@blocklet/meta 1.8.66-beta-7f4224af → 1.8.66-beta-b56e3b54

package/lib/fix.js

@@ -235,7 +235,7 @@ const fixName = (meta) => {
         (0, name_1.validateNewDid)(did);
         meta.name = did;
     }
-    catch (_a) {
+    catch {
         /* empty */
     }
     return meta;

package/lib/parse-navigation-from-blocklet.js

@@ -74,13 +74,13 @@ function tryParseItem(item) {
     try {
         return JSON.parse(item);
     }
-    catch (_a) {
+    catch {
         return item;
     }
 }
 function normalizeNavigationList(navigationList) {
     return navigationList.map((item) => {
-        const tempData = Object.assign({}, item);
+        const tempData = { ...item };
         if (tempData.role) {
             tempData.role = tryParseItem(tempData.role);
         }
@@ -209,11 +209,10 @@ function parseBlockletNavigationList(blocklet = {}) {
      * @returns
      */
     function genNavigationListByBlocklet(current, parent = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const targetList = [];
         const { children = [], meta = {} } = current;
-        const navigation = (0, cloneDeep_1.default)((meta === null || meta === void 0 ? void 0 : meta.navigation) || []);
-        if (((_b = (_a = current.meta) === null || _a === void 0 ? void 0 : _a.capabilities) === null || _b === void 0 ? void 0 : _b.navigation) !== false) {
+        const navigation = (0, cloneDeep_1.default)(meta?.navigation || []);
+        if (current.meta?.capabilities?.navigation !== false) {
             targetList.push(...navigation);
         }
         const parentName = parent.name || '';
@@ -226,15 +225,17 @@ function parseBlockletNavigationList(blocklet = {}) {
             const mergeName = [parentName, currentName, childName].filter(Boolean).join('.');
             const childNavigation = child.meta.navigation || [];
             const mergeBase = (0, url_join_1.default)(parentBase, currentBase, childBase);
-            if (((_d = (_c = child.meta) === null || _c === void 0 ? void 0 : _c.capabilities) === null || _d === void 0 ? void 0 : _d.navigation) !== false) {
+            if (child.meta?.capabilities?.navigation !== false) {
                 components.push({
                     did: child.meta.did,
                     name: mergeName,
                     link: mergeBase,
                     title: child.meta.title || '',
-                    navigation: childNavigation.map((item) => (Object.assign({ 
+                    navigation: childNavigation.map((item) => ({
                         // 给每个 navigation 赋予一个 setion，用于在 autocomplete 提供依据 section 筛选的基础
-                        section: DEFAULT_SECTION }, item))),
+                        section: DEFAULT_SECTION,
+                        ...item,
+                    })),
                 });
             }
             // 在现有的 navigation 中判断是否存在 children
@@ -250,7 +251,7 @@ function parseBlockletNavigationList(blocklet = {}) {
                     if (child.meta.navigation && child.meta.navigation.length > 0) {
                         const items = genNavigationListByBlocklet(child, { mountPoint: currentBase, name: currentName });
                         if (items.length > 0) {
-                            matchNavigation.items = (_e = matchNavigation.items) !== null && _e !== void 0 ? _e : [];
+                            matchNavigation.items = matchNavigation.items ?? [];
                             matchNavigation.items.push(...items);
                         }
                     }
@@ -259,7 +260,7 @@ function parseBlockletNavigationList(blocklet = {}) {
                     }
                 }
             }
-            else if (((_g = (_f = child.meta) === null || _f === void 0 ? void 0 : _f.capabilities) === null || _g === void 0 ? void 0 : _g.navigation) !== false) {
+            else if (child.meta?.capabilities?.navigation !== false) {
                 const childItems = genNavigationListByBlocklet(child, { mountPoint: currentBase, name: currentName });
                 // 否则动态注入一个 navigation
                 const tmpData = {
@@ -289,7 +290,6 @@ function parseBlockletNavigationList(blocklet = {}) {
 function patchBuiltinNavigation(navigation) {
     const copyNavigation = (0, cloneDeep_1.default)(navigation).filter((item) => item.id);
     deepWalk(copyNavigation, (item, parent) => {
-        var _a;
         if (item.items && item.items.length) {
             for (let i = item.items.length - 1; i >= 0; i--) {
                 if (!item.items[i].id) {
@@ -309,7 +309,7 @@ function patchBuiltinNavigation(navigation) {
             item.id = [parent.id, item.id].join(ID_SEPARATE);
         }
         item.from = item.from || 'yaml';
-        item.visible = (_a = item.visible) !== null && _a !== void 0 ? _a : true;
+        item.visible = item.visible ?? true;
     }, { key: 'items' });
     return copyNavigation;
 }
@@ -324,7 +324,6 @@ function compactNavigation(navigation, depth = 2) {
     const resData = flatternNavigation(copyNavigation, {
         depth,
         transform: (item, parent) => {
-            var _a;
             if (parent) {
                 if (!item._parent) {
                     item._parent = parent.id;
@@ -333,7 +332,7 @@ function compactNavigation(navigation, depth = 2) {
                     }
                 }
                 item.section = item.section || parent.section || [DEFAULT_SECTION];
-                item.visible = (_a = item.visible) !== null && _a !== void 0 ? _a : parent.visible;
+                item.visible = item.visible ?? parent.visible;
             }
             item.component = [parent.component, item.component].filter(Boolean).join('.');
             return item;
@@ -374,7 +373,7 @@ function getNavigationListBySection(navigationItem, section) {
             }
             return false;
         })
-            .map((item) => (Object.assign(Object.assign({}, item), { section })));
+            .map((item) => ({ ...item, section }));
     }
     return [];
 }
@@ -392,7 +391,11 @@ function splitNavigationBySection(navigation) {
         // eslint-disable-next-line no-inner-declarations
         function patchNavigationItem(item, section) {
             const sectionNavigationList = getNavigationListBySection(item, section);
-            itemNavigationList.push(Object.assign(Object.assign({}, baseNavigation), { section, items: sectionNavigationList }));
+            itemNavigationList.push({
+                ...baseNavigation,
+                section,
+                items: sectionNavigationList,
+            });
         }
         if (Array.isArray(navigationItem.section)) {
             for (const section of navigationItem.section) {
@@ -415,7 +418,10 @@ function splitNavigationBySection(navigation) {
             }
         }
         else {
-            itemNavigationList.push(Object.assign(Object.assign({}, navigationItem), { section: DEFAULT_SECTION }));
+            itemNavigationList.push({
+                ...navigationItem,
+                section: DEFAULT_SECTION,
+            });
         }
         allNavigationList.push(...itemNavigationList);
     }
@@ -453,7 +459,7 @@ exports.nestNavigationList = nestNavigationList;
 function filterNavigation(navigationList, components = []) {
     const nestedNavigation = nestNavigationList(navigationList);
     deepWalk(nestedNavigation, (item) => {
-        if (item === null || item === void 0 ? void 0 : item.component) {
+        if (item?.component) {
             if (!components.some((x) => x.name === item.component)) {
                 item.visible = false;
             }
@@ -467,14 +473,13 @@ function filterNavigation(navigationList, components = []) {
         }
     }, { key: 'items' });
     const filteredNavigation = nestedNavigation.filter((item) => {
-        var _a;
         if (item.visible === false)
             return false;
         // 如果某一菜单的 子菜单 均为隐藏状态，则一级菜单本身也不显示出来
         if (item.items &&
             Array.isArray(item.items) &&
             item.items.length > 0 &&
-            ((_a = item.items) === null || _a === void 0 ? void 0 : _a.every((v) => v.visible === false)))
+            item.items?.every((v) => v.visible === false))
             return false;
         return true;
     });
@@ -494,10 +499,9 @@ function cleanOrphanNavigation(list) {
 }
 exports.cleanOrphanNavigation = cleanOrphanNavigation;
 function parseNavigation(blocklet = {}, options = {}) {
-    var _a;
     const { beforeProcess = (v) => v } = options;
     const { navigationList: builtinNavigation, components } = parseBlockletNavigationList(blocklet);
-    const customNavigationList = ((_a = blocklet === null || blocklet === void 0 ? void 0 : blocklet.settings) === null || _a === void 0 ? void 0 : _a.navigations) || [];
+    const customNavigationList = blocklet?.settings?.navigations || [];
     const compactedNavigation = compactNavigation(beforeProcess(builtinNavigation));
     const patchedNavigation = patchBuiltinNavigation(compactedNavigation);
     const splitNavigation = splitNavigationBySection(patchedNavigation);
@@ -509,7 +513,7 @@ function parseNavigation(blocklet = {}, options = {}) {
                     const { section } = cur;
                     const link = smartJoinLink(cur.link, x.link);
                     const component = [cur.component, x.component].filter(Boolean).join('.');
-                    return Object.assign(Object.assign({}, x), { section, link, component, parent: '' });
+                    return { ...x, section, link, component, parent: '' };
                 }));
                 return all;
             }
@@ -520,10 +524,10 @@ function parseNavigation(blocklet = {}, options = {}) {
     const flatNavigation = flatternNavigation(levelUpNavigation, {
         transform(item, parent) {
             let { component } = item;
-            if (parent === null || parent === void 0 ? void 0 : parent.component) {
+            if (parent?.component) {
                 component = [parent.component, item.component].filter(Boolean).join('.');
             }
-            return Object.assign(Object.assign({}, item), { component });
+            return { ...item, component };
         },
     });
     const rawNavigation = (0, unionWith_1.default)(normalizeNavigationList(customNavigationList), flatNavigation, (prev, next) => {

package/lib/parse-navigation.js

@@ -24,7 +24,9 @@ const getGroups = (navigation) => {
             if (!groups[sec]) {
                 groups[sec] = [];
             }
-            const item = Object.assign({}, nav);
+            const item = {
+                ...nav,
+            };
             if (nav.section) {
                 item.section = sec === '__undefined__' ? [] : [sec];
             }
@@ -37,9 +39,8 @@ const getChildName = (nav) => nav.component || nav.child;
 const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
     const result = [];
     (navigation || []).forEach((nav) => {
-        var _a, _b;
         if (!getChildName(nav)) {
-            if (_level > 1 && ((_a = nav.items) === null || _a === void 0 ? void 0 : _a.length)) {
+            if (_level > 1 && nav.items?.length) {
                 const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
                 result.push(...list);
                 return;
@@ -63,7 +64,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
             if (nav.role) {
                 item.role = nav.role;
             }
-            if ((_b = nav.items) === null || _b === void 0 ? void 0 : _b.length) {
+            if (nav.items?.length) {
                 const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
                 if (list.length) {
                     item.items = list;
@@ -124,7 +125,10 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
                     if (list.length > 1) {
                         // more than 1 child nav
                         delete item.link;
-                        result.push(Object.assign(Object.assign({}, item), { items: list }));
+                        result.push({
+                            ...item,
+                            items: list,
+                        });
                     }
                     else {
                         // only 1 child nav
@@ -143,7 +147,10 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
                             item.section = item.section || groupSection;
                         }
                         item.items = list;
-                        result.push(Object.assign(Object.assign({}, item), { items: list }));
+                        result.push({
+                            ...item,
+                            items: list,
+                        });
                     }
                     else {
                         // secondary menu

package/lib/parse.js

@@ -22,7 +22,6 @@ const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT } = constants_1.default;
  * @param {boolean} options.ensureFiles should we verify that logo and files exists
  */
 const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, extraRawAttrs = {}, schemaOptions = {}, defaultStoreUrl, fix = true, } = {}) => {
-    var _a;
     let result;
     const blockletMetaFile = path_1.default.join(dir, BLOCKLET_META_FILE);
     const blockletMetaFileAlt = path_1.default.join(dir, BLOCKLET_META_FILE_ALT);
@@ -64,7 +63,7 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
     (0, fix_1.fixName)(result);
     (0, fix_1.fixPerson)(result);
     (0, fix_1.fixService)(result);
-    if (defaultStoreUrl && ((_a = result.components) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (defaultStoreUrl && result.components?.length) {
         result.components.forEach((x) => {
             if ('name' in x.source) {
                 if (!x.source.store) {
@@ -82,10 +81,13 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
     }, {});
     debug('fix', result);
     // Validate and cleanup
-    const schema = (0, schema_1.createBlockletSchema)(dir, Object.assign({ ensureMain,
+    const schema = (0, schema_1.createBlockletSchema)(dir, {
+        ensureMain,
         ensureFiles,
         ensureDist,
-        ensureComponentStore }, schemaOptions));
+        ensureComponentStore,
+        ...schemaOptions,
+    });
     const { value, error } = schema.validate(result);
     if (error) {
         throw new Error(`Invalid blocklet.yml: ${error.details
@@ -96,7 +98,7 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
                     return `${x.message}: ${x.context.value.id}`;
                 }
             }
-            catch (_a) {
+            catch {
                 //
             }
             return x.message;

package/lib/payment/v2.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -68,11 +59,11 @@ const safeMul = (a, b) => Number((0, util_1.fromUnitToToken)((0, util_1.fromToke
     .mul(new util_1.BN(b * defaultDecimals))
     .div(defaultDecimalsBN)));
 const md5 = (str) => crypto_1.default.createHash('md5').update(str).digest('hex');
-const getStoreInfo = (url) => __awaiter(void 0, void 0, void 0, function* () {
+const getStoreInfo = async (url) => {
     const storeMetaUrl = (0, url_join_1.default)(new URL(url).origin, BLOCKLET_STORE_META_PATH);
-    const { data: info } = yield axios_1.default.get(storeMetaUrl, { timeout: 8000 });
+    const { data: info } = await axios_1.default.get(storeMetaUrl, { timeout: 8000 });
     return info;
-});
+};
 /**
  * @typedef {{
  *   meta: Object
@@ -91,7 +82,7 @@ const getStoreInfo = (url) => __awaiter(void 0, void 0, void 0, function* () {
  *
  * @returns {Array<Component>}
  */
-const innerGetComponents = (inputMeta, context = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const innerGetComponents = async (inputMeta, context = {}) => {
     // FIXME 是否需要验证: 在同一个链上; 重复的 component
     const { ancestors = [], bundles = {} } = context;
     // check ancestor length
@@ -109,7 +100,7 @@ const innerGetComponents = (inputMeta, context = {}) => __awaiter(void 0, void 0
         let meta;
         let url;
         try {
-            const res = yield (0, util_meta_1.getBlockletMetaFromUrls)(urls, {
+            const res = await (0, util_meta_1.getBlockletMetaFromUrls)(urls, {
                 returnUrl: true,
                 validateFn: (m) => (0, validate_1.validateMeta)(m),
                 ensureTarball: false,
@@ -125,7 +116,7 @@ const innerGetComponents = (inputMeta, context = {}) => __awaiter(void 0, void 0
             throw new Error(`The blocklet cannot be a component: ${meta.title}`);
         }
         // check circular dependencies
-        if (ancestors.map((x) => { var _a; return (_a = x.meta) === null || _a === void 0 ? void 0 : _a.did; }).indexOf(meta.did) > -1) {
+        if (ancestors.map((x) => x.meta?.did).indexOf(meta.did) > -1) {
             throw new Error('Blocklet components have circular dependencies');
         }
         // generate child
@@ -134,7 +125,7 @@ const innerGetComponents = (inputMeta, context = {}) => __awaiter(void 0, void 0
         };
         // child store info
         if (config.source.store) {
-            const storeInfo = yield getStoreInfo(url);
+            const storeInfo = await getStoreInfo(url);
             // check uniq bundle did in different stores
             if (!bundles[child.meta.did]) {
                 bundles[child.meta.did] = storeInfo.id;
@@ -146,14 +137,14 @@ const innerGetComponents = (inputMeta, context = {}) => __awaiter(void 0, void 0
             child.storeUrl = new URL(url).origin;
         }
         // child children
-        child.children = yield innerGetComponents(meta, {
+        child.children = await innerGetComponents(meta, {
             ancestors: [...ancestors, { meta }],
             bundles,
         });
         children.push(child);
     }
     return children;
-});
+};
 /**
  * @param {Array<Component>} components
  * @param {Array<Store>} _stores
@@ -181,26 +172,25 @@ const getStores = (components, _stores = []) => {
     }
     return _stores;
 };
-const getComponents = (inputMeta) => __awaiter(void 0, void 0, void 0, function* () {
-    const components = yield innerGetComponents(inputMeta);
-    const stores = yield getStores(components);
+const getComponents = async (inputMeta) => {
+    const components = await innerGetComponents(inputMeta);
+    const stores = await getStores(components);
     return { components, stores };
-});
-const getPriceTokens = (meta, ocapClient) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const getPriceTokens = async (meta, ocapClient) => {
     const priceTokens = (0, cloneDeep_1.default)((0, get_1.default)(meta, 'payment.price', []));
     for (const token of priceTokens) {
         // eslint-disable-next-line no-await-in-loop
-        const { state } = yield ocapClient.getTokenState({ address: token.address });
+        const { state } = await ocapClient.getTokenState({ address: token.address });
         if (!state) {
             throw new Error(`Token specified in blocklet meta was not found on chain: ${token.address}`);
         }
         token.decimal = state.decimal;
     }
     return priceTokens;
-});
+};
 const getChildShare = (childMeta, parentPrice) => {
-    var _a;
-    if (!((_a = childMeta === null || childMeta === void 0 ? void 0 : childMeta.payment) === null || _a === void 0 ? void 0 : _a.componentPrice)) {
+    if (!childMeta?.payment?.componentPrice) {
         return 0;
     }
     const priceList = childMeta.payment.componentPrice;
@@ -246,7 +236,7 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [], }) => {
             const childShare = getChildShare(child.meta, price);
             parentShareBN = parentShareBN.sub((0, util_1.fromTokenToUnit)(childShare, priceToken.decimal));
             const componentContracts = getTokenTransfers({
-                priceToken: Object.assign(Object.assign({}, priceToken), { value: childShare }),
+                priceToken: { ...priceToken, value: childShare },
                 shares: child.meta.payment.share,
                 components: child.children || [],
             });
@@ -277,19 +267,22 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [], }) => {
     });
     return mergedContracts;
 };
-const getContract = ({ meta, priceTokens, components, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getContract = async ({ meta, priceTokens, components, }) => {
     const shares = meta.payment.share || [];
     const [priceToken] = priceTokens;
     const contracts = getTokenTransfers({ priceToken, shares, components });
     const code = contracts
         .map((x) => `transferToken('${x.tokenAddress}','${x.accountAddress}','${x.amount.toString()}')`)
         .join(';\n');
-    const shareList = contracts.map((x) => (Object.assign(Object.assign({}, x), { amount: (0, util_1.fromUnitToToken)(x.amount, priceToken.decimal) })));
+    const shareList = contracts.map((x) => ({
+        ...x,
+        amount: (0, util_1.fromUnitToToken)(x.amount, priceToken.decimal),
+    }));
     return {
         code,
         shares: shareList,
     };
-});
+};
 /**
  * we need to ensure that blocklet purchase factory does not change across changes
  *
@@ -373,17 +366,17 @@ const getFactoryInput = (inputTokens, { formatToken = true } = {}) => {
         variables: [],
     };
 };
-const getPaymentIntegrity = ({ contract, factoryInput, storeComponents, meta, client, storeId, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getPaymentIntegrity = async ({ contract, factoryInput, storeComponents, meta, client, storeId, }) => {
     if (!contract && !factoryInput && !storeComponents) {
-        const priceTokens = yield getPriceTokens(meta, client);
-        const { components, stores } = yield getComponents(meta);
+        const priceTokens = await getPriceTokens(meta, client);
+        const { components, stores } = await getComponents(meta);
         const store = stores.find((x) => x.id === storeId);
         // eslint-disable-next-line no-param-reassign
-        contract = (yield getContract({ meta, components, priceTokens })).code;
+        contract = (await getContract({ meta, components, priceTokens })).code;
         // eslint-disable-next-line no-param-reassign
-        factoryInput = yield getFactoryInput(priceTokens);
+        factoryInput = await getFactoryInput(priceTokens);
         // eslint-disable-next-line no-param-reassign
-        storeComponents = (store === null || store === void 0 ? void 0 : store.components) || [];
+        storeComponents = store?.components || [];
     }
     const paymentData = {
         factoryInput,
@@ -392,19 +385,19 @@ const getPaymentIntegrity = ({ contract, factoryInput, storeComponents, meta, cl
     };
     const integrity = md5((0, json_stable_stringify_1.default)(paymentData));
     return integrity;
-});
-const getStoreSignatures = ({ meta, stores, factoryInput, contract, }) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const getStoreSignatures = async ({ meta, stores, factoryInput, contract, }) => {
     const storeSignatures = [];
     for (const store of stores) {
         const { id, url, pk, components: storeComponents } = store;
-        const paymentIntegrity = yield getPaymentIntegrity({ factoryInput, contract, storeComponents });
+        const paymentIntegrity = await getPaymentIntegrity({ factoryInput, contract, storeComponents });
         /**
          * protocol: /api/payment/signature
          * method: POST
          * body: { blockletMeta, paymentIntegrity, paymentVersion }
          * return: { signer, pk, signature}
          */
-        const { data: res } = yield axios_1.default.post(`${url}/api/payment/signature`, {
+        const { data: res } = await axios_1.default.post(`${url}/api/payment/signature`, {
             blockletMeta: meta,
             paymentIntegrity,
             paymentVersion: VERSION,
@@ -434,7 +427,7 @@ const getStoreSignatures = ({ meta, stores, factoryInput, contract, }) => __awai
     return {
         storeSignatures,
     };
-});
+};
 /**
  * Used by CLI and Store to independent compute factory itx
  *
@@ -455,16 +448,16 @@ const getStoreSignatures = ({ meta, stores, factoryInput, contract, }) => __awai
  *   }>
  * }}
  */
-const createNftFactoryItx = ({ blockletMeta, ocapClient, issuers, storeUrl, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const priceTokens = yield getPriceTokens(blockletMeta, ocapClient);
-    const { components, stores } = yield getComponents(blockletMeta);
+const createNftFactoryItx = async ({ blockletMeta, ocapClient, issuers, storeUrl, }) => {
+    const priceTokens = await getPriceTokens(blockletMeta, ocapClient);
+    const { components, stores } = await getComponents(blockletMeta);
     const factoryInput = getFactoryInput(priceTokens);
-    const { code: contract, shares } = yield getContract({
+    const { code: contract, shares } = await getContract({
         meta: blockletMeta,
         priceTokens,
         components,
     });
-    const { storeSignatures } = yield getStoreSignatures({
+    const { storeSignatures } = await getStoreSignatures({
         meta: blockletMeta,
         stores,
         factoryInput,
@@ -482,7 +475,7 @@ const createNftFactoryItx = ({ blockletMeta, ocapClient, issuers, storeUrl, }) =
         stores: storeSignatures.map((x) => ({ id: x.signer, url: x.storeUrl })),
         shares,
     };
-});
+};
 exports.createNftFactoryItx = createNftFactoryItx;
 /**
  * Used by Store before generating payment signature
@@ -495,13 +488,13 @@ exports.createNftFactoryItx = createNftFactoryItx;
  * }}
  * @returns {string} integrity
  */
-const verifyPaymentIntegrity = ({ integrity: expected, blockletMeta, ocapClient, storeId, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const actual = yield getPaymentIntegrity({ meta: blockletMeta, client: ocapClient, storeId });
+const verifyPaymentIntegrity = async ({ integrity: expected, blockletMeta, ocapClient, storeId, }) => {
+    const actual = await getPaymentIntegrity({ meta: blockletMeta, client: ocapClient, storeId });
     if (actual !== expected) {
         throw new Error('verify payment integrity failed');
     }
     return expected;
-});
+};
 exports.verifyPaymentIntegrity = verifyPaymentIntegrity;
 /**
  * Used by Store before generating downloadToken
@@ -515,10 +508,9 @@ exports.verifyPaymentIntegrity = verifyPaymentIntegrity;
  *   components: Array<{did: string, version: string}>
  * }}
  */
-const verifyNftFactory = ({ factoryState, signerWallet, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const data = JSON.parse((_a = factoryState === null || factoryState === void 0 ? void 0 : factoryState.data) === null || _a === void 0 ? void 0 : _a.value);
-    const stores = (data === null || data === void 0 ? void 0 : data.stores) || [];
+const verifyNftFactory = async ({ factoryState, signerWallet, }) => {
+    const data = JSON.parse(factoryState?.data?.value);
+    const stores = data?.stores || [];
     const store = stores.find((x) => x.signer === signerWallet.address);
     if (!store) {
         throw new Error(`Signer does not found in factory. factory: ${factoryState.address}, signer: ${signerWallet.address}`);
@@ -527,7 +519,7 @@ const verifyNftFactory = ({ factoryState, signerWallet, }) => __awaiter(void 0,
     const { components } = store;
     // Token 的字段和 factory 中的字段不一致
     const factoryInput = getFactoryInput(factoryState.input.tokens.map((x) => (0, pick_1.default)(x, ['address', 'value'])), { formatToken: false });
-    const integrity = yield getPaymentIntegrity({
+    const integrity = await getPaymentIntegrity({
         contract: c.hook,
         factoryInput,
         storeComponents: components,
@@ -537,7 +529,7 @@ const verifyNftFactory = ({ factoryState, signerWallet, }) => __awaiter(void 0,
         throw new Error(`verify nft factory failed: ${factoryState.address}`);
     }
     return { components };
-});
+};
 exports.verifyNftFactory = verifyNftFactory;
 /**
  * Check blocklet and all of components are free
@@ -545,11 +537,11 @@ exports.verifyNftFactory = verifyNftFactory;
  *
  * @param {TBlockletMeta} meta
  */
-const checkFreeBlocklet = (blockletMeta) => __awaiter(void 0, void 0, void 0, function* () {
+const checkFreeBlocklet = async (blockletMeta) => {
     if (!(0, util_2.isFreeBlocklet)(blockletMeta)) {
         return Promise.reject(new Error('blocklet is not free'));
     }
-    const { components } = yield getComponents(blockletMeta);
+    const { components } = await getComponents(blockletMeta);
     const shouldAllComponentFree = (arr) => {
         arr.forEach(({ meta, children }) => {
             if (!(0, util_2.isFreeBlocklet)(meta) || !(0, util_2.isFreeComponent)(meta)) {
@@ -561,7 +553,7 @@ const checkFreeBlocklet = (blockletMeta) => __awaiter(void 0, void 0, void 0, fu
     };
     shouldAllComponentFree(components);
     return true;
-});
+};
 exports.checkFreeBlocklet = checkFreeBlocklet;
 // eslint-disable-next-line @typescript-eslint/naming-convention
 exports._test = {

package/lib/schema.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -375,7 +364,10 @@ const navigationItemProps = {
     icon: Joi.string().min(1),
     visible: Joi.boolean(),
 };
-const navigationItemSchema = Joi.object(Object.assign(Object.assign({}, navigationItemProps), { items: Joi.array().items(Joi.object(Object.assign({}, navigationItemProps)).rename('child', 'component')) }))
+const navigationItemSchema = Joi.object({
+    ...navigationItemProps,
+    items: Joi.array().items(Joi.object({ ...navigationItemProps }).rename('child', 'component')),
+})
     .rename('child', 'component')
     .meta({
     className: 'TNavigationItem',
@@ -623,25 +615,30 @@ const blockletMetaSchema = Joi.object(blockletMetaProps).options({ stripUnknown:
     unknownType: 'any',
 });
 exports.blockletMetaSchema = blockletMetaSchema;
-const createBlockletSchema = (baseDir, _a = {}) => {
-    var { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true } = _a, schemaOptions = __rest(_a, ["ensureMain", "ensureFiles", "ensureDist", "ensureComponentStore"]);
+const createBlockletSchema = (baseDir, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, ...schemaOptions } = {}) => {
     if (!baseDir || !fs_1.default.existsSync(baseDir)) {
         // eslint-disable-next-line no-param-reassign
         ensureFiles = false;
     }
-    return Joi.object(Object.assign(Object.assign({}, blockletMetaProps), { main: Joi.when('group', {
+    return Joi.object({
+        ...blockletMetaProps,
+        main: Joi.when('group', {
             is: Joi.valid(BlockletGroup.gateway),
             then: Joi.forbidden(),
             otherwise: ensureMain ? Joi.file().exists({ baseDir }).required() : Joi.string().trim().required(),
-        }), logo: ensureFiles ? Joi.file().trim().exists({ baseDir }).optional() : Joi.string().trim().optional(), 
+        }),
+        logo: ensureFiles ? Joi.file().trim().exists({ baseDir }).optional() : Joi.string().trim().optional(),
         // Other contents to be included in the bundle
         files: Joi.array()
             .items(ensureFiles
             ? // eslint-disable-next-line
                 Joi.file().exists({ baseDir, canSkip: (dir, name) => [BLOCKLET_ENTRY_FILE, BLOCKLET_BUNDLE_FILE].includes(name) || (0, is_glob_1.default)(name) }) // prettier-ignore
             : Joi.string().trim())
-            .optional(), dist: ensureDist ? distSchema.required() : distSchema.optional(), components: componentsSchema(ensureComponentStore) }))
-        .options(Object.assign({ stripUnknown: true, noDefaults: false }, schemaOptions))
+            .optional(),
+        dist: ensureDist ? distSchema.required() : distSchema.optional(),
+        components: componentsSchema(ensureComponentStore),
+    })
+        .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })
         .rename('children', 'components')
         .custom((data, helper) => {
         const { did, name } = data;

package/lib/service.js

@@ -22,7 +22,13 @@ setService({
     default: {},
 });
 // backward compatible
-SERVICES[NODE_SERVICES.AUTH_SERVICE] = Object.assign(Object.assign({}, SERVICES[NODE_SERVICES.AUTH]), { meta: Object.assign(Object.assign({}, SERVICES[NODE_SERVICES.AUTH].meta), { name: NODE_SERVICES.AUTH_SERVICE }) });
+SERVICES[NODE_SERVICES.AUTH_SERVICE] = {
+    ...SERVICES[NODE_SERVICES.AUTH],
+    meta: {
+        ...SERVICES[NODE_SERVICES.AUTH].meta,
+        name: NODE_SERVICES.AUTH_SERVICE,
+    },
+};
 const getService = (serviceName) => {
     if (!serviceName) {
         throw new Error('service name should not be empty');

package/lib/util-meta.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,7 +13,7 @@ const constant_1 = __importDefault(require("@abtnode/constant"));
 const did_1 = __importDefault(require("./did"));
 const validate_1 = require("./validate");
 const { BLOCKLET_STORE_API_BLOCKLET_PREFIX } = constant_1.default;
-const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plain']) => __awaiter(void 0, void 0, void 0, function* () {
+const validateUrl = async (url, expectedHttpResTypes = ['application/json', 'text/plain']) => {
     const parsed = new URL(url);
     const { protocol } = parsed;
     // file
@@ -37,7 +28,7 @@ const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plai
     if (protocol.startsWith('http')) {
         let res;
         try {
-            res = yield (0, axios_1.default)({ url, method: 'HEAD', timeout: 1000 * 10 });
+            res = await (0, axios_1.default)({ url, method: 'HEAD', timeout: 1000 * 10 });
         }
         catch (err) {
             throw new Error(`Cannot get content-type from ${url}: ${err.message}`);
@@ -49,36 +40,36 @@ const validateUrl = (url, expectedHttpResTypes = ['application/json', 'text/plai
         return true;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-});
+};
 exports.validateUrl = validateUrl;
 const validateBlockletMeta = (meta, opts = {}) => {
     (0, validate_1.fixAndValidateService)(meta);
     return (0, validate_1.validateMeta)(meta, opts);
 };
-const getBlockletMetaByUrl = (url) => __awaiter(void 0, void 0, void 0, function* () {
+const getBlockletMetaByUrl = async (url) => {
     const { protocol } = new URL(url);
     if (protocol.startsWith('file')) {
         const decoded = decodeURIComponent((0, url_1.fileURLToPath)(url));
         if (!fs_1.default.existsSync(decoded)) {
             throw new Error(`File does not exist: ${decoded}`);
         }
-        const d = yield fs_1.default.promises.readFile(decoded);
+        const d = await fs_1.default.promises.readFile(decoded);
         // @ts-expect-error TS(2345) FIXME: Argument of type 'Buffer' is not assignable to par... Remove this comment to see the full error message
         const meta = JSON.parse(d);
         return meta;
     }
     if (protocol.startsWith('http')) {
-        const { data: meta } = yield (0, axios_1.default)({ url, method: 'GET', timeout: 1000 * 20 });
+        const { data: meta } = await (0, axios_1.default)({ url, method: 'GET', timeout: 1000 * 20 });
         if (Object.prototype.toString.call(meta) !== '[object Object]') {
             throw new Error('Url is not valid');
         }
         return meta;
     }
     throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);
-});
+};
 exports.getBlockletMetaByUrl = getBlockletMetaByUrl;
-const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, returnUrl = false, ensureTarball = true, logger, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const meta = yield getBlockletMetaByUrl(url);
+const getBlockletMetaFromUrl = async (url, { validateFn = validateBlockletMeta, returnUrl = false, ensureTarball = true, logger, } = {}) => {
+    const meta = await getBlockletMetaByUrl(url);
     delete meta.htmlAst;
     const newMeta = validateFn(meta, { ensureDist: true });
     if (ensureTarball) {
@@ -86,7 +77,7 @@ const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, return
             const { href } = new URL(newMeta.dist.tarball, url);
             const tarball = decodeURIComponent(href);
             try {
-                yield validateUrl(tarball, ['application/octet-stream', 'application/x-gzip']);
+                await validateUrl(tarball, ['application/octet-stream', 'application/x-gzip']);
             }
             catch (error) {
                 if (!error.message.startsWith('Cannot get content-type')) {
@@ -107,11 +98,11 @@ const getBlockletMetaFromUrl = (url, { validateFn = validateBlockletMeta, return
         return { meta: newMeta, url };
     }
     return newMeta;
-});
+};
 exports.getBlockletMetaFromUrl = getBlockletMetaFromUrl;
-const getBlockletMetaFromUrls = (urls, { validateFn, returnUrl = false, ensureTarball = true, logger, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getBlockletMetaFromUrls = async (urls, { validateFn, returnUrl = false, ensureTarball = true, logger, } = {}) => {
     try {
-        const res = yield (0, promise_any_1.default)(urls.map((url) => getBlockletMetaFromUrl(url, { validateFn, returnUrl, ensureTarball, logger })));
+        const res = await (0, promise_any_1.default)(urls.map((url) => getBlockletMetaFromUrl(url, { validateFn, returnUrl, ensureTarball, logger })));
         return res;
     }
     catch (err) {
@@ -124,7 +115,7 @@ const getBlockletMetaFromUrls = (urls, { validateFn, returnUrl = false, ensureTa
         }
         throw new Error(message);
     }
-});
+};
 exports.getBlockletMetaFromUrls = getBlockletMetaFromUrls;
 /**
  * @param {*} config defined in componentSchema in blocklet meta schema

package/lib/util.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -88,9 +79,9 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
     // serial
     if (!parallel) {
         // eslint-disable-next-line no-async-promise-executor
-        return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        return new Promise(async (resolve, reject) => {
             try {
-                const params = yield cb(blocklet, {
+                const params = await cb(blocklet, {
                     parent: _parent,
                     root,
                     level: _level,
@@ -100,7 +91,7 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
                 });
                 if (blocklet.children) {
                     for (const child of blocklet.children) {
-                        yield forEachBlocklet(child, cb, {
+                        await forEachBlocklet(child, cb, {
                             params,
                             _parent: blocklet,
                             _root: root,
@@ -114,7 +105,7 @@ const forEachBlocklet = (blocklet, cb, { parallel = false, concurrencyLimit = 5,
             catch (err) {
                 reject(err);
             }
-        }));
+        });
     }
     // parallel
     const limit = _limit || (0, p_limit_1.default)(concurrencyLimit);
@@ -439,7 +430,7 @@ const getChainInfo = (env) => Object.entries(CHAIN_INFO_CONFIG).reduce((info, x)
     return info;
 }, {});
 exports.getChainInfo = getChainInfo;
-const isExternalBlocklet = (blocklet) => !!(blocklet === null || blocklet === void 0 ? void 0 : blocklet.controller);
+const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;
 const getRolesFromAuthConfig = (config) => {
     if (!config.whoCanAccess.startsWith(WHO_CAN_ACCESS_PREFIX_ROLES)) {

package/lib/validate.js

@@ -21,10 +21,13 @@ const fixAndValidateService = (meta) => {
 };
 exports.fixAndValidateService = fixAndValidateService;
 const validateMeta = (meta, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, schemaOptions = {}, } = {}) => {
-    const schema = (0, schema_1.createBlockletSchema)(null, Object.assign({ ensureMain,
+    const schema = (0, schema_1.createBlockletSchema)(null, {
+        ensureMain,
         ensureFiles,
         ensureDist,
-        ensureComponentStore }, schemaOptions));
+        ensureComponentStore,
+        ...schemaOptions,
+    });
     const { value, error } = schema.validate(meta);
     if (error) {
         throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);

package/lib/verify-multi-sig.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,7 +38,7 @@ function verifyDelegationToken(signature) {
     return true;
 }
 const verifyMultiSig = (blockletMeta) => {
-    const { signatures: tmpSignatures } = blockletMeta, meta = __rest(blockletMeta, ["signatures"]);
+    const { signatures: tmpSignatures, ...meta } = blockletMeta;
     const signatures = (0, cloneDeep_1.default)(tmpSignatures);
     if (!Array.isArray(signatures)) {
         throw new Error('Invalid signatures, signatures should be an array');
@@ -74,7 +63,7 @@ const verifyMultiSig = (blockletMeta) => {
             : signature;
         delete signature.sig;
         debug('verify', { signer });
-        let toBeVerifiedMeta = Object.assign({}, meta);
+        let toBeVerifiedMeta = { ...meta };
         if (lastSignature && lastSignature.appended) {
             debug('appended fields', { signer, appended: lastSignature.appended });
             lastSignature.appended.forEach((field) => {
@@ -89,7 +78,7 @@ const verifyMultiSig = (blockletMeta) => {
         }
         const type = (0, did_1.toTypeInfo)(signer);
         const wallet = (0, wallet_1.fromPublicKey)(pk, type);
-        const verifyRes = wallet.verify((0, json_stable_stringify_1.default)(Object.assign(Object.assign({}, toBeVerifiedMeta), { signatures: [signature, ...signatures] })), sig);
+        const verifyRes = wallet.verify((0, json_stable_stringify_1.default)({ ...toBeVerifiedMeta, signatures: [signature, ...signatures] }), sig);
         if (verifyRes !== true) {
             debug('verify failed', { signer });
             return verifyRes;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66-beta-7f4224af",
+  "version": "1.8.66-beta-b56e3b54",
   "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.66-beta-7f4224af",
-    "@abtnode/constant": "1.8.66-beta-7f4224af",
-    "@abtnode/util": "1.8.66-beta-7f4224af",
-    "@arcblock/did": "1.18.47",
-    "@arcblock/did-ext": "1.18.47",
-    "@arcblock/did-util": "1.18.47",
-    "@arcblock/jwt": "1.18.47",
-    "@blocklet/constant": "1.8.66-beta-7f4224af",
-    "@ocap/asset": "1.18.47",
-    "@ocap/mcrypto": "1.18.47",
-    "@ocap/types": "1.18.47",
-    "@ocap/util": "1.18.47",
-    "@ocap/wallet": "1.18.47",
+    "@abtnode/client": "1.8.66-beta-b56e3b54",
+    "@abtnode/constant": "1.8.66-beta-b56e3b54",
+    "@abtnode/util": "1.8.66-beta-b56e3b54",
+    "@arcblock/did": "1.18.52",
+    "@arcblock/did-ext": "1.18.52",
+    "@arcblock/did-util": "1.18.52",
+    "@arcblock/jwt": "1.18.52",
+    "@blocklet/constant": "1.8.66-beta-b56e3b54",
+    "@ocap/asset": "1.18.52",
+    "@ocap/mcrypto": "1.18.52",
+    "@ocap/types": "1.18.52",
+    "@ocap/util": "1.18.52",
+    "@ocap/wallet": "1.18.52",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -80,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "72d418f63ecb76b1d5d62edbcc5f336cb62bf308"
+  "gitHead": "4d95b431526128c14cd04c0741cac423afce8f48"
 }