@blocklet/meta 1.8.30 → 1.8.32

package/lib/did.js

@@ -7,4 +7,23 @@ const toBlockletDid = (name) => {
   return fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 };
 
+toBlockletDid.toExternalBlocklet = (name, userDid, { didOnly, nameOnly } = {}) => {
+  const blockletName = `${name}-${userDid.toLowerCase().substring(userDid.length - 6)}`;
+
+  if (nameOnly) {
+    return blockletName;
+  }
+
+  const blockletDid = toBlockletDid(blockletName);
+
+  if (didOnly) {
+    return blockletDid;
+  }
+
+  return {
+    name: blockletName,
+    did: blockletDid,
+  };
+};
+
 module.exports = toBlockletDid;

package/lib/parse-navigation.js

@@ -162,7 +162,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
             _level + 1
           );
 
-          if (_level === 1) { // eslint-disable-line
+          if (_level === 1) {
             // primary menu
             const item = cloneDeep(itemProto);
 
@@ -223,7 +223,7 @@ const uniq = (navigation) => {
 const parseNavigation = (...args) => {
   const res = doParseNavigation(...args);
 
-  return uniq(res);
+  return uniq(res).filter((x) => x.link || (x.items && x.items.length));
 };
 
 module.exports = parseNavigation;

package/lib/parse.js

@@ -86,7 +86,7 @@ const parse = (
   const schema = createBlockletSchema(dir, { ensureMain, ensureFiles, ensureDist, ...schemaOptions });
   const { value, error } = schema.validate(result);
   if (error) {
-    throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error(`Invalid blocklet.yml: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
   return value;

package/lib/schema.js

@@ -425,7 +425,8 @@ const createBlockletSchema = (
           reason: Joi.string().trim().required(),
         })
       ),
-    }).default({ server: BLOCKLET_LATEST_REQUIREMENT_SERVER, os: '*', cpu: '*' }),
+      nodejs: Joi.semverRange().valid(),
+    }).default({ server: BLOCKLET_LATEST_REQUIREMENT_SERVER, os: '*', cpu: '*', nodejs: '*' }),
 
     // interfaces: https://github.com/blocklet/blocklet-specification/issues/2
     interfaces: Joi.array()

package/lib/util.js

@@ -461,6 +461,8 @@ const getChainInfo = (env) =>
     return info;
   }, {});
 
+const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
+
 module.exports = {
   isFreeBlocklet,
   isFreeComponent,
@@ -490,4 +492,5 @@ module.exports = {
   getParentComponentName,
   getConnectAppUrl,
   getChainInfo,
+  isExternalBlocklet,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.30",
+  "version": "1.8.32",
   "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.8.30",
-    "@abtnode/util": "1.8.30",
-    "@arcblock/did": "1.17.23",
-    "@arcblock/did-ext": "1.17.23",
-    "@arcblock/did-util": "1.17.23",
-    "@arcblock/jwt": "1.17.23",
-    "@blocklet/constant": "1.8.30",
-    "@ocap/asset": "1.17.23",
-    "@ocap/mcrypto": "1.17.23",
-    "@ocap/util": "1.17.23",
-    "@ocap/wallet": "1.17.23",
+    "@abtnode/constant": "1.8.32",
+    "@abtnode/util": "1.8.32",
+    "@arcblock/did": "1.18.1",
+    "@arcblock/did-ext": "1.18.1",
+    "@arcblock/did-util": "1.18.1",
+    "@arcblock/jwt": "1.18.1",
+    "@blocklet/constant": "1.8.32",
+    "@ocap/asset": "1.18.1",
+    "@ocap/mcrypto": "1.18.1",
+    "@ocap/util": "1.18.1",
+    "@ocap/wallet": "1.18.1",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -36,7 +36,7 @@
     "fs-extra": "^10.1.0",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
-    "joi": "^17.6.2",
+    "joi": "17.6.3",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
@@ -54,5 +54,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
+  "gitHead": "8502244aeda5926b3433c1dd9142e63233e3c23c"
 }