Merge pull request #65 from PaimaStudios/concise-improvements

Improvements to paima-concise
PaimaStudios · Dec 8, 2022 · 39c8f14 · 39c8f14
2 parents 9ec0980 + 631d332
commit 39c8f14
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 199 deletions.
diff --git a/paima-concise/.gitignore b/paima-concise/.gitignore
@@ -1,4 +1,6 @@
 build/
 node_modules
 *.tsbuildinfo
-cache/
+cache/
+*.js
+*.d.ts
diff --git a/paima-concise/src/builder.d.ts b/paima-concise/src/builder.d.ts
diff --git a/paima-concise/src/builder.js b/paima-concise/src/builder.js
diff --git a/paima-concise/src/consumer.d.ts b/paima-concise/src/consumer.d.ts
diff --git a/paima-concise/src/consumer.js b/paima-concise/src/consumer.js
diff --git a/paima-concise/src/consumer.ts b/paima-concise/src/consumer.ts
@@ -28,20 +28,23 @@ const initialize = (input: string, version = EncodingVersion.V1): ConciseConsume
     initialInput(_decompress = false): string {
       return this.conciseInput;
     },
-    nextValue(): ConciseValue | '' {
+    nextValue(): ConciseValue | null {
       const [nextValue] = conciseValues.splice(0, 1);
-      return nextValue ?? '';
+      return nextValue ?? null;
     },
-    popValue(): ConciseValue | '' {
+    remainingValues(): ConciseValue[] {
+      return this.conciseValues;
+    },
+    popValue(): ConciseValue | null {
       const nextValue = conciseValues.pop();
-      return nextValue ?? '';
+      return nextValue ?? null;
     },
     prefix(): string {
       return this.concisePrefix;
     },
-    readValue(position: number): ConciseValue | '' {
+    readValue(position: number): ConciseValue | null {
       const index = position - 1;
-      return this.conciseValues[index] ?? '';
+      return this.conciseValues[index] ?? null;
     },
     stateIdentifiers(): ConciseValue[] {
       return this.conciseValues.filter(value => value.isStateIdentifier);

diff --git a/paima-concise/src/index.d.ts b/paima-concise/src/index.d.ts
diff --git a/paima-concise/src/index.js b/paima-concise/src/index.js
diff --git a/paima-concise/src/types.d.ts b/paima-concise/src/types.d.ts
diff --git a/paima-concise/src/types.js b/paima-concise/src/types.js
diff --git a/paima-concise/src/types.ts b/paima-concise/src/types.ts
@@ -38,14 +38,13 @@ export type ConciseConsumer = {
   conciseInput: string;
   concisePrefix: string;
   conciseValues: ConciseValue[];
-
   prefix: () => string;
   stateIdentifiers: () => ConciseValue[];
-  nextValue: () => ConciseValue | '';
-
-  popValue: () => ConciseValue | '';
+  nextValue: () => ConciseValue | null;
+  remainingValues: () => ConciseValue[];
+  popValue: () => ConciseValue | null;
   initialInput: (decompress?: boolean) => UTF8String;
   // Positions start at 1
-  readValue: (position: number) => ConciseValue | '';
+  readValue: (position: number) => ConciseValue | null;
   valueCount: () => number;
 };
diff --git a/paima-concise/src/utils.d.ts b/paima-concise/src/utils.d.ts
diff --git a/paima-concise/src/utils.js b/paima-concise/src/utils.js
diff --git a/paima-concise/src/v1/builder.d.ts b/paima-concise/src/v1/builder.d.ts
diff --git a/paima-concise/src/v1/builder.js b/paima-concise/src/v1/builder.js
diff --git a/paima-concise/src/v1/consts.d.ts b/paima-concise/src/v1/consts.d.ts
diff --git a/paima-concise/src/v1/consts.js b/paima-concise/src/v1/consts.js
diff --git a/paima-concise/src/v1/utils.d.ts b/paima-concise/src/v1/utils.d.ts
diff --git a/paima-concise/src/v1/utils.js b/paima-concise/src/v1/utils.js