dumi 2.0.0-beta.8 → 2.0.0-beta.9

package/dist/client/theme-api/useSiteSearch.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -71,7 +77,7 @@ function generateSearchMetadata(routes, demos, nav) {
       var _demosMapping$route$i;
 
       var routeMeta = route.meta;
-      var routeAbsPath = route.path.replace(/^([^/])/, '/$1');
+      var routeAbsPath = route.path.replace(/^([^/])/, '/$1') || '/';
       var routeNav = nav.find(function (item) {
         return routeAbsPath === item.link || routeAbsPath.startsWith("".concat(item.activePath, "/"));
       });
@@ -81,17 +87,17 @@ function generateSearchMetadata(routes, demos, nav) {
         return (_demo$asset = demo.asset) === null || _demo$asset === void 0 ? void 0 : _demo$asset.id;
       });
       var orphanSection = createMetadataSection('', routeMeta.frontmatter.title, routeAbsPath, routeMeta.texts);
-      var tocSections = routeMeta.toc // exclude demo id, to avoid duplicate
-      .filter(function (_ref) {
-        var id = _ref.id,
-            depth = _ref.depth;
-        return !demoIds.includes(id) && depth > 1;
-      }).map(function (toc, i) {
-        return createMetadataSection(toc.title, "".concat(routeMeta.frontmatter.title, " - ").concat(toc.title), "".concat(routeAbsPath, "#").concat(toc.id), routeMeta.texts, i);
-      });
-      var tabSections = (routeMeta.tabs || []).reduce(function (acc, _ref2) {
-        var key = _ref2.key,
-            meta = _ref2.meta;
+      var tocSections = routeMeta.toc.reduce(function (acc, toc, i) {
+        // exclude demo id, to avoid duplicate
+        if (!demoIds.includes(toc.id) && toc.depth > 1) {
+          acc.push(createMetadataSection(toc.title, "".concat(routeMeta.frontmatter.title, " - ").concat(toc.title), "".concat(routeAbsPath, "#").concat(toc.id), routeMeta.texts, i));
+        }
+
+        return acc;
+      }, []);
+      var tabSections = (routeMeta.tabs || []).reduce(function (acc, _ref) {
+        var key = _ref.key,
+            meta = _ref.meta;
         // collect orphan section that not in toc
         var tabOrphanSection = createMetadataSection('', "".concat(routeMeta.frontmatter.title, " - ").concat(meta.frontmatter.title), "".concat(routeAbsPath, "?").concat(TAB_QUERY_KEY, "=").concat(key), meta.texts);
         if (tabOrphanSection) acc.push(tabOrphanSection); // collect sections by toc
@@ -129,11 +135,13 @@ function generateHighlightTexts() {
     textToHighlight: str,
     searchWords: keywords,
     autoEscape: true
-  });
-  return [chunks.map(function (_ref3, i) {
-    var start = _ref3.start,
-        end = _ref3.end,
-        highlight = _ref3.highlight;
+  }); // save matched keywords
+
+  var matchedMapping = {};
+  return [chunks.map(function (_ref2, i) {
+    var start = _ref2.start,
+        end = _ref2.end,
+        highlight = _ref2.highlight;
     var highlightText = {
       text: str.slice(start, end)
     }; // omit long str before the first highlighted text
@@ -145,10 +153,13 @@ function generateHighlightTexts() {
 
     if (highlight) {
       highlightText.highlighted = true;
+      matchedMapping[keywords.find(function (k) {
+        return highlightText.text.includes(k);
+      })] = true;
     }
 
     return highlightText;
-  }), chunks.length];
+  }), matchedMapping];
 }
 
 function generateSearchResult(metadata, keywordsStr) {
@@ -172,17 +183,17 @@ function generateSearchResult(metadata, keywordsStr) {
             var _generateHighlightTex3 = generateHighlightTexts(sec.title, keywords),
                 _generateHighlightTex4 = _slicedToArray(_generateHighlightTex3, 2),
                 _highlightTitleTexts = _generateHighlightTex4[0],
-                _titleMatchCount = _generateHighlightTex4[1];
+                _titleMatchMapping = _generateHighlightTex4[1];
 
             var _generateHighlightTex5 = generateHighlightTexts(p, keywords),
                 _generateHighlightTex6 = _slicedToArray(_generateHighlightTex5, 2),
                 highlightTexts = _generateHighlightTex6[0],
-                matchCount = _generateHighlightTex6[1];
+                matchMapping = _generateHighlightTex6[1];
 
             hints.push({
               type: 'content',
               link: sec.link,
-              priority: _titleMatchCount + matchCount,
+              priority: Object.keys(_objectSpread(_objectSpread({}, _titleMatchMapping), matchMapping)).length,
               highlightTitleTexts: _highlightTitleTexts,
               highlightTexts: highlightTexts
             }); // match at most once in the same section
@@ -201,12 +212,12 @@ function generateSearchResult(metadata, keywordsStr) {
         var _generateHighlightTex = generateHighlightTexts(sec.title, keywords),
             _generateHighlightTex2 = _slicedToArray(_generateHighlightTex, 2),
             highlightTitleTexts = _generateHighlightTex2[0],
-            titleMatchCount = _generateHighlightTex2[1];
+            titleMatchMapping = _generateHighlightTex2[1];
 
         hints.push({
           type: 'title',
           link: sec.link,
-          priority: titleMatchCount,
+          priority: Object.keys(titleMatchMapping).length,
           highlightTitleTexts: highlightTitleTexts,
           highlightTexts: generateHighlightTexts(sec.paragraphs[0] || '', keywords)[0]
         });
@@ -218,17 +229,17 @@ function generateSearchResult(metadata, keywordsStr) {
         var _generateHighlightTex7 = generateHighlightTexts(demo.title, keywords),
             _generateHighlightTex8 = _slicedToArray(_generateHighlightTex7, 2),
             highlightTitleTexts = _generateHighlightTex8[0],
-            titleMatchCount = _generateHighlightTex8[1];
+            titleMatchMapping = _generateHighlightTex8[1];
 
         var _generateHighlightTex9 = generateHighlightTexts(demo.description, keywords),
             _generateHighlightTex10 = _slicedToArray(_generateHighlightTex9, 2),
             highlightTexts = _generateHighlightTex10[0],
-            matchCount = _generateHighlightTex10[1];
+            matchMapping = _generateHighlightTex10[1];
 
         hints.push({
           type: 'demo',
           link: demo.link,
-          priority: titleMatchCount + matchCount,
+          priority: Object.keys(_objectSpread(_objectSpread({}, titleMatchMapping), matchMapping)).length,
           highlightTitleTexts: highlightTitleTexts,
           highlightTexts: highlightTexts
         });
@@ -241,12 +252,12 @@ function generateSearchResult(metadata, keywordsStr) {
       var _generateHighlightTex11 = generateHighlightTexts(data.title, keywords),
           _generateHighlightTex12 = _slicedToArray(_generateHighlightTex11, 2),
           highlightTitleTexts = _generateHighlightTex12[0],
-          titleMatchCount = _generateHighlightTex12[1];
+          titleMatchMapping = _generateHighlightTex12[1];
 
       hints.push({
         type: 'page',
         link: data.link,
-        priority: titleMatchCount,
+        priority: Object.keys(titleMatchMapping).length,
         highlightTitleTexts: highlightTitleTexts,
         highlightTexts: generateHighlightTexts(((_data$sections$ = data.sections[0]) === null || _data$sections$ === void 0 ? void 0 : _data$sections$.paragraphs[0]) || '', keywords)[0]
       });
@@ -263,10 +274,15 @@ function generateSearchResult(metadata, keywordsStr) {
         hints: []
       };
 
-      (_resultMapping$key$hi = resultMapping[key].hints).push.apply(_resultMapping$key$hi, _toConsumableArray(hints.sort(function (prev, next) {
-        return next.priority - prev.priority;
-      })));
+      (_resultMapping$key$hi = resultMapping[key].hints).push.apply(_resultMapping$key$hi, hints);
     }
+  }); // sort hints
+
+  Object.values(resultMapping).forEach(function (_ref3) {
+    var hints = _ref3.hints;
+    hints.sort(function (prev, next) {
+      return next.priority - prev.priority;
+    });
   });
   return Object.values(resultMapping).sort(function (prev, next) {
     return next.priority - prev.priority;

package/dist/features/configPlugins/schema.js

@@ -36,7 +36,8 @@ function getSchemas() {
     }).optional(),
     extraRemarkPlugins: getUnifiedPluginSchema,
     extraRehypePlugins: getUnifiedPluginSchema,
-    themeConfig: (Joi) => Joi.object().optional()
+    themeConfig: (Joi) => Joi.object().optional(),
+    logo: (Joi) => Joi.string()
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/meta.js

@@ -40,7 +40,7 @@ var meta_default = (api) => {
     fn: (routes) => {
       metaFiles.length = 0;
       Object.values(routes).forEach((route) => {
-        if (!route.isLayout && !/\*|:/.test(route.path) && !(0, import_tabs.isTabRouteFile)(route.file)) {
+        if (!route.isLayout && !/\*|:/.test(route.path) && route.file && !(0, import_tabs.isTabRouteFile)(route.file)) {
           metaFiles.push({
             index: metaFiles.length,
             file: route.file,

package/dist/features/routes.js

@@ -113,7 +113,7 @@ var routes_default = (api) => {
     Object.entries(pages).forEach(([, route]) => {
       route.parentId = docLayoutId;
       route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(pagesDir, route.file));
-      routes[route.id] = route;
+      route.path = route.absPath.slice(1);
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
       const base = import_path.default.join(api.cwd, dir);
@@ -124,6 +124,7 @@ var routes_default = (api) => {
       Object.entries(dirRoutes).forEach(([key, route]) => {
         route.id = `${dir}/${key}`;
         route.parentId = docLayoutId;
+        route.path = route.absPath.slice(1);
         if (type) {
           const pluralType = (0, import_pluralize.plural)(type);
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");

package/dist/features/tabs.js

@@ -54,7 +54,7 @@ var tabs_default = (api) => {
   api.modifyRoutes((routes) => {
     tabs.length = 0;
     Object.values(routes).forEach((route) => {
-      if (isTabRouteFile(route.file)) {
+      if (route.file && isTabRouteFile(route.file)) {
         delete routes[route.id];
         const rtlFile = (0, import_plugin_utils.winPath)(import_path.default.relative(api.cwd, route.file));
         const routeId = (0, import_utils.createRouteId)(rtlFile);

package/dist/features/theme/index.js

@@ -134,7 +134,7 @@ export default function DumiContextWrapper() {
       locales,
       loading,
       setLoading,
-      themeConfig: ${JSON.stringify(api.config.themeConfig)},
+      themeConfig: ${JSON.stringify(Object.assign(import_plugin_utils.lodash.pick(api.config, "logo", "description", "title"), api.config.themeConfig))},
     }}>
       {outlet}
     </SiteContext.Provider>

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

@@ -44,7 +44,7 @@ function findClosestTitle(ancestors, node) {
   for (let i = ancestors.length - 1; i >= 0; i--) {
     const parent = ancestors[i];
     const current = ancestors[i + 1] || node;
-    for (let i2 = parent.children.indexOf(current) - 1; i2 >= 0; i2 -= 1) {
+    for (let i2 = parent.children.indexOf(current) - 1; i2 >= 0; i2--) {
       const child = parent.children[i2];
       if (child.type === "element" && import_rehypeSlug.HEADING_TAGS.includes(child.tagName)) {
         return child;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",