@blocklet/meta 1.16.28 → 1.16.29-beta-e04c6f40

package/lib/parse-navigation-from-blocklet.d.ts

@@ -85,9 +85,11 @@ interface Blocklet {
 interface ParseNavigationOption {
     beforeProcess?: (data: any) => any;
 }
+declare const sortRootNavigation: (navigation: NavigationItem[]) => NavigationItem[];
+declare const cleanOldNavigationHistory: (navigation: NavigationItem[]) => NavigationItem[];
 declare function parseNavigation(blocklet?: Blocklet, options?: ParseNavigationOption): {
     navigationList: any[];
     components: any[];
     builtinList: any[];
 };
-export { parseNavigation, deepWalk, isMatchSection, nestNavigationList, filterNavigation, cleanOrphanNavigation, joinLink, checkLink, flattenNavigation, splitNavigationBySection, };
+export { parseNavigation, deepWalk, isMatchSection, nestNavigationList, filterNavigation, cleanOrphanNavigation, joinLink, checkLink, flattenNavigation, splitNavigationBySection, cleanOldNavigationHistory, sortRootNavigation, };

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitNavigationBySection = exports.flattenNavigation = exports.checkLink = exports.joinLink = exports.cleanOrphanNavigation = exports.filterNavigation = exports.nestNavigationList = exports.isMatchSection = exports.deepWalk = exports.parseNavigation = void 0;
+exports.sortRootNavigation = exports.cleanOldNavigationHistory = exports.splitNavigationBySection = exports.flattenNavigation = exports.checkLink = exports.joinLink = exports.cleanOrphanNavigation = exports.filterNavigation = exports.nestNavigationList = exports.isMatchSection = exports.deepWalk = exports.parseNavigation = void 0;
 const unionWith_1 = __importDefault(require("lodash/unionWith"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
@@ -488,10 +488,25 @@ function cleanOrphanNavigation(list) {
     });
 }
 exports.cleanOrphanNavigation = cleanOrphanNavigation;
+const sortRootNavigation = (navigation) => {
+    const [root, other] = (0, lodash_1.partition)(navigation, (x) => x.id === '/team');
+    return [...root, ...other];
+};
+exports.sortRootNavigation = sortRootNavigation;
+// FIXME: Pillar, 这个函数是一个过渡方案, 用来清理 navigation 中的历史数据, 之后可以删除
+const cleanOldNavigationHistory = (navigation) => {
+    const [, other] = (0, lodash_1.partition)(navigation, (x) => {
+        const title = typeof x.title === 'string' ? x.title : x.title?.en;
+        // 这里找不到多余的可以用来判断的数据, 只好用 title 来判断
+        return (x.id === '/team' && title === 'Access') || (x.id === '/dashboard' && title === 'Blocklet');
+    });
+    return other;
+};
+exports.cleanOldNavigationHistory = cleanOldNavigationHistory;
 function parseNavigation(blocklet = {}, options = {}) {
     const { beforeProcess = (v) => v } = options;
     const { navigationList: builtinNavigation, components } = parseBlockletNavigationList(blocklet);
-    const customNavigationList = blocklet?.settings?.navigations || [];
+    const customNavigationList = cleanOldNavigationHistory(blocklet?.settings?.navigations || []);
     const compactedNavigation = compactNavigation(beforeProcess(builtinNavigation));
     const patchedNavigation = patchBuiltinNavigation(compactedNavigation);
     const splitNavigation = splitNavigationBySection(patchedNavigation);

package/lib/schema.js

@@ -302,7 +302,7 @@ const engineSchema = Joi.object({
 exports.engineSchema = engineSchema;
 const personSchema = Joi.object({
     name: Joi.string().min(1).required(),
-    email: Joi.string().email().optional(),
+    email: Joi.string().email({ tlds: false }).optional(),
     url: Joi.string().uri().optional(),
 }).meta({
     className: 'TPerson',
@@ -482,7 +482,9 @@ const blockletMetaProps = {
     documentation: Joi.string().uri().optional().allow('').default(''),
     homepage: Joi.string().uri().optional().allow('').default(''),
     license: Joi.string().optional().allow('').default(''),
-    support: Joi.alternatives().try(Joi.string().uri(), Joi.string().email()).optional(),
+    support: Joi.alternatives()
+        .try(Joi.string().uri(), Joi.string().email({ tlds: false }))
+        .optional(),
     // which asset factory to mint blocklet purchase nft
     // This is usually created and maintained by `blocklet publish` command
     nftFactory: Joi.DID().optional().allow('').default(''),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.28",
+  "version": "1.16.29-beta-e04c6f40",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,12 +25,12 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.28",
+    "@abtnode/constant": "1.16.29-beta-e04c6f40",
     "@arcblock/did": "1.18.123",
     "@arcblock/did-ext": "1.18.123",
     "@arcblock/did-util": "1.18.123",
     "@arcblock/jwt": "1.18.123",
-    "@blocklet/constant": "1.16.28",
+    "@blocklet/constant": "1.16.29-beta-e04c6f40",
     "@ocap/asset": "1.18.123",
     "@ocap/mcrypto": "1.18.123",
     "@ocap/types": "1.18.123",
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "54db076a7e520bbc260f8cbf0af31dd50b86aef1"
+  "gitHead": "f3e8f2ce931215b95ada33e87aee997d8ae52a69"
 }