@quadrokit/client 0.3.11 → 0.3.13

package/README.md

@@ -51,8 +51,9 @@ Environment variables (often via `.env` in the project root): `VITE_4D_ORIGIN`,
 
 | File | Purpose |
 |------|---------|
-| **`types.gen.ts`** | Entity interfaces and `*Path` unions for typed `select`. |
-| **`client.gen.ts`** | `createClient(config)` — dataclass APIs, optional `authentify`, `rpc`, `quadrokitCatalogMeta`. |
+| **`types.gen.ts`** | Entity interfaces; **`*Path`** aliases use **`QuadroAttributePaths<T>`** (recursive dot paths, depth-limited for circular relations); **`QuadroClient`** typing. |
+| **`catalog.gen.json`** | Catalog runtime spec (dataclass layouts, methods, relations) consumed by `@quadrokit/client/runtime` — keeps **`client.gen.ts`** tiny. |
+| **`client.gen.ts`** | Thin `createClient(config)` that wires `QuadroHttp` + `buildQuadroClientFromCatalogSpec` + `catalog.gen.json`. |
 | **`meta.json`** | `__NAME`, `sessionCookieName` hint for 4D session cookies. |
 
 Point your app imports at the generated folder, for example:

package/dist/generate/codegen.d.ts

@@ -1,4 +1,22 @@
 import type { CatalogJson } from '@quadrokit/shared';
+/** Serializable spec consumed by {@link buildQuadroClientFromCatalogSpec} at runtime. */
+export declare function buildCatalogRuntimeSpec(catalog: CatalogJson): {
+    classes: {
+        name: string;
+        relationMap: Record<string, string>;
+        keyNames: string[];
+        entityMethodNames: string[];
+        entityCollectionMethodNames: string[];
+        dataClassMethodNames: string[];
+        navigable: {
+            attr: string;
+            targetClass: string;
+            entityCollectionMethodNames: string[];
+        }[];
+    }[];
+    keyNamesByClass: Record<string, string[]>;
+    hasAuthentify: boolean;
+};
 /** Warn when the catalog lists dataclasses but omits attributes (e.g. plain `GET /rest/$catalog` instead of `/rest/$catalog/$all`). */
 export declare function warnIfCatalogLacksAttributes(catalog: CatalogJson): void;
 export declare function writeGenerated(outDir: string, catalog: CatalogJson): Promise<void>;

package/dist/generate/codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/generate/codegen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAsC,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAmXxF,uIAAuI;AACvI,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAYvE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBxF"}
+{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/generate/codegen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAsC,WAAW,EAAE,MAAM,mBAAmB,CAAA;AA4GxF,yFAAyF;AACzF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,GAAG;IAC7D,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACnC,QAAQ,EAAE,MAAM,EAAE,CAAA;QAClB,iBAAiB,EAAE,MAAM,EAAE,CAAA;QAC3B,2BAA2B,EAAE,MAAM,EAAE,CAAA;QACrC,oBAAoB,EAAE,MAAM,EAAE,CAAA;QAC9B,SAAS,EAAE;YACT,IAAI,EAAE,MAAM,CAAA;YACZ,WAAW,EAAE,MAAM,CAAA;YACnB,2BAA2B,EAAE,MAAM,EAAE,CAAA;SACtC,EAAE,CAAA;KACJ,EAAE,CAAA;IACH,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IACzC,aAAa,EAAE,OAAO,CAAA;CACvB,CAuBA;AA6GD,uIAAuI;AACvI,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAYvE;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBxF"}

package/dist/generate/codegen.mjs

@@ -66,28 +66,7 @@ function keyNames(dc) {
     const k = dc.key?.map((x) => x.name) ?? ['ID'];
     return k.length ? k : ['ID'];
 }
-function collectPaths(dc, byName, maxDepth) {
-    const paths = new Set();
-    const visit = (current, prefix, depth) => {
-        for (const a of current.attributes ?? []) {
-            if (a.kind === 'storage' || a.kind === 'calculated' || a.kind === 'alias') {
-                const p = prefix ? `${prefix}.${a.name}` : a.name;
-                paths.add(p);
-            }
-            if (a.kind === 'relatedEntity' && a.type && depth < maxDepth) {
-                const child = byName.get(a.type);
-                const base = prefix ? `${prefix}.${a.name}` : a.name;
-                paths.add(base);
-                if (child) {
-                    visit(child, base, depth + 1);
-                }
-            }
-        }
-    };
-    visit(dc, '', 0);
-    return [...paths].sort();
-}
-function emitInterface(dc, _byName) {
+function emitInterface(dc) {
     const lines = [];
     lines.push(`export interface ${dc.name} {`);
     for (const a of dc.attributes ?? []) {
@@ -115,42 +94,94 @@ function methodsForApply(dc, applyTo) {
     }
     return (dc.methods ?? []).filter((m) => m.applyTo === applyTo && m.exposed !== false);
 }
-function emitTypes(catalog) {
+function catalogHasAuthentify(catalog) {
+    return Boolean(catalog.methods?.some((m) => m.name === 'authentify' && m.applyTo === 'dataStore'));
+}
+/** Serializable spec consumed by {@link buildQuadroClientFromCatalogSpec} at runtime. */
+export function buildCatalogRuntimeSpec(catalog) {
     const classes = exposedDataClasses(catalog);
     const byName = new Map(classes.map((c) => [c.name, c]));
-    const interfaces = classes.map((c) => emitInterface(c, byName));
+    return {
+        hasAuthentify: catalogHasAuthentify(catalog),
+        keyNamesByClass: Object.fromEntries(classes.map((x) => [x.name, [...keyNames(x)]])),
+        classes: classes.map((c) => ({
+            name: c.name,
+            relationMap: relationTargets(c),
+            keyNames: [...keyNames(c)],
+            entityMethodNames: methodsForApply(c, 'entity').map((m) => m.name),
+            entityCollectionMethodNames: methodsForApply(c, 'entityCollection').map((m) => m.name),
+            dataClassMethodNames: methodsForApply(c, 'dataClass').map((m) => m.name),
+            navigable: navigableRelations(c).map((n) => ({
+                attr: n.attr,
+                targetClass: n.targetClass,
+                entityCollectionMethodNames: methodsForApply(byName.get(n.targetClass), 'entityCollection').map((m) => m.name),
+            })),
+        })),
+    };
+}
+function emitQuadroClientTypeBlock(catalog, withEntities) {
+    const classes = exposedDataClasses(catalog);
+    const hasAuthentify = catalogHasAuthentify(catalog);
+    const authLine = hasAuthentify
+        ? `  authentify: { login: (body: { email: string; password: string }) => Promise<unknown> };\n`
+        : '';
+    const tail = `  rpc: (segments: string[], init?: { method?: 'GET' | 'POST'; body?: unknown }) => Promise<unknown>;
+  sessionCookieName: string;
+  _http: QuadroHttp;
+};`;
+    if (!withEntities || classes.length === 0) {
+        return `export type QuadroClient = {
+${authLine}${tail}
+`;
+    }
+    const dcFn = `type QuadroDataClassFn = <R = unknown>(args?: readonly unknown[], init?: ClassFunctionHttpOptions & { unwrapResult?: boolean }) => Promise<R>;
+
+`;
+    const branches = classes
+        .map((c) => {
+        const keys = methodsForApply(c, 'dataClass')
+            .map((m) => `'${m.name}'`)
+            .join(' | ');
+        const rhs = keys
+            ? `BaseDataClassApi<${c.name}, ${c.name}Path> & { [K in ${keys}]: QuadroDataClassFn }`
+            : `BaseDataClassApi<${c.name}, ${c.name}Path>`;
+        return `  ${c.name}: ${rhs};`;
+    })
+        .join('\n');
+    return `${dcFn}export type QuadroClient = {
+${authLine}${branches}
+${tail}
+`;
+}
+function emitTypes(catalog) {
+    const classes = exposedDataClasses(catalog);
+    const interfaces = classes.map((c) => emitInterface(c));
     const pathTypes = classes.map((c) => {
-        const paths = collectPaths(c, byName, 2);
         const name = `${c.name}Path`;
-        const body = paths.length ? paths.map((p) => `'${p}'`).join('\n  | ') : 'never';
-        return `export type ${name} =\n  | ${body};`;
+        return `export type ${name} = QuadroAttributePaths<${c.name}>;`;
     });
     const header = `/* eslint-disable */\n/* Auto-generated by @quadrokit/client — do not edit */\n`;
+    const pathNote = classes.length > 0
+        ? `/**\n * *Path types use {@link QuadroAttributePaths} (recursive relation paths, depth-limited for circular graphs).\n * Override depth: \`type DeepEmployeePath = QuadroAttributePaths<Employee, 12>\`.\n */\n`
+        : '';
+    const runtimeImport = classes.length > 0
+        ? `import type { BaseDataClassApi, ClassFunctionHttpOptions, QuadroAttributePaths, QuadroHttp } from '@quadrokit/client/runtime';\n\n`
+        : `import type { QuadroHttp } from '@quadrokit/client/runtime';\n\n`;
     if (classes.length === 0) {
         const raw = catalog.dataClasses?.length ?? 0;
         const note = raw > 0
             ? `\n/**\n * No entity types: all ${raw} data class(es) in the catalog have exposed: false.\n * Enable REST exposure for tables in 4D, then run quadrokit-client generate again.\n */\n`
             : `\n/**\n * No entity types: the catalog has no dataClasses (or an empty list).\n */\n`;
-        return `${header}${note}\n`;
+        return `${header}${runtimeImport}${note}\n${emitQuadroClientTypeBlock(catalog, false)}`;
     }
-    return `${header}\n${interfaces.join('\n\n')}\n\n${pathTypes.join('\n\n')}\n`;
+    return `${header}${runtimeImport}${interfaces.join('\n\n')}\n\n${pathNote}${pathTypes.join('\n\n')}\n\n${emitQuadroClientTypeBlock(catalog, true)}`;
 }
 function emitClient(catalog) {
-    const classes = exposedDataClasses(catalog);
-    const byName = new Map(classes.map((c) => [c.name, c]));
     const dbName = catalog.__NAME ?? 'default';
-    const hasAuthentify = catalog.methods?.some((m) => m.name === 'authentify' && m.applyTo === 'dataStore');
-    const keyNamesRecord = Object.fromEntries(classes.map((x) => [x.name, keyNames(x)]));
-    const imports = classes.length > 0
-        ? `/* eslint-disable */\n/* Auto-generated by @quadrokit/client — do not edit */\n\nimport {\n  QuadroHttp,\n  makeDataClassApi,\n  attachRelatedApis,\n  attachEntityClassMethods,\n  bindEntityCollectionMethods,\n  callDataClassFunction,\n  callDatastorePath,\n  type ClassFunctionHttpOptions,\n  type CollectionHandle,\n  type CollectionOptions,\n  type SelectedEntity,\n} from '@quadrokit/client/runtime';\n`
-        : `/* eslint-disable */\n/* Auto-generated by @quadrokit/client — do not edit */\n\nimport { QuadroHttp, callDatastorePath } from '@quadrokit/client/runtime';\n`;
-    const typeImports = classes.map((c) => c.name).join(', ');
-    const pathImports = classes.map((c) => `${c.name}Path`).join(', ');
-    const typeImportLine = typeImports || pathImports
-        ? // Split so `rename-dist-js-to-mjs` does not rewrite this *emitted* import to `.mjs`.
-            `\nimport type { ${[typeImports, pathImports].filter(Boolean).join(', ')} } from './types.gen';\n\n`
-        : '\n';
-    const header = `${imports}${typeImportLine}`;
+    const imports = `/* eslint-disable */\n/* Auto-generated by @quadrokit/client — do not edit */\n\nimport {\n  QuadroHttp,\n  buildQuadroClientFromCatalogSpec,\n  type CatalogRuntimeSpec,\n} from '@quadrokit/client/runtime';\nimport catalogSpec from './catalog.gen.json' with { type: 'json' };\n`;
+    // Split so `rename-dist-js-to-mjs` does not rewrite this *emitted* import to `.mjs`.
+    const typeImport = `import type { QuadroClient } from './types.gen';\n\n`;
+    const header = `${imports}${typeImport}`;
     const metaExport = `
 export const quadrokitCatalogMeta = {
   __NAME: ${JSON.stringify(dbName)},
@@ -162,174 +193,24 @@ export interface QuadroClientConfig {
   baseURL: string;
   fetchImpl?: typeof fetch;
   defaultHeaders?: Record<string, string>;
+  /** Optional bus for request lifecycle events (loading / success / error). See {@link QuadroEventBus} from \`@quadrokit/client/runtime\`. */
+  events?: import('@quadrokit/client/runtime').QuadroEventBus;
 }
 `;
-    const mapFunctions = classes
-        .map((c) => {
-        const nav = navigableRelations(c);
-        const relMap = JSON.stringify(relationTargets(c));
-        const kn = JSON.stringify(keyNames(c));
-        const ecNav = nav.map((n) => ({
-            attr: n.attr,
-            targetClass: n.targetClass,
-            entityCollectionMethodNames: methodsForApply(byName.get(n.targetClass), 'entityCollection').map((m) => m.name),
-        }));
-        const entityMethodNames = methodsForApply(c, 'entity').map((m) => m.name);
-        return `  function map${c.name}Row(http: QuadroHttp, raw: unknown): ${c.name} {
-    const row = raw as ${c.name};
-    const pk = (row as { ID?: number }).ID ?? (row as { id?: number }).id;
-    attachEntityClassMethods(
-      raw,
-      {
-        http,
-        className: '${c.name}',
-        relationMap: ${relMap},
-        keyNames: ${kn},
-      },
-      ${JSON.stringify(entityMethodNames)},
-    );
-    attachRelatedApis(
-      raw,
-      {
-        http,
-        parentClass: '${c.name}',
-        parentId: pk as number,
-        relationMap: ${relMap},
-        keyNames: ${JSON.stringify(keyNamesRecord)},
-      },
-      ${JSON.stringify(ecNav)},
-    );
-    return row;
-  }`;
-    })
-        .join('\n\n');
-    const classBranches = classes
-        .map((c) => {
-        const relMap = JSON.stringify(relationTargets(c));
-        const kn = JSON.stringify(keyNames(c));
-        const pathsType = `${c.name}Path`;
-        const ecNames = JSON.stringify(methodsForApply(c, 'entityCollection').map((m) => m.name));
-        const dcBlock = methodsForApply(c, 'dataClass')
-            .map((m) => `        ${m.name}: async <R = unknown>(args: readonly unknown[] = [], init?: ClassFunctionHttpOptions & { unwrapResult?: boolean }) =>
-          callDataClassFunction<R>(http, '${c.name}', '${m.name}', args, init),`)
-            .join('\n');
-        const dcPrefix = dcBlock ? `${dcBlock}\n` : '';
-        return `    ${c.name}: (() => {
-      const cfg = {
-        http,
-        className: '${c.name}',
-        relationMap: ${relMap},
-        keyNames: ${kn},
-      } as const;
-      const api = makeDataClassApi<${c.name}>(cfg);
-      return {
-${dcPrefix}        all<S extends readonly ${pathsType}[] = readonly []>(
-          options?: CollectionOptions & { select?: S },
-        ): CollectionHandle<S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>> {
-          const inner = api.all(options as CollectionOptions);
-          bindEntityCollectionMethods(inner, { http, className: '${c.name}', relationMap: ${relMap} }, ${ecNames});
-          return {
-            ...inner,
-            delete: inner.delete.bind(inner),
-            release: inner.release.bind(inner),
-            get length() {
-              return inner.length;
-            },
-            [Symbol.asyncIterator]() {
-              const it = inner[Symbol.asyncIterator]();
-              return {
-                async next() {
-                  const n = await it.next();
-                  if (!n.done && n.value) {
-                    map${c.name}Row(http, n.value);
-                  }
-                  return n;
-                },
-                return(value) {
-                  return it.return?.(value) ?? Promise.resolve({ done: true, value });
-                },
-                throw(e) {
-                  return it.throw?.(e) ?? Promise.reject(e);
-                },
-              };
-            },
-          } as CollectionHandle<S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>>;
-        },
-        async get<S extends readonly ${pathsType}[] = readonly []>(
-          id: string | number,
-          options?: { select?: S },
-        ): Promise<(S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>) | null> {
-          const entity = await api.get(id, options);
-          if (entity) {
-            map${c.name}Row(http, entity);
-          }
-          return entity as (S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>) | null;
-        },
-        delete: (id: string | number) => api.delete(id),
-        query<S extends readonly ${pathsType}[] = readonly []>(
-          filter: string,
-          options?: CollectionOptions & { params?: unknown[]; select?: S },
-        ): CollectionHandle<S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>> {
-          const inner = api.query(filter, options as CollectionOptions);
-          bindEntityCollectionMethods(inner, { http, className: '${c.name}', relationMap: ${relMap} }, ${ecNames});
-          return {
-            ...inner,
-            delete: inner.delete.bind(inner),
-            release: inner.release.bind(inner),
-            get length() {
-              return inner.length;
-            },
-            [Symbol.asyncIterator]() {
-              const it = inner[Symbol.asyncIterator]();
-              return {
-                async next() {
-                  const n = await it.next();
-                  if (!n.done && n.value) {
-                    map${c.name}Row(http, n.value);
-                  }
-                  return n;
-                },
-                return(value) {
-                  return it.return?.(value) ?? Promise.resolve({ done: true, value });
-                },
-                throw(e) {
-                  return it.throw?.(e) ?? Promise.reject(e);
-                },
-              };
-            },
-          } as CollectionHandle<S['length'] extends 0 ? ${c.name} : SelectedEntity<${c.name}, S>>;
-        },
-      };
-    })(),`;
-    })
-        .join('\n');
-    const authentifyBlock = hasAuthentify
-        ? `
-    authentify: {
-      login: (body: { email: string; password: string }) =>
-        callDatastorePath(http, ['authentify', 'login'], { body }),
-    },`
-        : '';
     const body = `
-export function createClient(config: QuadroClientConfig) {
+export function createClient(config: QuadroClientConfig): QuadroClient {
   const http = new QuadroHttp({
     baseURL: config.baseURL,
     fetchImpl: config.fetchImpl,
     defaultHeaders: config.defaultHeaders,
+    events: config.events,
   });
-
-${mapFunctions}
-
-  return {${authentifyBlock}
-${classBranches}
-    rpc: (segments: string[], init?: { method?: 'GET' | 'POST'; body?: unknown }) =>
-      callDatastorePath(http, segments, init),
-    sessionCookieName: quadrokitCatalogMeta.sessionCookieName,
-    _http: http,
-  };
+  return buildQuadroClientFromCatalogSpec(
+    http,
+    catalogSpec as unknown as CatalogRuntimeSpec,
+    quadrokitCatalogMeta,
+  ) as QuadroClient;
 }
-
-export type QuadroClient = ReturnType<typeof createClient>;
 `;
     return header + metaExport + configInterface + body;
 }
@@ -347,6 +228,7 @@ export function warnIfCatalogLacksAttributes(catalog) {
 }
 export async function writeGenerated(outDir, catalog) {
     await mkdir(outDir, { recursive: true });
+    await writeFile(path.join(outDir, 'catalog.gen.json'), `${JSON.stringify(buildCatalogRuntimeSpec(catalog), null, 2)}\n`, 'utf8');
     await writeFile(path.join(outDir, 'types.gen.ts'), emitTypes(catalog), 'utf8');
     await writeFile(path.join(outDir, 'client.gen.ts'), emitClient(catalog), 'utf8');
     await writeFile(path.join(outDir, 'meta.json'), JSON.stringify({

package/dist/runtime/catalog-builder.d.ts

@@ -0,0 +1,25 @@
+import { type RelatedNavigationSpec } from './data-class.js';
+import type { QuadroHttp } from './http.js';
+/** One dataclass entry in `catalog.gen.json` (codegen output). */
+export interface CatalogClassRuntimeSpec {
+    name: string;
+    relationMap: Record<string, string>;
+    keyNames: readonly string[];
+    entityMethodNames: readonly string[];
+    entityCollectionMethodNames: readonly string[];
+    dataClassMethodNames: readonly string[];
+    navigable: readonly RelatedNavigationSpec[];
+}
+export interface CatalogRuntimeSpec {
+    classes: readonly CatalogClassRuntimeSpec[];
+    keyNamesByClass: Readonly<Record<string, readonly string[]>>;
+    hasAuthentify: boolean;
+}
+/**
+ * Builds the object returned by generated `createClient()` from `catalog.gen.json`.
+ * Keeps generated `client.gen.ts` small; all repetitive logic lives here.
+ */
+export declare function buildQuadroClientFromCatalogSpec(http: QuadroHttp, spec: CatalogRuntimeSpec, meta: {
+    sessionCookieName: string;
+}): Record<string, unknown>;
+//# sourceMappingURL=catalog-builder.d.ts.map

package/dist/runtime/catalog-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-builder.d.ts","sourceRoot":"","sources":["../../src/runtime/catalog-builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C,kEAAkE;AAClE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3B,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,2BAA2B,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9C,oBAAoB,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,SAAS,EAAE,SAAS,qBAAqB,EAAE,CAAA;CAC5C;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,SAAS,uBAAuB,EAAE,CAAA;IAC3C,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAA;IAC5D,aAAa,EAAE,OAAO,CAAA;CACvB;AAqHD;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,kBAAkB,EACxB,IAAI,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAA;CAAE,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoBzB"}

package/dist/runtime/catalog-builder.mjs

@@ -0,0 +1,99 @@
+import { callDataClassFunction } from './class-function.mjs';
+import { attachEntityClassMethods, attachRelatedApis, bindEntityCollectionMethods, makeDataClassApi, } from './data-class.mjs';
+import { callDatastorePath } from './datastore.mjs';
+function wrapCollectionWithRowMapper(inner, mapRow) {
+    return {
+        ...inner,
+        delete: inner.delete.bind(inner),
+        release: inner.release.bind(inner),
+        get length() {
+            return inner.length;
+        },
+        [Symbol.asyncIterator]() {
+            const it = inner[Symbol.asyncIterator]();
+            return {
+                async next() {
+                    const n = await it.next();
+                    if (!n.done && n.value) {
+                        mapRow(n.value);
+                    }
+                    return n;
+                },
+                return(value) {
+                    return it.return?.(value) ?? Promise.resolve({ done: true, value });
+                },
+                throw(e) {
+                    return it.throw?.(e) ?? Promise.reject(e);
+                },
+            };
+        },
+    };
+}
+function mapRowFromSpec(http, raw, c, keyNamesRecord) {
+    const pk = raw.ID ?? raw.id;
+    attachEntityClassMethods(raw, {
+        http,
+        className: c.name,
+        relationMap: c.relationMap,
+        keyNames: c.keyNames,
+    }, c.entityMethodNames);
+    attachRelatedApis(raw, {
+        http,
+        parentClass: c.name,
+        parentId: pk,
+        relationMap: c.relationMap,
+        keyNames: keyNamesRecord,
+    }, c.navigable);
+}
+function makeDataClassNamespace(http, c, keyNamesRecord) {
+    const cfg = {
+        http,
+        className: c.name,
+        relationMap: c.relationMap,
+        keyNames: c.keyNames,
+    };
+    const api = makeDataClassApi(cfg);
+    const mapRow = (raw) => {
+        mapRowFromSpec(http, raw, c, keyNamesRecord);
+        return raw;
+    };
+    const bindEc = (inner) => {
+        bindEntityCollectionMethods(inner, { http, className: c.name, relationMap: c.relationMap }, c.entityCollectionMethodNames);
+        return wrapCollectionWithRowMapper(inner, mapRow);
+    };
+    const out = {};
+    for (const name of c.dataClassMethodNames) {
+        out[name] = async (args = [], init) => callDataClassFunction(http, c.name, name, args, init);
+    }
+    out.all = (options) => bindEc(api.all(options));
+    out.get = async (id, options) => {
+        const entity = await api.get(id, options);
+        if (entity) {
+            mapRow(entity);
+        }
+        return entity;
+    };
+    out.delete = (id) => api.delete(id);
+    out.query = (filter, options) => bindEc(api.query(filter, options ?? {}));
+    return out;
+}
+/**
+ * Builds the object returned by generated `createClient()` from `catalog.gen.json`.
+ * Keeps generated `client.gen.ts` small; all repetitive logic lives here.
+ */
+export function buildQuadroClientFromCatalogSpec(http, spec, meta) {
+    const keyNamesRecord = spec.keyNamesByClass;
+    const out = {};
+    if (spec.hasAuthentify) {
+        out.authentify = {
+            login: (body) => callDatastorePath(http, ['authentify', 'login'], { body }, { operation: 'auth.login' }),
+        };
+    }
+    for (const c of spec.classes) {
+        out[c.name] = makeDataClassNamespace(http, c, keyNamesRecord);
+    }
+    out.rpc = (segments, init) => callDatastorePath(http, segments, init);
+    out.sessionCookieName = meta.sessionCookieName;
+    out._http = http;
+    return out;
+}

package/dist/runtime/class-function.d.ts

@@ -1,7 +1,3 @@
-/**
- * ORDA class functions over REST ([4D docs](https://developer.4d.com/docs/REST/classFunctions.html)):
- * dataclass, entity selection (entityCollection), and entity methods.
- */
 import type { QuadroHttp } from './http.js';
 import { type MethodSelectionQuery } from './query.js';
 export type ClassFunctionHttpOptions = {

package/dist/runtime/class-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class-function.d.ts","sourceRoot":"","sources":["../../src/runtime/class-function.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjF,MAAM,MAAM,wBAAwB,GAAG;IACrC,4EAA4E;IAC5E,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,uGAAuG;AACvG,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,CAAC,CAK7D;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,wBAAwB,GAAG;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,OAAO,CAAC,CAAC,CAAC,CAoBZ;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EACxC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,wBAAwB,GAAG;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,OAAO,CAAC,CAAC,CAAC,CAqBZ;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG;IACrE,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,CAAC,EAClD,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,6BAA6B,GACtC,OAAO,CAAC,CAAC,CAAC,CA2BZ"}
+{"version":3,"file":"class-function.d.ts","sourceRoot":"","sources":["../../src/runtime/class-function.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,EAA6B,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjF,MAAM,MAAM,wBAAwB,GAAG;IACrC,4EAA4E;IAC5E,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,uGAAuG;AACvG,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,CAAC,CAK7D;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,wBAAwB,GAAG;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,OAAO,CAAC,CAAC,CAAC,CAkCZ;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EACxC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,wBAAwB,GAAG;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,OAAO,CAAC,CAAC,CAAC,CAoCZ;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG;IACrE,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAAC,CAAC,EAClD,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,SAAS,OAAO,EAAE,EACxB,OAAO,CAAC,EAAE,6BAA6B,GACtC,OAAO,CAAC,CAAC,CAAC,CA4CZ"}

package/dist/runtime/class-function.mjs

@@ -14,6 +14,12 @@ export async function callDataClassFunction(http, dataClass, functionName, args,
     const method = options?.method ?? 'POST';
     const unwrap = options?.unwrapResult !== false;
     const base = `/${dataClass}/${functionName}`;
+    const ctx = {
+        operation: 'function.dataclass',
+        className: dataClass,
+        methodName: functionName,
+        attributes: { argCount: args.length },
+    };
     let body;
     if (method === 'GET') {
         const params = new URLSearchParams();
@@ -21,14 +27,14 @@ export async function callDataClassFunction(http, dataClass, functionName, args,
         body = await http.json(`${base}?${params.toString()}`, {
             method: 'GET',
             signal: options?.signal,
-        });
+        }, ctx);
     }
     else {
         body = await http.json(base, {
             method: 'POST',
             body: JSON.stringify([...args]),
             signal: options?.signal,
-        });
+        }, ctx);
     }
     return (unwrap ? unwrapClassFunctionResult(body) : body);
 }
@@ -40,6 +46,13 @@ export async function callEntityFunction(http, dataClass, entityKey, functionNam
     const unwrap = options?.unwrapResult !== false;
     const key = encodeURIComponent(String(entityKey));
     const base = `/${dataClass}(${key})/${functionName}`;
+    const ctx = {
+        operation: 'function.entity',
+        className: dataClass,
+        methodName: functionName,
+        entityKey,
+        attributes: { argCount: args.length },
+    };
     let body;
     if (method === 'GET') {
         const params = new URLSearchParams();
@@ -47,14 +60,14 @@ export async function callEntityFunction(http, dataClass, entityKey, functionNam
         body = await http.json(`${base}?${params.toString()}`, {
             method: 'GET',
             signal: options?.signal,
-        });
+        }, ctx);
     }
     else {
         body = await http.json(base, {
             method: 'POST',
             body: JSON.stringify([...args]),
             signal: options?.signal,
-        });
+        }, ctx);
     }
     return (unwrap ? unwrapClassFunctionResult(body) : body);
 }
@@ -72,6 +85,15 @@ export async function callEntityCollectionFunction(http, dataClass, relationMap,
         path += `/$entityset/${encodeURIComponent(id)}`;
     }
     path += buildMethodSelectionQuery(dataClass, relationMap, options?.selection);
+    const ctx = {
+        operation: 'function.entityCollection',
+        className: dataClass,
+        methodName: functionName,
+        attributes: {
+            argCount: args.length,
+            ...(options?.entitySet ? { entitySet: options.entitySet } : {}),
+        },
+    };
     let body;
     if (method === 'GET') {
         const params = new URLSearchParams();
@@ -80,14 +102,14 @@ export async function callEntityCollectionFunction(http, dataClass, relationMap,
         body = await http.json(`${path}${join}${params.toString()}`, {
             method: 'GET',
             signal: options?.signal,
-        });
+        }, ctx);
     }
     else {
         body = await http.json(path, {
             method: 'POST',
             body: JSON.stringify([...args]),
             signal: options?.signal,
-        });
+        }, ctx);
     }
     return (unwrap ? unwrapClassFunctionResult(body) : body);
 }

package/dist/runtime/client-types.d.ts

@@ -0,0 +1,17 @@
+import type { CollectionHandle, CollectionOptions } from './collection.js';
+import type { SelectedEntity } from './paths.js';
+/** Shape of each dataclass namespace on `createClient()` (codegen composes with per-class datastore method keys). */
+export type BaseDataClassApi<T, Path extends string> = {
+    all<S extends readonly Path[] = readonly []>(options?: CollectionOptions & {
+        select?: S;
+    }): CollectionHandle<S['length'] extends 0 ? T : SelectedEntity<T, S>>;
+    get<S extends readonly Path[] = readonly []>(id: string | number, options?: {
+        select?: S;
+    }): Promise<(S['length'] extends 0 ? T : SelectedEntity<T, S>) | null>;
+    delete(id: string | number): Promise<boolean>;
+    query<S extends readonly Path[] = readonly []>(filter: string, options?: CollectionOptions & {
+        params?: unknown[];
+        select?: S;
+    }): CollectionHandle<S['length'] extends 0 ? T : SelectedEntity<T, S>>;
+};
+//# sourceMappingURL=client-types.d.ts.map

package/dist/runtime/client-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-types.d.ts","sourceRoot":"","sources":["../../src/runtime/client-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,qHAAqH;AACrH,MAAM,MAAM,gBAAgB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,IAAI;IACrD,GAAG,CAAC,CAAC,SAAS,SAAS,IAAI,EAAE,GAAG,SAAS,EAAE,EACzC,OAAO,CAAC,EAAE,iBAAiB,GAAG;QAAE,MAAM,CAAC,EAAE,CAAC,CAAA;KAAE,GAC3C,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACrE,GAAG,CAAC,CAAC,SAAS,SAAS,IAAI,EAAE,GAAG,SAAS,EAAE,EACzC,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,CAAA;KAAE,GACvB,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;IACrE,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7C,KAAK,CAAC,CAAC,SAAS,SAAS,IAAI,EAAE,GAAG,SAAS,EAAE,EAC3C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,iBAAiB,GAAG;QAAE,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KAAE,GAC/D,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;CACtE,CAAA"}

package/dist/runtime/client-types.mjs

@@ -0,0 +1 @@
+export {};

package/dist/runtime/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/runtime/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,UAAU,EAAE,MAAM,WAAW,CAAA;AACnF,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAA;AAGnB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,gEAAgE;IAChE,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,sFAAsF;IACtF,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAA;CACnD;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,CAAA;AAsE3C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,GAAG,EAAE,iBAAiB,EACtB,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,gBAAgB,CAAC,CAAC,CAAC,CAmKrB;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IACnD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,8EAA8E;IAC9E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,CAAA"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/runtime/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,UAAU,EAAE,MAAM,WAAW,CAAA;AACnF,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAA;AAGnB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,gEAAgE;IAChE,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,sFAAsF;IACtF,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAA;CACnD;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,CAAA;AAsE3C;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,GAAG,EAAE,iBAAiB,EACtB,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,gBAAgB,CAAC,CAAC,CAAC,CA+LrB;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IACnD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,8EAA8E;IAC9E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,CAAA"}