@blocklet/meta 1.16.0-beta-1f8bf936 → 1.16.0-beta-58020de5

package/lib/parse.js

@@ -93,7 +93,7 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
     });
     const { value, error } = schema.validate(result);
     if (error) {
-        throw new Error(`Invalid blocklet.yml: ${error.details
+        throw new Error(`Invalid blocklet.yml:\n${error.details
             .map((x) => {
             try {
                 // 根据 navigation 校验规则定制特殊的错误消息显示
@@ -106,7 +106,7 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
             }
             return x.message;
         })
-            .join(', ')}`);
+            .join('\n')}`);
     }
     return value;
 };

package/lib/schema.js

@@ -59,7 +59,8 @@ const checkLinkHelper = (value, helper) => {
 A valid navigation link should be a relative url which start with '/' or a absolute url, such as:
 - /en/home
 - /zh/home
-- https://www.arcblock.io`);
+- https://www.arcblock.io
+`);
 };
 const checkId = (value, helper) => {
     if (!value || (0, is_var_name_1.default)(value)) {
@@ -73,7 +74,8 @@ A valid navigation id is should follow the rules of javascript variables, such a
 - fooBar
 - foo123
 
-see detail in https://www.npmjs.com/package/is-var-name`);
+see detail in https://www.npmjs.com/package/is-var-name
+`);
 };
 const titleSchema = Joi.string()
     .trim()

package/lib/util.d.ts

@@ -105,7 +105,12 @@ declare const getConnectAppUrl: ({ request, baseUrl }: {
     baseUrl: string;
 }) => string;
 declare const replaceSlotToIp: (url?: string, ip?: string) => string;
-declare const getChainInfo: (env: Record<string, string>) => Record<string, string>;
+type ChainInfo = {
+    type: 'arcblock' | 'ethereum' | 'solona';
+    id: string;
+    host: string;
+};
+declare const getChainInfo: (env: Record<string, string>) => ChainInfo;
 declare const isExternalBlocklet: (blocklet?: BlockletState) => boolean;
 declare const getRolesFromAuthConfig: (config: {
     whoCanAccess: string;
@@ -191,7 +196,7 @@ declare const _default: {
         request: Partial<Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
         baseUrl: string;
     }) => string;
-    getChainInfo: (env: Record<string, string>) => Record<string, string>;
+    getChainInfo: (env: Record<string, string>) => ChainInfo;
     isExternalBlocklet: (blocklet?: BlockletState) => boolean;
     isPreferenceKey: (x: TConfig) => Boolean;
     getRolesFromAuthConfig: (config: {

package/lib/util.js

@@ -448,13 +448,18 @@ const getConnectAppUrl = ({ request, baseUrl }) => {
 exports.getConnectAppUrl = getConnectAppUrl;
 const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (ip || '').replace(/\./g, '-'));
 exports.replaceSlotToIp = replaceSlotToIp;
-// transform process.env.CHAIN_x => { x: v }
-const getChainInfo = (env) => Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
-    // @ts-expect-error TS(2488) FIXME: Type 'unknown' must have a '[Symbol.iterator]()' m... Remove this comment to see the full error message
-    const [envName, [key, value]] = x;
-    info[key] = (0, get_1.default)(env, envName) || value;
-    return info;
-}, {});
+const getChainInfo = (env) => {
+    // @ts-ignore
+    const result = Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
+        const [envName, [key, value]] = x;
+        info[key] = (0, get_1.default)(env, envName) || value;
+        return info;
+    }, {});
+    if (result.type === 'ethereum' && result.id === 'none') {
+        result.id = '1';
+    }
+    return result;
+};
 exports.getChainInfo = getChainInfo;
 const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-1f8bf936",
+  "version": "1.16.0-beta-58020de5",
   "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.16.0-beta-1f8bf936",
-    "@abtnode/constant": "1.16.0-beta-1f8bf936",
-    "@abtnode/util": "1.16.0-beta-1f8bf936",
-    "@arcblock/did": "1.18.63",
-    "@arcblock/did-ext": "1.18.63",
-    "@arcblock/did-util": "1.18.63",
-    "@arcblock/jwt": "1.18.63",
-    "@blocklet/constant": "1.16.0-beta-1f8bf936",
-    "@ocap/asset": "1.18.63",
-    "@ocap/mcrypto": "1.18.63",
-    "@ocap/types": "1.18.63",
-    "@ocap/util": "1.18.63",
-    "@ocap/wallet": "1.18.63",
+    "@abtnode/client": "1.16.0-beta-58020de5",
+    "@abtnode/constant": "1.16.0-beta-58020de5",
+    "@abtnode/util": "1.16.0-beta-58020de5",
+    "@arcblock/did": "1.18.64",
+    "@arcblock/did-ext": "1.18.64",
+    "@arcblock/did-util": "1.18.64",
+    "@arcblock/jwt": "1.18.64",
+    "@blocklet/constant": "1.16.0-beta-58020de5",
+    "@ocap/asset": "1.18.64",
+    "@ocap/mcrypto": "1.18.64",
+    "@ocap/types": "1.18.64",
+    "@ocap/util": "1.18.64",
+    "@ocap/wallet": "1.18.64",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "d832948cdc83e67ea42a2aefba3649fa73723b65"
+  "gitHead": "9d3f47f9827acf13e9efea38cd605d3b36f9f523"
 }