marko 6.0.0-next.3.26 → 6.0.0-next.3.28

package/dist/html.js

@@ -32,6 +32,7 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
+  debug: () => debug,
   dynamicTagArgs: () => dynamicTagArgs,
   dynamicTagInput: () => dynamicTagInput,
   ensureScopeWithId: () => ensureScopeWithId,
@@ -435,7 +436,11 @@ var { hasOwnProperty } = {}, Generator = function* () {
   }
   init = "";
   assigns = "";
-}, Serializer = class {
+};
+function debug(obj, file, loc, vars) {
+  return obj;
+}
+var Serializer = class {
   #state = new State();
   get flushed() {
     return this.#state.flushed;
@@ -562,7 +567,7 @@ function writeSymbol(state, val, parent, accessor) {
 function writeUnknownSymbol(state) {
   return state.buf.push("Symbol()"), !0;
 }
-function writeNever() {
+function writeNever(state, val, ref) {
   return !1;
 }
 function writeNull(state) {
@@ -1618,7 +1623,7 @@ function escapeAttrValue(str) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s";
+var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
 
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
@@ -1745,8 +1750,10 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     let asyncOut = classAPIOut.beginAsync();
     (boundary.onNext = () => {
       boundary.done && (boundary.signal.aborted ? asyncOut.error(boundary.signal.reason) : queueMicrotask(() => {
-        let { scripts, html } = head = prepareChunk(head);
-        asyncOut.script(scripts), asyncOut.write(html), asyncOut.end(), head.html = head.scripts = "";
+        if (head = prepareChunk(head), boundary.done) {
+          let { scripts, html } = head;
+          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end(), head.html = head.scripts = "";
+        }
       }));
     })();
   },
@@ -1757,6 +1764,9 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       register(id, () => {
       })
     );
+  },
+  registerRenderBody(fn) {
+    register(RENDER_BODY_ID, fn);
   }
 };
 
@@ -1805,16 +1815,17 @@ var ServerRenderResult = class {
         aborted = !0, reason = err, reject && reject(err);
       },
       () => {
-        done = !0, resolve && resolve({ value, done: !value });
+        done = !0, resolve && (resolve({ value, done: !value }), value = "");
       }
     );
     return {
       next() {
+        if (aborted)
+          return Promise.reject(reason);
         if (value) {
           let result = { value, done: !1 };
           return value = "", Promise.resolve(result);
-        }
-        return done ? Promise.resolve({ value: "", done }) : aborted ? Promise.reject(reason) : new Promise(exec);
+        } else return done ? Promise.resolve({ value: "", done }) : new Promise(exec);
       },
       throw(error) {
         return done || aborted || boundary?.abort(error), Promise.resolve({
@@ -1881,7 +1892,7 @@ var ServerRenderResult = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0))));
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : boundary.done && (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0)));
       })();
     });
   }
@@ -1892,14 +1903,9 @@ var ServerRenderResult = class {
       return;
     }
     let { boundary } = head, onNext = boundary.onNext = (write2) => {
-      if (write2 || boundary.done) {
-        if (boundary.signal.aborted) {
-          tick2 || offTick(onNext), onAbort(boundary.signal.reason);
-          return;
-        }
-        head = prepareChunk(head);
-      }
-      if (write2 || boundary.done) {
+      if (boundary.signal.aborted)
+        tick2 || offTick(onNext), boundary.onNext = NOOP2, onAbort(boundary.signal.reason);
+      else if ((write2 || boundary.done) && (head = prepareChunk(head)), write2 || boundary.done) {
         let html = flushChunk(head, boundary.done);
         html && onWrite(html), boundary.done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
       } else tick2 && (tick2 = !1, queueTick(onNext));
@@ -1913,6 +1919,8 @@ var ServerRenderResult = class {
     return this.#head = null, flushChunk(prepareChunk(head), !0);
   }
 };
+function NOOP2() {
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,
@@ -1930,6 +1938,7 @@ var ServerRenderResult = class {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
+  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/html.mjs

@@ -358,7 +358,11 @@ var { hasOwnProperty } = {}, Generator = function* () {
   }
   init = "";
   assigns = "";
-}, Serializer = class {
+};
+function debug(obj, file, loc, vars) {
+  return obj;
+}
+var Serializer = class {
   #state = new State();
   get flushed() {
     return this.#state.flushed;
@@ -485,7 +489,7 @@ function writeSymbol(state, val, parent, accessor) {
 function writeUnknownSymbol(state) {
   return state.buf.push("Symbol()"), !0;
 }
-function writeNever() {
+function writeNever(state, val, ref) {
   return !1;
 }
 function writeNull(state) {
@@ -1541,7 +1545,7 @@ function escapeAttrValue(str) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s";
+var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
 
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
@@ -1668,8 +1672,10 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
     let asyncOut = classAPIOut.beginAsync();
     (boundary.onNext = () => {
       boundary.done && (boundary.signal.aborted ? asyncOut.error(boundary.signal.reason) : queueMicrotask(() => {
-        let { scripts, html } = head = prepareChunk(head);
-        asyncOut.script(scripts), asyncOut.write(html), asyncOut.end(), head.html = head.scripts = "";
+        if (head = prepareChunk(head), boundary.done) {
+          let { scripts, html } = head;
+          asyncOut.script(scripts), asyncOut.write(html), asyncOut.end(), head.html = head.scripts = "";
+        }
       }));
     })();
   },
@@ -1680,6 +1686,9 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       register(id, () => {
       })
     );
+  },
+  registerRenderBody(fn) {
+    register(RENDER_BODY_ID, fn);
   }
 };
 
@@ -1728,16 +1737,17 @@ var ServerRenderResult = class {
         aborted = !0, reason = err, reject && reject(err);
       },
       () => {
-        done = !0, resolve && resolve({ value, done: !value });
+        done = !0, resolve && (resolve({ value, done: !value }), value = "");
       }
     );
     return {
       next() {
+        if (aborted)
+          return Promise.reject(reason);
         if (value) {
           let result = { value, done: !1 };
           return value = "", Promise.resolve(result);
-        }
-        return done ? Promise.resolve({ value: "", done }) : aborted ? Promise.reject(reason) : new Promise(exec);
+        } else return done ? Promise.resolve({ value: "", done }) : new Promise(exec);
       },
       throw(error) {
         return done || aborted || boundary?.abort(error), Promise.resolve({
@@ -1804,7 +1814,7 @@ var ServerRenderResult = class {
         return reject(new Error("Cannot read from a consumed render result"));
       let { boundary } = head;
       (boundary.onNext = () => {
-        boundary.done && (boundary.signal.aborted ? reject(boundary.signal.reason) : (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0))));
+        boundary.signal.aborted ? (boundary.onNext = NOOP2, reject(boundary.signal.reason)) : boundary.done && (head = prepareChunk(head), boundary.done && resolve(flushChunk(head, !0)));
       })();
     });
   }
@@ -1815,14 +1825,9 @@ var ServerRenderResult = class {
       return;
     }
     let { boundary } = head, onNext = boundary.onNext = (write2) => {
-      if (write2 || boundary.done) {
-        if (boundary.signal.aborted) {
-          tick2 || offTick(onNext), onAbort(boundary.signal.reason);
-          return;
-        }
-        head = prepareChunk(head);
-      }
-      if (write2 || boundary.done) {
+      if (boundary.signal.aborted)
+        tick2 || offTick(onNext), boundary.onNext = NOOP2, onAbort(boundary.signal.reason);
+      else if ((write2 || boundary.done) && (head = prepareChunk(head)), write2 || boundary.done) {
         let html = flushChunk(head, boundary.done);
         html && onWrite(html), boundary.done ? (tick2 || offTick(onNext), onClose()) : tick2 = !0;
       } else tick2 && (tick2 = !1, queueTick(onNext));
@@ -1836,6 +1841,8 @@ var ServerRenderResult = class {
     return this.#head = null, flushChunk(prepareChunk(head), !0);
   }
 };
+function NOOP2() {
+}
 export {
   $global,
   attr,
@@ -1852,6 +1859,7 @@ export {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
+  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/translator/index.js

@@ -542,6 +542,10 @@ var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
   [Math, "Math"],
   [Reflect, "Reflect"]
 ]);
+function toAccess(accessor) {
+  const start = accessor[0];
+  return start === '"' || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
+}
 
 // src/html/writer.ts
 var K_SCOPE_ID = Symbol("Scope ID");
@@ -596,6 +600,7 @@ function escapeAttrValue(str) {
 var prefix = false ? "$compat_" : "$C_";
 var RENDERER_REGISTER_ID = prefix + (false ? "renderer" : "r");
 var SET_SCOPE_REGISTER_ID = prefix + (false ? "setScope" : "s");
+var RENDER_BODY_ID = prefix + (false ? "renderBody" : "b");
 
 // src/html/compat.ts
 var K_TAGS_API_STATE = Symbol();
@@ -1091,6 +1096,7 @@ function startSection(path5) {
     section = extra.section = {
       id: sections.length,
       name: sectionName,
+      loc: sectionNamePath?.node.loc || void 0,
       depth: parentSection ? parentSection.depth + 1 : 0,
       parent: parentSection,
       params: void 0,
@@ -2581,16 +2587,48 @@ function writeHTMLResumeStatements(path5, tagVarIdentifier) {
     }
   }
   if (serializedProperties.length || forceResumeScope(section)) {
-    path5.pushContainer(
-      "body",
-      import_compiler17.types.expressionStatement(
-        callRuntime(
-          "writeScope",
-          scopeIdIdentifier,
-          import_compiler17.types.objectExpression(serializedProperties)
-        )
-      )
+    let writeScope2 = callRuntime(
+      "writeScope",
+      scopeIdIdentifier,
+      import_compiler17.types.objectExpression(serializedProperties)
     );
+    if (!isOptimize()) {
+      let debugVars;
+      forEach(section.bindings, (binding) => {
+        let root = binding;
+        let access = "";
+        while (!root.loc && root.upstreamAlias) {
+          if (root.property !== void 0) {
+            access = toAccess(root.property) + access;
+          }
+          root = root.upstreamAlias;
+        }
+        if (root.loc) {
+          const locStr = import_compiler17.types.stringLiteral(
+            `${root.loc.start.line}:${root.loc.start.column + 1}`
+          );
+          (debugVars ||= []).push(
+            import_compiler17.types.objectProperty(
+              getScopeAccessorLiteral(binding),
+              root !== binding ? import_compiler17.types.arrayExpression([
+                import_compiler17.types.stringLiteral(root.name + access),
+                locStr
+              ]) : locStr
+            )
+          );
+        }
+      });
+      writeScope2 = callRuntime(
+        "debug",
+        writeScope2,
+        import_compiler17.types.stringLiteral(path5.hub.file.opts.filenameRelative),
+        section.loc && section.loc.start.line != null ? import_compiler17.types.stringLiteral(
+          `${section.loc.start.line}:${section.loc.start.column + 1}`
+        ) : import_compiler17.types.numericLiteral(0),
+        debugVars && import_compiler17.types.objectExpression(debugVars)
+      );
+    }
+    path5.pushContainer("body", import_compiler17.types.expressionStatement(writeScope2));
   }
   const resumeClosestBranch2 = !section.isBranch && (section.hasAbortSignal || !!section.closures || !!find(section.bindings, (binding) => binding.type === 1 /* let */));
   if (resumeClosestBranch2) {
@@ -3204,12 +3242,13 @@ function withPreviousLocation(newNode, originalNode) {
 // src/translator/util/references.ts
 var [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
-function createBinding(name2, type, section, upstreamAlias, upstreamExpression, property, declared = false) {
+function createBinding(name2, type, section, upstreamAlias, upstreamExpression, property, loc = null, declared = false) {
   const id = getNextBindingId();
   const binding = {
     id,
     name: name2,
     type,
+    loc,
     section,
     property,
     declared,
@@ -3333,6 +3372,7 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         upstreamAlias,
         upstreamExpression,
         property,
+        lVal.loc,
         true
       );
       trackReferencesForBinding(scope.getBinding(lVal.name));
@@ -3344,7 +3384,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         section,
         upstreamAlias,
         void 0,
-        property
+        property,
+        lVal.loc
       ));
       for (const prop of lVal.properties) {
         if (prop.type === "RestElement") {
@@ -3386,7 +3427,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         section,
         upstreamAlias,
         void 0,
-        property
+        property,
+        lVal.loc
       ));
       let i = -1;
       for (const element of lVal.elements) {
@@ -7930,7 +7972,7 @@ var function_default = {
     const extra = node.extra ??= {};
     const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler47.types.toIdentifier(
       markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
-    ) : markoRoot.node.name : import_compiler47.types.isVariableDeclarator(fn.parent) && import_compiler47.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : "anonymous");
+    ) : markoRoot.node.name : import_compiler47.types.isVariableDeclarator(fn.parent) && import_compiler47.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler47.types.isObjectMethod(node) && import_compiler47.types.isIdentifier(node.key) ? node.key.name : "anonymous");
     if (isMarkoAttribute(markoRoot) && ((0, import_babel_utils37.isNativeTag)(markoRoot.parentPath) && /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))) {
       return;
     }
@@ -7965,6 +8007,7 @@ function isFunction(fn, isStatic2) {
       return isStatic2 && !fn.node.declare;
     case "FunctionExpression":
     case "ArrowFunctionExpression":
+    case "ObjectMethod":
       return true;
     default:
       return false;

package/dist/translator/util/references.d.ts

@@ -15,6 +15,7 @@ export type Binding = {
     id: number;
     name: string;
     type: BindingType;
+    loc: t.SourceLocation | null;
     section: Section;
     serialize: boolean | Set<Binding>;
     aliases: Set<Binding>;
@@ -53,7 +54,7 @@ declare module "@marko/compiler/dist/types" {
     interface FunctionExpressionExtra extends FunctionExtra {
     }
 }
-export declare function createBinding(name: string, type: Binding["type"], section: Section, upstreamAlias?: Binding["upstreamAlias"], upstreamExpression?: Binding["upstreamExpression"], property?: string, declared?: boolean): Binding;
+export declare function createBinding(name: string, type: Binding["type"], section: Section, upstreamAlias?: Binding["upstreamAlias"], upstreamExpression?: Binding["upstreamExpression"], property?: string, loc?: t.SourceLocation | null, declared?: boolean): Binding;
 export declare function trackVarReferences(tag: t.NodePath<t.MarkoTag>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"], upstreamExpression?: Binding["upstreamExpression"]): void;
 export declare function trackParamsReferences(body: t.NodePath<t.MarkoTagBody | t.Program>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"], upstreamExpression?: Binding["upstreamExpression"]): void;
 export declare function setReferencesScope(path: t.NodePath<any>): void;

package/dist/translator/util/sections.d.ts

@@ -10,6 +10,7 @@ export declare enum ContentType {
 export interface Section {
     id: number;
     name: string;
+    loc: t.SourceLocation | undefined;
     depth: number;
     parent: Section | undefined;
     params: undefined | Binding;

package/index.d.ts

@@ -82,7 +82,7 @@ declare global {
       /** Render and attach the template to a DOM node. */
       abstract mount(
         input: Marko.TemplateInput<Input>,
-        reference: ParentNode & Node,
+        reference: Node,
         position?: "afterbegin" | "afterend" | "beforebegin" | "beforeend",
       ): {
         update(input: Marko.TemplateInput<Input>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.26",
+  "version": "6.0.0-next.3.28",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.11",
+    "@marko/compiler": "^5.39.12",
     "csstype": "^3.1.3",
     "magic-string": "^0.30.17"
   },