🫡 Retire the old template engine, use jsx solely

KimlikDAO · Dec 27, 2024 · a060656 · a060656
1 parent cc09514
commit a060656
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 423 deletions.
diff --git a/kastro/compiler/compiler.js b/kastro/compiler/compiler.js
@@ -83,8 +83,6 @@ const computeDepHash = (props) => {
  * @const {TargetFunction}
  */
 const forceBuildTarget = (targetName, props) => {
-  console.log("forceBuildTarget()", targetName);
-
   populateChildTargets(props);
   const targetFunc = getTargetFunction(targetName);
   if (!targetFunc) console.error("targetFunc not found", targetName);

diff --git a/kastro/compiler/component.js b/kastro/compiler/component.js
diff --git a/kastro/compiler/jsx-runtime.js b/kastro/compiler/jsx-runtime.js
@@ -25,6 +25,10 @@ const resolveProps = (props, lang) => {
   for (const key in props)
     if (key != "children" && typeof props[key] == "object" && (lang in props[key]))
       props[key] = props[key][lang];
+    else if (key.startsWith("data-")) {
+      if (key == "data-" + lang) props.children = [props[key]];
+      delete props[key];
+    }
   return props;
 }
 

diff --git a/kastro/compiler/page.js b/kastro/compiler/page.js
@@ -1,7 +1,6 @@
 import { minify } from "html-minifier";
 import { getDir } from "../../util/paths";
 import compiler from "./compiler";
-import { compileComponent } from "./component";
 import HtmlMinifierConfig from "./config/htmlMinifierConfig";
 import { initGlobals } from "./pageGlobals";
 
@@ -42,7 +41,8 @@ const pageTarget = (targetName, props) => {
   props.SharedCss = new Set();
   props.PageCss = new Set();
   initGlobals(props);
-  return compileComponent("ana", {}, props)
+  return import(`${targetName.slice(7, -5)}.jsx`)
+    .then((jsx) => jsx.default(props))
     .then((html) => getStyleSheets(targetName, props).then((styleSheets) => {
       html = "<!DOCTYPE html>" + html.replace("</head>", styleSheets + "</head>");
       return props.BuildMode == 0

diff --git a/kastro/compiler/test/ana/image.svg b/kastro/compiler/test/ana/image.svg
diff --git a/kastro/compiler/test/ana/sayfa.css b/kastro/compiler/test/ana/sayfa.css
diff --git a/kastro/compiler/test/ana/sayfa.html b/kastro/compiler/test/ana/sayfa.html
diff --git a/kastro/compiler/test/birim/cüzdan/birim.html b/kastro/compiler/test/birim/cüzdan/birim.html
diff --git a/kastro/compiler/test/birim/jsxcomp/comp.jsx b/kastro/compiler/test/birim/jsxcomp/comp.jsx
diff --git a/kastro/compiler/test/birim/jsxcomp/fibo.css b/kastro/compiler/test/birim/jsxcomp/fibo.css
diff --git a/kastro/compiler/test/birim/kpass/birim.css b/kastro/compiler/test/birim/kpass/birim.css
diff --git a/kastro/compiler/test/birim/kpass/birim.html b/kastro/compiler/test/birim/kpass/birim.html
diff --git a/kastro/compiler/test/birim/logo.svg b/kastro/compiler/test/birim/logo.svg