@synnaxlabs/client 0.56.2 → 0.57.0

package/src/node/index.ts

@@ -0,0 +1,10 @@
+// Copyright 2026 Synnax Labs, Inc.
+//
+// Use of this software is governed by the Business Source License included in the file
+// licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with the Business Source
+// License, use of this software will be governed by the Apache License, Version 2.0,
+// included in the file licenses/APL.txt.
+
+export * as node from "@/node/types.gen";

package/src/{cluster → node}/types.gen.ts

@@ -12,5 +12,5 @@
 import { zod } from "@synnaxlabs/x";
 import { type z } from "zod";
 
-export const nodeKeyZ = zod.uint12;
-export type NodeKey = z.infer<typeof nodeKeyZ>;
+export const keyZ = zod.uint12;
+export type Key = z.infer<typeof keyZ>;

package/src/ontology/client.ts

@@ -8,22 +8,40 @@
 // included in the file licenses/APL.txt.
 
 import { type UnaryClient } from "@synnaxlabs/freighter";
-import { array, strings } from "@synnaxlabs/x";
+import { deep, type destructor, primitive } from "@synnaxlabs/x";
 import { z } from "zod";
 
-import { QueryError } from "@/errors";
+import { NotFoundError } from "@/errors";
 import {
   type ID,
+  idsEqual,
   idToString,
   idZ,
+  oppositeRelationshipDirection,
+  PARENT_OF_RELATIONSHIP_TYPE,
+  parseID,
   parseIDs,
+  type Relationship,
+  type RelationshipDirection,
+  relationshipToString,
+  relationshipZ,
   type Resource,
+  type ResourceType,
   resourceTypeZ,
   resourceZ,
+  stringIDZ,
 } from "@/ontology/payload";
+import {
+  Cache,
+  RELATIONSHIP_DELETE_CHANNEL_NAME,
+  RELATIONSHIP_SET_CHANNEL_NAME,
+  RESOURCE_DELETE_CHANNEL_NAME,
+  RESOURCE_SET_CHANNEL_NAME,
+} from "@/ontology/store";
 import { Writer } from "@/ontology/writer";
+import { query } from "@/query";
 
-const retrieveReqZ = z.object({
+const wireReqZ = z.object({
   ids: idZ.array().optional(),
   children: z.boolean().optional(),
   parents: z.boolean().optional(),
@@ -32,148 +50,439 @@ const retrieveReqZ = z.object({
   searchTerm: z.string().optional(),
   limit: z.int().optional(),
   offset: z.int().optional(),
+  ignoreNotFoundError: z.boolean().optional(),
 });
-export interface RetrieveRequest extends z.infer<typeof retrieveReqZ> {}
+/** Everything an ontology retrieval can filter on. */
+export interface RetrieveRequest extends z.infer<typeof wireReqZ> {}
 
+/** The filters a retrieval accepts alongside its IDs. */
 export interface RetrieveOptions extends Pick<
   RetrieveRequest,
-  "excludeFieldData" | "types" | "children" | "parents"
+  "excludeFieldData" | "types"
 > {}
 
 const retrieveResZ = z.object({ resources: resourceZ.array() });
 
-/** The main client class for executing queries against a Synnax cluster ontology */
-export class Client {
+const parentRel = (from: ID, to: ID): Relationship => ({
+  from,
+  type: PARENT_OF_RELATIONSHIP_TYPE,
+  to,
+});
+
+/** A retrieve request with IDs normalized to stable, sorted strings. */
+type NormalizedRequest = {
+  ids?: string[];
+  excludeFieldData?: boolean;
+  types?: ResourceType[];
+  searchTerm?: string;
+  limit?: number;
+  offset?: number;
+};
+
+/** Request key for children/parents listings of a set of resources. */
+type DependentRequest = {
+  ids: string[];
+  types?: ResourceType[];
+  searchTerm?: string;
+  offset?: number;
+  limit?: number;
+  excludeFieldData?: boolean;
+};
+
+/** Query addressing the children or parents of a set of resources. */
+export type DependentParams = {
+  ids: ID | ID[];
+  types?: ResourceType[];
+  searchTerm?: string;
+  offset?: number;
+  limit?: number;
+  excludeFieldData?: boolean;
+};
+
+const DEPENDENT_SERVER_FIELDS = ["searchTerm", "limit", "offset"] as const;
+
+const normalizeIDs = (ids: ID | ID[]): string[] =>
+  [...new Set(idToString(parseIDs(ids)))].sort();
+
+const normalizeDependents = (
+  ids: ID | ID[],
+  options?: Omit<DependentParams, "ids">,
+): DependentRequest => {
+  const out: DependentRequest = { ids: normalizeIDs(ids) };
+  const { types, searchTerm, offset, limit, excludeFieldData } = options ?? {};
+  if (types != null) out.types = [...types].sort();
+  if (searchTerm != null) out.searchTerm = searchTerm;
+  if (offset != null) out.offset = offset;
+  if (limit != null) out.limit = limit;
+  if (excludeFieldData != null) out.excludeFieldData = excludeFieldData;
+  return out;
+};
+
+const retrieveRequestZ = z
+  .object({
+    ids: idZ.array().optional(),
+    excludeFieldData: z.boolean().optional(),
+    types: resourceTypeZ.array().optional(),
+    searchTerm: z.string().optional(),
+    limit: z.int().optional(),
+    offset: z.int().optional(),
+  })
+  .transform((req): NormalizedRequest => {
+    const out: NormalizedRequest = {};
+    if (req.ids != null) out.ids = normalizeIDs(req.ids);
+    if (req.excludeFieldData != null) out.excludeFieldData = req.excludeFieldData;
+    if (req.types != null) out.types = [...req.types].sort();
+    if (req.searchTerm != null) out.searchTerm = req.searchTerm;
+    if (req.limit != null) out.limit = req.limit;
+    if (req.offset != null) out.offset = req.offset;
+    return out;
+  });
+
+/** Resources are addressed by `ids`, so a bare key list is that shorthand. */
+const retrieveMultiParamsZ = retrieveRequestZ.or(
+  idZ.array().transform((ids): NormalizedRequest => ({ ids: normalizeIDs(ids) })),
+);
+
+/** Params for an ontology retrieval. A bare ID array is shorthand for `{ ids }`. */
+export type RetrieveParams = z.input<typeof retrieveRequestZ>;
+
+const singleParamsZ = z
+  .union([z.strictObject({ type: resourceTypeZ, key: z.string() }), stringIDZ])
+  .transform((id) => idToString(id));
+
+/**
+ * Client-side matching for a request: exact for id and type sets. Server-computed
+ * shapes (search, limit/offset) never reach this filter; they refetch instead.
+ */
+const requestFilter = (req: NormalizedRequest): ((r: Resource) => boolean) => {
+  const idSet = primitive.isNonZero(req.ids) ? new Set(req.ids) : undefined;
+  const typeSet = primitive.isNonZero(req.types) ? new Set(req.types) : undefined;
+  return (r) => {
+    if (idSet != null && !idSet.has(r.key)) return false;
+    if (typeSet != null && !typeSet.has(r.id.type)) return false;
+    return true;
+  };
+};
+
+/** Config for {@link Client}. */
+export interface ClientConfig {
+  unary: UnaryClient;
+  cache: query.Cache;
+}
+
+/**
+ * Reads the ontology on a Core: the resources and the relationships that join them.
+ * Reach it through `client.ontology`. Reads are served from a cache that a change
+ * stream keeps current.
+ */
+export class Client extends query.Retriever<
+  typeof retrieveMultiParamsZ,
+  string,
+  Resource,
+  Resource,
+  z.input<typeof singleParamsZ>
+> {
   readonly type: string = "ontology";
-  private readonly client: UnaryClient;
+  /** Read surface of the ontology record tables. */
+  readonly cache: Cache;
+  /** Cached read surface for the children of a set of resources. */
+  readonly children: query.Retrieves<DependentParams, Resource[]>;
+  /** Cached read surface for the parents of a set of resources. */
+  readonly parents: query.Retrieves<DependentParams, Resource[]>;
+  private readonly cfg: ClientConfig;
   private readonly writer: Writer;
 
-  constructor(unary: UnaryClient) {
-    this.client = unary;
+  constructor(cfg: ClientConfig) {
+    const { unary, cache } = cfg;
+    const relationships = cache.createTable<string, Relationship>({
+      name: "relationships",
+      equal: (a, b) =>
+        idsEqual(a.from, b.from) && idsEqual(a.to, b.to) && a.type === b.type,
+      listen: [
+        query.createSetListener(RELATIONSHIP_SET_CHANNEL_NAME, relationshipZ, {
+          key: (changed) => relationshipToString(changed),
+        }),
+        query.createDeleteListener(RELATIONSHIP_DELETE_CHANNEL_NAME, relationshipZ, {
+          key: (changed) => relationshipToString(changed),
+        }),
+      ],
+    });
+    const resources = cache.createTable<string, Resource>({
+      name: "resources",
+      equal: (a, b) => deep.equal(a, b),
+      // Fetches bypass the query cache: sibling domain deletes never write
+      // through to the resource store, so cached entries may be stale.
+      fetch: async (keys) =>
+        await this.execRetrieve({ ids: parseIDs(keys), ignoreNotFoundError: true }),
+      listen: [
+        query.createSetListener(RESOURCE_SET_CHANNEL_NAME, resourceZ, {
+          value: (changed, prev) => (prev == null ? changed : { ...prev, ...changed }),
+        }),
+        // The store is keyed by the full "type:key" string, not the bare key.
+        query.createDeleteListener(RESOURCE_DELETE_CHANNEL_NAME, idZ, {
+          key: (changed) => idToString(changed),
+        }),
+      ],
+    });
+    const single = cache.queries<string, Resource, string, Resource>({
+      name: "resource",
+      table: resources,
+      fetch: async (q) => [(await this.fetchSingle(q)).key],
+      compose: (records) => records[0],
+      keyOf: (q) => q,
+      single: true,
+    });
+    super(cache, {
+      name: "resource",
+      table: resources,
+      request: {
+        schema: retrieveMultiParamsZ,
+        fetch: async (req) => await this.fetchRequest(req),
+        matches: (resource, req) => requestFilter(req)(resource),
+      },
+      single: { schema: singleParamsZ, space: single },
+    });
+    this.cfg = cfg;
     this.writer = new Writer(unary);
+    this.cache = new Cache(relationships, resources);
+    this.children = this.dependentSurface(cache, "children", "to");
+    this.parents = this.dependentSurface(cache, "parents", "from");
   }
 
   /**
-   * Retrieves the resource in the ontology with the given ID.
-   * @param id - The ID of the resource to retrieve.
-   * @param options - Additional options for the retrieval.
-   * @param options.excludeFieldData - Whether to exclude the field data of the resource
-   * in the results.
-   * @returns The resource with the given ID.
-   * @throws {QueryError} If no resource is found with the given ID.
+   * Reads the resources the params address. The ID-array form remains for migration
+   * only: query with `{ ids }`, `children.retrieve`, or `parents.retrieve` instead.
    */
-  async retrieve(id: ID, options?: RetrieveOptions): Promise<Resource>;
-
-  /**
-   * Retrieves the resources in the ontology with the given IDs.
-   *
-   * @param ids - The IDs of the resources to retrieve.
-   * @param options - Additional options for the retrieval.
-   * @param options.excludeFieldData - Whether to exclude the field data of the
-   * resources in the results.
-   * @returns The resources with the given IDs.
-   * @throws {QueryError} If no resource is found with any of the given IDs.
-   */
-  async retrieve(ids: ID[], options?: RetrieveOptions): Promise<Resource[]>;
-
-  async retrieve(params: RetrieveRequest): Promise<Resource[]>;
-
+  retrieve(
+    ids: Array<ID | string>,
+    options?: RetrieveOptions & { children?: boolean; parents?: boolean },
+  ): Promise<Resource[]>;
+  retrieve(
+    params: string | z.input<typeof singleParamsZ>,
+    options?: query.FetchOptions,
+  ): Promise<Resource>;
+  retrieve(params: RetrieveParams, options?: query.FetchOptions): Promise<Resource[]>;
   async retrieve(
-    ids: ID | ID[] | RetrieveRequest,
-    options?: RetrieveOptions,
+    params:
+      Array<ID | string> | string | z.input<typeof singleParamsZ> | RetrieveParams,
+    options?:
+      | query.FetchOptions
+      | (RetrieveOptions & { children?: boolean; parents?: boolean }),
   ): Promise<Resource | Resource[]> {
-    if (!Array.isArray(ids) && typeof ids === "object" && !("key" in ids))
-      return await this.execRetrieve(ids);
-    const parsedIDs = parseIDs(ids);
-    const resources = await this.execRetrieve({ ids: parsedIDs, ...options });
-    if (Array.isArray(ids)) return resources;
-    if (resources.length === 0)
-      throw new QueryError(
-        `No resource found with ID ${strings.naturalLanguageJoin(
-          parsedIDs.map((id) => idToString(id)),
-        )}`,
-      );
-    return resources[0];
+    if (Array.isArray(params)) {
+      const ids = parseIDs(params);
+      const {
+        children = false,
+        parents = false,
+        ...rest
+      } = (options ?? {}) as RetrieveOptions & {
+        children?: boolean;
+        parents?: boolean;
+      };
+      if (children) return await this.children.retrieve({ ids, ...rest });
+      if (parents) return await this.parents.retrieve({ ids, ...rest });
+      return await super.retrieve({ ids, ...rest });
+    }
+    return await super.retrieve(
+      params as z.input<typeof singleParamsZ>,
+      options as query.FetchOptions,
+    );
   }
 
-  /**
-   * Retrieves the children of the resources with the given IDs.
-   * @param ids - The IDs of the resources whose children to retrieve.
-   * @param options - Additional options for the retrieval.
-   * the results.
-   * @returns The children of the resources with the given IDs.
-   */
+  /** Migration-only alias for `children.retrieve({ ids })`. */
   async retrieveChildren(
     ids: ID | ID[],
     options?: RetrieveOptions,
   ): Promise<Resource[]> {
-    return await this.execRetrieve({
-      ids: array.toArray(ids),
-      children: true,
-      ...options,
-    });
+    return await this.children.retrieve({ ids, ...options });
   }
 
-  /**
-   * Retrieves the parents of the resources with the given IDs.
-   *
-   * @param ids - the IDs of the resources whose parents to retrieve
-   * @param options - additional options for the retrieval
-   * @param options.excludeFieldData - whether to exclude the field data of the parents
-   * in the results
-   * @returns the parents of the resources with the given IDs
-   */
+  /** Migration-only alias for `parents.retrieve({ ids })`. */
   async retrieveParents(
     ids: ID | ID[],
     options?: RetrieveOptions,
   ): Promise<Resource[]> {
-    return await this.execRetrieve({
-      ids: array.toArray(ids),
-      parents: true,
-      ...options,
-    });
+    return await this.parents.retrieve({ ids, ...options });
   }
 
-  /**
-   * Adds children to a resource in the ontology.
-   * @param id - The ID of the resource to add children to.
-   * @param children - The IDs of the children to add.
-   */
+  /** Adds children to a resource in the ontology. */
   async addChildren(id: ID, ...children: ID[]): Promise<void> {
-    return await this.writer.addChildren(id, ...children);
+    await this.writer.addChildren(id, ...children);
+    children.forEach((child) => {
+      const rel = parentRel(id, child);
+      this.cache.relationships.set(relationshipToString(rel), rel);
+    });
   }
 
-  /**
-   * Removes children from a resource in the ontology.
-   * @param id - The ID of the resource to remove children from.
-   * @param children - The IDs of the children to remove.
-   */
+  /** Removes children from a resource in the ontology. */
   async removeChildren(id: ID, ...children: ID[]): Promise<void> {
-    return await this.writer.removeChildren(id, ...children);
+    await this.writer.removeChildren(id, ...children);
+    children.forEach((child) =>
+      this.cache.relationships.delete(relationshipToString(parentRel(id, child))),
+    );
   }
 
-  /**
-   * Moves children from one resource to another in the ontology.
-   * @param from - The ID of the resource to move children from.
-   * @param to - The ID of the resource to move children to.
-   * @param children - The IDs of the children to move.
-   */
+  /** Moves children from one resource to another in the ontology. */
   async moveChildren(from: ID, to: ID, ...children: ID[]): Promise<void> {
-    return await this.writer.moveChildren(from, to, ...children);
+    const move = (): destructor.Destructor[] => {
+      const deletions = children.map((child) =>
+        this.cache.relationships.delete(relationshipToString(parentRel(from, child))),
+      );
+      const insertions = children.map((child) => {
+        const rel = parentRel(to, child);
+        return this.cache.relationships.set(relationshipToString(rel), rel);
+      });
+      return [...deletions, ...insertions];
+    };
+    await query.optimistic({
+      rollbacks: move(),
+      commit: async () => await this.writer.moveChildren(from, to, ...children),
+    });
+    move();
+  }
+
+  /** Subscribes to every resource set delivered to the cache. */
+  onResourceSet(handler: (resource: Resource) => void): destructor.Destructor {
+    return this.cache.resources.subscribe((event) => {
+      if (event.variant === "set") handler(event.value);
+    });
+  }
+
+  /** Subscribes to every resource delete delivered to the cache. */
+  onResourceDelete(handler: (id: ID) => void): destructor.Destructor {
+    return this.cache.resources.subscribe((event) => {
+      if (event.variant === "delete") handler(parseID(event.key));
+    });
+  }
+
+  /** Subscribes to every relationship set delivered to the cache. */
+  onRelationshipSet(handler: (rel: Relationship) => void): destructor.Destructor {
+    return this.cache.relationships.subscribe((event) => {
+      if (event.variant === "set") handler(event.value);
+    });
+  }
+
+  /** Subscribes to every relationship delete delivered to the cache. */
+  onRelationshipDelete(handler: (rel: Relationship) => void): destructor.Destructor {
+    return this.cache.relationships.subscribe((event) => {
+      if (event.variant === "delete") handler(relationshipZ.parse(event.key));
+    });
+  }
+
+  /** Merges a fetched resource with cached field data it may lack. */
+  private mergeFieldData(r: Resource): Resource {
+    const p = this.cache.resources.get(r.key);
+    return p == null ? r : { ...r, data: r.data ?? p.data };
+  }
+
+  private writeResources(resources: Resource[]): void {
+    this.cache.resources.set(resources.map((r) => this.mergeFieldData(r)));
+  }
+
+  // Resources are deleted through other domain clients whose write-through
+  // never reaches the resource store, so fetches always hit the network
+  // rather than serving a possibly stale cached entry.
+  private async fetchSingle(q: string): Promise<Resource> {
+    const resources = await this.execRetrieve({
+      ids: [parseID(q)],
+    });
+    if (resources.length === 0)
+      throw new NotFoundError(`No resource found with ID ${q}`);
+    this.writeResources(resources);
+    return resources[0];
+  }
+
+  private async fetchRequest(req: NormalizedRequest): Promise<Resource[]> {
+    const { ids, ...rest } = req;
+    const resources = await this.execRetrieve(
+      ids == null ? rest : { ids: parseIDs(ids), ...rest },
+    );
+    return resources.map((r) => this.mergeFieldData(r));
+  }
+
+  private async fetchDependents(
+    q: DependentRequest,
+    direction: RelationshipDirection,
+  ): Promise<Resource[]> {
+    const { ids, ...rest } = q;
+    const resources = await this.execRetrieve({
+      ids: parseIDs(ids),
+      children: direction === "to",
+      parents: direction === "from",
+      ...rest,
+    });
+    this.writeResources(resources);
+    // Multi-anchor answers can't attribute members to an anchor, so only
+    // single-anchor queries write relationships through.
+    if (ids.length === 1) {
+      const anchor = parseID(ids[0]);
+      resources.forEach(({ id }) => {
+        const rel = direction === "to" ? parentRel(anchor, id) : parentRel(id, anchor);
+        this.cache.relationships.set(relationshipToString(rel), rel);
+      });
+    }
+    return resources;
+  }
+
+  private dependentSurface(
+    cache: query.Cache,
+    name: string,
+    direction: RelationshipDirection,
+  ): query.Retrieves<DependentParams, Resource[]> {
+    const anchor = oppositeRelationshipDirection(direction);
+    const space = cache.queries<DependentRequest, Resource[], string, Resource>({
+      name,
+      table: this.cache.resources,
+      fetch: async (q) => (await this.fetchDependents(q, direction)).map((r) => r.key),
+      compose: (records) => records,
+      matches: (resource, q) => this.isDependent(resource, q, direction),
+      serverFields: DEPENDENT_SERVER_FIELDS,
+      watch: [
+        query.watch(this.cache.relationships, (event, q: DependentRequest) => {
+          const rel =
+            event.variant === "set" ? event.value : relationshipZ.parse(event.key);
+          if (rel.type !== PARENT_OF_RELATIONSHIP_TYPE) return null;
+          if (!q.ids.includes(idToString(rel[anchor]))) return null;
+          if (q.types != null && !q.types.includes(rel[direction].type)) return null;
+          return [idToString(rel[direction])];
+        }),
+      ],
+    });
+    return {
+      retrieve: async ({ ids, ...options }, opts) =>
+        await space.retrieve(normalizeDependents(ids, options), opts),
+      onChange: ({ ids, ...options }, handler) =>
+        space.onChange(normalizeDependents(ids, options), handler),
+      getCached: ({ ids, ...options }) =>
+        space.getCached(normalizeDependents(ids, options)),
+    };
+  }
+
+  /** Whether a cached relationship makes the resource a dependent of the query. */
+  private isDependent(
+    resource: Resource,
+    q: DependentRequest,
+    direction: RelationshipDirection,
+  ): boolean {
+    if (q.types != null && !q.types.includes(resource.id.type)) return false;
+    const anchor = oppositeRelationshipDirection(direction);
+    return (
+      this.cache.relationships.get(
+        (rel) =>
+          rel.type === PARENT_OF_RELATIONSHIP_TYPE &&
+          q.ids.includes(idToString(rel[anchor])) &&
+          idsEqual(rel[direction], resource.id),
+      ).length > 0
+    );
   }
 
   private async execRetrieve(request: RetrieveRequest): Promise<Resource[]> {
-    const { resources } = await this.client.send(
+    const { resources } = await this.cfg.unary.send(
       "/ontology/retrieve",
       request,
-      retrieveReqZ,
+      wireReqZ,
       retrieveResZ,
     );
     return resources;
   }
 }
-
-export const RESOURCE_SET_CHANNEL_NAME = "sy_ontology_resource_set";
-export const RESOURCE_DELETE_CHANNEL_NAME = "sy_ontology_resource_delete";
-export const RELATIONSHIP_SET_CHANNEL_NAME = "sy_ontology_relationship_set";
-export const RELATIONSHIP_DELETE_CHANNEL_NAME = "sy_ontology_relationship_delete";

package/src/ontology/external.ts

@@ -9,3 +9,10 @@
 
 export * from "@/ontology/client";
 export * from "@/ontology/payload";
+export {
+  Cache,
+  RELATIONSHIP_DELETE_CHANNEL_NAME,
+  RELATIONSHIP_SET_CHANNEL_NAME,
+  RESOURCE_DELETE_CHANNEL_NAME,
+  RESOURCE_SET_CHANNEL_NAME,
+} from "@/ontology/store";