@blocklet/meta 1.8.25 → 1.8.26

package/lib/file.js

@@ -21,7 +21,12 @@ const select = (dir, { throwOnError = true } = {}) => {
   return metaToUpdate;
 };
 
-const update = (file, meta) => {
+const update = (file, meta, { fix = true } = {}) => {
+  if (!fix) {
+    fs.writeFileSync(file, yaml.dump(meta, { sortKeys: false, skipInvalid: true }));
+    return;
+  }
+
   delete meta.path;
   delete meta.folder;
   delete meta.htmlAst;

package/lib/parse-navigation.js

@@ -40,6 +40,8 @@ const getGroups = (navigation) => {
   return Object.values(groups);
 };
 
+const getChildName = (nav) => nav.component || nav.child;
+
 /**
  * @param {*} navigation src
  * @param {*} blocklet
@@ -50,7 +52,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
   const result = [];
 
   (navigation || []).forEach((nav) => {
-    if (!nav.child) {
+    if (!getChildName(nav)) {
       if (_level > 1 && nav.items?.length) {
         const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
         result.push(...list);
@@ -95,7 +97,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
     }
 
     // parse child
-    const child = (blocklet.children || []).find((x) => [x.meta.name, x.meta.did].includes(nav.child));
+    const child = (blocklet.children || []).find((x) => [x.meta.name, x.meta.did].includes(getChildName(nav)));
     if (!child) {
       return;
     }

package/lib/parse.js

@@ -28,6 +28,7 @@ const parse = (
     extraRawAttrs = {},
     serviceMetas,
     schemaOptions = {},
+    fix = true,
   } = {}
 ) => {
   let result = {};
@@ -57,6 +58,10 @@ const parse = (
     result = Object.assign(result, extraRawAttrs);
   }
 
+  if (!fix) {
+    return result;
+  }
+
   // Fix
   fixRequired(result, dir);
   fixRepository(result);

package/lib/payment/v2.js

@@ -24,6 +24,8 @@ const ZeroBN = new BN(0);
 const defaultDecimals = 1e6; // we only support 6 decimals on share ratio
 const defaultDecimalsBN = new BN(defaultDecimals);
 
+const getComponentConfig = (meta) => meta.components || meta.children;
+
 const safeMul = (a, b) =>
   Number(
     fromUnitToToken(
@@ -68,7 +70,7 @@ const _getComponents = async (inputMeta, context = {}) => {
     throw new Error('The depth of component should not exceed 40');
   }
 
-  const configs = inputMeta.children || [];
+  const configs = getComponentConfig(inputMeta);
 
   if (!configs || !configs.length) {
     return [];

package/lib/schema.js

@@ -245,11 +245,11 @@ const navigationItemSchema = Joi.object({
       en: Joi.string(),
     }).min(1)
   ),
-  child: Joi.string().min(1), // child name or child did
+  component: Joi.string().min(1), // child name or child did
   section: Joi.array().items(Joi.string().min(1)).single(),
   role: Joi.array().items(Joi.string().min(1)).single(),
   icon: Joi.string().min(1),
-});
+}).rename('child', 'component');
 
 const navigationSchema = Joi.array().items(
   navigationItemSchema.append({
@@ -487,7 +487,7 @@ const createBlockletSchema = (
     lastPublishedAt: Joi.string().isoDate().optional(),
 
     // blocklet component support
-    children: Joi.array().items(childrenSchema).unique('name').optional().default([]),
+    components: Joi.array().items(childrenSchema).unique('name').optional().default([]),
 
     // navigation & theme
     navigation: navigationSchema,
@@ -501,7 +501,9 @@ const createBlockletSchema = (
     bundleName: Joi.string(),
     bundleDid: Joi.DID().trim(),
     storeId: Joi.string(),
-  }).options({ stripUnknown: true, noDefaults: false, ...schemaOptions });
+  })
+    .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })
+    .rename('children', 'components');
 };
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.25",
+  "version": "1.8.26",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,8 +18,8 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.25",
-    "@abtnode/util": "1.8.25",
+    "@abtnode/constant": "1.8.26",
+    "@abtnode/util": "1.8.26",
     "@arcblock/did": "1.17.19",
     "@arcblock/did-ext": "1.17.19",
     "@arcblock/did-util": "1.17.19",
@@ -53,5 +53,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "ea34dcd0037c63cb63b31744efcf169edf8aa776"
+  "gitHead": "71937dabc196a98a1bb514789bc32aee44a1e8c4"
 }