@jskit-ai/kernel 0.1.147 → 0.1.149

package/client/vite/clientBootstrapPlugin.js

@@ -1,14 +1,17 @@
 import { readFile } from "node:fs/promises";
 import path from "node:path";
-import { loadInstalledPackageDescriptor } from "../../internal/node/installedPackageDescriptor.js";
+import {
+  collectRootDependencySpecifiers,
+  discoverInstalledPackages
+} from "../../internal/node/installedPackages.js";
 import { normalizeObject } from "../../shared/support/normalize.js";
 import { sortStrings } from "../../shared/support/sorting.js";
 import {
-  normalizeDescriptorClientProviders,
-  normalizeDescriptorClientOptimizeSpecifiers,
-  normalizeDescriptorUiRoutes,
-  normalizeClientDescriptorSections
-} from "../descriptorSections.js";
+  normalizePackageMetadataClientProviders,
+  normalizePackageMetadataClientOptimizeSpecifiers,
+  normalizePackageMetadataUiRoutes,
+  normalizeClientPackageMetadataSections
+} from "../packageMetadataSections.js";
 
 const CLIENT_BOOTSTRAP_VIRTUAL_ID = "virtual:jskit-client-bootstrap";
 const CLIENT_BOOTSTRAP_RESOLVED_ID = `\0${CLIENT_BOOTSTRAP_VIRTUAL_ID}`;
@@ -54,35 +57,23 @@ function isPathInsideRoot(rootPath, candidatePath) {
  * That hash does not change when local source changes, which lets a browser reuse stale client code
  * even after Vite restarts.
  *
- * Build this table from every lock-classified local package, not only packages with a ./client export.
+ * Build this table from every local package declared by the app, not only packages with a ./client export.
  * Resolving only the bootstrap entry is insufficient: a local client can use bare imports from another
  * local package's root, shared entry, or exported subpath and accidentally re-enter node_modules caching.
  */
-async function resolveLocalPackageSources({ appRoot, lockPath }) {
-  const absoluteLockPath = path.resolve(appRoot, lockPath);
-  const lockPayload = await readJsonFile(absoluteLockPath, {});
-  const installedPackages = normalizeObject(lockPayload.installedPackages);
-  const packages = [];
-
-  for (const packageId of sortStrings(Object.keys(installedPackages))) {
-    const installedPackageState = normalizeObject(installedPackages[packageId]);
-    const source = normalizeObject(installedPackageState.source);
-    const sourceType = String(source.type || "").trim().toLowerCase();
-    const packagePath = String(source.packagePath || "").trim();
-    if (!LOCAL_PACKAGE_SOURCE_TYPES.has(sourceType) || !packagePath) {
-      continue;
-    }
-
-    packages.push(
-      Object.freeze({
-        packageId,
-        installedPackageRoot: path.resolve(appRoot, "node_modules", ...packageId.split("/")),
-        sourcePackageRoot: path.resolve(appRoot, packagePath)
-      })
-    );
-  }
-
-  return Object.freeze(packages);
+async function resolveLocalPackageSources({ appRoot }) {
+  const installedPackages = await discoverInstalledPackages({ appRoot });
+  return Object.freeze(
+    installedPackages
+      .filter((entry) => LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
+      .map((entry) =>
+        Object.freeze({
+          packageId: entry.packageId,
+          installedPackageRoot: entry.installedPackageRoot,
+          sourcePackageRoot: entry.sourcePackageRoot
+        })
+      )
+  );
 }
 
 function splitSpecifierSuffix(source) {
@@ -126,37 +117,23 @@ function resolveCanonicalLocalPackageId(resolvedId, localPackage) {
     : "";
 }
 
-async function resolveInstalledClientModules({ appRoot, lockPath }) {
-  const absoluteLockPath = path.resolve(appRoot, lockPath);
-  const lockPayload = await readJsonFile(absoluteLockPath, {});
-  const installedPackages = normalizeObject(lockPayload.installedPackages);
-  const packageIds = sortStrings(Object.keys(installedPackages));
-
+async function resolveInstalledClientModules({ appRoot }) {
+  const installedPackages = await discoverInstalledPackages({ appRoot });
   const modules = [];
-  for (const packageId of packageIds) {
-    const installedPackageState = normalizeObject(installedPackages[packageId]);
-    const packageJsonPath = path.resolve(appRoot, "node_modules", ...packageId.split("/"), "package.json");
-    const packageJson = await readJsonFile(packageJsonPath, {});
-    if (!hasClientExport(packageJson)) {
+  for (const installedPackage of installedPackages) {
+    if (!hasClientExport(installedPackage.packageJson)) {
       continue;
     }
-
-    const descriptorRecord = await loadInstalledPackageDescriptor({
-      appRoot,
-      packageId,
-      installedPackageState,
-      required: false
-    });
-    const descriptorSections = normalizeClientDescriptorSections(descriptorRecord.descriptor);
+    const packageMetadataSections = normalizeClientPackageMetadataSections(installedPackage.packageMetadata);
 
     modules.push(
       Object.freeze({
-        packageId,
-        sourceType: String(installedPackageState?.source?.type || "").trim().toLowerCase(),
-        descriptorUiRoutes: descriptorSections.descriptorUiRoutes,
-        descriptorClientProviders: descriptorSections.descriptorClientProviders,
-        descriptorClientOptimizeIncludeSpecifiers: descriptorSections.descriptorClientOptimizeIncludeSpecifiers,
-        descriptorClientOptimizeExcludeSpecifiers: descriptorSections.descriptorClientOptimizeExcludeSpecifiers
+        packageId: installedPackage.packageId,
+        sourceType: installedPackage.sourceType,
+        packageMetadataUiRoutes: packageMetadataSections.packageMetadataUiRoutes,
+        packageMetadataClientProviders: packageMetadataSections.packageMetadataClientProviders,
+        packageMetadataClientOptimizeIncludeSpecifiers: packageMetadataSections.packageMetadataClientOptimizeIncludeSpecifiers,
+        packageMetadataClientOptimizeExcludeSpecifiers: packageMetadataSections.packageMetadataClientOptimizeExcludeSpecifiers
       })
     );
   }
@@ -169,26 +146,20 @@ async function resolveInstalledClientPackageIds(options) {
   return Object.freeze(modules.map((entry) => entry.packageId));
 }
 
-async function resolveLocalScopePackageIds({ appRoot, lockPath }) {
-  const absoluteLockPath = path.resolve(appRoot, lockPath);
-  const lockPayload = await readJsonFile(absoluteLockPath, {});
-  const installedPackages = normalizeObject(lockPayload.installedPackages);
-  const localScopeFromLock = Object.keys(installedPackages).filter((packageId) => isLocalScopePackageId(packageId));
-
+async function resolveLocalScopePackageIds({ appRoot }) {
   const appPackageJson = await readJsonFile(path.resolve(appRoot, "package.json"), {});
-  const localScopeFromPackageJson = Object.keys({
-    ...normalizeObject(appPackageJson.dependencies),
-    ...normalizeObject(appPackageJson.devDependencies),
-    ...normalizeObject(appPackageJson.optionalDependencies),
-    ...normalizeObject(appPackageJson.peerDependencies)
-  }).filter((packageId) => isLocalScopePackageId(packageId));
-
-  return Object.freeze(sortStrings([...localScopeFromLock, ...localScopeFromPackageJson]));
+  return Object.freeze(
+    sortStrings(
+      [...collectRootDependencySpecifiers(appPackageJson).keys()].filter((packageId) =>
+        isLocalScopePackageId(packageId)
+      )
+    )
+  );
 }
 
-function normalizeClientModuleDescriptors(value) {
+function normalizeClientModulePackageMetadataEntries(value) {
   const items = Array.isArray(value) ? value : [];
-  const descriptors = [];
+  const packageMetadataEntries = [];
 
   for (const item of items) {
     const record = normalizeObject(item);
@@ -197,33 +168,33 @@ function normalizeClientModuleDescriptors(value) {
       continue;
     }
     const sourceType = String(record.sourceType || "").trim().toLowerCase();
-    descriptors.push({
+    packageMetadataEntries.push({
       packageId,
       sourceType,
-      descriptorUiRoutes: normalizeDescriptorUiRoutes(record.descriptorUiRoutes),
-      descriptorClientProviders: normalizeDescriptorClientProviders(record.descriptorClientProviders),
-      descriptorClientOptimizeIncludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(
-        record.descriptorClientOptimizeIncludeSpecifiers
+      packageMetadataUiRoutes: normalizePackageMetadataUiRoutes(record.packageMetadataUiRoutes),
+      packageMetadataClientProviders: normalizePackageMetadataClientProviders(record.packageMetadataClientProviders),
+      packageMetadataClientOptimizeIncludeSpecifiers: normalizePackageMetadataClientOptimizeSpecifiers(
+        record.packageMetadataClientOptimizeIncludeSpecifiers
       ),
-      descriptorClientOptimizeExcludeSpecifiers: normalizeDescriptorClientOptimizeSpecifiers(
-        record.descriptorClientOptimizeExcludeSpecifiers
+      packageMetadataClientOptimizeExcludeSpecifiers: normalizePackageMetadataClientOptimizeSpecifiers(
+        record.packageMetadataClientOptimizeExcludeSpecifiers
       )
     });
   }
 
   return Object.freeze(
-    descriptors.sort((left, right) => left.packageId.localeCompare(right.packageId))
+    packageMetadataEntries.sort((left, right) => left.packageId.localeCompare(right.packageId))
   );
 }
 
 function createVirtualModuleSource(clientModules = []) {
-  const moduleDescriptors = normalizeClientModuleDescriptors(clientModules);
-  const importLines = moduleDescriptors.map(
+  const modulePackageMetadataEntries = normalizeClientModulePackageMetadataEntries(clientModules);
+  const importLines = modulePackageMetadataEntries.map(
     (entry, index) => `import * as clientModule${index} from ${JSON.stringify(`${entry.packageId}/client`)};`
   );
-  const moduleEntries = moduleDescriptors.map(
+  const moduleEntries = modulePackageMetadataEntries.map(
     (entry, index) =>
-      `  { packageId: ${JSON.stringify(entry.packageId)}, module: clientModule${index}, descriptorUiRoutes: ${JSON.stringify(entry.descriptorUiRoutes)}, descriptorClientProviders: ${JSON.stringify(entry.descriptorClientProviders)} }`
+      `  { packageId: ${JSON.stringify(entry.packageId)}, module: clientModule${index}, packageMetadataUiRoutes: ${JSON.stringify(entry.packageMetadataUiRoutes)}, packageMetadataClientProviders: ${JSON.stringify(entry.packageMetadataClientProviders)} }`
   );
 
   const entriesSource = moduleEntries.length > 0 ? moduleEntries.join(",\n") : "";
@@ -247,26 +218,26 @@ export { installedClientModules, bootInstalledClientModules };
 
 // Vite-only: this Set-based source-type filter exists solely to drive optimizeDeps include/exclude decisions.
 function resolveClientOptimizeExcludeSpecifiers(clientModules = []) {
-  const moduleDescriptors = normalizeClientModuleDescriptors(clientModules);
+  const modulePackageMetadataEntries = normalizeClientModulePackageMetadataEntries(clientModules);
   return sortStrings(
     [
-      ...moduleDescriptors
+      ...modulePackageMetadataEntries
         .filter((entry) => LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
         .flatMap((entry) => [entry.packageId, `${entry.packageId}/shared`, `${entry.packageId}/client`]),
-      ...moduleDescriptors.flatMap((entry) => entry.descriptorClientOptimizeExcludeSpecifiers || [])
+      ...modulePackageMetadataEntries.flatMap((entry) => entry.packageMetadataClientOptimizeExcludeSpecifiers || [])
     ]
   );
 }
 
 function resolveClientOptimizeIncludeSpecifiers(clientModules = [], excludeSpecifiers = []) {
-  const moduleDescriptors = normalizeClientModuleDescriptors(clientModules);
+  const modulePackageMetadataEntries = normalizeClientModulePackageMetadataEntries(clientModules);
   const excluded = new Set(sortStrings(excludeSpecifiers));
   return sortStrings(
     [
-      ...moduleDescriptors
+      ...modulePackageMetadataEntries
       .filter((entry) => !LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
       .map((entry) => `${entry.packageId}/client`),
-      ...moduleDescriptors.flatMap((entry) => entry.descriptorClientOptimizeIncludeSpecifiers || [])
+      ...modulePackageMetadataEntries.flatMap((entry) => entry.packageMetadataClientOptimizeIncludeSpecifiers || [])
     ].filter((specifier) => !excluded.has(specifier))
   );
 }
@@ -283,7 +254,7 @@ function resolveClientRuntimeDedupeSpecifiers(userResolveConfig = {}) {
   return sortStrings([...userDedupe, ...CLIENT_RUNTIME_DEDUPE_SPECIFIERS]);
 }
 
-function createJskitClientBootstrapPlugin({ lockPath = ".jskit/lock.json" } = {}) {
+function createJskitClientBootstrapPlugin() {
   let appRoot = process.cwd();
   let localPackages = Object.freeze([]);
   let resolvePackageSpecifier = null;
@@ -295,17 +266,14 @@ function createJskitClientBootstrapPlugin({ lockPath = ".jskit/lock.json" } = {}
     async config(userConfig = {}) {
       appRoot = process.cwd();
       const clientModules = await resolveInstalledClientModules({
-        appRoot,
-        lockPath
+        appRoot
       });
       const localScopePackageIds = await resolveLocalScopePackageIds({
-        appRoot,
-        lockPath
+        appRoot
       });
       const userResolve = normalizeObject(userConfig.resolve);
       localPackages = await resolveLocalPackageSources({
-        appRoot,
-        lockPath
+        appRoot
       });
       const clientExcludeSpecifiers = resolveClientOptimizeExcludeSpecifiers(clientModules);
       const localScopeExcludeSpecifiers = resolveLocalScopeOptimizeExcludeSpecifiers(localScopePackageIds);
@@ -364,8 +332,7 @@ function createJskitClientBootstrapPlugin({ lockPath = ".jskit/lock.json" } = {}
       }
 
       const clientModules = await resolveInstalledClientModules({
-        appRoot,
-        lockPath
+        appRoot
       });
 
       return createVirtualModuleSource(clientModules);