@blocklet/meta 1.16.33-beta-20241014-122831-e6000fb8 → 1.16.33-beta-20241016-094817-da9da642

package/lib/schema.js

@@ -351,7 +351,7 @@ const componentSourceSchema = Joi.alternatives().try(Joi.object({
     // 虽然 url 无法像 store 一样根据 version 获取指定版本的 component, 但是 version 仍然可以用于限制 component 版本
     version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semverRange().valid()),
 }), Joi.object({
-    store: Joi.string().uri(),
+    store: Joi.string().uri({ scheme: ['http', 'https'] }),
     name: blockletNameSchema.required(),
     // TODO 目前只能支持锁死的版本号，接下载需要支持自适应的版本号，比如 4.x
     version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semverRange().valid()).default('latest'),

package/lib/util.js

@@ -277,7 +277,7 @@ exports.isEnvShareableToClient = isEnvShareableToClient;
  * is env shareable between components
  */
 const isEnvShareable = (env) => {
-    return (!!env && !!(env.key || env.name) && !env.secure && !!env.shared && !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name]);
+    return !!env && !!(env.key || env.name) && !!env.shared && !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name];
 };
 exports.isEnvShareable = isEnvShareable;
 const getSharedConfigObj = (app, component) => {
@@ -287,12 +287,8 @@ const getSharedConfigObj = (app, component) => {
     }
     if (Array.isArray(app.configs)) {
         app.configs.forEach(({ key, value: value0, secure }) => {
-            if (!isEnvShareable({
-                key,
-                secure,
-                // config in container is force shared to components
-                shared: true,
-            })) {
+            // config in container is force shared to components
+            if (!isEnvShareable({ key, secure, shared: true })) {
                 return;
             }
             const value = (app.configObj || {})[key] || value0;
@@ -305,6 +301,23 @@ const getSharedConfigObj = (app, component) => {
             }
         });
     }
+    if (Array.isArray(app.children)) {
+        app.children
+            .filter((x) => x.meta?.did !== component.meta?.did)
+            .forEach((child) => {
+            (child.configs || [])
+                .filter(isEnvShareable) // only share shareable configs
+                .filter((x) => !(app.configs || []).find((y) => y.key === x.key)) // only share configs that app does not have
+                .forEach(({ key, value }) => {
+                const config = (component.configs || []).find((x) => x.key === key);
+                if (!config || // component does not have this config
+                    (!config.value && !(component.configObj || {})[config.key]) // component config is empty
+                ) {
+                    res[key] = value;
+                }
+            });
+        });
+    }
     // share blocklet app chain config
     (app.configs || []).forEach(({ key, value }) => {
         if (![

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.33-beta-20241014-122831-e6000fb8",
+  "version": "1.16.33-beta-20241016-094817-da9da642",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,12 +25,12 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.33-beta-20241014-122831-e6000fb8",
+    "@abtnode/constant": "1.16.33-beta-20241016-094817-da9da642",
     "@arcblock/did": "1.18.135",
     "@arcblock/did-ext": "1.18.135",
     "@arcblock/did-util": "1.18.135",
     "@arcblock/jwt": "1.18.135",
-    "@blocklet/constant": "1.16.33-beta-20241014-122831-e6000fb8",
+    "@blocklet/constant": "1.16.33-beta-20241016-094817-da9da642",
     "@ocap/asset": "1.18.135",
     "@ocap/mcrypto": "1.18.135",
     "@ocap/types": "1.18.135",
@@ -39,7 +39,7 @@
     "ajv": "^8.11.0",
     "axios": "^1.7.5",
     "cjk-length": "^1.0.0",
-    "debug": "^4.3.6",
+    "debug": "^4.3.7",
     "fs-extra": "^11.2.0",
     "hosted-git-info": "3.0.8",
     "hpagent": "^1.1.0",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "e0c74418f9349b237c189e8d7546dccd71309a38"
+  "gitHead": "a714300a967417cb3244e00eced42b844bf8e12f"
 }