@modern-js/app-tools 2.27.1-alpha.0 → 2.28.1-alpha.0

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

@@ -11,234 +11,232 @@ import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlia
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 const debug = createDebugger("plugin-analyze");
-export default ({ bundler }) => {
-  return {
-    name: "@modern-js/plugin-analyze",
-    setup: (api) => {
-      let pagesDir = [];
-      let nestedRouteEntries = [];
-      let originEntrypoints = [];
-      return {
-        async prepare() {
-          var _resolvedConfig_source;
-          let appContext = api.useAppContext();
-          const resolvedConfig = api.useResolvedConfigContext();
-          const hookRunners = api.useHookRunners();
-          try {
-            if (checkIsBuildCommands()) {
-              fs.emptydirSync(appContext.internalDirectory);
-            }
-          } catch {
-          }
-          const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
-          await hookRunners.addRuntimeExports();
-          if (apiOnly) {
-            const { routes: routes2 } = await hookRunners.modifyServerRoutes({
-              routes: []
-            });
-            debug(`server routes: %o`, routes2);
-            appContext = {
-              ...api.useAppContext(),
-              apiOnly,
-              serverRoutes: routes2
-            };
-            api.setAppContext(appContext);
-            return;
+export default ({ bundler }) => ({
+  name: "@modern-js/plugin-analyze",
+  setup: (api) => {
+    let pagesDir = [];
+    let nestedRouteEntries = [];
+    let originEntrypoints = [];
+    return {
+      async prepare() {
+        var _resolvedConfig_source;
+        let appContext = api.useAppContext();
+        const resolvedConfig = api.useResolvedConfigContext();
+        const hookRunners = api.useHookRunners();
+        try {
+          if (checkIsBuildCommands()) {
+            fs.emptydirSync(appContext.internalDirectory);
           }
-          const [{ getBundleEntry }, { getServerRoutes }, { generateCode }, { getHtmlTemplate }] = await Promise.all([
-            import("./getBundleEntry"),
-            import("./getServerRoutes"),
-            import("./generateCode"),
-            import("./getHtmlTemplate")
-          ]);
-          const entrypoints = getBundleEntry(appContext, resolvedConfig);
-          debug(`entrypoints: %o`, entrypoints);
-          const initialRoutes = getServerRoutes(entrypoints, {
-            appContext,
-            config: resolvedConfig
-          });
-          const { routes } = await hookRunners.modifyServerRoutes({
-            routes: initialRoutes
-          });
-          debug(`server routes: %o`, routes);
-          appContext = {
-            ...api.useAppContext(),
-            entrypoints,
-            serverRoutes: routes
-          };
-          api.setAppContext(appContext);
-          nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
-          pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
-          originEntrypoints = cloneDeep(entrypoints);
-          const { importsStatemets } = await generateCode(appContext, resolvedConfig, entrypoints, api);
-          const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
-            appContext,
-            config: resolvedConfig
+        } catch {
+        }
+        const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
+        await hookRunners.addRuntimeExports();
+        if (apiOnly) {
+          const { routes: routes2 } = await hookRunners.modifyServerRoutes({
+            routes: []
           });
-          debug(`html templates: %o`, htmlTemplates);
-          await hookRunners.addDefineTypes();
-          debug(`add Define Types`);
-          let checkedEntries = entrypoints.map((point) => point.entryName);
-          if (isDevCommand()) {
-            const { entry } = minimist(getArgv());
-            checkedEntries = await getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
-          }
+          debug(`server routes: %o`, routes2);
           appContext = {
             ...api.useAppContext(),
-            entrypoints,
-            checkedEntries,
             apiOnly,
-            serverRoutes: routes,
-            htmlTemplates
+            serverRoutes: routes2
           };
           api.setAppContext(appContext);
-          if (checkIsBuildCommands()) {
-            const normalizedConfig = api.useResolvedConfigContext();
-            const createBuilderForModern = await createBuilderGenerator(bundler);
-            const builder = await createBuilderForModern({
-              normalizedConfig,
-              appContext
+          return;
+        }
+        const [{ getBundleEntry }, { getServerRoutes }, { generateCode }, { getHtmlTemplate }] = await Promise.all([
+          import("./getBundleEntry"),
+          import("./getServerRoutes"),
+          import("./generateCode"),
+          import("./getHtmlTemplate")
+        ]);
+        const entrypoints = getBundleEntry(appContext, resolvedConfig);
+        debug(`entrypoints: %o`, entrypoints);
+        const initialRoutes = getServerRoutes(entrypoints, {
+          appContext,
+          config: resolvedConfig
+        });
+        const { routes } = await hookRunners.modifyServerRoutes({
+          routes: initialRoutes
+        });
+        debug(`server routes: %o`, routes);
+        appContext = {
+          ...api.useAppContext(),
+          entrypoints,
+          serverRoutes: routes
+        };
+        api.setAppContext(appContext);
+        nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
+        pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
+        originEntrypoints = cloneDeep(entrypoints);
+        const { importsStatemets } = await generateCode(appContext, resolvedConfig, entrypoints, api);
+        const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
+          appContext,
+          config: resolvedConfig
+        });
+        debug(`html templates: %o`, htmlTemplates);
+        await hookRunners.addDefineTypes();
+        debug(`add Define Types`);
+        let checkedEntries = entrypoints.map((point) => point.entryName);
+        if (isDevCommand()) {
+          const { entry } = minimist(getArgv());
+          checkedEntries = await getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
+        }
+        appContext = {
+          ...api.useAppContext(),
+          entrypoints,
+          checkedEntries,
+          apiOnly,
+          serverRoutes: routes,
+          htmlTemplates
+        };
+        api.setAppContext(appContext);
+        if (checkIsBuildCommands()) {
+          const normalizedConfig = api.useResolvedConfigContext();
+          const createBuilderForModern = await createBuilderGenerator(bundler);
+          const builder = await createBuilderForModern({
+            normalizedConfig,
+            appContext
+          });
+          builder.onBeforeBuild(async ({ bundlerConfigs }) => {
+            const hookRunners2 = api.useHookRunners();
+            await generateRoutes(appContext);
+            await hookRunners2.beforeBuild({
+              bundlerConfigs
             });
-            builder.onBeforeBuild(async ({ bundlerConfigs }) => {
-              const hookRunners2 = api.useHookRunners();
-              await generateRoutes(appContext);
-              await hookRunners2.beforeBuild({
-                bundlerConfigs
-              });
+          });
+          builder.onAfterBuild(async ({ stats }) => {
+            const hookRunners2 = api.useHookRunners();
+            await hookRunners2.afterBuild({
+              stats
             });
-            builder.onAfterBuild(async ({ stats }) => {
-              const hookRunners2 = api.useHookRunners();
-              await hookRunners2.afterBuild({
-                stats
+            await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
+          });
+          builder.onDevCompileDone(async ({ isFirstCompile }) => {
+            const hookRunners2 = api.useHookRunners();
+            if (process.stdout.isTTY || isFirstCompile) {
+              hookRunners2.afterDev({
+                isFirstCompile
               });
-              await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
-            });
-            builder.onDevCompileDone(async ({ isFirstCompile }) => {
-              const hookRunners2 = api.useHookRunners();
-              if (process.stdout.isTTY || isFirstCompile) {
-                hookRunners2.afterDev({
-                  isFirstCompile
-                });
-                if (isFirstCompile) {
-                  printInstructions(hookRunners2, appContext, normalizedConfig);
-                }
+              if (isFirstCompile) {
+                printInstructions(hookRunners2, appContext, normalizedConfig);
               }
+            }
+          });
+          builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {
+            const hookRunners2 = api.useHookRunners();
+            await generateIndexCode({
+              appContext,
+              config: resolvedConfig,
+              entrypoints,
+              api,
+              importsStatemets,
+              bundlerConfigs
             });
-            builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {
-              const hookRunners2 = api.useHookRunners();
-              await generateIndexCode({
-                appContext,
-                config: resolvedConfig,
-                entrypoints,
-                api,
-                importsStatemets,
-                bundlerConfigs
-              });
-              await hookRunners2.beforeCreateCompiler({
-                bundlerConfigs
-              });
+            await hookRunners2.beforeCreateCompiler({
+              bundlerConfigs
             });
-            builder.onAfterCreateCompiler(async ({ compiler }) => {
-              const hookRunners2 = api.useHookRunners();
-              await hookRunners2.afterCreateCompiler({
-                compiler
-              });
+          });
+          builder.onAfterCreateCompiler(async ({ compiler }) => {
+            const hookRunners2 = api.useHookRunners();
+            await hookRunners2.afterCreateCompiler({
+              compiler
             });
-            builder.addPlugins(resolvedConfig.builderPlugins);
-            appContext = {
-              ...api.useAppContext(),
-              builder
-            };
-            api.setAppContext(appContext);
-          }
-        },
-        watchFiles() {
-          return {
-            files: pagesDir,
-            isPrivate: true
-          };
-        },
-        resolvedConfig({ resolved }) {
-          const appContext = api.useAppContext();
-          const config = initialNormalizedConfig(resolved, appContext, bundler);
-          return {
-            resolved: config
+          });
+          builder.addPlugins(resolvedConfig.builderPlugins);
+          appContext = {
+            ...api.useAppContext(),
+            builder
           };
-        },
-        // This logic is not in the router plugin to avoid having to include some dependencies in the utils package
-        async modifyEntryImports({ entrypoint, imports }) {
-          const appContext = api.useAppContext();
-          const { srcDirectory, internalSrcAlias } = appContext;
-          const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
-          if (fileSystemRoutes && nestedRoutesEntry) {
-            const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
-            const rootLayoutFile = findExists([
-              ".js",
-              ".ts",
-              ".jsx",
-              ".tsx"
-            ].map((ext) => `${rootLayoutPath}${ext}`));
-            if (rootLayoutFile) {
-              const rootLayoutBuffer = await fs.readFile(rootLayoutFile);
-              const rootLayout = rootLayoutBuffer.toString();
-              const [, moduleExports] = await parseModule({
-                source: rootLayout.toString(),
-                filename: rootLayoutFile
+          api.setAppContext(appContext);
+        }
+      },
+      watchFiles() {
+        return {
+          files: pagesDir,
+          isPrivate: true
+        };
+      },
+      resolvedConfig({ resolved }) {
+        const appContext = api.useAppContext();
+        const config = initialNormalizedConfig(resolved, appContext, bundler);
+        return {
+          resolved: config
+        };
+      },
+      // This logic is not in the router plugin to avoid having to include some dependencies in the utils package
+      async modifyEntryImports({ entrypoint, imports }) {
+        const appContext = api.useAppContext();
+        const { srcDirectory, internalSrcAlias } = appContext;
+        const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
+        if (fileSystemRoutes && nestedRoutesEntry) {
+          const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
+          const rootLayoutFile = findExists([
+            ".js",
+            ".ts",
+            ".jsx",
+            ".tsx"
+          ].map((ext) => `${rootLayoutPath}${ext}`));
+          if (rootLayoutFile) {
+            const rootLayoutBuffer = await fs.readFile(rootLayoutFile);
+            const rootLayout = rootLayoutBuffer.toString();
+            const [, moduleExports] = await parseModule({
+              source: rootLayout.toString(),
+              filename: rootLayoutFile
+            });
+            const hasAppConfig = moduleExports.some((e) => e.n === APP_CONFIG_NAME);
+            const generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
+            if (hasAppConfig) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [
+                  {
+                    imported: APP_CONFIG_NAME
+                  }
+                ]
               });
-              const hasAppConfig = moduleExports.some((e) => e.n === APP_CONFIG_NAME);
-              const generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
-              if (hasAppConfig) {
-                imports.push({
-                  value: generateLayoutPath,
-                  specifiers: [
-                    {
-                      imported: APP_CONFIG_NAME
-                    }
-                  ]
-                });
-              }
-              const hasAppInit = moduleExports.some((e) => e.n === APP_INIT_EXPORTED);
-              if (hasAppInit) {
-                imports.push({
-                  value: generateLayoutPath,
-                  specifiers: [
-                    {
-                      imported: APP_INIT_EXPORTED,
-                      local: APP_INIT_IMPORTED
-                    }
-                  ]
-                });
-              }
             }
-          }
-          return {
-            entrypoint,
-            imports
-          };
-        },
-        validateSchema() {
-          return {
-            target: "output.splitRouteChunks",
-            schema: {
-              type: "boolean"
+            const hasAppInit = moduleExports.some((e) => e.n === APP_INIT_EXPORTED);
+            if (hasAppInit) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [
+                  {
+                    imported: APP_INIT_EXPORTED,
+                    local: APP_INIT_IMPORTED
+                  }
+                ]
+              });
             }
-          };
-        },
-        async fileChange(e) {
-          const appContext = api.useAppContext();
-          const { appDirectory } = appContext;
-          const { filename, eventType } = e;
-          const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
-          const absoluteFilePath = path.resolve(appDirectory, filename);
-          const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-          if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
-            const resolvedConfig = api.useResolvedConfigContext();
-            const { generateCode } = await import("./generateCode");
-            const entrypoints = cloneDeep(originEntrypoints);
-            generateCode(appContext, resolvedConfig, entrypoints, api);
           }
         }
-      };
-    }
-  };
-};
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      validateSchema() {
+        return {
+          target: "output.splitRouteChunks",
+          schema: {
+            type: "boolean"
+          }
+        };
+      },
+      async fileChange(e) {
+        const appContext = api.useAppContext();
+        const { appDirectory } = appContext;
+        const { filename, eventType } = e;
+        const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
+        const absoluteFilePath = path.resolve(appDirectory, filename);
+        const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
+        if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
+          const resolvedConfig = api.useResolvedConfigContext();
+          const { generateCode } = await import("./generateCode");
+          const entrypoints = cloneDeep(originEntrypoints);
+          generateCode(appContext, resolvedConfig, entrypoints, api);
+        }
+      }
+    };
+  }
+});

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

@@ -36,8 +36,35 @@ const createRoute = (routeInfo, rootDir, filename, entryName, isMainEntry) => {
     type: "nested"
   };
 };
-export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
-  var _route_children;
+export const optimizeRoute = (routeTree) => {
+  if (!routeTree.children || routeTree.children.length === 0) {
+    return [
+      routeTree
+    ];
+  }
+  const { children } = routeTree;
+  if (!routeTree._component) {
+    const newRoutes = children.map((child) => {
+      var _routeTree_path;
+      const routePath = `${(_routeTree_path = routeTree.path) !== null && _routeTree_path !== void 0 ? _routeTree_path : ""}${child.path ? `/${child.path}` : ""}`;
+      return {
+        ...child,
+        path: routePath
+      };
+    });
+    if (newRoutes.length > 1) {
+      return newRoutes.flatMap((newRoute) => optimizeRoute(newRoute));
+    }
+    return newRoutes;
+  } else {
+    routeTree.children = children.flatMap(optimizeRoute);
+    return [
+      routeTree
+    ];
+  }
+};
+export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion) => {
+  var _routePath, _finalRoute_children;
   if (!await fs.pathExists(dirname)) {
     return null;
   }
@@ -57,7 +84,7 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
-    path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
+    path: (_routePath = routePath) === null || _routePath === void 0 ? void 0 : _routePath.replace(/\$$/, "?"),
     children: [],
     isRoot
   };
@@ -73,10 +100,10 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await fs.stat(itemPath)).isDirectory();
     if (isDirectory2) {
-      const childRoute = await walk(itemPath, rootDir, alias, entryName, isMainEntry);
-      if (childRoute) {
-        var _route_children1;
-        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
+      const childRoute = await walk(itemPath, rootDir, alias, entryName, isMainEntry, oldVersion);
+      if (childRoute && !Array.isArray(childRoute)) {
+        var _route_children;
+        (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.push(childRoute);
       }
     }
     if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
@@ -102,7 +129,7 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       pageConfigFile = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
-      var _route_children2;
+      var _route_children1;
       pageRoute = createIndexRoute({
         _component: replaceWithAlias(alias.basename, itemPath, alias.name)
       }, rootDir, itemPath, entryName, isMainEntry);
@@ -112,13 +139,13 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       if (pageConfigFile) {
         pageRoute.config = pageConfigFile;
       }
-      (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
+      (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
       splatLoaderFile = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
-      var _route_children3;
+      var _route_children2;
       splatRoute = createRoute({
         _component: replaceWithAlias(alias.basename, itemPath, alias.name),
         path: "*"
@@ -126,7 +153,7 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       if (splatLoaderFile) {
         splatRoute.loader = splatLoaderFile;
       }
-      (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
+      (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
       route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -139,12 +166,12 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter((childRoute) => childRoute);
-  if (route.children && route.children.length === 0 && !route.index) {
+  const childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter((childRoute) => childRoute);
+  if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
     return null;
   }
-  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-    const childRoute = finalRoute.children[0];
+  if (childRoutes && childRoutes.length === 1 && !finalRoute._component) {
+    const childRoute = childRoutes[0];
     if (childRoute.path === "*") {
       const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
       finalRoute = {
@@ -153,5 +180,18 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry) => {
       };
     }
   }
+  if (splatRoute) {
+    var _childRoutes;
+    const slatRouteIndex = (_childRoutes = childRoutes) === null || _childRoutes === void 0 ? void 0 : _childRoutes.findIndex((childRoute) => childRoute === splatRoute);
+    if (typeof slatRouteIndex === "number" && slatRouteIndex !== -1) {
+      var _childRoutes1, _childRoutes2;
+      (_childRoutes1 = childRoutes) === null || _childRoutes1 === void 0 ? void 0 : _childRoutes1.splice(slatRouteIndex, 1);
+      (_childRoutes2 = childRoutes) === null || _childRoutes2 === void 0 ? void 0 : _childRoutes2.push(splatRoute);
+    }
+  }
+  if (isRoot && !oldVersion) {
+    const optimizedRoutes = optimizeRoute(finalRoute);
+    return optimizedRoutes;
+  }
   return finalRoute;
 };

package/dist/esm-node/analyze/templates.js

@@ -79,8 +79,8 @@ export const routesForServer = ({ routes }) => {
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children;
-      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children, _route;
+      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loader;
     if (route.type === "nested") {
@@ -147,8 +147,8 @@ export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, ent
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children;
-      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children, _route;
+      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loading;
     let error;