@blocklet/meta 1.6.27 → 1.6.30

package/lib/util.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 const get = require('lodash/get');
 
-const { BlockletGroup } = require('./constants');
+const { BlockletGroup, fromBlockletStatus, fromBlockletSource } = require('./constants');
 
 const forEachBlocklet = (blocklet, cb, { parallel = false, sync } = {}) => {
   // sync
@@ -47,33 +47,12 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, sync } = {}) => {
 
 const forEachBlockletSync = (blocklet, cb) => forEachBlocklet(blocklet, cb, { sync: true });
 
-const isAuthServiceEnabled = (blocklet) => {
-  const interfaces = get(blocklet, 'meta.interfaces') || [];
-  const isRootEnabled = interfaces.some((x) => {
-    const services = get(x, 'services') || [];
-    return services.some((s) => s.name === '@abtnode/auth-service');
-  });
-
-  if (isRootEnabled) {
-    return true;
-  }
-
-  const children = get(blocklet, 'children') || [];
-  for (const child of children) {
-    if (isAuthServiceEnabled(child)) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
 const getRequiredMissingConfigs = (blocklet) => {
   const missingConfigs = [];
   const configs = blocklet.configs || [];
   configs.forEach((item) => {
     if (item.required && !item.value) {
-      missingConfigs.push({ did: blocklet.meta.did, key: item.key });
+      missingConfigs.push({ did: blocklet.meta.did, key: item.key, description: item.description });
     }
   });
 
@@ -84,7 +63,7 @@ const getRequiredMissingConfigs = (blocklet) => {
     // or value of configProp in root blocklet config is empty.
     childConfigs.forEach((x) => {
       if (x.required && !x.value && !configs.some((y) => y.key === x.key && y.value)) {
-        missingConfigs.push({ did: child.meta.did, key: x.key });
+        missingConfigs.push({ did: child.meta.did, key: x.key, description: x.description });
       }
     });
   }
@@ -176,15 +155,30 @@ const getDisplayName = (blocklet, onlyUseMeta = false) => {
   return displayName || meta.title || meta.name;
 };
 
+const fixBlockletStatus = (blocklet) => {
+  if (!blocklet) {
+    return;
+  }
+
+  blocklet.status = fromBlockletStatus(blocklet.status);
+  blocklet.source = fromBlockletSource(blocklet.source);
+  (blocklet.children || []).forEach((child) => {
+    child.status = fromBlockletStatus(child.status);
+    if (child.source !== undefined) {
+      child.source = fromBlockletSource(child.source);
+    }
+  });
+};
+
 module.exports = {
   isFreeBlocklet,
   isComponentBlocklet,
   forEachBlockletSync,
   isDeletableBlocklet,
   forEachBlocklet,
-  isAuthServiceEnabled,
   getRequiredMissingConfigs,
   wipeSensitiveData,
   hasRunnableComponent,
   getDisplayName,
+  fixBlockletStatus,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.27",
+  "version": "1.6.30",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "^1.14.19",
-    "@arcblock/did-ext": "^1.14.19",
-    "@arcblock/did-util": "^1.14.19",
-    "@arcblock/nft": "^1.14.19",
-    "@ocap/asset": "^1.14.19",
-    "@ocap/mcrypto": "^1.14.19",
-    "@ocap/util": "^1.14.19",
-    "@ocap/wallet": "^1.14.19",
+    "@arcblock/did": "^1.14.20",
+    "@arcblock/did-ext": "^1.14.20",
+    "@arcblock/did-util": "^1.14.20",
+    "@arcblock/nft": "^1.14.20",
+    "@ocap/asset": "^1.14.20",
+    "@ocap/mcrypto": "^1.14.20",
+    "@ocap/util": "^1.14.20",
+    "@ocap/wallet": "^1.14.20",
     "ajv": "^7.0.3",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "5ec2dbcfa7d9464c0430ea3112e4fe0fbab65414"
+  "gitHead": "d8ea64b807f7852186cd4bf544193496fbb31e7c"
 }