@zajno/common 1.3.13 → 1.3.14

package/lib/lazy.light.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.light.d.ts","sourceRoot":"","sources":["../src/lazy.light.ts"],"names":[],"mappings":"AACA,oBAAY,SAAS,CAAC,CAAC,IAAI;IACvB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,KAAK,IAAI,IAAI,CAAC;CACjB,CAAC;AAEF,wBAAgB,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,gBAgB7C"}
+{"version":3,"file":"lazy.light.d.ts","sourceRoot":"","sources":["../src/lazy.light.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,oBAAY,SAAS,CAAC,CAAC,IAAI,WAAW,GAAG;IACrC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,KAAK,IAAI,IAAI,CAAC;CACjB,CAAC;AAEF,wBAAgB,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,gBAmB7C"}

package/lib/lazy.light.js

@@ -2,20 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLazy = void 0;
 function createLazy(factory) {
-    return {
-        _factory: factory,
-        _instance: undefined,
+    const _factory = factory;
+    let _instance = undefined;
+    const res = {
         get value() {
-            if (this._instance === undefined) {
-                this._instance = this._factory();
+            if (_instance === undefined) {
+                _instance = _factory();
             }
-            return this._instance;
+            return _instance;
         },
-        get hasValue() { return this._instance !== undefined; },
-        reset() {
-            this._instance = undefined;
+        get hasValue() { return _instance !== undefined; },
+        reset: () => {
+            _instance = undefined;
         },
+        dispose: () => res.reset(),
     };
+    return res;
 }
 exports.createLazy = createLazy;
 //# sourceMappingURL=lazy.light.js.map

package/lib/lazy.light.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.light.js","sourceRoot":"","sources":["../src/lazy.light.ts"],"names":[],"mappings":";;;AAQA,SAAgB,UAAU,CAAI,OAAgB;IAC1C,OAAO;QACH,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,SAAc;QACzB,IAAI,KAAK;YACL,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;aACpC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;QACD,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;QACvD,KAAK;YACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC/B,CAAC;KAEY,CAAC;AACtB,CAAC;AAhBD,gCAgBC"}
+{"version":3,"file":"lazy.light.js","sourceRoot":"","sources":["../src/lazy.light.ts"],"names":[],"mappings":";;;AASA,SAAgB,UAAU,CAAI,OAAgB;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC;IACzB,IAAI,SAAS,GAAM,SAAS,CAAC;IAE7B,MAAM,GAAG,GAAiB;QACtB,IAAI,KAAK;YACL,IAAI,SAAS,KAAK,SAAS,EAAE;gBACzB,SAAS,GAAG,QAAQ,EAAE,CAAC;aAC1B;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,QAAQ,KAAK,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;QAClD,KAAK,EAAE,GAAG,EAAE;YACR,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE;KAC7B,CAAC;IAEF,OAAO,GAAG,CAAC;AACf,CAAC;AAnBD,gCAmBC"}

package/lib/pool.d.ts

@@ -1,7 +1,15 @@
+import type { IDisposable } from './disposer';
 export declare class Pool<T> {
-    private _container;
-    get(factory: () => T): T;
-    release(e: T): void;
-    release(e: T[]): void;
+    readonly factory: () => T;
+    private readonly _container;
+    constructor(factory: () => T);
+    get(): T;
+    release(e: T | T[]): void;
+}
+export declare class PoolDisposable<T extends IDisposable> extends Pool<T> {
+    readonly initializer: (item: T) => void;
+    constructor(factory: () => T, initializer?: (item: T) => void);
+    get(): T;
+    release(e: T | T[]): void;
 }
 //# sourceMappingURL=pool.d.ts.map

package/lib/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AACA,qBAAa,IAAI,CAAC,CAAC;IAEf,OAAO,CAAC,UAAU,CAAW;IAE7B,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;IAQxB,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI;IACnB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI;CASxB"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,qBAAa,IAAI,CAAC,CAAC;IAIH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAFrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;gBAEjB,OAAO,EAAE,MAAM,CAAC;IAE9B,GAAG,IAAI,CAAC;IAQR,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI;CAOnC;AAED,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,IAAI,CAAC,CAAC,CAAC;IAEhC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI;gBAAzD,OAAO,EAAE,MAAM,CAAC,EAAW,WAAW,GAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAW;IAIrE,GAAG,IAAI,CAAC;IAMR,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI;CAQnC"}

package/lib/pool.js

@@ -1,26 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Pool = void 0;
+exports.PoolDisposable = exports.Pool = void 0;
+const functions_1 = require("functions");
 class Pool {
-    constructor() {
+    constructor(factory) {
+        this.factory = factory;
         this._container = [];
     }
-    get(factory) {
+    get() {
         if (this._container.length > 0) {
             return this._container.pop();
         }
         else {
-            return factory();
+            return this.factory();
         }
     }
     release(e) {
         if (Array.isArray(e)) {
             this._container.push(...e);
         }
-        else {
+        else if (e) {
             this._container.push(e);
         }
     }
 }
 exports.Pool = Pool;
+class PoolDisposable extends Pool {
+    constructor(factory, initializer = null) {
+        super(factory);
+        this.initializer = initializer;
+    }
+    get() {
+        const res = super.get();
+        functions_1.safeCall(this.initializer, res);
+        return res;
+    }
+    release(e) {
+        if (Array.isArray(e)) {
+            e.forEach(ee => ee.dispose());
+        }
+        else if (e) {
+            e.dispose();
+        }
+        return super.release(e);
+    }
+}
+exports.PoolDisposable = PoolDisposable;
 //# sourceMappingURL=pool.js.map

package/lib/pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":";;;AACA,MAAa,IAAI;IAAjB;QAEY,eAAU,GAAQ,EAAE,CAAC;IAoBjC,CAAC;IAlBG,GAAG,CAAC,OAAgB;QAChB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;SAChC;aAAM;YACH,OAAO,OAAO,EAAE,CAAC;SACpB;IACL,CAAC;IAKD,OAAO,CAAC,CAAU;QACd,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3B;IACL,CAAC;CACJ;AAtBD,oBAsBC"}
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAGrC,MAAa,IAAI;IAIb,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;QAFpB,eAAU,GAAQ,EAAE,CAAC;IAEG,CAAC;IAEnC,GAAG;QACN,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;SAChC;aAAM;YACH,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;SACzB;IACL,CAAC;IAEM,OAAO,CAAC,CAAU;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAC9B;aAAM,IAAI,CAAC,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3B;IACL,CAAC;CACJ;AArBD,oBAqBC;AAED,MAAa,cAAsC,SAAQ,IAAO;IAE9D,YAAY,OAAgB,EAAW,cAAiC,IAAI;QACxE,KAAK,CAAC,OAAO,CAAC,CAAC;QADoB,gBAAW,GAAX,WAAW,CAA0B;IAE5E,CAAC;IAEM,GAAG;QACN,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACxB,oBAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAChC,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,CAAU;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;SACjC;aAAM,IAAI,CAAC,EAAE;YACV,CAAC,CAAC,OAAO,EAAE,CAAC;SACf;QACD,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;CACJ;AApBD,wCAoBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/disposer.ts

@@ -59,9 +59,12 @@ export class Disposer {
             );
         }
 
-        this._disposers.forEach(d => d());
+        const copy = this._disposers.slice().reverse();
         this._disposers.length = 0;
         this._map.clear();
+
+        // this should separate side effects
+        copy.forEach(d => d());
     }
 }
 

package/src/lazy.light.ts

@@ -1,5 +1,6 @@
+import type { IDisposable } from './disposer';
 
-export type LazyLight<T> = {
+export type LazyLight<T> = IDisposable & {
     readonly value: T;
     readonly hasValue: boolean;
 
@@ -7,19 +8,22 @@ export type LazyLight<T> = {
 };
 
 export function createLazy<T>(factory: () => T) {
-    return {
-        _factory: factory,
-        _instance: undefined as T,
+    const _factory = factory;
+    let _instance: T = undefined;
+
+    const res: LazyLight<T> = {
         get value() {
-            if (this._instance === undefined) {
-                this._instance = this._factory();
+            if (_instance === undefined) {
+                _instance = _factory();
             }
-            return this._instance;
+            return _instance;
         },
-        get hasValue() { return this._instance !== undefined; },
-        reset() {
-            this._instance = undefined;
+        get hasValue() { return _instance !== undefined; },
+        reset: () => {
+            _instance = undefined;
         },
+        dispose: () => res.reset(),
+    };
 
-    } as LazyLight<T>;
+    return res;
 }

package/src/lazy.ts

@@ -1,6 +1,7 @@
-import { observable, transaction, makeObservable } from 'mobx';
+import type { IDisposable } from 'disposer';
+import { observable, makeObservable, action } from 'mobx';
 
-export default class Lazy<T> {
+export default class Lazy<T> implements IDisposable {
 
     @observable.ref
     private _instance: T = null;
@@ -25,9 +26,11 @@ export default class Lazy<T> {
     reset() {
         this._instance = null;
     }
+
+    dispose = () => this.reset();
 }
 
-export class LazyPromise<T> {
+export class LazyPromise<T> implements IDisposable {
 
     @observable.ref
     private _instance: T = null;
@@ -50,23 +53,27 @@ export class LazyPromise<T> {
     get() {
         if (!this._loaded && !this._busy) {
             this._busy = true;
-            this._factory().then(res => {
-                transaction(() => {
-                    this._busy = false;
-                    this._loaded = true;
-                    this._instance = res;
-                });
-            });
+            this._factory().then(this.setInstance);
         }
 
         return this._instance;
     }
 
+    @action
+    private setInstance = (res: T) => {
+        const wasBusy = this._busy;
+
+        this._busy = false;
+        this._loaded = wasBusy;
+        this._instance = wasBusy ? res : null;
+    };
+
+    @action
     reset() {
-        transaction(() => {
-            this._busy = false;
-            this._instance = this.initial;
-            this._loaded = false;
-        });
+        this._busy = false;
+        this._instance = this.initial;
+        this._loaded = false;
     }
+
+    dispose = () => this.reset();
 }

package/src/pool.ts

@@ -1,24 +1,47 @@
+import { safeCall } from 'functions';
+import type { IDisposable } from './disposer';
 
 export class Pool<T> {
 
-    private _container: T[] = [];
+    private readonly _container: T[] = [];
 
-    get(factory: () => T): T {
+    constructor(readonly factory: () => T) { }
+
+    public get(): T {
         if (this._container.length > 0) {
             return this._container.pop();
         } else {
-            return factory();
+            return this.factory();
         }
     }
 
-    release(e: T): void;
-    release(e: T[]): void;
-
-    release(e: T | T[]) {
+    public release(e: T | T[]): void {
         if (Array.isArray(e)) {
             this._container.push(...e);
-        } else {
+        } else if (e) {
             this._container.push(e);
         }
     }
 }
+
+export class PoolDisposable<T extends IDisposable> extends Pool<T> {
+
+    constructor(factory: () => T, readonly initializer: (item: T) => void = null) {
+        super(factory);
+    }
+
+    public get(): T {
+        const res = super.get();
+        safeCall(this.initializer, res);
+        return res;
+    }
+
+    public release(e: T | T[]): void {
+        if (Array.isArray(e)) {
+            e.forEach(ee => ee.dispose());
+        } else if (e) {
+            e.dispose();
+        }
+        return super.release(e);
+    }
+}

package/yarn.lock

@@ -3046,7 +3046,7 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==