topsyde-utils 1.0.40 → 1.0.41

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.
@@ -4,8 +4,7 @@ export type Constructor<T> = (abstract new (...args: any[]) => T) | (new (...arg
4
4
  declare abstract class Singleton {
5
5
  private static readonly instances;
6
6
  protected constructor();
7
- static GetInstance<T extends Singleton>(this: Constructor<T>): T;
8
- static GetInstance<T extends Singleton, U extends ConstructorParameters<new (...args: any[]) => T>>(this: Constructor<T>, ...args: U): T;
7
+ static GetInstance<T extends Singleton>(this: Constructor<T>, ...args: any[]): T;
9
8
  static GetInstanceCount(): number;
10
9
  }
11
10
  export default Singleton;
package/dist/singleton.js CHANGED
@@ -4,10 +4,28 @@ class Singleton {
4
4
  constructor() { }
5
5
  static GetInstance(...args) {
6
6
  const classReference = this;
7
- if (!Singleton.instances.has(classReference)) {
8
- Singleton.instances.set(classReference, new classReference(...args));
7
+ // Check if this class or any parent class has an instance
8
+ let instance = Singleton.instances.get(classReference);
9
+ // If no instance exists for this exact class, create one
10
+ if (!instance) {
11
+ // Check if any parent class has an instance we should use
12
+ const parentClass = Object.getPrototypeOf(classReference);
13
+ if (parentClass && parentClass !== Function.prototype) {
14
+ const parentInstance = Singleton.instances.get(parentClass);
15
+ if (parentInstance) {
16
+ // Register the parent instance with this class too
17
+ Singleton.instances.set(classReference, parentInstance);
18
+ return parentInstance;
19
+ }
20
+ }
21
+ // Create a new instance
22
+ instance = new classReference(...args);
23
+ if (!instance) {
24
+ throw new Error("Failed to create instance of class");
25
+ }
26
+ Singleton.instances.set(classReference, instance);
9
27
  }
10
- return Singleton.instances.get(classReference);
28
+ return instance;
11
29
  }
12
30
  static GetInstanceCount() {
13
31
  return Singleton.instances.size;
@@ -1 +1 @@
1
- {"version":3,"file":"singleton.js","sourceRoot":"","sources":["../src/singleton.ts"],"names":[],"mappings":";;AAIA,MAAe,SAAS;IAGvB,gBAAyB,CAAC;IAInB,MAAM,CAAC,WAAW,CAA4C,GAAG,IAAW;QAClF,MAAM,cAAc,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC9C,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,IAAK,cAAsB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAC/E,CAAC;QACD,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAM,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,gBAAgB;QAC7B,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IACjC,CAAC;;AAhBuB,mBAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;AAmBpE,kBAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"singleton.js","sourceRoot":"","sources":["../src/singleton.ts"],"names":[],"mappings":";;AAEA,MAAe,SAAS;IAGvB,gBAAyB,CAAC;IAEnB,MAAM,CAAC,WAAW,CAA4C,GAAG,IAAW;QAClF,MAAM,cAAc,GAAG,IAAI,CAAC;QAE5B,0DAA0D;QAC1D,IAAI,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEvD,yDAAyD;QACzD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,0DAA0D;YAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;YAC1D,IAAI,WAAW,IAAI,WAAW,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACvD,MAAM,cAAc,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC5D,IAAI,cAAc,EAAE,CAAC;oBACpB,mDAAmD;oBACnD,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;oBACxD,OAAO,cAAmB,CAAC;gBAC5B,CAAC;YACF,CAAC;YAED,wBAAwB;YACxB,QAAQ,GAAG,IAAK,cAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;YAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACvD,CAAC;YACD,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,QAAa,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,gBAAgB;QAC7B,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IACjC,CAAC;;AApCuB,mBAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;AAuCpE,kBAAe,SAAS,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "topsyde-utils",
3
- "version": "1.0.40",
3
+ "version": "1.0.41",
4
4
  "description": "A bundle of TypeScript utility classes and functions",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",