@modern-js/utils 2.31.2 → 2.32.0

package/dist/esm/runtime/nestedRoutes.js

@@ -1,15 +1,21 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense } from "react";
-import { createRoutesFromElements, Route } from "react-router-dom";
-export var transformNestedRoutes = function(routes) {
+import { createRoutesFromElements, Outlet, Route } from "react-router-dom";
+import { LOADER_REPORTER_NAME } from "../universal/constants";
+import { time } from "../universal/time";
+export var transformNestedRoutes = function(routes, reporter) {
   var routeElements = [];
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
     for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
-      var routeElement = renderNestedRoute(route);
+      var routeElement = renderNestedRoute(route, {
+        reporter: reporter
+      });
       routeElements.push(routeElement);
     }
   } catch (err) {
@@ -33,12 +39,12 @@ export var renderNestedRoute = function(nestedRoute) {
   var _config, _children;
   var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot, lazyImport = nestedRoute.lazyImport, config = nestedRoute.config, handle = nestedRoute.handle;
   var Component = component;
-  var parent = options.parent, DeferredDataComponent = options.DeferredDataComponent, _options_props = options.props, props = _options_props === void 0 ? {} : _options_props;
+  var parent = options.parent, DeferredDataComponent = options.DeferredDataComponent, _options_props = options.props, props = _options_props === void 0 ? {} : _options_props, reporter = options.reporter;
   var routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: createLoader(nestedRoute),
+    loader: createLoader(nestedRoute, reporter),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -89,13 +95,15 @@ export var renderNestedRoute = function(nestedRoute) {
   } else {
     var _parent1;
     nestedRoute.loading = (_parent1 = parent) === null || _parent1 === void 0 ? void 0 : _parent1.loading;
+    routeProps.element = /* @__PURE__ */ _jsx(Outlet, {});
   }
   if (element) {
     routeProps.element = element;
   }
   var childElements = (_children = children) === null || _children === void 0 ? void 0 : _children.map(function(childRoute) {
     return renderNestedRoute(childRoute, {
-      parent: nestedRoute
+      parent: nestedRoute,
+      reporter: reporter
     });
   });
   var routeElement = index ? /* @__PURE__ */ _jsx(Route, _object_spread_props(_object_spread({}, routeProps), {
@@ -106,15 +114,41 @@ export var renderNestedRoute = function(nestedRoute) {
   }), id);
   return routeElement;
 };
-function createLoader(route) {
+function createLoader(route, reporter) {
   var loader = route.loader;
   if (loader) {
-    return function(args) {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      return loader(args);
-    };
+    return function() {
+      var _ref = _async_to_generator(function(args) {
+        var end, res, cost, _reporter;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (typeof route.lazyImport === "function") {
+                route.lazyImport();
+              }
+              end = time();
+              return [
+                4,
+                loader(args)
+              ];
+            case 1:
+              res = _state.sent();
+              cost = end();
+              if (typeof document === "undefined" && reporter) {
+                ;
+                (_reporter = reporter) === null || _reporter === void 0 ? void 0 : _reporter.reportTiming("".concat(LOADER_REPORTER_NAME, "-").concat(route.id), cost);
+              }
+              return [
+                2,
+                res
+              ];
+          }
+        });
+      });
+      return function(args) {
+        return _ref.apply(this, arguments);
+      };
+    }();
   } else {
     return function() {
       if (typeof route.lazyImport === "function") {

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

@@ -3,3 +3,4 @@ var _createStorage = createStorage(), run = _createStorage.run, useHeaders = _cr
 export { run, useHeaders };
 export { serializeJson } from "./serialize";
 export * from "./nestedRoutes";
+export * from "./loaderContext";

package/dist/esm/runtime-node/loaderContext/createLoaderCtx.js

@@ -0,0 +1,20 @@
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+export var LoaderContext = /* @__PURE__ */ function() {
+  "use strict";
+  function LoaderContext2(defaultValue) {
+    _class_call_check(this, LoaderContext2);
+    this.defaultValue = defaultValue;
+    this.symbol = Symbol("loaderContext");
+  }
+  var _proto = LoaderContext2.prototype;
+  _proto.getDefaultValue = function getDefaultValue() {
+    if (!this.defaultValue) {
+      throw new Error("Can't get defaultValue before initialed");
+    }
+    return this.defaultValue;
+  };
+  return LoaderContext2;
+}();
+export function createLoaderContext(defaultValue) {
+  return new LoaderContext(defaultValue);
+}

package/dist/esm/runtime-node/loaderContext/createRequestCtx.js

@@ -0,0 +1,24 @@
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+export var RequestContext = /* @__PURE__ */ function() {
+  "use strict";
+  function RequestContext2() {
+    _class_call_check(this, RequestContext2);
+    this.store = /* @__PURE__ */ new Map();
+  }
+  var _proto = RequestContext2.prototype;
+  _proto.get = function get(loaderCtx) {
+    var symbol = loaderCtx.symbol;
+    if (this.store.get(symbol)) {
+      return this.store.get(symbol);
+    }
+    return loaderCtx.getDefaultValue();
+  };
+  _proto.set = function set(loaderCtx, value) {
+    var symbol = loaderCtx.symbol;
+    this.store.set(symbol, value);
+  };
+  return RequestContext2;
+}();
+export function createRequestContext() {
+  return new RequestContext();
+}

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

@@ -0,0 +1,3 @@
+import { createLoaderContext } from "./createLoaderCtx";
+export { createRequestContext } from "./createRequestCtx";
+export var reporterCtx = createLoaderContext();

package/dist/esm/universal/constants.js

@@ -1,3 +1,4 @@
 export var ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
 export var HMR_SOCK_PATH = "/webpack-hmr";
 export var HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
+export var LOADER_REPORTER_NAME = "server-loader";

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

@@ -1,10 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense } from "react";
-import { createRoutesFromElements, Route } from "react-router-dom";
-export const transformNestedRoutes = (routes) => {
+import { createRoutesFromElements, Outlet, Route } from "react-router-dom";
+import { LOADER_REPORTER_NAME } from "../universal/constants";
+import { time } from "../universal/time";
+export const transformNestedRoutes = (routes, reporter) => {
   const routeElements = [];
   for (const route of routes) {
-    const routeElement = renderNestedRoute(route);
+    const routeElement = renderNestedRoute(route, {
+      reporter
+    });
     routeElements.push(routeElement);
   }
   return createRoutesFromElements(routeElements);
@@ -13,12 +17,12 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
   var _config, _children;
   const { children, index, id, component, isRoot, lazyImport, config, handle } = nestedRoute;
   const Component = component;
-  const { parent, DeferredDataComponent, props = {} } = options;
+  const { parent, DeferredDataComponent, props = {}, reporter } = options;
   const routeProps = {
     caseSensitive: nestedRoute.caseSensitive,
     path: nestedRoute.path,
     id: nestedRoute.id,
-    loader: createLoader(nestedRoute),
+    loader: createLoader(nestedRoute, reporter),
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
@@ -74,13 +78,15 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
   } else {
     var _parent1;
     nestedRoute.loading = (_parent1 = parent) === null || _parent1 === void 0 ? void 0 : _parent1.loading;
+    routeProps.element = /* @__PURE__ */ _jsx(Outlet, {});
   }
   if (element) {
     routeProps.element = element;
   }
   const childElements = (_children = children) === null || _children === void 0 ? void 0 : _children.map((childRoute) => {
     return renderNestedRoute(childRoute, {
-      parent: nestedRoute
+      parent: nestedRoute,
+      reporter
     });
   });
   const routeElement = index ? /* @__PURE__ */ _jsx(Route, {
@@ -93,14 +99,21 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
   }, id);
   return routeElement;
 };
-function createLoader(route) {
+function createLoader(route, reporter) {
   const { loader } = route;
   if (loader) {
-    return (args) => {
+    return async (args) => {
       if (typeof route.lazyImport === "function") {
         route.lazyImport();
       }
-      return loader(args);
+      const end = time();
+      const res = await loader(args);
+      const cost = end();
+      if (typeof document === "undefined" && reporter) {
+        var _reporter;
+        (_reporter = reporter) === null || _reporter === void 0 ? void 0 : _reporter.reportTiming(`${LOADER_REPORTER_NAME}-${route.id}`, cost);
+      }
+      return res;
     };
   } else {
     return () => {

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

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

package/dist/esm-node/runtime-node/loaderContext/createLoaderCtx.js

@@ -0,0 +1,15 @@
+export class LoaderContext {
+  getDefaultValue() {
+    if (!this.defaultValue) {
+      throw new Error("Can't get defaultValue before initialed");
+    }
+    return this.defaultValue;
+  }
+  constructor(defaultValue) {
+    this.defaultValue = defaultValue;
+    this.symbol = Symbol("loaderContext");
+  }
+}
+export function createLoaderContext(defaultValue) {
+  return new LoaderContext(defaultValue);
+}

package/dist/esm-node/runtime-node/loaderContext/createRequestCtx.js

@@ -0,0 +1,19 @@
+export class RequestContext {
+  get(loaderCtx) {
+    const { symbol } = loaderCtx;
+    if (this.store.get(symbol)) {
+      return this.store.get(symbol);
+    }
+    return loaderCtx.getDefaultValue();
+  }
+  set(loaderCtx, value) {
+    const { symbol } = loaderCtx;
+    this.store.set(symbol, value);
+  }
+  constructor() {
+    this.store = /* @__PURE__ */ new Map();
+  }
+}
+export function createRequestContext() {
+  return new RequestContext();
+}

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

@@ -0,0 +1,3 @@
+import { createLoaderContext } from "./createLoaderCtx";
+export { createRequestContext } from "./createRequestCtx";
+export const reporterCtx = createLoaderContext();

package/dist/esm-node/universal/constants.js

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

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import type { NestedRoute } from '@modern-js/types';
-export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
+import type { NestedRoute, Reporter } from '@modern-js/types';
+export declare const transformNestedRoutes: (routes: NestedRoute[], reporter: Reporter) => import("react-router-dom").RouteObject[];
 type DeferredDataComponentType = (props?: {
   nonce?: string;
 }) => JSX.Element | null;
@@ -8,5 +8,6 @@ export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
   parent?: NestedRoute;
   DeferredDataComponent?: DeferredDataComponentType;
   props?: Record<string, any>;
+  reporter?: Reporter;
 }) => JSX.Element;
 export {};

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

@@ -6,4 +6,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 * from './nestedRoutes';
+export * from './nestedRoutes';
+export * from './loaderContext';

package/dist/types/runtime-node/loaderContext/createLoaderCtx.d.ts

@@ -0,0 +1,7 @@
+export declare class LoaderContext<T = unknown> {
+  symbol: symbol;
+  private defaultValue?;
+  constructor(defaultValue?: T);
+  getDefaultValue(): T;
+}
+export declare function createLoaderContext<T = unknown>(defaultValue?: T): LoaderContext<T>;

package/dist/types/runtime-node/loaderContext/createRequestCtx.d.ts

@@ -0,0 +1,7 @@
+import { LoaderContext } from './createLoaderCtx';
+export declare class RequestContext {
+  private store;
+  get<T>(loaderCtx: LoaderContext<T>): T;
+  set<T = unknown>(loaderCtx: LoaderContext, value: T): void;
+}
+export declare function createRequestContext(): RequestContext;

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

@@ -0,0 +1,4 @@
+import type { Reporter } from '@modern-js/types';
+export { createRequestContext, type RequestContext } from './createRequestCtx';
+export type { LoaderContext } from './createLoaderCtx';
+export declare const reporterCtx: import("./createLoaderCtx").LoaderContext<Reporter>;

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

@@ -1,3 +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 type ServerContext = Pick<ModernServerContext, 'logger' | 'req' | 'reporter' | '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

@@ -9,4 +9,8 @@ export declare const HMR_SOCK_PATH = "/webpack-hmr";
 /**
  * html placeholder
  */
-export declare const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
+export declare const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
+/**
+ * reporter name for server loader
+ */
+export declare const LOADER_REPORTER_NAME = "server-loader";

package/package.json

@@ -15,11 +15,11 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.2",
+  "version": "2.32.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/index.js",
+  "module": "./dist/esm/index.js",
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     ".": {
@@ -67,7 +67,7 @@
       "default": "./dist/cjs/universal/constants.js"
     },
     "./universal/format-webpack": {
-      "types": "./dist/types/universal/format-webpack.d.ts",
+      "types": "./dist/types/universal/formatWebpack.d.ts",
       "import": "./dist/esm/universal/formatWebpack.js",
       "default": "./dist/cjs/universal/formatWebpack.js"
     },
@@ -243,9 +243,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.31.2",
-    "@scripts/build": "2.31.1",
-    "@scripts/jest-config": "2.31.1"
+    "@scripts/build": "2.32.0",
+    "@scripts/jest-config": "2.32.0",
+    "@modern-js/types": "2.32.0"
   },
   "sideEffects": false,
   "scripts": {