@synnaxlabs/client 0.37.0 → 0.38.0

package/src/ontology/group/group.ts

@@ -7,7 +7,8 @@
 // License, use of this software will be governed by the Apache License, Version 2.0,
 // included in the file licenses/APL.txt.
 
-import { ontology } from "@/ontology";
+import { type ontology } from "@/ontology";
+import { ontologyID as payloadOntologyID } from "@/ontology/group/payload";
 
 export class Group {
   key: string;
@@ -19,9 +20,6 @@ export class Group {
   }
 
   get ontologyID(): ontology.ID {
-    return new ontology.ID({
-      type: "group",
-      key: this.key,
-    });
+    return payloadOntologyID(this.key);
   }
 }

package/src/ontology/payload.ts

@@ -95,7 +95,7 @@ export class ID {
   static readonly z = z.union([z.instanceof(ID), crudeIDZ.transform((v) => new ID(v))]);
 }
 
-export const Root = new ID({ type: "builtin", key: "root" });
+export const Root = new ID({ type: BUILTIN_TYPE, key: "root" });
 
 export const schemaFieldZ = z.object({ type: z.number() });
 

package/src/ranger/client.ts

@@ -20,7 +20,7 @@ import { MultipleFoundError, NotFoundError, QueryError } from "@/errors";
 import { type framer } from "@/framer";
 import { type label } from "@/label";
 import { type Label } from "@/label/payload";
-import { ontology } from "@/ontology";
+import { type ontology } from "@/ontology";
 import { type Resource } from "@/ontology/payload";
 import { type Alias, Aliaser } from "@/ranger/alias";
 import { KV } from "@/ranger/kv";
@@ -32,6 +32,7 @@ import {
   type Name,
   type Names,
   type NewPayload,
+  ontologyID,
   type Params,
   type Payload,
   payloadZ,
@@ -40,9 +41,6 @@ import { type CreateOptions, type Writer } from "@/ranger/writer";
 import { signals } from "@/signals";
 import { nullableArrayZ } from "@/util/zod";
 
-const ontologyID = (key: string): ontology.ID =>
-  new ontology.ID({ type: "range", key });
-
 export class Range {
   key: string;
   name: string;
@@ -83,7 +81,7 @@ export class Range {
   }
 
   get ontologyID(): ontology.ID {
-    return new ontology.ID({ key: this.key, type: "range" });
+    return ontologyID(this.key);
   }
 
   get payload(): Payload {
@@ -155,7 +153,7 @@ export class Range {
   async openChildRangeTracker(): Promise<observe.ObservableAsyncCloseable<Range[]>> {
     const wrapper = new observe.Observer<Range[]>();
     const initial: ontology.Resource[] = (await this.retrieveChildren()).map((r) => {
-      const id = new ontology.ID({ key: r.key, type: "range" });
+      const id = ontologyID(r.key);
       return { id, key: id.toString(), name: r.name, data: r.payload };
     });
     const base = await this.ontologyClient.openDependentTracker({
@@ -174,7 +172,7 @@ export class Range {
     const wrapper = new observe.Observer<Range>();
     const p = await this.retrieveParent();
     if (p == null) return null;
-    const id = new ontology.ID({ key: p.key, type: "range" });
+    const id = ontologyID(p.key);
     const resourceP = { id, key: id.toString(), name: p.name, data: p.payload };
     const base = await this.ontologyClient.openDependentTracker({
       target: this.ontologyID,
@@ -302,10 +300,7 @@ export class Client implements AsyncTermSearcher<string, Key, Range> {
   }
 
   async retrieveParent(range: Key): Promise<Range | null> {
-    const res = await this.ontologyClient.retrieveParents({
-      key: range,
-      type: "range",
-    });
+    const res = await this.ontologyClient.retrieveParents(ontologyID(range));
     if (res.length === 0) return null;
     const first = res[0];
     if (first.id.type !== "range") return null;

package/src/ranger/payload.ts

@@ -78,8 +78,8 @@ export const analyzeParams = (ranges: Params): ParamAnalysisResult => {
 export const ONTOLOGY_TYPE: ontology.ResourceType = "range";
 export const ALIAS_ONTOLOGY_TYPE: ontology.ResourceType = "range-alias";
 
-export const rangeOntologyID = (key: Key): ontology.ID =>
+export const ontologyID = (key: Key): ontology.ID =>
   new ontology.ID({ type: ONTOLOGY_TYPE, key });
 
-export const rangeAliasOntologyID = (key: Key): ontology.ID =>
+export const aliasOntologyID = (key: Key): ontology.ID =>
   new ontology.ID({ type: ALIAS_ONTOLOGY_TYPE, key });

package/src/util/retrieve.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 { type Primitive,toArray } from "@synnaxlabs/x";
+import { type Primitive, toArray } from "@synnaxlabs/x";
 
 import { MultipleFoundError, NotFoundError } from "@/errors";
 
@@ -84,7 +84,7 @@ export const analyzeParams = <
     variant,
     normalized: normal,
     actual: args,
-  } as unknown as ParamAnalysisResult<T, K>;
+  } as ParamAnalysisResult<T, K>;
 };
 
 export const checkForMultipleOrNoResults = <T, R>(

package/src/util/zod.ts

@@ -10,4 +10,7 @@
 import { z } from "zod";
 
 export const nullableArrayZ = <Z extends z.ZodTypeAny>(item: Z) =>
-  z.union([z.null().transform(() => [] as z.output<Z>[]), item.array()]);
+  z.union([
+    z.union([z.null(), z.undefined()]).transform(() => [] as z.output<Z>[]),
+    item.array(),
+  ]);

package/vite.config.ts

@@ -7,23 +7,16 @@
 // License, use of this software will be governed by the Apache License, Version 2.0,
 // included in the file licenses/APL.txt.
 
+/// <reference types="vitest/config" />
+
 import { lib } from "@synnaxlabs/vite-plugin";
 import { defineConfig } from "vite";
 
 import packageJSON from "./package.json";
 
 export default defineConfig({
-  define: {
-    __VERSION__: JSON.stringify(packageJSON.version),
-  },
+  define: { __VERSION__: JSON.stringify(packageJSON.version) },
   plugins: [lib({ name: "client" })],
-  build: {
-    rollupOptions: {
-      external: ["zod"],
-    },
-  },
-  test: {
-    globals: true,
-    environment: "jsdom",
-  },
+  build: { rollupOptions: { external: ["zod"] } },
+  test: { globals: true, environment: "jsdom" },
 });