@blocklet/resolver 1.16.27 → 1.16.28-beta-bfbab430

package/index.js

@@ -15,6 +15,8 @@ const schema_1 = require("@blocklet/meta/lib/schema");
 const validate_1 = require("@blocklet/meta/lib/validate");
 const util_meta_1 = require("@blocklet/meta/lib/util-meta");
 const did_2 = __importDefault(require("@blocklet/meta/lib/did"));
+const engine_1 = require("@blocklet/meta/lib/engine");
+const url_path_friendly_1 = __importDefault(require("@blocklet/meta/lib/url-path-friendly"));
 const isDidMatchName = (did, name) => {
     if ((0, did_1.isValid)(did) && name === did) {
         return true;
@@ -77,6 +79,11 @@ const validateBlockletMeta = (meta, opts = {}) => {
 exports.validateBlockletMeta = validateBlockletMeta;
 const getComponentConfig = (meta) => {
     const components = meta.components || meta.children || [];
+    // treat engine as component
+    const engine = (0, engine_1.getBlockletEngine)(meta);
+    if (engine?.interpreter === 'blocklet') {
+        components.push({ source: engine.source, required: true });
+    }
     return components;
 };
 exports.getComponentConfig = getComponentConfig;
@@ -120,7 +127,7 @@ const parseComponents = async (component, context = {}, logger = console) => {
         if (config.description) {
             meta.description = await schema_1.descriptionSchema.validateAsync(config.description);
         }
-        const mountPoint = config.mountPoint || `/${meta.did}`;
+        const mountPoint = config.mountPoint || `/${(0, url_path_friendly_1.default)(meta.title || meta.name || meta.did)}`.toLowerCase();
         const child = {
             mountPoint,
             meta,
@@ -136,6 +143,16 @@ const parseComponents = async (component, context = {}, logger = console) => {
             required: !!config.required,
             version: config.source.version || 'latest',
         });
+        // parse engine components recursively
+        const engine = (0, engine_1.getBlockletEngine)(meta);
+        if (engine?.interpreter === 'blocklet') {
+            await (0, exports.parseComponents)({
+                // @ts-ignore
+                meta: { components: [{ source: engine.source, required: true }] },
+                dependencies: [],
+                children: [],
+            }, { ancestors: [...ancestors, { meta }], dynamicComponents });
+        }
         // @ts-ignore
         await (0, exports.parseComponents)(child, { ancestors: [...ancestors, { meta }], dynamicComponents });
     }));
@@ -227,7 +244,9 @@ const parseOptionalComponents = async (blocklet, logger = console) => {
             }
             for (const component of dynamicComponents) {
                 const { mountPoint, bundleSource, meta } = component;
-                if ((optionalNames.has(meta.name) || optionalNames.has(meta.did)) === false || appendNames.has(meta.did) || appendNames.has(meta.name)) {
+                if ((optionalNames.has(meta.name) || optionalNames.has(meta.did)) === false ||
+                    appendNames.has(meta.did) ||
+                    appendNames.has(meta.name)) {
                     // eslint-disable-next-line no-continue
                     continue;
                 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27",
+  "version": "1.16.28-beta-bfbab430",
   "description": "Blocklet meta resolver",
   "main": "index.js",
   "files": [
@@ -22,13 +22,13 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@arcblock/did": "^1.18.123",
-    "@blocklet/constant": "1.16.27",
-    "@blocklet/meta": "1.16.27",
+    "@blocklet/constant": "1.16.28-beta-bfbab430",
+    "@blocklet/meta": "1.16.28-beta-bfbab430",
     "lru-cache": "^6.0.0",
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.27",
+    "@abtnode/types": "1.16.28-beta-bfbab430",
     "@arcblock/eslint-config-ts": "^0.3.0",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.12.2",
@@ -40,5 +40,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "b7dcd46b040c5ad3a273b14b1a411fafc1390828"
+  "gitHead": "f1fbf0752de46be00d1faa0d54eb7d28016e0bb9"
 }