@modern-js/app-tools 1.22.1 → 2.0.0-alpha.0

package/dist/js/modern/analyze/getBundleEntry.js

@@ -1,75 +1,73 @@
-import path from 'path';
-import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
+import path from "path";
+import {
+  ensureAbsolutePath,
+  fs,
+  findExists,
+  MAIN_ENTRY_NAME
+} from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
-
-const ensureExtensions = file => {
+const ensureExtensions = (file) => {
   if (!path.extname(file)) {
-    return findExists(JS_EXTENSIONS.map(ext => `${file}${ext}`)) || file;
+    return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
   }
-
   return file;
 };
-
-const ifAlreadyExists = (entrypoints, checked) => entrypoints.some(entrypoint => {
+const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
-    // reset entryName
     checked.entryName = entrypoint.entryName;
     return true;
-  } // filesystem routes entrypoint conflict with normal entrypoint.
-
-
+  }
   if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
-    throw new Error(`Entry configuration conflicts\n Your configuration: ${checked.entry}.\n Default entrypoint: ${entrypoint.entry}\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`);
+    throw new Error(
+      `Entry configuration conflicts
+ Your configuration: ${checked.entry}.
+ Default entrypoint: ${entrypoint.entry}
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
+    );
   }
-
   return false;
 });
-
-export const getBundleEntry = (appContext, config) => {
-  const {
-    appDirectory,
-    packageName
-  } = appContext;
+const getBundleEntry = (appContext, config) => {
+  const { appDirectory, packageName } = appContext;
   const {
-    source: {
-      disableDefaultEntries,
-      entries,
-      entriesDir
-    }
+    source: { disableDefaultEntries, entries, entriesDir }
   } = config;
-  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config); // merge entrypoints from user config with directory convention.
-
+  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
+  console.log("defaults", defaults, entries);
   if (entries) {
-    Object.keys(entries).forEach(name => {
+    Object.keys(entries).forEach((name) => {
       const value = entries[name];
-      const entrypoint = typeof value === 'string' ? {
+      const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value),
         isAutoMount: true,
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : undefined
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value.entry),
         isAutoMount: !value.disableMount,
-        fileSystemRoutes: value.enableFileSystemRoutes ? {} : undefined
+        customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-
+      if (entrypoint.fileSystemRoutes) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }
     });
   }
-
   if (!disableDefaultEntries) {
-    // find main entry point which server route is '/'.
-    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
-    const found = defaults.find(({
-      entryName,
-      entry
-    }) => entryName === packageName || path.dirname(entry) === entriesDirAbs);
+    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
+    const found = defaults.find(
+      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
+    );
     found && (found.entryName = MAIN_ENTRY_NAME);
   }
-
+  console.log("22222222222222", defaults);
   return defaults;
-};
+};
+export {
+  getBundleEntry
+};

package/dist/js/modern/analyze/getClientRoutes/getRoutes.js

@@ -0,0 +1,220 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import path from "path";
+import { fs } from "@modern-js/utils";
+import { makeLegalIdentifier } from "../makeLegalIdentifier";
+import {
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT
+} from "../constants";
+import { replaceWithAlias } from "../utils";
+import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
+const compName = (srcDirectory, filePath) => {
+  const legalCompName = makeLegalIdentifier(
+    path.relative(srcDirectory, filePath)
+  );
+  return `Comp_${legalCompName}`;
+};
+const layoutNameAbbr = (filePath) => {
+  const prefix = "L_";
+  const dirName = path.dirname(filePath).split("/").pop() || "";
+  return `${prefix}${makeLegalIdentifier(dirName)}`;
+};
+const parents = [];
+const recursiveReadDir = ({
+  dir,
+  routes,
+  basePath = "/",
+  srcDirectory,
+  srcAlias
+}) => {
+  let hasDynamicRoute = false;
+  let resetParent = false;
+  let parent = parents[parents.length - 1];
+  const layout = findLayout(dir);
+  if (layout) {
+    if (basePath === "/") {
+      throw new Error(`should use _app instead of _layout in ${dir}`);
+    } else {
+      const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
+      const componentName = compName(srcDirectory, layout);
+      const route = {
+        path: `${basePath.substring(0, basePath.length - 1)}`,
+        children: [],
+        _component: alias,
+        component: componentName,
+        parent,
+        type: "page"
+      };
+      parent = route;
+      resetParent = true;
+      routes.push(route);
+      parents.push(route);
+      routes = route.children;
+    }
+  }
+  for (const relative of fs.readdirSync(dir)) {
+    const filePath = path.join(dir, relative);
+    if (!shouldSkip(filePath)) {
+      const filename = path.basename(filePath, path.extname(filePath));
+      const alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
+      const componentName = compName(srcDirectory, filePath);
+      const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
+      if (dynamicRouteMatched) {
+        if (hasDynamicRoute) {
+          throw new Error(
+            `Can't set two dynamic route in one directory: ${dir}`
+          );
+        } else {
+          hasDynamicRoute = true;
+        }
+      }
+      const route = {
+        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        _component: alias,
+        component: componentName,
+        parent,
+        type: "page"
+      };
+      if (fs.statSync(filePath).isDirectory()) {
+        recursiveReadDir({
+          dir: filePath,
+          routes,
+          basePath: `${route.path}/`,
+          srcDirectory,
+          srcAlias
+        });
+        continue;
+      }
+      if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+        continue;
+      }
+      if (filename === FILE_SYSTEM_ROUTES_INDEX) {
+        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
+      }
+      if (filename === "404" && basePath === "/") {
+        route.path = "*";
+      }
+      routes.push(route);
+    }
+  }
+  if (resetParent) {
+    parents.pop();
+  }
+};
+const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
+  const flat = (routes) => routes.reduce(
+    (memo, route) => memo.concat(
+      Array.isArray(route.children) ? flat(route.children) : [route]
+    ),
+    []
+  );
+  const generate = (route) => {
+    const codes = [];
+    let lastComponent = route.component;
+    const imports = [
+      `import React from 'react';`,
+      `import ${lastComponent} from '${route._component}'`
+    ];
+    while (route = route.parent) {
+      const layoutComponent = route.component;
+      const layoutComponentAbbr = layoutNameAbbr(route._component);
+      imports.push(`import ${layoutComponent} from '${route._component}';`);
+      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
+      codes.push(
+        `const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`
+      );
+      lastComponent = currentComponent;
+    }
+    const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
+    fs.outputFileSync(
+      file,
+      `${imports.join("\n")}
+${codes.join(
+        "\n"
+      )}
+export default ${lastComponent}`
+    );
+    return {
+      component: lastComponent,
+      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+    };
+  };
+  const normalized = flat(nested).map(
+    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+  );
+  return normalized;
+};
+const getClientRoutes = ({
+  entrypoint,
+  srcDirectory,
+  srcAlias,
+  internalDirectory,
+  internalDirAlias
+}) => {
+  const { entryName, pageRoutesEntry } = entrypoint;
+  if (!pageRoutesEntry) {
+    return [];
+  }
+  if (!fs.existsSync(pageRoutesEntry)) {
+    throw new Error(
+      `generate file system routes error, ${pageRoutesEntry} directory not found.`
+    );
+  }
+  if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
+    throw new Error(
+      `generate file system routes error, ${pageRoutesEntry} should be directory.`
+    );
+  }
+  let routes = [];
+  recursiveReadDir({
+    dir: pageRoutesEntry,
+    routes,
+    basePath: "/",
+    srcDirectory,
+    srcAlias
+  });
+  const internalComponentsDir = path.resolve(
+    internalDirectory,
+    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
+  );
+  fs.emptyDirSync(internalComponentsDir);
+  routes = normalizeNestedRoutes(
+    routes,
+    internalComponentsDir,
+    internalDirectory,
+    internalDirAlias
+  );
+  parents.length = 0;
+  routes.sort((a, b) => {
+    const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
+    if (delta === 0) {
+      return a.path.length - b.path.length;
+    }
+    return delta;
+  });
+  debug(`fileSystem routes: %o`, routes);
+  return routes;
+};
+export {
+  getClientRoutes
+};

package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js

@@ -0,0 +1,216 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import path from "path";
+import { fs } from "@modern-js/utils";
+import { makeLegalIdentifier } from "../makeLegalIdentifier";
+import {
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT
+} from "../constants";
+import { replaceWithAlias } from "../utils";
+import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
+const compName = (srcDirectory, filePath) => {
+  const legalCompName = makeLegalIdentifier(
+    path.relative(srcDirectory, filePath)
+  );
+  return `Comp_${legalCompName}`;
+};
+const layoutNameAbbr = (filePath) => {
+  const prefix = "L_";
+  const dirName = path.dirname(filePath).split("/").pop() || "";
+  return `${prefix}${makeLegalIdentifier(dirName)}`;
+};
+const parents = [];
+const recursiveReadDirLegacy = ({
+  dir,
+  routes,
+  basePath = "/",
+  srcDirectory,
+  srcAlias
+}) => {
+  let hasDynamicRoute = false;
+  let resetParent = false;
+  let parent = parents[parents.length - 1];
+  const layout = findLayout(dir);
+  if (layout) {
+    if (basePath === "/") {
+      throw new Error(`should use _app instead of _layout in ${dir}`);
+    } else {
+      const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
+      const componentName = compName(srcDirectory, layout);
+      const route = {
+        path: `${basePath.substring(0, basePath.length - 1)}`,
+        exact: false,
+        routes: [],
+        _component: alias,
+        component: componentName,
+        parent
+      };
+      parent = route;
+      resetParent = true;
+      routes.push(route);
+      parents.push(route);
+      routes = route.routes;
+    }
+  }
+  for (const relative of fs.readdirSync(dir)) {
+    const filePath = path.join(dir, relative);
+    if (!shouldSkip(filePath)) {
+      const filename = path.basename(filePath, path.extname(filePath));
+      const alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
+      const componentName = compName(srcDirectory, filePath);
+      const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
+      if (dynamicRouteMatched) {
+        if (hasDynamicRoute) {
+          throw new Error(
+            `Can't set two dynamic route in one directory: ${dir}`
+          );
+        } else {
+          hasDynamicRoute = true;
+        }
+      }
+      const route = {
+        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        _component: alias,
+        component: componentName,
+        exact: true,
+        parent
+      };
+      if (fs.statSync(filePath).isDirectory()) {
+        recursiveReadDirLegacy({
+          dir: filePath,
+          routes,
+          basePath: `${route.path}/`,
+          srcDirectory,
+          srcAlias
+        });
+        continue;
+      }
+      if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+        continue;
+      }
+      if (filename === FILE_SYSTEM_ROUTES_INDEX) {
+        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
+      }
+      if (filename === "404" && basePath === "/") {
+        route.path = "*";
+        route.exact = false;
+      }
+      routes.push(route);
+    }
+  }
+  if (resetParent) {
+    parents.pop();
+  }
+};
+const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
+  const flat = (routes) => routes.reduce(
+    (memo, route) => memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [route]),
+    []
+  );
+  const generate = (route) => {
+    const codes = [];
+    let lastComponent = route.component;
+    const imports = [
+      `import React from 'react';`,
+      `import ${lastComponent} from '${route._component}'`
+    ];
+    while (route = route.parent) {
+      const layoutComponent = route.component;
+      const layoutComponentAbbr = layoutNameAbbr(route._component);
+      imports.push(`import ${layoutComponent} from '${route._component}';`);
+      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
+      codes.push(
+        `const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`
+      );
+      lastComponent = currentComponent;
+    }
+    const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
+    fs.outputFileSync(
+      file,
+      `${imports.join("\n")}
+${codes.join(
+        "\n"
+      )}
+export default ${lastComponent}`
+    );
+    return {
+      component: lastComponent,
+      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+    };
+  };
+  const normalized = flat(nested).map(
+    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+  );
+  return normalized;
+};
+const getClientRoutes = ({
+  entrypoint,
+  srcDirectory,
+  srcAlias,
+  internalDirectory,
+  internalDirAlias
+}) => {
+  const { entry, entryName } = entrypoint;
+  if (!fs.existsSync(entry)) {
+    throw new Error(
+      `generate file system routes error, ${entry} directory not found.`
+    );
+  }
+  if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
+    throw new Error(
+      `generate file system routes error, ${entry} should be directory.`
+    );
+  }
+  let routes = [];
+  recursiveReadDirLegacy({
+    dir: entry,
+    routes,
+    basePath: "/",
+    srcDirectory,
+    srcAlias
+  });
+  const internalComponentsDir = path.resolve(
+    internalDirectory,
+    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
+  );
+  fs.emptyDirSync(internalComponentsDir);
+  routes = normalizeNestedRoutes(
+    routes,
+    internalComponentsDir,
+    internalDirectory,
+    internalDirAlias
+  );
+  parents.length = 0;
+  routes.sort((a, b) => {
+    const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
+    if (delta === 0) {
+      return a.path.length - b.path.length;
+    }
+    return delta;
+  });
+  debug(`fileSystem routes: %o`, routes);
+  return routes;
+};
+export {
+  getClientRoutes
+};

package/dist/js/modern/analyze/getClientRoutes/index.js

@@ -0,0 +1,6 @@
+import { getClientRoutes } from "./getRoutes";
+import { getClientRoutes as getClientRoutes2 } from "./getRoutesLegacy";
+export {
+  getClientRoutes,
+  getClientRoutes2 as getClientRoutesLegacy
+};

package/dist/js/modern/analyze/getClientRoutes/utils.js

@@ -0,0 +1,31 @@
+import path from "path";
+import { createDebugger, findExists, fs } from "@modern-js/utils";
+import {
+  JS_EXTENSIONS,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX
+} from "../constants";
+const debug = createDebugger("get-client-routes");
+const findLayout = (dir) => findExists(
+  JS_EXTENSIONS.map(
+    (ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)
+  )
+);
+const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;
+const shouldSkip = (file) => {
+  if (fs.statSync(file).isDirectory()) {
+    return false;
+  }
+  const ext = path.extname(file);
+  if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
+    return true;
+  }
+  return false;
+};
+export {
+  debug,
+  findLayout,
+  getRouteWeight,
+  shouldSkip
+};