@blocklet/sdk 1.16.21-beta-2e75c75c → 1.16.21-beta-da3f852a

package/lib/component/index.d.ts

@@ -27,15 +27,20 @@ declare const getResourceExportDir: ({ projectId, releaseId }?: {
     projectId: string;
     releaseId?: string;
 }) => string;
-declare const getResources: ({ scope, did, types, skipRunningCheck, }?: {
+declare const getResources: ({ scope, types, skipRunningCheck, }?: {
     scope?: 'all' | 'pack' | 'excludePack';
     did?: string;
-    types?: string[];
+    types?: {
+        did: string;
+        type: string;
+    }[];
     skipRunningCheck?: boolean;
 }) => Resource[];
-declare const getPackResources: ({ did, types, }?: {
-    did?: string;
-    types?: string[];
+declare const getPackResources: ({ types, }?: {
+    types?: {
+        did: string;
+        type: string;
+    }[];
 }) => Resource[];
 declare const waitForComponentRunning: (name: string, timeout?: number, interval?: number) => Promise<boolean>;
 export { call };
@@ -56,15 +61,20 @@ declare const _default: {
         projectId: string;
         releaseId?: string;
     }) => string;
-    getResources: ({ scope, did, types, skipRunningCheck, }?: {
+    getResources: ({ scope, types, skipRunningCheck, }?: {
         scope?: "pack" | "all" | "excludePack";
         did?: string;
-        types?: string[];
+        types?: {
+            did: string;
+            type: string;
+        }[];
         skipRunningCheck?: boolean;
     }) => Util.Resource[];
-    getPackResources: ({ did, types, }?: {
-        did?: string;
-        types?: string[];
+    getPackResources: ({ types, }?: {
+        types?: {
+            did: string;
+            type: string;
+        }[];
     }) => Util.Resource[];
 };
 export default _default;

package/lib/component/index.js

@@ -119,12 +119,12 @@ const getResourceExportDir = ({ projectId, releaseId } = { projectId: '' }) => {
     return dir;
 };
 exports.getResourceExportDir = getResourceExportDir;
-const getResources = ({ scope = 'all', did, types, skipRunningCheck, } = {}) => {
-    return Util.getResources({ components: config_1.components, scope, did, types, skipRunningCheck });
+const getResources = ({ scope = 'all', types, skipRunningCheck, } = {}) => {
+    return Util.getResources({ components: config_1.components, scope, types, skipRunningCheck });
 };
 exports.getResources = getResources;
-const getPackResources = ({ did, types, } = {}) => {
-    return Util.getResources({ components: config_1.components, scope: 'pack', did, types, ignorePublic: true });
+const getPackResources = ({ types, } = {}) => {
+    return Util.getResources({ components: config_1.components, scope: 'pack', types, ignorePublic: true });
 };
 exports.getPackResources = getPackResources;
 const waitForComponentRunning = async (name, timeout = 30000, interval = 250) => {

package/lib/component/util.d.ts

@@ -6,11 +6,13 @@ type Resource = {
     status?: number;
     path?: string;
 };
-declare function getResources({ scope, components: allComponents, did, types, skipRunningCheck, ignorePublic, }?: {
+declare function getResources({ scope, components: allComponents, types, skipRunningCheck, ignorePublic, }?: {
     scope?: 'all' | 'pack' | 'excludePack';
     components: TComponent[];
-    did?: string;
-    types?: string[];
+    types?: {
+        did: string;
+        type: string;
+    }[];
     skipRunningCheck?: boolean;
     ignorePublic?: boolean;
 }): Resource[];

package/lib/component/util.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResources = void 0;
 const pick_1 = __importDefault(require("lodash/pick"));
 const constant_1 = require("@blocklet/constant");
-function getResources({ scope, components: allComponents, did, types, skipRunningCheck, ignorePublic, } = {
+function getResources({ scope, components: allComponents, types, skipRunningCheck, ignorePublic, } = {
     scope: 'all',
     components: [],
 }) {
     const list = [];
-    if (!did && !types?.length) {
+    if (!types?.length) {
         return list;
     }
     let components = allComponents;
@@ -26,18 +26,14 @@ function getResources({ scope, components: allComponents, did, types, skipRunnin
         .filter((x) => scope === 'pack' || skipRunningCheck || x.status === constant_1.BlockletStatus.running)
         .forEach((component) => {
         const resources = component.resourcesV2 || [].filter((x) => ignorePublic || x.public);
-        let resourcePath;
-        if (did && types?.length) {
-            const resource = resources.find((x) => {
-                const [resourceDid, resourceType] = x.path.split('/').slice(-2);
-                return did === resourceDid && types.includes(resourceType);
-            });
-            resourcePath = resource?.path;
-        }
-        if (resourcePath) {
+        const resource = resources.find((x) => {
+            const [resourceDid, resourceType] = x.path.split('/').slice(-2);
+            return types.some((item) => item?.did === resourceDid && item?.type === resourceType);
+        });
+        if (resource?.path) {
             list.push({
                 ...(0, pick_1.default)(component, ['title', 'did', 'version', 'status']),
-                path: resourcePath,
+                path: resource.path,
             });
         }
     });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.21-beta-2e75c75c",
+  "version": "1.16.21-beta-da3f852a",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.21-beta-2e75c75c",
-    "@abtnode/constant": "1.16.21-beta-2e75c75c",
+    "@abtnode/client": "1.16.21-beta-da3f852a",
+    "@abtnode/constant": "1.16.21-beta-da3f852a",
     "@arcblock/did": "1.18.108",
     "@arcblock/did-auth": "1.18.108",
     "@arcblock/jwt": "1.18.108",
     "@arcblock/ws": "1.18.108",
-    "@blocklet/constant": "1.16.21-beta-2e75c75c",
-    "@blocklet/env": "1.16.21-beta-2e75c75c",
-    "@blocklet/meta": "1.16.21-beta-2e75c75c",
+    "@blocklet/constant": "1.16.21-beta-da3f852a",
+    "@blocklet/env": "1.16.21-beta-da3f852a",
+    "@blocklet/meta": "1.16.21-beta-da3f852a",
     "@did-connect/authenticator": "^2.2.1",
     "@did-connect/handler": "^2.2.1",
     "@nedb/core": "^2.1.5",
@@ -75,5 +75,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "1fca0b58e1ed4f7a9bb268829a7c84290a01c89d"
+  "gitHead": "57b315bdb59f2125c5f0595d5cb21c92196710ba"
 }