@blocklet/meta 1.7.14 → 1.7.17

package/lib/fix.js

@@ -54,10 +54,6 @@ const fixRequired = (data, dir) => {
       data.group = 'static';
     }
   }
-
-  if (!data.specVersion && !data.public_url && !data.admin_url) {
-    data.public_url = '/';
-  }
 };
 
 const fixRepository = (data) => {

package/lib/schema.js

@@ -24,14 +24,14 @@ const {
 } = require('./constants');
 
 const WELLKNOWN_PATH_PREFIX = '/.well-known';
-const MAX_TITLE_LENGTH = 22;
+const MAX_TITLE_LENGTH = 24;
 const MAX_NAME_LENGTH = 32;
 
 const Joi = JOI.extend(semver).extend(semverRange).extend(fileExtension).extend(didExtension);
 
 const titleSchema = Joi.string()
   .trim()
-  .min(3)
+  .min(1)
   .custom((value) => {
     if (cjkLength(value) > MAX_TITLE_LENGTH) {
       throw new Error(
@@ -43,6 +43,13 @@ const titleSchema = Joi.string()
   });
 const descriptionSchema = Joi.string().trim().min(3).max(160);
 
+const blockletNameSchema = Joi.string()
+  .custom((value) => {
+    validateName(value);
+    return value;
+  })
+  .max(MAX_NAME_LENGTH);
+
 const environmentSchema = Joi.object({
   name: Joi.string().trim().required(),
   description: Joi.string().trim().required(),
@@ -162,10 +169,23 @@ const statsSchema = Joi.object({
 });
 
 const childrenSchema = Joi.object({
-  name: Joi.string().min(1).required(),
+  name: blockletNameSchema.required(),
   title: titleSchema,
   description: descriptionSchema,
-  resolved: Joi.alternatives().try(Joi.string().uri(), Joi.string()).required(),
+  mountPoint: Joi.string().trim().min(1), // added in 1.2.3
+  services: Joi.array().items(serviceSchema).unique('name'), // added in 1.2.3
+  source: Joi.alternatives().try(
+    Joi.object({
+      url: Joi.alternatives().try(Joi.string().uri(), Joi.array().items(Joi.string().uri()).min(1)).required(),
+    }),
+    Joi.object({
+      store: Joi.alternatives().try(Joi.string().uri(), Joi.array().items(Joi.string().uri()).min(1)).required(),
+      name: blockletNameSchema.required(),
+      // TODO 目前只能支持锁死的版本号，接下载需要支持自适应的版本号，比如 4.x
+      version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semver().valid()).default('latest'),
+    })
+  ),
+  resolved: Joi.alternatives().try(Joi.string().uri(), Joi.string()), // deprecated
   mountPoints: Joi.array() // deprecated
     .items(
       Joi.object({
@@ -180,11 +200,13 @@ const childrenSchema = Joi.object({
       })
     )
     .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) => {
+}).custom((value, helper) => {
   if (!value.mountPoint && (!value.mountPoints || !value.mountPoints.length)) {
-    throw new Error('mountPoint is required');
+    return helper.message('child mountPoint is required');
+  }
+
+  if (!value.source && !value.resolved) {
+    return helper.message('child source is required');
   }
 
   return value;
@@ -233,13 +255,7 @@ const createBlockletSchema = (
   return Joi.object({
     did: Joi.DID().trim().required(),
     version: Joi.semver().valid().required(),
-    name: Joi.string()
-      .custom((value) => {
-        validateName(value);
-        return value;
-      })
-      .max(MAX_NAME_LENGTH)
-      .required(),
+    name: blockletNameSchema.required(),
     description: descriptionSchema.required(),
     group: Joi.string().valid(...BLOCKLET_GROUPS).required(), // prettier-ignore
     main: Joi.when('group', {
@@ -415,7 +431,7 @@ const createBlockletSchema = (
     lastPublishedAt: Joi.string().isoDate().optional(),
 
     // blocklet component support
-    children: Joi.array().items(childrenSchema).optional().default([]),
+    children: Joi.array().items(childrenSchema).unique('name').optional().default([]),
 
     // navigation & theme
     navigation: navigationSchema,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.14",
+  "version": "1.7.17",
   "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.14",
-    "@abtnode/util": "1.7.14",
-    "@arcblock/did": "^1.16.6",
-    "@arcblock/did-ext": "^1.16.6",
-    "@arcblock/did-util": "^1.16.6",
-    "@arcblock/jwt": "^1.16.6",
-    "@arcblock/nft": "^1.16.6",
-    "@ocap/asset": "^1.16.6",
-    "@ocap/mcrypto": "^1.16.6",
-    "@ocap/util": "^1.16.6",
-    "@ocap/wallet": "^1.16.6",
+    "@abtnode/constant": "1.7.17",
+    "@abtnode/util": "1.7.17",
+    "@arcblock/did": "^1.16.9",
+    "@arcblock/did-ext": "^1.16.9",
+    "@arcblock/did-util": "^1.16.9",
+    "@arcblock/jwt": "^1.16.9",
+    "@arcblock/nft": "^1.16.9",
+    "@ocap/asset": "^1.16.9",
+    "@ocap/mcrypto": "^1.16.9",
+    "@ocap/util": "^1.16.9",
+    "@ocap/wallet": "^1.16.9",
     "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "1f3855e6dc8b6d6c91526264e2f63215df6b962c"
+  "gitHead": "142a5b1e83ea03647ef9bea8de9bb269c9c82928"
 }