@jskit-ai/kernel 0.1.96 → 0.1.98

package/client/descriptorSections.js

@@ -45,7 +45,7 @@ function normalizeDescriptorClientProviders(value) {
   return Object.freeze(providers);
 }
 
-function normalizeDescriptorClientOptimizeIncludeSpecifiers(value) {
+function normalizeDescriptorClientOptimizeSpecifiers(value) {
   return Object.freeze(sortStrings(value));
 }
 
@@ -61,15 +61,14 @@ function normalizeClientDescriptorSections(descriptorValue) {
   return Object.freeze({
     descriptorUiRoutes: normalizeDescriptorUiRoutes(ui.routes),
     descriptorClientProviders: normalizeDescriptorClientProviders(runtimeClient.providers),
-    descriptorClientOptimizeIncludeSpecifiers: normalizeDescriptorClientOptimizeIncludeSpecifiers(
-      optimizeDeps.include
-    )
+    descriptorClientOptimizeIncludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(optimizeDeps.include),
+    descriptorClientOptimizeExcludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(optimizeDeps.exclude)
   });
 }
 
 export {
   normalizeDescriptorUiRoutes,
   normalizeDescriptorClientProviders,
-  normalizeDescriptorClientOptimizeIncludeSpecifiers,
+  normalizeDescriptorClientOptimizeSpecifiers,
   normalizeClientDescriptorSections
 };

package/client/vite/clientBootstrapPlugin.js

@@ -5,7 +5,7 @@ import { normalizeObject } from "../../shared/support/normalize.js";
 import { sortStrings } from "../../shared/support/sorting.js";
 import {
   normalizeDescriptorClientProviders,
-  normalizeDescriptorClientOptimizeIncludeSpecifiers,
+  normalizeDescriptorClientOptimizeSpecifiers,
   normalizeDescriptorUiRoutes,
   normalizeClientDescriptorSections
 } from "../descriptorSections.js";
@@ -67,7 +67,8 @@ async function resolveInstalledClientModules({ appRoot, lockPath }) {
         sourceType: String(installedPackageState?.source?.type || "").trim().toLowerCase(),
         descriptorUiRoutes: descriptorSections.descriptorUiRoutes,
         descriptorClientProviders: descriptorSections.descriptorClientProviders,
-        descriptorClientOptimizeIncludeSpecifiers: descriptorSections.descriptorClientOptimizeIncludeSpecifiers
+        descriptorClientOptimizeIncludeSpecifiers: descriptorSections.descriptorClientOptimizeIncludeSpecifiers,
+        descriptorClientOptimizeExcludeSpecifiers: descriptorSections.descriptorClientOptimizeExcludeSpecifiers
       })
     );
   }
@@ -113,8 +114,11 @@ function normalizeClientModuleDescriptors(value) {
       sourceType,
       descriptorUiRoutes: normalizeDescriptorUiRoutes(record.descriptorUiRoutes),
       descriptorClientProviders: normalizeDescriptorClientProviders(record.descriptorClientProviders),
-      descriptorClientOptimizeIncludeSpecifiers: normalizeDescriptorClientOptimizeIncludeSpecifiers(
+      descriptorClientOptimizeIncludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(
         record.descriptorClientOptimizeIncludeSpecifiers
+      ),
+      descriptorClientOptimizeExcludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(
+        record.descriptorClientOptimizeExcludeSpecifiers
       )
     });
   }
@@ -158,22 +162,26 @@ function resolveClientOptimizeExcludeSpecifiers(clientModules = []) {
   const moduleDescriptors = normalizeClientModuleDescriptors(clientModules);
   const localSourceTypes = new Set(["local-package", "app-local-package"]);
   return sortStrings(
-    moduleDescriptors
-      .filter((entry) => localSourceTypes.has(entry.sourceType))
-      .flatMap((entry) => [entry.packageId, `${entry.packageId}/shared`, `${entry.packageId}/client`])
+    [
+      ...moduleDescriptors
+        .filter((entry) => localSourceTypes.has(entry.sourceType))
+        .flatMap((entry) => [entry.packageId, `${entry.packageId}/shared`, `${entry.packageId}/client`]),
+      ...moduleDescriptors.flatMap((entry) => entry.descriptorClientOptimizeExcludeSpecifiers || [])
+    ]
   );
 }
 
-function resolveClientOptimizeIncludeSpecifiers(clientModules = []) {
+function resolveClientOptimizeIncludeSpecifiers(clientModules = [], excludeSpecifiers = []) {
   const moduleDescriptors = normalizeClientModuleDescriptors(clientModules);
   const localSourceTypes = new Set(["local-package", "app-local-package"]);
+  const excluded = new Set(sortStrings(excludeSpecifiers));
   return sortStrings(
     [
       ...moduleDescriptors
       .filter((entry) => !localSourceTypes.has(entry.sourceType))
       .map((entry) => `${entry.packageId}/client`),
       ...moduleDescriptors.flatMap((entry) => entry.descriptorClientOptimizeIncludeSpecifiers || [])
-    ]
+    ].filter((specifier) => !excluded.has(specifier))
   );
 }
 
@@ -204,12 +212,12 @@ function createJskitClientBootstrapPlugin({ lockPath = ".jskit/lock.json" } = {}
       });
       const clientExcludeSpecifiers = resolveClientOptimizeExcludeSpecifiers(clientModules);
       const localScopeExcludeSpecifiers = resolveLocalScopeOptimizeExcludeSpecifiers(localScopePackageIds);
-      const clientIncludeSpecifiers = resolveClientOptimizeIncludeSpecifiers(clientModules);
       const userOptimizeDeps = normalizeObject(userConfig.optimizeDeps);
       const userExclude = sortStrings(userOptimizeDeps.exclude);
       const userInclude = sortStrings(userOptimizeDeps.include);
       const exclude = sortStrings([...userExclude, ...clientExcludeSpecifiers, ...localScopeExcludeSpecifiers]);
-      const include = sortStrings([...userInclude, ...clientIncludeSpecifiers]);
+      const clientIncludeSpecifiers = resolveClientOptimizeIncludeSpecifiers(clientModules, exclude);
+      const include = sortStrings([...userInclude, ...clientIncludeSpecifiers].filter((specifier) => !exclude.includes(specifier)));
       const userResolve = normalizeObject(userConfig.resolve);
       const dedupe = resolveClientRuntimeDedupeSpecifiers(userResolve);
 

package/client/vite/clientBootstrapPlugin.test.js

@@ -82,6 +82,31 @@ test("resolveClientOptimizeExcludeSpecifiers excludes local/app-local package ro
   ]);
 });
 
+test("resolveClientOptimizeExcludeSpecifiers includes descriptor-declared excludes", () => {
+  const exclude = resolveClientOptimizeExcludeSpecifiers([
+    {
+      packageId: "@z/pkg",
+      sourceType: "packages-directory",
+      descriptorUiRoutes: [],
+      descriptorClientOptimizeExcludeSpecifiers: ["@z/pkg/client"]
+    },
+    {
+      packageId: "@a/pkg",
+      sourceType: "local-package",
+      descriptorUiRoutes: [],
+      descriptorClientOptimizeExcludeSpecifiers: ["external-problem-dep"]
+    }
+  ]);
+
+  assert.deepEqual(exclude, [
+    "@a/pkg",
+    "@a/pkg/client",
+    "@a/pkg/shared",
+    "@z/pkg/client",
+    "external-problem-dep"
+  ]);
+});
+
 test("resolveClientOptimizeIncludeSpecifiers includes only non-local package clients", () => {
   const include = resolveClientOptimizeIncludeSpecifiers([
     {
@@ -109,6 +134,27 @@ test("resolveClientOptimizeIncludeSpecifiers includes only non-local package cli
   assert.deepEqual(include, ["@c/pkg/client", "@z/pkg/client"]);
 });
 
+test("resolveClientOptimizeIncludeSpecifiers omits excluded package clients", () => {
+  const include = resolveClientOptimizeIncludeSpecifiers(
+    [
+      {
+        packageId: "@z/pkg",
+        sourceType: "packages-directory",
+        descriptorUiRoutes: []
+      },
+      {
+        packageId: "@c/pkg",
+        sourceType: "npm",
+        descriptorUiRoutes: [],
+        descriptorClientOptimizeIncludeSpecifiers: ["extra-dep"]
+      }
+    ],
+    ["@z/pkg/client", "extra-dep"]
+  );
+
+  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, [
@@ -410,6 +456,58 @@ test("createJskitClientBootstrapPlugin config excludes installed client package
   }
 });
 
+test("createJskitClientBootstrapPlugin config lets descriptor excludes override automatic client includes", async () => {
+  const tempRoot = await mkdtemp(path.join(os.tmpdir(), "jskit-client-bootstrap-config-descriptor-exclude-"));
+  const previousCwd = process.cwd();
+
+  try {
+    await mkdir(path.join(tempRoot, ".jskit"), { recursive: true });
+    await writeJson(path.join(tempRoot, ".jskit", "lock.json"), {
+      lockVersion: 1,
+      installedPackages: {
+        "@example/app-bound-client": {
+          source: {
+            type: "npm"
+          }
+        }
+      }
+    });
+
+    const packageRoot = path.join(tempRoot, "node_modules", "@example", "app-bound-client");
+    await mkdir(packageRoot, { recursive: true });
+    await writeJson(path.join(packageRoot, "package.json"), {
+      name: "@example/app-bound-client",
+      exports: {
+        "./client": "./src/client/index.js"
+      }
+    });
+    await writeDescriptor(path.join(packageRoot, "package.descriptor.mjs"), {
+      metadata: {
+        client: {
+          optimizeDeps: {
+            include: ["safe-helper"],
+            exclude: ["@example/app-bound-client/client"]
+          }
+        }
+      }
+    });
+
+    process.chdir(tempRoot);
+    const plugin = createJskitClientBootstrapPlugin();
+    const result = await plugin.config({
+      optimizeDeps: {
+        include: ["@example/app-bound-client/client", "user-helper"],
+        exclude: ["user-excluded"]
+      }
+    });
+
+    assert.deepEqual(result.optimizeDeps.exclude, ["@example/app-bound-client/client", "user-excluded"]);
+    assert.deepEqual(result.optimizeDeps.include, ["safe-helper", "user-helper"]);
+  } finally {
+    process.chdir(previousCwd);
+  }
+});
+
 test("createJskitClientBootstrapPlugin config excludes local package roots and client/shared subpaths", async () => {
   const tempRoot = await mkdtemp(path.join(os.tmpdir(), "jskit-client-bootstrap-config-local-"));
   const previousCwd = process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "type": "module",
   "dependencies": {
     "json-rest-schema": "1.x.x"