marko 5.37.63 → 5.38.1

package/dist/runtime/helpers/tags-compat/runtime-html.js

@@ -148,7 +148,7 @@ exports.p = function (htmlCompat) {
     {}
   );
 
-  htmlCompat.patchDynamicTag(function getRenderer(scopeId, accessor, tag) {
+  htmlCompat.patchDynamicTag(function getRenderer(tag, scopeId, accessor) {
     if (!tag || isMarko6(tag._ || tag.content || tag)) {
       return tag;
     }

package/dist/translator/index.js

@@ -588,20 +588,21 @@ function getRuntimeEntryFiles(output, optimize) {
   `${base}core-tags/core/__flush_here_and_after__.js`,
   `${base}core-tags/core/await/renderer.js`,
   `${base}core-tags/core/await/reorderer-renderer.js`,
-  `${base}runtime/helpers/skip-serialize.js`] :
+  `${base}runtime/helpers/skip-serialize.js`,
+  `${base}runtime/helpers/tags-compat/html${optimize ? "" : "-debug"}.mjs`] :
 
   [
   `${base}runtime/vdom/index.js`,
   `${base}runtime/vdom/hot-reload.js`,
   `${base}runtime/vdom/helpers/attrs.js`,
-  `${base}runtime/vdom/helpers/const-element.js`])];
+  `${base}runtime/vdom/helpers/const-element.js`,
+  `${base}runtime/helpers/tags-compat/dom${optimize ? "" : "-debug"}.mjs`])];
 
 
 }
 
-function isRenderContent(path) {
-  const { node } = path;
-  return _compiler.types.MARKO_TYPES.includes(node.type) && !node.static;
+function isRenderContent({ node }) {
+  return /^Marko/.test(node.type) && !node.static;
 }
 
 function resolveRelativeTagEntry(file, tagDef) {

package/dist/translator/scriptlet.js

@@ -1,4 +1,35 @@
-"use strict";exports.__esModule = true;exports.default = _default;function _default(path) {
+"use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
+
+function _default(path) {
   const { node } = path;
+  const isHTML = path.hub.file.markoOpts.output === "html";
+  switch (node.target) {
+    case "server":
+      if (!isHTML) {
+        replaceWithUndefinedIdentifiers(path);
+        return;
+      }
+      break;
+    case "client":
+      if (isHTML) {
+        replaceWithUndefinedIdentifiers(path);
+        return;
+      }
+      break;
+  }
   path.replaceWithMultiple(node.body);
+}
+
+function replaceWithUndefinedIdentifiers(path) {
+  const keys = Object.keys(path.getOuterBindingIdentifiers());
+  if (keys.length) {
+    path.replaceWith(
+      _compiler.types.variableDeclaration(
+        "var",
+        keys.map((key) => _compiler.types.variableDeclarator(_compiler.types.identifier(key)))
+      )
+    );
+  } else {
+    path.remove();
+  }
 }

package/dist/translator/taglib/core/index.js

@@ -5,9 +5,11 @@ var parseMacro = _interopRequireWildcard(require("./macro/parse"));
 var translateMacro = _interopRequireWildcard(require("./macro/translate"));
 var _migrate = _interopRequireDefault(require("./migrate"));
 var parseClass = _interopRequireWildcard(require("./parse-class"));
+var parseClient = _interopRequireWildcard(require("./parse-client"));
 var parseExport = _interopRequireWildcard(require("./parse-export"));
 var parseImport = _interopRequireWildcard(require("./parse-import"));
 var parseModuleCode = _interopRequireWildcard(require("./parse-module-code"));
+var parseServer = _interopRequireWildcard(require("./parse-server"));
 var parseStatic = _interopRequireWildcard(require("./parse-static"));
 var transformBody = _interopRequireWildcard(require("./transform-body"));
 var transformStyle = _interopRequireWildcard(require("./transform-style"));
@@ -55,6 +57,20 @@ var translateWhile = _interopRequireWildcard(require("./translate-while"));funct
     }]
 
   },
+  "<client>": {
+    "node-factory": parseClient,
+    "parse-options": {
+      statement: true,
+      rawOpenTag: true
+    }
+  },
+  "<server>": {
+    "node-factory": parseServer,
+    "parse-options": {
+      statement: true,
+      rawOpenTag: true
+    }
+  },
   "<class>": {
     "node-factory": parseClass,
     "parse-options": {

package/dist/translator/taglib/core/parse-client.js

@@ -0,0 +1,18 @@
+"use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
+var _babelUtils = require("@marko/compiler/babel-utils");
+
+function _default(path) {
+  const {
+    node,
+    hub: { file }
+  } = path;
+  const { rawValue, end } = node;
+  const code = rawValue.replace(/^client\s*/, "");
+  const start = node.start + (rawValue.length - code.length);
+  let body = (0, _babelUtils.parseStatements)(file, code, start, end);
+  if (body.length === 1 && _compiler.types.isBlockStatement(body[0])) {
+    body = body[0].body;
+  }
+
+  path.replaceWith(_compiler.types.markoScriptlet(body, true, "client"));
+}

package/dist/translator/taglib/core/parse-server.js

@@ -0,0 +1,18 @@
+"use strict";exports.__esModule = true;exports.default = _default;var _compiler = require("@marko/compiler");
+var _babelUtils = require("@marko/compiler/babel-utils");
+
+function _default(path) {
+  const {
+    node,
+    hub: { file }
+  } = path;
+  const { rawValue, end } = node;
+  const code = rawValue.replace(/^server\s*/, "");
+  const start = node.start + (rawValue.length - code.length);
+  let body = (0, _babelUtils.parseStatements)(file, code, start, end);
+  if (body.length === 1 && _compiler.types.isBlockStatement(body[0])) {
+    body = body[0].body;
+  }
+
+  path.replaceWith(_compiler.types.markoScriptlet(body, true, "server"));
+}

package/dist/translator/util/add-dependencies.js

@@ -140,6 +140,23 @@ const entryBuilder = exports.entryBuilder = {
             resolveRelativeToEntry(entryFile, file, value)
           );
         }
+      } else if (
+      _compiler.types.isMarkoScriptlet(child) &&
+      child.static &&
+      child.target !== "server")
+      {
+        for (const stmt of child.body) {
+          if (_compiler.types.isImportDeclaration(stmt)) {
+            const { value } = stmt.source;
+            if (child.target === "client" || state.shouldIncludeImport(value)) {
+              addImport(
+                imports,
+                body,
+                resolveRelativeToEntry(entryFile, file, value)
+              );
+            }
+          }
+        }
       }
     }
 

package/dist/translator/util/optimize-vdom-create.js

@@ -78,7 +78,11 @@ const analyzeStaticVisitor = {
       !(0, _keyManager.hasUserKey)(path);
 
       const tagDef = (0, _babelUtils.getTagDef)(path);
-      isStatic = isStatic && !tagDef.translator;
+      isStatic =
+      isStatic && (
+      !tagDef.translator ||
+      tagDef.name === "script" ||
+      tagDef.name === "style");
 
       // check attributes
       isStatic =

package/dist/translator.js

@@ -0,0 +1,13 @@
+"use strict";exports.__esModule = true;exports.translate = exports.transform = exports.taglibs = exports.tagDiscoveryDirs = exports.preferAPI = exports.getRuntimeEntryFiles = exports.analyze = void 0;var tagsAPI = _interopRequireWildcard(require("@marko/runtime-tags/translator"));
+
+var classAPI = _interopRequireWildcard(require("./translator/index"));function _interopRequireWildcard(e, t) {if ("function" == typeof WeakMap) var r = new WeakMap(),n = new WeakMap();return (_interopRequireWildcard = function (e, t) {if (!t && e && e.__esModule) return e;var o,i,f = { __proto__: null, default: e };if (null === e || "object" != typeof e && "function" != typeof e) return f;if (o = t ? n : r) {if (o.has(e)) return o.get(e);o.set(e, f);}for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]);return f;})(e, t);}
+
+const {
+  preferAPI,
+  tagDiscoveryDirs,
+  transform,
+  analyze,
+  translate,
+  taglibs,
+  getRuntimeEntryFiles
+} = tagsAPI.createInteropTranslator(classAPI);exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.taglibs = taglibs;exports.translate = translate;exports.analyze = analyze;exports.transform = transform;exports.tagDiscoveryDirs = tagDiscoveryDirs;exports.preferAPI = preferAPI;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.37.63",
+  "version": "5.38.1",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -70,7 +70,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.28.2",
-    "@marko/compiler": "^5.39.43",
+    "@marko/compiler": "^5.39.45",
+    "@marko/runtime-tags": "^6.0.122",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -148,7 +148,7 @@ exports.p = function (htmlCompat) {
     {},
   );
 
-  htmlCompat.patchDynamicTag(function getRenderer(scopeId, accessor, tag) {
+  htmlCompat.patchDynamicTag(function getRenderer(tag, scopeId, accessor) {
     if (!tag || isMarko6(tag._ || tag.content || tag)) {
       return tag;
     }

package/src/translator/index.js

@@ -589,19 +589,20 @@ export function getRuntimeEntryFiles(output, optimize) {
           `${base}core-tags/core/await/renderer.js`,
           `${base}core-tags/core/await/reorderer-renderer.js`,
           `${base}runtime/helpers/skip-serialize.js`,
+          `${base}runtime/helpers/tags-compat/html${optimize ? "" : "-debug"}.mjs`,
         ]
       : [
           `${base}runtime/vdom/index.js`,
           `${base}runtime/vdom/hot-reload.js`,
           `${base}runtime/vdom/helpers/attrs.js`,
           `${base}runtime/vdom/helpers/const-element.js`,
+          `${base}runtime/helpers/tags-compat/dom${optimize ? "" : "-debug"}.mjs`,
         ]),
   ];
 }
 
-function isRenderContent(path) {
-  const { node } = path;
-  return t.MARKO_TYPES.includes(node.type) && !node.static;
+function isRenderContent({ node }) {
+  return /^Marko/.test(node.type) && !node.static;
 }
 
 function resolveRelativeTagEntry(file, tagDef) {

package/src/translator/scriptlet.js

@@ -1,4 +1,35 @@
+import { types as t } from "@marko/compiler";
+
 export default function (path) {
   const { node } = path;
+  const isHTML = path.hub.file.markoOpts.output === "html";
+  switch (node.target) {
+    case "server":
+      if (!isHTML) {
+        replaceWithUndefinedIdentifiers(path);
+        return;
+      }
+      break;
+    case "client":
+      if (isHTML) {
+        replaceWithUndefinedIdentifiers(path);
+        return;
+      }
+      break;
+  }
   path.replaceWithMultiple(node.body);
 }
+
+function replaceWithUndefinedIdentifiers(path) {
+  const keys = Object.keys(path.getOuterBindingIdentifiers());
+  if (keys.length) {
+    path.replaceWith(
+      t.variableDeclaration(
+        "var",
+        keys.map((key) => t.variableDeclarator(t.identifier(key))),
+      ),
+    );
+  } else {
+    path.remove();
+  }
+}

package/src/translator/taglib/core/index.js

@@ -5,9 +5,11 @@ import * as parseMacro from "./macro/parse";
 import * as translateMacro from "./macro/translate";
 import migrate from "./migrate";
 import * as parseClass from "./parse-class";
+import * as parseClient from "./parse-client";
 import * as parseExport from "./parse-export";
 import * as parseImport from "./parse-import";
 import * as parseModuleCode from "./parse-module-code";
+import * as parseServer from "./parse-server";
 import * as parseStatic from "./parse-static";
 import * as transformBody from "./transform-body";
 import * as transformStyle from "./transform-style";
@@ -55,6 +57,20 @@ export default {
       },
     ],
   },
+  "<client>": {
+    "node-factory": parseClient,
+    "parse-options": {
+      statement: true,
+      rawOpenTag: true,
+    },
+  },
+  "<server>": {
+    "node-factory": parseServer,
+    "parse-options": {
+      statement: true,
+      rawOpenTag: true,
+    },
+  },
   "<class>": {
     "node-factory": parseClass,
     "parse-options": {

package/src/translator/taglib/core/parse-client.js

@@ -0,0 +1,18 @@
+import { types as t } from "@marko/compiler";
+import { parseStatements } from "@marko/compiler/babel-utils";
+
+export default function (path) {
+  const {
+    node,
+    hub: { file },
+  } = path;
+  const { rawValue, end } = node;
+  const code = rawValue.replace(/^client\s*/, "");
+  const start = node.start + (rawValue.length - code.length);
+  let body = parseStatements(file, code, start, end);
+  if (body.length === 1 && t.isBlockStatement(body[0])) {
+    body = body[0].body;
+  }
+
+  path.replaceWith(t.markoScriptlet(body, true, "client"));
+}

package/src/translator/taglib/core/parse-server.js

@@ -0,0 +1,18 @@
+import { types as t } from "@marko/compiler";
+import { parseStatements } from "@marko/compiler/babel-utils";
+
+export default function (path) {
+  const {
+    node,
+    hub: { file },
+  } = path;
+  const { rawValue, end } = node;
+  const code = rawValue.replace(/^server\s*/, "");
+  const start = node.start + (rawValue.length - code.length);
+  let body = parseStatements(file, code, start, end);
+  if (body.length === 1 && t.isBlockStatement(body[0])) {
+    body = body[0].body;
+  }
+
+  path.replaceWith(t.markoScriptlet(body, true, "server"));
+}

package/src/translator/util/add-dependencies.js

@@ -140,6 +140,23 @@ export const entryBuilder = {
             resolveRelativeToEntry(entryFile, file, value),
           );
         }
+      } else if (
+        t.isMarkoScriptlet(child) &&
+        child.static &&
+        child.target !== "server"
+      ) {
+        for (const stmt of child.body) {
+          if (t.isImportDeclaration(stmt)) {
+            const { value } = stmt.source;
+            if (child.target === "client" || state.shouldIncludeImport(value)) {
+              addImport(
+                imports,
+                body,
+                resolveRelativeToEntry(entryFile, file, value),
+              );
+            }
+          }
+        }
       }
     }
 

package/src/translator/util/optimize-vdom-create.js

@@ -78,7 +78,11 @@ const analyzeStaticVisitor = {
         !hasUserKey(path);
 
       const tagDef = getTagDef(path);
-      isStatic = isStatic && !tagDef.translator;
+      isStatic =
+        isStatic &&
+        (!tagDef.translator ||
+          tagDef.name === "script" ||
+          tagDef.name === "style");
 
       // check attributes
       isStatic =

package/src/translator.js

@@ -0,0 +1,13 @@
+import * as tagsAPI from "@marko/runtime-tags/translator";
+
+import * as classAPI from "./translator/index";
+
+export const {
+  preferAPI,
+  tagDiscoveryDirs,
+  transform,
+  analyze,
+  translate,
+  taglibs,
+  getRuntimeEntryFiles,
+} = tagsAPI.createInteropTranslator(classAPI);

package/translator/package.json

@@ -1,5 +1,5 @@
 {
-  "main": "../dist/translator/index.js",
+  "main": "../dist/translator.js",
   "types": "index.d.ts",
-  "main:override": "../src/translator/index.js"
+  "main:override": "../src/translator.js"
 }