marko 6.0.153 → 6.0.155

package/dist/debug/dom.js

@@ -720,8 +720,8 @@ function walk(startNode, walkCodes, branch) {
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
   let value;
+  let currentMultiplier;
   let storedMultiplier = 0;
-  let currentMultiplier = 0;
   let currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; ) {
     value = walkCodes.charCodeAt(currentWalkIndex++);

package/dist/debug/dom.mjs

@@ -606,8 +606,8 @@ function walk(startNode, walkCodes, branch) {
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
   let value;
+  let currentMultiplier;
   let storedMultiplier = 0;
-  let currentMultiplier = 0;
   let currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; ) {
     value = walkCodes.charCodeAt(currentWalkIndex++);

package/dist/debug/html.js

@@ -782,7 +782,7 @@ function getRegistered(val) {
 function writeRoot(state, root) {
   const { buf } = state;
   const hadBuf = buf.length !== 0;
-  let result = "";
+  let result;
   if (hadBuf) {
     buf.push(",");
   }
@@ -1238,7 +1238,7 @@ function writeSet(state, val, ref) {
   return true;
 }
 function writeArrayBuffer(state, val) {
-  let result = "";
+  let result;
   if (val.byteLength) {
     const view = new Int8Array(val);
     result = hasOnlyZeros(view) ? "new ArrayBuffer(" + val.byteLength + ")" : "new Int8Array(" + typedArrayToInitString(view) + ").buffer";
@@ -1380,7 +1380,6 @@ function writeRequest(state, val, ref) {
   }
   if (val.referrerPolicy) {
     options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0);
-    sep = ",";
   }
   state.buf.push(
     hasBody ? options + "})" : options ? ",{" + options + "})" : ")"
@@ -1402,7 +1401,6 @@ function writeResponse(state, val, ref) {
   state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
   if (headers) {
     options += sep + "headers:{" + headers + "}";
-    sep = ",";
   }
   if (!val.body || val.bodyUsed) {
     state.buf.push(
@@ -3192,7 +3190,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
   }
   const state = getState();
   const branchId = _peek_scope_id();
-  let rendered = false;
+  let rendered;
   let result;
   if (typeof renderer === "string") {
     if (true) {

package/dist/debug/html.mjs

@@ -689,7 +689,7 @@ function getRegistered(val) {
 function writeRoot(state, root) {
   const { buf } = state;
   const hadBuf = buf.length !== 0;
-  let result = "";
+  let result;
   if (hadBuf) {
     buf.push(",");
   }
@@ -1145,7 +1145,7 @@ function writeSet(state, val, ref) {
   return true;
 }
 function writeArrayBuffer(state, val) {
-  let result = "";
+  let result;
   if (val.byteLength) {
     const view = new Int8Array(val);
     result = hasOnlyZeros(view) ? "new ArrayBuffer(" + val.byteLength + ")" : "new Int8Array(" + typedArrayToInitString(view) + ").buffer";
@@ -1287,7 +1287,6 @@ function writeRequest(state, val, ref) {
   }
   if (val.referrerPolicy) {
     options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0);
-    sep = ",";
   }
   state.buf.push(
     hasBody ? options + "})" : options ? ",{" + options + "})" : ")"
@@ -1309,7 +1308,6 @@ function writeResponse(state, val, ref) {
   state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
   if (headers) {
     options += sep + "headers:{" + headers + "}";
-    sep = ",";
   }
   if (!val.body || val.bodyUsed) {
     state.buf.push(
@@ -3099,7 +3097,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
   }
   const state = getState();
   const branchId = _peek_scope_id();
-  let rendered = false;
+  let rendered;
   let result;
   if (typeof renderer === "string") {
     if (true) {

package/dist/dom.js

@@ -447,7 +447,7 @@ function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  let value, currentMultiplier, storedMultiplier = 0, currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; )
     if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32 /* Get */) {
       let node = walker.currentNode;

package/dist/dom.mjs

@@ -336,7 +336,7 @@ function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
 function walkInternal(currentWalkIndex, walkCodes, scope) {
-  let value, storedMultiplier = 0, currentMultiplier = 0, currentScopeIndex = 0;
+  let value, currentMultiplier, storedMultiplier = 0, currentScopeIndex = 0;
   for (; currentWalkIndex < walkCodes.length; )
     if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32 /* Get */) {
       let node = walker.currentNode;

package/dist/html.js

@@ -542,7 +542,7 @@ function getRegistered(val) {
     return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
-  let { buf } = state, hadBuf = buf.length !== 0, result = "";
+  let { buf } = state, hadBuf = buf.length !== 0, result;
   if (hadBuf && buf.push(","), writeProp(state, root, null, "")) {
     let rootRef = state.refs.get(root);
     if (rootRef) {
@@ -836,7 +836,7 @@ function writeSet(state, val, ref) {
   ), writeArray(state, items, arrayRef), state.buf.push(")"), !0;
 }
 function writeArrayBuffer(state, val) {
-  let result = "";
+  let result;
   if (val.byteLength) {
     let view = new Int8Array(val);
     result = hasOnlyZeros(view) ? "new ArrayBuffer(" + val.byteLength + ")" : "new Int8Array(" + typedArrayToInitString(view) + ").buffer";
@@ -887,7 +887,7 @@ function writeRequest(state, val, ref) {
   let options = "";
   val.cache !== "default" && (options += sep + "cache:" + quote(val.cache, 0), sep = ","), val.credentials !== "same-origin" && (options += sep + "credentials:" + quote(val.credentials, 0), sep = ",");
   let headers = stringEntriesToProps(val.headers);
-  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0), sep = ","), state.buf.push(
+  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(
     hasBody ? options + "})" : options ? ",{" + options + "})" : ")"
   ), !0;
 }
@@ -895,7 +895,7 @@ function writeResponse(state, val, ref) {
   let sep = "", options = "";
   val.status !== 200 && (options += "status:" + val.status, sep = ","), val.statusText && (options += sep + "statusText:" + quote(val.statusText, 0), sep = ",");
   let headers = stringEntriesToProps(val.headers);
-  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), !val.body || val.bodyUsed ? state.buf.push(
+  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}"), !val.body || val.bodyUsed ? state.buf.push(
     "new Response" + (options ? "(null,{" + options + "})" : "")
   ) : (state.buf.push("new Response("), state.buf.push(
     (writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")")
@@ -2008,7 +2008,7 @@ var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_I
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered = !1, result;
+  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     if (rendered = !0, _scope_id(), _html(

package/dist/html.mjs

@@ -452,7 +452,7 @@ function getRegistered(val) {
     return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
-  let { buf } = state, hadBuf = buf.length !== 0, result = "";
+  let { buf } = state, hadBuf = buf.length !== 0, result;
   if (hadBuf && buf.push(","), writeProp(state, root, null, "")) {
     let rootRef = state.refs.get(root);
     if (rootRef) {
@@ -746,7 +746,7 @@ function writeSet(state, val, ref) {
   ), writeArray(state, items, arrayRef), state.buf.push(")"), !0;
 }
 function writeArrayBuffer(state, val) {
-  let result = "";
+  let result;
   if (val.byteLength) {
     let view = new Int8Array(val);
     result = hasOnlyZeros(view) ? "new ArrayBuffer(" + val.byteLength + ")" : "new Int8Array(" + typedArrayToInitString(view) + ").buffer";
@@ -797,7 +797,7 @@ function writeRequest(state, val, ref) {
   let options = "";
   val.cache !== "default" && (options += sep + "cache:" + quote(val.cache, 0), sep = ","), val.credentials !== "same-origin" && (options += sep + "credentials:" + quote(val.credentials, 0), sep = ",");
   let headers = stringEntriesToProps(val.headers);
-  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0), sep = ","), state.buf.push(
+  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(
     hasBody ? options + "})" : options ? ",{" + options + "})" : ")"
   ), !0;
 }
@@ -805,7 +805,7 @@ function writeResponse(state, val, ref) {
   let sep = "", options = "";
   val.status !== 200 && (options += "status:" + val.status, sep = ","), val.statusText && (options += sep + "statusText:" + quote(val.statusText, 0), sep = ",");
   let headers = stringEntriesToProps(val.headers);
-  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}", sep = ","), !val.body || val.bodyUsed ? state.buf.push(
+  return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:{" + headers + "}"), !val.body || val.bodyUsed ? state.buf.push(
     "new Response" + (options ? "(null,{" + options + "})" : "")
   ) : (state.buf.push("new Response("), state.buf.push(
     (writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")")
@@ -1918,7 +1918,7 @@ var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_I
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered = !1, result;
+  let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     if (rendered = !0, _scope_id(), _html(

package/dist/translator/index.js

@@ -9388,7 +9388,7 @@ function createSources(state, param) {
   return { state, param };
 }
 function compareSources(a, b) {
-  let delta = 0;
+  let delta;
   if (a.param) {
     if (!b.param) return 1;
     if (delta = compareReferences(a.param, b.param)) return delta;
@@ -9775,21 +9775,21 @@ function findClosestReference(from, refs) {
       return from;
     }
     for (const ref of refs) {
-      const closest = findClosestUpstream(from, ref);
-      if (closest) return closest;
+      const closest2 = findClosestUpstream(from, ref);
+      if (closest2) return closest2;
     }
   } else {
-    const closest = findClosestUpstream(from, refs);
-    if (closest) return closest;
+    const closest2 = findClosestUpstream(from, refs);
+    if (closest2) return closest2;
   }
 }
 function findClosestUpstream(from, to) {
-  let closest = from;
+  let closest2 = from;
   do {
-    if (closest === to) {
-      return closest;
+    if (closest2 === to) {
+      return closest2;
     }
-  } while (closest = closest.upstreamAlias);
+  } while (closest2 = closest2.upstreamAlias);
 }
 function getRootBindings(reads) {
   let rootRefs;
@@ -12396,22 +12396,13 @@ var attribute_tag_default = {
 // src/translator/visitors/tag/custom-tag.ts
 var import_compiler61 = require("@marko/compiler");
 var import_babel_utils49 = require("@marko/compiler/babel-utils");
+var import_fastest_levenshtein = require("fastest-levenshtein");
 var import_path4 = __toESM(require("path"));
 var custom_tag_default = {
   analyze: {
     enter(tag) {
       const templateFile = (0, import_babel_utils49.getTagTemplate)(tag);
-      if (!templateFile) {
-        const tagName = getTagName(tag);
-        if (tagName && tag.scope.hasBinding(tagName)) {
-          throw tag.get("name").buildCodeFrameError(
-            `Local variables must be in a [dynamic tag](https://markojs.com/docs/reference/language#dynamic-tags) unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`
-          );
-        }
-        throw tag.get("name").buildCodeFrameError(
-          `Unable to find entry point for [custom tag](https://markojs.com/docs/reference/custom-tag#relative-custom-tags) \`<${tagName}>\`.`
-        );
-      }
+      if (!templateFile) throw tagNotFoundError(tag);
       (0, import_babel_utils49.assertAttributesOrSingleArg)(tag);
       const childFile = (0, import_babel_utils49.loadFileForTag)(tag);
       if (!childFile) {
@@ -12542,18 +12533,29 @@ function getTagRelativePath(tag) {
   } else if (node.extra?.tagNameImported) {
     relativePath = node.extra.tagNameImported;
   }
-  if (!relativePath) {
-    const tagName = getTagName(tag);
-    if (tagName && tag.scope.hasBinding(tagName)) {
-      throw tag.get("name").buildCodeFrameError(
-        `Local variables must be in a [dynamic tag](https://markojs.com/docs/reference/language#dynamic-tags) unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`
-      );
-    }
-    throw tag.get("name").buildCodeFrameError(
-      `Unable to find entry point for [custom tag](https://markojs.com/docs/reference/custom-tag#relative-custom-tags) \`<${tagName}>\`.`
+  if (!relativePath) throw tagNotFoundError(tag);
+  return relativePath;
+}
+function tagNotFoundError(tag) {
+  const tagName = getTagName(tag);
+  if (tagName && tag.scope.hasBinding(tagName)) {
+    return tag.get("name").buildCodeFrameError(
+      `Local variables must be in a [dynamic tag](https://markojs.com/docs/reference/language#dynamic-tags) unless they are PascalCase. Use \`<\${${tagName}}/>\` or rename to \`${tagName.charAt(0).toUpperCase() + tagName.slice(1)}\`.`
     );
   }
-  return relativePath;
+  let didYouMean = "";
+  if (tagName) {
+    const closestTag = (0, import_fastest_levenshtein.closest)(
+      tagName,
+      Object.keys(tag.state.file.___taglibLookup.merged.tags)
+    );
+    if ((0, import_fastest_levenshtein.distance)(tagName, closestTag) < 4) {
+      didYouMean = ` Did you mean \`<${closestTag}>\`?`;
+    }
+  }
+  return tag.get("name").buildCodeFrameError(
+    `Unable to find entry point for [custom tag](https://markojs.com/docs/reference/custom-tag#relative-custom-tags) \`<${tagName}>\`.${didYouMean}`
+  );
 }
 function importOrSelfReferenceName(file, request, name2, nameHint) {
   if (isCircularRequest(file, request)) {

package/dist/translator/util/known-tag.d.ts

@@ -21,6 +21,5 @@ declare module "@marko/compiler/dist/types" {
 export declare function knownTagAnalyze(tag: t.NodePath<t.MarkoTag>, contentSection: Section, propTree: BindingPropTree | undefined): void;
 export declare function knownTagTranslateHTML(tag: t.NodePath<t.MarkoTag>, tagIdentifier: t.Expression, contentSection: Section, propTree: BindingPropTree | undefined): void;
 export declare function knownTagTranslateDOM(tag: t.NodePath<t.MarkoTag>, propTree: BindingPropTree | undefined, getBindingIdentifier: (binding: Binding, preferedName?: string) => t.Identifier, callSetup: (section: Section, childBinding: Binding) => void): void;
-export declare function getTagRelativePath(tag: t.NodePath<t.MarkoTag>): string;
 export declare function finalizeKnownTags(section: Section): void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.153",
+  "version": "6.0.155",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -39,6 +39,7 @@
     "dist",
     "tags",
     "index.d.ts",
+    "translator.js",
     "tags-html.d.ts",
     "!**/meta.*.json",
     "!**/__tests__",
@@ -48,8 +49,9 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.58",
+    "@marko/compiler": "^5.39.60",
     "csstype": "^3.2.3",
+    "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "engines": {

package/translator.js

@@ -0,0 +1,8 @@
+/**
+ * This file exists for tools which do not support the
+ * package.json `exports` field (eg old versions of jest).
+ *
+ * This allows `require("marko/translator")` without issues
+ * in those environments.
+ */
+module.exports = require("./dist/translator");