@ecopages/core 0.2.0-alpha.38 → 0.2.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-alpha.38",
+  "version": "0.2.0-alpha.39",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-alpha.38",
+    "@ecopages/file-system": "0.2.0-alpha.39",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@worker-tools/html-rewriter": "0.1.0-pre.19",

package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.d.ts

@@ -1,7 +1,42 @@
 import type { NodeModuleScriptAsset } from '../../assets.types.js';
 import { BaseScriptProcessor } from '../base/base-script-processor.js';
+/**
+ * Processes browser script assets whose entrypoint is referenced by package specifier.
+ *
+ * @remarks
+ * Resolution stays app-boundary-first: prefer the active build adapter, then fall back
+ * to ESM export-map resolution, and only then probe a small set of literal file paths.
+ */
 export declare class NodeModuleScriptProcessor extends BaseScriptProcessor<NodeModuleScriptAsset> {
     process(dep: NodeModuleScriptAsset): Promise<import("../../assets.types.js").ProcessedAsset>;
+    /**
+     * Resolves a node-module script entry from the current app boundary.
+     *
+     * @remarks
+     * The build adapter remains the primary resolution surface because Bun/native
+     * host-owned builds may have a more accurate view of aliases and package
+     * ownership than core does. The local fallback only runs when that adapter
+     * resolution is unavailable.
+     */
     private resolveModulePath;
+    /**
+     * Resolves browser-owned script specifiers without relying on CommonJS resolution.
+     *
+     * @remarks
+     * This path intentionally stays ESM-first because these assets are emitted as
+     * browser scripts. We first ask Node's ESM resolver to evaluate the package
+     * export map from the app boundary. If that still fails, we fall back to a
+     * bounded filesystem probe so direct file installs and package subpaths like
+     * `pkg/client/entry` still resolve when the export map does not cover them.
+     */
     private resolveModulePathFallback;
+    /**
+     * Returns the file candidates we accept during the final literal filesystem probe.
+     *
+     * @remarks
+     * This is intentionally small and browser-entry-oriented: direct files, common
+     * JS extensions, and `index.*` entrypoints. If a package needs anything more
+     * exotic, it should resolve through the adapter or ESM export-map path above.
+     */
+    private getFallbackCandidatePaths;
 }

package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { fileSystem } from "@ecopages/file-system";
 import { getAppBuildAdapter } from "../../../../../build/build-adapter.js";
 import { BaseScriptProcessor } from "../base/base-script-processor.js";
@@ -46,6 +47,15 @@ class NodeModuleScriptProcessor extends BaseScriptProcessor {
       };
     });
   }
+  /**
+   * Resolves a node-module script entry from the current app boundary.
+   *
+   * @remarks
+   * The build adapter remains the primary resolution surface because Bun/native
+   * host-owned builds may have a more accurate view of aliases and package
+   * ownership than core does. The local fallback only runs when that adapter
+   * resolution is unavailable.
+   */
   resolveModulePath(importPath, rootDir) {
     if (path.isAbsolute(importPath) && fileSystem.exists(importPath)) {
       return importPath;
@@ -56,13 +66,28 @@ class NodeModuleScriptProcessor extends BaseScriptProcessor {
       return this.resolveModulePathFallback(importPath, rootDir);
     }
   }
+  /**
+   * Resolves browser-owned script specifiers without relying on CommonJS resolution.
+   *
+   * @remarks
+   * This path intentionally stays ESM-first because these assets are emitted as
+   * browser scripts. We first ask Node's ESM resolver to evaluate the package
+   * export map from the app boundary. If that still fails, we fall back to a
+   * bounded filesystem probe so direct file installs and package subpaths like
+   * `pkg/client/entry` still resolve when the export map does not cover them.
+   */
   resolveModulePathFallback(importPath, rootDir, maxDepth = 5) {
+    try {
+      return fileURLToPath(import.meta.resolve(importPath, pathToFileURL(path.join(rootDir, "package.json")).href));
+    } catch {
+    }
     let currentDir = rootDir;
     let remainingDepth = maxDepth;
     while (remainingDepth >= 0) {
-      const modulePath = path.join(currentDir, "node_modules", importPath);
-      if (fileSystem.exists(modulePath)) {
-        return modulePath;
+      for (const candidatePath of this.getFallbackCandidatePaths(currentDir, importPath)) {
+        if (fileSystem.exists(candidatePath)) {
+          return candidatePath;
+        }
       }
       const parentDir = path.dirname(currentDir);
       if (parentDir === currentDir) {
@@ -73,6 +98,26 @@ class NodeModuleScriptProcessor extends BaseScriptProcessor {
     }
     throw new Error(`Could not resolve module '${importPath}' from '${rootDir}'`);
   }
+  /**
+   * Returns the file candidates we accept during the final literal filesystem probe.
+   *
+   * @remarks
+   * This is intentionally small and browser-entry-oriented: direct files, common
+   * JS extensions, and `index.*` entrypoints. If a package needs anything more
+   * exotic, it should resolve through the adapter or ESM export-map path above.
+   */
+  getFallbackCandidatePaths(rootDir, importPath) {
+    const moduleBasePath = path.join(rootDir, "node_modules", importPath);
+    return [
+      moduleBasePath,
+      `${moduleBasePath}.js`,
+      `${moduleBasePath}.mjs`,
+      `${moduleBasePath}.cjs`,
+      path.join(moduleBasePath, "index.js"),
+      path.join(moduleBasePath, "index.mjs"),
+      path.join(moduleBasePath, "index.cjs")
+    ];
+  }
 }
 export {
   NodeModuleScriptProcessor