@kernlang/core 3.4.6 → 3.4.7-canary.101.1.5437ac62

package/dist/native-eligibility.js

@@ -35,7 +35,6 @@ export const LEGACY_NEG_PATTERNS = [
     /\bfor\s*\(/,
     /\bdo\s*\{/,
     /\bswitch\s*\(/,
-    /\btypeof\b/,
     /\binstanceof\b/,
     /^\s*import\b/m,
     /\brequire\(/,
@@ -71,6 +70,73 @@ export const LEGACY_NEG_PATTERNS = [
     /\(\s*\.{3}/,
     /\/\w+\/[gimsy]*/,
 ];
+const FOREIGN_HANDLER_LANGS = new Set(['ts', 'typescript', 'js', 'javascript', 'python', 'py']);
+function createFenceScanState() {
+    return { inQuote: false, quoteChar: null, exprDepth: 0 };
+}
+function indexOfFenceOutsideQuotes(content, fence, state = createFenceScanState()) {
+    for (let i = 0; i < content.length; i++) {
+        const ch = content[i];
+        const next = content[i + 1];
+        if (ch === '\\' && state.inQuote) {
+            i++;
+            continue;
+        }
+        if ((ch === '"' || ch === "'" || ch === '`') && (!state.inQuote || ch === state.quoteChar)) {
+            if (state.inQuote) {
+                state.inQuote = false;
+                state.quoteChar = null;
+            }
+            else {
+                state.inQuote = true;
+                state.quoteChar = ch;
+            }
+            continue;
+        }
+        if (state.inQuote)
+            continue;
+        if (ch === '{' && next === '{') {
+            state.exprDepth++;
+            i++;
+            continue;
+        }
+        if (ch === '}' && next === '}' && state.exprDepth > 0) {
+            state.exprDepth--;
+            i++;
+            continue;
+        }
+        if (state.exprDepth > 0)
+            continue;
+        if (content.startsWith(fence, i))
+            return i;
+    }
+    return -1;
+}
+function parseBoundaryProp(opener, propName) {
+    const quoted = new RegExp(`(?:^|\\s)${propName}="([^"]*)"`).exec(opener);
+    if (quoted)
+        return quoted[1];
+    const bare = new RegExp(`(?:^|\\s)${propName}=([^\\s]+)`).exec(opener);
+    return bare?.[1];
+}
+function annotateRawBody(text, startLine, endLine, opener) {
+    return {
+        text,
+        startLine,
+        endLine,
+        opener: opener.trim(),
+        declaredLang: parseBoundaryProp(opener, 'lang'),
+        declaredReason: parseBoundaryProp(opener, 'reason'),
+    };
+}
+export function isExplicitForeignRawBody(body) {
+    const opener = body.opener?.trim();
+    if (opener && !/^handler\b/.test(opener))
+        return false;
+    const lang = body.declaredLang?.trim().toLowerCase();
+    const reason = body.declaredReason?.trim();
+    return Boolean(lang && reason && FOREIGN_HANDLER_LANGS.has(lang));
+}
 /** Classify a single raw body. Slice α-3: delegates to the AST walker so
  *  eligibility ≡ migrate-success by construction. */
 export function classifyHandlerBody(rawBody) {
@@ -94,17 +160,19 @@ export function extractRawBodies(content) {
     let inBody = false;
     let buf = [];
     let startLine = 0;
+    let opener = '';
+    let closeScanState = createFenceScanState();
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         if (!inBody) {
-            const openIdx = line.indexOf('<<<');
+            const openIdx = indexOfFenceOutsideQuotes(line, '<<<');
             if (openIdx === -1)
                 continue;
             const afterOpen = line.slice(openIdx + 3);
-            const closeIdx = afterOpen.indexOf('>>>');
+            const closeIdx = indexOfFenceOutsideQuotes(afterOpen, '>>>');
             if (closeIdx !== -1) {
                 // Shape 1: inline single-line `handler <<< body >>>`.
-                bodies.push({ text: afterOpen.slice(0, closeIdx).trim(), startLine: i + 1, endLine: i + 1 });
+                bodies.push(annotateRawBody(afterOpen.slice(0, closeIdx).trim(), i + 1, i + 1, line.slice(0, openIdx)));
                 continue;
             }
             // Shape 2/3: multi-line block. parser-core.ts `parseLines` discards
@@ -114,9 +182,11 @@ export function extractRawBodies(content) {
             inBody = true;
             buf = [];
             startLine = i + 1;
+            opener = line.slice(0, openIdx);
+            closeScanState = createFenceScanState();
         }
         else {
-            const closeIdx = line.indexOf('>>>');
+            const closeIdx = indexOfFenceOutsideQuotes(line, '>>>', closeScanState);
             if (closeIdx === -1) {
                 buf.push(line);
                 continue;
@@ -124,8 +194,10 @@ export function extractRawBodies(content) {
             const before = line.slice(0, closeIdx).trim();
             if (before.length > 0)
                 buf.push(before);
-            bodies.push({ text: buf.join('\n'), startLine, endLine: i + 1 });
+            bodies.push(annotateRawBody(buf.join('\n'), startLine, i + 1, opener));
             inBody = false;
+            opener = '';
+            closeScanState = createFenceScanState();
         }
     }
     return bodies;
@@ -137,7 +209,9 @@ export function scanFileForEligibility(content) {
     const raw = extractRawBodies(content);
     let eligibleBodies = 0;
     const bodies = raw.map((body) => {
-        const result = classifyHandlerBody(body.text);
+        const result = isExplicitForeignRawBody(body)
+            ? { eligible: false, reason: 'explicit-foreign' }
+            : classifyHandlerBody(body.text);
         if (result.eligible)
             eligibleBodies++;
         return { ...body, ...result };

package/dist/native-eligibility.js.map

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

package/dist/parser-core.js

@@ -70,6 +70,84 @@ function stripInlineComment(content) {
     }
     return content;
 }
+function indexOfFenceOutsideQuotes(content, fence) {
+    let inQuote = false;
+    let quoteChar = null;
+    let exprDepth = 0;
+    for (let i = 0; i < content.length; i++) {
+        const ch = content[i];
+        const next = content[i + 1];
+        if (ch === '\\' && inQuote) {
+            i++;
+            continue;
+        }
+        if ((ch === '"' || ch === "'") && (!inQuote || ch === quoteChar)) {
+            if (inQuote) {
+                inQuote = false;
+                quoteChar = null;
+            }
+            else {
+                inQuote = true;
+                quoteChar = ch;
+            }
+            continue;
+        }
+        if (inQuote)
+            continue;
+        if (ch === '{' && next === '{') {
+            exprDepth++;
+            i++;
+            continue;
+        }
+        if (ch === '}' && next === '}' && exprDepth > 0) {
+            exprDepth--;
+            i++;
+            continue;
+        }
+        if (exprDepth > 0)
+            continue;
+        if (content.startsWith(fence, i))
+            return i;
+    }
+    return -1;
+}
+function findMultilineBlockOpen(trimmed, runtime) {
+    for (const type of runtime.multilineBlockTypes) {
+        if (!trimmed.startsWith(type))
+            continue;
+        const afterType = trimmed.slice(type.length);
+        if (!/^\s/.test(afterType))
+            continue;
+        const openIdx = indexOfFenceOutsideQuotes(trimmed, '<<<');
+        if (openIdx !== -1)
+            return { type, openIdx };
+    }
+    return undefined;
+}
+function parseDecoratorLine(trimmed, indent, lineNum) {
+    const exportMatch = /^export\s+(@[\s\S]+)$/u.exec(trimmed);
+    const exported = Boolean(exportMatch);
+    const decorator = exportMatch ? exportMatch[1].trimStart() : trimmed;
+    const decoratorCol = indent + 1 + (exported ? trimmed.indexOf('@') : 0);
+    const m = /^@([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)(?:\(([\s\S]*)\))?\s*$/.exec(decorator);
+    if (!m)
+        return null;
+    const [, name, args] = m;
+    return {
+        indent,
+        rawLength: trimmed.length,
+        type: 'decorator',
+        props: {
+            name,
+            ...(args !== undefined ? { args: args.trim() } : {}),
+            ...(exported ? { __exportNextFn: true } : {}),
+        },
+        styles: {},
+        pseudoStyles: {},
+        themeRefs: [],
+        loc: { line: lineNum, col: decoratorCol, endLine: lineNum, endCol: indent + 1 + trimmed.length },
+    };
+}
 // ── Prop parsing ─────────────────────────────────────────────────────────
 /** Map a value token to its JS representation. */
 function tokenValue(tok) {
@@ -131,18 +209,21 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
     if (content.trim() === '')
         return null;
     const col = indent + 1;
+    const exportMatch = /^export\s+(fn\b[\s\S]*)$/u.exec(content);
+    const contentForParse = exportMatch ? exportMatch[1] : content;
+    const parseCol = col + content.length - contentForParse.length;
     if (indentText.includes('\t')) {
         emitDiagnostic(state, 'INVALID_INDENT', 'warning', `Tab indentation at line ${lineNum}`, lineNum, 1, {
             endCol: indent + 1,
         });
     }
     const diagBefore = state.diagnostics.length;
-    const tokens = tokenizeLineInternal(content, state);
+    const tokens = tokenizeLineInternal(contentForParse, state);
     for (let d = diagBefore; d < state.diagnostics.length; d++) {
         if (state.diagnostics[d].line === 0)
             state.diagnostics[d].line = lineNum;
-        state.diagnostics[d].col += indent;
-        state.diagnostics[d].endCol += indent;
+        state.diagnostics[d].col += parseCol - 1;
+        state.diagnostics[d].endCol += parseCol - 1;
     }
     const s = new TokenStream(tokens);
     // First token must be an identifier (the node type)
@@ -150,7 +231,7 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
     if (!typeToken) {
         const firstToken = tokens.find((tok) => tok.kind !== 'whitespace');
         if (firstToken) {
-            emitDiagnostic(state, 'DROPPED_LINE', 'error', `Dropped line ${lineNum}: expected a node type at the start of the line`, lineNum, col + firstToken.pos, {
+            emitDiagnostic(state, 'DROPPED_LINE', 'error', `Dropped line ${lineNum}: expected a node type at the start of the line`, lineNum, parseCol + firstToken.pos, {
                 endCol: col + content.length,
             });
         }
@@ -167,16 +248,18 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
             styles: {},
             pseudoStyles: {},
             themeRefs: [],
-            loc: { line: lineNum, col, endLine: lineNum, endCol: col + content.length },
+            loc: { line: lineNum, col: parseCol, endLine: lineNum, endCol: col + content.length },
         };
     }
     const type = typeToken;
     if (!isKnownNodeType(type, runtime) && !runtime.multilineBlockTypes.has(type) && !runtime.isTemplateNode(type)) {
-        emitDiagnostic(state, 'UNKNOWN_NODE_TYPE', 'warning', `Unknown node type '${type}' at line ${lineNum}`, lineNum, col, {
-            endCol: col + type.length,
+        emitDiagnostic(state, 'UNKNOWN_NODE_TYPE', 'warning', `Unknown node type '${type}' at line ${lineNum}`, lineNum, parseCol, {
+            endCol: parseCol + type.length,
         });
     }
     const props = {};
+    if (exportMatch)
+        props.export = true;
     const quotedProps = new Set();
     const styles = {};
     const pseudoStyles = {};
@@ -203,7 +286,7 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
     // ── Keyword-specific handling ──────────────────────────────────────
     const handler = KEYWORD_HANDLERS.get(type);
     if (handler)
-        handler(s, props, content);
+        handler(s, props, contentForParse);
     // ── Generic prop/style/theme parsing ───────────────────────────────
     while (!s.done()) {
         s.skipWS();
@@ -223,11 +306,11 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
             continue;
         }
         // Key=value prop (extracted helper from Codex)
-        if (parseProp(state, s, props, quotedProps, lineNum, col))
+        if (parseProp(state, s, props, quotedProps, lineNum, parseCol))
             continue;
         // Unknown token — skip with warning
         const skipped = s.next();
-        const errCol = col + skipped.pos;
+        const errCol = parseCol + skipped.pos;
         emitDiagnostic(state, 'UNEXPECTED_TOKEN', 'warning', `Unexpected token "${skipped.value}" at line ${lineNum}:${errCol}`, lineNum, errCol, {
             endCol: errCol + skipped.value.length,
         });
@@ -241,13 +324,15 @@ function parseLine(state, raw, lineNum, runtime = defaultRuntime) {
         styles,
         pseudoStyles,
         themeRefs,
-        loc: { line: lineNum, col, endLine: lineNum, endCol: col + content.length },
+        loc: { line: lineNum, col: parseCol, endLine: lineNum, endCol: col + content.length },
     };
 }
 // ── Minified source expander ─────────────────────────────────────────────
 function expandMinified(source) {
     if (!source.includes('(') || source.split('\n').length > 1)
         return source;
+    if (/^\s*(?:export\s+)?fn\s+[A-Za-z_$][\w$]*/u.test(source))
+        return source;
     const result = [];
     let depth = 0;
     let current = '';
@@ -377,18 +462,57 @@ function scanLineState(s, prev) {
 function parseLines(state, source, runtime = defaultRuntime) {
     const lines = expandMinified(source).split('\n');
     const parsed = [];
+    const pendingDecorators = [];
+    const warnDroppedDecorators = (message) => {
+        for (const dec of pendingDecorators) {
+            emitDiagnostic(state, 'DROPPED_DECORATOR', 'warning', message(dec), dec.loc.line, dec.loc.col, {
+                endCol: dec.loc.endCol,
+            });
+        }
+        pendingDecorators.length = 0;
+    };
+    const pushParsed = (line) => {
+        parsed.push(line);
+        if (line.type !== 'fn') {
+            warnDroppedDecorators((dec) => `Decorator '${String(dec.props.name)}' at line ${dec.loc.line} must be followed by a fn declaration`);
+            return;
+        }
+        for (const dec of pendingDecorators) {
+            if (dec.indent !== line.indent) {
+                emitDiagnostic(state, 'DROPPED_DECORATOR', 'warning', `Decorator '${String(dec.props.name)}' at line ${dec.loc.line} must use the same indentation as its fn declaration`, dec.loc.line, dec.loc.col, { endCol: dec.loc.endCol });
+                continue;
+            }
+            if (dec.props.__exportNextFn === true) {
+                line.props.export = true;
+            }
+            delete dec.props.__exportNextFn;
+            parsed.push({ ...dec, indent: line.indent + 2 });
+        }
+        pendingDecorators.length = 0;
+    };
     for (let i = 0; i < lines.length; i++) {
         const trimmed = lines[i].trimStart();
         // Skip comment lines (// or #)
         if (trimmed.startsWith('//') || trimmed.startsWith('#'))
             continue;
-        const multilineType = [...runtime.multilineBlockTypes].find((type) => trimmed.startsWith(`${type} <<<`));
-        if (multilineType) {
+        if (trimmed.startsWith('@') || /^export\s+@/u.test(trimmed)) {
+            const indent = lines[i].search(/\S/);
+            const dec = parseDecoratorLine(stripInlineComment(lines[i].slice(indent)).trim(), indent, i + 1);
+            if (dec) {
+                pendingDecorators.push(dec);
+                continue;
+            }
+        }
+        const multilineOpen = findMultilineBlockOpen(trimmed, runtime);
+        if (multilineOpen) {
+            const multilineType = multilineOpen.type;
             const indent = lines[i].search(/\S/);
             const codeLines = [];
             const startLine = i + 1;
-            const blockOpen = `${multilineType} <<<`;
-            const afterOpen = trimmed.slice(blockOpen.length);
+            const openIdx = multilineOpen.openIdx;
+            const opener = trimmed.slice(0, openIdx).trimEnd();
+            const blockOpen = `${opener} <<<`;
+            const afterOpen = trimmed.slice(openIdx + 3);
             let closed = false;
             if (afterOpen.includes('>>>')) {
                 closed = true;
@@ -417,14 +541,16 @@ function parseLines(state, source, runtime = defaultRuntime) {
                     suggestion: `Close the '${multilineType} <<<' block with a matching '>>>' marker before the file ends.`,
                 });
             }
-            parsed.push({
+            const openerParsed = parseLine(state, `${' '.repeat(indent)}${opener}`, startLine, runtime);
+            pushParsed({
                 indent,
                 rawLength: lines[startLine - 1].slice(indent).length,
-                type: multilineType,
-                props: { code: codeLines.join('\n').replace(/^\n+|\n+$/g, '') },
-                styles: {},
-                pseudoStyles: {},
-                themeRefs: [],
+                type: openerParsed?.type ?? multilineType,
+                props: { ...(openerParsed?.props ?? {}), code: codeLines.join('\n').replace(/^\n+|\n+$/g, '') },
+                quotedProps: openerParsed?.quotedProps,
+                styles: openerParsed?.styles ?? {},
+                pseudoStyles: openerParsed?.pseudoStyles ?? {},
+                themeRefs: openerParsed?.themeRefs ?? [],
                 loc: {
                     line: startLine,
                     col: indent + 1,
@@ -446,8 +572,9 @@ function parseLines(state, source, runtime = defaultRuntime) {
             const nextTrimmed = lines[i + 1].trimStart();
             if (nextTrimmed.startsWith('//') || nextTrimmed.startsWith('#'))
                 break;
-            if ([...runtime.multilineBlockTypes].some((t) => nextTrimmed.startsWith(`${t} <<<`)))
+            if (findMultilineBlockOpen(nextTrimmed, runtime)) {
                 break;
+            }
             i++;
             joinedParts.push(lines[i]);
             lineState = scanLineState(lines[i], lineState);
@@ -455,8 +582,9 @@ function parseLines(state, source, runtime = defaultRuntime) {
         const joined = joinedParts.length === 1 ? joinedParts[0] : joinedParts.join('\n');
         const p = parseLine(state, joined, startLine, runtime);
         if (p)
-            parsed.push(p); // null only for blank/comment lines; __error nodes are always pushed
+            pushParsed(p); // null only for blank/comment lines; __error nodes are always pushed
     }
+    warnDroppedDecorators((dec) => `Decorator '${String(dec.props.name)}' at line ${dec.loc.line} must be followed by a fn declaration`);
     return parsed;
 }
 // ── Tree building ────────────────────────────────────────────────────────
@@ -501,6 +629,117 @@ function buildTree(state, parsed, root, rootIndent) {
         stack.push({ node, indent: p.indent });
     }
 }
+function canonicalizeFirstClassFunctionBodies(state, node) {
+    if (node.children) {
+        for (const child of node.children)
+            canonicalizeFirstClassFunctionBodies(state, child);
+    }
+    if (node.type !== 'fn')
+        return;
+    const isFirstClassSyntax = node.props?.__firstClassSyntax === true;
+    if (node.props)
+        delete node.props.__firstClassSyntax;
+    if (!isFirstClassSyntax || !node.children?.some(isNativeBodyStatementChild))
+        return;
+    const existingHandler = node.children.find((child) => child.type === 'handler');
+    if (existingHandler) {
+        const firstBody = node.children.find(isNativeBodyStatementChild);
+        const loc = firstBody?.loc ?? existingHandler.loc ?? node.loc ?? { line: 1, col: 1, endCol: 2 };
+        emitDiagnostic(state, 'BODY_STATEMENT_OUTSIDE_NATIVE_HANDLER', 'error', 'First-class fn bodies cannot mix direct KERN body statements with an explicit `handler` child. Move the direct statements into the handler or remove the explicit handler.', loc.line, loc.col, { endCol: loc.endCol ?? loc.col + 1 });
+        return;
+    }
+    const nextChildren = [];
+    let implicitHandler = null;
+    for (const child of node.children) {
+        if (!isNativeBodyStatementChild(child)) {
+            nextChildren.push(child);
+            continue;
+        }
+        if (!implicitHandler) {
+            implicitHandler = {
+                type: 'handler',
+                props: { lang: 'kern' },
+                children: [],
+                loc: { ...(child.loc ?? node.loc ?? { line: 1, col: 1 }) },
+            };
+            nextChildren.push(implicitHandler);
+        }
+        implicitHandler.children.push(child);
+    }
+    node.children = nextChildren;
+}
+function isKernSourcePath(path) {
+    return typeof path === 'string' && path.endsWith('.kern');
+}
+function canonicalizeFirstClassModuleImports(node) {
+    if (!node.children)
+        return;
+    const nextChildren = [];
+    for (const child of node.children) {
+        canonicalizeFirstClassModuleImports(child);
+        const isFirstClassImport = child.type === 'import' && child.props?.__firstClassImport === true;
+        if (!isFirstClassImport) {
+            nextChildren.push(child);
+            continue;
+        }
+        const props = child.props ?? {};
+        const bindings = Array.isArray(props.__firstClassBindings)
+            ? props.__firstClassBindings
+            : [];
+        const from = props.from;
+        delete props.__firstClassImport;
+        delete props.__firstClassBindings;
+        if (!isKernSourcePath(from)) {
+            nextChildren.push(child);
+            continue;
+        }
+        const isTypeOnly = props.types === true || props.types === 'true';
+        nextChildren.push({
+            type: 'use',
+            props: { path: from },
+            children: bindings.map((binding) => ({
+                type: 'from',
+                props: {
+                    name: String(binding.name),
+                    ...(typeof binding.as === 'string' ? { as: binding.as } : {}),
+                    ...(isTypeOnly ? { kind: 'type' } : {}),
+                },
+                children: [],
+                loc: child.loc,
+            })),
+            loc: child.loc,
+        });
+    }
+    node.children = nextChildren;
+}
+function isNativeBodyStatementChild(node) {
+    switch (node.type) {
+        case 'cell':
+        case 'set':
+        case 'comment':
+        case 'let':
+        case 'assign':
+        case 'destructure':
+        case 'do':
+        case 'fmt':
+        case 'return':
+        case 'if':
+        case 'else':
+        case 'while':
+        case 'for':
+        case 'each':
+        case 'try':
+        case 'catch':
+        case 'finally':
+        case 'throw':
+        case 'continue':
+        case 'break':
+        case 'branch':
+            return true;
+        default:
+            return false;
+    }
+}
 /** Recursively compute endLine/endCol for each node based on its last child. */
 function computeEndSpans(node) {
     if (node.children && node.children.length > 0) {
@@ -539,6 +778,8 @@ export function parseInternal(source, asDocument, runtime, options) {
         root = toNode(parsed[0]);
         buildTree(state, parsed.slice(1), root, parsed[0].indent);
     }
+    canonicalizeFirstClassFunctionBodies(state, root);
+    canonicalizeFirstClassModuleImports(root);
     computeEndSpans(root);
     validateExpressions(state, root);
     validateEffects(state, root);