@blocklet/meta 1.16.0 → 1.16.1

package/lib/util.d.ts

@@ -5,6 +5,10 @@ type TConfig = TEnvironment & {
     key: string;
 };
 type Component = BlockletState | ComponentState;
+type ComponentPro = Component & {
+    configObj?: Record<string, string>;
+    environmentObj?: Record<string, string>;
+};
 declare const getComponentId: (component?: {
     meta?: {
         did?: string;
@@ -40,7 +44,7 @@ declare const getComponentBundleId: (component: {
  * @a/b/@c/d/@e/f => @a/b/@c/d
  */
 declare const getParentComponentName: (name?: string) => string;
-declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
+declare const forEachBlocklet: (blocklet: ComponentPro, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
     parallel?: boolean;
     concurrencyLimit?: number;
     sync?: boolean;
@@ -111,17 +115,18 @@ type ChainInfo = {
     host: string;
 };
 declare const getChainInfo: (env: Record<string, string>) => ChainInfo;
+declare const getBlockletChainInfo: (blocklet: ComponentPro) => ChainInfo;
 declare const isExternalBlocklet: (blocklet?: BlockletState) => boolean;
 declare const getRolesFromAuthConfig: (config: {
     whoCanAccess: string;
 }) => Array<string>;
 declare const getBlockletAppIdList: (blocklet: Partial<BlockletState>) => string[];
-export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, getParentComponentName, getConnectAppUrl, getChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, };
+export { isFreeBlocklet, isFreeComponent, isComponentBlocklet, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
     isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
-    forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
+    forEachBlocklet: (blocklet: ComponentPro, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
         parallel?: boolean;
         concurrencyLimit?: number;
         sync?: boolean;
@@ -197,6 +202,7 @@ declare const _default: {
         baseUrl: string;
     }) => string;
     getChainInfo: (env: Record<string, string>) => ChainInfo;
+    getBlockletChainInfo: (blocklet: ComponentPro) => ChainInfo;
     isExternalBlocklet: (blocklet?: BlockletState) => boolean;
     isPreferenceKey: (x: TConfig) => Boolean;
     getRolesFromAuthConfig: (config: {

package/lib/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
+exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getBlockletChainInfo = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -461,6 +461,28 @@ const getChainInfo = (env) => {
     return result;
 };
 exports.getChainInfo = getChainInfo;
+const getBlockletChainInfo = (blocklet) => {
+    const emptyInfo = getChainInfo({});
+    if (!blocklet) {
+        return emptyInfo;
+    }
+    const chainInfoInRoot = getChainInfo(blocklet.configObj);
+    if (chainInfoInRoot.host !== 'none') {
+        return chainInfoInRoot;
+    }
+    let chainInfoInChild;
+    forEachChildSync(blocklet, (b) => {
+        if (chainInfoInChild && chainInfoInChild.host !== 'none') {
+            return;
+        }
+        const chainInfo = getChainInfo(b.configObj);
+        if (chainInfo.host !== 'none') {
+            chainInfoInChild = chainInfo;
+        }
+    });
+    return chainInfoInChild || emptyInfo;
+};
+exports.getBlockletChainInfo = getBlockletChainInfo;
 const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;
 const getRolesFromAuthConfig = (config) => {
@@ -507,6 +529,7 @@ exports.default = {
     getParentComponentName,
     getConnectAppUrl,
     getChainInfo,
+    getBlockletChainInfo,
     isExternalBlocklet,
     isPreferenceKey,
     getRolesFromAuthConfig,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,14 +24,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.0",
-    "@abtnode/constant": "1.16.0",
-    "@abtnode/util": "1.16.0",
+    "@abtnode/client": "1.16.1",
+    "@abtnode/constant": "1.16.1",
+    "@abtnode/util": "1.16.1",
     "@arcblock/did": "1.18.65",
     "@arcblock/did-ext": "1.18.65",
     "@arcblock/did-util": "1.18.65",
     "@arcblock/jwt": "1.18.65",
-    "@blocklet/constant": "1.16.0",
+    "@blocklet/constant": "1.16.1",
     "@ocap/asset": "1.18.65",
     "@ocap/mcrypto": "1.18.65",
     "@ocap/types": "1.18.65",
@@ -59,7 +59,6 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "1.8.68",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -81,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "da461546c6db9c7d347689708af27654c17ac28e"
+  "gitHead": "5912cfbd3b7573850727b05a808b1f798686267f"
 }