@blocklet/resolver 1.16.23-beta-f85576a6 → 1.16.23-beta-aeb9f5bd

package/index.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.parseBlocklet = exports.parseComponents = exports.getComponentConfig = exports.validateBlockletMeta = exports.ensureMeta = exports.filterDuplicateComponents = exports.isDidMatchName = void 0;
+exports.parseOptionalComponents = exports.filterRequiredComponents = exports.parseBlocklet = exports.parseComponents = exports.getComponentConfig = exports.validateBlockletMeta = exports.ensureMeta = exports.filterDuplicateComponents = exports.isDidMatchName = void 0;
 /* eslint-disable prettier/prettier */
 /* eslint-disable no-await-in-loop */
 const semver_1 = __importDefault(require("semver"));
@@ -177,3 +177,74 @@ const parseBlocklet = async (url) => {
     return dynamicComponents;
 };
 exports.parseBlocklet = parseBlocklet;
+const filterRequiredComponents = (component, children) => {
+    const requiredNames = new Set(component.meta?.components?.filter((v) => v.required).map((v) => v.name) || []);
+    requiredNames.add(component.meta.name);
+    const requiredChildren = children.filter((child) => requiredNames.has(child.meta.name));
+    return requiredChildren;
+};
+exports.filterRequiredComponents = filterRequiredComponents;
+const parseOptionalComponents = async (children) => {
+    if (!children || !children.length) {
+        return [];
+    }
+    const optionalComponents = [];
+    const childrenNames = new Set(children.map((v) => v.meta.name));
+    const hasOptionalChildren = new Set();
+    const optionalNames = new Set();
+    const appendNames = new Set();
+    const dependenciesMap = {};
+    children.forEach((child) => {
+        child.meta.components?.forEach((component) => {
+            if (!childrenNames.has(component.name)) {
+                hasOptionalChildren.add(child.meta.did);
+                optionalNames.add(component.name);
+                if (!dependenciesMap[component.name]) {
+                    dependenciesMap[component.name] = [];
+                }
+                dependenciesMap[component.name].push({
+                    parentDid: child.meta.did,
+                    parentName: child.meta.name,
+                    parentTitle: child.meta.title,
+                    required: !!component.required,
+                    mountPoint: !!component.mountPoint,
+                });
+            }
+        });
+    });
+    for (const child of children) {
+        if (!child.meta || !hasOptionalChildren.has(child.meta.did)) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+        const hasNotFetchChild = child.meta.components.find((component) => !childrenNames.has(component.name) && !appendNames.has(component.name));
+        if (!hasNotFetchChild) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+        try {
+            const { dynamicComponents } = await (0, exports.parseComponents)(child);
+            for (const component of dynamicComponents) {
+                const { mountPoint, bundleSource, meta } = component;
+                if (!optionalNames.has(meta.name) || appendNames.has(meta.name)) {
+                    // eslint-disable-next-line no-continue
+                    continue;
+                }
+                const optionalChild = {
+                    logoUrl: `${bundleSource.store}/assets/${meta.did}/logo.png?v=${meta.version}`,
+                    dependencies: dependenciesMap[meta.name] || [],
+                    mountPoint,
+                    bundleSource,
+                    meta,
+                };
+                appendNames.add(meta.name);
+                optionalComponents.push(optionalChild);
+            }
+        }
+        catch (err) {
+            throw new Error(`Can not parse optional child: ${child.meta.name}`);
+        }
+    }
+    return optionalComponents;
+};
+exports.parseOptionalComponents = parseOptionalComponents;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-f85576a6",
+  "version": "1.16.23-beta-aeb9f5bd",
   "description": "Blocklet meta resolver",
   "main": "index.js",
   "files": [
@@ -21,22 +21,22 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@arcblock/did": "^1.18.108",
-    "@blocklet/constant": "1.16.23-beta-f85576a6",
-    "@blocklet/meta": "1.16.23-beta-f85576a6",
+    "@blocklet/constant": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/meta": "1.16.23-beta-aeb9f5bd",
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.23-beta-f85576a6",
+    "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@types/jest": "^29.2.0",
+    "@types/jest": "^29.5.11",
     "@types/node": "^18.11.0",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
     "eslint": "^8.25.0",
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "prettier": "^2.7.1",
-    "ts-jest": "^27.1.5",
+    "ts-jest": "^29.1.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "bac83a74944b4cef3ccb386277023caf0e1d5cd4"
+  "gitHead": "418cacd970d373aecc8706f8992e57369d394577"
 }