@thi.ng/idgen - npm Package Compare versions

Comparing version 0.2.12 to 0.2.13

CHANGELOG.md

@@ -6,2 +6,10 @@ # Change Log
 
+## [0.2.13](https://github.com/thi-ng/umbrella/compare/@thi.ng/idgen@[e-mail]/idgen@0.2.13) (2020-05-14)
+
+**Note:** Version bump only for package @thi.ng/idgen
+
+
+
+
+
 ## [0.2.12](https://github.com/thi-ng/umbrella/compare/@thi.ng/idgen@[e-mail]/idgen@0.2.12) (2020-05-03)
@@ -8,0 +16,0 @@

index.js

@@ -5,115 +5,118 @@ import { __decorate } from "tslib";
 export const EVENT_REMOVED = "removed";
-let IDGen = class IDGen {
-    constructor(bits = 32, vbits = 32 - bits, cap = Math.pow(2, bits), next = 0) {
-        const maxCap = Math.pow(2, bits);
-        assert(bits > 0 && bits + vbits <= 32, "wrong total bit size [1..32]");
-        assert(cap <= maxCap, `requested capacity too large for bit size (max. ${maxCap})`);
-        this.ids = [];
-        this.nextID = next;
-        this.start = next;
-        this._capacity = cap;
-        this.num = 0;
-        this.mask = maxCap - 1;
-        this.vmask = (1 << vbits) - 1;
-        this.shift = bits;
-        this._freeID = -1;
-    }
-    id(id) {
-        return id & this.mask;
-    }
-    version(id) {
-        return (id >>> this.shift) & this.vmask;
-    }
-    get capacity() {
-        return this._capacity;
-    }
-    /**
-     * Attempts to set new capacity to given value. Capacity can only be
-     * increased and the operation is only supported for unversioned
-     * instances (i.e. vbits = 0).
-     */
-    set capacity(newCap) {
-        assert(!this.vmask, "can't change capacity w/ versioning enabled");
-        if (newCap >= this.mask + 1) {
-            const bits = Math.ceil(Math.log2(newCap));
-            assert(bits > 0 && bits <= 32, "wrong bit size for new capacity [1..32]");
-            this._capacity = newCap;
-            this.mask = Math.pow(2, bits) - 1;
+let IDGen = /** @class */ (() => {
+    let IDGen = class IDGen {
+        constructor(bits = 32, vbits = 32 - bits, cap = 2 ** bits, next = 0) {
+            const maxCap = 2 ** bits;
+            assert(bits > 0 && bits + vbits <= 32, "wrong total bit size [1..32]");
+            assert(cap <= maxCap, `requested capacity too large for bit size (max. ${maxCap})`);
+            this.ids = [];
+            this.nextID = next;
+            this.start = next;
+            this._capacity = cap;
+            this.num = 0;
+            this.mask = maxCap - 1;
+            this.vmask = (1 << vbits) - 1;
             this.shift = bits;
+            this._freeID = -1;
         }
-        else {
-            throw new Error("can't reduce capacity");
+        id(id) {
+            return id & this.mask;
         }
-    }
-    get available() {
-        return this._capacity - this.num - this.start;
-    }
-    get used() {
-        return this.num;
-    }
-    get freeID() {
-        return this._freeID;
-    }
-    *[Symbol.iterator]() {
-        for (let i = this.nextID; --i >= 0;) {
-            const id = this.ids[i];
-            if ((id & this.mask) === i)
-                yield id;
+        version(id) {
+            return (id >>> this.shift) & this.vmask;
         }
-    }
-    clear() {
-        this.ids.length = 0;
-        this.nextID = this.start;
-        this.num = 0;
-        this._freeID = -1;
-    }
-    next() {
-        let id;
-        if (this._freeID !== -1) {
-            id = this._freeID;
+        get capacity() {
+            return this._capacity;
+        }
+        /**
+         * Attempts to set new capacity to given value. Capacity can only be
+         * increased and the operation is only supported for unversioned
+         * instances (i.e. vbits = 0).
+         */
+        set capacity(newCap) {
+            assert(!this.vmask, "can't change capacity w/ versioning enabled");
+            if (newCap >= this.mask + 1) {
+                const bits = Math.ceil(Math.log2(newCap));
+                assert(bits > 0 && bits <= 32, "wrong bit size for new capacity [1..32]");
+                this._capacity = newCap;
+                this.mask = 2 ** bits - 1;
+                this.shift = bits;
+            }
+            else {
+                throw new Error("can't reduce capacity");
+            }
+        }
+        get available() {
+            return this._capacity - this.num - this.start;
+        }
+        get used() {
+            return this.num;
+        }
+        get freeID() {
+            return this._freeID;
+        }
+        *[Symbol.iterator]() {
+            for (let i = this.nextID; --i >= 0;) {
+                const id = this.ids[i];
+                if ((id & this.mask) === i)
+                    yield id;
+            }
+        }
+        clear() {
+            this.ids.length = 0;
+            this.nextID = this.start;
+            this.num = 0;
+            this._freeID = -1;
+        }
+        next() {
+            let id;
+            if (this._freeID !== -1) {
+                id = this._freeID;
+                const rawID = this.id(id);
+                this._freeID = this.ids[rawID];
+                this.ids[rawID] = id;
+            }
+            else {
+                assert(this.nextID < this._capacity, "max capacity reached");
+                id = this.nextID++;
+                this.ids[id] = id;
+            }
+            this.num++;
+            this.notify({ id: EVENT_ADDED, target: this, value: id });
+            return id;
+        }
+        free(id) {
+            if (!this.has(id))
+                return false;
+            this.ids[this.id(id)] = this._freeID;
+            this._freeID = this.nextVersion(id);
+            this.num--;
+            this.notify({ id: EVENT_REMOVED, target: this, value: id });
+            return true;
+        }
+        has(id) {
             const rawID = this.id(id);
-            this._freeID = this.ids[rawID];
-            this.ids[rawID] = id;
+            return id >= 0 && rawID < this.nextID && this.ids[rawID] === id;
         }
-        else {
-            assert(this.nextID < this._capacity, "max capacity reached");
-            id = this.nextID++;
-            this.ids[id] = id;
+        /** {@inheritDoc @thi.ng/api#INotify.addListener} */
+        // @ts-ignore: mixin
+        addListener(id, fn, scope) { }
+        /** {@inheritDoc @thi.ng/api#INotify.removeListener} */
+        // @ts-ignore: mixin
+        removeListener(id, fn, scope) { }
+        /** {@inheritDoc @thi.ng/api#INotify.notify} */
+        // @ts-ignore: mixin
+        notify(event) { }
+        nextVersion(id) {
+            return (((id & this.mask) |
+                (((this.version(id) + 1) & this.vmask) << this.shift)) >>>
+                0);
         }
-        this.num++;
-        this.notify({ id: EVENT_ADDED, target: this, value: id });
-        return id;
-    }
-    free(id) {
-        if (!this.has(id))
-            return false;
-        this.ids[this.id(id)] = this._freeID;
-        this._freeID = this.nextVersion(id);
-        this.num--;
-        this.notify({ id: EVENT_REMOVED, target: this, value: id });
-        return true;
-    }
-    has(id) {
-        const rawID = this.id(id);
-        return id >= 0 && rawID < this.nextID && this.ids[rawID] === id;
-    }
-    /** {@inheritDoc @thi.ng/api#INotify.addListener} */
-    // @ts-ignore: mixin
-    addListener(id, fn, scope) { }
-    /** {@inheritDoc @thi.ng/api#INotify.removeListener} */
-    // @ts-ignore: mixin
-    removeListener(id, fn, scope) { }
-    /** {@inheritDoc @thi.ng/api#INotify.notify} */
-    // @ts-ignore: mixin
-    notify(event) { }
-    nextVersion(id) {
-        return (((id & this.mask) |
-            (((this.version(id) + 1) & this.vmask) << this.shift)) >>>
-            0);
-    }
-};
-IDGen = __decorate([
-    INotifyMixin
-], IDGen);
+    };
+    IDGen = __decorate([
+        INotifyMixin
+    ], IDGen);
+    return IDGen;
+})();
 export { IDGen };
 export const idgen = (bits, vbits, cap, next) => new IDGen(bits, vbits, cap, next);

lib/index.js

@@ -10,107 +10,111 @@ 'use strict';
 const EVENT_REMOVED = "removed";
-exports.IDGen = class IDGen {
-    constructor(bits = 32, vbits = 32 - bits, cap = Math.pow(2, bits), next = 0) {
-        const maxCap = Math.pow(2, bits);
-        api.assert(bits > 0 && bits + vbits <= 32, "wrong total bit size [1..32]");
-        api.assert(cap <= maxCap, `requested capacity too large for bit size (max. ${maxCap})`);
-        this.ids = [];
-        this.nextID = next;
-        this.start = next;
-        this._capacity = cap;
-        this.num = 0;
-        this.mask = maxCap - 1;
-        this.vmask = (1 << vbits) - 1;
-        this.shift = bits;
-        this._freeID = -1;
-    }
-    id(id) {
-        return id & this.mask;
-    }
-    version(id) {
-        return (id >>> this.shift) & this.vmask;
-    }
-    get capacity() {
-        return this._capacity;
-    }
-    set capacity(newCap) {
-        api.assert(!this.vmask, "can't change capacity w/ versioning enabled");
-        if (newCap >= this.mask + 1) {
-            const bits = Math.ceil(Math.log2(newCap));
-            api.assert(bits > 0 && bits <= 32, "wrong bit size for new capacity [1..32]");
-            this._capacity = newCap;
-            this.mask = Math.pow(2, bits) - 1;
+let IDGen =  (() => {
+    let IDGen = class IDGen {
+        constructor(bits = 32, vbits = 32 - bits, cap = 2 ** bits, next = 0) {
+            const maxCap = 2 ** bits;
+            api.assert(bits > 0 && bits + vbits <= 32, "wrong total bit size [1..32]");
+            api.assert(cap <= maxCap, `requested capacity too large for bit size (max. ${maxCap})`);
+            this.ids = [];
+            this.nextID = next;
+            this.start = next;
+            this._capacity = cap;
+            this.num = 0;
+            this.mask = maxCap - 1;
+            this.vmask = (1 << vbits) - 1;
             this.shift = bits;
+            this._freeID = -1;
         }
-        else {
-            throw new Error("can't reduce capacity");
+        id(id) {
+            return id & this.mask;
         }
-    }
-    get available() {
-        return this._capacity - this.num - this.start;
-    }
-    get used() {
-        return this.num;
-    }
-    get freeID() {
-        return this._freeID;
-    }
-    *[Symbol.iterator]() {
-        for (let i = this.nextID; --i >= 0;) {
-            const id = this.ids[i];
-            if ((id & this.mask) === i)
-                yield id;
+        version(id) {
+            return (id >>> this.shift) & this.vmask;
         }
-    }
-    clear() {
-        this.ids.length = 0;
-        this.nextID = this.start;
-        this.num = 0;
-        this._freeID = -1;
-    }
-    next() {
-        let id;
-        if (this._freeID !== -1) {
-            id = this._freeID;
+        get capacity() {
+            return this._capacity;
+        }
+        set capacity(newCap) {
+            api.assert(!this.vmask, "can't change capacity w/ versioning enabled");
+            if (newCap >= this.mask + 1) {
+                const bits = Math.ceil(Math.log2(newCap));
+                api.assert(bits > 0 && bits <= 32, "wrong bit size for new capacity [1..32]");
+                this._capacity = newCap;
+                this.mask = 2 ** bits - 1;
+                this.shift = bits;
+            }
+            else {
+                throw new Error("can't reduce capacity");
+            }
+        }
+        get available() {
+            return this._capacity - this.num - this.start;
+        }
+        get used() {
+            return this.num;
+        }
+        get freeID() {
+            return this._freeID;
+        }
+        *[Symbol.iterator]() {
+            for (let i = this.nextID; --i >= 0;) {
+                const id = this.ids[i];
+                if ((id & this.mask) === i)
+                    yield id;
+            }
+        }
+        clear() {
+            this.ids.length = 0;
+            this.nextID = this.start;
+            this.num = 0;
+            this._freeID = -1;
+        }
+        next() {
+            let id;
+            if (this._freeID !== -1) {
+                id = this._freeID;
+                const rawID = this.id(id);
+                this._freeID = this.ids[rawID];
+                this.ids[rawID] = id;
+            }
+            else {
+                api.assert(this.nextID < this._capacity, "max capacity reached");
+                id = this.nextID++;
+                this.ids[id] = id;
+            }
+            this.num++;
+            this.notify({ id: EVENT_ADDED, target: this, value: id });
+            return id;
+        }
+        free(id) {
+            if (!this.has(id))
+                return false;
+            this.ids[this.id(id)] = this._freeID;
+            this._freeID = this.nextVersion(id);
+            this.num--;
+            this.notify({ id: EVENT_REMOVED, target: this, value: id });
+            return true;
+        }
+        has(id) {
             const rawID = this.id(id);
-            this._freeID = this.ids[rawID];
-            this.ids[rawID] = id;
+            return id >= 0 && rawID < this.nextID && this.ids[rawID] === id;
         }
-        else {
-            api.assert(this.nextID < this._capacity, "max capacity reached");
-            id = this.nextID++;
-            this.ids[id] = id;
+        addListener(id, fn, scope) { }
+        removeListener(id, fn, scope) { }
+        notify(event) { }
+        nextVersion(id) {
+            return (((id & this.mask) |
+                (((this.version(id) + 1) & this.vmask) << this.shift)) >>>
+                0);
         }
-        this.num++;
-        this.notify({ id: EVENT_ADDED, target: this, value: id });
-        return id;
-    }
-    free(id) {
-        if (!this.has(id))
-            return false;
-        this.ids[this.id(id)] = this._freeID;
-        this._freeID = this.nextVersion(id);
-        this.num--;
-        this.notify({ id: EVENT_REMOVED, target: this, value: id });
-        return true;
-    }
-    has(id) {
-        const rawID = this.id(id);
-        return id >= 0 && rawID < this.nextID && this.ids[rawID] === id;
-    }
-    addListener(id, fn, scope) { }
-    removeListener(id, fn, scope) { }
-    notify(event) { }
-    nextVersion(id) {
-        return (((id & this.mask) |
-            (((this.version(id) + 1) & this.vmask) << this.shift)) >>>
-            0);
-    }
-};
-exports.IDGen = tslib.__decorate([
-    api.INotifyMixin
-], exports.IDGen);
-const idgen = (bits, vbits, cap, next) => new exports.IDGen(bits, vbits, cap, next);
+    };
+    IDGen = tslib.__decorate([
+        api.INotifyMixin
+    ], IDGen);
+    return IDGen;
+})();
+const idgen = (bits, vbits, cap, next) => new IDGen(bits, vbits, cap, next);
 
 exports.EVENT_ADDED = EVENT_ADDED;
 exports.EVENT_REMOVED = EVENT_REMOVED;
+exports.IDGen = IDGen;
 exports.idgen = idgen;

lib/index.umd.js

@@ -1,1 +0,1 @@
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports,require("tslib"),require("@thi.ng/api")):"function"==typeof define&&define.amd?define(["exports","tslib","@thi.ng/api"],i):i(((t=t||self).thi=t.thi||{},t.thi.ng=t.thi.ng||{},t.thi.ng.idgen={}),t.thi.ng[""],t.thi.ng.api)}(this,(function(t,i,e){"use strict";t.IDGen=class{constructor(t=32,i=32-t,s=Math.pow(2,t),h=0){const r=Math.pow(2,t);e.assert(t>0&&t+i<=32,"wrong total bit size [1..32]"),e.assert(s<=r,`requested capacity too large for bit size (max. ${r})`),this.ids=[],this.nextID=h,this.start=h,this._capacity=s,this.num=0,this.mask=r-1,this.vmask=(1<<i)-1,this.shift=t,this._freeID=-1}id(t){return t&this.mask}version(t){return t>>>this.shift&this.vmask}get capacity(){return this._capacity}set capacity(t){if(e.assert(!this.vmask,"can't change capacity w/ versioning enabled"),!(t>=this.mask+1))throw new Error("can't reduce capacity");{const i=Math.ceil(Math.log2(t));e.assert(i>0&&i<=32,"wrong bit size for new capacity [1..32]"),this._capacity=t,this.mask=Math.pow(2,i)-1,this.shift=i}}get available(){return this._capacity-this.num-this.start}get used(){return this.num}get freeID(){return this._freeID}*[Symbol.iterator](){for(let t=this.nextID;--t>=0;){const i=this.ids[t];(i&this.mask)===t&&(yield i)}}clear(){this.ids.length=0,this.nextID=this.start,this.num=0,this._freeID=-1}next(){let t;if(-1!==this._freeID){t=this._freeID;const i=this.id(t);this._freeID=this.ids[i],this.ids[i]=t}else e.assert(this.nextID<this._capacity,"max capacity reached"),t=this.nextID++,this.ids[t]=t;return this.num++,this.notify({id:"added",target:this,value:t}),t}free(t){return!!this.has(t)&&(this.ids[this.id(t)]=this._freeID,this._freeID=this.nextVersion(t),this.num--,this.notify({id:"removed",target:this,value:t}),!0)}has(t){const i=this.id(t);return t>=0&&i<this.nextID&&this.ids[i]===t}addListener(t,i,e){}removeListener(t,i,e){}notify(t){}nextVersion(t){return(t&this.mask|(this.version(t)+1&this.vmask)<<this.shift)>>>0}},t.IDGen=i.__decorate([e.INotifyMixin],t.IDGen);t.EVENT_ADDED="added",t.EVENT_REMOVED="removed",t.idgen=(i,e,s,h)=>new t.IDGen(i,e,s,h),Object.defineProperty(t,"__esModule",{value:!0})}));
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports,require("tslib"),require("@thi.ng/api")):"function"==typeof define&&define.amd?define(["exports","tslib","@thi.ng/api"],i):i(((t=t||self).thi=t.thi||{},t.thi.ng=t.thi.ng||{},t.thi.ng.idgen={}),t.thi.ng[""],t.thi.ng.api)}(this,(function(t,i,e){"use strict";let s=(()=>{let t=class{constructor(t=32,i=32-t,s=2**t,h=0){const r=2**t;e.assert(t>0&&t+i<=32,"wrong total bit size [1..32]"),e.assert(s<=r,`requested capacity too large for bit size (max. ${r})`),this.ids=[],this.nextID=h,this.start=h,this._capacity=s,this.num=0,this.mask=r-1,this.vmask=(1<<i)-1,this.shift=t,this._freeID=-1}id(t){return t&this.mask}version(t){return t>>>this.shift&this.vmask}get capacity(){return this._capacity}set capacity(t){if(e.assert(!this.vmask,"can't change capacity w/ versioning enabled"),!(t>=this.mask+1))throw new Error("can't reduce capacity");{const i=Math.ceil(Math.log2(t));e.assert(i>0&&i<=32,"wrong bit size for new capacity [1..32]"),this._capacity=t,this.mask=2**i-1,this.shift=i}}get available(){return this._capacity-this.num-this.start}get used(){return this.num}get freeID(){return this._freeID}*[Symbol.iterator](){for(let t=this.nextID;--t>=0;){const i=this.ids[t];(i&this.mask)===t&&(yield i)}}clear(){this.ids.length=0,this.nextID=this.start,this.num=0,this._freeID=-1}next(){let t;if(-1!==this._freeID){t=this._freeID;const i=this.id(t);this._freeID=this.ids[i],this.ids[i]=t}else e.assert(this.nextID<this._capacity,"max capacity reached"),t=this.nextID++,this.ids[t]=t;return this.num++,this.notify({id:"added",target:this,value:t}),t}free(t){return!!this.has(t)&&(this.ids[this.id(t)]=this._freeID,this._freeID=this.nextVersion(t),this.num--,this.notify({id:"removed",target:this,value:t}),!0)}has(t){const i=this.id(t);return t>=0&&i<this.nextID&&this.ids[i]===t}addListener(t,i,e){}removeListener(t,i,e){}notify(t){}nextVersion(t){return(t&this.mask|(this.version(t)+1&this.vmask)<<this.shift)>>>0}};return t=i.__decorate([e.INotifyMixin],t),t})();t.EVENT_ADDED="added",t.EVENT_REMOVED="removed",t.IDGen=s,t.idgen=(t,i,e,h)=>new s(t,i,e,h),Object.defineProperty(t,"__esModule",{value:!0})}));

package.json

 {
     "name": "@thi.ng/idgen",
-    "version": "0.2.12",
+    "version": "0.2.13",
     "description": "Generator of opaque numeric identifiers with optional support for ID versioning and efficient re-use",
@@ -36,14 +36,14 @@ "module": "./index.js",
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
-        "@microsoft/api-extractor": "^7.7.13",
+        "@microsoft/api-extractor": "^7.8.0",
         "@types/mocha": "^7.0.2",
-        "@types/node": "^13.13.4",
+        "@types/node": "^14.0.1",
         "mocha": "^7.1.2",
         "nyc": "^15.0.1",
-        "ts-node": "^8.9.1",
+        "ts-node": "^8.10.1",
         "typedoc": "^0.17.6",
-        "typescript": "^3.8.3"
+        "typescript": "^3.9.2"
     },
     "dependencies": {
-        "@thi.ng/api": "^6.10.4",
-        "tslib": "^1.11.1"
+        "@thi.ng/api": "^6.10.5",
+        "tslib": "^1.12.0"
     },
@@ -71,3 +71,3 @@ "files": [
     },
-    "gitHead": "c11f130122cbaa05b8d48d394c3a164e238c8078"
+    "gitHead": "97c301379d830c1982c364cfbec8766ff14f73f5"
 }

README.md

@@ -64,3 +64,3 @@ <!-- This file is generated - DO NOT EDIT! -->
 
-Package sizes (gzipped, pre-treeshake): ESM: 847 bytes / CJS: 895 bytes / UMD: 985 bytes
+Package sizes (gzipped, pre-treeshake): ESM: 853 bytes / CJS: 909 bytes / UMD: 992 bytes
 
@@ -67,0 +67,0 @@ ## Dependencies

No alert changes

Improved metrics

Total package byte prevSize

41142

increased by2.93%

Lines of code

276

increased by2.6%

Dependency changes

• [e-mail]/api@^6.10.5

• Updatedtslib@^1.12.0