@modern-js/utils 2.15.0 → 2.16.0

package/dist/esm/universal/nestedRoutes.js

@@ -1,10 +1,7 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+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";
-const transformNestedRoutes = (routes) => {
+import { createRoutesFromElements, Route } from "react-router-dom";
+export const transformNestedRoutes = (routes) => {
   const routeElements = [];
   for (const route of routes) {
     const routeElement = renderNestedRoute(route);
@@ -12,7 +9,7 @@ const transformNestedRoutes = (routes) => {
   }
   return createRoutesFromElements(routeElements);
 };
-const renderNestedRoute = (nestedRoute, options = {}) => {
+export const renderNestedRoute = (nestedRoute, options = {}) => {
   const { children, index, id, component, isRoot, lazyImport, config } = nestedRoute;
   const Component = component;
   const { parent, DeferredDataComponent, props = {} } = options;
@@ -24,46 +21,67 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
-    handle: typeof config === "object" ? config == null ? void 0 : config.handle : {},
+    handle: typeof config === "object" ? config === null || config === void 0 ? void 0 : config.handle : {},
     index: nestedRoute.index,
     element: nestedRoute.element,
     errorElement: nestedRoute.errorElement
   };
   if (nestedRoute.error) {
-    const errorElement = /* @__PURE__ */ jsx(nestedRoute.error, {});
+    const errorElement = /* @__PURE__ */ _jsx(nestedRoute.error, {});
     routeProps.errorElement = errorElement;
   }
   let element;
   if (Component) {
-    if ((parent == null ? void 0 : parent.loading) && lazyImport) {
+    if ((parent === null || parent === void 0 ? void 0 : parent.loading) && lazyImport) {
       const Loading = parent.loading;
       if (isLoadableComponent(Component)) {
-        element = /* @__PURE__ */ jsx(Component, { fallback: /* @__PURE__ */ jsx(Loading, {}) });
+        element = /* @__PURE__ */ _jsx(Component, {
+          fallback: /* @__PURE__ */ _jsx(Loading, {})
+        });
       } else {
-        element = /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loading, {}), children: /* @__PURE__ */ jsx(Component, {}) });
+        element = /* @__PURE__ */ _jsx(Suspense, {
+          fallback: /* @__PURE__ */ _jsx(Loading, {}),
+          children: /* @__PURE__ */ _jsx(Component, {})
+        });
       }
     } else if (isLoadableComponent(Component) && lazyImport) {
-      element = /* @__PURE__ */ jsx(Component, {});
+      element = /* @__PURE__ */ _jsx(Component, {});
     } else if (isRoot) {
-      element = /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(Component, { ...props }),
-        typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ jsx(DeferredDataComponent, {})
-      ] });
+      element = /* @__PURE__ */ _jsxs(_Fragment, {
+        children: [
+          /* @__PURE__ */ _jsx(Component, {
+            ...props
+          }),
+          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ _jsx(DeferredDataComponent, {})
+        ]
+      });
     } else if (lazyImport) {
-      element = /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(Component, {}) });
+      element = /* @__PURE__ */ _jsx(Suspense, {
+        fallback: null,
+        children: /* @__PURE__ */ _jsx(Component, {})
+      });
     } else {
-      element = /* @__PURE__ */ jsx(Component, {});
+      element = /* @__PURE__ */ _jsx(Component, {});
     }
   } else {
-    nestedRoute.loading = parent == null ? void 0 : parent.loading;
+    nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
   }
   if (element) {
     routeProps.element = element;
   }
-  const childElements = children == null ? void 0 : children.map((childRoute) => {
-    return renderNestedRoute(childRoute, { parent: nestedRoute });
+  const childElements = children === null || children === void 0 ? void 0 : children.map((childRoute) => {
+    return renderNestedRoute(childRoute, {
+      parent: nestedRoute
+    });
   });
-  const routeElement = index ? /* @__PURE__ */ jsx(Route, { ...routeProps, index: true }, id) : /* @__PURE__ */ jsx(Route, { ...routeProps, index: false, children: childElements }, id);
+  const routeElement = index ? /* @__PURE__ */ _jsx(Route, {
+    ...routeProps,
+    index: true
+  }, id) : /* @__PURE__ */ _jsx(Route, {
+    ...routeProps,
+    index: false,
+    children: childElements
+  }, id);
   return routeElement;
 };
 function createLoader(route) {
@@ -87,7 +105,3 @@ function createLoader(route) {
 function isLoadableComponent(component) {
   return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
 }
-export {
-  renderNestedRoute,
-  transformNestedRoutes
-};

package/dist/esm/universal/pluginDagSort.js

@@ -0,0 +1,50 @@
+export const pluginDagSort = (plugins, key = "name", preKey = "pre", postKey = "post") => {
+  let allLines = [];
+  function getPluginByAny(q) {
+    const target = plugins.find((item) => typeof q === "string" ? item[key] === q : item[key] === q[key]);
+    if (!target) {
+      throw new Error(`plugin ${q} not existed`);
+    }
+    return target;
+  }
+  plugins.forEach((item) => {
+    var _item_preKey, _item_postKey;
+    (_item_preKey = item[preKey]) === null || _item_preKey === void 0 ? void 0 : _item_preKey.forEach((p) => {
+      if (plugins.find((ap) => ap.name === p)) {
+        allLines.push([
+          getPluginByAny(p)[key],
+          getPluginByAny(item)[key]
+        ]);
+      }
+    });
+    (_item_postKey = item[postKey]) === null || _item_postKey === void 0 ? void 0 : _item_postKey.forEach((pt) => {
+      if (plugins.find((ap) => ap.name === pt)) {
+        allLines.push([
+          getPluginByAny(item)[key],
+          getPluginByAny(pt)[key]
+        ]);
+      }
+    });
+  });
+  let zeroEndPoints = plugins.filter((item) => !allLines.find((l) => l[1] === item[key]));
+  const sortedPoint = [];
+  while (zeroEndPoints.length) {
+    const zep = zeroEndPoints.shift();
+    sortedPoint.push(getPluginByAny(zep));
+    allLines = allLines.filter((l) => l[0] !== getPluginByAny(zep)[key]);
+    const restPoints = plugins.filter((item) => !sortedPoint.find((sp) => sp[key] === item[key]));
+    zeroEndPoints = restPoints.filter(
+      // eslint-disable-next-line @typescript-eslint/no-loop-func
+      (item) => !allLines.find((l) => l[1] === item[key])
+    );
+  }
+  if (allLines.length) {
+    const restInRingPoints = {};
+    allLines.forEach((l) => {
+      restInRingPoints[l[0]] = true;
+      restInRingPoints[l[1]] = true;
+    });
+    throw new Error(`plugins dependences has loop: ${Object.keys(restInRingPoints).join(",")}`);
+  }
+  return sortedPoint;
+};

package/dist/esm/universal/serialize.js

@@ -1,7 +1,6 @@
 import serialize from "serialize-javascript";
-const serializeJson = (data) => {
-  return serialize(data, { isJSON: true });
-};
-export {
-  serializeJson
+export const serializeJson = (data) => {
+  return serialize(data, {
+    isJSON: true
+  });
 };

package/dist/esm/version.js

@@ -1,10 +1,12 @@
 import path from "path";
 import { fs, execa, semver } from "./compiled";
-async function getPnpmVersion() {
-  const { stdout } = await execa("pnpm", ["--version"]);
+export async function getPnpmVersion() {
+  const { stdout } = await execa("pnpm", [
+    "--version"
+  ]);
   return stdout;
 }
-const isReact18 = (cwd) => {
+export const isReact18 = (cwd) => {
   const pkgPath = path.join(cwd, "package.json");
   if (!fs.existsSync(pkgPath)) {
     return false;
@@ -19,7 +21,3 @@ const isReact18 = (cwd) => {
   }
   return semver.satisfies(semver.minVersion(deps.react), ">=18.0.0");
 };
-export {
-  getPnpmVersion,
-  isReact18
-};

package/dist/esm/wait.js

@@ -1,6 +1,4 @@
 const wait = (time = 0) => new Promise((resolve) => {
   setTimeout(resolve, time);
 });
-export {
-  wait
-};
+export { wait };

package/dist/esm/watch.js

@@ -1,11 +1,11 @@
 import * as path from "path";
 import { chokidar } from "./compiled";
-const WatchChangeType = {
+export const WatchChangeType = {
   ADD: "add",
   UNLINK: "unlink",
   CHANGE: "change"
 };
-const watch = (watchDir, runTask, ignored = []) => {
+export const watch = (watchDir, runTask, ignored = []) => {
   let ready = false;
   const watcher = chokidar.watch(watchDir, {
     ignored
@@ -13,24 +13,29 @@ const watch = (watchDir, runTask, ignored = []) => {
   watcher.on("ready", () => ready = true);
   watcher.on("change", async (filePath) => {
     const changedFilePath = path.resolve(filePath);
-    await runTask({ changedFilePath, changeType: WatchChangeType.CHANGE });
+    await runTask({
+      changedFilePath,
+      changeType: WatchChangeType.CHANGE
+    });
   });
   watcher.on("add", async (filePath) => {
     const changedFilePath = path.resolve(filePath);
     if (ready) {
-      await runTask({ changedFilePath, changeType: WatchChangeType.ADD });
+      await runTask({
+        changedFilePath,
+        changeType: WatchChangeType.ADD
+      });
     }
   });
   watcher.on("unlink", async (filePath) => {
     const changedFilePath = path.resolve(filePath);
-    await runTask({ changedFilePath, changeType: WatchChangeType.UNLINK });
+    await runTask({
+      changedFilePath,
+      changeType: WatchChangeType.UNLINK
+    });
   });
   watcher.on("error", (err) => {
     throw err;
   });
   return watcher;
 };
-export {
-  WatchChangeType,
-  watch
-};

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

@@ -0,0 +1 @@
+export declare const pluginDagSort: <P extends Record<string, any>>(plugins: P[], key?: string, preKey?: string, postKey?: string) => P[];

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/toolkit/utils"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/index.js",
@@ -95,6 +99,11 @@
       "import": "./dist/esm/universal/nestedRoutes.js",
       "types": "./dist/types/universal/nestedRoutes.d.ts",
       "default": "./dist/cjs/universal/nestedRoutes.js"
+    },
+    "./universal/pluginDagSort": {
+      "import": "./dist/esm/universal/pluginDagSort.js",
+      "types": "./dist/types/universal/pluginDagSort.d.ts",
+      "default": "./dist/cjs/universal/pluginDagSort.js"
     }
   },
   "publishConfig": {
@@ -195,6 +204,9 @@
       ],
       "universal/nestedRoutes": [
         "./dist/types/universal/nestedRoutes.d.ts"
+      ],
+      "universal/pluginDagSort": [
+        "./dist/types/universal/pluginDagSort.d.ts"
       ]
     }
   },
@@ -230,9 +242,9 @@
     "typescript": "^4",
     "webpack": "^5.76.2",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/types": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "scripts": {