marko 5.36.4 → 5.37.0

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

@@ -0,0 +1,164 @@
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.analyzeStaticVDOM = analyzeStaticVDOM;exports.optimizeStaticVDOM = optimizeStaticVDOM;var _compiler = require("@marko/compiler");
+var _babelUtils = require("@marko/compiler/babel-utils");
+
+
+
+
+
+
+var _he = require("he");
+
+var _attributes = _interopRequireDefault(require("../tag/native-tag[vdom]/attributes"));
+var _keyManager = require("./key-manager");
+var _vdomOutWrite = _interopRequireDefault(require("./vdom-out-write"));
+
+const skipDirectives = new Set([
+"key",
+"w-bind",
+"no-update",
+"no-update-if",
+"no-update-body",
+"no-update-body-if"]
+);
+const staticNodes = new WeakSet();
+
+const mergeStaticCreateVisitor = {
+  MarkoText(path, state) {
+    const { node } = path;
+    state.currentRoot = _compiler.types.callExpression(
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
+      [_compiler.types.stringLiteral((0, _he.decode)(node.value))]
+    );
+  },
+  MarkoPlaceholder(path, state) {
+    const computed = (0, _babelUtils.computeNode)(path.node.value);
+    state.currentRoot = _compiler.types.callExpression(
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
+      [
+      _compiler.types.stringLiteral(
+        computed && computed.value != null ? `${computed.value}` : ""
+      )]
+
+    );
+  },
+  MarkoTag(path, state) {
+    (0, _keyManager.getKeyManager)(path).resolveKey(path);
+    state.currentRoot = _compiler.types.callExpression(
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("e")),
+      getConstElementArgs(path)
+    );
+  }
+};
+
+const analyzeStaticVisitor = {
+  MarkoText(path) {
+    staticNodes.add(path.node);
+  },
+  MarkoPlaceholder(path) {
+    if (path.node.escape) {
+      const computed = (0, _babelUtils.computeNode)(path.node.value);
+      if (computed) {
+        staticNodes.add(path.node);
+      }
+    }
+  },
+  MarkoTag: {
+    enter(path) {
+      // needed to handle global keys on elements that don't have specific key attributes
+      if ((0, _babelUtils.isLoopTag)(path)) path.skip();
+    },
+    exit(path) {
+      // check name
+      let isStatic =
+      (0, _babelUtils.isNativeTag)(path) &&
+      !path.node.attributeTags.length &&
+      !path.node.body.attributeTags &&
+      !path.node.body.params.length &&
+      !path.node.arguments &&
+      !(0, _keyManager.hasUserKey)(path);
+
+      const tagDef = (0, _babelUtils.getTagDef)(path);
+      isStatic = isStatic && !tagDef.translator;
+
+      // check attributes
+      isStatic =
+      isStatic &&
+      path.
+      get("attributes").
+      every(
+        (attr) =>
+        _compiler.types.isMarkoAttribute(attr) &&
+        !(
+        attr.node.arguments ||
+        attr.node.modifier ||
+        skipDirectives.has(attr.node.name) ||
+        !(0, _babelUtils.computeNode)(attr.node.value))
+
+      );
+
+      // check children
+      isStatic =
+      isStatic &&
+      path.
+      get("body").
+      get("body").
+      every((t) => staticNodes.has(t.node));
+
+      if (isStatic) staticNodes.add(path.node);
+    }
+  }
+};
+
+function optimizeStaticVDOM(path) {
+  const {
+    hub: { file }
+  } = path;
+
+  if (
+  !shouldRun(file.markoOpts) ||
+  !staticNodes.has(path.node) ||
+  staticNodes.has(path.parentPath.parentPath.node))
+  {
+    return;
+  }
+
+  const identifier = path.scope.generateUidIdentifier("marko_node");
+  const state = {
+    currentRoot: _compiler.types.callExpression(
+      (0, _babelUtils.importDefault)(
+        file,
+        "marko/src/runtime/vdom/helpers/const-element.js",
+        "marko_constElement"
+      ),
+      getConstElementArgs(path)
+    )
+  };
+
+  path.traverse(mergeStaticCreateVisitor, state);
+
+  const d = _compiler.types.variableDeclaration("const", [
+  _compiler.types.variableDeclarator(identifier, state.currentRoot)]
+  );
+  file.path.node.body.push(d);
+  path.replaceWith((0, _vdomOutWrite.default)("n", identifier, file._componentInstanceIdentifier));
+  path.skip();
+}
+
+function analyzeStaticVDOM(path) {
+  if (shouldRun(path.hub.file.markoOpts)) {
+    path.traverse(analyzeStaticVisitor);
+  }
+}
+
+function shouldRun(markoOpts) {
+  return markoOpts.optimize && markoOpts.output !== "html";
+}
+
+function getConstElementArgs(path) {
+  const { node } = path;
+  return [
+  node.name,
+  (0, _attributes.default)(path, path.get("attributes")),
+  _compiler.types.numericLiteral(node.body.body.length)];
+
+}

package/dist/translator/util/plugin-hooks.js

@@ -0,0 +1,22 @@
+"use strict";exports.__esModule = true;exports.enter = enter;exports.exit = exit; // Utilities for executing multi step compiler hooks (code generators in this package).
+
+function enter(plugin, ...args) {
+  const fn =
+  plugin && (
+  plugin.enter ||
+  plugin.default && plugin.default.enter ||
+  plugin.default) ||
+  plugin;
+  if (typeof fn === "function") {
+    fn(...args);
+  }
+}
+
+function exit(plugin, ...args) {
+  const fn =
+  plugin && (
+  plugin.exit || (plugin.default ? plugin.default.exit : undefined));
+  if (typeof fn === "function") {
+    fn(...args);
+  }
+}

package/dist/translator/util/runtime-flags.js

@@ -0,0 +1,3 @@
+"use strict";exports.__esModule = true;exports.SPREAD_ATTRS = exports.IS_CUSTOM_ELEMENT = exports.HAS_SIMPLE_ATTRS = void 0;const HAS_SIMPLE_ATTRS = exports.HAS_SIMPLE_ATTRS = 1;
+const IS_CUSTOM_ELEMENT = exports.IS_CUSTOM_ELEMENT = 2; // TODO: impl custom elements.
+const SPREAD_ATTRS = exports.SPREAD_ATTRS = 4; // TODO: impl custom elements.

package/dist/translator/util/vdom-out-write.js

@@ -0,0 +1,10 @@
+"use strict";exports.__esModule = true;exports.default = write;var _compiler = require("@marko/compiler");
+
+function write(method, ...args) {
+  return _compiler.types.expressionStatement(
+    _compiler.types.callExpression(
+      _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier(method)),
+      args
+    )
+  );
+}

package/dist/translator/util/with-previous-location.js

@@ -0,0 +1,6 @@
+"use strict";exports.__esModule = true;exports.default = withPreviousLocation;function withPreviousLocation(newNode, originalNode) {
+  newNode.start = originalNode.start;
+  newNode.loc = originalNode.loc;
+  newNode.end = originalNode.end;
+  return newNode;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.36.4",
+  "version": "5.37.0",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -60,14 +60,16 @@
     "index-browser.marko",
     "index.js",
     "node-require.js",
-    "tags-html.d.ts"
+    "tags-html.d.ts",
+    "translator/package.json",
+    "translator/index.d.ts"
   ],
   "scripts": {
     "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@marko/compiler": "^5.38.3",
-    "@marko/translator-default": "^6.1.2",
+    "@babel/runtime": "^7.26.0",
+    "@marko/compiler": "^5.39.0",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",
@@ -75,6 +77,7 @@
     "csstype": "^3.1.3",
     "events-light": "^1.0.5",
     "listener-tracker": "^2.0.0",
+    "magic-string": "^0.30.15",
     "minimatch": "^9.0.5",
     "raptor-util": "^3.2.0",
     "resolve-from": "^5.0.0",

package/src/taglib/index.js

@@ -30,11 +30,11 @@ exports.finder = compiler.taglib._finder;
 exports.lookup = {
   buildLookup: function (dir, translator) {
     if (!translator || !Array.isArray(translator.taglibs)) {
-      translator = require("@marko/translator-default");
+      translator = require("../translator");
       // eslint-disable-next-line no-constant-condition
       if ("MARKO_DEBUG") {
         complain(
-          "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('@marko/translator-default'))`.",
+          "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('marko/translator'))`.",
         );
       }
     }

package/src/translator/cdata/index.js

@@ -0,0 +1,15 @@
+import translateHTML from "./index[html]";
+import translateVDOM from "./index[vdom]";
+
+export default function (path) {
+  const {
+    hub: {
+      file: { markoOpts },
+    },
+  } = path;
+  if (markoOpts.output === "html") {
+    translateHTML(path);
+  } else {
+    translateVDOM(path);
+  }
+}

package/src/translator/cdata/index[html].js

@@ -0,0 +1,15 @@
+import { types as t } from "@marko/compiler";
+
+import write from "../util/html-out-write";
+import withPreviousLocation from "../util/with-previous-location";
+
+export default function (path) {
+  const { node } = path;
+
+  path.replaceWith(
+    withPreviousLocation(
+      write`<![CDATA[${t.stringLiteral(node.value)}]]>`,
+      node,
+    ),
+  );
+}

package/src/translator/cdata/index[vdom].js

@@ -0,0 +1,12 @@
+import { types as t } from "@marko/compiler";
+
+import write from "../util/vdom-out-write";
+import withPreviousLocation from "../util/with-previous-location";
+
+export default function (path) {
+  const { node } = path;
+
+  path.replaceWith(
+    withPreviousLocation(write("t", t.stringLiteral(node.value)), node),
+  );
+}

package/src/translator/class.js

@@ -0,0 +1,65 @@
+import { types as t } from "@marko/compiler";
+
+export default function (path) {
+  const {
+    hub: { file },
+    node: {
+      body: { body },
+    },
+  } = path;
+
+  const classProperties = [];
+  let onCreateMethod = body.find(
+    (prop) =>
+      prop.computed === false &&
+      t.isIdentifier(prop.key) &&
+      prop.key.name === "onCreate",
+  );
+
+  const objectProperties = body
+    .map((prop) => {
+      if (t.isClassMethod(prop)) {
+        prop.type = "ObjectMethod";
+        delete prop.start;
+        delete prop.end;
+        delete prop.loc;
+        return prop;
+      } else if (t.isClassProperty(prop) && !prop.static) {
+        if (!prop.declare) {
+          classProperties.push(
+            t.assignmentExpression(
+              "=",
+              t.memberExpression(t.thisExpression(), prop.key, prop.computed),
+              prop.value || t.unaryExpression("void", t.numericLiteral(0)),
+            ),
+          );
+        }
+
+        return undefined;
+      }
+
+      throw file.buildCodeFrameError(
+        prop,
+        "Unsupported class property on component.",
+      );
+    })
+    .filter(Boolean);
+
+  if (classProperties.length) {
+    if (!onCreateMethod) {
+      objectProperties.push(
+        (onCreateMethod = t.objectMethod(
+          "method",
+          t.identifier("onCreate"),
+          [],
+          t.blockStatement([]),
+        )),
+      );
+    }
+
+    onCreateMethod.body.body.unshift(...classProperties);
+  }
+
+  file._inlineComponentClass = t.objectExpression(objectProperties);
+  path.remove();
+}

package/src/translator/comment/index.js

@@ -0,0 +1,15 @@
+import translateHTML from "./index[html]";
+import translateVDOM from "./index[vdom]";
+
+export default function (path) {
+  const {
+    hub: {
+      file: { markoOpts },
+    },
+  } = path;
+  if (markoOpts.output === "html") {
+    translateHTML(path);
+  } else {
+    translateVDOM(path);
+  }
+}

package/src/translator/comment/index[html].js

@@ -0,0 +1,17 @@
+import { types as t } from "@marko/compiler";
+
+import write from "../util/html-out-write";
+import withPreviousLocation from "../util/with-previous-location";
+const ieConditionalCommentRegExp = /^\[if |<!\[endif\]$/;
+
+export default function (path) {
+  const { node } = path;
+
+  if (ieConditionalCommentRegExp.test(node.value)) {
+    path.replaceWith(
+      withPreviousLocation(write`<!--${t.stringLiteral(node.value)}-->`, node),
+    );
+  } else {
+    path.remove();
+  }
+}

package/src/translator/comment/index[vdom].js

@@ -0,0 +1,3 @@
+export default function (path) {
+  path.remove();
+}

package/src/translator/declaration/index.js

@@ -0,0 +1,15 @@
+import translateHTML from "./index[html]";
+import translateVDOM from "./index[vdom]";
+
+export default function (path) {
+  const {
+    hub: {
+      file: { markoOpts },
+    },
+  } = path;
+  if (markoOpts.output === "html") {
+    translateHTML(path);
+  } else {
+    translateVDOM(path);
+  }
+}

package/src/translator/declaration/index[html].js

@@ -0,0 +1,12 @@
+import { types as t } from "@marko/compiler";
+
+import write from "../util/html-out-write";
+import withPreviousLocation from "../util/with-previous-location";
+
+export default function (path) {
+  const { node } = path;
+
+  path.replaceWith(
+    withPreviousLocation(write`<?${t.stringLiteral(node.value)}?>`, node),
+  );
+}

package/src/translator/declaration/index[vdom].js

@@ -0,0 +1,3 @@
+export default function (path) {
+  path.remove();
+}

package/src/translator/document-type/index.js

@@ -0,0 +1,15 @@
+import translateHTML from "./index[html]";
+import translateVDOM from "./index[vdom]";
+
+export default function (path) {
+  const {
+    hub: {
+      file: { markoOpts },
+    },
+  } = path;
+  if (markoOpts.output === "html") {
+    translateHTML(path);
+  } else {
+    translateVDOM(path);
+  }
+}

package/src/translator/document-type/index[html].js

@@ -0,0 +1,12 @@
+import { types as t } from "@marko/compiler";
+
+import write from "../util/html-out-write";
+import withPreviousLocation from "../util/with-previous-location";
+
+export default function (path) {
+  const { node } = path;
+
+  path.replaceWith(
+    withPreviousLocation(write`<!${t.stringLiteral(node.value)}>`, node),
+  );
+}

package/src/translator/document-type/index[vdom].js

@@ -0,0 +1,3 @@
+export default function (path) {
+  path.remove();
+}