@blocklet/resolver 1.16.23-beta-abdda301 → 1.16.23-beta-035db744

package/index.js

@@ -77,8 +77,7 @@ const validateBlockletMeta = (meta, opts = {}) => {
 exports.validateBlockletMeta = validateBlockletMeta;
 const getComponentConfig = (meta) => {
     const components = meta.components || meta.children || [];
-    const staticComponents = (meta.staticComponents || []).map((x) => ({ ...x, static: true }));
-    return [...components, ...staticComponents];
+    return components;
 };
 exports.getComponentConfig = getComponentConfig;
 const parseComponents = async (component, context = {}, logger = console) => {
@@ -90,21 +89,10 @@ const parseComponents = async (component, context = {}, logger = console) => {
     const configs = (0, exports.getComponentConfig)(component.meta) || [];
     if (!configs || !configs.length) {
         return {
-            staticComponents: [],
             dynamicComponents,
         };
     }
-    const staticComponents = [];
-    for (const config of configs) {
-        const isStatic = !!config.static;
-        if (isStatic) {
-            if (!config.name) {
-                throw new Error(`Name does not found in child ${config.name}`);
-            }
-        }
-    }
     await Promise.all(configs.map(async (config) => {
-        const isStatic = !!config.static;
         const urls = (0, util_meta_1.getSourceUrlsFromConfig)(config);
         let rawMeta;
         try {
@@ -120,7 +108,7 @@ const parseComponents = async (component, context = {}, logger = console) => {
         if ((0, util_1.hasStartEngine)(rawMeta) && !(0, util_1.findWebInterface)(rawMeta)) {
             throw new Error(`Web interface does not found in component ${rawMeta.title || rawMeta.name}`);
         }
-        const meta = (0, exports.ensureMeta)(rawMeta, { name: isStatic ? config.name : null });
+        const meta = (0, exports.ensureMeta)(rawMeta);
         // check circular dependencies
         if (ancestors.map((x) => x.meta?.bundleDid).indexOf(meta.bundleDid) > -1) {
             throw new Error('Blocklet components have circular dependencies');
@@ -132,7 +120,7 @@ const parseComponents = async (component, context = {}, logger = console) => {
         if (config.description) {
             meta.description = await schema_1.descriptionSchema.validateAsync(config.description);
         }
-        const mountPoint = isStatic ? config.mountPoint : config.mountPoint || `/${meta.did}`;
+        const mountPoint = config.mountPoint || `/${meta.did}`;
         const child = {
             mountPoint,
             meta,
@@ -140,25 +128,19 @@ const parseComponents = async (component, context = {}, logger = console) => {
             dependencies: [],
             children: [],
         };
-        if (isStatic) {
-            staticComponents.push(child);
-        }
-        else {
-            // @ts-ignore
-            dynamicComponents.push(child);
-            component.dependencies = component.dependencies || [];
-            component.dependencies.push({
-                did: child.meta.bundleDid,
-                required: !!config.required,
-                version: config.source.version || 'latest',
-            });
-        }
+        // @ts-ignore
+        dynamicComponents.push(child);
+        component.dependencies = component.dependencies || [];
+        component.dependencies.push({
+            did: child.meta.bundleDid,
+            required: !!config.required,
+            version: config.source.version || 'latest',
+        });
         // @ts-ignore
         await (0, exports.parseComponents)(child, { ancestors: [...ancestors, { meta }], dynamicComponents });
     }));
-    component.children = staticComponents;
+    component.children = [];
     return {
-        staticComponents,
         dynamicComponents,
     };
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-abdda301",
+  "version": "1.16.23-beta-035db744",
   "description": "Blocklet meta resolver",
   "main": "index.js",
   "files": [
@@ -15,19 +15,20 @@
     "test": "NODE_ENV=test node tools/jest.js",
     "coverage": "npm run test -- --coverage",
     "clean": "rm -f index.d.ts index.js",
+    "build:blocklet-resolver": "npm run build",
     "build": "npm run clean && tsc"
   },
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@arcblock/did": "^1.18.108",
-    "@blocklet/constant": "1.16.23-beta-abdda301",
-    "@blocklet/meta": "1.16.23-beta-abdda301",
+    "@arcblock/did": "^1.18.110",
+    "@blocklet/constant": "1.16.23-beta-035db744",
+    "@blocklet/meta": "1.16.23-beta-035db744",
     "lru-cache": "^6.0.0",
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.23-beta-abdda301",
+    "@abtnode/types": "1.16.23-beta-035db744",
     "@arcblock/eslint-config-ts": "^0.2.4",
     "@types/jest": "^29.5.11",
     "@types/node": "^18.11.0",
@@ -39,5 +40,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528"
+  "gitHead": "43b1f85fa413b81be8b8015031ac271a9d9f3456"
 }