marko 5.37.62 → 5.38.0

package/dist/translator/index.js

@@ -599,9 +599,8 @@ function getRuntimeEntryFiles(output, optimize) {
 
 }
 
-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/tag/index.js

@@ -57,7 +57,29 @@ var _nativeTag = _interopRequireDefault(require("./native-tag"));function _inter
         moveIgnoredAttrTags(path);
       }
 
-      if ((0, _babelUtils.isDynamicTag)(path) || !((0, _babelUtils.isMacroTag)(path) || (0, _babelUtils.isNativeTag)(path))) {
+      if ((0, _babelUtils.isNativeTag)(path)) {
+        if (tagDef && tagDef.name === "body") {
+          path.
+          get("body").
+          pushContainer("body", [
+          _compiler.types.markoTag(
+            _compiler.types.stringLiteral("init-components"),
+            [],
+            _compiler.types.markoTagBody()
+          ),
+          _compiler.types.markoTag(
+            _compiler.types.stringLiteral("await-reorderer"),
+            [],
+            _compiler.types.markoTagBody()
+          ),
+          _compiler.types.markoTag(
+            _compiler.types.stringLiteral("_preferred-script-location"),
+            [],
+            _compiler.types.markoTagBody()
+          )]
+          );
+        }
+      } else if (!(0, _babelUtils.isMacroTag)(path)) {
         (0, _attributeTag.analyzeAttributeTags)(path);
       }
 

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

@@ -1,12 +1,15 @@
-"use strict";exports.__esModule = true;exports.default = void 0;var translateElse = _interopRequireWildcard(require("./conditional/translate-else"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var translateElse = _interopRequireWildcard(require("./conditional/translate-else"));
 var translateElseIf = _interopRequireWildcard(require("./conditional/translate-else-if"));
 var translateIf = _interopRequireWildcard(require("./conditional/translate-if"));
 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"));
@@ -18,7 +21,8 @@ var translateServerOnly = _interopRequireWildcard(require("./translate-server-on
 var translateWhile = _interopRequireWildcard(require("./translate-while"));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);}var _default = exports.default =
 
 {
-  "taglib-id": "marko-default-core",
+  taglibId: "marko-core",
+  migrate: _migrate.default,
   "<import>": {
     "node-factory": parseImport,
     "parse-options": {
@@ -53,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": {
@@ -89,7 +107,9 @@ var translateWhile = _interopRequireWildcard(require("./translate-while"));funct
   "<style>": {
     transformer: transformStyle,
     "parse-options": {
-      rawOpenTag: true
+      text: true,
+      rawOpenTag: true,
+      preserveWhitespace: true
     }
   },
   "<macro>": {
@@ -283,9 +303,6 @@ var translateWhile = _interopRequireWildcard(require("./translate-while"));funct
     "code-generator": translateServerOnly,
     renderer: "marko/src/core-tags/components/preferred-script-location-tag.js"
   },
-  "<body>": {
-    transformer: transformBody
-  },
   "<await>": {
     renderer: "marko/src/core-tags/core/await/renderer.js",
     types: "marko/src/core-tags/core/await/index.d.marko",

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/taglib/core/parse-static.js

@@ -14,5 +14,5 @@ function _default(path) {
     body = body[0].body;
   }
 
-  path.replaceWith(_compiler.types.MarkoScriptlet(body, true));
+  path.replaceWith(_compiler.types.markoScriptlet(body, true));
 }

package/dist/translator/taglib/index.js

@@ -1,6 +1,5 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.optionalTaglibs = exports.default = void 0;var _core = _interopRequireDefault(require("./core"));
-var _migrate = _interopRequireDefault(require("./migrate"));
 const optionalTaglibs = exports.optionalTaglibs = ["marko-widgets", "@marko/compat-v4"];var _default = exports.default =
 [
-["marko/core", _core.default],
-["marko/migrate", _migrate.default]];
+["marko-html-title", { "<title>": { parseOptions: { text: false } } }], // In Marko 5 the title tag parses as html even though only text is really allowed.
+[_core.default.taglibId, _core.default]];

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/package.json

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

package/src/translator/index.js

@@ -599,9 +599,8 @@ export function getRuntimeEntryFiles(output, optimize) {
   ];
 }
 
-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/tag/index.js

@@ -57,7 +57,29 @@ export default {
         moveIgnoredAttrTags(path);
       }
 
-      if (isDynamicTag(path) || !(isMacroTag(path) || isNativeTag(path))) {
+      if (isNativeTag(path)) {
+        if (tagDef && tagDef.name === "body") {
+          path
+            .get("body")
+            .pushContainer("body", [
+              t.markoTag(
+                t.stringLiteral("init-components"),
+                [],
+                t.markoTagBody(),
+              ),
+              t.markoTag(
+                t.stringLiteral("await-reorderer"),
+                [],
+                t.markoTagBody(),
+              ),
+              t.markoTag(
+                t.stringLiteral("_preferred-script-location"),
+                [],
+                t.markoTagBody(),
+              ),
+            ]);
+        }
+      } else if (!isMacroTag(path)) {
         analyzeAttributeTags(path);
       }
 

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

@@ -3,10 +3,13 @@ import * as translateElseIf from "./conditional/translate-else-if";
 import * as translateIf from "./conditional/translate-if";
 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";
@@ -18,7 +21,8 @@ import * as translateServerOnly from "./translate-server-only";
 import * as translateWhile from "./translate-while";
 
 export default {
-  "taglib-id": "marko-default-core",
+  taglibId: "marko-core",
+  migrate,
   "<import>": {
     "node-factory": parseImport,
     "parse-options": {
@@ -53,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": {
@@ -89,7 +107,9 @@ export default {
   "<style>": {
     transformer: transformStyle,
     "parse-options": {
+      text: true,
       rawOpenTag: true,
+      preserveWhitespace: true,
     },
   },
   "<macro>": {
@@ -283,9 +303,6 @@ export default {
     "code-generator": translateServerOnly,
     renderer: "marko/src/core-tags/components/preferred-script-location-tag.js",
   },
-  "<body>": {
-    transformer: transformBody,
-  },
   "<await>": {
     renderer: "marko/src/core-tags/core/await/renderer.js",
     types: "marko/src/core-tags/core/await/index.d.marko",

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/taglib/core/parse-static.js

@@ -14,5 +14,5 @@ export default function (path) {
     body = body[0].body;
   }
 
-  path.replaceWith(t.MarkoScriptlet(body, true));
+  path.replaceWith(t.markoScriptlet(body, true));
 }

package/src/translator/taglib/index.js

@@ -1,7 +1,6 @@
 import coreTaglib from "./core";
-import migrateTaglib from "./migrate";
 export const optionalTaglibs = ["marko-widgets", "@marko/compat-v4"];
 export default [
-  ["marko/core", coreTaglib],
-  ["marko/migrate", migrateTaglib],
+  ["marko-html-title", { "<title>": { parseOptions: { text: false } } }], // In Marko 5 the title tag parses as html even though only text is really allowed.
+  [coreTaglib.taglibId, coreTaglib],
 ];

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/dist/translator/taglib/migrate/index.js

@@ -1,5 +0,0 @@
-"use strict";exports.__esModule = true;exports.default = void 0;var migrateAllTemplates = _interopRequireWildcard(require("./all-templates"));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);}var _default = exports.default =
-{
-  "taglib-id": "marko-default-migrate",
-  migrator: migrateAllTemplates
-};

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

@@ -1,5 +0,0 @@
-import * as migrateAllTemplates from "./all-templates";
-export default {
-  "taglib-id": "marko-default-migrate",
-  migrator: migrateAllTemplates,
-};