@blocklet/meta 1.7.4 → 1.7.7

package/lib/did.js

@@ -3,7 +3,7 @@ const { toHex } = require('@ocap/util');
 const { fromPublicKey } = require('@arcblock/did');
 
 const toBlockletDid = (name) => {
-  const pk = toHex(name);
+  const pk = toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
   return fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 };
 

package/lib/parse-navigation.js

@@ -0,0 +1,78 @@
+const get = require('lodash/get');
+const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
+
+/**
+ * @param {*} navigation src
+ * @param {*} blocklet
+ * @param {*} prefix prefix of link
+ * @param {*} level 1 or 2. primary menu or secondary menu
+ */
+const parseNavigation = (navigation, blocklet, prefix = '/', level = 1) => {
+  const result = [];
+
+  (navigation || []).forEach((nav) => {
+    if (!nav.child) {
+      const item = {
+        title: nav.title,
+      };
+
+      if (nav.link) {
+        item.link = normalizePathPrefix(`${prefix}${nav.link || '/'}`);
+      }
+
+      if (level === 1) {
+        const list = parseNavigation(nav.items, blocklet, prefix, 2);
+        if (list.length) {
+          item.items = list;
+        }
+      }
+
+      result.push(item);
+      return;
+    }
+
+    if (!blocklet) {
+      return;
+    }
+
+    // parse child
+    const child = (blocklet.children || []).find((x) => [x.meta.name, x.meta.did].includes(nav.child));
+    if (!child) {
+      return;
+    }
+    const childTitle = child.meta.title || child.meta.name;
+
+    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 || '/'}`),
+      });
+    } 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 || '/'}`),
+      });
+    } else {
+      // child declares multiple menus
+      if (level === 1) { // eslint-disable-line
+        // primary menu
+        const item = {
+          title: nav.title || child.meta.title || child.meta.name,
+          items: parseNavigation(childNavigation, null, normalizePathPrefix(`${prefix}${child.mountPoint}`), 2),
+        };
+        result.push(item);
+      } else {
+        // secondary menu
+        const list = parseNavigation(childNavigation, null, normalizePathPrefix(`${prefix}${child.mountPoint}`), 2);
+        result.push(...list);
+      }
+    }
+  });
+
+  return result;
+};
+
+module.exports = parseNavigation;

package/lib/schema.js

@@ -37,6 +37,12 @@ const environmentSchema = Joi.object({
   secure: Joi.boolean().default(false),
   validation: Joi.string().optional(),
   shared: Joi.boolean().default((parent) => !parent.secure),
+}).custom((x, helper) => {
+  if (x.secure && x.default) {
+    return helper.message(`Cannot declare default value for secure env ${x.name}`);
+  }
+
+  return x;
 });
 
 const scriptsSchema = Joi.object({
@@ -155,8 +161,7 @@ const childrenSchema = Joi.object({
         services: Joi.array().items(serviceSchema).unique('name'),
       })
     )
-    .optional()
-    .default([]),
+    .optional(),
   mountPoint: Joi.string().trim().min(1), // added in 1.2.3
   services: Joi.array().items(serviceSchema).unique('name'), // added in 1.2.3
 }).custom((value) => {
@@ -190,6 +195,22 @@ const titleSchema = Joi.string()
   });
 const descriptionSchema = Joi.string().trim().min(3).max(160);
 
+const navigationItemSchema = Joi.object({
+  title: Joi.string().required(),
+  link: Joi.string(),
+  child: Joi.string(), // child name or child did
+});
+
+const navigationSchema = Joi.array().items(
+  navigationItemSchema.append({
+    items: Joi.array().items(navigationItemSchema),
+  })
+);
+
+const themeSchema = Joi.object({
+  background: Joi.string(),
+});
+
 const createBlockletSchema = (
   baseDir,
   { ensureMain = false, ensureFiles = false, ensureDist = false, ...schemaOptions } = {}
@@ -391,6 +412,10 @@ const createBlockletSchema = (
 
     // blocklet component support
     children: Joi.array().items(childrenSchema).optional().default([]),
+
+    // navigation & theme
+    navigation: navigationSchema,
+    theme: themeSchema,
   })
     .rename('public_url', 'publicUrl', { ignoreUndefined: true, override: true })
     .rename('admin_url', 'adminUrl', { ignoreUndefined: true, override: true })
@@ -409,4 +434,6 @@ module.exports = {
   distSchema,
   titleSchema,
   descriptionSchema,
+  navigationSchema,
+  themeSchema,
 };

package/lib/util.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 const get = require('lodash/get');
 
-const { NODE_SERVICES } = require('@abtnode/constant');
+const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
 
 const { BlockletGroup, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB } = require('./constants');
 
@@ -213,6 +213,8 @@ const isInvitedUserOnlyInMeta = (blocklet) => {
   return service && service.config && ['yes', 'not-first'].includes(service.config.invitedUserOnly);
 };
 
+const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (ip || '').replace(/\./g, '-'));
+
 module.exports = {
   isFreeBlocklet,
   isComponentBlocklet,
@@ -227,4 +229,5 @@ module.exports = {
   findWebInterface,
   findServiceFromMeta,
   isInvitedUserOnlyInMeta,
+  replaceSlotToIp,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.4",
+  "version": "1.7.7",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,19 +18,20 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.4",
-    "@arcblock/did": "^1.15.3",
-    "@arcblock/did-ext": "^1.15.3",
-    "@arcblock/did-util": "^1.15.3",
-    "@arcblock/nft": "^1.15.3",
-    "@ocap/asset": "^1.15.3",
-    "@ocap/mcrypto": "^1.15.3",
-    "@ocap/util": "^1.15.3",
-    "@ocap/wallet": "^1.15.3",
+    "@abtnode/constant": "1.7.7",
+    "@abtnode/util": "1.7.7",
+    "@arcblock/did": "^1.16.0",
+    "@arcblock/did-ext": "^1.16.0",
+    "@arcblock/did-util": "^1.16.0",
+    "@arcblock/nft": "^1.16.0",
+    "@ocap/asset": "^1.16.0",
+    "@ocap/mcrypto": "^1.16.0",
+    "@ocap/util": "^1.16.0",
+    "@ocap/wallet": "^1.16.0",
     "ajv": "^7.0.3",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
     "joi": "^17.6.0",
@@ -44,5 +45,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "02b25a877e5b56b389ab318a851bea01212e10df"
+  "gitHead": "619db37ea7a91c64a9bf30836a55c70d55325e73"
 }