@openedc/sdk 3.8.2-next.1 → 3.8.2-next.2

package/README.md

@@ -100,7 +100,7 @@ await subject.set({ subjectKey: "Patient-003" }).commit();
 Instead of specifying the project per call, a global scope can be set for all upcoming statements. This works well for linear, sequential flows but should be avoided in parallel or callback-based code that handles multiple projects concurrently. Assumed for the rest of the examples.
 
 ```ts
-import { Location, SubjectData } from "@openedc/sdk";
+import { scope, Location, SubjectData } from "@openedc/sdk";
 
 // Scope subsequent queries and commits
 scope(project);

package/openedc-sdk.d.ts

@@ -196,6 +196,13 @@ export type FieldDefinition = {
 	relation?: typeof DataBlock | typeof DataBlock[];
 	delete?: "unset" | "cascade";
 };
+export type FieldsOf<T> = {
+	[K in keyof T as T[K] extends Function ? never : K]: T[K];
+};
+export type WhereValue<T> = T extends DataBlock ? T | BlockReference<T> : T extends BlockReference<infer U> ? T | U : T extends (infer E)[] ? WhereValue<E>[] : T;
+export type WhereFilter<T> = {
+	[K in keyof FieldsOf<T>]?: WhereValue<T[K]>;
+};
 declare class DataBlock {
 	static adapter: PersistenceAdapter;
 	static fields: Record<string, FieldDefinition>;
@@ -215,8 +222,8 @@ declare class DataBlock {
 	get static(): typeof DataBlock;
 	protected get children(): DataBlock[];
 	static where<T extends typeof DataBlock>(this: T): Collection<T>;
-	static where<T extends typeof DataBlock>(this: T, value: string): Where<T>;
-	static where<T extends typeof DataBlock>(this: T, value: Record<string, ExtendedKey>): Collection<T>;
+	static where<T extends typeof DataBlock>(this: T, value: keyof WhereFilter<InstanceType<T>> & string): Where<T>;
+	static where<T extends typeof DataBlock>(this: T, value: WhereFilter<InstanceType<T>>): Collection<T>;
 	commit(options?: {
 		cascade?: boolean;
 		project?: Project | string;
@@ -243,7 +250,7 @@ declare class DataBlock {
 	}, visited?: Record<string, DataBlock>): this;
 	find<T extends typeof DataBlock>(block: T, key?: string, value?: unknown, all?: boolean, visited?: Set<string>): InstanceType<T> | undefined;
 	find<T extends typeof DataBlock>(block: T, key: string | undefined, value: unknown | undefined, all: true, visited?: Set<string>): InstanceType<T>[] | undefined;
-	set(values: Partial<this>): this & Partial<this>;
+	set(values: Partial<FieldsOf<this>>): this & Partial<FieldsOf<this>>;
 	get uncommitted(): boolean;
 	get reference(): BlockReference<this>;
 	private static withCache;
@@ -801,9 +808,9 @@ export declare class CalendarEvent extends DataBlock {
 	studyEventInstance?: number;
 	name?: string;
 	description?: string;
-	private startDateUTC;
+	startDateUTC: string;
 	private startTimeUTC?;
-	private endDateUTC;
+	endDateUTC: string;
 	private endTimeUTC?;
 	shared?: boolean;
 	constructor(owner: BlockReference<User>, startDate: string);

package/openedc-sdk.js

@@ -9833,15 +9833,17 @@ const Gs = (Ve = class {
   static async rebuildBlock(e) {
     const r = Object.assign(new this(), e);
     for (const [n, i] of Object.entries(this.fields)) {
-      if (!i.relation) continue;
       const s = Reflect.get(r, n);
-      if (Array.isArray(s)) {
-        const o = s.map((u) => ke.fromString(u)).filter((u) => !!u), a = i.lazy ? o : await Promise.all(o.map((u) => u.data));
-        Reflect.set(r, n, a.filter((u) => u));
-      } else {
-        const o = ke.fromString(s), a = i.lazy ? o : await (o == null ? void 0 : o.data);
-        Reflect.set(r, n, a);
-      }
+      if (i.type === Date && s)
+        Reflect.set(r, n, new Date(s));
+      else if (i.relation)
+        if (Array.isArray(s)) {
+          const o = s.map((u) => ke.fromString(u)).filter((u) => !!u), a = i.lazy ? o : await Promise.all(o.map((u) => u.data));
+          Reflect.set(r, n, a.filter(Boolean));
+        } else {
+          const o = ke.fromString(s), a = i.lazy ? o : await (o == null ? void 0 : o.data);
+          Reflect.set(r, n, a);
+        }
     }
     return r.internal.lastState = structuredClone(e), r;
   }
@@ -20768,7 +20770,7 @@ Ze = Et([
 let Yn;
 const xD = async ({ serverUrl: t, apiKey: e }) => {
   var d;
-  const r = await fetch(t + "/api/status");
+  const r = await fetch(new URL("/api/status", t));
   if (!r.ok) throw new Error("Server not available");
   const { supabaseUrl: n, supabaseKey: i } = await r.json();
   Yn = ip(n, i, {
@@ -20779,7 +20781,7 @@ const xD = async ({ serverUrl: t, apiKey: e }) => {
       }
     }
   });
-  const s = await fetch(t + "/api/auth/token", {
+  const s = await fetch(new URL("/api/auth/token", t), {
     method: "POST",
     headers: {
       Authorization: `Bearer ${e}`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openedc/sdk",
-    "version": "3.8.2-next.1",
+    "version": "3.8.2-next.2",
     "description": "TypeScript SDK for the OpenEDC Health Platform",
     "type": "module",
     "main": "./openedc-sdk.js",