@swissjs/swite 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.3.2
+
+### Patch Changes
+
+- Generalize resolution system and add internalScopes support
+
+  - Add `findSiblingRepository(startPath, repoName)` — replaces hardcoded swiss-lib discovery with a generic sibling repo finder. `findSwissLibMonorepo` preserved as a backward-compat wrapper.
+  - Add `findPackage` with local-first dev precedence — in development, resolves `@scoped/*` packages from local sibling source trees before falling back to `node_modules`.
+  - `internalScopes` from `swiss.config.ts` now flows through to all handlers at startup — prevents internal-scoped packages from being routed to jsDelivr CDN.
+  - `NodeModuleHandler` rewritten to use `findPackage` — replaces verbose walk-up/swiss-lib fallback chain with unified local-first resolver. Adds dist→src redirect for local sibling packages.
+  - CDN blacklist: packages matching `internalScopes` are blocked from jsDelivr fallback with a clear error log.
+  - Fix `cli.ts` builder import path (`./build-engine/builder.js`).
+  - Fix `url-resolver.ts` dynamic import path for `file-path-resolver`.
+  - Update peer deps: `@swissjs/core` → `0.1.8`, `@swissjs/compiler` → `0.1.5`.
+
 ## 0.2.31
 
 ### Patch Changes

package/dist/adapters/proxy/SwiteProxyError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SwiteProxyError.d.ts","sourceRoot":"","sources":["../../../src/adapters/proxy/SwiteProxyError.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAgB,SAAQ,KAAK;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO;CAOpE"}

package/dist/{proxy → adapters/proxy}/proxyToPython.d.ts

@@ -1,4 +1,4 @@
-import type { PythonServiceConfig } from "../config.js";
+import type { PythonServiceConfig } from "../../config/config.js";
 /**
  * Called by swite start on startup.
  * Disables localhost fallback — PYTHON_SERVICE_URL is the only valid base URL.

package/dist/adapters/proxy/proxyToPython.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxyToPython.d.ts","sourceRoot":"","sources":["../../../src/adapters/proxy/proxyToPython.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAMlE;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAExC;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAEjE;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAiDxE"}

package/dist/build-engine/builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/build-engine/builder.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,QAAQ,CAAiB;gBAErB,MAAM,EAAE,WAAW;IAezB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBd,cAAc;YAMd,iBAAiB;YA+BjB,gBAAgB;YAsEhB,6BAA6B;YA+J7B,MAAM;YAmdN,gBAAgB;YAchB,cAAc;YAuBd,SAAS;YAuBT,OAAO;IAgBrB,OAAO,CAAC,WAAW;YAQL,iBAAiB;YAyBjB,UAAU;YASV,aAAa;CAiC5B;AAED;;GAEG;AACH,wBAAsB,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9D"}

package/dist/{builder.js → build-engine/builder.js}

@@ -4,11 +4,11 @@
  * Licensed under the MIT License.
  */
 import { build as esbuild } from "esbuild";
-import { UiCompiler } from "@kibologic/compiler";
+import { UiCompiler } from "@swissjs/compiler";
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import chalk from "chalk";
-import { ModuleResolver } from "./resolver.js";
+import { ModuleResolver } from "../resolution/resolver.js";
 export class SwiteBuilder {
     constructor(config) {
         this.compiler = new UiCompiler();
@@ -28,18 +28,12 @@ export class SwiteBuilder {
     async build() {
         const startTime = Date.now();
         console.log(chalk.cyan("\n⚡ SWITE - Production Build\n"));
+        const tempDir = path.join(this.config.root, ".swite-build");
         try {
-            // Step 1: Clean output directory
             await this.cleanOutputDir();
-            // Step 2: Compile Swiss files to temp directory
-            const tempDir = path.join(this.config.root, ".swite-build");
             await this.compileSwissFiles(tempDir);
-            // Step 3: Bundle with esbuild
             await this.bundle(tempDir);
-            // Step 4: Copy public assets
             await this.copyPublicAssets();
-            // Step 5: Clean up temp directory
-            await fs.rm(tempDir, { recursive: true, force: true });
             const duration = Date.now() - startTime;
             console.log(chalk.green(`\n✅ Build completed in ${duration}ms\n`));
         }
@@ -47,6 +41,9 @@ export class SwiteBuilder {
             console.error(chalk.red("\n❌ Build failed:"), error);
             throw error;
         }
+        finally {
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
     }
     async cleanOutputDir() {
         console.log(chalk.blue("🧹 Cleaning output directory..."));
@@ -284,12 +281,9 @@ export class SwiteBuilder {
         // Configure esbuild to resolve workspace packages from temp directory
         const absWorkingDir = workspaceRoot || this.config.root;
         // const aliases = workspaceRoot ? await this.createAliases(workspaceRoot, tempDir) : {}; // Unused
-        // Mark Node.js built-ins and build-time-only deps as external
+        // Mark Node.js built-ins as external; user-facing framework packages are
+        // resolved at runtime — do not hardcode package scopes here
         const nodeBuiltins = [
-            "@kibologic/swite",
-            "@kibologic/core",
-            "@kibologic/*",
-            "@kibologic/*",
             "fs",
             "path",
             "os",

package/dist/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { resolve } from "node:path";
 import chalk from "chalk";
-import { SwiteServer } from "./server.js";
-import { loadUserConfig } from "./config-loader.js";
-import { startPythonDevService, stopPythonDevService, } from "./dev/pythonDevManager.js";
-import { setProductionMode } from "./proxy/proxyToPython.js";
+import { SwiteServer } from "./dev-engine/server.js";
+import { loadUserConfig } from "./config/config-loader.js";
+import { startPythonDevService, stopPythonDevService, } from "./dev-engine/pythonDevManager.js";
+import { setProductionMode } from "./adapters/proxy/proxyToPython.js";
 const [, , command, ...args] = process.argv;
 const root = resolve(process.cwd());
 async function dev() {
@@ -49,7 +49,7 @@ async function start() {
     await server.start();
 }
 async function build() {
-    const { SwiteBuilder } = await import("./builder.js");
+    const { SwiteBuilder } = await import("./build-engine/builder.js");
     const config = await loadUserConfig(root);
     const builder = new SwiteBuilder({
         root,

package/dist/config/config-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAgC3E"}

package/dist/{config.d.ts → config/config.d.ts}

@@ -20,6 +20,17 @@ export interface ServerConfig {
 export interface SwiteUserConfig {
     server?: ServerConfig;
     services?: ServicesConfig;
+    /**
+     * Package scopes that should be treated as "internal" or "private".
+     * These scopes prioritize local/monorepo resolution and are forbidden from CDN redirects.
+     * e.g. ["@kibologic", "@alpine"]
+     */
+    internalScopes?: string[];
+    /**
+     * Manual override for sibling repository lookup.
+     * Swite will search these directories for local package source code.
+     */
+    siblingRepositories?: string[];
 }
 /**
  * Define swite configuration with full TypeScript validation.

package/dist/config/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,CAErE"}

package/dist/config/env.d.ts

@@ -0,0 +1,25 @@
+export interface EnvConfig {
+    mode?: "development" | "production";
+    prefix?: string;
+}
+/**
+ * Load environment variables from .env files.
+ * Supports .env, .env.local, .env.[mode], .env.[mode].local
+ */
+export declare function loadEnv(root: string, mode?: string, prefix?: string): Record<string, string>;
+/**
+ * Replace all import.meta.env references in compiled code with their literal values.
+ *
+ * This is the only correct approach for ES modules — import.meta is sealed and
+ * import.meta.env cannot be assigned at runtime. All substitution must happen at
+ * transform time (here, after esbuild strips TypeScript).
+ *
+ * Handles:
+ *  - import.meta.env.KEY  → JSON.stringify(env[KEY]) or "undefined"
+ *  - import.meta.env.DEV  → true/false literal
+ *  - import.meta.env.PROD → true/false literal
+ *  - import.meta.env.MODE → "development"/"production" literal
+ *  - bare import.meta.env → serialized object literal (for spread, typeof, etc.)
+ */
+export declare function inlineEnvReferences(code: string, env: Record<string, string>, mode?: string): string;
+//# sourceMappingURL=env.d.ts.map

package/dist/config/env.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/config/env.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,MAAsB,EAC5B,MAAM,GAAE,MAAiB,GACxB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,IAAI,GAAE,MAAsB,GAC3B,MAAM,CAsBR"}

package/dist/config/env.js

@@ -0,0 +1,84 @@
+/*
+ * Environment Variable Support for SWITE
+ * Provides import.meta.env replacement for SWITE
+ */
+import { readFileSync, existsSync } from "node:fs";
+import { join } from "node:path";
+/**
+ * Load environment variables from .env files.
+ * Supports .env, .env.local, .env.[mode], .env.[mode].local
+ */
+export function loadEnv(root, mode = "development", prefix = "SWITE_") {
+    const env = {};
+    const envFiles = [`.env.${mode}.local`, `.env.${mode}`, `.env.local`, `.env`];
+    for (const file of envFiles) {
+        const envPath = join(root, file);
+        if (!existsSync(envPath))
+            continue;
+        const content = readFileSync(envPath, "utf-8");
+        for (const line of content.split("\n")) {
+            const trimmed = line.trim();
+            if (!trimmed || trimmed.startsWith("#"))
+                continue;
+            const match = trimmed.match(/^([^=]+)=(.*)$/);
+            if (!match)
+                continue;
+            const key = match[1].trim();
+            const value = match[2].replace(/^["']|["']$/g, "");
+            if (key.startsWith(prefix) || key.startsWith("PUBLIC_")) {
+                env[key] = value;
+            }
+        }
+    }
+    return env;
+}
+/**
+ * Replace all import.meta.env references in compiled code with their literal values.
+ *
+ * This is the only correct approach for ES modules — import.meta is sealed and
+ * import.meta.env cannot be assigned at runtime. All substitution must happen at
+ * transform time (here, after esbuild strips TypeScript).
+ *
+ * Handles:
+ *  - import.meta.env.KEY  → JSON.stringify(env[KEY]) or "undefined"
+ *  - import.meta.env.DEV  → true/false literal
+ *  - import.meta.env.PROD → true/false literal
+ *  - import.meta.env.MODE → "development"/"production" literal
+ *  - bare import.meta.env → serialized object literal (for spread, typeof, etc.)
+ */
+export function inlineEnvReferences(code, env, mode = "development") {
+    if (!code.includes("import.meta.env"))
+        return code;
+    const isDev = mode !== "production";
+    // Named key access first (most specific)
+    code = code.replace(/\bimport\.meta\.env\.([A-Z_][A-Z0-9_]*)\b/g, (_, key) => {
+        if (key === "DEV")
+            return String(isDev);
+        if (key === "PROD")
+            return String(!isDev);
+        if (key === "MODE")
+            return JSON.stringify(mode);
+        if (key === "SSR")
+            return "false";
+        if (key in env)
+            return JSON.stringify(env[key]);
+        return "undefined";
+    });
+    // Bare import.meta.env (spread/typeof patterns)
+    if (code.includes("import.meta.env")) {
+        const envLiteral = buildEnvLiteral(env, mode);
+        code = code.replace(/\bimport\.meta\.env\b/g, envLiteral);
+    }
+    return code;
+}
+function buildEnvLiteral(env, mode) {
+    const isDev = mode !== "production";
+    const entries = [
+        `MODE:${JSON.stringify(mode)}`,
+        `DEV:${isDev}`,
+        `PROD:${!isDev}`,
+        `SSR:false`,
+        ...Object.entries(env).map(([k, v]) => `${JSON.stringify(k)}:${JSON.stringify(v)}`),
+    ];
+    return `({${entries.join(",")}})`;
+}

package/dist/{handlers → dev-engine/handlers}/base-handler.d.ts

@@ -1,9 +1,12 @@
 import type { Response } from "express";
-import { ModuleResolver } from "../resolver.js";
+import { ModuleResolver } from "../../resolution/resolver.js";
+import type { SwiteUserConfig } from "../../config/config.js";
 export interface HandlerContext {
     resolver: ModuleResolver;
     root: string;
     workspaceRoot: string | null;
+    env?: Record<string, string>;
+    userConfig?: SwiteUserConfig;
 }
 /**
  * Set cache-busting headers for development
@@ -17,5 +20,6 @@ export declare class BaseHandler {
     constructor(context: HandlerContext);
     protected resolveFilePath(url: string): Promise<string>;
     protected fileExists(filePath: string): Promise<boolean>;
+    protected getDependencies(compiled: string): Promise<string[]>;
 }
 //# sourceMappingURL=base-handler.d.ts.map

package/dist/dev-engine/handlers/base-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/base-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAMjD;AAED;;GAEG;AACH,qBAAa,WAAW;IACV,SAAS,CAAC,OAAO,EAAE,cAAc;gBAAvB,OAAO,EAAE,cAAc;cAE7B,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAI7C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAS9C,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmBrE"}

package/dist/dev-engine/handlers/base-handler.js

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024 Themba Mzumara
+ * SWITE - SWISS Development Server
+ * Licensed under the MIT License.
+ */
+import { promises as fs } from "node:fs";
+import { ModuleResolver } from "../../resolution/resolver.js";
+import { resolveFilePath } from "../../resolution/path/file-path-resolver.js";
+/**
+ * Set cache-busting headers for development
+ */
+export function setDevHeaders(res) {
+    // Prevent all caching during development
+    res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
+    res.setHeader("Pragma", "no-cache");
+    res.setHeader("Expires", "0");
+    res.setHeader("Surrogate-Control", "no-store");
+}
+/**
+ * Base handler utilities
+ */
+export class BaseHandler {
+    constructor(context) {
+        this.context = context;
+    }
+    async resolveFilePath(url) {
+        return resolveFilePath(url, this.context.root, this.context.workspaceRoot, this.context.userConfig);
+    }
+    async fileExists(filePath) {
+        try {
+            await fs.access(filePath);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async getDependencies(compiled) {
+        const deps = [];
+        const importPattern = /(?:import|from|export).*['"]([^'"]+)['"]/g;
+        let match;
+        while ((match = importPattern.exec(compiled)) !== null) {
+            const specifier = match[1];
+            if (specifier.startsWith("/") || specifier.startsWith("@")) {
+                try {
+                    const resolved = await this.context.resolver.resolve(specifier, "");
+                    if (resolved && !resolved.startsWith("http")) {
+                        deps.push(resolved);
+                    }
+                }
+                catch {
+                    // ignore resolution errors during dependency tracking
+                }
+            }
+        }
+        return deps;
+    }
+}

package/dist/dev-engine/handlers/js-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"js-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/js-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIxC,OAAO,EACL,WAAW,EAEX,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAK3B,qBAAa,SAAU,SAAQ,WAAW;IACxC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,cAAc;IAO7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsGxD"}

package/dist/{handlers → dev-engine/handlers}/js-handler.js

@@ -5,7 +5,7 @@
  */
 import { promises as fs } from "node:fs";
 import chalk from "chalk";
-import { rewriteImports } from "../import-rewriter.js";
+import { rewriteImports } from "../../resolution/rewriting/import-rewriter.js";
 import { BaseHandler, setDevHeaders, } from "./base-handler.js";
 import { UIHandler } from "./ui-handler.js";
 import { UIXHandler } from "./uix-handler.js";

package/dist/dev-engine/handlers/mjs-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mjs-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/mjs-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIxC,OAAO,EACL,WAAW,EAEX,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAG3B,qBAAa,UAAW,SAAQ,WAAW;IACzC,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,cAAc;IAK7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCxD"}

package/dist/{handlers → dev-engine/handlers}/mjs-handler.js

@@ -5,7 +5,7 @@
  */
 import { promises as fs } from "node:fs";
 import chalk from "chalk";
-import { rewriteImports } from "../import-rewriter.js";
+import { rewriteImports } from "../../resolution/rewriting/import-rewriter.js";
 import { BaseHandler, setDevHeaders, } from "./base-handler.js";
 import { JSHandler } from "./js-handler.js";
 export class MJSHandler extends BaseHandler {

package/dist/dev-engine/handlers/node-module-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-module-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/node-module-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKxC,OAAO,EAAE,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQrE,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,cAAc;IAO7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgPvD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CAmCjC"}

package/dist/{handlers → dev-engine/handlers}/node-module-handler.js

@@ -6,13 +6,14 @@
 import { promises as fs } from "node:fs";
 import * as path from "node:path";
 import chalk from "chalk";
-import { rewriteImports } from "../import-rewriter.js";
+import { rewriteImports } from "../../resolution/rewriting/import-rewriter.js";
 import { BaseHandler } from "./base-handler.js";
 import { UIHandler } from "./ui-handler.js";
 import { UIXHandler } from "./uix-handler.js";
 import { TSHandler } from "./ts-handler.js";
-import { findWorkspaceRoot } from "../utils/workspace.js";
-import { shouldUseCdnFallback } from "../utils/cdn-fallback.js";
+import { findWorkspaceRoot } from "../../kernel/workspace.js";
+import { findPackage } from "../../kernel/package-finder.js";
+import { shouldUseCdnFallback } from "../../resolution/cdn/cdn-fallback.js";
 export class NodeModuleHandler extends BaseHandler {
     constructor(context) {
         super(context);
@@ -64,52 +65,33 @@ export class NodeModuleHandler extends BaseHandler {
                     current = parent;
                 }
             }
+            // CONSOLIDATED DISCOVERY: Use the Generalized Package Finder
+            // This follows our "Local-First" priority: Siblings > Local node_modules > Workspace node_modules
             if (!filePath) {
-                // Try workspace root node_modules
-                if (workspaceRoot) {
-                    const workspaceNodeModulesPath = path.join(workspaceRoot, urlPath);
-                    console.log(chalk.blue(`[node_modules] Trying workspace path: ${workspaceNodeModulesPath}`));
-                    try {
-                        // Try to resolve symlinks first (realpath works even if path is a symlink)
-                        const resolvedPath = await fs.realpath(workspaceNodeModulesPath);
-                        console.log(chalk.blue(`[node_modules] Resolved to: ${resolvedPath}`));
-                        // Verify the resolved path exists
-                        await fs.access(resolvedPath);
-                        filePath = resolvedPath;
-                        console.log(chalk.green(`[node_modules] ✓ Found in workspace: ${urlPath}`));
-                    }
-                    catch (err2) {
-                        console.log(chalk.yellow(`[node_modules] Workspace path failed: ${err2 instanceof Error ? err2.message : String(err2)}`));
-                        // Try swiss-lib monorepo node_modules (dynamically found)
-                        const { findSwissLibMonorepo } = await import("../utils/package-finder.js");
-                        const swissLib = await findSwissLibMonorepo(this.context.root);
-                        if (swissLib) {
-                            const swissNodeModulesPath = path.join(swissLib, urlPath);
-                            console.log(chalk.blue(`[node_modules] Trying swiss-lib path: ${swissNodeModulesPath}`));
-                            try {
-                                // Try to resolve symlinks first (realpath works even if path is a symlink)
-                                const resolvedPath = await fs.realpath(swissNodeModulesPath);
-                                console.log(chalk.blue(`[node_modules] Resolved to: ${resolvedPath}`));
-                                // Verify the resolved path exists
-                                await fs.access(resolvedPath);
-                                filePath = resolvedPath;
-                                console.log(chalk.green(`[node_modules] ✓ Found in swiss-lib monorepo: ${urlPath}`));
-                            }
-                            catch (err3) {
-                                console.log(chalk.yellow(`[node_modules] swiss-lib path failed: ${err3 instanceof Error ? err3.message : String(err3)}`));
-                                // File not found in any location, will trigger case-insensitive search below
-                                filePath = path.join(this.context.root, urlPath);
+                const urlParts = urlPath.split("/");
+                const packageName = urlParts[1].startsWith("@") ? `${urlParts[1]}/${urlParts[2]}` : urlParts[1];
+                const remainingPath = urlParts[1].startsWith("@") ? urlParts.slice(3).join("/") : urlParts.slice(2).join("/");
+                const location = await findPackage(packageName, this.context.root, workspaceRoot);
+                if (location) {
+                    filePath = path.join(location.path, remainingPath);
+                    console.log(chalk.green(`[node_modules] ✓ Found ${packageName} via ${location.type}: ${filePath}`));
+                    // Re-use dist -> src fallback for local siblings
+                    if (location.type !== 'node_modules' && filePath.includes("/dist/")) {
+                        const srcPath = filePath.replace("/dist/", "/src/").replace(/\.[mc]?js$/, ".ts");
+                        try {
+                            await fs.access(srcPath);
+                            console.log(chalk.yellow(`[node_modules] Intercept: Serving local source instead of dist: ${srcPath}`));
+                            filePath = srcPath;
+                            if (srcPath.endsWith(".ts")) {
+                                return await this.tsHandler.handle(url.replace(/\.[mc]?js$/, ".ts"), res);
                             }
                         }
-                        else {
-                            // File not found in any location, will trigger case-insensitive search below
-                            filePath = path.join(this.context.root, urlPath);
-                        }
+                        catch { /* Fallback to original filePath */ }
                     }
                 }
-                else {
-                    filePath = path.join(this.context.root, urlPath);
-                }
+            }
+            if (!filePath) {
+                filePath = path.join(this.context.root, urlPath);
             }
             console.log(chalk.gray(`[node_modules] Resolving: ${url} -> ${filePath}`));
             // File path is already resolved from above, no need to resolve again
@@ -259,6 +241,13 @@ export class NodeModuleHandler extends BaseHandler {
         }
         if (!pkgName || pkgName === "." || pkgName === "..")
             return null;
+        // Never redirect internal/private scoped packages to public CDNs
+        const internalScopes = this.context.userConfig?.internalScopes || [];
+        const isInternal = internalScopes.some(scope => pkgName === scope || pkgName.startsWith(scope + "/"));
+        if (isInternal) {
+            console.log(chalk.red(`[node_modules] CDN Blocked: Internal scope package ${pkgName} cannot be served from jsDelivr.`));
+            return null;
+        }
         if (!shouldUseCdnFallback(pkgName))
             return null;
         // jsDelivr +esm serves ESM build; works for reflect-metadata and most npm packages

package/dist/{handlers → dev-engine/handlers}/ts-handler.d.ts

@@ -2,10 +2,6 @@ import type { Response } from "express";
 import { BaseHandler, type HandlerContext } from "./base-handler.js";
 export declare class TSHandler extends BaseHandler {
     constructor(context: HandlerContext);
-    /**
-     * Extract dependencies from compiled code (import paths)
-     */
-    private getDependencies;
     handle(url: string, res: Response): Promise<void>;
 }
 //# sourceMappingURL=ts-handler.d.ts.map

package/dist/dev-engine/handlers/ts-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ts-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/ts-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMxC,OAAO,EACL,WAAW,EAEX,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,SAAU,SAAQ,WAAW;gBAC5B,OAAO,EAAE,cAAc;IAI7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAuHxD"}

package/dist/{handlers → dev-engine/handlers}/ts-handler.js

@@ -5,37 +5,14 @@
  */
 import { promises as fs } from "node:fs";
 import chalk from "chalk";
-import { rewriteImports } from "../import-rewriter.js";
-import { compilationCache } from "../cache/compilation-cache.js";
+import { rewriteImports } from "../../resolution/rewriting/import-rewriter.js";
+import { inlineEnvReferences } from "../../config/env.js";
+import { compilationCache } from "../../internal/cache/compilation-cache.js";
 import { BaseHandler, setDevHeaders, } from "./base-handler.js";
 export class TSHandler extends BaseHandler {
     constructor(context) {
         super(context);
     }
-    /**
-     * Extract dependencies from compiled code (import paths)
-     */
-    async getDependencies(compiled) {
-        const deps = [];
-        const importPattern = /(?:import|from|export).*['"]([^'"]+)['"]/g;
-        let match;
-        while ((match = importPattern.exec(compiled)) !== null) {
-            const specifier = match[1];
-            // Only track absolute paths and workspace paths (not relative)
-            if (specifier.startsWith("/") || specifier.startsWith("@")) {
-                try {
-                    const resolved = await this.context.resolver.resolve(specifier, "");
-                    if (resolved && !resolved.startsWith("http")) {
-                        deps.push(resolved);
-                    }
-                }
-                catch {
-                    // Ignore resolution errors
-                }
-            }
-        }
-        return deps;
-    }
     async handle(url, res) {
         const filePath = await this.resolveFilePath(url);
         console.log(chalk.gray(`[.ts] ${url}`));
@@ -101,8 +78,8 @@ export class TSHandler extends BaseHandler {
             target: "esnext",
             sourcefile: filePath,
         });
-        const rewritten = await rewriteImports(result.code, filePath, this.context.resolver);
-        // Store in cache (use result.code as "compiled" for dependency tracking)
+        const inlined = inlineEnvReferences(result.code, this.context.env);
+        const rewritten = await rewriteImports(inlined, filePath, this.context.resolver);
         await compilationCache.set(filePath, result.code, rewritten, (compiled) => this.getDependencies(compiled));
         // Debug: Check for bare imports after rewriting
         const bareImportPattern = /(?:import|from|export).*['"](@[^'"]+\/[^'"]+)(?!\/)[^'"]*['"]/;

package/dist/{handlers → dev-engine/handlers}/ui-handler.d.ts

@@ -3,10 +3,6 @@ import { BaseHandler, type HandlerContext } from "./base-handler.js";
 export declare class UIHandler extends BaseHandler {
     private compiler;
     constructor(context: HandlerContext);
-    /**
-     * Extract dependencies from compiled code (import paths)
-     */
-    private getDependencies;
     handle(url: string, res: Response): Promise<void>;
 }
 //# sourceMappingURL=ui-handler.d.ts.map

package/dist/dev-engine/handlers/ui-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/ui-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAQxC,OAAO,EACL,WAAW,EAEX,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,SAAU,SAAQ,WAAW;IACxC,OAAO,CAAC,QAAQ,CAAoB;gBAExB,OAAO,EAAE,cAAc;IAI7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAkExD"}