@blocklet/meta 1.16.33-beta-20241018-093853-2efbcd5e → 1.16.33-beta-20241023-050633-f64145a7

package/lib/util.d.ts

@@ -89,8 +89,8 @@ declare const isEnvShareableToClient: (env?: TConfig) => boolean;
 /**
  * is env shareable between components
  */
-declare const isEnvShareable: (env?: Partial<TConfig>) => boolean;
-declare const getSharedConfigObj: (app?: TComponentPro, component?: TComponentPro) => any;
+declare const isEnvShareable: (env?: Partial<TConfig>, includeSecure?: boolean) => boolean;
+declare const getSharedConfigObj: (app?: TComponentPro, component?: TComponentPro, includeSecure?: boolean) => any;
 declare const isPreferenceKey: (x: Partial<TConfig>) => Boolean;
 declare const getAppMissingConfigs: (app?: any) => any[];
 declare const getComponentMissingConfigs: (component?: any, app?: any) => any[];
@@ -178,11 +178,11 @@ declare const _default: {
     }) => Promise<unknown>;
     forEachComponentV2Sync: (blocklet: any, cb: Function) => Promise<unknown>;
     isDeletableBlocklet: (blocklet?: BlockletState) => boolean;
-    getSharedConfigObj: (app?: TComponentPro, component?: TComponentPro) => any;
+    getSharedConfigObj: (app?: TComponentPro, component?: TComponentPro, includeSecure?: boolean) => any;
     getAppMissingConfigs: (app?: any) => any[];
     getComponentMissingConfigs: (component?: any, app?: any) => any[];
     isEnvShareableToClient: (env?: TConfig) => boolean;
-    isEnvShareable: (env?: Partial<TConfig>) => boolean;
+    isEnvShareable: (env?: Partial<TConfig>, includeSecure?: boolean) => boolean;
     wipeSensitiveData: (blocklet?: BlockletState) => BlockletState;
     hasRunnableComponent: (blocklet: BlockletState) => boolean;
     getAppName: (blocklet: BlockletState, onlyUseMeta?: boolean) => string;

package/lib/util.js

@@ -276,11 +276,15 @@ exports.isEnvShareableToClient = isEnvShareableToClient;
 /**
  * is env shareable between components
  */
-const isEnvShareable = (env) => {
-    return !!env && !!(env.key || env.name) && !!env.shared && !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name];
+const isEnvShareable = (env, includeSecure = false) => {
+    return (!!env &&
+        !!(env.key || env.name) &&
+        !!env.shared &&
+        !constant_2.BLOCKLET_CONFIGURABLE_KEY[env.key || env.name] &&
+        (includeSecure ? true : !env.secure));
 };
 exports.isEnvShareable = isEnvShareable;
-const getSharedConfigObj = (app, component) => {
+const getSharedConfigObj = (app, component, includeSecure = false) => {
     const res = {};
     if (!app || !component) {
         return res;
@@ -288,13 +292,13 @@ const getSharedConfigObj = (app, component) => {
     if (Array.isArray(app.configs)) {
         app.configs.forEach(({ key, value: value0, secure }) => {
             // config in container is force shared to components
-            if (!isEnvShareable({ key, secure, shared: true })) {
+            if (!isEnvShareable({ key, secure, shared: true }, includeSecure)) {
                 return;
             }
             const value = (app.configObj || {})[key] || value0;
             const config = (component.configs || []).find((x) => x.key === key);
             if (!config || // component does not have this config
-                isEnvShareable(config) || // component config is shareable
+                isEnvShareable(config, includeSecure) || // component config is shareable
                 (!config.value && !(component.configObj || {})[config.key]) // component config is empty
             ) {
                 res[key] = value;
@@ -306,7 +310,7 @@ const getSharedConfigObj = (app, component) => {
             .filter((x) => x.meta?.did !== component.meta?.did)
             .forEach((child) => {
             (child.configs || [])
-                .filter(isEnvShareable) // only share shareable configs
+                .filter((x) => isEnvShareable(x, includeSecure)) // 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);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.33-beta-20241018-093853-2efbcd5e",
+  "version": "1.16.33-beta-20241023-050633-f64145a7",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,17 +25,17 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.33-beta-20241018-093853-2efbcd5e",
-    "@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-20241018-093853-2efbcd5e",
-    "@ocap/asset": "1.18.135",
-    "@ocap/mcrypto": "1.18.135",
-    "@ocap/types": "1.18.135",
-    "@ocap/util": "1.18.135",
-    "@ocap/wallet": "1.18.135",
+    "@abtnode/constant": "1.16.33-beta-20241023-050633-f64145a7",
+    "@arcblock/did": "1.18.136",
+    "@arcblock/did-ext": "1.18.136",
+    "@arcblock/did-util": "1.18.136",
+    "@arcblock/jwt": "1.18.136",
+    "@blocklet/constant": "1.16.33-beta-20241023-050633-f64145a7",
+    "@ocap/asset": "1.18.136",
+    "@ocap/mcrypto": "1.18.136",
+    "@ocap/types": "1.18.136",
+    "@ocap/util": "1.18.136",
+    "@ocap/wallet": "1.18.136",
     "ajv": "^8.11.0",
     "axios": "^1.7.5",
     "cjk-length": "^1.0.0",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "d7da547332961a71a6a5994bed3d307be52f0d64"
+  "gitHead": "ed8130f55cb68a23c72ea0fd58c2bad38de18719"
 }