@blocklet/meta 1.8.3 → 1.8.6

package/lib/constants.js

@@ -172,7 +172,6 @@ module.exports = Object.freeze({
   BLOCKLET_ENTRY_FILE: 'blocklet.js',
   BLOCKLET_META_FILE: 'blocklet.yml',
   BLOCKLET_META_FILE_ALT: 'blocklet.yaml',
-  BLOCKLET_META_FILE_OLD: 'blocklet.json',
 
   BLOCKLET_DEFAULT_VERSION: '1.0.0',
 

package/lib/file.js

@@ -1,9 +1,9 @@
 const path = require('path');
 const yaml = require('js-yaml');
 const fs = require('fs-extra');
-const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT, BLOCKLET_META_FILE_OLD } = require('./constants');
+const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT } = require('./constants');
 
-const list = [BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT, BLOCKLET_META_FILE_OLD];
+const list = [BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT];
 
 const select = (dir, { throwOnError = true } = {}) => {
   const metaFile = path.join(dir, BLOCKLET_META_FILE);

package/lib/parse-navigation.js

@@ -7,13 +7,13 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
  * @param {*} prefix prefix of link
  * @param {*} _level 1: primary menu, >2: secondary menu
  */
-const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
+const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
   const result = [];
 
   (navigation || []).forEach((nav) => {
     if (!nav.child) {
       if (_level > 1 && nav.items?.length) {
-        const list = parseNavigation(nav.items, blocklet, prefix, _level + 1);
+        const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
         result.push(...list);
         return;
       }
@@ -37,7 +37,7 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
       }
 
       if (nav.items?.length) {
-        const list = parseNavigation(nav.items, blocklet, prefix, _level + 1);
+        const list = doParseNavigation(nav.items, blocklet, prefix, _level + 1);
         if (list.length) {
           item.items = list;
         }
@@ -82,7 +82,7 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
       result.push(item);
     } else {
       // child declares multiple menus
-      const list = parseNavigation(
+      const list = doParseNavigation(
         childNavigation,
         child,
         normalizePathPrefix(`${prefix}${child.mountPoint}`),
@@ -105,4 +105,42 @@ const parseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
   return result;
 };
 
+const markDuplicate = (navigation, urls = []) => {
+  navigation.forEach((item) => {
+    if (item.link && urls.includes(item.link)) {
+      item.duplicate = true;
+    }
+    if (item.link) {
+      urls.push(item.link);
+    }
+
+    if (item.items) {
+      markDuplicate(item.items, urls);
+    }
+  });
+
+  return navigation;
+};
+
+const filterDuplicate = (navigation) => {
+  const res = navigation.filter((x) => !x.duplicate);
+  res.forEach((item) => {
+    if (item.items) {
+      item.items = filterDuplicate(item.items);
+    }
+  });
+
+  return res;
+};
+
+const uniq = (navigation) => {
+  return filterDuplicate(markDuplicate(navigation));
+};
+
+const parseNavigation = (...args) => {
+  const res = doParseNavigation(...args);
+
+  return uniq(res);
+};
+
 module.exports = parseNavigation;

package/lib/parse.js

@@ -4,14 +4,14 @@ const yaml = require('js-yaml');
 const camelCase = require('lodash/camelCase');
 const debug = require('debug')('@blocklet/meta:parse');
 
-const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT, BLOCKLET_META_FILE_OLD } = require('./constants');
+const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT } = require('./constants');
 
 const toBlockletDid = require('./did');
 const { createBlockletSchema } = require('./schema');
 const { fixRequired, fixRepository, fixFiles, fixPerson, fixKeywords, fixTags, fixService } = require('./fix');
 
 /**
- * Get blocklet meta from blocklet.yml > blocklet.json > package.json
+ * Get blocklet meta from blocklet.yml
  * @param {string} dir blocklet directory
  * @param {object} options.extraRawAttrs extra attributes, will be used as base attributes
  * @param {boolean} options.ensureMain should we verify that main exists
@@ -21,30 +21,16 @@ const { fixRequired, fixRepository, fixFiles, fixPerson, fixKeywords, fixTags, f
  */
 const parse = (
   dir,
-  { ensureMain = false, ensureFiles = false, ensureDist = false, extraRawAttrs = {}, serviceMetas } = {}
+  {
+    ensureMain = false,
+    ensureFiles = false,
+    ensureDist = false,
+    extraRawAttrs = {},
+    serviceMetas,
+    schemaOptions = {},
+  } = {}
 ) => {
   let result = {};
-  const packageFile = path.join(dir, 'package.json');
-  if (fs.existsSync(packageFile)) {
-    try {
-      const packageJson = JSON.parse(fs.readFileSync(packageFile).toString());
-      delete packageJson.scripts;
-      result = Object.assign(result, packageJson, packageJson.blocklet || {});
-      debug('parse package.json', result);
-    } catch (err) {
-      console.error('parse_blocklet_meta from package.json failed', err);
-    }
-  }
-
-  const blockletMetaFileOld = path.join(dir, BLOCKLET_META_FILE_OLD);
-  if (fs.existsSync(blockletMetaFileOld)) {
-    try {
-      result = Object.assign(result, JSON.parse(fs.readFileSync(blockletMetaFileOld).toString()));
-      debug(`parse ${BLOCKLET_META_FILE_OLD}`, result);
-    } catch (err) {
-      console.error(`parse_blocklet_meta from ${BLOCKLET_META_FILE_OLD} failed`, err);
-    }
-  }
 
   const blockletMetaFile = path.join(dir, BLOCKLET_META_FILE);
   const blockletMetaFileAlt = path.join(dir, BLOCKLET_META_FILE_ALT);
@@ -90,7 +76,7 @@ const parse = (
   }, {});
 
   // Validate and cleanup
-  const schema = createBlockletSchema(dir, { ensureMain, ensureFiles, ensureDist });
+  const schema = createBlockletSchema(dir, { ensureMain, ensureFiles, ensureDist, ...schemaOptions });
   const { value, error } = schema.validate(result);
   if (error) {
     throw new Error(`Invalid blocklet meta: ${error.details.map((x) => x.message).join(', ')}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.3",
+  "version": "1.8.6",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,16 +18,16 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.3",
-    "@abtnode/util": "1.8.3",
-    "@arcblock/did": "1.17.5",
-    "@arcblock/did-ext": "1.17.5",
-    "@arcblock/did-util": "1.17.5",
-    "@arcblock/jwt": "1.17.5",
-    "@ocap/asset": "1.17.5",
-    "@ocap/mcrypto": "1.17.5",
-    "@ocap/util": "1.17.5",
-    "@ocap/wallet": "1.17.5",
+    "@abtnode/constant": "1.8.6",
+    "@abtnode/util": "1.8.6",
+    "@arcblock/did": "1.17.6",
+    "@arcblock/did-ext": "1.17.6",
+    "@arcblock/did-util": "1.17.6",
+    "@arcblock/jwt": "1.17.6",
+    "@ocap/asset": "1.17.6",
+    "@ocap/mcrypto": "1.17.6",
+    "@ocap/util": "1.17.6",
+    "@ocap/wallet": "1.17.6",
     "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "c734aca7bf1fc03378c3b082d0622b6a540a8bd3"
+  "gitHead": "070dad4ce5e12c8961399788f9d206bf7d9d263f"
 }