@vesk/compiler 0.2.8 → 0.2.9

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,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAuCxD,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;AAoBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAqjCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AA2DD,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,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBnI;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,EAOjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAwCxD,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;AAoBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;AAqjCD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AA2HD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAoED,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,CAAA;CAAO,GAAG,MAAM,CAOnN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAqBnI;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -7,6 +7,7 @@ import { parse } from '@vesk/compiler/src/parser';
 import { generateIR } from '@vesk/compiler/src/ir-generator';
 import { transformTopLevelForActions } from '@vesk/compiler/src/actions';
 import { extractRuntimeNames } from '@vesk/compiler/src/server-utils';
+import { importBindingPairs } from '@vesk/compiler/src/module-imports';
 import { stripTrackGeneric } from '@vesk/compiler/src/scan';
 import { inlineMdImportsFrom } from '@vesk/compiler/src/md-inline';
 import { stripTsTypes, hasTsSyntax } from '@vesk/compiler/src/strip-ts';
@@ -1532,7 +1533,16 @@ function emitClientFromIR(ir, options) {
             runtimeNames.push(name);
         }
     }
-    const runtimeImport = `import { ${runtimeNames.join(', ')} } from '@vesk/runtime';`;
+    // A name the file already binds via its own imports (e.g. a local module that
+    // exports its own `effect`) shadows the runtime binding — never inject a
+    // duplicate `import { x } from '@vesk/runtime'`. Mirrors SSR, so the two agree.
+    const boundLocally = new Set();
+    for (const imp of ir.imports) {
+        for (const pair of importBindingPairs(imp))
+            boundLocally.add(pair.local);
+    }
+    const shadowedRuntimeNames = runtimeNames.filter(n => !boundLocally.has(n));
+    const runtimeImport = `import { ${shadowedRuntimeNames.length > 0 ? shadowedRuntimeNames.join(', ') : 'destroy_block'} } from '@vesk/runtime';`;
     const moduleCode = `
 ${runtimeImport}
 ${importLines}

package/dist/ir-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAoBP,MAAM,uBAAuB,CAAC;AA+I/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AAmsBD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CA0N3D"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAoBP,MAAM,uBAAuB,CAAC;AAgJ/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AAuxBD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAiO3D"}

package/dist/ir-generator.js

@@ -4,6 +4,7 @@ import { createBaseParser } from '@vesk/compiler/src/parser';
 import { skipWhitespace, findBalancedEnd, splitTopLevel, startsWithIdentifier, stripDeclKeyword, isWhitespaceChar, collapseNewlineWhitespace } from '@vesk/compiler/src/scan';
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
 import { stripTypeImport } from '@vesk/compiler/src/vsk-imports';
+import { importBindingPairs } from '@vesk/compiler/src/module-imports';
 import { collectCalledIdentifiers, extractImportNames, importModuleTarget } from '@vesk/compiler/src/tokens';
 let __vskAnnotations = [];
 function parseExprNode(text) {
@@ -89,11 +90,11 @@ function componentUsesFetch(nodes) {
                 return true;
         }
         else if (node instanceof RuntimeStatement) {
-            if (node.raw.includes('useFetch('))
+            if (node.raw.includes('useFetch(') || node.raw.includes('useFetch.'))
                 return true;
         }
         else if (node instanceof DynamicBinding) {
-            if (node.expression.raw.includes('useFetch('))
+            if (node.expression.raw.includes('useFetch(') || node.expression.raw.includes('useFetch.'))
                 return true;
         }
         else if (node instanceof MapRegion) {
@@ -467,6 +468,32 @@ function processJSXChildren(source, children) {
                 result.push(...processJSXChildren(source, [c]));
             i++;
         }
+        else if (child.type === 'ForOfStatement') {
+            let alternate = [];
+            let consumed = 1;
+            const emptyText = children[i + 1];
+            const emptyContainer = children[i + 2];
+            if (emptyText && emptyText.type === 'JSXText' &&
+                ['#empty', 'empty'].includes(emptyText.value.trim()) &&
+                emptyContainer && emptyContainer.type === 'JSXExpressionContainer' &&
+                emptyContainer.expression.type !== 'JSXEmptyExpression') {
+                alternate = exprToIR(source, emptyContainer.expression);
+                consumed = 3;
+            }
+            result.push(...processForStatement(source, child, alternate));
+            i += consumed;
+            continue;
+        }
+        else if (child.type === 'IfStatement' || child.type === 'ForStatement' ||
+            child.type === 'ForInStatement' ||
+            child.type === 'WhileStatement' || child.type === 'DoWhileStatement' ||
+            child.type === 'SwitchStatement' || child.type === 'TryStatement' ||
+            child.type === 'VariableDeclaration' || child.type === 'ExpressionStatement' ||
+            child.type === 'ReturnStatement' || child.type === 'WithStatement' ||
+            child.type === 'LabeledStatement') {
+            result.push(...processStatementModeBody(source, [child]));
+            i++;
+        }
         else {
             i++;
         }
@@ -509,6 +536,30 @@ function exprToIR(source, expr) {
     }
     return [new DynamicBinding(toExpression(source, expr))];
 }
+/**
+ * True when an `ExpressionStatement` expression is a pure value that should
+ * render as output (a bare reference, member access, literal, template,
+ * conditional, etc.) rather than a side-effecting statement (call, assignment,
+ * update, `new`, `await`, `yield`, tagged template, `delete`/`void`). Side
+ * effects stay as runtime statements; pure values become dynamic bindings.
+ */
+function isRenderableExpression(expr) {
+    const t = expr.type;
+    if (t === 'CallExpression' || t === 'NewExpression' ||
+        t === 'AssignmentExpression' || t === 'UpdateExpression' ||
+        t === 'AwaitExpression' || t === 'YieldExpression' ||
+        t === 'TaggedTemplateExpression' || t === 'ImportExpression' ||
+        t === 'MetaProperty') {
+        return false;
+    }
+    if (t === 'UnaryExpression') {
+        return expr.operator !== 'delete' && expr.operator !== 'void';
+    }
+    if (t === 'SequenceExpression') {
+        return isRenderableExpression(expr.expressions[expr.expressions.length - 1]);
+    }
+    return true;
+}
 function processJSXCallbackBody(source, body) {
     if (body.type === 'JSXElement')
         return processJSXElement(source, body);
@@ -606,12 +657,17 @@ function buildGuardChain(source, guardClauses, mainReturn) {
         const guard = guardClauses[i];
         const condExpr = toExpression(source, guard.test);
         const consequent = [];
-        if (guard.consequent.type === 'ReturnStatement' && guard.consequent.argument) {
-            if (guard.consequent.argument.type === 'JSXElement') {
-                consequent.push(...processJSXElement(source, guard.consequent.argument));
+        const guardReturn = getReturnArgument(guard.consequent);
+        if (guardReturn) {
+            if (guardReturn.type === 'JSXElement') {
+                consequent.push(...processJSXElement(source, guardReturn));
+            }
+            else if (guardReturn.type === 'JSXFragment') {
+                for (const c of guardReturn.children)
+                    consequent.push(...processJSXChildren(source, [c]));
             }
             else {
-                consequent.push(new DynamicBinding(toExpression(source, guard.consequent.argument)));
+                consequent.push(new DynamicBinding(toExpression(source, guardReturn)));
             }
         }
         currentAlternate = [new OpaqueDynamicRegion(condExpr, consequent, currentAlternate)];
@@ -655,7 +711,24 @@ function hasJSXInSubtree(node) {
     return false;
 }
 function isGuardClause(node) {
-    return node.type === 'IfStatement' && node.consequent.type === 'ReturnStatement' && hasJSXInSubtree(node.consequent);
+    return (node.type === 'IfStatement' &&
+        !node.alternate &&
+        getReturnArgument(node.consequent) !== null &&
+        hasJSXInSubtree(node.consequent));
+}
+/**
+ * Returns the `return` argument of a statement that represents an early
+ * return — either a bare `ReturnStatement` or a `BlockStatement` wrapping a
+ * single `ReturnStatement`. Returns `null` when the statement is not such a
+ * return (including `return null` / `return;`, whose argument is absent).
+ */
+function getReturnArgument(node) {
+    if (node.type === 'ReturnStatement')
+        return node.argument ?? null;
+    if (node.type === 'BlockStatement' && node.body.length === 1 && node.body[0].type === 'ReturnStatement') {
+        return node.body[0].argument ?? null;
+    }
+    return null;
 }
 function isStatementMode(bodyStmts) {
     if (bodyStmts.some((s) => s.type === 'JSXElement' || s.type === 'JSXExpressionContainer' || s.type === 'JSXFragment'))
@@ -842,6 +915,16 @@ function processStatementModeBody(source, bodyStmts) {
         else if (stmt.type === 'ForStatement') {
             nodes.push(...processForStatement(source, stmt));
         }
+        else if (stmt.type === 'ExpressionStatement') {
+            if (isRenderableExpression(stmt.expression)) {
+                nodes.push(...exprToIR(source, stmt.expression));
+            }
+            else {
+                const raw = getSource(source, stmt);
+                if (raw)
+                    nodes.push(new RuntimeStatement(raw, stmt, source));
+            }
+        }
         else if (stmt.type === 'ClassDeclaration') {
             throw VeskError.classDecl();
         }
@@ -1161,7 +1244,15 @@ export function generateIR(ast, source) {
             for (const n of extractImportNames(imp))
                 existing.add(n);
         }
-        const missing = [...usedFunctions].filter(f => !existing.has(f));
+        // A name already bound by the file's own imports (any target — including a
+        // local module with the same export) wins; never auto-import a duplicate
+        // binding. Mirrors client shadowing so SSR and client agree.
+        const boundLocally = new Set();
+        for (const imp of imports) {
+            for (const pair of importBindingPairs(imp))
+                boundLocally.add(pair.local);
+        }
+        const missing = [...usedFunctions].filter(f => !existing.has(f) && !boundLocally.has(f));
         if (missing.length > 0) {
             imports.push(`import { ${missing.join(', ')} } from '@vesk/runtime';`);
         }

package/dist/module-imports.d.ts

@@ -0,0 +1,51 @@
+/**
+ * AST-driven extraction of the value bindings introduced by one import
+ * statement (`import { a as b } from 'm'` → `[{ local: 'b', imported: 'a' }]`;
+ * `import X from 'm'` → `[{ local: 'X', imported: 'default' }]`;
+ * `import * as X from 'm'` → `[{ local: 'X', imported: '*' }]`). Type-only
+ * specifiers are skipped. Side-effect imports return `[]`.
+ */
+export declare function importBindingPairs(imp: string): Array<{
+    local: string;
+    imported: string;
+}>;
+/** Local binding names imported from non-runtime, non-`.vsk` modules. */
+export declare function localValueImportNames(importStrs: string[]): string[];
+/** True when an import line should be SSR-loaded (non-runtime, non-empty, non-`.vsk`). */
+export declare function isLocalValueImport(imp: string): boolean;
+/**
+ * Loads every local value import and merges its exports into `__vesk` so SSR
+ * component bodies can reference them. Pure side-effect imports (`import './x'`)
+ * are also resolved and executed so their module-level setup runs client AND
+ * server. Resolution is relative to `sourcePath` (the importing `.vsk` file).
+ *
+ * Best-effort: unresolvable/unloadable modules warn and are skipped, matching
+ * how unresolvable `.vsk` imports are handled. Unsupported ESM constructs
+ * (import.meta/top-level await) THROW a specific error — loading them would
+ * silently yield `undefined` at render.
+ */
+export declare function applyLocalModuleImports(__vesk: Record<string, unknown>, importStrs: string[], sourcePath: string | undefined): void;
+/**
+ * Loads (and caches) a module's export object. Cache entries track both the
+ * module's own mtime and the mtimes of everything it transitively resolved,
+ * so a change to any dependency invalidates every module that pulls it in.
+ * Builtin markers load through Node and are cached separately (never stale).
+ */
+export declare function loadSsrModule(absPath: string): Record<string, unknown> | null;
+/**
+ * Resolves a specifier to an absolute file path (or a `BUILTIN_PREFIX` marker
+ * for Node builtins). Relative/absolute localities use extension probing;
+ * bare specifiers (`npm-package`, `pkg/subpath`, `node:fs`, `fs`) prefer
+ * Node's own resolver — which understands `exports` maps, conditions, scoped
+ * packages and builtins — and fall back to a `node_modules` walk-up.
+ *
+ * Every resolved file path is normalized through `realpathSync` so two
+ * specifiers pointing at the same physical file (e.g. pnpm/yarn symlinked
+ * `node_modules`) share one cache entry and one module instance.
+ */
+export declare function resolveSsrModule(specifier: string, fromDir: string): string | null;
+/** Rewrites an ESM program body (imports/exports removed) into CJS statements. */
+export declare function esmToCjs(body: Array<{
+    type: string;
+} & Record<string, unknown>>): string;
+//# sourceMappingURL=module-imports.d.ts.map

package/dist/module-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-imports.d.ts","sourceRoot":"","sources":["../src/module-imports.ts"],"names":[],"mappings":"AAmGA;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgC1F;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQpE;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,IAAI,CAuBN;AAiBD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAqD7E;AAqJD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyBlF;AAoJD,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAiGxF"}