@vesk/compiler 0.2.61 → 0.2.62

package/dist/client-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAUjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAgJlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAI5E;AAyCD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,EAAE,CAuB9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoBD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AAumED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAmJD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAuED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC5J;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/E;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"client-codegen.d.ts","sourceRoot":"","sources":["../src/client-codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAuB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAGL,cAAc,EAQd,gBAAgB,EAUjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAkGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI1D;AAiDD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAgJlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAI5E;AAyCD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,EAAE,CAuB9F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAY5F;AAoFD,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,SAAS,CAQtE;AA+nED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAmJD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAuED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAOpQ;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAyC5J;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/E;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -406,6 +406,78 @@ export function transformTrackedInit(init, tracked) {
         return init;
     return transformTracked({ raw: init, ast: expr }, tracked);
 }
+/**
+ * Names a body-level `RuntimeStatement` binds (`const list = …`, `let x = …`).
+ * Only top-level `Identifier` declarators count — destructuring patterns are
+ * rare here and a false negative only means we hoist, which is the previous
+ * behaviour.
+ */
+function runtimeDeclaredNames(node) {
+    if (!(node instanceof RuntimeStatement))
+        return [];
+    const stmt = node.ast;
+    if (!stmt || stmt.type !== 'VariableDeclaration' || !stmt.declarations)
+        return [];
+    const out = [];
+    for (const d of stmt.declarations) {
+        if (d.id && d.id.type === 'Identifier' && typeof d.id.name === 'string')
+            out.push(d.id.name);
+    }
+    return out;
+}
+/**
+ * Whether a `TrackDecl` initializer reads any of `names`. Parsed with the vsk
+ * parser (TS generics and `.vsk` syntax included) and walked AST-only — no
+ * regex over source. An unparsable init reports `false`, which keeps the
+ * previous hoist behaviour rather than silently changing emission order.
+ */
+function initReadsAnyOf(init, names) {
+    if (!init || names.size === 0)
+        return false;
+    let expr = null;
+    try {
+        const prog = parse(`(${init})`);
+        expr = prog.body?.[0]?.type === 'ExpressionStatement' ? (prog.body[0].expression ?? null) : null;
+    }
+    catch {
+        return false;
+    }
+    if (!expr)
+        return false;
+    let found = false;
+    const walk = (n) => {
+        if (found || !n || typeof n !== 'object')
+            return;
+        if (Array.isArray(n)) {
+            for (const c of n)
+                walk(c);
+            return;
+        }
+        const t = n.type;
+        if (typeof t !== 'string')
+            return;
+        if (t === 'Identifier') {
+            if (names.has(n.name))
+                found = true;
+            return;
+        }
+        if (t === 'MemberExpression') {
+            const m = n;
+            walk(m.object);
+            // A non-computed property is a field name, not a reference.
+            if (m.computed)
+                walk(m.property);
+            return;
+        }
+        for (const key of Object.keys(n)) {
+            if (key === 'loc' || key === 'range' || key === 'start' || key === 'end')
+                continue;
+            walk(n[key]);
+        }
+    };
+    walk(expr);
+    return found;
+}
 const NON_BUBBLING_EVENTS = new Set([
     'focus', 'blur',
     'mouseenter', 'mouseleave',
@@ -2484,9 +2556,29 @@ function generateComponent(comp, importedNames = new Set(), hydrate = false, asy
     const paramInit = buildParamInit(comp.paramNames, comp.propsAlias);
     if (paramInit)
         ctx.push(indent(paramInit));
-    // Hoist TrackDecls to top to avoid TDZ when Head/effects reference them before declaration
+    // Hoist TrackDecls to top to avoid TDZ when Head/effects reference them before
+    // declaration — BUT a TrackDecl whose initializer reads a binding declared by
+    // an EARLIER body statement must stay in place. Hoisting it turned
+    // `const list = …; const &[sel] = track(list[0])` into
+    // `const sel = track(list[0]); const list = …`, so the client threw
+    // `ReferenceError: Cannot access 'list' before initialization` and the route
+    // rendered the error page after hydration. Source order already satisfies the
+    // Head/effect case, because both are emitted after the statements they read.
+    const deferredTrackDecls = new Set();
+    {
+        const declaredSoFar = new Set();
+        for (const node of comp.body) {
+            if (node instanceof TrackDecl) {
+                if (initReadsAnyOf(node.init, declaredSoFar))
+                    deferredTrackDecls.add(node);
+                continue;
+            }
+            for (const name of runtimeDeclaredNames(node))
+                declaredSoFar.add(name);
+        }
+    }
     for (const node of comp.body) {
-        if (node instanceof TrackDecl) {
+        if (node instanceof TrackDecl && !deferredTrackDecls.has(node)) {
             emitNode(ctx, node, tracked, null);
         }
     }
@@ -2539,8 +2631,14 @@ function generateComponent(comp, importedNames = new Set(), hydrate = false, asy
         }
     }
     for (const node of comp.body) {
-        if (node instanceof TrackDecl)
+        // A TrackDecl that could not be hoisted (its init reads an earlier body
+        // binding) is emitted here, in source order, so the binding it reads is
+        // already initialised.
+        if (node instanceof TrackDecl) {
+            if (deferredTrackDecls.has(node))
+                emitNode(ctx, node, tracked, null);
             continue;
+        }
         const v = emitNode(ctx, node, tracked, null, undefined, '__components', topPendingSkip, topBudget || undefined);
         if (v) {
             if (ctx.hydrate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.61",
+  "version": "0.2.62",
   "type": "module",
   "description": "Vesk compiler — lexer, parser, semantic analysis, IR, codegen",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sveltejs/acorn-typescript": "^1.0.0",
-    "@vesk/types": "^0.2.61",
+    "@vesk/types": "^0.2.62",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",