dumi 2.1.5 → 2.1.6

package/dist/assetParsers/atom.d.ts

@@ -4,6 +4,7 @@ declare class AtomAssetsParser {
     private resolveDir;
     private unresolvedFiles;
     private parser;
+    private resolver;
     private parseDeferrer;
     private watcher;
     private cbs;
@@ -21,5 +22,6 @@ declare class AtomAssetsParser {
     }>;
     watch(cb: AtomAssetsParser['cbs'][number]): void;
     unwatch(cb: AtomAssetsParser['cbs'][number]): void;
+    destroy(): void;
 }
 export default AtomAssetsParser;

package/dist/assetParsers/atom.js

@@ -42,28 +42,33 @@ var AtomAssetsParser = class {
     this.parser = new import_parser.SchemaParser({
       entryPath: absEntryFile,
       basePath: (0, import_utils.getProjectRoot)(opts.resolveDir),
-      unPkgHost: opts.unpkgHost ?? "https://unpkg.com"
+      unPkgHost: opts.unpkgHost ?? "https://unpkg.com",
+      mode: "worker"
     });
   }
   async parse() {
-    if (!this.parseDeferrer || this.unresolvedFiles.length) {
+    if (!this.parseDeferrer) {
       this.parseDeferrer = (async () => {
-        this.unresolvedFiles.splice(0);
-        await this.parser.patch([]);
-        const resolver = new import_parser.SchemaResolver(await this.parser.parse());
+        await this.parser.patch(this.unresolvedFiles.splice(0));
+        const resolver = new import_parser.SchemaResolver(await this.parser.parse(), {
+          mode: "worker"
+        });
+        this.resolver = resolver;
         const result = {
           components: {},
           functions: {}
         };
         const fallbackProps = { type: "object", properties: {} };
         const fallbackSignature = { arguments: [] };
-        resolver.componentList.forEach((id) => {
+        const componentList = await resolver.componentList;
+        const functionList = await resolver.functionList;
+        for (const id of componentList) {
           const needResolve = this.resolveFilter({
             id,
             type: "COMPONENT",
-            ids: resolver.componentList
+            ids: componentList
           });
-          let propsConfig = needResolve ? resolver.getComponent(id).props : fallbackProps;
+          let propsConfig = needResolve ? (await resolver.getComponent(id)).props : fallbackProps;
           const size = Buffer.byteLength(JSON.stringify(propsConfig));
           if (size > MAX_PARSE_SIZE) {
             propsConfig = fallbackProps;
@@ -75,14 +80,14 @@ var AtomAssetsParser = class {
             title: id,
             propsConfig
           };
-        });
-        resolver.functionList.forEach((id) => {
+        }
+        for (const id of functionList) {
           const needResolve = this.resolveFilter({
             id,
             type: "FUNCTION",
-            ids: resolver.functionList
+            ids: functionList
           });
-          let signature = needResolve ? resolver.getFunction(id).signature : fallbackSignature;
+          let signature = needResolve ? (await resolver.getFunction(id)).signature : fallbackSignature;
           const size = Buffer.byteLength(JSON.stringify(signature));
           if (size > MAX_PARSE_SIZE) {
             signature = fallbackSignature;
@@ -94,9 +99,15 @@ var AtomAssetsParser = class {
             title: id,
             signature
           };
-        });
+        }
         return result;
       })();
+      this.parseDeferrer.finally(() => {
+        var _a;
+        (_a = this.resolver) == null ? void 0 : _a.$$destroyWorker();
+        this.resolver = void 0;
+        this.parseDeferrer = void 0;
+      });
     }
     return this.parseDeferrer;
   }
@@ -117,7 +128,7 @@ var AtomAssetsParser = class {
         ],
         ignoreInitial: true
       }).on("all", (ev, file) => {
-        if (["add", "change"].includes(ev) && /\.(j|t)sx?$/.test(file)) {
+        if (["add", "change"].includes(ev) && /((?<!\.d)\.ts|\.(jsx?|tsx))$/.test(file)) {
           this.unresolvedFiles.push(import_path.default.join(this.resolveDir, file));
           lazyParse();
         }
@@ -128,6 +139,11 @@ var AtomAssetsParser = class {
   unwatch(cb) {
     this.cbs.splice(this.cbs.indexOf(cb), 1);
   }
+  destroy() {
+    var _a;
+    (_a = this.resolver) == null ? void 0 : _a.$$destroyWorker();
+    this.parser.$$destroyWorker();
+  }
 };
 var atom_default = AtomAssetsParser;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/configPlugins/index.js

@@ -28,7 +28,8 @@ var configPlugins_default = (api) => {
     resolve: {
       docDirs: ["docs"],
       atomDirs: [{ type: "component", dir: "src" }],
-      codeBlockMode: "active"
+      codeBlockMode: "active",
+      forceKebabCaseRouting: true
     },
     themeConfig: {
       footer: `Copyright \xA9 ${new Date().getFullYear()} | Powered by <a href="https://d.umijs.org" target="_blank" rel="noreferrer">dumi</a>`,

package/dist/features/configPlugins/schema.js

@@ -32,7 +32,8 @@ function getSchemas() {
       atomDirs: Joi.array().items(Joi.object({ type: Joi.string(), dir: Joi.string() })).optional(),
       entityDirs: Joi.forbidden().error(new Error("`entityDirs` is already deprecated, please rename it to `atomDirs` in `.dumirc.ts`")),
       codeBlockMode: Joi.string().valid("active", "passive").optional(),
-      entryFile: Joi.string().optional()
+      entryFile: Joi.string().optional(),
+      forceKebabCaseRouting: Joi.bool().optional()
     }).optional(),
     extraRemarkPlugins: getUnifiedPluginSchema,
     extraRehypePlugins: getUnifiedPluginSchema,

package/dist/features/parser.js

@@ -73,6 +73,7 @@ var parser_default = (api) => {
   api.onGenerateFiles(async () => {
     if (api.env === "production") {
       writeAtomsMetaFile(await api.service.atomParser.parse());
+      api.service.atomParser.destroy();
     } else if (prevData) {
       writeAtomsMetaFile(prevData);
     }

package/dist/features/routes.js

@@ -42,16 +42,17 @@ function kebabCaseRoutePath(routePath) {
   };
   return routePath.replace(/(.)?([A-Z][^A-Z/])/g, replacer).replace(/(.)?([A-Z]+)/g, replacer);
 }
-function localizeUmiRoute(route, locales) {
+function localizeUmiRoute(route, locales, forceKebabCase) {
   const locale = locales.find((locale2) => route.path.endsWith(`/${locale2.id}`) && import_path.default.parse(route.file).name.endsWith(`.${locale2.id}`));
+  const format = forceKebabCase ? kebabCaseRoutePath : (str) => str;
   if (locale) {
     const base = !("base" in locale) || locale.base === "/" ? "" : locale.base.replace(/^(\/)(.+)$/, "$2$1");
     const suffix = "suffix" in locale ? locale.suffix : "";
-    route.path = `${base}${kebabCaseRoutePath(route.path.replace(new RegExp(`/${locale.id}$`), "").replace(/((^|\/)(index|README))$/, ""))}${suffix}`;
+    route.path = `${base}${format(route.path.replace(new RegExp(`/${locale.id}$`), "").replace(/((^|\/)(index|README))$/, ""))}${suffix}`;
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   } else {
-    route.path = kebabCaseRoutePath(route.path);
-    route.absPath = kebabCaseRoutePath(route.absPath);
+    route.path = format(route.path);
+    route.absPath = format(route.absPath);
   }
 }
 function flatRoute(route, docLayoutId) {
@@ -174,7 +175,7 @@ var routes_default = (api) => {
     at ${route.file}`);
       } else if (!route.isLayout) {
         flatRoute(route, docLayoutId);
-        localizeUmiRoute(route, api.config.locales);
+        localizeUmiRoute(route, api.config.locales, api.config.resolve.forceKebabCaseRouting);
       }
     });
     if (Object.values(pages).every((route) => route.path !== "*")) {

package/dist/types.d.ts

@@ -33,6 +33,7 @@ interface IDumiExtendsConfig {
         }[];
         codeBlockMode: 'active' | 'passive';
         entryFile?: string;
+        forceKebabCaseRouting: boolean;
     };
     locales: ILocalesConfig;
     themeConfig: IThemeConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -86,7 +86,7 @@
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
     "deepmerge": "^4.2.2",
-    "dumi-afx-deps": "^1.0.0-alpha.6",
+    "dumi-afx-deps": "^1.0.0-alpha.12",
     "dumi-assets-types": "2.0.0-alpha.0",
     "enhanced-resolve": "^5.10.0",
     "estree-util-to-js": "^1.1.0",