@kodycodes/cli 1.23.1 → 1.23.2

package/dist/local-bundle.js

@@ -1,64 +1,125 @@
 import * as esbuild from 'esbuild';
-import { resolve } from 'node:path';
+import { relative, resolve } from 'node:path';
+/** Thrown when esbuild fails; `diagnostics` keeps the structured locations. */
+export class BundleError extends Error {
+    diagnostics;
+    constructor(message, diagnostics) {
+        super(message);
+        this.name = 'BundleError';
+        this.diagnostics = diagnostics;
+    }
+}
+/**
+ * esbuild options shared by one-shot bundles and `kody dev` rebuilds: follow
+ * relative imports and npm packages, keep `kody:*` external for package-graph
+ * + runtime binding, and leave `node:*` external for workerd `nodejs_compat`.
+ */
+export function localBundleOptions(entry) {
+    return {
+        absWorkingDir: process.cwd(),
+        entryPoints: [entry],
+        bundle: true,
+        write: false,
+        format: 'esm',
+        platform: 'neutral',
+        target: 'esnext',
+        logLevel: 'silent',
+        packages: 'bundle',
+        external: ['kody:*', 'node:*'],
+    };
+}
 /**
  * Bundle a `--file` entry for local workerd the same way hosted execute /
- * publish resolves code: follow relative imports and npm packages, keep
- * `kody:*` external for package-graph + runtime binding, and leave `node:*`
- * external for workerd `nodejs_compat` (same as unbundled `--code`).
+ * publish resolves code.
  */
 export async function bundleLocalUserModule(modulePath) {
     const entry = resolve(modulePath);
     let result;
     try {
-        result = await esbuild.build({
-            absWorkingDir: process.cwd(),
-            entryPoints: [entry],
-            bundle: true,
-            write: false,
-            format: 'esm',
-            platform: 'neutral',
-            target: 'esnext',
-            logLevel: 'silent',
-            packages: 'bundle',
-            external: ['kody:*', 'node:*'],
-        });
+        result = await esbuild.build(localBundleOptions(entry));
     }
     catch (error) {
-        throw new Error(formatBundleError(modulePath, error));
+        throw createBundleError(modulePath, error);
     }
     const output = result.outputFiles?.[0];
     if (output === undefined) {
-        throw new Error(`Could not bundle ${modulePath} for local execute: esbuild produced no output.`);
+        throw new BundleError(`Could not bundle ${modulePath}: esbuild produced no output.`, []);
     }
     if (result.errors.length > 0) {
-        throw new Error(formatBundleError(modulePath, { errors: result.errors }));
+        throw createBundleError(modulePath, { errors: result.errors });
     }
     return output.text;
 }
-function formatBundleError(modulePath, error) {
-    const details = bundleErrorDetails(error);
-    const header = `Could not bundle ${modulePath} for local execute.`;
+/**
+ * `workingDir` is esbuild's `absWorkingDir` (locations are relative to it);
+ * `displayRoot` is what reported paths are relative to.
+ */
+export function createBundleError(modulePath, error, paths = {
+    workingDir: process.cwd(),
+    displayRoot: process.cwd(),
+}) {
+    const diagnostics = bundleDiagnostics(error, paths);
+    const details = diagnostics.map(formatBundleDiagnostic).join('\n');
+    const header = `Could not bundle ${modulePath}.`;
     const body = details.length > 0 ? `${header}\n${details}` : header;
+    const messages = diagnostics.map((item) => item.message).join('\n');
     // Only when the unresolved specifier itself is kody:@ (not a path that happens
     // to contain that substring).
-    if (/Could not resolve ["']kody:@/i.test(details)) {
-        return `${body}\nfix: Map the dependency in .kody/deps.json (or package.json#kody.localDeps), keep it in this package's exports, or log in so published package-graph can supply it.`;
+    if (/Could not resolve ["']kody:@/i.test(messages)) {
+        return new BundleError(`${body}\nfix: Map the dependency in .kody/deps.json (or package.json#kody.localDeps), keep it in this package's exports, or log in so published package-graph can supply it.`, diagnostics);
     }
     if (/Could not resolve|Cannot find module|ENOENT/i.test(body)) {
-        return `${body}\nfix: Run \`npm install\` in the package directory (and any local deps), then retry.`;
+        return new BundleError(`${body}\nfix: Run \`npm install\` in the package directory (and any local deps), then retry.`, diagnostics);
     }
-    return body;
+    return new BundleError(body, diagnostics);
+}
+/** `file:line:col: message` followed by an indented code frame. */
+export function formatBundleDiagnostic(item) {
+    const where = item.file !== null
+        ? `${item.file}${item.line !== null ? `:${item.line}` : ''}${item.col !== null ? `:${item.col}` : ''}: `
+        : '';
+    return `${where}${item.message}${item.frame ? `\n${item.frame}` : ''}`;
 }
-function bundleErrorDetails(error) {
+function bundleDiagnostics(error, paths) {
     if (isEsbuildFailure(error)) {
         return error.errors
-            .map((item) => item.text.trim())
-            .filter((text) => text.length > 0)
-            .join('\n');
+            .filter((item) => item.text.trim().length > 0)
+            .map((item) => toDiagnostic(item, paths));
     }
-    if (error instanceof Error)
-        return error.message;
-    return String(error);
+    return [
+        {
+            file: null,
+            line: null,
+            col: null,
+            message: error instanceof Error ? error.message : String(error),
+            frame: null,
+        },
+    ];
+}
+function toDiagnostic(item, paths) {
+    const location = item.location;
+    if (!location) {
+        return { file: null, line: null, col: null, message: item.text.trim(), frame: null };
+    }
+    const absolute = resolve(paths.workingDir, location.file);
+    const fromRoot = relative(paths.displayRoot, absolute);
+    const file = fromRoot && !fromRoot.startsWith('..') ? fromRoot : absolute;
+    return {
+        file,
+        line: location.line,
+        col: location.column + 1,
+        message: item.text.trim(),
+        frame: codeFrame(location),
+    };
+}
+function codeFrame(location) {
+    if (!location.lineText)
+        return null;
+    const gutter = String(location.line);
+    const pad = ' '.repeat(gutter.length);
+    const caretWidth = Math.max(1, Math.min(location.length || 1, location.lineText.length));
+    return (`  ${gutter} | ${location.lineText}\n` +
+        `  ${pad} | ${' '.repeat(location.column)}${'^'.repeat(caretWidth)}`);
 }
 function isEsbuildFailure(error) {
     return (typeof error === 'object' &&

package/dist/local-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-bundle.js","sourceRoot":"","sources":["../src/local-bundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-bundle.js","sourceRoot":"","sources":["../src/local-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAa7C,+EAA+E;AAC/E,MAAM,OAAO,WAAY,SAAQ,KAAK;IAC5B,WAAW,CAAyB;IAC7C,YAAY,OAAe,EAAE,WAAoC;QAChE,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAC/B,CAAC;CACD;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC/C,OAAO;QACN,aAAa,EAAE,OAAO,CAAC,GAAG,EAAE;QAC5B,WAAW,EAAE,CAAC,KAAK,CAAC;QACpB,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KACC,CAAA;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,UAAkB;IAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACjC,IAAI,MAA2B,CAAA;IAC/B,IAAI,CAAC;QACJ,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAA;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC3C,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAA;IACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,WAAW,CAAC,oBAAoB,UAAU,+BAA+B,EAAE,EAAE,CAAC,CAAA;IACzF,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,iBAAiB,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAA;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAChC,UAAkB,EAClB,KAAc,EACd,QAAqD;IACpD,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE;IACzB,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE;CAC1B;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACnD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAClE,MAAM,MAAM,GAAG,oBAAoB,UAAU,GAAG,CAAA;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IAClE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnE,+EAA+E;IAC/E,8BAA8B;IAC9B,IAAI,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,WAAW,CACrB,GAAG,IAAI,uKAAuK,EAC9K,WAAW,CACX,CAAA;IACF,CAAC;IACD,IAAI,8CAA8C,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/D,OAAO,IAAI,WAAW,CACrB,GAAG,IAAI,uFAAuF,EAC9F,WAAW,CACX,CAAA;IACF,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;AAC1C,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,sBAAsB,CAAC,IAAsB;IAC5D,MAAM,KAAK,GACV,IAAI,CAAC,IAAI,KAAK,IAAI;QACjB,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI;QACxG,CAAC,CAAC,EAAE,CAAA;IACN,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AACvE,CAAC;AAED,SAAS,iBAAiB,CACzB,KAAc,EACd,KAAkD;IAElD,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,MAAM;aACjB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;aAC7C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3C,CAAC;IACD,OAAO;QACN;YACC,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/D,KAAK,EAAE,IAAI;SACX;KACD,CAAA;AACF,CAAC;AAED,SAAS,YAAY,CACpB,IAAqB,EACrB,KAAkD;IAElD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACrF,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IACzD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IACtD,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IACzE,OAAO;QACN,IAAI;QACJ,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,GAAG,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;QACxB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACzB,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC;KAC1B,CAAA;AACF,CAAC;AAED,SAAS,SAAS,CAAC,QAA0B;IAC5C,IAAI,CAAC,QAAQ,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IACnC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IACxF,OAAO,CACN,KAAK,MAAM,MAAM,QAAQ,CAAC,QAAQ,IAAI;QACtC,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACpE,CAAA;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACvC,OAAO,CACN,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,QAAQ,IAAI,KAAK;QACjB,KAAK,CAAC,OAAO,CAAE,KAA6B,CAAC,MAAM,CAAC,CACpD,CAAA;AACF,CAAC"}

package/dist/package-app-dev.d.ts

@@ -1,8 +1,14 @@
 /**
  * Long-running `kody dev` app server: bundles `kody.app.entry` the same way
- * local-bundle/publish does for esbuild, serves via workerd, strips the mount
- * at the Node proxy, and rebuilds on file changes.
+ * local-bundle/publish does for esbuild, serves via workerd behind a Node
+ * proxy that strips the mount, and rebuilds on file changes.
+ *
+ * Each successful rebuild starts a new workerd "generation" and only swaps the
+ * proxy over once it is listening; the previous generation drains in-flight
+ * requests and is then stopped. Requests that arrive mid-rebuild wait for it,
+ * so a save is never answered by a 503 or a stale bundle.
  */
+import { type DevEvent } from './dev/dev-events.js';
 import { type PackageLocalContext } from './package-local-runtime-source.js';
 import type { KodyPackageManifest } from './package-manifest.js';
 import type { KodyTarget } from './target.js';
@@ -35,10 +41,17 @@ export type PackageAppDevOptions = {
     passthroughHosts?: ReadonlyArray<string>;
     workerdPath?: string;
     fetchFn?: typeof fetch;
-    /** Hot reload via fs.watch (default true). One-shot `dev fetch` turns this off. */
+    /**
+     * Rebuild on file changes (default true). One-shot `dev fetch` turns this
+     * off, which also makes an initial build failure throw.
+     */
     watch?: boolean;
+    /** Quiet period after the last file event before rebuilding. */
+    debounceMs?: number;
     onStatus?: (message: string) => void;
     onError?: (message: string) => void;
+    /** Rebuilds, build/runtime errors, and app logs. */
+    onEvent?: (event: DevEvent) => void;
 };
 export type PackageAppDevServer = {
     url: string;