@blocklet/meta 1.16.23-beta-abdda301 → 1.16.23-beta-035db744

package/lib/parse.js

@@ -62,7 +62,7 @@ const parse = (dir, { ensureFiles = false, ensureDist = false, ensureComponentSt
     (0, fix_1.fixName)(result);
     (0, fix_1.fixPerson)(result);
     (0, fix_1.fixService)(result);
-    ['components', 'staticComponents'].forEach((prop) => {
+    ['components'].forEach((prop) => {
         if (defaultStoreUrl && result[prop]?.length) {
             result[prop].forEach((x) => {
                 if (isSourceFromStore(x.source)) {

package/lib/payment/v2.js

@@ -54,10 +54,7 @@ exports.version = VERSION;
 const ZeroBN = new util_1.BN(0);
 const defaultDecimals = 1e6; // we only support 6 decimals on share ratio
 const defaultDecimalsBN = new util_1.BN(defaultDecimals);
-const getComponentConfig = (meta) => []
-    .concat(meta.components || meta.children)
-    .concat(meta.staticComponents)
-    .filter(Boolean);
+const getComponentConfig = (meta) => [].concat(meta.components || meta.children).filter(Boolean);
 const safeMul = (a, b) => Number((0, util_1.fromUnitToToken)((0, util_1.fromTokenToUnit)(a)
     .mul(new util_1.BN(b * defaultDecimals))
     .div(defaultDecimalsBN)));

package/lib/schema.js

@@ -336,13 +336,6 @@ const componentSchemaProps = {
     // backward compatible, useless
     name: blockletNameSchema,
 };
-const staticComponentSchemaProps = {
-    source: componentSourceSchema.required(),
-    name: blockletNameSchema.required(),
-    title: titleSchema,
-    description: descriptionSchema,
-    mountPoint: mountPointSchema.required(),
-};
 const createComponentSchema = (schema, allowEmptyStore) => Joi.object(schema).custom((value, helper) => {
     if (!allowEmptyStore && value.source && value.source.name && !value.source.store) {
         // @ts-expect-error
@@ -355,33 +348,13 @@ const componentSchema = createComponentSchema(componentSchemaProps).meta({
     unknownType: 'any',
 });
 exports.componentSchema = componentSchema;
-const staticComponentSchema = createComponentSchema(staticComponentSchemaProps).meta({
-    className: 'TStaticComponent',
-    unknownType: 'any',
-});
 const componentSchemaWithoutStoreCheck = createComponentSchema(componentSchemaProps, true);
-const staticComponentSchemaWithoutStoreCheck = createComponentSchema(staticComponentSchemaProps, true);
-const componentsSchema = ({ isStatic, checkStore } = {}) => {
-    const arr = isStatic
-        ? [staticComponentSchema, staticComponentSchemaWithoutStoreCheck]
-        : [componentSchema, componentSchemaWithoutStoreCheck];
-    let schema = Joi.array()
+const componentsSchema = ({ checkStore } = {}) => {
+    const arr = [componentSchema, componentSchemaWithoutStoreCheck];
+    const schema = Joi.array()
         .items(checkStore ? arr[0] : arr[1])
         .optional()
-        .custom((value, helper) => {
-        if (isStatic) {
-            const names = value.map((x) => x.name);
-            const duplicateName = names.find((x, i) => names.indexOf(x) !== i);
-            if (duplicateName) {
-                // @ts-expect-error
-                return helper.message(`find duplicate name "${duplicateName}" in components`);
-            }
-        }
-        return value;
-    });
-    if (!isStatic) {
-        schema = schema.default([]);
-    }
+        .default([]);
     return schema;
 };
 const signatureSchema = Joi.object({
@@ -667,7 +640,6 @@ const blockletMetaProps = {
     lastPublishedAt: Joi.string().isoDate().optional(),
     // blocklet component support
     components: componentsSchema(),
-    staticComponents: componentsSchema({ isStatic: true }),
     // navigation & theme
     navigation: navigationSchema,
     theme: themeSchema,
@@ -702,7 +674,6 @@ const createBlockletSchema = (baseDir, { ensureFiles = false, ensureDist = false
             .optional(),
         dist: ensureDist ? distSchema.required() : distSchema.optional(),
         components: componentsSchema({ checkStore: ensureComponentStore }),
-        staticComponents: componentsSchema({ isStatic: true, checkStore: ensureComponentStore }),
         name: ensureName ? Joi.string().optional() : Joi.string().required(),
     })
         .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })

package/lib/types/schema.d.ts

@@ -108,20 +108,6 @@ export interface TBlockletMeta {
     scripts?: TScripts;
     signatures?: TSignature[];
     specVersion?: string;
-    staticComponents?: {
-        description?: TDescription;
-        mountPoint: TMountPoint;
-        name: TBlockletName;
-        source: {
-            url: string | string[];
-            version?: 'latest' | string;
-        } | {
-            name: TBlockletName;
-            store?: string | string[];
-            version?: 'latest' | string;
-        };
-        title?: TTitle;
-    }[];
     stats?: TStats;
     storeId?: string;
     support?: string | string;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-abdda301",
+  "version": "1.16.23-beta-035db744",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -19,22 +19,23 @@
     "clean": "rm -fr lib",
     "types": "ts-node tools/types.js && sed -i.bak 's/unknown/string/g' ./src/types/schema.ts && rm  ./src/types/schema.ts.bak && prettier --write ./src/types/*.ts",
     "prebuild": "npm run clean && npm run types",
+    "build:blocklet-meta": "npm run build",
     "build": "tsc"
   },
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.23-beta-abdda301",
-    "@arcblock/did": "1.18.108",
-    "@arcblock/did-ext": "1.18.108",
-    "@arcblock/did-util": "1.18.108",
-    "@arcblock/jwt": "1.18.108",
-    "@blocklet/constant": "1.16.23-beta-abdda301",
-    "@ocap/asset": "1.18.108",
-    "@ocap/mcrypto": "1.18.108",
-    "@ocap/types": "1.18.108",
-    "@ocap/util": "1.18.108",
-    "@ocap/wallet": "1.18.108",
+    "@abtnode/constant": "1.16.23-beta-035db744",
+    "@arcblock/did": "1.18.110",
+    "@arcblock/did-ext": "1.18.110",
+    "@arcblock/did-util": "1.18.110",
+    "@arcblock/jwt": "1.18.110",
+    "@blocklet/constant": "1.16.23-beta-035db744",
+    "@ocap/asset": "1.18.110",
+    "@ocap/mcrypto": "1.18.110",
+    "@ocap/types": "1.18.110",
+    "@ocap/util": "1.18.110",
+    "@ocap/wallet": "1.18.110",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -78,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528"
+  "gitHead": "43b1f85fa413b81be8b8015031ac271a9d9f3456"
 }