marko 5.37.0 → 6.0.0-3.4

package/src/translator/tag/native-tag[html]/index.js

@@ -1,221 +0,0 @@
-import { types as t } from "@marko/compiler";
-import {
-  getTagDef,
-  importDefault,
-  normalizeTemplateString,
-} from "@marko/compiler/babel-utils";
-import { resolve } from "path";
-import SELF_CLOSING from "self-closing-tags";
-
-import write from "../../util/html-out-write";
-import { hasUserKey } from "../../util/key-manager";
-import withPreviousLocation from "../../util/with-previous-location";
-import translateAttributes from "./attributes";
-
-const EMPTY_OBJECT = {};
-
-/**
- * Translates the html streaming version of a standard html element.
- */
-export default function (path, isNullable) {
-  const {
-    hub: { file },
-    node,
-  } = path;
-  const {
-    key,
-    name,
-    body: { body },
-    handlers,
-  } = node;
-  const tagProperties = (path.node.extra && path.node.extra.properties) || [];
-  const tagDef = getTagDef(path);
-  const meta = file.metadata.marko;
-
-  if (tagDef) {
-    const { parseOptions = EMPTY_OBJECT } = tagDef;
-    if (parseOptions.import) {
-      // TODO: the taglib should be updated to support this as a top level option.
-      file.metadata.marko.deps.push(resolve(tagDef.dir, parseOptions.import));
-    }
-  }
-
-  if (handlers) {
-    Object.entries(handlers).forEach(
-      ([eventName, { arguments: args, once }]) => {
-        const delegateArgs = [t.stringLiteral(eventName), args[0]];
-
-        // TODO: look into only sending this if once is true.
-        delegateArgs.push(t.booleanLiteral(once));
-
-        if (args.length > 1) {
-          delegateArgs.push(t.arrayExpression(args.slice(1)));
-        }
-
-        // TODO: why do we output eventName twice.
-        tagProperties.push(
-          t.objectProperty(
-            t.stringLiteral(`on${eventName}`),
-            t.callExpression(
-              t.memberExpression(
-                file._componentDefIdentifier,
-                t.identifier("d"),
-              ),
-              delegateArgs,
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  const isHTML = file.markoOpts.output === "html";
-  let dataMarko = t.stringLiteral("");
-
-  if (node.preserveAttrs) {
-    tagProperties.push(
-      t.objectProperty(
-        t.identifier("pa"),
-        t.objectExpression(
-          node.preserveAttrs.map((name) =>
-            t.objectProperty(
-              t.isValidIdentifier(name)
-                ? t.identifier(name)
-                : t.stringLiteral(name),
-              t.numericLiteral(1),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  if (isHTML) {
-    if (
-      (!meta.hasStatefulTagParams &&
-        !meta.hasFunctionEventHandlers &&
-        (meta.hasComponentBrowser || !meta.hasComponent)) ||
-      isPreserved(path)
-    ) {
-      const dataMarkoArgs = [t.identifier("out"), file._componentDefIdentifier];
-
-      if (tagProperties.length) {
-        // TODO we should pre evaluate this if it is static.
-        dataMarkoArgs.push(t.objectExpression(tagProperties));
-      }
-
-      if (hasUserKey(path) || (key && node.isPreserved)) {
-        if (dataMarkoArgs.length === 2) {
-          dataMarkoArgs.push(t.numericLiteral(0));
-        }
-
-        dataMarkoArgs.push(key);
-      }
-
-      if (dataMarkoArgs.length > 2) {
-        dataMarko = t.callExpression(
-          importDefault(
-            file,
-            "marko/src/runtime/html/helpers/data-marko.js",
-            "marko_props",
-          ),
-          dataMarkoArgs,
-        );
-      }
-    }
-  }
-
-  const translatedAttrs = translateAttributes(path, path.get("attributes"));
-  let isSelfClosing = false;
-  let openTagEnding = ">";
-
-  if (t.isStringLiteral(name)) {
-    if (
-      tagDef &&
-      tagDef.htmlType &&
-      (tagDef.htmlType === "svg" || tagDef.htmlType === "math")
-    ) {
-      if (!body.length) {
-        isSelfClosing = true;
-        openTagEnding = " />";
-      }
-    } else if (SELF_CLOSING.voidElements.indexOf(name.value) !== -1) {
-      isSelfClosing = true;
-    }
-  }
-
-  const isEmpty = isSelfClosing || !body.length;
-  let writeStartNode = normalizeTemplateString`<${name}${dataMarko}${translatedAttrs}${openTagEnding}`;
-
-  writeStartNode = withPreviousLocation(
-    isEmpty && !isSelfClosing
-      ? write`${writeStartNode}</${name}>`
-      : write`${writeStartNode}`,
-    name,
-  );
-
-  if (isNullable) {
-    writeStartNode = t.ifStatement(name, writeStartNode);
-
-    if (!isEmpty) {
-      writeStartNode.alternate = t.expressionStatement(
-        t.callExpression(
-          t.memberExpression(t.identifier("out"), t.identifier("bf")),
-          [
-            normalizeTemplateString`f_${key}`,
-            file._componentInstanceIdentifier,
-            t.numericLiteral(1),
-          ],
-        ),
-      );
-    }
-  }
-
-  if (isEmpty) {
-    path.replaceWith(writeStartNode);
-    return;
-  }
-
-  let needsBlock;
-  for (const childNode of body) {
-    if (t.isVariableDeclaration(childNode)) {
-      if (childNode.kind === "const" || childNode.kind === "let") {
-        needsBlock = true;
-        break;
-      }
-    }
-  }
-
-  let writeEndNode = write`</${name}>`;
-
-  if (isNullable) {
-    writeEndNode = t.ifStatement(
-      name,
-      writeEndNode,
-      t.expressionStatement(
-        t.callExpression(
-          t.memberExpression(t.identifier("out"), t.identifier("ef")),
-          [],
-        ),
-      ),
-    );
-  }
-
-  path.replaceWithMultiple(
-    [writeStartNode]
-      .concat(needsBlock ? t.blockStatement(body) : body)
-      .concat(writeEndNode),
-  );
-}
-
-function isPreserved(path) {
-  let parentTag = path;
-  do {
-    parentTag = parentTag.parentPath.parentPath;
-    if (parentTag.get("isPreserved").node === true) {
-      return true;
-    }
-  } while (t.isMarkoTag(parentTag));
-
-  return false;
-}

package/src/translator/tag/native-tag[vdom]/attributes.js

@@ -1,105 +0,0 @@
-import { types as t } from "@marko/compiler";
-import { importDefault } from "@marko/compiler/babel-utils";
-
-import { evaluateAttr } from "../util";
-
-export default function (path, attrs) {
-  const len = attrs.length;
-  if (len === 0) return t.nullLiteral();
-  if (len === 1 && attrs[0].node.type === "MarkoSpreadAttribute") {
-    return t.callExpression(
-      importDefault(
-        path.hub.file,
-        "marko/src/runtime/vdom/helpers/attrs.js",
-        "marko_attrs",
-      ),
-      [attrs[0].node.value],
-    );
-  }
-
-  if (attrs.some((attr) => attr.node.type === "MarkoSpreadAttribute")) {
-    const attrsObjects = [];
-    let props;
-
-    for (let i = 0; i < len; i++) {
-      const attr = attrs[i];
-      const {
-        node: { name, value },
-      } = attr;
-
-      if (name) {
-        const computed = evaluateAttr(attr);
-        const prop = t.objectProperty(
-          t.stringLiteral(name),
-          computed?.value !== undefined
-            ? t.stringLiteral(computed.value)
-            : value,
-        );
-        if (props) {
-          props.push(prop);
-        } else {
-          attrsObjects.push(t.objectExpression((props = [prop])));
-        }
-      } else {
-        attrsObjects.push(value);
-        props = undefined;
-      }
-    }
-
-    return t.callExpression(
-      importDefault(
-        path.hub.file,
-        "marko/src/runtime/vdom/helpers/merge-attrs.js",
-        "marko_merge_attrs",
-      ),
-      attrsObjects,
-    );
-  }
-
-  const attrValues = new Map();
-  const props = [];
-
-  // Remove duplicate attrs so last one wins.
-  for (let i = len; i--; ) {
-    const attr = attrs[i];
-    const { name, value } = attr.node;
-    if (attrValues.has(name)) continue;
-    const computed = evaluateAttr(attr);
-    attrValues.set(
-      name,
-      computed
-        ? {
-            confident: true,
-            computed: computed.value,
-            value,
-          }
-        : {
-            confident: false,
-            computed: undefined,
-            value,
-          },
-    );
-  }
-
-  for (const [name, { confident, computed, value }] of [
-    ...attrValues,
-  ].reverse()) {
-    if (confident) {
-      if (computed == null || computed === false) {
-        continue;
-      }
-
-      props.push(
-        t.objectProperty(t.stringLiteral(name), t.stringLiteral(computed)),
-      );
-    } else {
-      props.push(t.objectProperty(t.stringLiteral(name), value));
-    }
-  }
-
-  if (props.length) {
-    return t.objectExpression(props);
-  }
-
-  return t.nullLiteral();
-}

package/src/translator/tag/native-tag[vdom]/index.js

@@ -1,189 +0,0 @@
-import { types as t } from "@marko/compiler";
-import {
-  getTagDef,
-  normalizeTemplateString,
-} from "@marko/compiler/babel-utils";
-
-import * as FLAGS from "../../util/runtime-flags";
-import write from "../../util/vdom-out-write";
-import withPreviousLocation from "../../util/with-previous-location";
-import translateAttributes from "./attributes";
-
-const SIMPLE_ATTRS = ["id", "class", "style"];
-
-/**
- * Translates the html streaming version of a standard html element.
- */
-export default function (path, isNullable) {
-  const { node } = path;
-  const {
-    name,
-    key,
-    body: { body },
-  } = node;
-
-  const isEmpty = !body.length;
-  const writeArgs = tagArguments(path, false);
-  let writeStartNode = withPreviousLocation(
-    write(isEmpty ? "e" : "be", ...writeArgs),
-    node.name,
-  );
-
-  if (isNullable) {
-    writeStartNode = t.ifStatement(name, writeStartNode);
-
-    if (!isEmpty) {
-      writeStartNode.alternate = t.expressionStatement(
-        t.callExpression(
-          t.memberExpression(t.identifier("out"), t.identifier("bf")),
-          [
-            normalizeTemplateString`f_${key}`,
-            path.hub.file._componentInstanceIdentifier,
-          ],
-        ),
-      );
-    }
-  }
-
-  if (isEmpty) {
-    path.replaceWith(writeStartNode);
-    return;
-  }
-
-  let writeEndNode = write("ee");
-  if (isNullable) {
-    writeEndNode = t.ifStatement(
-      name,
-      writeEndNode,
-      t.expressionStatement(
-        t.callExpression(
-          t.memberExpression(t.identifier("out"), t.identifier("ef")),
-          [],
-        ),
-      ),
-    );
-  }
-
-  let needsBlock;
-  for (const childNode of body) {
-    if (t.isVariableDeclaration(childNode)) {
-      if (childNode.kind === "const" || childNode.kind === "let") {
-        needsBlock = true;
-        break;
-      }
-    }
-  }
-
-  path.replaceWithMultiple(
-    [writeStartNode]
-      .concat(needsBlock ? t.blockStatement(body) : body)
-      .concat(writeEndNode),
-  );
-}
-
-function isPropertyName({ key }, names) {
-  if (t.isStringLiteral(key)) {
-    return names.includes(key.value);
-  } else if (t.isIdentifier(key)) {
-    return names.includes(key.name);
-  }
-}
-
-function tagArguments(path) {
-  const {
-    hub: { file },
-    node,
-  } = path;
-  const {
-    name,
-    key,
-    body: { body },
-    handlers,
-  } = node;
-  const tagProperties = (path.node.extra && path.node.extra.properties) || [];
-  const attrsObj = translateAttributes(path, path.get("attributes"));
-  let runtimeFlags = 0;
-
-  if (!t.isNullLiteral(attrsObj) && !t.isObjectExpression(attrsObj)) {
-    runtimeFlags |= FLAGS.SPREAD_ATTRS;
-  }
-
-  const writeArgs = [
-    name,
-    attrsObj,
-    key,
-    file._componentInstanceIdentifier,
-    body.length ? t.nullLiteral() : t.numericLiteral(0),
-  ];
-
-  if (node.preserveAttrs) {
-    tagProperties.push(
-      t.objectProperty(
-        t.identifier("pa"),
-        t.objectExpression(
-          node.preserveAttrs.map((name) =>
-            t.objectProperty(
-              t.isValidIdentifier(name)
-                ? t.identifier(name)
-                : t.stringLiteral(name),
-              t.numericLiteral(1),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  if (handlers) {
-    Object.entries(handlers).forEach(
-      ([eventName, { arguments: args, once }]) => {
-        const delegateArgs = [t.stringLiteral(eventName), args[0]];
-
-        // TODO: look into only sending this if once is true.
-        delegateArgs.push(t.booleanLiteral(once));
-
-        if (args.length > 1) {
-          delegateArgs.push(t.arrayExpression(args.slice(1)));
-        }
-
-        // TODO: why do we output eventName twice.
-        tagProperties.push(
-          t.objectProperty(
-            t.stringLiteral(`on${eventName}`),
-            t.callExpression(
-              t.memberExpression(
-                file._componentDefIdentifier,
-                t.identifier("d"),
-              ),
-              delegateArgs,
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  if (
-    t.isObjectExpression(attrsObj) &&
-    attrsObj.properties.every((n) => isPropertyName(n, SIMPLE_ATTRS)) &&
-    !node.preserveAttrs
-  ) {
-    runtimeFlags |= FLAGS.HAS_SIMPLE_ATTRS;
-  }
-
-  const tagDef = getTagDef(path);
-
-  if (tagDef) {
-    const { htmlType } = tagDef;
-    if (htmlType === "custom-element") {
-      runtimeFlags |= FLAGS.IS_CUSTOM_ELEMENT;
-    }
-  }
-
-  writeArgs.push(t.numericLiteral(runtimeFlags));
-
-  if (tagProperties.length) {
-    writeArgs.push(t.objectExpression(tagProperties));
-  }
-  return writeArgs;
-}