@marko/translator-default 5.31.13 → 5.31.14

package/dist/index.js

@@ -505,9 +505,7 @@ function getRuntimeEntryFiles(output, optimize) {
   `${base}runtime/vdom/index.js`,
   `${base}runtime/vdom/hot-reload.js`,
   `${base}runtime/vdom/helpers/attrs.js`,
-  `${base}runtime/vdom/helpers/const.js`,
-  `${base}runtime/vdom/helpers/v-element.js`,
-  `${base}runtime/vdom/helpers/v-text.js`,
+  `${base}runtime/vdom/helpers/const-element.js`,
   `${base}runtime/vdom/preserve-attrs.js`])];
 
 

package/dist/tag/native-tag[vdom]/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;exports.tagArguments = tagArguments;var _babelUtils = require("@marko/babel-utils");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _babelUtils = require("@marko/babel-utils");
 var _compiler = require("@marko/compiler");
 var FLAGS = _interopRequireWildcard(require("../../util/runtime-flags"));
 var _vdomOutWrite = _interopRequireDefault(require("../../util/vdom-out-write"));
@@ -7,7 +7,85 @@ var _attributes = _interopRequireDefault(require("./attributes"));function _getR
 
 const SIMPLE_ATTRS = ["id", "class", "style"];
 
-function tagArguments(path, isStatic) {
+/**
+ * Translates the html streaming version of a standard html element.
+ */
+function _default(path, isNullable) {
+  const { node } = path;
+  const {
+    name,
+    key,
+    body: { body }
+  } = node;
+
+  const isEmpty = !body.length;
+  const writeArgs = tagArguments(path, false);
+  let writeStartNode = (0, _withPreviousLocation.default)(
+    (0, _vdomOutWrite.default)(isEmpty ? "e" : "be", ...writeArgs),
+    node.name
+  );
+
+  if (isNullable) {
+    writeStartNode = _compiler.types.ifStatement(
+      name,
+      writeStartNode,
+      _compiler.types.expressionStatement(
+        _compiler.types.callExpression(
+          _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("bf")),
+          [
+          (0, _babelUtils.normalizeTemplateString)`f_${key}`,
+          path.hub.file._componentInstanceIdentifier]
+
+        )
+      )
+    );
+  }
+
+  if (isEmpty) {
+    path.replaceWith(writeStartNode);
+    return;
+  }
+
+  let writeEndNode = (0, _vdomOutWrite.default)("ee");
+  if (isNullable) {
+    writeEndNode = _compiler.types.ifStatement(
+      name,
+      writeEndNode,
+      _compiler.types.expressionStatement(
+        _compiler.types.callExpression(
+          _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("ef")),
+          []
+        )
+      )
+    );
+  }
+
+  let needsBlock;
+  for (const childNode of body) {
+    if (_compiler.types.isVariableDeclaration(childNode)) {
+      if (childNode.kind === "const" || childNode.kind === "let") {
+        needsBlock = true;
+        break;
+      }
+    }
+  }
+
+  path.replaceWithMultiple(
+    [writeStartNode].
+    concat(needsBlock ? _compiler.types.blockStatement(body) : body).
+    concat(writeEndNode)
+  );
+}
+
+function isPropertyName({ key }, names) {
+  if (_compiler.types.isStringLiteral(key)) {
+    return names.includes(key.value);
+  } else if (_compiler.types.isIdentifier(key)) {
+    return names.includes(key.name);
+  }
+}
+
+function tagArguments(path) {
   const {
     hub: { file },
     node
@@ -29,13 +107,9 @@ function tagArguments(path, isStatic) {
   const writeArgs = [
   name,
   attrsObj,
-  !key && isStatic ? _compiler.types.nullLiteral() : key,
-  isStatic ? _compiler.types.nullLiteral() : file._componentInstanceIdentifier,
-  isStatic ?
-  _compiler.types.numericLiteral(body.length) :
-  body.length ?
-  _compiler.types.nullLiteral() :
-  _compiler.types.numericLiteral(0)];
+  key,
+  file._componentInstanceIdentifier,
+  body.length ? _compiler.types.nullLiteral() : _compiler.types.numericLiteral(0)];
 
 
   if (node.preserveAttrs) {
@@ -101,82 +175,4 @@ function tagArguments(path, isStatic) {
     writeArgs.push(_compiler.types.objectExpression(tagProperties));
   }
   return writeArgs;
-}
-
-/**
- * Translates the html streaming version of a standard html element.
- */
-function _default(path, isNullable) {
-  const { node } = path;
-  const {
-    name,
-    key,
-    body: { body }
-  } = node;
-
-  const isEmpty = !body.length;
-  const writeArgs = tagArguments(path, false);
-  let writeStartNode = (0, _withPreviousLocation.default)(
-    (0, _vdomOutWrite.default)(isEmpty ? "e" : "be", ...writeArgs),
-    node.name
-  );
-
-  if (isNullable) {
-    writeStartNode = _compiler.types.ifStatement(
-      name,
-      writeStartNode,
-      _compiler.types.expressionStatement(
-        _compiler.types.callExpression(
-          _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("bf")),
-          [
-          (0, _babelUtils.normalizeTemplateString)`f_${key}`,
-          path.hub.file._componentInstanceIdentifier]
-
-        )
-      )
-    );
-  }
-
-  if (isEmpty) {
-    path.replaceWith(writeStartNode);
-    return;
-  }
-
-  let writeEndNode = (0, _vdomOutWrite.default)("ee");
-  if (isNullable) {
-    writeEndNode = _compiler.types.ifStatement(
-      name,
-      writeEndNode,
-      _compiler.types.expressionStatement(
-        _compiler.types.callExpression(
-          _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("ef")),
-          []
-        )
-      )
-    );
-  }
-
-  let needsBlock;
-  for (const childNode of body) {
-    if (_compiler.types.isVariableDeclaration(childNode)) {
-      if (childNode.kind === "const" || childNode.kind === "let") {
-        needsBlock = true;
-        break;
-      }
-    }
-  }
-
-  path.replaceWithMultiple(
-    [writeStartNode].
-    concat(needsBlock ? _compiler.types.blockStatement(body) : body).
-    concat(writeEndNode)
-  );
-}
-
-function isPropertyName({ key }, names) {
-  if (_compiler.types.isStringLiteral(key)) {
-    return names.includes(key.value);
-  } else if (_compiler.types.isIdentifier(key)) {
-    return names.includes(key.name);
-  }
 }

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

@@ -7,7 +7,7 @@
 
 var _compiler = require("@marko/compiler");
 var _he = require("he");
-var _nativeTagVdom = require("../tag/native-tag[vdom]");
+var _attributes = _interopRequireDefault(require("../tag/native-tag[vdom]/attributes"));
 var _keyManager = require("./key-manager");
 var _vdomOutWrite = _interopRequireDefault(require("./vdom-out-write"));
 
@@ -40,10 +40,9 @@ const mergeStaticCreateVisitor = {
   },
   MarkoTag(path, state) {
     (0, _keyManager.getKeyManager)(path).resolveKey(path);
-    const writeArgs = (0, _nativeTagVdom.tagArguments)(path, true);
     state.currentRoot = _compiler.types.callExpression(
       _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("e")),
-      writeArgs
+      getConstElementArgs(path)
     );
   }
 };
@@ -70,7 +69,8 @@ const analyzeStaticVisitor = {
       let isStatic =
       (0, _babelUtils.isNativeTag)(path) &&
       !path.node.body.params.length &&
-      !path.node.arguments;
+      !path.node.arguments &&
+      !(0, _keyManager.hasUserKey)(path);
 
       const tagDef = (0, _babelUtils.getTagDef)(path);
       isStatic = isStatic && !tagDef.translator;
@@ -118,15 +118,14 @@ function optimizeStaticVDOM(path) {
   }
 
   const identifier = path.scope.generateUidIdentifier("marko_node");
-  const writeArgs = (0, _nativeTagVdom.tagArguments)(path, true);
   const state = {
     currentRoot: _compiler.types.callExpression(
       (0, _babelUtils.importDefault)(
         file,
-        "marko/src/runtime/vdom/helpers/v-element.js",
-        "marko_createElement"
+        "marko/src/runtime/vdom/helpers/const-element.js",
+        "marko_constElement"
       ),
-      writeArgs
+      getConstElementArgs(path)
     )
   };
 
@@ -148,4 +147,13 @@ function analyzeStaticVDOM(path) {
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "5.31.13",
+  "version": "5.31.14",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@marko/compiler": "^5.34.6",
-    "marko": "^5.32.7"
+    "marko": "^5.32.8"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",