@gby/destroyable 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,275 +1,96 @@
1
- /**
2
- * 可销毁的
3
- *
4
- * @remarks
5
- * @gby/destroyable 提供了用于构建可销毁对象的类的基类,用于使得地管理可销毁对象的生命周期
6
- *
7
- * @packageDocumentation
8
- */
9
-
10
- import { EventBus } from '@gby/event-bus';
11
- import { EventEmitter } from 'node:events';
12
- import { FunDestroyer as FunDestroyer_2 } from './Destroyable';
13
-
14
- /**
15
- * 创建可销毁的子类
16
- * @remarks
17
- * 用于根据传入的父类 动态生成可可销毁的子类
18
- * @param ParentClass
19
- * @returns
20
- */
21
- export declare function createDestroyableSubClass<P extends new (...args: any) => Object>(ParentClass: P): {
22
- new (...args: any): {
23
- /**
24
- * 是否已经销毁
25
- */
26
- readonly isDestroyed: boolean;
27
- _isDestroyed: boolean;
28
- /**
29
- * 销毁者
30
- */
31
- _destroyers: FunDestroyer[];
32
- /**
33
- * 添加销毁者
34
- * @param fun
35
- * @returns 返回销毁者的顺序
36
- */
37
- disposeFun<T extends FunDestroyer>(fun: T): T;
38
- /**
39
- * 取消销毁者函数
40
- * @param fun
41
- * @returns
42
- */
43
- cancelDisposeFun<T extends FunDestroyer>(fun: T): T;
44
- /**
45
- * 添加销毁对象
46
- * @param obj
47
- * @param sync - 表示是否使用 `obj.destroy()` 方法进行销毁;默认使用 `obj.destroyAsync()` 方法进行销毁
48
- * @returns
49
- */
50
- disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
51
- /**
52
- * 取消销毁者函数
53
- * @param fun
54
- * @returns
55
- */
56
- cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
57
- /**
58
- * 添加销毁函数或销毁对象
59
- * @param fun
60
- */
61
- dispose<T extends FunDestroyer>(fun: T): T;
62
- dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
63
- dispose<T extends /*elided*/ any | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
64
- cancelDispose<T extends FunDestroyer>(fun: T): T;
65
- cancelDispose<T extends /*elided*/ any>(obj: T): T;
66
- cancelDispose<T extends /*elided*/ any | FunDestroyer>(objOrFun: T): T;
67
- /**
68
- * 自己的销毁方法
69
- * @remarks
70
- * 子类根据需要进行重载
71
- */
72
- destroyThis(): void;
73
- /**
74
- * 销毁
75
- */
76
- destroy(): true | undefined;
77
- /**
78
- * 异步销毁
79
- * @remarks
80
- * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
81
- */
82
- destroyAsync(): Promise<true | undefined>;
83
- constructor: Function;
84
- toString(): string;
85
- toLocaleString(): string;
86
- valueOf(): Object;
87
- hasOwnProperty(v: PropertyKey): boolean;
88
- isPrototypeOf(v: Object): boolean;
89
- propertyIsEnumerable(v: PropertyKey): boolean;
90
- };
91
- } & P;
92
-
93
- /**
94
- * 可销毁的对象
95
- */
96
- export declare class Destroyable {
97
- /**
98
- * 是否已经销毁
99
- */
100
- get isDestroyed(): boolean;
101
- _isDestroyed: boolean;
102
- /**
103
- * 销毁者
104
- */
105
- _destroyers: FunDestroyer[];
106
- /**
107
- * 添加销毁者
108
- * @param fun
109
- * @returns 返回销毁者的顺序
110
- */
111
- disposeFun<T extends FunDestroyer>(fun: T): T;
112
- /**
113
- * 取消销毁者函数
114
- * @param fun
115
- * @returns
116
- */
117
- cancelDisposeFun<T extends FunDestroyer>(fun: T): T;
118
- /**
119
- * 添加销毁对象
120
- * @param obj
121
- * @param sync - 表示是否使用 `obj.destroy()` 方法进行销毁;默认使用 `obj.destroyAsync()` 方法进行销毁
122
- * @returns
123
- */
124
- disposeObj<T extends Destroyable>(obj: T, sync?: boolean): T;
125
- /**
126
- * 取消销毁者函数
127
- * @param fun
128
- * @returns
129
- */
130
- cancelDisposeObj<T extends Destroyable>(obj: T): T;
131
- /**
132
- * 添加销毁函数或销毁对象
133
- * @param fun
134
- */
135
- dispose<T extends FunDestroyer>(fun: T): T;
136
- dispose<T extends Destroyable>(obj: T, asyncDestroy?: boolean): T;
137
- dispose<T extends Destroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
138
- cancelDispose<T extends FunDestroyer>(fun: T): T;
139
- cancelDispose<T extends Destroyable>(obj: T): T;
140
- cancelDispose<T extends Destroyable | FunDestroyer>(objOrFun: T): T;
141
- /**
142
- * 自己的销毁方法
143
- * @remarks
144
- * 子类根据需要进行重载
145
- */
146
- destroyThis(): void;
147
- /**
148
- * 销毁
149
- */
150
- destroy(): true | undefined;
151
- /**
152
- * 异步销毁
153
- * @remarks
154
- * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
155
- */
156
- destroyAsync(): Promise<true | undefined>;
157
- }
158
-
159
- /**
160
- * createDestroyableSubClass 创建的类的实例类型
161
- */
162
- export declare type DestroyableSub<ParentClass extends new (...args: any) => Object> = InstanceType<DestroyableSubClass<ParentClass>>;
163
-
164
- /**
165
- * createDestroyableSubClass 创建的类的类型
166
- */
167
- export declare type DestroyableSubClass<ParentClass extends new (...args: any) => Object> = ReturnType<typeof createDestroyableSubClass<ParentClass>>;
168
-
169
- /**
170
- * 销毁 Destroyable 对象
171
- * @param object
172
- * @returns
173
- */
174
- export declare function destroyDestroyable(object: Destroyable): boolean;
175
-
176
- /**
177
- * 销毁对象
178
- * @param object
179
- * @returns
180
- */
181
- export declare function destroyObject(object: any): boolean;
182
-
183
- /**
184
- * 函数销毁者
185
- */
186
- export declare type FunDestroyer = () => void;
187
-
188
- /**
189
- * NodeDestroyable 类对象
190
- */
191
- export declare const NodeDestroyable: {
192
- new (...args: any): {
193
- readonly isDestroyed: boolean;
194
- _isDestroyed: boolean;
195
- _destroyers: FunDestroyer_2[];
196
- disposeFun<T extends FunDestroyer_2>(fun: T): T;
197
- cancelDisposeFun<T extends FunDestroyer_2>(fun: T): T;
198
- disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
199
- cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
200
- dispose<T extends FunDestroyer_2>(fun: T): T;
201
- dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
202
- dispose<T extends FunDestroyer_2 | /*elided*/ any>(objOrFun: T, asyncDestroy?: boolean): T;
203
- cancelDispose<T extends FunDestroyer_2>(fun: T): T;
204
- cancelDispose<T extends /*elided*/ any>(obj: T): T;
205
- cancelDispose<T extends FunDestroyer_2 | /*elided*/ any>(objOrFun: T): T;
206
- destroyThis(): void;
207
- destroy(): true | undefined;
208
- destroyAsync(): Promise<true | undefined>;
209
- constructor: Function;
210
- toString(): string;
211
- toLocaleString(): string;
212
- valueOf(): Object;
213
- hasOwnProperty(v: PropertyKey): boolean;
214
- isPrototypeOf(v: Object): boolean;
215
- propertyIsEnumerable(v: PropertyKey): boolean;
216
- };
217
- } & typeof EventEmitter;
218
-
219
- /**
220
- * NodeDestroyable 实例的类型
221
- */
222
- export declare type NodeDestroyable = InstanceType<NodeDestroyableClass>;
223
-
224
- /**
225
- * NodeDestroyable 类的类型
226
- */
227
- export declare type NodeDestroyableClass = typeof NodeDestroyable;
228
-
229
- /**
230
- * 调用已销对象的时抛出错误
231
- */
232
- export declare function throwOnDestroyed(): void;
233
-
234
- /**
235
- * WebDestroyable 类对象
236
- */
237
- export declare const WebDestroyable: {
238
- new (...args: any): {
239
- readonly isDestroyed: boolean;
240
- _isDestroyed: boolean;
241
- _destroyers: FunDestroyer_2[];
242
- disposeFun<T extends FunDestroyer_2>(fun: T): T;
243
- cancelDisposeFun<T extends FunDestroyer_2>(fun: T): T;
244
- disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
245
- cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
246
- dispose<T extends FunDestroyer_2>(fun: T): T;
247
- dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
248
- dispose<T extends FunDestroyer_2 | /*elided*/ any>(objOrFun: T, asyncDestroy?: boolean): T;
249
- cancelDispose<T extends FunDestroyer_2>(fun: T): T;
250
- cancelDispose<T extends /*elided*/ any>(obj: T): T;
251
- cancelDispose<T extends FunDestroyer_2 | /*elided*/ any>(objOrFun: T): T;
252
- destroyThis(): void;
253
- destroy(): true | undefined;
254
- destroyAsync(): Promise<true | undefined>;
255
- constructor: Function;
256
- toString(): string;
257
- toLocaleString(): string;
258
- valueOf(): Object;
259
- hasOwnProperty(v: PropertyKey): boolean;
260
- isPrototypeOf(v: Object): boolean;
261
- propertyIsEnumerable(v: PropertyKey): boolean;
262
- };
263
- } & typeof EventBus;
264
-
265
- /**
266
- * WebDestroyable 实例的类型
267
- */
268
- export declare type WebDestroyable = InstanceType<WebDestroyableClass>;
269
-
270
- /**
271
- * WebDestroyable 类的类型
272
- */
273
- export declare type WebDestroyableClass = typeof WebDestroyable;
274
-
275
- export { }
1
+ /**
2
+ * 函数销毁者
3
+ */
4
+ export type FunDestroyer = () => void;
5
+ /**
6
+ * 可销毁的对象
7
+ */
8
+ export declare class Destroyable {
9
+ /**
10
+ * 引用计数
11
+ * @remarks
12
+ * 引用计数为 0 时,对象才会被销毁
13
+ */
14
+ refCount: number;
15
+ /**
16
+ * 是否已经销毁
17
+ */
18
+ get isDestroyed(): boolean;
19
+ _isDestroyed: boolean;
20
+ /**
21
+ * 是否可以销毁
22
+ */
23
+ get canDestroy(): boolean;
24
+ /**
25
+ * 销毁者
26
+ */
27
+ _destroyers: FunDestroyer[];
28
+ /**
29
+ * 添加销毁者
30
+ * @param fun
31
+ * @returns 返回销毁者的顺序
32
+ */
33
+ disposeFun<T extends FunDestroyer>(fun: T): T;
34
+ /**
35
+ * 取消销毁者函数
36
+ * @param fun
37
+ * @returns
38
+ */
39
+ cancelDisposeFun<T extends FunDestroyer>(fun: T): T;
40
+ /**
41
+ * 添加销毁对象
42
+ * @param obj
43
+ * @param sync - 表示是否使用 `obj.destroy()` 方法进行销毁;默认使用 `obj.destroyAsync()` 方法进行销毁
44
+ * @returns
45
+ */
46
+ disposeObj<T extends Destroyable>(obj: T, sync?: boolean): T;
47
+ /**
48
+ * 取消销毁者函数
49
+ * @param fun
50
+ * @returns
51
+ */
52
+ cancelDisposeObj<T extends Destroyable>(obj: T): T;
53
+ /**
54
+ * 添加销毁函数或销毁对象
55
+ * @param fun
56
+ */
57
+ dispose<T extends FunDestroyer>(fun: T): T;
58
+ dispose<T extends Destroyable>(obj: T, asyncDestroy?: boolean): T;
59
+ dispose<T extends Destroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
60
+ cancelDispose<T extends FunDestroyer>(fun: T): T;
61
+ cancelDispose<T extends Destroyable>(obj: T): T;
62
+ cancelDispose<T extends Destroyable | FunDestroyer>(objOrFun: T): T;
63
+ /**
64
+ * 自己的销毁方法
65
+ * @remarks
66
+ * 子类根据需要进行重载
67
+ */
68
+ destroyThis(): void;
69
+ /**
70
+ * 销毁
71
+ */
72
+ destroy(): boolean;
73
+ /**
74
+ * 异步销毁
75
+ * @remarks
76
+ * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
77
+ */
78
+ destroyAsync(): Promise<boolean>;
79
+ }
80
+ /**
81
+ * 调用已销对象的时抛出错误
82
+ */
83
+ export declare function throwOnDestroyed(): void;
84
+ /**
85
+ * 销毁对象
86
+ * @param object
87
+ * @returns
88
+ */
89
+ export declare function destroyObject(object: any): boolean;
90
+ /**
91
+ * 销毁 Destroyable 对象
92
+ * @param object
93
+ * @returns
94
+ */
95
+ export declare function destroyDestroyable(object: any): boolean;
96
+ //# sourceMappingURL=Destroyable.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAGtC;;GAEG;AACH,qBAAa,WAAW;IAEpB;;OAEG;IACH,IAAI,WAAW,YAEd;IACD,YAAY,UAAS;IAErB;;OAEG;IACH,WAAW,EAAE,YAAY,EAAE,CAAM;IAEjC;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAK7C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAMnD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,IAAI,CAAC,EAAC,OAAO,GAAG,CAAC;IAQ1D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IASlD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IAC/D,OAAO,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IASnF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC/C,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAcnE;;;;OAIG;IACH,WAAW;IAKX;;OAEG;IACH,OAAO;IAiBP;;;;OAIG;IACG,YAAY;CAmBrB;AAOD;;GAEG;AACH,wBAAgB,gBAAgB,SAE/B;AAKD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,WAYrD"}
1
+ {"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAGtC;;GAEG;AACH,qBAAa,WAAW;IAEpB;;;;OAIG;IACH,QAAQ,SAAK;IAEb;;OAEG;IACH,IAAI,WAAW,YAEd;IACD,YAAY,UAAS;IAErB;;OAEG;IACH,IAAI,UAAU,YAEb;IAED;;OAEG;IACH,WAAW,EAAE,YAAY,EAAE,CAAM;IAEjC;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAK7C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAMnD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,IAAI,CAAC,EAAC,OAAO,GAAG,CAAC;IAQ1D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IASlD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IAC/D,OAAO,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IASnF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC/C,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAcnE;;;;OAIG;IACH,WAAW;IAKX;;OAEG;IACH,OAAO;IA6BP;;;;OAIG;IACG,YAAY;CA6BrB;AAOD;;GAEG;AACH,wBAAgB,gBAAgB,SAE/B;AAKD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,WAY7C"}
@@ -5,8 +5,10 @@ import { EventEmitter } from "node:events";
5
5
  */
6
6
  export declare const WebDestroyable: {
7
7
  new (...args: any): {
8
+ refCount: number;
8
9
  readonly isDestroyed: boolean;
9
10
  _isDestroyed: boolean;
11
+ readonly canDestroy: boolean;
10
12
  _destroyers: import("./Destroyable").FunDestroyer[];
11
13
  disposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
12
14
  cancelDisposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
@@ -19,8 +21,8 @@ export declare const WebDestroyable: {
19
21
  cancelDispose<T extends /*elided*/ any>(obj: T): T;
20
22
  cancelDispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T): T;
21
23
  destroyThis(): void;
22
- destroy(): true | undefined;
23
- destroyAsync(): Promise<true | undefined>;
24
+ destroy(): boolean;
25
+ destroyAsync(): Promise<boolean>;
24
26
  constructor: Function;
25
27
  toString(): string;
26
28
  toLocaleString(): string;
@@ -43,8 +45,10 @@ export type WebDestroyable = InstanceType<WebDestroyableClass>;
43
45
  */
44
46
  export declare const NodeDestroyable: {
45
47
  new (...args: any): {
48
+ refCount: number;
46
49
  readonly isDestroyed: boolean;
47
50
  _isDestroyed: boolean;
51
+ readonly canDestroy: boolean;
48
52
  _destroyers: import("./Destroyable").FunDestroyer[];
49
53
  disposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
50
54
  cancelDisposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
@@ -57,8 +61,8 @@ export declare const NodeDestroyable: {
57
61
  cancelDispose<T extends /*elided*/ any>(obj: T): T;
58
62
  cancelDispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T): T;
59
63
  destroyThis(): void;
60
- destroy(): true | undefined;
61
- destroyAsync(): Promise<true | undefined>;
64
+ destroy(): boolean;
65
+ destroyAsync(): Promise<boolean>;
62
66
  constructor: Function;
63
67
  toString(): string;
64
68
  toLocaleString(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"DestroyableSub.d.ts","sourceRoot":"","sources":["../src/DestroyableSub.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAsC,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,cAAc,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;uBAA0C,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,eAAe,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC"}
1
+ {"version":3,"file":"DestroyableSub.d.ts","sourceRoot":"","sources":["../src/DestroyableSub.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAsC,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,cAAc,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAA0C,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,eAAe,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC"}
@@ -8,11 +8,21 @@ import type { FunDestroyer } from "./Destroyable";
8
8
  */
9
9
  export declare function createDestroyableSubClass<P extends new (...args: any) => Object>(ParentClass: P): {
10
10
  new (...args: any): {
11
+ /**
12
+ * 引用计数
13
+ * @remarks
14
+ * 引用计数为 0 时,对象才会被销毁
15
+ */
16
+ refCount: number;
11
17
  /**
12
18
  * 是否已经销毁
13
19
  */
14
20
  readonly isDestroyed: boolean;
15
21
  _isDestroyed: boolean;
22
+ /**
23
+ * 是否可以销毁
24
+ */
25
+ readonly canDestroy: boolean;
16
26
  /**
17
27
  * 销毁者
18
28
  */
@@ -61,13 +71,13 @@ export declare function createDestroyableSubClass<P extends new (...args: any) =
61
71
  /**
62
72
  * 销毁
63
73
  */
64
- destroy(): true | undefined;
74
+ destroy(): boolean;
65
75
  /**
66
76
  * 异步销毁
67
77
  * @remarks
68
78
  * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
69
79
  */
70
- destroyAsync(): Promise<true | undefined>;
80
+ destroyAsync(): Promise<boolean>;
71
81
  constructor: Function;
72
82
  toString(): string;
73
83
  toLocaleString(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"createDestroyableSubClass.d.ts","sourceRoot":"","sources":["../src/createDestroyableSubClass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,WAAW,EAAE,CAAC;kBAA9B,GAAG;QAO7D;;WAEG;;;QAMH;;WAEG;qBACU,YAAY,EAAE;QAE3B;;;;WAIG;mBACQ,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAK7C;;;;WAIG;yBACc,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAMnD;;;;;WAKG;mBACQ,CAAC,8BAA8B,CAAC,SAAS,OAAO,GAAG,CAAC;QAQ/D;;;;WAIG;yBACc,CAAC,8BAA8B,CAAC,GAAG,CAAC;QASrD;;;WAGG;gBACK,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;gBAClC,CAAC,8BAA8B,CAAC,iBAAiB,OAAO,GAAG,CAAC;gBAC5D,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,iBAAiB,OAAO,GAAG,CAAC;sBAS1E,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;sBAClC,CAAC,8BAA8B,CAAC,GAAG,CAAC;sBACpC,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,GAAG,CAAC;QActE;;;;WAIG;;QAMH;;WAEG;;QAkBH;;;;WAIG;;;;;;;;;;MAiDV;AAMD;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,UAAU,CAAC,OAAO,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE9I;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"createDestroyableSubClass.d.ts","sourceRoot":"","sources":["../src/createDestroyableSubClass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,WAAW,EAAE,CAAC;kBAA9B,GAAG;QAQ7D;;;;WAIG;;QAGH;;WAEG;;;QAMH;;WAEG;;QAMH;;WAEG;qBACU,YAAY,EAAE;QAE3B;;;;WAIG;mBACQ,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAK7C;;;;WAIG;yBACc,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAMnD;;;;;WAKG;mBACQ,CAAC,8BAA8B,CAAC,SAAS,OAAO,GAAG,CAAC;QAQ/D;;;;WAIG;yBACc,CAAC,8BAA8B,CAAC,GAAG,CAAC;QASrD;;;WAGG;gBACK,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;gBAClC,CAAC,8BAA8B,CAAC,iBAAiB,OAAO,GAAG,CAAC;gBAC5D,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,iBAAiB,OAAO,GAAG,CAAC;sBAS1E,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;sBAClC,CAAC,8BAA8B,CAAC,GAAG,CAAC;sBACpC,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,GAAG,CAAC;QActE;;;;WAIG;;QAMH;;WAEG;;QA8BH;;;;WAIG;;;;;;;;;;MAmCV;AAMD;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,UAAU,CAAC,OAAO,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE9I;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ var Destroyable=function(o,c){"use strict";var m=Object.defineProperty;var w=(o,c,y)=>c in o?m(o,c,{enumerable:!0,configurable:!0,writable:!0,value:y}):o[c]=y;var h=(o,c,y)=>w(o,typeof c!="symbol"?c+"":c,y);class y{constructor(){h(this,"refCount",0);h(this,"_isDestroyed",!1);h(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const t=this._destroyers.indexOf(e);return this._destroyers.splice(t,1),e}disposeObj(e,t){const n=t?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(n),e.__destroyable_destroyer=n,e}cancelDisposeObj(e){const t=e.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),e}dispose(e,t){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,t)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(n){console.error("销毁函数在同步销毁时出错",this,t,n)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{const n=t();n&&n instanceof Promise&&await n}catch(n){console.error("销毁函数在异步销毁时出错",this,t,n)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}}function a(){throw"已销毁"}function f(i){for(var e in i)typeof i[e]=="function"&&(i[e]=a);return i._isDestroyed=!0,!0}function u(i){for(var e in i)!(e in y.prototype)&&typeof i[e]=="function"&&(i[e]=a);return i._isDestroyed=!0,!0}function l(i){class e extends i{constructor(){super(...arguments);h(this,"refCount",0);h(this,"_isDestroyed",!1);h(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const r=this._destroyers.indexOf(s);return this._destroyers.splice(r,1),s}disposeObj(s,r){const d=r?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(d),s.__destroyable_destroyer=d,s}cancelDisposeObj(s){const r=s.__destroyable_destroyer;return r&&this.cancelDisposeFun(r),s}dispose(s,r){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,r)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{r()}catch(d){console.error("销毁函数在同步销毁时出错",this,r,d)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{const d=r();d&&d instanceof Promise&&await d}catch(d){console.error("销毁函数在异步销毁时出错",this,r,d)}}this._destroyers.length=0;try{const r=this.destroyThis();r&&r instanceof Promise&&await r}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}}return e}var D=Object.defineProperty,p=(i,e,t)=>e in i?D(i,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):i[e]=t,_=(i,e,t)=>(p(i,e+"",t),t);if(!globalThis.CustomEvent){class i extends Event{constructor(t,n){super(t,n),_(this,"detail"),this.detail=n==null?void 0:n.detail}}globalThis.CustomEvent=i}class v extends EventTarget{addEventListener(e,t,n){const s=n==null?void 0:n.times;if(s){const r=typeof t=="function"?t:t==null?void 0:t.handleEvent;if(r)return this.multipleListen(e,r,s)}return super.addEventListener(e,t,n),()=>{this.removeEventListener(e,t,n)}}dispatchEvent(e,t){const n=e instanceof Event?e:new CustomEvent(e,{detail:t,bubbles:!1,cancelable:!0,composed:!1});return super.dispatchEvent(n)}onceListen(e,t,n){return this.addEventListener(e,t,{...n,once:!0})}multipleListen(e,t,n){let s=0;const r=new AbortController,d=r.signal;return super.addEventListener(e,E=>{++s>=n&&r.abort(),t.call(this,E)},{signal:d}),function(){r.abort()}}}const b=l(v),g=l(c.EventEmitter);return o.Destroyable=y,o.NodeDestroyable=g,o.WebDestroyable=b,o.createDestroyableSubClass=l,o.destroyDestroyable=u,o.destroyObject=f,o.throwOnDestroyed=a,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),o}({},node_events);
package/dist/index.js CHANGED
@@ -1,15 +1,21 @@
1
- var a = Object.defineProperty;
2
- var l = (t, e, r) => e in t ? a(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
3
- var o = (t, e, r) => l(t, typeof e != "symbol" ? e + "" : e, r);
4
- import { EventBus as f } from "@gby/event-bus";
5
- import { EventEmitter as p } from "node:events";
6
- class _ {
1
+ var u = Object.defineProperty;
2
+ var a = (i, e, s) => e in i ? u(i, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[e] = s;
3
+ var y = (i, e, s) => a(i, typeof e != "symbol" ? e + "" : e, s);
4
+ import { EventBus as l } from "@gby/event-bus";
5
+ import { EventEmitter as f } from "node:events";
6
+ class p {
7
7
  constructor() {
8
- o(this, "_isDestroyed", !1);
8
+ /**
9
+ * 引用计数
10
+ * @remarks
11
+ * 引用计数为 0 时,对象才会被销毁
12
+ */
13
+ y(this, "refCount", 0);
14
+ y(this, "_isDestroyed", !1);
9
15
  /**
10
16
  * 销毁者
11
17
  */
12
- o(this, "_destroyers", []);
18
+ y(this, "_destroyers", []);
13
19
  }
14
20
  /**
15
21
  * 是否已经销毁
@@ -17,6 +23,12 @@ class _ {
17
23
  get isDestroyed() {
18
24
  return this._isDestroyed;
19
25
  }
26
+ /**
27
+ * 是否可以销毁
28
+ */
29
+ get canDestroy() {
30
+ return !this.isDestroyed && this.refCount <= 0;
31
+ }
20
32
  /**
21
33
  * 添加销毁者
22
34
  * @param fun
@@ -31,8 +43,8 @@ class _ {
31
43
  * @returns
32
44
  */
33
45
  cancelDisposeFun(e) {
34
- const r = this._destroyers.indexOf(e);
35
- return this._destroyers.splice(r, 1), e;
46
+ const s = this._destroyers.indexOf(e);
47
+ return this._destroyers.splice(s, 1), e;
36
48
  }
37
49
  /**
38
50
  * 添加销毁对象
@@ -40,13 +52,13 @@ class _ {
40
52
  * @param sync - 表示是否使用 `obj.destroy()` 方法进行销毁;默认使用 `obj.destroyAsync()` 方法进行销毁
41
53
  * @returns
42
54
  */
43
- disposeObj(e, r) {
44
- const n = r ? function() {
55
+ disposeObj(e, s) {
56
+ const o = s ? function() {
45
57
  return e.destroy();
46
58
  } : function() {
47
59
  return e.destroyAsync();
48
60
  };
49
- return this.disposeFun(n), e.__destroyable_destroyer = n, e;
61
+ return this.disposeFun(o), e.__destroyable_destroyer = o, e;
50
62
  }
51
63
  /**
52
64
  * 取消销毁者函数
@@ -54,11 +66,11 @@ class _ {
54
66
  * @returns
55
67
  */
56
68
  cancelDisposeObj(e) {
57
- const r = e.__destroyable_destroyer;
58
- return r && this.cancelDisposeFun(r), e;
69
+ const s = e.__destroyable_destroyer;
70
+ return s && this.cancelDisposeFun(s), e;
59
71
  }
60
- dispose(e, r) {
61
- return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, r);
72
+ dispose(e, s) {
73
+ return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, s);
62
74
  }
63
75
  cancelDispose(e) {
64
76
  return typeof e == "function" ? this.cancelDisposeFun(e) : this.cancelDisposeObj(e);
@@ -74,14 +86,23 @@ class _ {
74
86
  * 销毁
75
87
  */
76
88
  destroy() {
77
- if (this.isDestroyed) return !0;
89
+ if (!this.canDestroy) return this.isDestroyed;
78
90
  let e = this._destroyers.length;
79
- for (; --e >= 0; )
91
+ for (; --e >= 0; ) {
92
+ const s = this._destroyers[e];
80
93
  try {
81
- this._destroyers[e]();
82
- } catch {
94
+ s();
95
+ } catch (o) {
96
+ console.error("销毁函数在同步销毁时出错", this, s, o);
83
97
  }
84
- this._destroyers.length = 0, this.destroyThis(), u(this);
98
+ }
99
+ this._destroyers.length = 0;
100
+ try {
101
+ this.destroyThis();
102
+ } catch (s) {
103
+ console.error("destroyThis 在异步销毁时出错", this, s);
104
+ }
105
+ return c(this), !0;
85
106
  }
86
107
  /**
87
108
  * 异步销毁
@@ -89,38 +110,55 @@ class _ {
89
110
  * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
90
111
  */
91
112
  async destroyAsync() {
92
- if (this.isDestroyed) return !0;
113
+ if (!this.canDestroy) return this.isDestroyed;
93
114
  let e = this._destroyers.length;
94
- for (; --e >= 0; )
115
+ for (; --e >= 0; ) {
116
+ const s = this._destroyers[e];
95
117
  try {
96
- await this._destroyers[e]();
97
- } catch {
118
+ const o = s();
119
+ o && o instanceof Promise && await o;
120
+ } catch (o) {
121
+ console.error("销毁函数在异步销毁时出错", this, s, o);
98
122
  }
99
- this._destroyers.length = 0, await this.destroyThis(), u(this);
123
+ }
124
+ this._destroyers.length = 0;
125
+ try {
126
+ const s = this.destroyThis();
127
+ s && s instanceof Promise && await s;
128
+ } catch (s) {
129
+ console.error("destroyThis 在异步销毁时出错", this, s);
130
+ }
131
+ return c(this), !0;
100
132
  }
101
133
  }
102
- function y() {
134
+ function h() {
103
135
  throw "已销毁";
104
136
  }
105
- function x(t) {
106
- for (var e in t)
107
- typeof t[e] == "function" && (t[e] = y);
108
- return t._isDestroyed = !0, !0;
137
+ function w(i) {
138
+ for (var e in i)
139
+ typeof i[e] == "function" && (i[e] = h);
140
+ return i._isDestroyed = !0, !0;
109
141
  }
110
- function u(t) {
111
- for (var e in t)
112
- !(e in _.prototype) && typeof t[e] == "function" && (t[e] = y);
113
- return t._isDestroyed = !0, !0;
142
+ function c(i) {
143
+ for (var e in i)
144
+ !(e in p.prototype) && typeof i[e] == "function" && (i[e] = h);
145
+ return i._isDestroyed = !0, !0;
114
146
  }
115
- function c(t) {
116
- class e extends t {
147
+ function d(i) {
148
+ class e extends i {
117
149
  constructor() {
118
150
  super(...arguments);
119
- o(this, "_isDestroyed", !1);
151
+ /**
152
+ * 引用计数
153
+ * @remarks
154
+ * 引用计数为 0 时,对象才会被销毁
155
+ */
156
+ y(this, "refCount", 0);
157
+ y(this, "_isDestroyed", !1);
120
158
  /**
121
159
  * 销毁者
122
160
  */
123
- o(this, "_destroyers", []);
161
+ y(this, "_destroyers", []);
124
162
  }
125
163
  /**
126
164
  * 是否已经销毁
@@ -128,22 +166,28 @@ function c(t) {
128
166
  get isDestroyed() {
129
167
  return this._isDestroyed;
130
168
  }
169
+ /**
170
+ * 是否可以销毁
171
+ */
172
+ get canDestroy() {
173
+ return !this.isDestroyed && this.refCount <= 0;
174
+ }
131
175
  /**
132
176
  * 添加销毁者
133
177
  * @param fun
134
178
  * @returns 返回销毁者的顺序
135
179
  */
136
- disposeFun(s) {
137
- return this._destroyers.push(s), s;
180
+ disposeFun(t) {
181
+ return this._destroyers.push(t), t;
138
182
  }
139
183
  /**
140
184
  * 取消销毁者函数
141
185
  * @param fun
142
186
  * @returns
143
187
  */
144
- cancelDisposeFun(s) {
145
- const i = this._destroyers.indexOf(s);
146
- return this._destroyers.splice(i, 1), s;
188
+ cancelDisposeFun(t) {
189
+ const r = this._destroyers.indexOf(t);
190
+ return this._destroyers.splice(r, 1), t;
147
191
  }
148
192
  /**
149
193
  * 添加销毁对象
@@ -151,28 +195,28 @@ function c(t) {
151
195
  * @param sync - 表示是否使用 `obj.destroy()` 方法进行销毁;默认使用 `obj.destroyAsync()` 方法进行销毁
152
196
  * @returns
153
197
  */
154
- disposeObj(s, i) {
155
- const h = i ? function() {
156
- return s.destroy();
198
+ disposeObj(t, r) {
199
+ const n = r ? function() {
200
+ return t.destroy();
157
201
  } : function() {
158
- return s.destroyAsync();
202
+ return t.destroyAsync();
159
203
  };
160
- return this.disposeFun(h), s.__destroyable_destroyer = h, s;
204
+ return this.disposeFun(n), t.__destroyable_destroyer = n, t;
161
205
  }
162
206
  /**
163
207
  * 取消销毁者函数
164
208
  * @param fun
165
209
  * @returns
166
210
  */
167
- cancelDisposeObj(s) {
168
- const i = s.__destroyable_destroyer;
169
- return i && this.cancelDisposeFun(i), s;
211
+ cancelDisposeObj(t) {
212
+ const r = t.__destroyable_destroyer;
213
+ return r && this.cancelDisposeFun(r), t;
170
214
  }
171
- dispose(s, i) {
172
- return typeof s == "function" ? this.disposeFun(s) : this.disposeObj(s, i);
215
+ dispose(t, r) {
216
+ return typeof t == "function" ? this.disposeFun(t) : this.disposeObj(t, r);
173
217
  }
174
- cancelDispose(s) {
175
- return typeof s == "function" ? this.cancelDisposeFun(s) : this.cancelDisposeObj(s);
218
+ cancelDispose(t) {
219
+ return typeof t == "function" ? this.cancelDisposeFun(t) : this.cancelDisposeObj(t);
176
220
  }
177
221
  /**
178
222
  * 自己的销毁方法
@@ -185,14 +229,23 @@ function c(t) {
185
229
  * 销毁
186
230
  */
187
231
  destroy() {
188
- if (this.isDestroyed) return !0;
189
- let s = this._destroyers.length;
190
- for (; --s >= 0; )
232
+ if (!this.canDestroy) return this.isDestroyed;
233
+ let t = this._destroyers.length;
234
+ for (; --t >= 0; ) {
235
+ const r = this._destroyers[t];
191
236
  try {
192
- this._destroyers[s]();
193
- } catch {
237
+ r();
238
+ } catch (n) {
239
+ console.error("销毁函数在同步销毁时出错", this, r, n);
194
240
  }
195
- this._destroyers.length = 0, this.destroyThis(), r(this);
241
+ }
242
+ this._destroyers.length = 0;
243
+ try {
244
+ this.destroyThis();
245
+ } catch (r) {
246
+ console.error("destroyThis 在异步销毁时出错", this, r);
247
+ }
248
+ return c(this), !0;
196
249
  }
197
250
  /**
198
251
  * 异步销毁
@@ -200,30 +253,36 @@ function c(t) {
200
253
  * 会依次执行销毁,并且只有上一个销毁完成之后才会执行下一个销毁
201
254
  */
202
255
  async destroyAsync() {
203
- if (this.isDestroyed) return !0;
204
- let s = this._destroyers.length;
205
- for (; --s >= 0; )
256
+ if (!this.canDestroy) return this.isDestroyed;
257
+ let t = this._destroyers.length;
258
+ for (; --t >= 0; ) {
259
+ const r = this._destroyers[t];
206
260
  try {
207
- await this._destroyers[s]();
208
- } catch {
261
+ const n = r();
262
+ n && n instanceof Promise && await n;
263
+ } catch (n) {
264
+ console.error("销毁函数在异步销毁时出错", this, r, n);
209
265
  }
210
- this._destroyers.length = 0, await this.destroyThis(), r(this);
266
+ }
267
+ this._destroyers.length = 0;
268
+ try {
269
+ const r = this.destroyThis();
270
+ r && r instanceof Promise && await r;
271
+ } catch (r) {
272
+ console.error("destroyThis 在异步销毁时出错", this, r);
273
+ }
274
+ return c(this), !0;
211
275
  }
212
276
  }
213
- function r(n) {
214
- for (var d in n)
215
- !(d in e.prototype) && typeof n[d] == "function" && (n[d] = y);
216
- return n._isDestroyed = !0, !0;
217
- }
218
277
  return e;
219
278
  }
220
- const T = c(f), m = c(p);
279
+ const x = d(l), T = d(f);
221
280
  export {
222
- _ as Destroyable,
223
- m as NodeDestroyable,
224
- T as WebDestroyable,
225
- c as createDestroyableSubClass,
226
- u as destroyDestroyable,
227
- x as destroyObject,
228
- y as throwOnDestroyed
281
+ p as Destroyable,
282
+ T as NodeDestroyable,
283
+ x as WebDestroyable,
284
+ d as createDestroyableSubClass,
285
+ c as destroyDestroyable,
286
+ w as destroyObject,
287
+ h as throwOnDestroyed
229
288
  };
@@ -1 +1 @@
1
- (function(t,r){typeof exports=="object"&&typeof module<"u"?r(exports,require("@gby/event-bus"),require("node:events")):typeof define=="function"&&define.amd?define(["exports","@gby/event-bus","node:events"],r):(t=typeof globalThis<"u"?globalThis:t||self,r(t.Destroyable={},t.eventBus,t.node_events))})(this,function(t,r,y){"use strict";var g=Object.defineProperty;var v=(t,r,y)=>r in t?g(t,r,{enumerable:!0,configurable:!0,writable:!0,value:y}):t[r]=y;var u=(t,r,y)=>v(t,typeof r!="symbol"?r+"":r,y);class a{constructor(){u(this,"_isDestroyed",!1);u(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const i=this._destroyers.indexOf(e);return this._destroyers.splice(i,1),e}disposeObj(e,i){const d=i?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(d),e.__destroyable_destroyer=d,e}cancelDisposeObj(e){const i=e.__destroyable_destroyer;return i&&this.cancelDisposeFun(i),e}dispose(e,i){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,i)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(this.isDestroyed)return!0;let e=this._destroyers.length;for(;--e>=0;)try{this._destroyers[e]()}catch{}this._destroyers.length=0,this.destroyThis(),f(this)}async destroyAsync(){if(this.isDestroyed)return!0;let e=this._destroyers.length;for(;--e>=0;)try{await this._destroyers[e]()}catch{}this._destroyers.length=0,await this.destroyThis(),f(this)}}function h(){throw"已销毁"}function D(n){for(var e in n)typeof n[e]=="function"&&(n[e]=h);return n._isDestroyed=!0,!0}function f(n){for(var e in n)!(e in a.prototype)&&typeof n[e]=="function"&&(n[e]=h);return n._isDestroyed=!0,!0}function l(n){class e extends n{constructor(){super(...arguments);u(this,"_isDestroyed",!1);u(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const o=this._destroyers.indexOf(s);return this._destroyers.splice(o,1),s}disposeObj(s,o){const p=o?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(p),s.__destroyable_destroyer=p,s}cancelDisposeObj(s){const o=s.__destroyable_destroyer;return o&&this.cancelDisposeFun(o),s}dispose(s,o){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,o)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(this.isDestroyed)return!0;let s=this._destroyers.length;for(;--s>=0;)try{this._destroyers[s]()}catch{}this._destroyers.length=0,this.destroyThis(),i(this)}async destroyAsync(){if(this.isDestroyed)return!0;let s=this._destroyers.length;for(;--s>=0;)try{await this._destroyers[s]()}catch{}this._destroyers.length=0,await this.destroyThis(),i(this)}}function i(d){for(var c in d)!(c in e.prototype)&&typeof d[c]=="function"&&(d[c]=h);return d._isDestroyed=!0,!0}return e}const _=l(r.EventBus),b=l(y.EventEmitter);t.Destroyable=a,t.NodeDestroyable=b,t.WebDestroyable=_,t.createDestroyableSubClass=l,t.destroyDestroyable=f,t.destroyObject=D,t.throwOnDestroyed=h,Object.defineProperty(t,Symbol.toStringTag,{value:"Module"})});
1
+ (function(i,o){typeof exports=="object"&&typeof module<"u"?o(exports,require("@gby/event-bus"),require("node:events")):typeof define=="function"&&define.amd?define(["exports","@gby/event-bus","node:events"],o):(i=typeof globalThis<"u"?globalThis:i||self,o(i.Destroyable={},i.eventBus,i.node_events))})(this,function(i,o,h){"use strict";var b=Object.defineProperty;var g=(i,o,h)=>o in i?b(i,o,{enumerable:!0,configurable:!0,writable:!0,value:h}):i[o]=h;var c=(i,o,h)=>g(i,typeof o!="symbol"?o+"":o,h);class l{constructor(){c(this,"refCount",0);c(this,"_isDestroyed",!1);c(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const t=this._destroyers.indexOf(e);return this._destroyers.splice(t,1),e}disposeObj(e,t){const y=t?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(y),e.__destroyable_destroyer=y,e}cancelDisposeObj(e){const t=e.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),e}dispose(e,t){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,t)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(y){console.error("销毁函数在同步销毁时出错",this,t,y)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{const y=t();y&&y instanceof Promise&&await y}catch(y){console.error("销毁函数在异步销毁时出错",this,t,y)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}}function a(){throw"已销毁"}function D(n){for(var e in n)typeof n[e]=="function"&&(n[e]=a);return n._isDestroyed=!0,!0}function u(n){for(var e in n)!(e in l.prototype)&&typeof n[e]=="function"&&(n[e]=a);return n._isDestroyed=!0,!0}function f(n){class e extends n{constructor(){super(...arguments);c(this,"refCount",0);c(this,"_isDestroyed",!1);c(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const r=this._destroyers.indexOf(s);return this._destroyers.splice(r,1),s}disposeObj(s,r){const d=r?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(d),s.__destroyable_destroyer=d,s}cancelDisposeObj(s){const r=s.__destroyable_destroyer;return r&&this.cancelDisposeFun(r),s}dispose(s,r){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,r)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{r()}catch(d){console.error("销毁函数在同步销毁时出错",this,r,d)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{const d=r();d&&d instanceof Promise&&await d}catch(d){console.error("销毁函数在异步销毁时出错",this,r,d)}}this._destroyers.length=0;try{const r=this.destroyThis();r&&r instanceof Promise&&await r}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}}return e}const _=f(o.EventBus),p=f(h.EventEmitter);i.Destroyable=l,i.NodeDestroyable=p,i.WebDestroyable=_,i.createDestroyableSubClass=f,i.destroyDestroyable=u,i.destroyObject=D,i.throwOnDestroyed=a,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gby/destroyable",
3
- "version": "1.0.2",
3
+ "version": "1.1.0",
4
4
  "description": "@gby/destroyable 提供了用于构建可销毁对象的类的基类,用于使得地管理可销毁对象的生命周期",
5
5
  "main": "./dist/index.umd.cjs",
6
6
  "module": "./dist/index.js",
@@ -8,7 +8,8 @@
8
8
  "exports": {
9
9
  "require": "./dist/index.umd.cjs",
10
10
  "types": "./dist/index.d.ts",
11
- "import": "./dist/index.js"
11
+ "import": "./dist/index.js",
12
+ "default": "./dist/index.js"
12
13
  },
13
14
  "type": "module",
14
15
  "sideEffects": false,
@@ -1,11 +0,0 @@
1
- // This file is read by tools that parse documentation comments conforming to the TSDoc standard.
2
- // It should be published with your NPM package. It should not be tracked by Git.
3
- {
4
- "tsdocVersion": "0.12",
5
- "toolPackages": [
6
- {
7
- "packageName": "@microsoft/api-extractor",
8
- "packageVersion": "7.52.8"
9
- }
10
- ]
11
- }