@blocklet/meta 1.16.17-beta-d282d63e → 1.16.17-beta-4f13d99d

package/lib/has-start-engine.d.ts

@@ -0,0 +1,4 @@
+import type { BlockletMeta } from '@abtnode/client';
+import type { TBlockletMeta } from './types';
+declare const hasStartEngine: (meta: TBlockletMeta | BlockletMeta) => boolean;
+export default hasStartEngine;

package/lib/has-start-engine.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hasStartEngine = (meta) => !!meta?.main;
+exports.default = hasStartEngine;

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

@@ -1,4 +1,4 @@
-declare const checkLink: (value: string) => boolean;
+import { checkLink } from './url-path-friendly';
 interface DeepWalkCallback {
     (current: any, parent: any, options: DeepWalkCallbackOptions): void;
 }

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

@@ -14,27 +14,13 @@ const url_join_1 = __importDefault(require("url-join"));
 const path_1 = __importDefault(require("path"));
 const is_absolute_url_1 = __importDefault(require("is-absolute-url"));
 const lodash_1 = require("lodash");
+const has_start_engine_1 = __importDefault(require("./has-start-engine"));
+const url_path_friendly_1 = require("./url-path-friendly");
+Object.defineProperty(exports, "checkLink", { enumerable: true, get: function () { return url_path_friendly_1.checkLink; } });
 const DEFAULT_SECTION = 'header';
 const BASE_PATH = '/';
 const DEFAULT_LINK = '/';
 const ID_SEPARATE = '/';
-/**
- * 判断一个 url 是否为合法的 url 拼接路径
- * /abc, /abc/bcd valid
- * /abc, /abc//bcd invalid
- * @param value 需要检查的 url path
- * @returns boolean
- */
-const checkUrlPath = (value) => {
-    return /^\/(?:[^/]+\/)*$/.test(value) || /^\/(?:[^/]+\/)*[^/]+$/.test(value);
-};
-const checkLink = (value) => {
-    if ((0, is_absolute_url_1.default)(value) || checkUrlPath(value)) {
-        return true;
-    }
-    return false;
-};
-exports.checkLink = checkLink;
 function deepWalk(tree, cb = () => { }, { key = 'children', order = 'first' } = {}) {
     function walk(current, { index = 0, parent = null, level = 0 } = {}) {
         if (Array.isArray(current)) {
@@ -114,20 +100,20 @@ function smartJoinLink(_parentLink, _childLink, { strict = true, } = {}) {
         parentLink = parentLink || '/';
         childLink = childLink || '/';
     }
-    if ((0, lodash_1.isObject)(parentLink) && (0, lodash_1.isString)(childLink) && checkLink(childLink)) {
+    if ((0, lodash_1.isObject)(parentLink) && (0, lodash_1.isString)(childLink) && (0, url_path_friendly_1.checkLink)(childLink)) {
         return Object.keys(parentLink).reduce((res, key) => {
             res[key] = optionalJoin(parentLink[key], childLink);
             return res;
         }, {});
     }
-    if ((0, lodash_1.isString)(parentLink) && checkLink(parentLink) && (0, lodash_1.isObject)(childLink)) {
+    if ((0, lodash_1.isString)(parentLink) && (0, url_path_friendly_1.checkLink)(parentLink) && (0, lodash_1.isObject)(childLink)) {
         return Object.keys(childLink).reduce((res, key) => {
             res[key] = optionalJoin(parentLink, childLink[key]);
             return res;
         }, {});
     }
     if ((0, lodash_1.isString)(parentLink) && (0, lodash_1.isString)(childLink)) {
-        if (checkLink(parentLink) || checkLink(childLink)) {
+        if ((0, url_path_friendly_1.checkLink)(parentLink) || (0, url_path_friendly_1.checkLink)(childLink)) {
             return optionalJoin(parentLink, childLink);
         }
         return childLink;
@@ -212,7 +198,7 @@ function parseBlockletNavigationList(blocklet = {}) {
         const targetList = [];
         const { children = [], meta = {} } = current;
         const navigation = (0, cloneDeep_1.default)(meta?.navigation || []);
-        if (current.meta?.capabilities?.navigation !== false) {
+        if ((0, has_start_engine_1.default)(meta) && current.meta?.capabilities?.navigation !== false) {
             targetList.push(...navigation);
         }
         const parentName = parent.name || '';
@@ -220,6 +206,10 @@ function parseBlockletNavigationList(blocklet = {}) {
         const currentName = current === blocklet ? '' : meta.name || '';
         const currentBase = current === blocklet ? '' : current.mountPoint || BASE_PATH;
         for (const child of children) {
+            if (!(0, has_start_engine_1.default)(child.meta)) {
+                // eslint-disable-next-line no-continue
+                continue;
+            }
             const childName = child.meta.name;
             const childBase = child.mountPoint;
             const mergeName = [parentName, currentName, childName].filter(Boolean).join('.');

package/lib/schema.js

@@ -39,18 +39,16 @@ const constant_2 = require("@blocklet/constant");
 const did_2 = __importDefault(require("./did"));
 const extension_1 = require("./extension");
 const name_1 = require("./name");
-const parse_navigation_from_blocklet_1 = require("./parse-navigation-from-blocklet");
 const url_path_friendly_1 = __importStar(require("./url-path-friendly"));
 const cjkLength = cjk_length_1.default.default;
 const WELLKNOWN_PATH_PREFIX = '/.well-known';
-const MAX_TITLE_LENGTH = 24;
 const Joi = joi_1.default.extend(joi_extension_semver_1.semver)
     .extend(joi_extension_semver_1.semverRange)
     .extend(extension_1.fileExtension)
     .extend(extension_1.didExtension);
 exports.Joi = Joi;
 const checkLinkHelper = (value, helper) => {
-    if ((0, parse_navigation_from_blocklet_1.checkLink)(value)) {
+    if ((0, url_path_friendly_1.checkLink)(value)) {
         return value;
     }
     // @ts-expect-error
@@ -81,8 +79,8 @@ const titleSchema = Joi.string()
     .trim()
     .min(1)
     .custom((value) => {
-    if (cjkLength(value) > MAX_TITLE_LENGTH) {
-        throw new Error(`title length should not exceed ${MAX_TITLE_LENGTH} (see: https://www.npmjs.com/package/cjk-length)`);
+    if (cjkLength(value) > constant_2.MAX_TITLE_LENGTH) {
+        throw new Error(`title length should not exceed ${constant_2.MAX_TITLE_LENGTH} (see: https://www.npmjs.com/package/cjk-length)`);
     }
     return value;
 })
@@ -406,9 +404,9 @@ const localeList = ['en', 'zh', 'fr', 'ru', 'ar', 'es', 'de', 'pt', 'ja', 'hi'];
 const navigationItemProps = {
     id: Joi.string().custom(checkId),
     title: Joi.alternatives()
-        .try(Joi.string().min(1).max(MAX_TITLE_LENGTH), Joi.object()
+        .try(Joi.string().min(1).max(constant_2.MAX_TITLE_LENGTH), Joi.object()
         .min(1)
-        .pattern(Joi.string().valid(...localeList), Joi.string().min(1).max(MAX_TITLE_LENGTH)))
+        .pattern(Joi.string().valid(...localeList), Joi.string().min(1).max(constant_2.MAX_TITLE_LENGTH)))
         .required(),
     link: Joi.alternatives().try(Joi.string().custom(checkLinkHelper), Joi.object()
         .min(1)

package/lib/url-path-friendly.d.ts

@@ -2,5 +2,6 @@ declare const isValidUrlPath: (name: any) => boolean;
 declare const urlPathFriendly: (name: any, { keepSlash }?: {
     keepSlash?: boolean;
 }) => any;
-export { isValidUrlPath };
+declare const checkLink: (value: string) => boolean;
+export { isValidUrlPath, checkLink };
 export default urlPathFriendly;

package/lib/url-path-friendly.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidUrlPath = void 0;
+exports.checkLink = exports.isValidUrlPath = void 0;
+const is_absolute_url_1 = __importDefault(require("is-absolute-url"));
 const isValidUrlPath = (name) => {
     // Check if the path contains any uppercase letters
     if (/[A-Z]/.test(name)) {
@@ -34,4 +38,21 @@ const urlPathFriendly = (name, { keepSlash = true } = {}) => {
     }
     return noConsecutiveSlashes;
 };
+/**
+ * 判断一个 url 是否为合法的 url 拼接路径
+ * /abc, /abc/bcd valid
+ * /abc, /abc//bcd invalid
+ * @param value 需要检查的 url path
+ * @returns boolean
+ */
+const checkUrlPath = (value) => {
+    return /^\/(?:[^/]+\/)*$/.test(value) || /^\/(?:[^/]+\/)*[^/]+$/.test(value);
+};
+const checkLink = (value) => {
+    if ((0, is_absolute_url_1.default)(value) || checkUrlPath(value)) {
+        return true;
+    }
+    return false;
+};
+exports.checkLink = checkLink;
 exports.default = urlPathFriendly;

package/lib/util.d.ts

@@ -1,5 +1,6 @@
 import type { BlockletState, ComponentState } from '@abtnode/client';
 import type { Request } from 'express';
+import hasStartEngine from './has-start-engine';
 import type { TBlockletMeta, TEnvironment } from './types';
 type TConfig = TEnvironment & {
     key: string;
@@ -145,7 +146,6 @@ declare const getBlockletServices: (blocklet: Partial<BlockletState>) => Array<{
 declare const isInProgress: (status: string | number) => boolean;
 declare const isBeforeInstalled: (status: string | number) => boolean;
 declare const isRunning: (status: string | number) => boolean;
-declare const hasStartEngine: (meta: TBlockletMeta) => boolean;
 export { isFreeBlocklet, isFreeComponent, forEachBlocklet, forEachBlockletSync, forEachChild, forEachChildSync, forEachComponentV2, forEachComponentV2Sync, isDeletableBlocklet, getSharedConfigObj, getAppMissingConfigs, getComponentMissingConfigs, isEnvShareableToClient, isEnvShareable, wipeSensitiveData, hasRunnableComponent, getAppName, getAppName as getDisplayName, getAppDescription, fixBlockletStatus, findWebInterface, findWebInterfacePort, findServiceFromMeta, getWhoCanAccess, getComponentWhoCanAccess, replaceSlotToIp, getComponentId, getComponentName, getComponentBundleId, findComponent, findComponentById, findComponentV2, findComponentByIdV2, filterComponentsV2, getParentComponentName, getConnectAppUrl, getChainInfo, getBlockletChainInfo, isExternalBlocklet, isPreferenceKey, getRolesFromAuthConfig, getBlockletAppIdList, getBlockletServices, isInProgress, isBeforeInstalled, isRunning, isGatewayBlocklet, hasStartEngine, };
 declare const _default: {
     isFreeBlocklet: (meta: TBlockletMeta) => boolean;
@@ -253,6 +253,6 @@ declare const _default: {
     isBeforeInstalled: (status: string | number) => boolean;
     isRunning: (status: string | number) => boolean;
     isGatewayBlocklet: (meta: TBlockletMeta) => boolean;
-    hasStartEngine: (meta: TBlockletMeta) => boolean;
+    hasStartEngine: (meta: TBlockletMeta | import("@abtnode/client").BlockletMeta) => boolean;
 };
 export default _default;

package/lib/util.js

@@ -11,6 +11,8 @@ const url_join_1 = __importDefault(require("url-join"));
 const p_limit_1 = __importDefault(require("p-limit"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const constant_2 = require("@blocklet/constant");
+const has_start_engine_1 = __importDefault(require("./has-start-engine"));
+exports.hasStartEngine = has_start_engine_1.default;
 const { NODE_SERVICES, SLOT_FOR_IP_DNS_SITE, WHO_CAN_ACCESS, WHO_CAN_ACCESS_PREFIX_ROLES } = constant_1.default;
 const getComponentId = (component, ancestors = []) => `${ancestors.map((x) => (x && x.meta ? x.meta.did : '')).join('/')}${ancestors.length ? '/' : ''}${component && component.meta ? component.meta.did : ''}`;
 exports.getComponentId = getComponentId;
@@ -676,8 +678,6 @@ const isBeforeInstalled = (status) => [
 exports.isBeforeInstalled = isBeforeInstalled;
 const isRunning = (status) => [constant_2.BlockletStatus.running, 'running'].includes(status);
 exports.isRunning = isRunning;
-const hasStartEngine = (meta) => !!meta?.main;
-exports.hasStartEngine = hasStartEngine;
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
@@ -725,5 +725,5 @@ exports.default = {
     isBeforeInstalled,
     isRunning,
     isGatewayBlocklet,
-    hasStartEngine,
+    hasStartEngine: has_start_engine_1.default,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-d282d63e",
+  "version": "1.16.17-beta-4f13d99d",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,17 +24,17 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.17-beta-d282d63e",
-    "@arcblock/did": "1.18.91",
-    "@arcblock/did-ext": "1.18.91",
-    "@arcblock/did-util": "1.18.91",
-    "@arcblock/jwt": "1.18.91",
-    "@blocklet/constant": "1.16.17-beta-d282d63e",
-    "@ocap/asset": "1.18.91",
-    "@ocap/mcrypto": "1.18.91",
-    "@ocap/types": "1.18.91",
-    "@ocap/util": "1.18.91",
-    "@ocap/wallet": "1.18.91",
+    "@abtnode/constant": "1.16.17-beta-4f13d99d",
+    "@arcblock/did": "1.18.92",
+    "@arcblock/did-ext": "1.18.92",
+    "@arcblock/did-util": "1.18.92",
+    "@arcblock/jwt": "1.18.92",
+    "@blocklet/constant": "1.16.17-beta-4f13d99d",
+    "@ocap/asset": "1.18.92",
+    "@ocap/mcrypto": "1.18.92",
+    "@ocap/types": "1.18.92",
+    "@ocap/util": "1.18.92",
+    "@ocap/wallet": "1.18.92",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "b675be55d76903e8b92d98cfca7d960fcfedd98f"
+  "gitHead": "005478c4b14448f2ae896ae363972afbde1d7e7b"
 }