@modern-js/utils 3.2.2 → 3.3.0

package/dist/cjs/cli/index.js

@@ -57,6 +57,9 @@ var __webpack_modules__ = {
     "./route" (module) {
         module.exports = require("./route.js");
     },
+    "./routeComponentFiles" (module) {
+        module.exports = require("./routeComponentFiles.js");
+    },
     "./runtimeExports" (module) {
         module.exports = require("./runtimeExports.js");
     },
@@ -205,9 +208,13 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _modulePath__rspack_import_21)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_modulePath__rspack_import_21[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _tsconfig__rspack_import_22 = __webpack_require__("./tsconfig");
+    var _routeComponentFiles__rspack_import_22 = __webpack_require__("./routeComponentFiles");
+    var __rspack_reexport = {};
+    for(const __rspack_import_key in _routeComponentFiles__rspack_import_22)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_routeComponentFiles__rspack_import_22[__rspack_import_key];
+    __webpack_require__.d(__webpack_exports__, __rspack_reexport);
+    var _tsconfig__rspack_import_23 = __webpack_require__("./tsconfig");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _tsconfig__rspack_import_22)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_tsconfig__rspack_import_22[__rspack_import_key];
+    for(const __rspack_import_key in _tsconfig__rspack_import_23)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_tsconfig__rspack_import_23[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
 })();
 for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/cli/routeComponentFiles.js

@@ -0,0 +1,108 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    collectRouteComponentFiles: ()=>collectRouteComponentFiles,
+    normalizeModulePath: ()=>normalizeModulePath
+});
+const external_node_fs_namespaceObject = require("node:fs");
+var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const RESOLVE_EXTENSIONS = [
+    '.tsx',
+    '.ts',
+    '.jsx',
+    '.js',
+    '.mjs',
+    '.cjs'
+];
+function normalizeModulePath(filePath) {
+    const absolute = external_node_path_default().resolve(filePath);
+    let real = absolute;
+    try {
+        real = external_node_fs_default().realpathSync.native(absolute);
+    } catch  {}
+    return real.split(external_node_path_default().sep).join('/');
+}
+function resolveRouteComponentFile(component, srcDirectory, srcAlias) {
+    const normalizedAlias = srcAlias.replace(/[\\/]+$/, '');
+    let candidate;
+    if (component === normalizedAlias || component.startsWith(`${normalizedAlias}/`)) {
+        const relative = component.slice(normalizedAlias.length).replace(/^\/+/, '');
+        candidate = external_node_path_default().resolve(srcDirectory, relative);
+    } else {
+        if (!external_node_path_default().isAbsolute(component)) return;
+        candidate = external_node_path_default().resolve(component);
+    }
+    if (external_node_path_default().extname(candidate) && external_node_fs_default().existsSync(candidate)) return normalizeModulePath(candidate);
+    for (const ext of RESOLVE_EXTENSIONS)if (external_node_fs_default().existsSync(candidate + ext)) return normalizeModulePath(candidate + ext);
+    for (const ext of RESOLVE_EXTENSIONS){
+        const indexFile = external_node_path_default().join(candidate, `index${ext}`);
+        if (external_node_fs_default().existsSync(indexFile)) return normalizeModulePath(indexFile);
+    }
+}
+function collectRouteComponentFiles(routes, srcDirectory, srcAlias) {
+    const resolvedFiles = new Set();
+    const unresolvedSpecifiers = [];
+    const walk = (list)=>{
+        if (!Array.isArray(list)) return;
+        for (const route of list){
+            if (route._component) {
+                const file = resolveRouteComponentFile(route._component, srcDirectory, srcAlias);
+                if (file) resolvedFiles.add(file);
+                else unresolvedSpecifiers.push(route._component);
+            }
+            walk(route.children);
+        }
+    };
+    walk(routes);
+    return {
+        resolvedFiles,
+        unresolvedSpecifiers
+    };
+}
+exports.collectRouteComponentFiles = __webpack_exports__.collectRouteComponentFiles;
+exports.normalizeModulePath = __webpack_exports__.normalizeModulePath;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "collectRouteComponentFiles",
+    "normalizeModulePath"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/cli/index.mjs

@@ -20,4 +20,5 @@ export * from "./config.mjs";
 export * from "./version.mjs";
 export * from "./route.mjs";
 export * from "./modulePath.mjs";
+export * from "./routeComponentFiles.mjs";
 export * from "./tsconfig.mjs";

package/dist/esm/cli/routeComponentFiles.mjs

@@ -0,0 +1,56 @@
+import node_fs from "node:fs";
+import node_path from "node:path";
+const RESOLVE_EXTENSIONS = [
+    '.tsx',
+    '.ts',
+    '.jsx',
+    '.js',
+    '.mjs',
+    '.cjs'
+];
+function normalizeModulePath(filePath) {
+    const absolute = node_path.resolve(filePath);
+    let real = absolute;
+    try {
+        real = node_fs.realpathSync.native(absolute);
+    } catch  {}
+    return real.split(node_path.sep).join('/');
+}
+function resolveRouteComponentFile(component, srcDirectory, srcAlias) {
+    const normalizedAlias = srcAlias.replace(/[\\/]+$/, '');
+    let candidate;
+    if (component === normalizedAlias || component.startsWith(`${normalizedAlias}/`)) {
+        const relative = component.slice(normalizedAlias.length).replace(/^\/+/, '');
+        candidate = node_path.resolve(srcDirectory, relative);
+    } else {
+        if (!node_path.isAbsolute(component)) return;
+        candidate = node_path.resolve(component);
+    }
+    if (node_path.extname(candidate) && node_fs.existsSync(candidate)) return normalizeModulePath(candidate);
+    for (const ext of RESOLVE_EXTENSIONS)if (node_fs.existsSync(candidate + ext)) return normalizeModulePath(candidate + ext);
+    for (const ext of RESOLVE_EXTENSIONS){
+        const indexFile = node_path.join(candidate, `index${ext}`);
+        if (node_fs.existsSync(indexFile)) return normalizeModulePath(indexFile);
+    }
+}
+function collectRouteComponentFiles(routes, srcDirectory, srcAlias) {
+    const resolvedFiles = new Set();
+    const unresolvedSpecifiers = [];
+    const walk = (list)=>{
+        if (!Array.isArray(list)) return;
+        for (const route of list){
+            if (route._component) {
+                const file = resolveRouteComponentFile(route._component, srcDirectory, srcAlias);
+                if (file) resolvedFiles.add(file);
+                else unresolvedSpecifiers.push(route._component);
+            }
+            walk(route.children);
+        }
+    };
+    walk(routes);
+    return {
+        resolvedFiles,
+        unresolvedSpecifiers
+    };
+}
+export { collectRouteComponentFiles, normalizeModulePath };

package/dist/esm-node/cli/index.mjs

@@ -21,4 +21,5 @@ export * from "./config.mjs";
 export * from "./version.mjs";
 export * from "./route.mjs";
 export * from "./modulePath.mjs";
+export * from "./routeComponentFiles.mjs";
 export * from "./tsconfig.mjs";

package/dist/esm-node/cli/routeComponentFiles.mjs

@@ -0,0 +1,57 @@
+import "node:module";
+import node_fs from "node:fs";
+import node_path from "node:path";
+const RESOLVE_EXTENSIONS = [
+    '.tsx',
+    '.ts',
+    '.jsx',
+    '.js',
+    '.mjs',
+    '.cjs'
+];
+function normalizeModulePath(filePath) {
+    const absolute = node_path.resolve(filePath);
+    let real = absolute;
+    try {
+        real = node_fs.realpathSync.native(absolute);
+    } catch  {}
+    return real.split(node_path.sep).join('/');
+}
+function resolveRouteComponentFile(component, srcDirectory, srcAlias) {
+    const normalizedAlias = srcAlias.replace(/[\\/]+$/, '');
+    let candidate;
+    if (component === normalizedAlias || component.startsWith(`${normalizedAlias}/`)) {
+        const relative = component.slice(normalizedAlias.length).replace(/^\/+/, '');
+        candidate = node_path.resolve(srcDirectory, relative);
+    } else {
+        if (!node_path.isAbsolute(component)) return;
+        candidate = node_path.resolve(component);
+    }
+    if (node_path.extname(candidate) && node_fs.existsSync(candidate)) return normalizeModulePath(candidate);
+    for (const ext of RESOLVE_EXTENSIONS)if (node_fs.existsSync(candidate + ext)) return normalizeModulePath(candidate + ext);
+    for (const ext of RESOLVE_EXTENSIONS){
+        const indexFile = node_path.join(candidate, `index${ext}`);
+        if (node_fs.existsSync(indexFile)) return normalizeModulePath(indexFile);
+    }
+}
+function collectRouteComponentFiles(routes, srcDirectory, srcAlias) {
+    const resolvedFiles = new Set();
+    const unresolvedSpecifiers = [];
+    const walk = (list)=>{
+        if (!Array.isArray(list)) return;
+        for (const route of list){
+            if (route._component) {
+                const file = resolveRouteComponentFile(route._component, srcDirectory, srcAlias);
+                if (file) resolvedFiles.add(file);
+                else unresolvedSpecifiers.push(route._component);
+            }
+            walk(route.children);
+        }
+    };
+    walk(routes);
+    return {
+        resolvedFiles,
+        unresolvedSpecifiers
+    };
+}
+export { collectRouteComponentFiles, normalizeModulePath };

package/dist/types/cli/index.d.ts

@@ -20,4 +20,5 @@ export * from './config';
 export * from './version';
 export * from './route';
 export * from './modulePath';
+export * from './routeComponentFiles';
 export * from './tsconfig';

package/dist/types/cli/routeComponentFiles.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Normalize a path so that route-component collection and `module.resource`
+ * comparison use the exact same form: resolve symlinks (best effort), make it
+ * absolute, and use POSIX separators. Used on both sides of the `test` match so
+ * Windows / symlink / mixed-separator paths still line up.
+ */
+export declare function normalizeModulePath(filePath: string): string;
+export type RouteComponentFileCollection = {
+    /** Normalized absolute paths of resolved route component files. */
+    resolvedFiles: Set<string>;
+    /** `_component` specifiers that could not be mapped to a real file. */
+    unresolvedSpecifiers: string[];
+};
+/**
+ * Per-entry route component files, keyed by entry name. Collected by the router
+ * plugin from the FINAL routes and consumed (currently by stream SSR lazy
+ * compilation) to force route components eager.
+ */
+export type EagerRouteComponentFilesByEntry = Map<string, RouteComponentFileCollection>;
+/**
+ * Walk the file-system route tree and collect the normalized absolute file
+ * paths of every route component, plus any `_component` specifiers that could
+ * not be resolved to a real file.
+ */
+export declare function collectRouteComponentFiles(routes: unknown, srcDirectory: string, srcAlias: string): RouteComponentFileCollection;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.2",
+  "version": "3.3.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
@@ -142,17 +142,17 @@
     "rslog": "^1.3.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.21.5",
+    "@rslib/core": "0.22.0",
     "@types/node": "^20",
     "happy-dom": "^20.9.0",
     "typescript": "^5",
     "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/types": "3.2.2"
+    "@modern-js/types": "3.3.0",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6"
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7"
   },
   "peerDependenciesMeta": {
     "react": {