@blocklet/resolver 1.16.25-beta-4f765cf3 → 1.16.25-beta-708d1e12

package/index.js

@@ -172,6 +172,9 @@ const filterRequiredComponents = (component, children) => {
 };
 exports.filterRequiredComponents = filterRequiredComponents;
 const dynamicComponentsCache = new lru_cache_1.default({ max: 300, maxAge: 60 * 60 * 1000 * 3 }); // 3 hours
+const getComponentName = (component) => {
+    return component.source?.name || component.name;
+};
 const parseOptionalComponents = async (blocklet, logger = console) => {
     const { children } = blocklet || {};
     if (!children || !children.length) {
@@ -185,13 +188,14 @@ const parseOptionalComponents = async (blocklet, logger = console) => {
     const dependenciesMap = {};
     children.forEach((child) => {
         child.meta.components?.forEach((component) => {
-            if (!childrenNames.has(component.name)) {
+            const name = getComponentName(component);
+            if (!childrenNames.has(name)) {
                 hasOptionalChildren.add(child.meta.did);
-                optionalNames.add(component.name);
-                if (!dependenciesMap[component.name]) {
-                    dependenciesMap[component.name] = [];
+                optionalNames.add(name);
+                if (!dependenciesMap[name]) {
+                    dependenciesMap[name] = [];
                 }
-                dependenciesMap[component.name].push({
+                dependenciesMap[name].push({
                     parentDid: child.meta.did,
                     parentName: child.meta.name,
                     parentTitle: child.meta.title,
@@ -206,7 +210,10 @@ const parseOptionalComponents = async (blocklet, logger = console) => {
             // eslint-disable-next-line no-continue
             continue;
         }
-        const hasNotFetchChild = child.meta.components.find((component) => !childrenNames.has(component.name) && !appendNames.has(component.name));
+        const hasNotFetchChild = child.meta.components.find((component) => {
+            const name = getComponentName(component);
+            return !childrenNames.has(name) && !appendNames.has(name);
+        });
         if (!hasNotFetchChild) {
             // eslint-disable-next-line no-continue
             continue;
@@ -220,7 +227,7 @@ const parseOptionalComponents = async (blocklet, logger = console) => {
             }
             for (const component of dynamicComponents) {
                 const { mountPoint, bundleSource, meta } = component;
-                if (!optionalNames.has(meta.name) || 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;
                 }
@@ -232,6 +239,7 @@ const parseOptionalComponents = async (blocklet, logger = console) => {
                     meta,
                 };
                 appendNames.add(optionalChild.meta.name);
+                appendNames.add(optionalChild.meta.did);
                 optionalComponents.push(optionalChild);
             }
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-beta-4f765cf3",
+  "version": "1.16.25-beta-708d1e12",
   "description": "Blocklet meta resolver",
   "main": "index.js",
   "files": [
@@ -22,13 +22,13 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@arcblock/did": "^1.18.113",
-    "@blocklet/constant": "1.16.25-beta-4f765cf3",
-    "@blocklet/meta": "1.16.25-beta-4f765cf3",
+    "@blocklet/constant": "1.16.25-beta-708d1e12",
+    "@blocklet/meta": "1.16.25-beta-708d1e12",
     "lru-cache": "^6.0.0",
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.25-beta-4f765cf3",
+    "@abtnode/types": "1.16.25-beta-708d1e12",
     "@arcblock/eslint-config-ts": "^0.2.4",
     "@types/jest": "^29.5.11",
     "@types/node": "^18.11.0",
@@ -40,5 +40,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "7783a4bf883bb44b4266651b04008ef65bf6c2ce"
+  "gitHead": "2abdc1c1a5c3c74926052acee6fed3cb99e96714"
 }