@jskit-ai/kernel 0.1.210 → 0.1.212

package/client/vite/clientBootstrapPlugin.js

@@ -309,16 +309,11 @@ export { installedClientModules, bootInstalledClientModules };
 `;
 }
 
-// Vite-only: this Set-based source-type filter exists solely to drive optimizeDeps include/exclude decisions.
+// Explicit package exclusions remain separate from mutable local source resolution.
 function resolveClientOptimizeExcludeSpecifiers(clientModules = []) {
   const modulePackageMetadataEntries = normalizeClientModulePackageMetadataEntries(clientModules);
   return sortStrings(
-    [
-      ...modulePackageMetadataEntries
-        .filter((entry) => LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
-        .flatMap((entry) => [entry.packageId, `${entry.packageId}/shared`, `${entry.packageId}/client`]),
-      ...modulePackageMetadataEntries.flatMap((entry) => entry.packageMetadataClientOptimizeExcludeSpecifiers || [])
-    ]
+    modulePackageMetadataEntries.flatMap((entry) => entry.packageMetadataClientOptimizeExcludeSpecifiers || [])
   );
 }
 
@@ -335,12 +330,6 @@ function resolveClientOptimizeIncludeSpecifiers(clientModules = [], excludeSpeci
   );
 }
 
-function resolveLocalScopeOptimizeExcludeSpecifiers(localScopePackageIds = []) {
-  return sortStrings(
-    localScopePackageIds.flatMap((packageId) => [packageId, `${packageId}/shared`, `${packageId}/client`])
-  );
-}
-
 function resolveClientRuntimeDedupeSpecifiers(userResolveConfig = {}) {
   const resolveConfig = normalizeObject(userResolveConfig);
   const userDedupe = sortStrings(resolveConfig.dedupe);
@@ -352,6 +341,7 @@ function createJskitClientBootstrapPlugin({ proxyTarget = "" } = {}) {
   let hasMutableLocalPackages = false;
   let localPackages = Object.freeze([]);
   let resolvePackageSpecifier = null;
+  let clientScanSpecifiers = [];
 
   return {
     name: "jskit-client-bootstrap",
@@ -377,14 +367,12 @@ function createJskitClientBootstrapPlugin({ proxyTarget = "" } = {}) {
         installedPackages.some((entry) => LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
       );
       const clientExcludeSpecifiers = resolveClientOptimizeExcludeSpecifiers(clientModules);
-      const localScopeExcludeSpecifiers = resolveLocalScopeOptimizeExcludeSpecifiers(localScopePackageIds);
       const userOptimizeDeps = normalizeObject(userConfig.optimizeDeps);
       const userExclude = sortStrings(userOptimizeDeps.exclude);
       const userInclude = sortStrings(userOptimizeDeps.include);
       const exclude = sortStrings([
         ...userExclude,
-        ...clientExcludeSpecifiers,
-        ...localScopeExcludeSpecifiers
+        ...clientExcludeSpecifiers
       ]);
       const clientIncludeSpecifiers = resolveClientOptimizeIncludeSpecifiers(clientModules, exclude);
       const include = sortStrings([
@@ -392,6 +380,11 @@ function createJskitClientBootstrapPlugin({ proxyTarget = "" } = {}) {
         ...clientIncludeSpecifiers,
         CLIENT_BOOTSTRAP_MODULE_SPECIFIER
       ].filter((specifier) => !exclude.includes(specifier)));
+      // Vite cannot crawl the virtual bootstrap. Local and explicitly excluded clients
+      // still need scanning so their npm imports are ready before the first page loads.
+      clientScanSpecifiers = clientModules
+        .map((entry) => `${entry.packageId}/client`)
+        .filter((specifier) => !include.includes(specifier));
       const dedupe = resolveClientRuntimeDedupeSpecifiers(userResolve);
       const userServer = normalizeObject(userConfig.server);
       const userProxyEntries = normalizeObject(userServer.proxy);
@@ -415,7 +408,7 @@ function createJskitClientBootstrapPlugin({ proxyTarget = "" } = {}) {
         }
       };
     },
-    configResolved(resolvedConfig) {
+    async configResolved(resolvedConfig) {
       if (hasMutableLocalPackages && resolvedConfig.resolve?.preserveSymlinks === true) {
         throw new Error(
           "JSKIT mutable local packages require Vite real-path resolution. Remove resolve.preserveSymlinks: true."
@@ -426,6 +419,28 @@ function createJskitClientBootstrapPlugin({ proxyTarget = "" } = {}) {
       // its dependency ?v hash) before JSKIT sees the selected file. The config resolver applies the
       // app's aliases, exports conditions, and wildcard rules without registering an optimized dep.
       resolvePackageSpecifier = resolvedConfig.createResolver({ scan: true });
+      if (clientScanSpecifiers.length === 0) {
+        return;
+      }
+      const clientEntries = await Promise.all(clientScanSpecifiers.map(async (specifier) => {
+        const entry = await resolvePackageSpecifier(specifier, path.join(appRoot, "package.json"));
+        if (!entry) {
+          throw new Error(`Cannot resolve JSKIT client dependency scan entry ${specifier}.`);
+        }
+        const localPackage = resolveLocalPackageForSpecifier(specifier, localPackages);
+        return localPackage ? resolveCanonicalLocalPackageId(entry, localPackage) || entry : entry;
+      }));
+      const optimizeDeps = resolvedConfig.environments.client.optimizeDeps;
+      const input = resolvedConfig.environments.client.input ?? resolvedConfig.build.rolldownOptions.input;
+      const entries = optimizeDeps.entries ?? (input
+        ? (typeof input === "string" || Array.isArray(input) ? input : Object.values(input))
+        : ["**/*.html", "!**/__tests__/**", "!**/coverage/**"]);
+      const scanEntries = sortStrings([
+        ...(Array.isArray(entries) ? entries : [entries]),
+        ...clientEntries
+      ]);
+      optimizeDeps.entries = scanEntries;
+      resolvedConfig.optimizeDeps.entries = scanEntries;
     },
     async resolveId(source, importer) {
       if (source === CLIENT_BOOTSTRAP_VIRTUAL_ID) {
@@ -472,7 +487,6 @@ export {
   resolveCanonicalLocalPackageId,
   resolveLocalPackageForSpecifier,
   resolveLocalPackageSources,
-  resolveLocalScopeOptimizeExcludeSpecifiers,
   resolveInstalledClientPackageIds,
   resolveLocalScopePackageIds,
   resolveInstalledClientModules,

package/client/vite/clientBootstrapPlugin.test.js

@@ -11,7 +11,6 @@ import {
   resolveCanonicalLocalPackageId,
   resolveLocalPackageForSpecifier,
   resolveLocalPackageSources,
-  resolveLocalScopeOptimizeExcludeSpecifiers,
   resolveClientOptimizeIncludeSpecifiers,
   resolveClientOptimizeExcludeSpecifiers,
   resolveLocalScopePackageIds,
@@ -164,7 +163,7 @@ test("createVirtualModuleSource renders deterministic client module imports", ()
   assert.match(source, /installedClientModules/);
 });
 
-test("resolveClientOptimizeExcludeSpecifiers excludes local/app-local package roots and client/shared subpaths", () => {
+test("resolveClientOptimizeExcludeSpecifiers lets Vite scan local source imports", () => {
   const exclude = resolveClientOptimizeExcludeSpecifiers([
     {
       packageId: "@z/pkg",
@@ -188,14 +187,7 @@ test("resolveClientOptimizeExcludeSpecifiers excludes local/app-local package ro
     }
   ]);
 
-  assert.deepEqual(exclude, [
-    "@a/pkg",
-    "@a/pkg/client",
-    "@a/pkg/shared",
-    "@b/pkg",
-    "@b/pkg/client",
-    "@b/pkg/shared"
-  ]);
+  assert.deepEqual(exclude, []);
 });
 
 test("resolveClientOptimizeExcludeSpecifiers includes packageMetadata-declared excludes", () => {
@@ -215,9 +207,6 @@ test("resolveClientOptimizeExcludeSpecifiers includes packageMetadata-declared e
   ]);
 
   assert.deepEqual(exclude, [
-    "@a/pkg",
-    "@a/pkg/client",
-    "@a/pkg/shared",
     "@z/pkg/client",
     "external-problem-dep"
   ]);
@@ -271,18 +260,6 @@ test("resolveClientOptimizeIncludeSpecifiers omits excluded package clients", ()
   assert.deepEqual(include, ["@c/pkg/client"]);
 });
 
-test("resolveLocalScopeOptimizeExcludeSpecifiers expands @local package ids to root/client/shared", () => {
-  const exclude = resolveLocalScopeOptimizeExcludeSpecifiers(["@local/app", "@local/feature"]);
-  assert.deepEqual(exclude, [
-    "@local/app",
-    "@local/app/client",
-    "@local/app/shared",
-    "@local/feature",
-    "@local/feature/client",
-    "@local/feature/shared"
-  ]);
-});
-
 test("resolveInstalledClientPackageIds returns only installed packages with a client export", async () => {
   const tempRoot = await mkdtemp(path.join(os.tmpdir(), "jskit-client-bootstrap-"));
   const appRoot = tempRoot;
@@ -681,11 +658,14 @@ test("createJskitClientBootstrapPlugin resolves multiple local packages before V
       ["@example/local-utility", path.join(tempRoot, "node_modules", "@example", "local-utility", "browser", "utility.js")],
       ["@example/local-utility/shared", path.join(tempRoot, "node_modules", "@example", "local-utility", "browser", "utility-shared.js")]
     ]);
-    plugin.configResolved({
+    await plugin.configResolved({
+      optimizeDeps: {},
+      environments: { client: { optimizeDeps: { entries: ["index.html"] } } },
+      build: { rolldownOptions: {} },
       createResolver(options) {
         assert.equal(options.scan, true);
         return async (source, importer) => {
-          assert.equal(importer, undefined);
+          assert.ok(importer === undefined || importer === path.join(tempRoot, "package.json"));
           return viteResolvedIds.get(source);
         };
       }
@@ -812,7 +792,7 @@ test("createJskitClientBootstrapPlugin config lets packageMetadata excludes over
   }
 });
 
-test("createJskitClientBootstrapPlugin config excludes local package roots and client/shared subpaths", async () => {
+test("createJskitClientBootstrapPlugin config keeps local packages as scannable source", async () => {
   const tempRoot = await mkdtemp(path.join(os.tmpdir(), "jskit-client-bootstrap-config-local-"));
   const previousCwd = process.cwd();
 
@@ -862,11 +842,7 @@ test("createJskitClientBootstrapPlugin config excludes local package roots and c
       }
     });
 
-    assert.deepEqual(result.optimizeDeps.exclude, [
-      "@example/local-client",
-      "@example/local-client/client",
-      "@example/local-client/shared"
-    ]);
+    assert.deepEqual(result.optimizeDeps.exclude, []);
     assert.deepEqual(result.optimizeDeps.include, [
       "@example/remote-client/client",
       "@jskit-ai/kernel/client/moduleBootstrap",
@@ -910,7 +886,7 @@ test("createJskitClientBootstrapPlugin config preserves user resolve fields and
   }
 });
 
-test("createJskitClientBootstrapPlugin config excludes all @local scoped packages from package.json", async () => {
+test("createJskitClientBootstrapPlugin config uses real paths for @local scoped packages", async () => {
   const tempRoot = await mkdtemp(path.join(os.tmpdir(), "jskit-client-bootstrap-local-scope-config-"));
   const previousCwd = process.cwd();
 
@@ -944,14 +920,7 @@ test("createJskitClientBootstrapPlugin config excludes all @local scoped package
     const plugin = createJskitClientBootstrapPlugin();
     const result = await plugin.config({});
 
-    assert.deepEqual(result.optimizeDeps.exclude, [
-      "@local/feature",
-      "@local/feature/client",
-      "@local/feature/shared",
-      "@local/main",
-      "@local/main/client",
-      "@local/main/shared"
-    ]);
+    assert.deepEqual(result.optimizeDeps.exclude, []);
     assert.deepEqual(result.optimizeDeps.include, [
       "@example/remote-client/client",
       "@jskit-ai/kernel/client/moduleBootstrap"
@@ -976,7 +945,7 @@ test("createJskitClientBootstrapPlugin rejects a later preserveSymlinks override
     const result = await plugin.config({});
 
     assert.equal(result.resolve.preserveSymlinks, false);
-    assert.throws(
+    await assert.rejects(
       () => plugin.configResolved({
         resolve: {
           preserveSymlinks: true

package/client/vite/clientDependencyScan.test.js

@@ -0,0 +1,93 @@
+import assert from "node:assert/strict";
+import { mkdtemp, mkdir, rm, symlink, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import test from "node:test";
+import { optimizeDeps, resolveConfig } from "vite";
+import { createJskitClientBootstrapPlugin } from "./clientBootstrapPlugin.js";
+
+const scanCases = [
+  { name: "workspace with explicit entries", localDependency: "1.0.0", config: { optimizeDeps: { entries: ["src/main.js"] } } },
+  { name: "workspace with default HTML discovery", localDependency: "1.0.0", config: {} },
+  { name: "workspace with build inputs", localDependency: "1.0.0", config: { build: { rolldownOptions: { input: { app: "src/main.js" } } } } },
+  { name: "file dependency", localDependency: "file:packages/main", config: { optimizeDeps: { entries: ["src/main.js"] } } }
+];
+
+for (const scanCase of scanCases) {
+  test(`cold scan discovers virtual client and local shared dependencies: ${scanCase.name}`, async () => {
+    const root = await mkdtemp(path.join(os.tmpdir(), "jskit-client-dependency-scan-"));
+    const previousCwd = process.cwd();
+    const write = async (name, source) => {
+      const target = path.join(root, name);
+      await mkdir(path.dirname(target), { recursive: true });
+      await writeFile(target, typeof source === "string" ? source : JSON.stringify(source));
+    };
+
+    try {
+      await write("package.json", {
+        name: "client-scan-fixture", type: "module", private: true,
+        workspaces: ["packages/*"],
+        dependencies: {
+          "@local/main": scanCase.localDependency,
+          "@local/utility": "1.0.0",
+          "@example/shell": "1.0.0"
+        }
+      });
+      await write("index.html", '<script type="module" src="/src/main.js"></script>');
+      await write("__tests__/ignored.html", '<script type="module">import "missing-test-only";</script>');
+      await write("src/main.js", 'import "virtual:jskit-client-bootstrap";');
+      await write("packages/main/package.json", {
+        name: "@local/main", version: "1.0.0", type: "module",
+        jskit: { kind: "runtime" },
+        exports: { "./client": { browser: "./browser.js", default: "./server.js" } }
+      });
+      await write("packages/main/browser.js", 'import "client-helper"; import "@local/utility/shared"; import("./Page.vue");');
+      await write("packages/main/server.js", 'import "server-only-missing";');
+      await write("packages/main/Page.vue", '<script setup>import "page-helper";</script><template>Page</template>');
+      await write("packages/utility/package.json", {
+        name: "@local/utility", version: "1.0.0", type: "module",
+        exports: { "./shared": "./shared.js" }
+      });
+      await write("packages/utility/shared.js", 'import "shared-helper";');
+      await mkdir(path.join(root, "node_modules/@local"), { recursive: true });
+      for (const name of ["main", "utility"]) {
+        await symlink(path.join(root, "packages", name), path.join(root, "node_modules/@local", name));
+      }
+      await write("node_modules/@example/shell/package.json", {
+        name: "@example/shell", version: "1.0.0", type: "module",
+        exports: { "./client": "./client.js" },
+        jskit: { metadata: { client: { optimizeDeps: { exclude: ["@example/shell/client"] } } } }
+      });
+      await write("node_modules/@example/shell/client.js", 'import "/src/shell-content.js";');
+      await write("src/shell-content.js", 'import "shell-helper";');
+      await write("node_modules/@jskit-ai/kernel/package.json", {
+        name: "@jskit-ai/kernel", version: "1.0.0", type: "module",
+        exports: { "./client/moduleBootstrap": "./bootstrap.js" }
+      });
+      await write("node_modules/@jskit-ai/kernel/bootstrap.js", "export const bootClientModules = () => {};");
+      for (const name of ["client-helper", "shared-helper", "page-helper", "shell-helper"]) {
+        await write(`node_modules/${name}/package.json`, {
+          name, version: "1.0.0", type: "module", exports: "./index.js"
+        });
+        await write(`node_modules/${name}/index.js`, "export const value = 1;");
+      }
+
+      process.chdir(root);
+      const config = await resolveConfig({
+        configFile: false,
+        logLevel: "silent",
+        plugins: [createJskitClientBootstrapPlugin()],
+        ...scanCase.config
+      }, "serve");
+      const metadata = await optimizeDeps(config, true);
+      for (const name of ["client-helper", "shared-helper", "page-helper", "shell-helper"]) {
+        assert.ok(metadata.optimized[name], `${name} must be ready before the browser loads a page`);
+      }
+      assert.equal(Object.keys(metadata.optimized).some((id) => id.startsWith("@local/")), false);
+      assert.equal(metadata.optimized["@example/shell/client"], undefined);
+    } finally {
+      process.chdir(previousCwd);
+      await rm(root, { recursive: true, force: true });
+    }
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.210",
+  "version": "0.1.212",
   "type": "module",
   "dependencies": {
     "json-rest-schema": "^1.0.17"