@ives_xxz/framework 1.4.0 → 1.4.2

package/FW.d.ts

@@ -177,11 +177,6 @@ declare namespace FW {
     onDestroy();
   };
 
-  type SocketMessage = {
-    data: any;
-    error: boolean;
-  };
-
   type SocketManager = {
     createSocket(
       tag: string,

package/Framework.ts

@@ -117,7 +117,7 @@ class Framework {
   }
 
   /**
-   * 创建注册表
+   * 创建注册表实例
    */
   createRegistry(bundleName: string): FW.Registry {
     if (!this.registry.has(bundleName)) return;
@@ -126,12 +126,11 @@ class Framework {
   }
 
   /**
-   * 销毁注册表
+   * 销毁注册表实例
    * @param bundleName
    */
   destroyRegistry(bundleName: string) {
-    if (this.registry.has(bundleName)) return;
-    this.registry.delete(bundleName);
+    if (!this.registry.has(bundleName)) return;
     this.container.unbind(this.registry.get(bundleName));
   }
 

package/define/FWEventDefine.ts

@@ -1,11 +1,4 @@
 export namespace FWEventDefine {
-  export enum SystemEvent {
-    BUNDLE_LOADED = 'BUNDLE_LOADED',
-    BUNDLE_RELEASE = 'BUNDLE_RELEASE',
-    BUNDLE_REGISTERED = 'BUNDLE_REGISTERED',
-    BUNDLE_UN_REGISTERED = 'BUNDLE_UN_REGISTERED',
-  }
-
   export enum LanguageEvent {
     /** 语言变更 */
     LANGUAGE_CHANGE = 'LANGUAGE_CHANGE',

package/entry/FWEntry.ts

@@ -166,7 +166,20 @@ export default class FWEntry implements FW.Entry {
   }
 
   getDepend(bundleName: string) {
-    return this.map.get(bundleName)?.depend || [];
+    const dependencySet = new Set<string>();
+    const findDependencies = (name: string) => {
+      const directDeps = this.map.get(name)?.depend || [];
+      for (const dep of directDeps) {
+        if (!dependencySet.has(dep)) {
+          dependencySet.add(dep);
+          findDependencies(dep);
+        }
+      }
+    };
+
+    findDependencies(bundleName);
+
+    return Array.from(dependencySet);
   }
 
   hasSceneName(sceneName: string) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],