marko 6.0.0-next.3.27 → 6.0.0-next.3.29

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.27",
+  "version": "6.0.0-next.3.29",
   "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"
   },