@blocklet/meta 1.8.68 → 1.8.69-beta-e0666d0d

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);
@@ -61,9 +60,10 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
     (0, fix_1.fixFiles)(result);
     (0, fix_1.fixKeywords)(result);
     (0, fix_1.fixTags)(result);
+    (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) {
@@ -81,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
@@ -95,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.d.ts

@@ -3,6 +3,7 @@ declare const titleSchema: JOI.StringSchema<string>;
 declare const descriptionSchema: JOI.StringSchema<string>;
 declare const logoSchema: JOI.StringSchema<string>;
 declare const mountPointSchema: JOI.StringSchema<string>;
+declare const updateMountPointSchema: JOI.StringSchema<string>;
 declare const blockletNameSchema: JOI.StringSchema<string>;
 declare const environmentNameSchema: JOI.StringSchema<string>;
 declare const environmentSchema: JOI.ObjectSchema<any>;
@@ -28,7 +29,7 @@ declare const createBlockletSchema: (baseDir: string, { ensureMain, ensureFiles,
     ensureDist?: boolean;
     ensureComponentStore?: boolean;
 }) => JOI.ObjectSchema;
-export { blockletMetaSchema, blockletNameSchema, componentSchema, createBlockletSchema, descriptionSchema, distSchema, endpointSchema, engineSchema, environmentSchema, environmentNameSchema, interfaceSchema, logoSchema, mountPointSchema, navigationItemSchema, navigationSchema, personSchema, scriptsSchema, serviceSchema, signatureSchema, themeSchema, titleSchema, statsSchema, cacheableSchema, authConfigSchema, };
+export { blockletMetaSchema, blockletNameSchema, componentSchema, createBlockletSchema, descriptionSchema, distSchema, endpointSchema, engineSchema, environmentSchema, environmentNameSchema, interfaceSchema, logoSchema, mountPointSchema, updateMountPointSchema, navigationItemSchema, navigationSchema, personSchema, scriptsSchema, serviceSchema, signatureSchema, themeSchema, titleSchema, statsSchema, cacheableSchema, authConfigSchema, };
 declare const _default: {
     blockletNameSchema: JOI.StringSchema<string>;
     componentSchema: JOI.ObjectSchema<any>;
@@ -52,6 +53,7 @@ declare const _default: {
     navigationSchema: JOI.ArraySchema<any[]>;
     themeSchema: JOI.ObjectSchema<any>;
     mountPointSchema: JOI.StringSchema<string>;
+    updateMountPointSchema: JOI.StringSchema<string>;
     authConfigSchema: JOI.ObjectSchema<any>;
 };
 export default _default;

package/lib/schema.js

@@ -1,39 +1,50 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authConfigSchema = exports.cacheableSchema = exports.statsSchema = exports.titleSchema = exports.themeSchema = exports.signatureSchema = exports.serviceSchema = exports.scriptsSchema = exports.personSchema = exports.navigationSchema = exports.navigationItemSchema = exports.mountPointSchema = exports.logoSchema = exports.interfaceSchema = exports.environmentNameSchema = exports.environmentSchema = exports.engineSchema = exports.endpointSchema = exports.distSchema = exports.descriptionSchema = exports.createBlockletSchema = exports.componentSchema = exports.blockletNameSchema = exports.blockletMetaSchema = void 0;
+exports.authConfigSchema = exports.cacheableSchema = exports.statsSchema = exports.titleSchema = exports.themeSchema = exports.signatureSchema = exports.serviceSchema = exports.scriptsSchema = exports.personSchema = exports.navigationSchema = exports.navigationItemSchema = exports.updateMountPointSchema = exports.mountPointSchema = exports.logoSchema = exports.interfaceSchema = exports.environmentNameSchema = exports.environmentSchema = exports.engineSchema = exports.endpointSchema = exports.distSchema = exports.descriptionSchema = exports.createBlockletSchema = exports.componentSchema = exports.blockletNameSchema = exports.blockletMetaSchema = void 0;
 const fs_1 = __importDefault(require("fs"));
 const joi_1 = __importDefault(require("joi"));
-// eslint-disable-next-line import/no-named-default
 const cjk_length_1 = __importDefault(require("cjk-length"));
 const is_glob_1 = __importDefault(require("is-glob"));
 const joi_extension_semver_1 = require("joi-extension-semver");
 const is_var_name_1 = __importDefault(require("is-var-name"));
 const constant_1 = require("@abtnode/constant");
-const did_1 = __importDefault(require("./did"));
+const did_1 = require("@arcblock/did");
+const did_2 = __importDefault(require("./did"));
 const extension_1 = require("./extension");
 const name_1 = require("./name");
 const constants_1 = __importDefault(require("./constants"));
 const parse_navigation_from_blocklet_1 = require("./parse-navigation-from-blocklet");
-const url_friendly_1 = __importDefault(require("./url-friendly"));
+const url_friendly_1 = __importStar(require("./url-friendly"));
 const cjkLength = cjk_length_1.default.default;
 const { BLOCKLET_GROUPS, BLOCKLET_PLATFORMS, BLOCKLET_ARCHITECTURES, BLOCKLET_INTERFACE_TYPES, BLOCKLET_INTERFACE_PROTOCOLS, BLOCKLET_ENTRY_FILE, BLOCKLET_BUNDLE_FILE, BLOCKLET_DEFAULT_PORT_NAME, BLOCKLET_DYNAMIC_PATH_PREFIX, BlockletGroup, BLOCKLET_LATEST_REQUIREMENT_SERVER, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_INTERFACE_TYPE_WELLKNOWN, BLOCKLET_APP_SPACE_ENDPOINTS, BLOCKLET_CONFIGURABLE_KEY, } = constants_1.default;
 const WELLKNOWN_PATH_PREFIX = '/.well-known';
 const MAX_TITLE_LENGTH = 24;
-const MAX_NAME_LENGTH = 32;
 const Joi = joi_1.default.extend(joi_extension_semver_1.semver)
     .extend(joi_extension_semver_1.semverRange)
     .extend(extension_1.fileExtension)
@@ -89,18 +100,26 @@ const logoSchema = Joi.string()
 })
     .meta({ className: 'TLogo' });
 exports.logoSchema = logoSchema;
-const mountPointSchema = Joi.string()
-    .trim()
-    .min(1)
+const baseMountPointSchema = Joi.string().trim().min(1);
+const mountPointSchema = baseMountPointSchema
     .meta({ className: 'TMountPoint' })
-    .custom((value) => (0, url_friendly_1.default)(value));
+    .custom((value, helper) => {
+    if ((0, url_friendly_1.isValidUrl)(value)) {
+        return value;
+    }
+    // @ts-expect-error
+    return helper.message('mountPoint cannot contain such characters space $*_+~.()\'"!:@\\');
+});
 exports.mountPointSchema = mountPointSchema;
+const updateMountPointSchema = baseMountPointSchema
+    .meta({ className: 'TUpdateMountPoint' })
+    .custom((value) => (0, url_friendly_1.default)(value));
+exports.updateMountPointSchema = updateMountPointSchema;
 const blockletNameSchema = Joi.string()
     .custom((value) => {
     (0, name_1.validateName)(value);
     return value;
 })
-    .max(MAX_NAME_LENGTH)
     .meta({ className: 'TBlockletName' });
 exports.blockletNameSchema = blockletNameSchema;
 const ENV_NAME_WHITE_LIST = [BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE];
@@ -382,7 +401,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',
@@ -430,7 +452,7 @@ exports.authConfigSchema = authConfigSchema;
 const blockletMetaProps = {
     did: Joi.DID().trim().required(),
     version: Joi.semver().valid().required(),
-    name: blockletNameSchema.required(),
+    name: blockletNameSchema.optional(),
     description: descriptionSchema.required(),
     group: Joi.string()
         .valid(...BLOCKLET_GROUPS)
@@ -630,32 +652,56 @@ 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;
-        const expectDid = (0, did_1.default)(name);
-        if (expectDid !== did) {
-            // @ts-expect-error
-            return helper.message(`the did of name "${name}" should be "${expectDid}"`);
+        let cacheError;
+        if ((0, did_1.isValid)(did)) {
+            try {
+                (0, name_1.validateNewDid)(did);
+                return data;
+            }
+            catch (e) {
+                cacheError = e;
+            }
+        }
+        /* ------------- 兼容旧的逻辑，旧逻辑使用 name 生成一个 did ------------- */
+        // 此时 name 必须存在
+        if (name) {
+            const expectDid = (0, did_2.default)(name);
+            if (expectDid !== did) {
+                // @ts-ignore
+                return helper.message(`The did of name "${name}" should be "${expectDid}"`);
+            }
+            return data;
+            /* ------------------------------------------------------ */
+        }
+        if (cacheError) {
+            return helper.message(cacheError.message);
         }
         return data;
     });
@@ -679,5 +725,6 @@ exports.default = {
     navigationSchema,
     themeSchema,
     mountPointSchema,
+    updateMountPointSchema,
     authConfigSchema,
 };

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/types/schema.d.ts

@@ -66,7 +66,7 @@ export interface TBlockletMeta {
     logoUrl?: string;
     main: string;
     maintainers?: TPerson[];
-    name: TBlockletName;
+    name?: TBlockletName;
     navigation?: TNavigation;
     nftFactory?: string;
     path?: string;
@@ -287,3 +287,4 @@ export interface TTheme {
     };
 }
 export type TTitle = string;
+export type TUpdateMountPoint = string;