url-safe-bitpacking 0.3.1 → 0.3.2

package/dist/index.js

@@ -118,12 +118,12 @@ var rawStringifier2 = (value, intData2) => {
 };
 
 // src/parsers/enumParser.ts
-var getBitsCount3 = (versionData2) => versionData2.bits;
-var rawParser3 = (rawString, versionData2) => rawValueParser(rawString, versionData2.bits);
-var rawStringifier3 = (value, versionData2) => {
-  if (value > versionData2.max)
+var getBitsCount3 = (enumData2) => enumData2.bits;
+var rawParser3 = (rawString, enumData2) => rawValueParser(rawString, enumData2.bits);
+var rawStringifier3 = (value, enumData2) => {
+  if (value > enumData2.max)
     throw new Error("Version exceeds max");
-  return rawIntStringifier(value, versionData2.bits);
+  return rawIntStringifier(value, enumData2.bits);
 };
 
 // src/parsers/versionParser.ts
@@ -691,8 +691,11 @@ class StateNode {
   }
   updateUpstream = () => {
     const newBitstring = this.getBitString();
-    if (newBitstring !== this.bitstring)
-      this.bitstring = newBitstring, this.parent && this.parent.updateUpstream();
+    if (newBitstring !== this.bitstring) {
+      this.bitstring = newBitstring;
+      if (this.parent)
+        this.parent.updateUpstream();
+    }
   };
   getStateBits = () => {
     throw new Error("not implemented for " + this.type);
@@ -752,10 +755,8 @@ class SimpleStateNodes extends StateNode {
   }
   getChildren = () => [];
   getDescription = () => `${this.name}: ${this.value}`;
-  updateValue = (value) => {
-    this.value = constrainValue7(this.descriptor, value);
-    this.updateUpstream();
-  };
+  updateValue = (value) => (this.value = constrainValue7(this.descriptor, value), this.updateUpstream());
+  updateDescriptor = (entry) => (this.descriptor = entry, this.updateValue(this.value));
   toDataEntry = () => ({
     ...this.descriptor,
     name: this.name,
@@ -783,121 +784,118 @@ class EnumArrayNode extends SimpleStateNodes {
   getDescription = () => `${this.name}: [${this.value.map((v) => this.descriptor.mapping[v]).join(", ")}]`;
 }
 
-class OptionalNode extends StateNode {
+class ComplexStateNodes extends StateNode {
   state;
-  stateBits;
   descriptor;
-  child = null;
   constructor(entry, parent) {
     super(entry, parent);
     this.state = entry.state;
-    this.stateBits = entry.stateBits;
-    this.descriptor = entry["descriptor"];
+    this.descriptor = entry;
+  }
+}
+
+class OptionalNode extends ComplexStateNodes {
+  child = null;
+  constructor(entry, parent) {
+    super(entry, parent);
+    this.child = this.initializedChild();
     this.bitstring = this.getBitString();
   }
   getChildren = () => [this.child];
   getStateBits = () => rawStateStringifier3(this.state);
   getValueBits = () => this.child ? this.child.bitstring : "";
+  initializedChild = () => this.descriptor.descriptor[this.state ? 1 : 0] ? NodeFactory(this.descriptor.descriptor[this.state ? 1 : 0], this) : null;
   updateState = (newState) => {
-    this.state = constrainState(newState);
-    if (this.state === this.state)
+    const constrainedNewState = constrainState(newState);
+    if (this.state === constrainedNewState)
       return;
-    this.child = this.descriptor[this.state ? 1 : 0] ? NodeFactory(this.descriptor[this.state ? 1 : 0], this) : null;
+    this.state = constrainedNewState;
+    this.child = this.descriptor.descriptor[this.state ? 1 : 0] ? NodeFactory(this.descriptor.descriptor[this.state ? 1 : 0], this) : null;
+    this.updateUpstream();
+  };
+  updateDescriptor = (entry) => {
+    this.descriptor = entry;
+    this.child = this.initializedChild();
     this.updateUpstream();
   };
   toDataEntry = () => ({
-    type: "OPTIONAL",
+    ...this.descriptor,
     name: this.name,
     state: this.state,
-    stateBits: this.stateBits,
-    descriptor: this.descriptor,
     value: this.child ? this.child.toDataEntry() : null
   });
   getDescription = () => `${this.name}: ${this.state}`;
 }
 
-class EnumOptionsNode extends StateNode {
-  state;
-  stateBits;
-  descriptor;
-  mapping;
+class EnumOptionsNode extends ComplexStateNodes {
   child = null;
   constructor(entry, parent) {
     super(entry, parent);
-    this.state = entry.state;
-    this.stateBits = entry.stateBits;
-    this.descriptor = entry["descriptor"];
-    this.mapping = entry["mapping"];
-    this.child = entry["value"] ? NodeFactory(entry["value"], this) : null;
+    this.child = this.initializedChild();
     this.bitstring = this.getBitString();
   }
   getChildren = () => [this.child];
-  getStateBits = () => rawStateStringifier4(this.state, this.stateBits);
+  getStateBits = () => rawStateStringifier4(this.state, this.descriptor.stateBits);
   getValueBits = () => this.child ? this.child.bitstring : "";
+  initializedChild = () => this.descriptor.descriptor[this.state] ? NodeFactory(this.descriptor.descriptor[this.state], this) : null;
   updateState = (newState) => {
-    const constrainedNewState = constrainState2(this.descriptor.length, newState);
+    const constrainedNewState = constrainState2(this.descriptor.descriptor.length, newState);
     if (constrainedNewState === this.state)
       return;
-    const validationResult = validateDataEntry(this.descriptor[constrainedNewState], this.child ? this.child.toDataEntry() : null);
+    const validationResult = validateDataEntry(this.descriptor.descriptor[constrainedNewState], this.child ? this.child.toDataEntry() : null);
     this.child = validationResult ? NodeFactory(validationResult, this) : null;
     this.state = constrainedNewState;
     this.updateUpstream();
   };
+  updateDescriptor = (entry) => {
+    this.descriptor = entry;
+    this.child = this.initializedChild();
+    this.updateUpstream();
+  };
   toDataEntry = () => ({
-    type: "ENUM_OPTIONS",
+    ...this.descriptor,
     name: this.name,
     state: this.state,
-    stateBits: this.stateBits,
-    descriptor: this.descriptor,
-    mapping: this.mapping,
     value: this.child ? this.child.toDataEntry() : null
   });
-  getDescription = () => `${this.name}: ${this.state} of ${this.mapping.length} options`;
+  getDescription = () => `${this.name}: ${this.state} of ${this.descriptor.mapping.length} options`;
 }
 
-class ArrayNode extends StateNode {
-  descriptor;
+class ArrayNode extends ComplexStateNodes {
   children;
-  minCount;
-  maxCount;
-  stateBits;
-  state;
   constructor(entry, parent) {
     super(entry, parent);
-    this.descriptor = entry["descriptor"];
-    this.children = entry["value"].map((child) => NodeFactory(child, this));
-    this.minCount = entry["minCount"];
-    this.maxCount = entry["maxCount"];
-    this.stateBits = entry["stateBits"];
-    this.state = entry["state"];
+    this.children = this.initializedChildren();
     this.bitstring = this.getBitString();
   }
+  initializedChildren = () => this.descriptor.value.map((child) => NodeFactory(child, this));
   getChildren = () => this.children;
-  getStateBits = () => rawStateStringifier2(this.state, this.minCount, this.stateBits);
+  getStateBits = () => rawStateStringifier2(this.state, this.descriptor.minCount, this.descriptor.stateBits);
   getValueBits = () => this.children.map((child) => child.bitstring).join("");
+  updateDescriptor = (entry) => {
+    this.descriptor = entry;
+    this.children = this.initializedChildren();
+    this.updateUpstream();
+  };
   updateState = (newState) => {
-    const constrainedNewState = constrainState3(newState, this.minCount, this.maxCount);
+    const constrainedNewState = constrainState3(newState, this.descriptor.minCount, this.descriptor.maxCount);
     if (constrainedNewState === this.state)
       return;
     if (constrainedNewState < this.state)
       this.children = this.children.slice(0, constrainedNewState);
     else
       for (let i = this.state;i < constrainedNewState; i++)
-        this.children.push(NodeFactory(this.descriptor, this));
+        this.children.push(NodeFactory(this.descriptor.descriptor, this));
     this.state = constrainedNewState;
     this.updateUpstream();
   };
   toDataEntry = () => ({
-    type: "ARRAY",
+    ...this.descriptor,
     name: this.name,
     value: this.children.map((child) => child.toDataEntry()),
-    minCount: this.minCount,
-    maxCount: this.maxCount,
-    stateBits: this.stateBits,
-    state: this.state,
-    descriptor: this.descriptor
+    state: this.state
   });
-  getDescription = () => `${this.name}: ${this.state} of (${this.minCount}, ${this.maxCount})`;
+  getDescription = () => `${this.name}: ${this.state} of (${this.descriptor.minCount}, ${this.descriptor.maxCount})`;
 }
 
 class ObjectNode extends StateNode {
@@ -905,18 +903,23 @@ class ObjectNode extends StateNode {
   children;
   constructor(entry, parent) {
     super(entry, parent);
-    this.descriptor = entry["descriptor"];
-    this.children = entry["value"].map((child) => NodeFactory(child, this));
+    this.descriptor = entry;
+    this.children = this.initializedChild();
     this.bitstring = this.getBitString();
   }
+  initializedChild = () => this.descriptor.value.map((child) => NodeFactory(child, this));
+  updateDescriptor = (entry) => {
+    this.descriptor = entry;
+    this.children = this.initializedChild();
+    this.updateUpstream();
+  };
   getChildren = () => this.children;
   getStateBits = () => "";
   getValueBits = () => this.children.map((child) => child.bitstring).join("");
   toDataEntry = () => ({
-    type: "OBJECT",
+    ...this.descriptor,
     name: this.name,
     value: this.children.map((child) => child.toDataEntry()),
-    descriptor: this.descriptor,
     stateBits: 0
   });
 }

package/dist/parsers/enumParser.d.ts

@@ -1,4 +1,4 @@
 import { EnumData } from '../types/enumData';
-export declare const getBitsCount: (versionData: EnumData) => number;
-export declare const rawParser: (rawString: string, versionData: EnumData) => number;
-export declare const rawStringifier: (value: number, versionData: EnumData) => string;
+export declare const getBitsCount: (enumData: EnumData) => number;
+export declare const rawParser: (rawString: string, enumData: EnumData) => number;
+export declare const rawStringifier: (value: number, enumData: EnumData) => string;

package/dist/stateHandling/stateNode.d.ts

@@ -1,5 +1,5 @@
 import { DataType } from '../enums';
-import { ArrayDataEntry, BooleanDataEntry, DataEntry, EnumArrayDataEntry, EnumDataEntry, EnumOptionsDataEntry, FloatDataEntry, IntDataEntry, ObjectDataEntry, OptionalDataEntry, VersionDataEntry, UpdateWithValidationTypes } from '../types';
+import { ArrayDataEntry, BooleanDataEntry, DataEntry, EnumArrayDataEntry, EnumDataEntry, EnumOptionsDataEntry, FloatDataEntry, IntDataEntry, ObjectDataEntry, OptionalDataEntry, VersionDataEntry, UpdateWithValidationTypes, UpdateWithStateEntries } from '../types';
 export declare class StateNode {
     protected parent: StateNode | null;
     protected root: StateNode;
@@ -35,6 +35,7 @@ declare class SimpleStateNodes<T extends UpdateWithValidationTypes> extends Stat
     getChildren: () => SpecificTypeNode[];
     getDescription: () => string;
     updateValue: (value: T["value"]) => void;
+    updateDescriptor: (entry: T) => void;
     toDataEntry: () => T;
 }
 export declare class VersionNode extends SimpleStateNodes<VersionDataEntry> {
@@ -51,44 +52,43 @@ export declare class EnumArrayNode extends SimpleStateNodes<EnumArrayDataEntry>
     getStateBits: () => string;
     getDescription: () => string;
 }
-export declare class OptionalNode extends StateNode {
-    private state;
-    private stateBits;
-    private descriptor;
+declare class ComplexStateNodes<T extends UpdateWithStateEntries> extends StateNode {
+    state: T['state'];
+    descriptor: T;
+    constructor(entry: T, parent: SpecificTypeNode | null);
+}
+export declare class OptionalNode extends ComplexStateNodes<OptionalDataEntry> {
     private child;
     constructor(entry: OptionalDataEntry, parent: SpecificTypeNode | null);
     getChildren: () => (SpecificTypeNode | null)[];
     getStateBits: () => string;
     getValueBits: () => string;
+    private initializedChild;
     updateState: (newState: OptionalDataEntry["state"]) => void;
+    updateDescriptor: (entry: OptionalDataEntry) => void;
     toDataEntry: () => OptionalDataEntry;
     getDescription: () => string;
 }
-export declare class EnumOptionsNode extends StateNode {
-    private state;
-    private stateBits;
-    private descriptor;
-    private mapping;
+export declare class EnumOptionsNode extends ComplexStateNodes<EnumOptionsDataEntry> {
     private child;
     constructor(entry: EnumOptionsDataEntry, parent: SpecificTypeNode | null);
     getChildren: () => (SpecificTypeNode | null)[];
     getStateBits: () => string;
     getValueBits: () => string;
+    private initializedChild;
     updateState: (newState: EnumOptionsDataEntry["state"]) => void;
+    updateDescriptor: (entry: EnumOptionsDataEntry) => void;
     toDataEntry: () => EnumOptionsDataEntry;
     getDescription: () => string;
 }
-export declare class ArrayNode extends StateNode {
-    private descriptor;
+export declare class ArrayNode extends ComplexStateNodes<ArrayDataEntry> {
     private children;
-    private minCount;
-    private maxCount;
-    private stateBits;
-    private state;
     constructor(entry: ArrayDataEntry, parent: SpecificTypeNode | null);
+    private initializedChildren;
     getChildren: () => SpecificTypeNode[];
     getStateBits: () => string;
     getValueBits: () => string;
+    updateDescriptor: (entry: ArrayDataEntry) => void;
     updateState: (newState: ArrayDataEntry["state"]) => void;
     toDataEntry: () => ArrayDataEntry;
     getDescription: () => string;
@@ -97,6 +97,8 @@ export declare class ObjectNode extends StateNode {
     private descriptor;
     private children;
     constructor(entry: ObjectDataEntry, parent: SpecificTypeNode | null);
+    private initializedChild;
+    updateDescriptor: (entry: ObjectDataEntry) => void;
     getChildren: () => SpecificTypeNode[];
     getStateBits: () => string;
     getValueBits: () => string;

package/package.json

@@ -6,7 +6,7 @@
     "dist/*"
   ],
   "type": "module",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "author": "Jonas Ward",
   "description": "Library for creating web safe base64 objects with custom bith widths and dynamic values.",
   "scripts": {