@modern-js/utils 2.22.1-alpha.0 → 2.22.1-alpha.2

package/dist/cjs/cli/constants/index.js

@@ -13,6 +13,9 @@ _export(exports, {
   ROUTE_SPEC_FILE: function() {
     return ROUTE_SPEC_FILE;
   },
+  NESTED_ROUTE_SPEC_FILE: function() {
+    return NESTED_ROUTE_SPEC_FILE;
+  },
   MAIN_ENTRY_NAME: function() {
     return MAIN_ENTRY_NAME;
   },
@@ -107,6 +110,7 @@ _export(exports, {
 const _export_star = require("@swc/helpers/_/_export_star");
 _export_star._(require("./chainId"), exports);
 const ROUTE_SPEC_FILE = "route.json";
+const NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
 const MAIN_ENTRY_NAME = "main";
 const SERVER_BUNDLE_DIRECTORY = "bundles";
 const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";

package/dist/cjs/runtime-node/index.js

@@ -20,6 +20,8 @@ _export(exports, {
     return _serialize.serializeJson;
   }
 });
+const _export_star = require("@swc/helpers/_/_export_star");
 const _storage = require("./storage");
 const _serialize = require("./serialize");
+_export_star._(require("./nestedRoutes"), exports);
 const { run, useContext: useHeaders } = (0, _storage.createStorage)();

package/dist/cjs/runtime-node/nestedRoutes.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "matchEntry", {
+  enumerable: true,
+  get: function() {
+    return matchEntry;
+  }
+});
+function sortByUrlPath(entries) {
+  entries.sort(function(a, b) {
+    const length1 = a.urlPath.length;
+    const length2 = b.urlPath.length;
+    if (length1 < length2) {
+      return 1;
+    }
+    if (length1 > length2) {
+      return -1;
+    }
+    return 0;
+  });
+  return entries;
+}
+const matchEntry = (pathname, entries) => {
+  sortByUrlPath(entries);
+  return entries.find((entry) => pathname.startsWith(entry.urlPath));
+};

package/dist/cjs/universal/constants.js

@@ -15,7 +15,11 @@ _export(exports, {
   },
   HMR_SOCK_PATH: function() {
     return HMR_SOCK_PATH;
+  },
+  HTML_CHUNKSMAP_SEPARATOR: function() {
+    return HTML_CHUNKSMAP_SEPARATOR;
   }
 });
 const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
 const HMR_SOCK_PATH = "/webpack-hmr";
+const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";

package/dist/esm/cli/constants/index.js

@@ -1,4 +1,5 @@
 export const ROUTE_SPEC_FILE = "route.json";
+export const NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
 export const MAIN_ENTRY_NAME = "main";
 export const SERVER_BUNDLE_DIRECTORY = "bundles";
 export const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";

package/dist/esm/runtime-node/index.js

@@ -2,3 +2,4 @@ import { createStorage } from "./storage";
 const { run, useContext: useHeaders } = createStorage();
 export { run, useHeaders };
 export { serializeJson } from "./serialize";
+export * from "./nestedRoutes";

package/dist/esm/runtime-node/nestedRoutes.js

@@ -0,0 +1,18 @@
+function sortByUrlPath(entries) {
+  entries.sort(function(a, b) {
+    const length1 = a.urlPath.length;
+    const length2 = b.urlPath.length;
+    if (length1 < length2) {
+      return 1;
+    }
+    if (length1 > length2) {
+      return -1;
+    }
+    return 0;
+  });
+  return entries;
+}
+export const matchEntry = (pathname, entries) => {
+  sortByUrlPath(entries);
+  return entries.find((entry) => pathname.startsWith(entry.urlPath));
+};

package/dist/esm/universal/constants.js

@@ -1,2 +1,3 @@
 export const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
 export const HMR_SOCK_PATH = "/webpack-hmr";
+export const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";

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

@@ -3,6 +3,10 @@ import { InternalPlugins } from '@modern-js/types';
  * route specification file
  */
 export declare const ROUTE_SPEC_FILE = "route.json";
+/**
+ * Front-end routing metadata
+ */
+export declare const NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
 /**
  * main entry name
  */

package/dist/types/runtime-node/index.d.ts

@@ -5,4 +5,5 @@
 import type { IncomingHttpHeaders } from 'http';
 declare const run: <O>(context: IncomingHttpHeaders, cb: () => O | Promise<O>) => Promise<O>, useHeaders: () => IncomingHttpHeaders;
 export { run, useHeaders };
-export { serializeJson } from './serialize';
+export { serializeJson } from './serialize';
+export * from './nestedRoutes';

package/dist/types/runtime-node/nestedRoutes.d.ts

@@ -0,0 +1,3 @@
+import type { ModernServerContext, ServerRoute } from '@modern-js/types';
+export type ServerContext = Pick<ModernServerContext, 'logger' | 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
+export declare const matchEntry: (pathname: string, entries: ServerRoute[]) => ServerRoute | undefined;

package/dist/types/universal/constants.d.ts

@@ -5,4 +5,8 @@ export declare const ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
 /**
  * hmr socket connect path
  */
-export declare const HMR_SOCK_PATH = "/webpack-hmr";
+export declare const HMR_SOCK_PATH = "/webpack-hmr";
+/**
+ * html placeholder
+ */
+export declare const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.1-alpha.0",
+  "version": "2.22.1-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -36,41 +36,50 @@
     },
     "./runtime/router": {
       "types": "./dist/types/runtime/router.d.ts",
+      "require": "./dist/cjs/runtime/router.js",
       "default": "./dist/esm/runtime/router.js"
     },
     "./runtime/remix-router": {
       "types": "./dist/types/runtime/remixRouter.d.ts",
+      "require": "./dist/cjs/runtime/remixRouter.js",
       "default": "./dist/esm/runtime/remixRouter.js"
     },
     "./runtime/nested-routes": {
       "types": "./dist/types/runtime/nestedRoutes.d.ts",
+      "require": "./dist/cjs/runtime/nestedRoutes.js",
       "default": "./dist/esm/runtime/nestedRoutes.js"
     },
     "./runtime-browser": {
       "jsnext:source": "./src/runtime-browser/index.d.ts",
+      "require": "./dist/cjs/runtime-browser/index.js",
       "default": "./dist/esm/runtime-browser/index.js"
     },
     "./runtime-node": {
       "types": "./dist/types/runtime-node/index.d.ts",
+      "require": "./dist/cjs/runtime-node/index.js",
       "default": "./dist/esm/runtime-node/index.js"
     },
     "./runtime-node/router": {
       "types": "./dist/types/runtime-node/router.d.ts",
+      "require": "./dist/cjs/runtime-node/router.js",
       "default": "./dist/esm/runtime-node/router.js"
     },
     "./universal/constants": {
       "types": "./dist/types/universal/constants.d.ts",
       "import": "./dist/esm/universal/constants.js",
+      "require": "./dist/cjs/universal/constants.js",
       "default": "./dist/cjs/universal/constants.js"
     },
     "./universal/format-webpack": {
       "types": "./dist/types/universal/format-webpack.d.ts",
       "import": "./dist/esm/universal/formatWebpack.js",
+      "require": "./dist/cjs/universal/formatWebpack.js",
       "default": "./dist/cjs/universal/formatWebpack.js"
     },
     "./universal/plugin-dag-sort": {
       "types": "./dist/types/universal/pluginDagSort.d.ts",
       "import": "./dist/esm/universal/pluginDagSort.js",
+      "require": "./dist/cjs/universal/pluginDagSort.js",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
     "./ajv": "./dist/compiled/ajv/index.js",