@synnaxlabs/x 0.15.0 → 0.15.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@synnaxlabs/x",
   "private": false,
-  "version": "0.15.0",
+  "version": "0.15.1",
   "type": "module",
   "description": "Common Utilities for Synnax Labs",
   "repository": "https://github.com/synnaxlabs/synnax/tree/main/x/go",
@@ -16,7 +16,6 @@
   "dependencies": {
     "async-mutex": "^0.4.0",
     "js-convert-case": "^4.2.0",
-    "msgpackr": "^1.9.9",
     "nanoid": "^5.0.2",
     "typescript": "^5.3.3",
     "zod": "3.22.4"

package/src/binary/encoder.ts

@@ -7,7 +7,6 @@
 // License, use of this software will be governed by the Apache License, Version 2.0,
 // included in the file licenses/APL.txt.
 
-import { pack, unpack } from "msgpackr";
 import { type ZodSchema, type z } from "zod";
 
 import { Case } from "@/case";
@@ -38,23 +37,6 @@ export interface EncoderDecoder {
   decode: <P>(data: Uint8Array | ArrayBuffer, schema?: ZodSchema<P>) => P;
 }
 
-/** MsgpackEncoderDecoder is a msgpack implementation of EncoderDecoder. */
-export class MsgpackEncoderDecoder implements EncoderDecoder {
-  contentType = "application/msgpack";
-
-  encode(payload: unknown): ArrayBuffer {
-    return pack(Case.toSnake(payload));
-  }
-
-  decode<P extends z.ZodTypeAny>(
-    data: Uint8Array | ArrayBuffer,
-    schema?: P,
-  ): z.output<P> {
-    const unpacked = Case.toCamel(unpack(new Uint8Array(data)));
-    return schema != null ? schema.parse(unpacked) : (unpacked as P);
-  }
-}
-
 /** JSONEncoderDecoder is a JSON implementation of EncoderDecoder. */
 export class JSONEncoderDecoder implements EncoderDecoder {
   contentType = "application/json";
@@ -88,7 +70,4 @@ export class JSONEncoderDecoder implements EncoderDecoder {
   static registerCustomType(): void {}
 }
 
-export const ENCODERS: EncoderDecoder[] = [
-  new MsgpackEncoderDecoder(),
-  new JSONEncoderDecoder(),
-];
+export const ENCODERS: EncoderDecoder[] = [new JSONEncoderDecoder()];

package/src/telem/series.spec.ts

@@ -529,6 +529,49 @@ describe("Series", () => {
       ]);
     });
   });
+
+  describe("as", () => {
+    describe("number", () => {
+      it("should correctly interpret the series as numeric", () => {
+        const s = new Series([1, 2, 3]);
+        const s2 = s.as("number");
+        expect(s2.at(0)).toEqual(1);
+      });
+      it("should throw an error if the series is not numeric", () => {
+        const s = new Series(["a", "b", "c"]);
+        expect(() => {
+          s.as("number");
+        }).toThrow();
+      });
+    });
+    describe("string", () => {
+      it("should correctly interpret the series as a string", () => {
+        const s = new Series(["apple", "banana", "carrot"]);
+        const s2 = s.as("string");
+        expect(s2.at(0)).toEqual("apple");
+      });
+      it("should throw an error if the series is not a string", () => {
+        const s = new Series([1, 2, 3]);
+        expect(() => {
+          s.as("string");
+        }).toThrow();
+      });
+    });
+    describe("bigint", () => {
+      it("should correctly interpret the series as a bigint", () => {
+        const s = new Series([BigInt(1), BigInt(2), BigInt(3)]);
+        console.log(s.dataType);
+        const s2 = s.as("bigint");
+        expect(s2.at(0)).toEqual(BigInt(1));
+      });
+      it("should throw an error if the series is not a bigint", () => {
+        const s = new Series([1, 2, 3]);
+        expect(() => {
+          s.as("bigint");
+        }).toThrow();
+      });
+    });
+  });
 });
 
 describe("MultiSeries", () => {

package/src/telem/series.ts

@@ -577,20 +577,35 @@ export class Series<T extends TelemValue = TelemValue> {
     }
   }
 
-  as(dataType: "string"): Series<string>;
+  as(jsType: "string"): Series<string>;
 
-  as(dataType: "number"): Series<number>;
+  as(jsType: "number"): Series<number>;
 
-  as(dataType: "bigint"): Series<bigint>;
+  as(jsType: "bigint"): Series<bigint>;
 
-  as(dataType: "numeric"): Series<NumericTelemValue>;
-
-  as<T extends TelemValue>(dataType: CrudeDataType): Series<T> {
-    if (!new DataType(dataType).equals(this.dataType))
-      throw new Error(
-        `cannot convert series of type ${this.dataType.toString()} to ${dataType.toString()}`,
-      );
-    return this as unknown as Series<T>;
+  as<T extends TelemValue>(jsType: "string" | "number" | "bigint"): Series<T> {
+    if (jsType === "string") {
+      if (!this.dataType.equals(DataType.STRING))
+        throw new Error(
+          `cannot convert series of type ${this.dataType.toString()} to string`,
+        );
+      return this as unknown as Series<T>;
+    }
+    if (jsType === "number") {
+      if (!this.dataType.isNumeric)
+        throw new Error(
+          `cannot convert series of type ${this.dataType.toString()} to number`,
+        );
+      return this as unknown as Series<T>;
+    }
+    if (jsType === "bigint") {
+      if (!this.dataType.equals(DataType.INT64))
+        throw new Error(
+          `cannot convert series of type ${this.dataType.toString()} to bigint`,
+        );
+      return this as unknown as Series<T>;
+    }
+    throw new Error(`cannot convert series to ${jsType as string}`);
   }
 
   get digest(): SeriesDigest {
@@ -748,6 +763,8 @@ export const addSamples = (
 ): NumericTelemValue => {
   if (typeof a === "bigint" && typeof b === "bigint") return a + b;
   if (typeof a === "number" && typeof b === "number") return a + b;
+  if (b === 0) return a;
+  if (a === 0) return b;
   return Number(a) + Number(b);
 };
 
@@ -764,13 +781,11 @@ export class MultiSeries<T extends TelemValue = TelemValue> implements Iterable<
     this.series = series;
   }
 
-  as(dataType: "string"): MultiSeries<string>;
-
-  as(dataType: "number"): MultiSeries<number>;
+  as(jsType: "string"): MultiSeries<string>;
 
-  as(dataType: "bigint"): MultiSeries<bigint>;
+  as(jsType: "number"): MultiSeries<number>;
 
-  as(dataType: "numeric"): MultiSeries<NumericTelemValue>;
+  as(jsType: "bigint"): MultiSeries<bigint>;
 
   as<T extends TelemValue>(dataType: CrudeDataType): MultiSeries<T> {
     if (!new DataType(dataType).equals(this.dataType))

package/src/telem/telem.ts

@@ -7,7 +7,7 @@
 // License, use of this software will be governed by the Apache License, Version 2.0,
 // included in the file licenses/APL.txt.
 
-import { object, z } from "zod";
+import { z } from "zod";
 
 import { type Stringer } from "@/primitive";
 import { addSamples } from "@/telem/series";
@@ -1049,6 +1049,18 @@ export class DataType extends String implements Stringer {
     return this.equals(DataType.JSON) || this.equals(DataType.STRING);
   }
 
+  get isNumeric(): boolean {
+    return !this.isVariable && !this.equals(DataType.UUID);
+  }
+
+  get isInteger(): boolean {
+    return this.toString().startsWith("int");
+  }
+
+  get isFloat(): boolean {
+    return this.toString().startsWith("float");
+  }
+
   get density(): Density {
     const v = DataType.DENSITIES.get(this.toString());
     if (v == null) throw new Error(`unable to find density for ${this.valueOf()}`);