@blocklet/meta 1.6.18 → 1.6.22

package/lib/constants.js

@@ -173,7 +173,7 @@ module.exports = Object.freeze({
 
   BLOCKLET_DEFAULT_VERSION: '1.0.0',
 
-  BLOCKLET_LATEST_SPEC_VERSION: '1.2.1',
+  BLOCKLET_LATEST_SPEC_VERSION: '1.2.3',
   BLOCKLET_LATEST_REQUIREMENT_SERVER: '>=1.6.2',
   BLOCKLET_LATEST_REQUIREMENT_ABTNODE: '>=1.5.15', // Deprecated
 

package/lib/schema.js

@@ -140,7 +140,7 @@ const statsSchema = Joi.object({
 const childrenSchema = Joi.object({
   name: Joi.string().min(1).required(),
   resolved: Joi.alternatives().try(Joi.string().uri(), Joi.string()).required(),
-  mountPoints: Joi.array()
+  mountPoints: Joi.array() // deprecated
     .items(
       Joi.object({
         root: Joi.object({
@@ -155,6 +155,14 @@ const childrenSchema = Joi.object({
     )
     .optional()
     .default([]),
+  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) => {
+  if (!value.mountPoint && (!value.mountPoints || !value.mountPoints.length)) {
+    throw new Error('mountPoint is required');
+  }
+
+  return value;
 });
 
 const signatureSchema = Joi.object({
@@ -259,9 +267,7 @@ const createBlockletSchema = (
           }
           return value;
         }, 'invalid blocklet share'),
-    })
-      .default({ price: [], share: [] })
-      .optional(),
+    }).default({ price: [], share: [] }),
 
     keywords: Joi.alternatives()
       .try(Joi.string().trim().min(1), Joi.array().items(Joi.string().min(1)))
@@ -334,7 +340,13 @@ const createBlockletSchema = (
     // capabilities
     capabilities: Joi.object({
       clusterMode: Joi.boolean().default(false), // Can blocklet be started in cluster mode
-    }).default({}),
+
+      // added in 1.2.2
+      component: Joi.boolean().default(true), // Can blocklet become a component and be composed by other blocklets
+    }).default({
+      clusterMode: false,
+      component: true,
+    }),
 
     // Other contents to be included in the bundle
     files: Joi.array()

package/lib/util.js

@@ -101,6 +101,10 @@ const isFreeBlocklet = (meta) => {
   return priceList.every((x) => x === 0);
 };
 
+const isComponentBlocklet = (meta) => {
+  return get(meta, 'capabilities.component') !== false;
+};
+
 const wipeSensitiveData = (blocklet) => {
   if (!blocklet) {
     return blocklet;
@@ -174,6 +178,7 @@ const getDisplayName = (blocklet, onlyUseMeta = false) => {
 
 module.exports = {
   isFreeBlocklet,
+  isComponentBlocklet,
   forEachBlockletSync,
   isDeletableBlocklet,
   forEachBlocklet,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.18",
+  "version": "1.6.22",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,21 +18,21 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "^1.14.8",
-    "@arcblock/did-ext": "^1.14.8",
-    "@arcblock/did-util": "^1.14.8",
-    "@arcblock/nft": "^1.14.8",
-    "@ocap/asset": "^1.14.8",
-    "@ocap/mcrypto": "^1.14.8",
-    "@ocap/util": "^1.14.8",
-    "@ocap/wallet": "^1.14.8",
+    "@arcblock/did": "^1.14.16",
+    "@arcblock/did-ext": "^1.14.16",
+    "@arcblock/did-util": "^1.14.16",
+    "@arcblock/nft": "^1.14.16",
+    "@ocap/asset": "^1.14.16",
+    "@ocap/mcrypto": "^1.14.16",
+    "@ocap/util": "^1.14.16",
+    "@ocap/wallet": "^1.14.16",
     "ajv": "^7.0.3",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
     "hosted-git-info": "3.0.8",
     "is-glob": "^4.0.3",
-    "joi": "^17.5.0",
+    "joi": "^17.6.0",
     "joi-extension-semver": "^5.0.0",
     "js-yaml": "^3.14.0",
     "json-stable-stringify": "^1.0.1",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
+  "gitHead": "18ac52a439dbd04e4ace98d796b6de517503fb14"
 }