@blocklet/meta 1.8.51 → 1.8.53

package/lib/types/schema.d.ts

@@ -95,7 +95,7 @@ export interface TBlockletMeta {
     title?: TTitle | '';
     version: string;
 }
-export declare type TBlockletName = string;
+export type TBlockletName = string;
 export interface TComponent {
     description?: TDescription;
     mountPoint?: TMountPoint;
@@ -121,7 +121,7 @@ export interface TComponent {
     };
     title?: TTitle;
 }
-export declare type TDescription = string;
+export type TDescription = string;
 export interface TDist {
     integrity: string;
     size?: number;
@@ -154,7 +154,7 @@ export interface TEnvironment {
     shared?: boolean;
     validation?: string;
 }
-export declare type TEnvironmentName = string;
+export type TEnvironmentName = string;
 export interface TInterface {
     endpoints?: TEndpoint[];
     name: string;
@@ -168,9 +168,9 @@ export interface TInterface {
     services?: TService[];
     type: 'web' | 'service' | 'wellknown';
 }
-export declare type TLogo = string;
-export declare type TMountPoint = string;
-export declare type TNavigation = TNavigationItem[];
+export type TLogo = string;
+export type TMountPoint = string;
+export type TNavigation = TNavigationItem[];
 export interface TNavigationItem {
     component?: string;
     icon?: string;
@@ -260,4 +260,4 @@ export interface TTheme {
         header?: string;
     };
 }
-export declare type TTitle = string;
+export type TTitle = string;

package/lib/util.d.ts

@@ -1,7 +1,7 @@
 import { BlockletState, ComponentState } from '@abtnode/client';
 import { Request } from 'express';
 import { TBlockletMeta, TEnvironment } from './types';
-declare type TConfig = TEnvironment & {
+type TConfig = TEnvironment & {
     key: string;
 };
 declare const getComponentId: (component?: {
@@ -39,8 +39,9 @@ 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, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
+declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
     parallel?: boolean;
+    concurrencyLimit?: number;
     sync?: boolean;
     params?: any;
     _parent?: any;
@@ -48,6 +49,7 @@ declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Fu
     _level?: number;
     _tasks?: any;
     _ancestors?: any[];
+    _limit?: (fn: () => void) => void;
 }) => Promise<unknown>;
 declare const forEachBlockletSync: (blocklet: any, cb: Function) => Promise<unknown>;
 declare const forEachChild: (blocklet: any, cb: Function, params?: any) => Promise<any>;
@@ -124,8 +126,9 @@ declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
     isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
-    forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
+    forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
         parallel?: boolean;
+        concurrencyLimit?: number;
         sync?: boolean;
         params?: any;
         _parent?: any;
@@ -133,6 +136,7 @@ declare const _default: {
         _level?: number;
         _tasks?: any;
         _ancestors?: any[];
+        _limit?: (fn: () => void) => void;
     }) => Promise<unknown>;
     forEachBlockletSync: (blocklet: any, cb: Function) => Promise<unknown>;
     forEachChild: (blocklet: any, cb: Function, params?: any) => Promise<any>;

package/lib/util.js

@@ -17,6 +17,7 @@ exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlo
 const get_1 = __importDefault(require("lodash/get"));
 const slugify_1 = __importDefault(require("slugify"));
 const url_join_1 = __importDefault(require("url-join"));
+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;
@@ -55,7 +56,7 @@ const getParentComponentName = (name) => {
     return arr.join('/');
 };
 exports.getParentComponentName = getParentComponentName;
-const forEachBlocklet = (blocklet, cb, { parallel = false, sync, params: inputParams, _parent, _root, _level = 0, _tasks: inputTasks, _ancestors = [], } = {}) => {
+const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5, sync, params: inputParams, _parent, _root, _level = 0, _tasks: inputTasks, _ancestors = [], _limit, } = {}) => {
     const root = _root || _parent || blocklet;
     // id maybe meaningless if no meta in blocklet or _ancestors
     const id = getComponentId(blocklet, _ancestors);
@@ -116,8 +117,9 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, sync, params: inputPa
         }));
     }
     // parallel
+    const limit = _limit || (0, p_limit_1.default)(concurrencyLimit);
     const tasks = inputTasks || [];
-    tasks.push(cb(blocklet, { parent: _parent, root, level: _level, ancestors: _ancestors, id }));
+    tasks.push(limit(() => cb(blocklet, { parent: _parent, root, level: _level, ancestors: _ancestors, id })));
     if (blocklet.children) {
         for (const child of blocklet.children) {
             forEachBlocklet(child, cb, {
@@ -127,6 +129,7 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, sync, params: inputPa
                 _level: _level + 1,
                 _tasks: tasks,
                 _ancestors: newAncestors,
+                _limit: limit,
             });
         }
     }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.51",
+  "version": "1.8.53",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,19 +24,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.51",
-    "@abtnode/constant": "1.8.51",
-    "@abtnode/util": "1.8.51",
-    "@arcblock/did": "1.18.32",
-    "@arcblock/did-ext": "1.18.32",
-    "@arcblock/did-util": "1.18.32",
-    "@arcblock/jwt": "1.18.32",
-    "@blocklet/constant": "1.8.51",
-    "@ocap/asset": "1.18.32",
-    "@ocap/mcrypto": "1.18.32",
-    "@ocap/types": "1.18.32",
-    "@ocap/util": "1.18.32",
-    "@ocap/wallet": "1.18.32",
+    "@abtnode/client": "1.8.53",
+    "@abtnode/constant": "1.8.53",
+    "@abtnode/util": "1.8.53",
+    "@arcblock/did": "1.18.34",
+    "@arcblock/did-ext": "1.18.34",
+    "@arcblock/did-util": "1.18.34",
+    "@arcblock/jwt": "1.18.34",
+    "@blocklet/constant": "1.8.53",
+    "@ocap/asset": "1.18.34",
+    "@ocap/mcrypto": "1.18.34",
+    "@ocap/types": "1.18.34",
+    "@ocap/util": "1.18.34",
+    "@ocap/wallet": "1.18.34",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -51,6 +51,7 @@
     "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "p-limit": "^3.1.0",
     "promise.any": "^2.0.4",
     "slugify": "^1.6.5",
     "url-join": "^4.0.1",
@@ -58,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.49",
+    "@abtnode/client": "^1.8.52",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -79,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "30e929da51edaa22104c4de4e3d1661d790c578c"
+  "gitHead": "48a5659627cbf21c232514e332d96e3fe8442e0f"
 }