@vesk/compiler 0.2.28 → 0.2.30

package/dist/client-codegen.d.ts

@@ -48,7 +48,9 @@ export declare function compileClient(source: string, _componentName: string | n
  * `resolveComponentName`, so callers don't need a second full parse just
  * to learn the name.
  */
-export declare function compileClientBoth(source: string, _componentName: string | null, sourcePath?: string): {
+export declare function compileClientBoth(source: string, _componentName: string | null, sourcePath?: string, opts?: {
+    skipHyd?: boolean;
+}): {
     comp: string;
     hyd: string;
     name: string | null;

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,EASjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAyCxD,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,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;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;AAmjDD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAgID,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAqED,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,CAAA;CAAO,GAAG,MAAM,CAO9O;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAwBxJ;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,EASjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAyCxD,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,CAwGlI;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAU5E;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;AAknDD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAe3C;AAgID,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAqED,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,CAAA;CAAO,GAAG,MAAM,CAO9O;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,CAAA;CAAE,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA0BpD;AAED,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/client-codegen.js

@@ -383,8 +383,9 @@ function emitNode(ctx, node, tracked, effectsVar, parentVar, compPrefix = '__com
         if (ctx.hydrate) {
             ctx.push(`if (props.children !== undefined && props.children !== null) {`);
             ctx.push(`  if (typeof props.children === 'function') {`);
-            ctx.push(`    const __child = props.children(${ctx.walker});`);
-            ctx.push(`    if (__child && typeof __child.then === 'function') __pendingChild = __child.then(() => $mount || $root);`);
+            ctx.push(`    const __slot = createLayoutSlot(${ctx.walker}, ${parentVar});`);
+            ctx.push(`    const __child = props.children(__slot.walker);`);
+            ctx.push(`    if (__child && typeof __child.then === 'function') __pendingChild = __slot.track(__child);`);
             ctx.push(`  } else {`);
             ctx.push(`    ${parentVar}.appendChild(props.children);`);
             ctx.push(`  }`);
@@ -493,7 +494,77 @@ function emitStatic(ctx, node, tracked, effectsVar) {
     let residueBefore = 0;
     for (const child of children) {
         let childVar;
-        if (singleReactiveText && child instanceof DynamicBinding && child.kind === 'text') {
+        // Hydrate mode: pure static subtree children of a claimed element are already
+        // captured in __vsk_ssrEls. Retrieve them instead of claiming via nextElement
+        // (which would miss because SSR emits no marker for static children of dynamic parents).
+        const isPureStaticChild = ctx.hydrate && child instanceof StaticNode && isStaticIR(child.children);
+        if (isPureStaticChild) {
+            const ssrEl = `${el}.__vsk_ssrEls[${residueBefore}]`;
+            childVar = ssrEl;
+            // Process dynamic attributes on the retrieved SSR element
+            const dynAttrs = [];
+            const staticChildren = [];
+            for (const c of child.children) {
+                if (c instanceof DynamicBinding && c.kind === 'attribute') {
+                    dynAttrs.push(c);
+                }
+                else {
+                    staticChildren.push(c);
+                }
+            }
+            for (const attr of dynAttrs) {
+                const target = attr.target || '';
+                const isEvent = target.startsWith('on') && target.length > 2;
+                if (target === 'ref') {
+                    const expr = transformTracked(attr.expression, tracked);
+                    ctx.push(`(${expr})(${ssrEl});`);
+                }
+                else if (isEvent) {
+                    const eventName = target.slice(2).toLowerCase();
+                    const handler = transformTracked(attr.expression, tracked);
+                    if (NON_BUBBLING_EVENTS.has(eventName)) {
+                        ctx.directEvents.add(eventName);
+                        ctx.push(`${ssrEl}.addEventListener(${JSON.stringify(eventName)}, ${handler});`);
+                    }
+                    else {
+                        const prop = `__evh_${eventName}`;
+                        ctx.delegatedEvents.add(eventName);
+                        ctx.push(`${ssrEl}.${prop} = ${handler};`);
+                    }
+                    ctx.push(`${ssrEl}.setAttribute('data-vsk-ev', '');`);
+                }
+                else if (target === 'style') {
+                    const expr = transformTracked(attr.expression, tracked);
+                    const eff = `effect(() => { applyStyle(${ssrEl}, ${expr}); })`;
+                    if (effectsVar) {
+                        ctx.push(`${effectsVar}.push(${eff});`);
+                    }
+                    else {
+                        ctx.effects.push(`${eff};`);
+                    }
+                }
+                else {
+                    const expr = transformTracked(attr.expression, tracked);
+                    const useProp = PROPERTY_ATTRS[node.tag]?.has(target);
+                    const eff = useProp
+                        ? `effect(() => { ${ssrEl}.${target} = ${expr}; })`
+                        : `effect(() => { const __v = ${expr}; if (__v != null && __v !== false) ${ssrEl}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
+                    if (effectsVar) {
+                        ctx.push(`${effectsVar}.push(${eff});`);
+                    }
+                    else {
+                        ctx.effects.push(`${eff};`);
+                    }
+                }
+            }
+            // The subtree is fully static (isStaticIR), so it carries no dynamic
+            // attributes, events, or text — every descendant is already present in
+            // the SSR element. Re-emitting fresh text nodes here would append
+            // duplicates after the SSR text (the SSR <h1> "compiler is the
+            // product." regression). Keep the element as-is and don't recurse.
+            childVar = ssrEl;
+        }
+        else if (singleReactiveText && child instanceof DynamicBinding && child.kind === 'text') {
             childVar = emitDynamicBinding(ctx, child, tracked, effectsVar, `${el}.__vsk_ssrText`);
         }
         else {
@@ -2180,7 +2251,7 @@ function emitClientFromIR(ir, options) {
     if (options.hydrate && ir.components.some(c => hasKeyedMap(c.body)))
         runtimeNames.push('reconcileHydrated');
     if (options.hydrate) {
-        const hydrateNames = ['hydrate', 'hydrateViewport', 'hydrateIdle', 'hydrateOnInteraction', 'needsHydration', 'createHydrateWalker', 'collectVskMarkers', 'reactiveProps'];
+        const hydrateNames = ['hydrate', 'hydrateViewport', 'hydrateIdle', 'hydrateOnInteraction', 'needsHydration', 'createHydrateWalker', 'collectVskMarkers', 'reactiveProps', 'createLayoutSlot'];
         for (const name of hydrateNames) {
             if (!runtimeNames.includes(name))
                 runtimeNames.push(name);
@@ -2227,14 +2298,14 @@ export function compileClient(source, _componentName, options = {}) {
  * `resolveComponentName`, so callers don't need a second full parse just
  * to learn the name.
  */
-export function compileClientBoth(source, _componentName, sourcePath) {
+export function compileClientBoth(source, _componentName, sourcePath, opts) {
     const ast = parse(source, sourcePath ? { filename: sourcePath } : {});
     // Downstream type-stripping mutates AST nodes in place (stripTsTypes),
     // so each emit mode needs its own tree. Cloning is far cheaper than the
     // second full acorn+TS parse this replaces.
-    const hydAst = structuredClone(ast);
+    const hydAst = opts?.skipHyd ? null : structuredClone(ast);
     const ir = generateIR(ast, source, sourcePath);
-    const irHyd = generateIR(hydAst, source, sourcePath);
+    const irHyd = opts?.skipHyd ? null : generateIR(hydAst, source, sourcePath);
     const defaultComp = ir.components.find((c) => c.defaultExport);
     let name = null;
     if (defaultComp)
@@ -2249,8 +2320,11 @@ export function compileClientBoth(source, _componentName, sourcePath) {
     // Comp and hyd land in the same scoped file block, so they share one
     // allocator: hyd continues after the names comp already consumed.
     const alloc = nameAllocFor(sourcePath);
+    const comp = emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc });
+    if (opts?.skipHyd)
+        return { comp, hyd: '', name };
     return {
-        comp: emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc }),
+        comp,
         hyd: emitClientFromIR(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc }),
         name,
     };

package/dist/server-jsgen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAAkG,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAmDrK,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAqDjJ;AAkXD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAqD1F;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE,CA4BzE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAYhG"}
+{"version":3,"file":"server-jsgen.d.ts","sourceRoot":"","sources":["../src/server-jsgen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAOzE,OAAO,EAAkG,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAmDrK,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,OAAe,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CA2DjJ;AAkXD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAqD1F;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE,CA4BzE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAYhG"}

package/dist/server-jsgen.js

@@ -48,7 +48,10 @@ export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
     if (node instanceof TextNode) {
         if (!node.value)
             return '';
-        return `__out.push(${JSON.stringify(node.value)});`;
+        // The JSX parser entity-decodes text (`&lt;style&gt;` -> `<style>`), so the
+        // decoded value must be re-escaped for HTML text context. Emitting it raw
+        // would turn &lt;` escapes into real start tags and break the parse.
+        return `__out.push(${JSON.stringify(escapeHtml(node.value))});`;
     }
     if (node instanceof DynamicBinding)
         return dynamicBindingToJS(node, tracked);
@@ -105,8 +108,10 @@ export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
     }
     if (node instanceof RuntimeStatement)
         return semicolonizeStatement(transformTracked(node, tracked || new Map()));
-    if (node instanceof SlotNode)
-        return `__out.push(props.children || '');`;
+    if (node instanceof SlotNode) {
+        const sid = `s${nextVskId()}`;
+        return `__out.push('<!--vsk-slot:${sid}-->');__out.push(props.children || '');__out.push('<!--vsk-slot-end:${sid}-->');`;
+    }
     if (node instanceof PropSlotRender)
         return `__out.push(props.${node.propName} || '');`;
     if (node instanceof PropSlot)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "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.28",
+    "@vesk/types": "^0.2.30",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",