@vesk/compiler 0.2.25 → 0.2.27

package/dist/module-imports.js

@@ -1,4 +1,4 @@
-import { readFileSync, realpathSync, statSync } from 'node:fs';
+import { readFileSync, existsSync, realpathSync, statSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { dirname, extname, isAbsolute, join, resolve } from 'node:path';
 import { print } from 'esrap';
@@ -644,10 +644,180 @@ function createModuleRequire(fromDir) {
         return loaded;
     };
 }
+const EMPTY_ALIASES = { exact: new Map(), wildcard: [] };
+const ALIAS_CACHE = new Map();
+/** Strips `//` + block comments and trailing commas so a tsconfig.json parses. */
+function parseJsonc(raw) {
+    let out = '';
+    let inString = false;
+    let quote = '';
+    for (let i = 0; i < raw.length; i++) {
+        const ch = raw[i];
+        const next = raw[i + 1];
+        if (inString) {
+            out += ch;
+            if (ch === '\\') {
+                out += next ?? '';
+                i++;
+            }
+            else if (ch === quote) {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            inString = true;
+            quote = ch;
+            out += ch;
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            while (i < raw.length && raw[i] !== '\n')
+                i++;
+            out += '\n';
+            continue;
+        }
+        if (ch === '/' && next === '*') {
+            i += 2;
+            while (i < raw.length && !(raw[i] === '*' && raw[i + 1] === '/'))
+                i++;
+            i++;
+            continue;
+        }
+        out += ch;
+    }
+    return JSON.parse(out.replace(/,\s*([}\]])/g, '$1'));
+}
+/** Nearest `tsconfig.json` at or above `fromDir`, or null. */
+export function findTsconfigPath(fromDir) {
+    let dir = fromDir;
+    for (let depth = 0; depth < 64; depth++) {
+        const st = statOrNull(join(dir, 'tsconfig.json'));
+        if (st && st.isFile())
+            return join(dir, 'tsconfig.json');
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+function buildAliases(tsconfig) {
+    let raw;
+    try {
+        raw = readFileSync(tsconfig, 'utf-8');
+    }
+    catch {
+        return EMPTY_ALIASES;
+    }
+    let parsed = null;
+    try {
+        parsed = parseJsonc(raw);
+    }
+    catch {
+        return EMPTY_ALIASES;
+    }
+    const co = parsed?.compilerOptions;
+    if (!co || typeof co.paths !== 'object' || co.paths === null)
+        return EMPTY_ALIASES;
+    const configDir = dirname(tsconfig);
+    const baseUrl = typeof co.baseUrl === 'string' && co.baseUrl.length > 0 ? resolve(configDir, co.baseUrl) : configDir;
+    const exact = new Map();
+    const wildcard = [];
+    for (const [key, value] of Object.entries(co.paths)) {
+        if (!Array.isArray(value))
+            continue;
+        const targets = value.filter((t) => typeof t === 'string').map((t) => resolve(baseUrl, t));
+        if (targets.length === 0)
+            continue;
+        const star = key.indexOf('*');
+        if (star === -1)
+            exact.set(key, targets);
+        else
+            wildcard.push({ prefix: key.slice(0, star), suffix: key.slice(star + 1), targets });
+    }
+    // Longest prefix first so a specific alias (`@app/`) beats a broad one (`@/`).
+    wildcard.sort((a, b) => b.prefix.length - a.prefix.length);
+    return { exact, wildcard };
+}
+function loadAliases(fromDir) {
+    const tsconfig = findTsconfigPath(fromDir);
+    if (!tsconfig)
+        return EMPTY_ALIASES;
+    const st = statOrNull(tsconfig);
+    if (!st)
+        return EMPTY_ALIASES;
+    const cached = ALIAS_CACHE.get(tsconfig);
+    if (cached && cached.mtimeMs === st.mtimeMs)
+        return cached.aliases;
+    const aliases = buildAliases(tsconfig);
+    if (ALIAS_CACHE.size >= 64)
+        ALIAS_CACHE.clear();
+    ALIAS_CACHE.set(tsconfig, { mtimeMs: st.mtimeMs, aliases });
+    return aliases;
+}
+/**
+ * Resolves a tsconfig-alias specifier (`@/x`, `@app/x`) to an existing file via
+ * the nearest tsconfig's `baseUrl` + `paths`, or null when the specifier is not
+ * aliased or no target exists (caller then falls through to normal resolution).
+ */
+export function resolveAliasModule(spec, fromDir) {
+    const aliases = loadAliases(fromDir);
+    if (aliases.exact.size === 0 && aliases.wildcard.length === 0)
+        return null;
+    const candidates = [];
+    const exact = aliases.exact.get(spec);
+    if (exact)
+        candidates.push(...exact);
+    for (const w of aliases.wildcard) {
+        if (spec.startsWith(w.prefix) && spec.endsWith(w.suffix) && spec.length >= w.prefix.length + w.suffix.length) {
+            const middle = spec.slice(w.prefix.length, spec.length - w.suffix.length);
+            candidates.push(...w.targets.map((t) => t.replace('*', middle)));
+        }
+    }
+    for (const candidate of candidates) {
+        const found = probeFile(candidate);
+        if (found)
+            return found;
+    }
+    return null;
+}
+/**
+ * Resolves a relative import specifier to an absolute file path for a bundler
+ * (esbuild/rollup) to consume. An explicit extension is preserved — `./x.ts`
+ * stays `./x.ts` and must never become `./x.ts.ts`. An extensionless specifier
+ * is probed against `EXTENSIONS` (then `.vsk`, so component imports resolve),
+ * and falls back to `.ts` so the bundler reports the missing file by name.
+ * tsconfig `paths` aliases (`@/x`, `@app/x`) resolve against the app tsconfig;
+ * other bare/absolute specifiers are returned unchanged. This is the single
+ * source of truth for every relative-import rewrite (SSR loader and client
+ * chunk bundler).
+ */
+export function resolveImportPath(spec, fromDir) {
+    if (spec.startsWith('./') || spec.startsWith('../')) {
+        const base = resolve(fromDir, spec);
+        if (extname(base))
+            return base;
+        for (const suffix of EXTENSIONS) {
+            if (existsSync(base + suffix))
+                return base + suffix;
+        }
+        if (existsSync(`${base}.vsk`))
+            return `${base}.vsk`;
+        return `${base}.ts`;
+    }
+    if (!isAbsolute(spec)) {
+        const aliased = resolveAliasModule(spec, fromDir);
+        if (aliased)
+            return aliased;
+    }
+    return spec;
+}
 /**
  * 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
+ * tsconfig `paths` aliases (`@/x`, `@app/x`) resolve against the app tsconfig;
+ * other 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.
  *
@@ -670,6 +840,11 @@ export function resolveSsrModule(specifier, fromDir) {
         resolved = probeFile(resolve(fromDir, specifier));
     }
     else {
+        // tsconfig `paths` alias (`@/x`, `@app/x`) — resolved before Node's
+        // resolver so app-local aliases win over any same-named package.
+        const aliased = resolveAliasModule(specifier, fromDir);
+        if (aliased)
+            return toRealPath(aliased);
         // Bare specifier — prefer the native resolver (exports map, conditions,
         // builtins, symlinks), then fall back to a node_modules walk-up.
         const native = nativeResolve(specifier, fromDir);

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;AAoCrK,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,CAmDjJ;AAsWD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAmD1F;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,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"}

package/dist/server-jsgen.js

@@ -1,4 +1,4 @@
-import { StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, WhileLoop, SwitchBlock, TryCatch, ForLoop, TrackDecl, RuntimeStatement, ComponentRef, ComponentCall, ServerBlock, ClientBlock, HeadBlock, SlotNode, } from '@vesk/compiler/src/ir';
+import { StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, WhileLoop, SwitchBlock, TryCatch, ForLoop, TrackDecl, RuntimeStatement, ComponentRef, ComponentCall, ServerBlock, ClientBlock, HeadBlock, SlotNode, PropSlot, PropSlotRender, } from '@vesk/compiler/src/ir';
 import { isStaticIR, collectTrackedNames, transformTracked, transformTrackedInit, semicolonizeStatement } from '@vesk/compiler/src/client-codegen';
 import { unwrapTrackCall, stripTrackGeneric, hasTopLevelComma, skipWhitespace, findBalancedEnd, startsWithIdentifier } from '@vesk/compiler/src/scan';
 import { escapeHtml, indent, exprJS, extractTopLevelNames, extractRuntimeNames, buildParamInit, __vskHydrate, __vskImportedNames, setVskImportedNames, setVskForceClaim, takeVskForceClaim, nextVskId, } from '@vesk/compiler/src/server-utils';
@@ -19,14 +19,28 @@ import { localValueImportNames } from '@vesk/compiler/src/module-imports';
 // the client's for every property, not just sticky.
 //
 // The wrapper tag must be `<span>`, not `<div>`. The HTML parser implicitly
-// closes an open `<p>` on a flow-content start tag like `<div>`, so a `<div>`
-// wrapper inside a `<p>` (a component called inside a paragraph, e.g. a `Link`
-// in an eyebrow row) is hoisted out of the paragraph, stranding its `<!--vsk-->`
-// marker in the now-empty `<p>` → `nextElementSibling` is null → the hydration
-// claim misses and every later claim tag-shifts, wiping the SSR content. `<span>`
-// is phrasing content (legal inside `<p>`) and never triggers an implicit close,
-// while `display: contents` keeps it box-less everywhere a `<div>` would be.
-const HYDRATE_COMPONENT_WRAPPER = '<!--vsk--><span style="display:contents">';
+// Marker-ONLY component boundary. The client's shared walker claims a
+// component call-site by reading the component's own root element off this
+// marker — the SSR output of a component call is exactly the marker followed
+// by the callee's content. A `<span style="display:contents">` box here would
+// sit between the marker and that root, so a `nextElement(tag)` claim (e.g.
+// LoadingIndicator claiming `div`) hits a tag mismatch, never advances the
+// walker cursor, and every later claim miss wipes the SSR content.
+//
+// Every marker is keyed, no bare markers (Hydrate-Todo: keyed markers):
+// component boundaries carry the callee name (`<!--vsk:c:Name-->`),
+// static-subtree boundaries carry the tag (`<!--vsk:t:tag-->`). The walker
+// asserts the tag identity on adopt, reports skew deterministically, and names
+// every miss/orphan — divergence is pinpointed at the exact boundary instead
+// of cascading anonymously.
+function sanitizeMarkerName(name) {
+    // No regex (compiler rule): identifiers cannot contain comment-breaking
+    // sequences, but guard anyway — `--` would terminate the HTML comment.
+    return String(name).split('--').join('-').split('<').join('').split('>').join('');
+}
+function componentMarker(compName) {
+    return `<!--vsk:c:${sanitizeMarkerName(compName)}-->`;
+}
 export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
     importedNames = importedNames || __vskImportedNames;
     if (node instanceof StaticNode)
@@ -93,6 +107,10 @@ export function irNodeToJS(node, importedNames, isAsync = false, tracked) {
         return semicolonizeStatement(transformTracked(node, tracked || new Map()));
     if (node instanceof SlotNode)
         return `__out.push(props.children || '');`;
+    if (node instanceof PropSlotRender)
+        return `__out.push(props.${node.propName} || '');`;
+    if (node instanceof PropSlot)
+        return '';
     return '';
 }
 let __currentCompName = '';
@@ -108,13 +126,11 @@ function exprJSX(node, tracked) {
 function staticNodeToJS(node, isAsync = false, tracked) {
     const lines = [];
     const dynAttrTargets = new Set();
-    const dynAttrOrder = [];
     for (const child of node.children) {
         if (child instanceof DynamicBinding && child.kind === 'attribute' && child.target !== null && child.target !== 'ref') {
             if (isEvent(child.target))
                 continue;
             dynAttrTargets.add(child.target);
-            dynAttrOrder.push(child.target);
         }
     }
     const hasDynamicAttrs = dynAttrTargets.size > 0;
@@ -122,7 +138,9 @@ function staticNodeToJS(node, isAsync = false, tracked) {
     const forceClaim = takeVskForceClaim();
     const subtreeNeedsJS = __vskHydrate && (forceClaim || !isStaticIR(node.children));
     if (subtreeNeedsJS) {
-        lines.push(`__out.push('<!--vsk-->');`);
+        // Keyed static boundary (Hydrate-Todo: no bare markers): the walker
+        // asserts this tag on adopt and names it in every miss/orphan report.
+        lines.push('__out.push(' + JSON.stringify(`<!--vsk:t:${sanitizeMarkerName(node.tag)}-->`) + ');');
     }
     for (const attr of node.attributes) {
         if (isEvent(attr.name))
@@ -136,17 +154,13 @@ function staticNodeToJS(node, isAsync = false, tracked) {
             openTag += ` ${attr.name}="${escapeHtml(attr.value)}"`;
         }
     }
-    for (const target of dynAttrOrder) {
-        openTag += ` ${target}=""`;
-    }
     if (node.selfClosing) {
         let tag = openTag + ' />';
         if (hasDynamicAttrs) {
             let expr = JSON.stringify(tag);
             for (const child of node.children) {
                 if (child instanceof DynamicBinding && child.kind === 'attribute' && child.target !== 'ref' && !isEvent(child.target)) {
-                    const val = `__escape(String(${exprJSX(child.expression, tracked)}))`;
-                    expr = `${expr}.replace(${JSON.stringify(' ' + child.target + '=""')}, ' ' + ${JSON.stringify(child.target)} + '=\"' + ${val} + '\"')`;
+                    expr += ` + __attr(${JSON.stringify(child.target)}, ${exprJSX(child.expression, tracked)})`;
                 }
             }
             lines.push(`__out.push(${expr});`);
@@ -161,8 +175,7 @@ function staticNodeToJS(node, isAsync = false, tracked) {
         let expr = JSON.stringify(openTag);
         for (const child of node.children) {
             if (child instanceof DynamicBinding && child.kind === 'attribute' && child.target !== 'ref' && !isEvent(child.target)) {
-                const val = `__escape(String(${exprJSX(child.expression, tracked)}))`;
-                expr = `${expr}.replace(${JSON.stringify(' ' + child.target + '=""')}, ' ' + ${JSON.stringify(child.target)} + '=\"' + ${val} + '\"')`;
+                expr += ` + __attr(${JSON.stringify(child.target)}, ${exprJSX(child.expression, tracked)})`;
             }
         }
         lines.push(`__out.push(${expr});`);
@@ -413,9 +426,29 @@ function componentCallToJS(node, importedNames, isAsync = false, tracked) {
         propsEntries.push(`...${exprJSX(sp, tracked)}`);
     }
     const lines = [];
-    if (node.children.length > 0) {
+    // Named content slots (`trigger={<Button/>}`) thread through the same channel
+    // as `children`: a closed-over IIFE that serializes the slot body to a string.
+    const slotChildren = node.children.filter((c) => c instanceof PropSlot);
+    const regularChildren = node.children.filter((c) => !(c instanceof PropSlot));
+    for (const slot of slotChildren) {
+        const slotLines = [];
+        for (const child of slot.body) {
+            const code = irNodeToJS(child, importedNames, isAsync, tracked);
+            if (code)
+                slotLines.push(code);
+        }
+        if (slotLines.length > 0) {
+            const slotVar = `__sl${nextVskId()}`;
+            propsEntries.push(`${JSON.stringify(slot.propName)}: ${slotVar}`);
+            lines.push(`const ${slotVar} = ${isAsync ? 'await (async ' : '('}() => {`);
+            lines.push(`const __out = [];`);
+            lines.push(indent(slotLines.join('\n')));
+            lines.push(`return __out.join(''); })();`);
+        }
+    }
+    if (regularChildren.length > 0) {
         const childLines = [];
-        for (const child of node.children) {
+        for (const child of regularChildren) {
             const code = irNodeToJS(child, importedNames, isAsync, tracked);
             if (code)
                 childLines.push(code);
@@ -448,9 +481,7 @@ function componentCallToJS(node, importedNames, isAsync = false, tracked) {
     lines.push(`const ${calleeVar} = ${callee};`);
     const callExpr = `${awaitKw}${calleeVar}(${propsObj}, __registry, (${calleeVar}.__veskScope || __vesk))`;
     if (__vskHydrate) {
-        // Wrapper purpose documented at HYDRATE_COMPONENT_WRAPPER; it must never
-        // become a layout box (see the constant's comment for why).
-        lines.push(`__out.push(${JSON.stringify(HYDRATE_COMPONENT_WRAPPER)} + (${callExpr} || '') + '</span>');`);
+        lines.push(`__out.push(${JSON.stringify(componentMarker(compName))} + (${callExpr} || ''));`);
     }
     else {
         lines.push(`__out.push(${callExpr} || '');`);
@@ -468,6 +499,8 @@ export function generateFunctionBody(comp, importedNames) {
     lines.push(`__sa({ c: null, p: __prev });`);
     lines.push(`try {`);
     lines.push(`const __escape = (s) => { s = String(s); return s.split('&').join('&amp;').split('<').join('&lt;').split('>').join('&gt;').split(${JSON.stringify('"')}).join('&quot;'); };`);
+    lines.push(`const __styleText = (v) => { if (typeof v === 'string') return v; if (v && typeof v === 'object') { let s = ''; for (const k in v) { const x = v[k]; if (x == null || x === false) continue; s += k.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase()) + ':' + x + ';'; } return s; } return String(v); };`);
+    lines.push(`const __attr = (n, v) => (v == null || v === false) ? '' : ' ' + n + '="' + __escape(n === 'style' ? __styleText(v) : String(v)) + '"';`);
     lines.push(`const raw = (s) => s == null ? '' : String(s);`);
     lines.push(`const __tk = globalThis.__vsk_ssr_token || '';`);
     if (asyncMode) {

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

@@ -1 +1 @@
-{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-render.d.ts","sourceRoot":"","sources":["../src/server-render.ts"],"names":[],"mappings":"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"}

package/dist/server-render.js

@@ -40,24 +40,29 @@ function compileFileInternal(source, sourcePath, seenImportFiles) {
             if (seenImportFiles.has(importPath))
                 continue;
             seenImportFiles.add(importPath);
+            // Only truly unresolvable imports are skipped. A `.vsk` file that EXISTS
+            // but fails to compile must surface its error — silently dropping it here
+            // corrupts the component registry (the caller later crashes on
+            // `undefined.__veskScope` with no pointer back to the real cause).
+            let importedSrc;
             try {
-                const importedSrc = readFileSync(importPath, 'utf-8');
-                const sub = compileFileInternal(importedSrc, importPath, seenImportFiles);
-                for (const [name, fn] of sub.componentMap) {
-                    if (!componentMap.has(name))
-                        componentMap.set(name, fn);
-                }
-                // Hoist the sub-`.vsk`'s scope into this file's so that
-                // registry-hoisted sub components (called with this `__vesk`) can
-                // destructure runtime imports, module values and top-level helpers.
-                for (const key of Object.keys(sub.__vesk)) {
-                    if (key in __vesk)
-                        continue;
-                    __vesk[key] = sub.__vesk[key];
-                }
+                importedSrc = readFileSync(importPath, 'utf-8');
             }
             catch {
-                // skip unresolvable imports
+                continue;
+            }
+            const sub = compileFileInternal(importedSrc, importPath, seenImportFiles);
+            for (const [name, fn] of sub.componentMap) {
+                if (!componentMap.has(name))
+                    componentMap.set(name, fn);
+            }
+            // Hoist the sub-`.vsk`'s scope into this file's so that
+            // registry-hoisted sub components (called with this `__vesk`) can
+            // destructure runtime imports, module values and top-level helpers.
+            for (const key of Object.keys(sub.__vesk)) {
+                if (key in __vesk)
+                    continue;
+                __vesk[key] = sub.__vesk[key];
             }
         }
     }

package/package.json

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