@blocklet/meta 1.8.11 → 1.8.12

package/lib/parse-navigation.js

@@ -1,4 +1,5 @@
 const get = require('lodash/get');
+const cloneDeep = require('lodash/cloneDeep');
 const isEqual = require('lodash/isEqual');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 
@@ -16,6 +17,29 @@ const parseLink = (input, prefix) => {
   return parseLinkString(input, prefix);
 };
 
+const getGroups = (navigation) => {
+  const groups = {};
+  for (const nav of navigation) {
+    const sections = !nav.section || !nav.section.length ? ['__undefined__'] : nav.section;
+    for (const sec of sections) {
+      if (!groups[sec]) {
+        groups[sec] = [];
+      }
+
+      const item = {
+        ...nav,
+      };
+
+      if (nav.section) {
+        item.section = sec === '__undefined__' ? [] : [sec];
+      }
+
+      groups[sec].push(item);
+    }
+  }
+  return Object.values(groups);
+};
+
 /**
  * @param {*} navigation src
  * @param {*} blocklet
@@ -37,7 +61,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
         title: nav.title,
       };
 
-      if (_level === 1 && nav.section) {
+      if (nav.section) {
         item.section = nav.section;
       }
 
@@ -77,50 +101,76 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
     }
     const childTitle = child.meta.title || child.meta.name;
 
-    const item = {
+    const itemProto = {
       title: nav.title || childTitle,
     };
 
-    if (_level === 1 && nav.section) {
-      item.section = nav.section;
+    if (nav.section) {
+      itemProto.section = nav.section;
     }
 
     if (nav.icon) {
-      item.icon = nav.icon;
+      itemProto.icon = nav.icon;
     }
 
     if (nav.role) {
-      item.role = nav.role;
+      itemProto.role = nav.role;
     }
 
-    const childNavigation = get(child, 'meta.navigation', []);
-    if (!childNavigation.length) {
+    // get groups by section
+    const groups = getGroups(get(child, 'meta.navigation', []));
+
+    if (!groups.length) {
       // child does not declares menu
+      const item = cloneDeep(itemProto);
       item.link = parseLink(child.mountPoint || '/', prefix);
       result.push(item);
-    } else if (childNavigation.length === 1) {
-      // child declares one menu
-      item.title = nav.title || childNavigation[0].title || childTitle;
-      item.link = parseLink(childNavigation[0].link || '/', normalizePathPrefix(`${prefix}${child.mountPoint}`));
-      result.push(item);
     } else {
-      // child declares multiple menus
-      const list = doParseNavigation(
-        childNavigation,
-        child,
-        normalizePathPrefix(`${prefix}${child.mountPoint}`),
-        _level + 1
-      );
-
-      if (_level === 1) { // eslint-disable-line
-        // primary menu
-        result.push({
-          ...item,
-          items: list,
-        });
-      } else {
-        // secondary menu
-        result.push(...list);
+      for (const childNavigation of groups) {
+        if (childNavigation.length === 1) {
+          // child declares one menu
+          const childNav = childNavigation[0];
+
+          const item = cloneDeep(itemProto);
+
+          item.title = nav.title || childNav.title || childTitle;
+
+          if (childNav.icon) {
+            item.icon = item.icon || childNav.icon;
+          }
+
+          if (childNav.role) {
+            item.role = item.icon || childNav.role;
+          }
+
+          if (childNav.section) {
+            item.section = item.section || childNav.section;
+          }
+
+          item.link = parseLink(childNavigation[0].link || '/', normalizePathPrefix(`${prefix}${child.mountPoint}`));
+          result.push(item);
+        } else {
+          // child declares multiple menus
+          const list = doParseNavigation(
+            childNavigation,
+            child,
+            normalizePathPrefix(`${prefix}${child.mountPoint}`),
+            _level + 1
+          );
+
+          if (_level === 1) { // eslint-disable-line
+            // primary menu
+            const item = cloneDeep(itemProto);
+            item.items = list;
+            result.push({
+              ...item,
+              items: list,
+            });
+          } else {
+            // secondary menu
+            result.push(...list);
+          }
+        }
       }
     }
   });

package/lib/payment.js

@@ -72,9 +72,10 @@ const createNftFactoryItx = ({ meta, tokens, shares, issuers, serviceUrl }) => {
     ],
   };
 
+  itx.address = toFactoryAddress(itx);
+
   isValidFactory(itx, true);
 
-  itx.address = toFactoryAddress(itx);
   return itx;
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.11",
+  "version": "1.8.12",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,16 +18,16 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.11",
-    "@abtnode/util": "1.8.11",
-    "@arcblock/did": "1.17.11",
-    "@arcblock/did-ext": "1.17.11",
-    "@arcblock/did-util": "1.17.11",
-    "@arcblock/jwt": "1.17.11",
-    "@ocap/asset": "1.17.11",
-    "@ocap/mcrypto": "1.17.11",
-    "@ocap/util": "1.17.11",
-    "@ocap/wallet": "1.17.11",
+    "@abtnode/constant": "1.8.12",
+    "@abtnode/util": "1.8.12",
+    "@arcblock/did": "1.17.12",
+    "@arcblock/did-ext": "1.17.12",
+    "@arcblock/did-util": "1.17.12",
+    "@arcblock/jwt": "1.17.12",
+    "@ocap/asset": "1.17.12",
+    "@ocap/mcrypto": "1.17.12",
+    "@ocap/util": "1.17.12",
+    "@ocap/wallet": "1.17.12",
     "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "389148562de1ce5b45097e764bc9d1718009e527"
+  "gitHead": "f4cb25a77f7ee48333b3243918a0a9c81b94ab8c"
 }