@blocklet/meta 1.8.6 → 1.8.9

package/lib/parse-navigation.js

@@ -1,6 +1,21 @@
 const get = require('lodash/get');
+const isEqual = require('lodash/isEqual');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 
+const parseLinkString = (link, prefix = '') =>
+  link.startsWith('/') ? normalizePathPrefix(`${prefix}${link || '/'}`) : link;
+
+const parseLink = (input, prefix) => {
+  if (Object.prototype.toString.call(input) === '[object Object]') {
+    return Object.entries(input).reduce((o, [key, value]) => {
+      o[key] = parseLinkString(value, prefix);
+      return o;
+    }, {});
+  }
+
+  return parseLinkString(input, prefix);
+};
+
 /**
  * @param {*} navigation src
  * @param {*} blocklet
@@ -31,11 +46,15 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
       }
 
       if (nav.link) {
-        item.link = nav.link.startsWith('/') ? normalizePathPrefix(`${prefix}${nav.link || '/'}`) : nav.link;
+        item.link = parseLink(nav.link, prefix);
       } else {
         item.link = '';
       }
 
+      if (nav.role) {
+        item.role = nav.role;
+      }
+
       if (nav.items?.length) {
         const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
         if (list.length) {
@@ -70,15 +89,19 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
       item.icon = nav.icon;
     }
 
+    if (nav.role) {
+      item.role = nav.role;
+    }
+
     const childNavigation = get(child, 'meta.navigation', []);
     if (!childNavigation.length) {
       // child does not declares menu
-      item.link = normalizePathPrefix(`${prefix}${child.mountPoint || '/'}`);
+      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 = normalizePathPrefix(`${prefix}${child.mountPoint}${childNavigation[0].link || '/'}`);
+      item.link = parseLink(childNavigation[0].link || '/', normalizePathPrefix(`${prefix}${child.mountPoint}`));
       result.push(item);
     } else {
       // child declares multiple menus
@@ -107,7 +130,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
 
 const markDuplicate = (navigation, urls = []) => {
   navigation.forEach((item) => {
-    if (item.link && urls.includes(item.link)) {
+    if (item.link && urls.some((x) => isEqual(x, item.link))) {
       item.duplicate = true;
     }
     if (item.link) {

package/lib/schema.js

@@ -237,9 +237,16 @@ const navigationItemSchema = Joi.object({
       }).min(1)
     )
     .required(),
-  link: Joi.string().min(1),
+  link: Joi.alternatives().try(
+    Joi.string(),
+    Joi.object({
+      zh: Joi.string(),
+      en: Joi.string(),
+    }).min(1)
+  ),
   child: Joi.string().min(1), // child name or child did
   section: Joi.array().items(Joi.string().min(1)).single(),
+  role: Joi.array().items(Joi.string().min(1)).single(),
   icon: Joi.string().min(1),
 });
 

package/lib/util.js

@@ -129,7 +129,7 @@ const forEachBlocklet = (
 
   // parallel
   const tasks = inputTasks || [];
-  tasks.push(cb(blocklet, { parent: _parent, root, level: _level, ancestors: _ancestors }));
+  tasks.push(cb(blocklet, { parent: _parent, root, level: _level, ancestors: _ancestors, id }));
   if (blocklet.children) {
     for (const child of blocklet.children) {
       forEachBlocklet(child, cb, {
@@ -139,7 +139,6 @@ const forEachBlocklet = (
         _level: _level + 1,
         _tasks: tasks,
         _ancestors: newAncestors,
-        id,
       });
     }
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.6",
+  "version": "1.8.9",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,20 +18,20 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.6",
-    "@abtnode/util": "1.8.6",
-    "@arcblock/did": "1.17.6",
-    "@arcblock/did-ext": "1.17.6",
-    "@arcblock/did-util": "1.17.6",
-    "@arcblock/jwt": "1.17.6",
-    "@ocap/asset": "1.17.6",
-    "@ocap/mcrypto": "1.17.6",
-    "@ocap/util": "1.17.6",
-    "@ocap/wallet": "1.17.6",
+    "@abtnode/constant": "1.8.9",
+    "@abtnode/util": "1.8.9",
+    "@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",
     "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
-    "debug": "^4.3.3",
-    "fs-extra": "^10.0.1",
+    "debug": "^4.3.4",
+    "fs-extra": "^10.1.0",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
     "joi": "^17.6.0",
@@ -39,12 +39,12 @@
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
-    "slugify": "^1.4.6",
+    "slugify": "^1.6.5",
     "url-join": "^4.0.1",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "jest": "^27.4.5"
+    "jest": "^27.5.1"
   },
-  "gitHead": "070dad4ce5e12c8961399788f9d206bf7d9d263f"
+  "gitHead": "1846a1f0bae2f870f3fe635b1f17ed06867d370d"
 }