@blocklet/meta 1.7.9 → 1.7.10

package/lib/parse-navigation.js

@@ -17,7 +17,7 @@ const parseNavigation = (navigation, blocklet, prefix = '/', level = 1) => {
       };
 
       if (nav.link) {
-        item.link = normalizePathPrefix(`${prefix}${nav.link || '/'}`);
+        item.link = nav.link.startsWith('/') ? normalizePathPrefix(`${prefix}${nav.link || '/'}`) : nav.link;
       }
 
       if (level === 1) {

package/lib/service.js

@@ -0,0 +1,102 @@
+const fs = require('fs-extra');
+const cloneDeep = require('lodash/cloneDeep');
+const Ajv = require('ajv').default;
+
+const { NODE_SERVICES } = require('@abtnode/constant');
+
+const ajv = new Ajv({
+  useDefaults: true,
+  removeAdditional: 'all',
+});
+
+const SERVICES = {};
+
+const setService = (meta) => {
+  const validate = ajv.compile(meta.schema.JSONSchema);
+
+  // parse empty custom config to get default config
+  const defaultConfig = {};
+  validate(defaultConfig);
+
+  SERVICES[meta.name] = {
+    meta,
+    validate,
+    defaultConfig,
+  };
+};
+
+setService(fs.readJSONSync(require.resolve('@abtnode/blocklet-services/configs/auth.json')));
+
+// backward compatible
+SERVICES[NODE_SERVICES.AUTH_SERVICE] = {
+  ...SERVICES[NODE_SERVICES.AUTH],
+  meta: {
+    ...SERVICES[NODE_SERVICES.AUTH].meta,
+    name: NODE_SERVICES.AUTH_SERVICE,
+  },
+};
+
+const getServiceMetas = ({ stringifySchema = false } = {}) => {
+  const list = Object.values(SERVICES).map(({ meta }) => {
+    const data = cloneDeep(meta);
+    if (stringifySchema) {
+      data.schema = JSON.stringify(meta.schema);
+    }
+    return data;
+  });
+
+  return list;
+};
+
+const getService = (serviceName) => {
+  if (!serviceName) {
+    throw new Error('service name should not be empty');
+  }
+
+  const service = SERVICES[serviceName];
+  if (!service) {
+    throw new Error(`service ${serviceName} does not exist`);
+  }
+
+  return service;
+};
+
+const getServiceConfig = (serviceName, customConfig, { validate } = {}) => {
+  const service = getService(serviceName);
+
+  const data = cloneDeep(customConfig || {});
+  // this method may have side effect thar will fill default value to customConfig
+  const valid = service.validate(data || {});
+
+  if (validate && !valid) {
+    const message = service.validate.errors.map((x) => `${x.instancePath} ${x.message}`).join(', ');
+    throw new Error(`Invalid blocklet service config: ${message}`);
+  }
+
+  return data;
+};
+
+const getDefaultServiceConfig = (serviceName) => {
+  const { defaultConfig } = getService(serviceName);
+
+  return defaultConfig;
+};
+
+const findService = (services, name) => {
+  const names = [name];
+
+  // backward compatible
+  if (name === NODE_SERVICES.AUTH) {
+    names.push(NODE_SERVICES.AUTH_SERVICE);
+  }
+
+  return (services || []).find((x) => names.includes(x.name));
+};
+
+module.exports = {
+  getServiceMetas,
+  getServiceConfig,
+  getDefaultServiceConfig,
+  findService,
+  setService,
+};

package/lib/validate.js

@@ -1,14 +1,7 @@
-const Ajv = require('ajv').default;
-const cloneDeep = require('lodash/cloneDeep');
-
 const { createBlockletSchema } = require('./schema');
+const { getServiceConfig } = require('./service');
 
-const fixAndValidateService = (meta, serviceMetas) => {
-  const ajv = new Ajv({
-    useDefaults: true,
-    removeAdditional: 'all',
-  });
-
+const fixAndValidateService = (meta) => {
   if (!meta.interfaces) {
     return meta;
   }
@@ -19,26 +12,7 @@ const fixAndValidateService = (meta, serviceMetas) => {
   meta.interfaces.forEach((d) => {
     if (d.services && d.services.length) {
       d.services.forEach((s) => {
-        const config = cloneDeep(s.config) || {};
-
-        // validate service.config if serviceMetaList is exist
-        if (serviceMetas) {
-          const serviceMeta = serviceMetas.find((x) => x.name === s.name);
-          if (!serviceMeta) {
-            throw new Error(`Invalid blocklet service: ${s.name} does not exist`);
-          }
-
-          const validate = ajv.compile(serviceMeta.schema.JSONSchema);
-          // this method may have side effect thar will fill default value to config
-          const valid = validate(config);
-
-          if (!valid) {
-            const message = validate.errors.map((x) => `${x.dataPath} ${x.message}`).join(', ');
-            throw new Error(`Invalid blocklet service config: ${message}`);
-          }
-        }
-
-        s.config = config;
+        s.config = getServiceConfig(s.name, s.config, { validate: true });
       });
     }
   });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.9",
+  "version": "1.7.10",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,18 +18,18 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.9",
-    "@abtnode/util": "1.7.9",
-    "@arcblock/did": "^1.16.4",
-    "@arcblock/did-ext": "^1.16.4",
-    "@arcblock/did-util": "^1.16.4",
-    "@arcblock/jwt": "^1.16.4",
-    "@arcblock/nft": "^1.16.4",
-    "@ocap/asset": "^1.16.4",
-    "@ocap/mcrypto": "^1.16.4",
-    "@ocap/util": "^1.16.4",
-    "@ocap/wallet": "^1.16.4",
-    "ajv": "^7.0.3",
+    "@abtnode/constant": "1.7.10",
+    "@abtnode/util": "1.7.10",
+    "@arcblock/did": "^1.16.5",
+    "@arcblock/did-ext": "^1.16.5",
+    "@arcblock/did-util": "^1.16.5",
+    "@arcblock/jwt": "^1.16.5",
+    "@arcblock/nft": "^1.16.5",
+    "@ocap/asset": "^1.16.5",
+    "@ocap/mcrypto": "^1.16.5",
+    "@ocap/util": "^1.16.5",
+    "@ocap/wallet": "^1.16.5",
+    "ajv": "^8.11.0",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.1",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
+  "gitHead": "8eab10fd39b6183a2fa4d2706f52e8b2ecaa059a"
 }