dumi 2.4.19-beta.0 → 2.4.20

package/dist/features/routes.js

@@ -140,14 +140,14 @@ var routes_default = (api) => {
       };
     }
     Object.entries(pages).forEach(([, route]) => {
-      const { base: base2 } = api.config.conventionRoutes;
-      route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base2, route.file));
+      const { base } = api.config.conventionRoutes;
+      route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base, route.file));
       routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
-      const base2 = import_path.default.join(api.cwd, dir);
+      const base = import_path.default.join(api.cwd, dir);
       const dirRoutes = (0, import_core.getConventionRoutes)({
-        base: base2,
+        base,
         exclude: [/.*(?<!md)$/, /(\/|^)(\.|_)/]
       });
       Object.entries(dirRoutes).forEach(([key, route]) => {
@@ -157,15 +157,15 @@ var routes_default = (api) => {
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");
           route.absPath = `/${route.path}`;
         }
-        route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base2, route.file));
+        route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base, route.file));
         routes[route.id] = route;
       });
     });
     atomDirs.forEach(({ type, subType = "", dir }) => {
-      const base2 = import_path.default.join(api.cwd, dir);
+      const base = import_path.default.join(api.cwd, dir);
       const atomFiles = import_plugin_utils.glob.sync(
         "{*,*/index,*/index.*,*/README,*/README.*}.md",
-        { cwd: base2 }
+        { cwd: base }
       );
       atomFiles.forEach((file) => {
         const routeFile = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), subType, file));
@@ -176,7 +176,7 @@ var routes_default = (api) => {
           path: routePath,
           absPath: `/${routePath}`,
           parentId: docLayoutId,
-          file: (0, import_plugin_utils.winPath)(import_path.default.resolve(base2, file)),
+          file: (0, import_plugin_utils.winPath)(import_path.default.resolve(base, file)),
           meta: { _atom_route: true }
         };
       });
@@ -205,11 +205,10 @@ var routes_default = (api) => {
         file: require.resolve("../client/pages/404")
       };
     }
-    const base = api.config.base;
     routes["demo-render"] = {
       id: "demo-render",
       path: `${import_constants.SP_ROUTE_PREFIX}demos/:id`,
-      absPath: `${base}${import_constants.SP_ROUTE_PREFIX}demos/:id`,
+      absPath: `/${import_constants.SP_ROUTE_PREFIX}demos/:id`,
       parentId: demoLayoutId,
       file: require.resolve("../client/pages/Demo")
     };

package/dist/loaders/markdown/transformer/rehypeSlug.js

@@ -47,7 +47,7 @@ function rehypeSlug() {
     const slugger = new import_github_slugger.default();
     vFile.data.toc = [];
     visit(tree, "element", (node) => {
-      var _a, _b;
+      var _a, _b, _c;
       if (HEADING_TAGS.includes(node.tagName)) {
         const title = toString({
           type: "element",
@@ -58,12 +58,16 @@ function rehypeSlug() {
           )
         }).trim();
         const depth = Number(node.tagName.slice(1));
-        const id = slugger.slug(title);
-        node.properties.id = id;
-        vFile.data.toc.push({ id, depth, title });
-      } else if ([import_rehypeDemo.DUMI_DEMO_TAG, import_rehypeDemo.DUMI_DEMO_GRID_TAG].includes(node.tagName) && ((_a = node.data) == null ? void 0 : _a[import_rehypeDemo.DEMO_PROP_VALUE_KEY])) {
+        node.properties ?? (node.properties = {});
+        (_a = node.properties).id ?? (_a.id = slugger.slug(title));
+        vFile.data.toc.push({
+          id: node.properties.id,
+          depth,
+          title
+        });
+      } else if ([import_rehypeDemo.DUMI_DEMO_TAG, import_rehypeDemo.DUMI_DEMO_GRID_TAG].includes(node.tagName) && ((_b = node.data) == null ? void 0 : _b[import_rehypeDemo.DEMO_PROP_VALUE_KEY])) {
         const demos = [].concat(
-          (_b = node.data) == null ? void 0 : _b[import_rehypeDemo.DEMO_PROP_VALUE_KEY]
+          (_c = node.data) == null ? void 0 : _c[import_rehypeDemo.DEMO_PROP_VALUE_KEY]
         );
         demos.forEach(({ demo, previewerProps }) => {
           var _a2, _b2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.19-beta.0",
+  "version": "2.4.20",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",

package/theme-default/builtins/API/index.js

@@ -95,8 +95,14 @@ var HANDLERS = {
     return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Token, null, '{'), props, /*#__PURE__*/React.createElement(Token, null, '}'));
   },
   array: function array(prop) {
+    var _this2 = this;
     var arrayType = /*#__PURE__*/React.createElement("span", null, "any");
     if (prop.items) {
+      if (Array.isArray(prop.items)) return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Token, null, '['), prop.items.map(function (item, i) {
+        return /*#__PURE__*/React.createElement("span", {
+          key: "".concat(i)
+        }, i > 0 && ', ', _this2.toNode(item));
+      }), /*#__PURE__*/React.createElement(Token, null, ']'));
       var className = this.getValidClassName(prop.items);
       arrayType = className !== null && className !== void 0 ? className : this.toNode(prop.items);
     }
@@ -108,7 +114,7 @@ var HANDLERS = {
   },
   // FIXME: extract real type
   function: function _function(_ref4) {
-    var _this2 = this;
+    var _this3 = this;
     var signature = _ref4.signature;
     // handle Function type without signature
     if (!signature) return /*#__PURE__*/React.createElement("span", null, "Function");
@@ -119,8 +125,8 @@ var HANDLERS = {
       }, signature.isAsync ? /*#__PURE__*/React.createElement(Token, null, "async") : '', /*#__PURE__*/React.createElement(Token, null, '('), signature.arguments.map(function (arg, ai) {
         return /*#__PURE__*/React.createElement("span", {
           key: "".concat(si).concat(ai)
-        }, /*#__PURE__*/React.createElement("span", null, arg.key), arg.hasQuestionToken && /*#__PURE__*/React.createElement(Token, null, "?"), /*#__PURE__*/React.createElement(Token, null, ":"), _this2.toNode(!!arg.schema ? arg.schema : fixArg(arg)), ai < signature.arguments.length - 1 && /*#__PURE__*/React.createElement(Token, null, ","));
-      }), /*#__PURE__*/React.createElement(Token, null, ')'), /*#__PURE__*/React.createElement(Token, null, "=>"), _this2.toNode(signature.returnType), si < signatures.length - 1 && /*#__PURE__*/React.createElement(Token, null, "|"));
+        }, /*#__PURE__*/React.createElement("span", null, arg.key), arg.hasQuestionToken && /*#__PURE__*/React.createElement(Token, null, "?"), /*#__PURE__*/React.createElement(Token, null, ":"), _this3.toNode(!!arg.schema ? arg.schema : fixArg(arg)), ai < signature.arguments.length - 1 && /*#__PURE__*/React.createElement(Token, null, ","));
+      }), /*#__PURE__*/React.createElement(Token, null, ')'), /*#__PURE__*/React.createElement(Token, null, "=>"), _this3.toNode(signature.returnType), si < signatures.length - 1 && /*#__PURE__*/React.createElement(Token, null, "|"));
     });
   },
   // FIXME: extract real type
@@ -139,20 +145,20 @@ var HANDLERS = {
     }));
   },
   oneOf: function oneOf(prop) {
-    var _this3 = this;
+    var _this4 = this;
     return prop.oneOf.map(function (v, i) {
       return /*#__PURE__*/React.createElement("span", {
         key: i
-      }, _this3.getValidClassName(v) || _this3.toNode(v), i < prop.oneOf.length - 1 && /*#__PURE__*/React.createElement(Token, null, "|"));
+      }, _this4.getValidClassName(v) || _this4.toNode(v), i < prop.oneOf.length - 1 && /*#__PURE__*/React.createElement(Token, null, "|"));
     });
   },
   reference: function reference(prop) {
-    var _this4 = this;
+    var _this5 = this;
     var typeParameters = prop.typeParameters || [];
     var params = typeParameters.map(function (param, i) {
       return /*#__PURE__*/React.createElement("span", {
         key: i
-      }, _this4.toNode(param), i < typeParameters.length - 1 && /*#__PURE__*/React.createElement(Token, null, ","));
+      }, _this5.toNode(param), i < typeParameters.length - 1 && /*#__PURE__*/React.createElement(Token, null, ","));
     });
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
       className: "dumi-default-api-link",

package/theme-default/builtins/SourceCode/index.js

@@ -91,7 +91,9 @@ var SourceCode = function SourceCode(props) {
   });
   return /*#__PURE__*/React.createElement("div", {
     className: "dumi-default-source-code"
-  }, /*#__PURE__*/React.createElement(CopyToClipboard, {
+  }, Boolean(lang) && /*#__PURE__*/React.createElement("span", {
+    className: "dumi-default-source-code-language"
+  }, lang), /*#__PURE__*/React.createElement(CopyToClipboard, {
     text: text,
     onCopy: function onCopy() {
       setIsCopied(true);

package/theme-default/builtins/SourceCode/index.less

@@ -158,6 +158,24 @@
     visibility: hidden;
   }
 
+  &-language {
+    position: absolute;
+    top: 2px;
+    right: 8px;
+    z-index: 2;
+    font-size: 12px;
+    font-weight: 500;
+    user-select: none;
+    user-select: none;
+    color: @c-text-note;
+    transition: color 0.4s, opacity 0.4s;
+  }
+
+  &:hover &-language {
+    opacity: 0;
+    visibility: hidden;
+  }
+
   @{dark-selector} & {
     @bg-color: shade(@c-site-bg-dark, 50%);