@blocklet/meta 1.8.40 → 1.8.42

package/lib/parse-navigation-from-blocklet.d.ts

@@ -45,9 +45,10 @@ declare function splitNavigationBySection(navigation: any): any[];
  */
 declare function nestNavigationList(list?: any[]): any[];
 declare function filterNavigation(navigationList: any, components?: any[]): any[];
+declare function cleanOrphanNavigation(list: any): any;
 declare function parseNavigation(blocklet?: {}, options?: {}): {
     navigationList: any[];
     components: any[];
     builtinList: any[];
 };
-export { parseNavigation, deepWalk, isMatchSection, nestNavigationList, filterNavigation, joinLink, checkLink, flatternNavigation, splitNavigationBySection, };
+export { parseNavigation, deepWalk, isMatchSection, nestNavigationList, filterNavigation, cleanOrphanNavigation, joinLink, checkLink, flatternNavigation, splitNavigationBySection, };

package/lib/parse-navigation-from-blocklet.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitNavigationBySection = exports.flatternNavigation = exports.checkLink = exports.joinLink = exports.filterNavigation = exports.nestNavigationList = exports.isMatchSection = exports.deepWalk = exports.parseNavigation = void 0;
+exports.splitNavigationBySection = exports.flatternNavigation = exports.checkLink = exports.joinLink = exports.cleanOrphanNavigation = exports.filterNavigation = exports.nestNavigationList = exports.isMatchSection = exports.deepWalk = exports.parseNavigation = void 0;
 const unionWith_1 = __importDefault(require("lodash/unionWith"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
@@ -301,7 +301,6 @@ function patchBuiltinNavigation(navigation) {
     const copyNavigation = (0, cloneDeep_1.default)(navigation).filter((item) => item.id);
     deepWalk(copyNavigation, (item, parent) => {
         var _a;
-        // item.id = item.component || JSON.stringify(item.title) || nanoid();
         if (item.items && item.items.length) {
             for (let i = item.items.length - 1; i >= 0; i--) {
                 if (!item.items[i].id) {
@@ -463,8 +462,8 @@ function nestNavigationList(list = []) {
 }
 exports.nestNavigationList = nestNavigationList;
 function filterNavigation(navigationList, components = []) {
-    const fullNavigation = nestNavigationList(navigationList);
-    deepWalk(fullNavigation, (item) => {
+    const nestedNavigation = nestNavigationList(navigationList);
+    deepWalk(nestedNavigation, (item) => {
         if (item === null || item === void 0 ? void 0 : item.component) {
             if (!components.some((x) => x.name === item.component)) {
                 item.visible = false;
@@ -478,9 +477,22 @@ function filterNavigation(navigationList, components = []) {
             }
         }
     }, { key: 'items' });
-    return fullNavigation.filter((item) => item.visible !== false);
+    const filteredNavigation = nestedNavigation.filter((item) => item.visible !== false);
+    return filteredNavigation;
 }
 exports.filterNavigation = filterNavigation;
+function cleanOrphanNavigation(list) {
+    // 将仅有一个 child 的菜单提升到上一级
+    return list.map((item) => {
+        if (item.items && Array.isArray(item.items) && item.items.length === 1) {
+            if (['header', 'footer', '', undefined, null].includes(item.section)) {
+                return item.items[0];
+            }
+        }
+        return item;
+    });
+}
+exports.cleanOrphanNavigation = cleanOrphanNavigation;
 function parseNavigation(blocklet = {}, options = {}) {
     var _a;
     const { beforeProcess = (v) => v } = options;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.40",
+  "version": "1.8.42",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,14 +24,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.40",
-    "@abtnode/constant": "1.8.40",
-    "@abtnode/util": "1.8.40",
+    "@abtnode/client": "1.8.42",
+    "@abtnode/constant": "1.8.42",
+    "@abtnode/util": "1.8.42",
     "@arcblock/did": "1.18.26",
     "@arcblock/did-ext": "1.18.26",
     "@arcblock/did-util": "1.18.26",
     "@arcblock/jwt": "1.18.26",
-    "@blocklet/constant": "1.8.40",
+    "@blocklet/constant": "1.8.42",
     "@ocap/asset": "1.18.26",
     "@ocap/mcrypto": "1.18.26",
     "@ocap/types": "1.18.26",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "336dbe0ad2cf512a322358899e56aab3668b1715"
+  "gitHead": "04771ed44e11deb3f214b637be6e3b78ca2b9245"
 }