@blocklet/meta 1.7.24 → 1.7.27

package/lib/has-reserved-key.js

@@ -0,0 +1,14 @@
+const { BLOCKLET_CONFIGURABLE_KEY } = require('./constants');
+
+const hasReservedKey = (environments) =>
+  environments.some((x) => {
+    const key = (x.key || x.name || '').toString();
+
+    if (key.startsWith('ABT_NODE_')) {
+      return true;
+    }
+
+    return !!(key.startsWith('BLOCKLET_') && !BLOCKLET_CONFIGURABLE_KEY[key]);
+  });
+
+module.exports = hasReservedKey;

package/lib/parse-navigation.js

@@ -22,6 +22,14 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
         title: nav.title,
       };
 
+      if (_level === 1 && nav.section) {
+        item.section = nav.section;
+      }
+
+      if (nav.icon) {
+        item.icon = nav.icon;
+      }
+
       if (nav.link) {
         item.link = nav.link.startsWith('/') ? normalizePathPrefix(`${prefix}${nav.link || '/'}`) : nav.link;
       } else {
@@ -50,19 +58,28 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
     }
     const childTitle = child.meta.title || child.meta.name;
 
+    const item = {
+      title: nav.title || childTitle,
+    };
+
+    if (_level === 1 && nav.section) {
+      item.section = nav.section;
+    }
+
+    if (nav.icon) {
+      item.icon = nav.icon;
+    }
+
     const childNavigation = get(child, 'meta.navigation', []);
     if (!childNavigation.length) {
       // child does not declares menu
-      result.push({
-        title: nav.title || childTitle,
-        link: normalizePathPrefix(`${prefix}${child.mountPoint || '/'}`),
-      });
+      item.link = normalizePathPrefix(`${prefix}${child.mountPoint || '/'}`);
+      result.push(item);
     } else if (childNavigation.length === 1) {
       // child declares one menu
-      result.push({
-        title: nav.title || childNavigation[0].title || childTitle,
-        link: normalizePathPrefix(`${prefix}${child.mountPoint}${childNavigation[0].link || '/'}`),
-      });
+      item.title = nav.title || childNavigation[0].title || childTitle;
+      item.link = normalizePathPrefix(`${prefix}${child.mountPoint}${childNavigation[0].link || '/'}`);
+      result.push(item);
     } else {
       // child declares multiple menus
       const list = parseNavigation(
@@ -75,7 +92,7 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
       if (_level === 1) { // eslint-disable-line
         // primary menu
         result.push({
-          title: nav.title || child.meta.title || child.meta.name,
+          ...item,
           items: list,
         });
       } else {

package/lib/schema.js

@@ -228,9 +228,19 @@ const signatureSchema = Joi.object({
 });
 
 const navigationItemSchema = Joi.object({
-  title: Joi.string().required(),
-  link: Joi.string(),
-  child: Joi.string(), // child name or child did
+  title: Joi.alternatives()
+    .try(
+      Joi.string(),
+      Joi.object({
+        zh: Joi.string(),
+        en: Joi.string(),
+      }).min(1)
+    )
+    .required(),
+  link: Joi.string().min(1),
+  child: Joi.string().min(1), // child name or child did
+  section: Joi.array().items(Joi.string().min(1)).single(),
+  icon: Joi.string().min(1),
 });
 
 const navigationSchema = Joi.array().items(
@@ -240,7 +250,14 @@ const navigationSchema = Joi.array().items(
 );
 
 const themeSchema = Joi.object({
-  background: Joi.string(),
+  background: Joi.alternatives().try(
+    Joi.string().min(1),
+    Joi.object({
+      header: Joi.string().min(1),
+      footer: Joi.string().min(1),
+      default: Joi.string().min(1),
+    }).min(1)
+  ),
 });
 
 const createBlockletSchema = (
@@ -436,6 +453,10 @@ const createBlockletSchema = (
     // navigation & theme
     navigation: navigationSchema,
     theme: themeSchema,
+    copyright: Joi.object({
+      owner: Joi.string().min(1),
+      year: Joi.alternatives().try(Joi.string(), Joi.number()),
+    }),
 
     // NOTE: following fields only exist in blocklet server and cannot be set manually
     bundleName: Joi.string(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.24",
+  "version": "1.7.27",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,17 +18,17 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.24",
-    "@abtnode/util": "1.7.24",
-    "@arcblock/did": "^1.16.15",
-    "@arcblock/did-ext": "^1.16.15",
-    "@arcblock/did-util": "^1.16.15",
-    "@arcblock/jwt": "^1.16.15",
-    "@arcblock/nft": "^1.16.15",
-    "@ocap/asset": "^1.16.15",
-    "@ocap/mcrypto": "^1.16.15",
-    "@ocap/util": "^1.16.15",
-    "@ocap/wallet": "^1.16.15",
+    "@abtnode/constant": "1.7.27",
+    "@abtnode/util": "1.7.27",
+    "@arcblock/did": "1.17.0",
+    "@arcblock/did-ext": "1.17.0",
+    "@arcblock/did-util": "1.17.0",
+    "@arcblock/jwt": "1.17.0",
+    "@arcblock/nft": "1.17.0",
+    "@ocap/asset": "1.17.0",
+    "@ocap/mcrypto": "1.17.0",
+    "@ocap/util": "1.17.0",
+    "@ocap/wallet": "1.17.0",
     "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "904178e4dd0cd14c2a0a8b9131708c7ec68351e1"
+  "gitHead": "81a5492df66389b0aede13f033d1e493450833bc"
 }