@isopodlabs/utilities 1.5.6 → 1.5.7

package/dist/bits.d.ts

@@ -7,7 +7,33 @@ export declare function countSet(x: bigint | number): number;
 export declare function highestClear(x: number | bigint): number;
 export declare function lowestClear(x: number | bigint): number;
 export declare function countClear(x: bigint | number): number;
-export declare class ImmutableSparseBits {
+export interface immutableBitSet {
+    countSet(): number;
+    complement(): this;
+    intersect(other: this): this;
+    union(other: this): this;
+    xor(other: this): this;
+    contains(other: this): boolean;
+    test(a: number): boolean;
+    next(a: number, set: boolean): number;
+    where(set: boolean, from?: number): {
+        [Symbol.iterator](): Generator<number>;
+    };
+    ranges(): {
+        [Symbol.iterator](): Generator<number[]>;
+    };
+}
+export interface BitSet extends immutableBitSet {
+    set(a: number): void;
+    clear(a: number): void;
+    setRange(a: number, b: number): this;
+    clearRange(a: number, b: number): this;
+    selfComplement(): this;
+    selfIntersect(other: this): this;
+    selfUnion(other: this): this;
+    selfXor(other: this): this;
+}
+export declare class ImmutableSparseBits implements immutableBitSet {
     protected bits: number[];
     protected undef: number;
     static whereGenerator(bits: number[], undef: number, set: boolean, from?: number): Generator<number>;
@@ -24,7 +50,8 @@ export declare class ImmutableSparseBits {
     xor(other: ImmutableSparseBits): this;
     clean(): this;
     contains(other: ImmutableSparseBits): boolean;
-    has(a: number): boolean;
+    test(a: number): boolean;
+    countSet(): number;
     next(a: number, set?: boolean): number;
     toDense(): DenseBits;
     where(set: boolean, from?: number): {
@@ -35,7 +62,7 @@ export declare class ImmutableSparseBits {
     };
     [Symbol.iterator](): Generator<number>;
 }
-export declare class SparseBits extends ImmutableSparseBits {
+export declare class SparseBits extends ImmutableSparseBits implements BitSet {
     private setMask;
     private clearMask;
     selfComplement(): this;
@@ -44,20 +71,22 @@ export declare class SparseBits extends ImmutableSparseBits {
     selfXor(other: SparseBits): this;
     set(a: number): void;
     clear(a: number): void;
-    has(a: number): boolean;
+    test(a: number): boolean;
     setRange(a: number, b: number): this;
     clearRange(a: number, b: number): this;
 }
-export declare class ImmutableDenseBits {
+export declare class ImmutableDenseBits implements immutableBitSet {
     protected bits: bigint;
     constructor(bits?: bigint);
     protected create(bits?: bigint): this;
     complement(): this;
-    intersect(other: DenseBits): this;
-    union(other: DenseBits): this;
-    xor(other: DenseBits): this;
-    has(a: number): boolean;
+    intersect(other: ImmutableDenseBits): this;
+    union(other: ImmutableDenseBits): this;
+    xor(other: ImmutableDenseBits): this;
+    test(a: number): boolean;
+    contains(other: this): boolean;
     next(a: number, set?: boolean): number;
+    countSet(): number;
     get length(): number;
     where(set: boolean, from?: number): {
         [Symbol.iterator](): Generator<number>;
@@ -68,7 +97,7 @@ export declare class ImmutableDenseBits {
     [Symbol.iterator](): Generator<number>;
     toSparse(): SparseBits;
 }
-export declare class DenseBits extends ImmutableDenseBits {
+export declare class DenseBits extends ImmutableDenseBits implements BitSet {
     private setMask;
     private clearMask;
     selfComplement(): this;

package/dist/bits.js

@@ -278,9 +278,15 @@ class ImmutableSparseBits {
         }
         return true;
     }
-    has(a) {
+    test(a) {
         return !!((this.bits[a >> 5] ?? this.undef) & (1 << (a & 0x1f)));
     }
+    countSet() {
+        let count = 0;
+        for (const i in this.bits)
+            count += countSet32(this.bits[i]);
+        return count;
+    }
     next(a, set = true) {
         ++a;
         const xor = this.undef;
@@ -429,7 +435,7 @@ class SparseBits extends ImmutableSparseBits {
     clear(a) {
         this.clearMask(a >> 5, 1 << (a & 0x1f));
     }
-    has(a) {
+    test(a) {
         const i = a >> 5;
         return !!((this.bits[i] ?? this.undef) & (1 << (a & 0x1f)));
     }
@@ -497,14 +503,20 @@ class ImmutableDenseBits {
     xor(other) {
         return this.create(this.bits ^ other.bits);
     }
-    has(a) {
+    test(a) {
         return !!(this.bits & (1n << BigInt(a)));
     }
+    contains(other) {
+        return (this.bits & other.bits) === other.bits;
+    }
     next(a, set = true) {
         let s = this.bits >> BigInt(a + 1);
         s = set ? s & -s : (s + 1n) & ~s;
         return s ? a + highestSet(s) : -1;
     }
+    countSet() {
+        return countSet(this.bits);
+    }
     get length() {
         return highestSet(this.bits);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@isopodlabs/utilities",
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"description": "Various typescript helpers.",
 	"repository": {
 		"type": "git",