@blocklet/meta 1.16.6-beta-4562aa60 → 1.16.6-beta-eaa4d39d

package/lib/util.js

@@ -12,7 +12,7 @@ const p_limit_1 = __importDefault(require("p-limit"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const constants_1 = __importDefault(require("./constants"));
 const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE, WHO_CAN_ACCESS, WHO_CAN_ACCESS_PREFIX_ROLES } = constant_1.default;
-const { BlockletGroup, BlockletStatus, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_CONFIGURABLE_KEY, CHAIN_INFO_CONFIG, BLOCKLET_PREFERENCE_PREFIX, BLOCKLET_INTERFACE_TYPE_SERVICE, } = constants_1.default;
+const { BlockletGroup, BlockletStatus, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_CONFIGURABLE_KEY, CHAIN_INFO_CONFIG, CHAIN_PROP_MAP, BLOCKLET_PREFERENCE_PREFIX, BLOCKLET_INTERFACE_TYPE_SERVICE, } = constants_1.default;
 const getComponentId = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.did : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.did : ''}`;
 exports.getComponentId = getComponentId;
 const getComponentName = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.name : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.name : ''}`;
@@ -188,7 +188,7 @@ const isEnvShareable = (env) => {
 exports.isEnvShareable = isEnvShareable;
 const getSharedConfigObj = (component, ancestors) => {
     const res = {};
-    if (!ancestors) {
+    if (!ancestors || !ancestors.length) {
         return res;
     }
     for (let i = ancestors.length - 1; i >= 0; i--) {
@@ -209,11 +209,37 @@ const getSharedConfigObj = (component, ancestors) => {
             });
         }
     }
+    // share blocklet app chain config
+    const ancestor = ancestors[0];
+    (ancestor.configs || []).forEach(({ key, value }) => {
+        if (![
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_HOST,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_ID,
+            BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_CHAIN_TYPE,
+        ].includes(key)) {
+            return;
+        }
+        res[CHAIN_PROP_MAP[key]] = value;
+    });
     return res;
 };
 exports.getSharedConfigObj = getSharedConfigObj;
 const isPreferenceKey = (x) => x.key.startsWith(BLOCKLET_PREFERENCE_PREFIX) === true;
 exports.isPreferenceKey = isPreferenceKey;
+const isConfigMissing = (item, sharedConfigObj) => {
+    if (item.required) {
+        if (
+        // if the value and the shared value are both empty
+        (!item.value && !sharedConfigObj[item.key]) ||
+            // if CHAIN_HOST, CHAIN_ID, CHAIN_TYPE in sharedConfigObj and the shared value is empty
+            (Object.values(CHAIN_PROP_MAP).includes(item.key) &&
+                Object.keys(sharedConfigObj).includes(item.key) &&
+                !sharedConfigObj[item.key])) {
+            return true;
+        }
+    }
+    return false;
+};
 const getAppMissingConfigs = (blocklet = {}) => {
     const missingConfigs = [];
     forEachBlockletSync(blocklet, (b, { ancestors, level }) => {
@@ -223,7 +249,7 @@ const getAppMissingConfigs = (blocklet = {}) => {
         const configs = b.configs || [];
         const sharedConfigObj = getSharedConfigObj(b, ancestors);
         configs.forEach((item) => {
-            if (item.required && !item.value && !sharedConfigObj[item.key]) {
+            if (isConfigMissing(item, sharedConfigObj)) {
                 missingConfigs.push({ did: b.meta.did, key: item.key, description: item.description });
             }
         });
@@ -236,7 +262,7 @@ const getComponentMissingConfigs = (component = {}, ancestors = []) => {
     const configs = component.configs || [];
     const sharedConfigObj = getSharedConfigObj(component, ancestors);
     configs.forEach((item) => {
-        if (item.required && !item.value && !sharedConfigObj[item.key]) {
+        if (isConfigMissing(item, sharedConfigObj)) {
             missingConfigs.push({ did: component.meta.did, key: item.key, description: item.description });
         }
     });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-4562aa60",
+  "version": "1.16.6-beta-eaa4d39d",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,18 +24,18 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-4562aa60",
-    "@abtnode/util": "1.16.6-beta-4562aa60",
-    "@arcblock/did": "1.18.72",
-    "@arcblock/did-ext": "1.18.72",
-    "@arcblock/did-util": "1.18.72",
-    "@arcblock/jwt": "1.18.72",
-    "@blocklet/constant": "1.16.6-beta-4562aa60",
-    "@ocap/asset": "1.18.72",
-    "@ocap/mcrypto": "1.18.72",
-    "@ocap/types": "1.18.72",
-    "@ocap/util": "1.18.72",
-    "@ocap/wallet": "1.18.72",
+    "@abtnode/constant": "1.16.6-beta-eaa4d39d",
+    "@abtnode/util": "1.16.6-beta-eaa4d39d",
+    "@arcblock/did": "1.18.73",
+    "@arcblock/did-ext": "1.18.73",
+    "@arcblock/did-util": "1.18.73",
+    "@arcblock/jwt": "1.18.73",
+    "@blocklet/constant": "1.16.6-beta-eaa4d39d",
+    "@ocap/asset": "1.18.73",
+    "@ocap/mcrypto": "1.18.73",
+    "@ocap/types": "1.18.73",
+    "@ocap/util": "1.18.73",
+    "@ocap/wallet": "1.18.73",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "e49856099ffc3c16eda77480a7ad93b2e9760764"
+  "gitHead": "0d2ab99f67109e989f8182fc70bc3ee9fa430585"
 }