@blocklet/meta 1.8.36 → 1.8.37

package/lib/schema.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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.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"));
+const constant_1 = require("@abtnode/constant");
 // eslint-disable-next-line import/no-named-default
 const cjk_length_1 = __importDefault(require("cjk-length"));
 const is_glob_1 = __importDefault(require("is-glob"));
@@ -71,6 +72,10 @@ const environmentSchema = Joi.object({
     shared: Joi.boolean().default((parent) => !parent.secure),
 })
     .custom((x, helper) => {
+    if (x.name.startsWith(constant_1.BLOCKLET_PREFERENCE_PREFIX)) {
+        // @ts-expect-error
+        return helper.message(`Env name can not start with ${constant_1.BLOCKLET_PREFERENCE_PREFIX}`);
+    }
     if (x.secure && x.default) {
         // @ts-expect-error
         return helper.message(`Cannot declare default value for secure env ${x.name}`);

package/lib/util.d.ts

@@ -1,4 +1,4 @@
-import { BlockletState } from '@abtnode/client';
+import { BlockletState, ComponentState } from '@abtnode/client';
 import { Request } from 'express';
 import { TBlockletMeta, TEnvironment } from './types';
 declare const getComponentId: (component?: {
@@ -36,7 +36,7 @@ declare const getComponentBundleId: (component: {
  * @a/b/@c/d/@e/f => @a/b/@c/d
  */
 declare const getParentComponentName: (name?: string) => string;
-declare const forEachBlocklet: (blocklet: BlockletState, cb: Function, { parallel, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
+declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
     parallel?: boolean;
     sync?: boolean;
     params?: any;
@@ -49,7 +49,7 @@ declare const forEachBlocklet: (blocklet: BlockletState, cb: Function, { paralle
 declare const forEachBlockletSync: (blocklet: any, cb: Function) => Promise<unknown>;
 declare const forEachChild: (blocklet: any, cb: Function, params?: any) => Promise<any>;
 declare const forEachChildSync: (blocklet: BlockletState, cb: Function) => Promise<any>;
-declare const findComponentById: (blocklet: BlockletState, componentId: string, { _ancestors, returnAncestors, }?: {
+declare const findComponentById: (blocklet: BlockletState | ComponentState, componentId: string, { _ancestors, returnAncestors, }?: {
     _ancestors?: any[];
     returnAncestors?: boolean;
 }) => any;
@@ -117,7 +117,7 @@ declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
     isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
-    forEachBlocklet: (blocklet: BlockletState, cb: Function, { parallel, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
+    forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Function, { parallel, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, }?: {
         parallel?: boolean;
         sync?: boolean;
         params?: any;
@@ -170,7 +170,7 @@ declare const _default: {
             version: string;
         };
     }) => string;
-    findComponentById: (blocklet: BlockletState, componentId: string, { _ancestors, returnAncestors, }?: {
+    findComponentById: (blocklet: BlockletState | ComponentState, componentId: string, { _ancestors, returnAncestors, }?: {
         _ancestors?: any[];
         returnAncestors?: boolean;
     }) => any;

package/lib/util.js

@@ -18,6 +18,7 @@ const get_1 = __importDefault(require("lodash/get"));
 const slugify_1 = __importDefault(require("slugify"));
 const url_join_1 = __importDefault(require("url-join"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
+const constant_2 = require("@blocklet/constant");
 const constants_1 = __importDefault(require("./constants"));
 const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE, WHO_CAN_ACCESS } = constant_1.default;
 const { BlockletGroup, fromBlockletStatus, fromBlockletSource, BLOCKLET_INTERFACE_TYPE_WEB, BLOCKLET_CONFIGURABLE_KEY, CHAIN_INFO_CONFIG, } = constants_1.default;
@@ -216,7 +217,7 @@ const getAppMissingConfigs = (blocklet = {}) => {
             }
         });
     });
-    return missingConfigs;
+    return missingConfigs.filter((x) => x.key.startsWith(constant_2.BLOCKLET_PREFERENCE_PREFIX) === false);
 };
 exports.getAppMissingConfigs = getAppMissingConfigs;
 const getComponentMissingConfigs = (component = {}, ancestors = []) => {
@@ -258,11 +259,14 @@ const wipeSensitiveData = (blocklet) => {
         return blocklet;
     }
     forEachBlocklet(blocklet, (d) => {
-        (d.configs || []).forEach((x) => {
-            if (x.secure) {
-                x.value = x.value ? '__encrypted__' : '';
-            }
-        });
+        if (d.configs) {
+            d.configs = d.configs.filter((x) => x.key.startsWith(constant_2.BLOCKLET_PREFERENCE_PREFIX) === false);
+            d.configs.forEach((x) => {
+                if (x.secure) {
+                    x.value = x.value ? '__encrypted__' : '';
+                }
+            });
+        }
         (d.environments || []).forEach((x) => {
             if (['BLOCKLET_APP_SK'].includes(x.key)) {
                 x.value = '__encrypted__';

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.36",
+  "version": "1.8.37",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,14 +24,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.36",
-    "@abtnode/constant": "1.8.36",
-    "@abtnode/util": "1.8.36",
+    "@abtnode/client": "1.8.37",
+    "@abtnode/constant": "1.8.37",
+    "@abtnode/util": "1.8.37",
     "@arcblock/did": "1.18.15",
     "@arcblock/did-ext": "1.18.15",
     "@arcblock/did-util": "1.18.15",
     "@arcblock/jwt": "1.18.15",
-    "@blocklet/constant": "1.8.36",
+    "@blocklet/constant": "1.8.37",
     "@ocap/asset": "1.18.15",
     "@ocap/mcrypto": "1.18.15",
     "@ocap/types": "1.18.15",
@@ -56,7 +56,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.34",
+    "@abtnode/client": "^1.8.36",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -77,5 +77,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "507e974ce88bad1aa002c593130b32982207f803"
+  "gitHead": "f26f451c6e2b1168b36f78269eafdf3f671236bf"
 }