@blocklet/meta 1.16.17-beta-7ec31a60 → 1.16.17-beta-8cacb9b3

package/lib/payment/v2.js

@@ -114,10 +114,6 @@ const innerGetComponents = async (inputMeta, context = {}) => {
         catch (err) {
             throw new Error(`Failed get component meta: ${config.title || config.name}: ${err.message}`);
         }
-        // check is component
-        if (!(0, util_2.isComponentBlocklet)(meta)) {
-            throw new Error(`The blocklet cannot be a component: ${meta.title}`);
-        }
         // check circular dependencies
         if (ancestors.map((x) => x.meta?.did).indexOf(meta.did) > -1) {
             throw new Error('Blocklet components have circular dependencies');

package/lib/schema.js

@@ -630,9 +630,9 @@ const blockletMetaProps = {
             .optional(),
         navigation: Joi.boolean().default(true),
         serverless: Joi.boolean().optional(),
-        // @deprecated
-        component: Joi.boolean().default(true),
         resourceExportPage: Joi.string().trim(),
+        // @deprecated
+        component: Joi.boolean(), // Can blocklet become a component and be composed by other blocklets
     }).default({}),
     // Other contents to be included in the bundle
     files: Joi.array().items(Joi.string().trim()).optional(),

package/lib/util.d.ts

@@ -95,7 +95,6 @@ declare const getAppMissingConfigs: (app?: any) => any[];
 declare const getComponentMissingConfigs: (component?: any, app?: any) => any[];
 declare const isFreeBlocklet: (meta: TBlockletMeta) => boolean;
 declare const isFreeComponent: (meta: TBlockletMeta) => boolean;
-declare const isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
 declare const wipeSensitiveData: (blocklet?: BlockletState) => BlockletState;
 declare const isDeletableBlocklet: (blocklet?: BlockletState) => boolean;
 declare const isGatewayBlocklet: (meta: TBlockletMeta) => boolean;
@@ -147,11 +146,10 @@ 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, isComponentBlocklet, 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, };
+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;
     isFreeComponent: (meta: TBlockletMeta) => boolean;
-    isComponentBlocklet: (meta?: TBlockletMeta) => boolean;
     forEachBlocklet: (blocklet: TComponentPro, cb: Function, { parallel, concurrencyLimit, sync, params: inputParams, _parent, _root, _level, _tasks: inputTasks, _ancestors, _limit, }?: {
         parallel?: boolean;
         concurrencyLimit?: number;

package/lib/util.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.hasStartEngine = exports.isGatewayBlocklet = exports.isRunning = exports.isBeforeInstalled = exports.isInProgress = exports.getBlockletServices = exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getBlockletChainInfo = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.filterComponentsV2 = exports.findComponentByIdV2 = exports.findComponentV2 = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getComponentWhoCanAccess = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.isEnvShareableToClient = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachComponentV2Sync = exports.forEachComponentV2 = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isComponentBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
+exports.hasStartEngine = exports.isGatewayBlocklet = exports.isRunning = exports.isBeforeInstalled = exports.isInProgress = exports.getBlockletServices = exports.getBlockletAppIdList = exports.getRolesFromAuthConfig = exports.isPreferenceKey = exports.isExternalBlocklet = exports.getBlockletChainInfo = exports.getChainInfo = exports.getConnectAppUrl = exports.getParentComponentName = exports.filterComponentsV2 = exports.findComponentByIdV2 = exports.findComponentV2 = exports.findComponentById = exports.findComponent = exports.getComponentBundleId = exports.getComponentName = exports.getComponentId = exports.replaceSlotToIp = exports.getComponentWhoCanAccess = exports.getWhoCanAccess = exports.findServiceFromMeta = exports.findWebInterfacePort = exports.findWebInterface = exports.fixBlockletStatus = exports.getAppDescription = exports.getDisplayName = exports.getAppName = exports.hasRunnableComponent = exports.wipeSensitiveData = exports.isEnvShareable = exports.isEnvShareableToClient = exports.getComponentMissingConfigs = exports.getAppMissingConfigs = exports.getSharedConfigObj = exports.isDeletableBlocklet = exports.forEachComponentV2Sync = exports.forEachComponentV2 = exports.forEachChildSync = exports.forEachChild = exports.forEachBlockletSync = exports.forEachBlocklet = exports.isFreeComponent = exports.isFreeBlocklet = void 0;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -375,10 +375,6 @@ const isFreeComponent = (meta) => {
     return !meta.payment.componentPrice.length;
 };
 exports.isFreeComponent = isFreeComponent;
-const isComponentBlocklet = (meta) => {
-    return (0, get_1.default)(meta, 'capabilities.component') !== false;
-};
-exports.isComponentBlocklet = isComponentBlocklet;
 const wipeSensitiveData = (blocklet) => {
     if (!blocklet) {
         return blocklet;
@@ -685,7 +681,6 @@ exports.hasStartEngine = hasStartEngine;
 exports.default = {
     isFreeBlocklet,
     isFreeComponent,
-    isComponentBlocklet,
     forEachBlocklet,
     forEachBlockletSync,
     forEachChild,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-7ec31a60",
+  "version": "1.16.17-beta-8cacb9b3",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,12 +24,12 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.17-beta-7ec31a60",
+    "@abtnode/constant": "1.16.17-beta-8cacb9b3",
     "@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-7ec31a60",
+    "@blocklet/constant": "1.16.17-beta-8cacb9b3",
     "@ocap/asset": "1.18.91",
     "@ocap/mcrypto": "1.18.91",
     "@ocap/types": "1.18.91",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "622bb131130d28c3fc554dcb5dc9d72b7da3fba2"
+  "gitHead": "0e3266f543b6d419a004ca94ee9efb572e3d9809"
 }