@proofkit/fmodata 0.1.0-alpha.7 → 0.1.0-alpha.9

package/dist/esm/client/table-occurrence.js

@@ -22,10 +22,12 @@ class TableOccurrence {
     __publicField(this, "_navigationConfig");
     __publicField(this, "navigation");
     __publicField(this, "defaultSelect");
+    __publicField(this, "fmtId");
     this.name = config.name;
     this.baseTable = config.baseTable;
     this._navigationConfig = config.navigation ?? {};
     this.defaultSelect = config.defaultSelect ?? "schema";
+    this.fmtId = config.fmtId;
     this.navigation = createNavigationGetters(this._navigationConfig);
   }
   addNavigation(nav) {
@@ -33,7 +35,8 @@ class TableOccurrence {
       name: this.name,
       baseTable: this.baseTable,
       navigation: { ...this._navigationConfig, ...nav },
-      defaultSelect: this.defaultSelect
+      defaultSelect: this.defaultSelect,
+      fmtId: this.fmtId
     });
   }
   /**
@@ -41,7 +44,7 @@ class TableOccurrence {
    * @returns The FMTID string or the table name
    */
   getTableId() {
-    return "fmtId" in this && this.fmtId ? this.fmtId : this.name;
+    return this.fmtId ?? this.name;
   }
   /**
    * Returns the table occurrence name.
@@ -54,29 +57,18 @@ class TableOccurrence {
    * Returns true if this TableOccurrence is using FileMaker table occurrence IDs.
    */
   isUsingTableId() {
-    return "fmtId" in this && this.fmtId !== void 0;
+    return this.fmtId !== void 0;
   }
 }
 function createTableOccurrence(config) {
   return new TableOccurrence(config);
 }
-class TableOccurrenceWithIds extends TableOccurrence {
-  constructor(config) {
-    super({
-      ...config,
-      navigation: config.navigation
-    });
-    __publicField(this, "fmtId");
-    this.fmtId = config.fmtId;
-  }
-}
-function createTableOccurrenceWithIds(config) {
-  return new TableOccurrenceWithIds(config);
+function defineTableOccurrence(config) {
+  return new TableOccurrence(config);
 }
 export {
   TableOccurrence,
-  TableOccurrenceWithIds,
   createTableOccurrence,
-  createTableOccurrenceWithIds
+  defineTableOccurrence
 };
 //# sourceMappingURL=table-occurrence.js.map

package/dist/esm/client/table-occurrence.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-occurrence.js","sources":["../../../src/client/table-occurrence.ts"],"sourcesContent":["import { BaseTable, BaseTableWithIds } from \"./base-table\";\n\n// Helper type to extract schema from BaseTable\ntype ExtractSchema<BT> =\n  BT extends BaseTable<infer S, any, any, any> ? S : never;\n\n// Helper type to resolve navigation functions to their return types\ntype ResolveNavigation<T> = {\n  [K in keyof T]: T[K] extends () => infer R ? R : T[K];\n};\n\n// Helper to create a getter-based navigation object\nfunction createNavigationGetters<\n  Nav extends Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  >,\n>(navConfig: Nav): ResolveNavigation<Nav> {\n  const result: any = {};\n\n  for (const key in navConfig) {\n    Object.defineProperty(result, key, {\n      get() {\n        const navItem = navConfig[key];\n        return typeof navItem === \"function\" ? navItem() : navItem;\n      },\n      enumerable: true,\n      configurable: true,\n    });\n  }\n\n  return result as ResolveNavigation<Nav>;\n}\n\nexport class TableOccurrence<\n  BT extends BaseTable<any, any, any, any> = any,\n  Name extends string = string,\n  Nav extends Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  > = {},\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n> {\n  public readonly name: Name;\n  public readonly baseTable: BT;\n  protected _navigationConfig: Nav;\n  public readonly navigation: ResolveNavigation<Nav>;\n  public readonly defaultSelect: DefSelect;\n  constructor(config: {\n    readonly name: Name;\n    readonly baseTable: BT;\n    readonly navigation?: Nav;\n    readonly defaultSelect?: DefSelect;\n  }) {\n    this.name = config.name;\n    this.baseTable = config.baseTable;\n    this._navigationConfig = (config.navigation ?? {}) as Nav;\n    this.defaultSelect = (config.defaultSelect ?? \"schema\") as DefSelect;\n    // Create navigation getters that lazily resolve functions\n    this.navigation = createNavigationGetters(this._navigationConfig);\n  }\n\n  addNavigation<\n    NewNav extends Record<\n      string,\n      | TableOccurrence<any, any, any, any>\n      | (() => TableOccurrence<any, any, any, any>)\n    >,\n  >(nav: NewNav): TableOccurrence<BT, Name, Nav & NewNav, DefSelect> {\n    return new TableOccurrence({\n      name: this.name,\n      baseTable: this.baseTable,\n      navigation: { ...this._navigationConfig, ...nav } as Nav & NewNav,\n      defaultSelect: this.defaultSelect,\n    });\n  }\n\n  /**\n   * Returns the FileMaker table occurrence ID (FMTID) if available, or the table name.\n   * @returns The FMTID string or the table name\n   */\n  getTableId(): string {\n    // Check if fmtId exists (only on TableOccurrenceWithIds)\n    return \"fmtId\" in this && (this as any).fmtId\n      ? (this as any).fmtId\n      : this.name;\n  }\n\n  /**\n   * Returns the table occurrence name.\n   * @returns The table name\n   */\n  getTableName(): string {\n    return this.name;\n  }\n\n  /**\n   * Returns true if this TableOccurrence is using FileMaker table occurrence IDs.\n   */\n  isUsingTableId(): boolean {\n    return \"fmtId\" in this && this.fmtId !== undefined;\n  }\n}\n\n// Helper function to create TableOccurrence with proper type inference\nexport function createTableOccurrence<\n  const Name extends string,\n  BT extends BaseTable<any, any, any, any>,\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n>(config: {\n  name: Name;\n  baseTable: BT;\n  defaultSelect?: DefSelect;\n}): TableOccurrence<BT, Name, {}, DefSelect> {\n  return new TableOccurrence(config);\n}\n\n// Helper type to validate that all navigation values are TableOccurrenceWithIds\ntype ValidateNavWithIds<Nav> =\n  Nav extends Record<\n    string,\n    | TableOccurrenceWithIds<any, any, any, any>\n    | (() => TableOccurrenceWithIds<any, any, any, any>)\n  >\n    ? Nav\n    : \"Error: All navigation table occurrences must be TableOccurrenceWithIds when using TableOccurrenceWithIds\";\n\n/**\n * TableOccurrenceWithIds extends TableOccurrence to require:\n * 1. A BaseTableWithIds (which has fmfIds defined)\n * 2. A required fmtId for this table occurrence\n * 3. All navigation relationships must also be TableOccurrenceWithIds\n *\n * This ensures bidirectional type-level enforcement: if you use FileMaker IDs,\n * they must be defined on both the BaseTable (fmfIds) and TableOccurrence (fmtId),\n * and all related table occurrences in navigation must also have IDs.\n *\n * @template BT - Must be a BaseTableWithIds (enforced at type level)\n * @template Name - The name of this table occurrence\n * @template Nav - Navigation relationships (must all be TableOccurrenceWithIds)\n * @template DefSelect - Default select behavior\n *\n * @example\n * ```ts\n * const usersBaseWithIds = new BaseTableWithIds({\n *   schema: { id: z.string(), name: z.string() },\n *   idField: \"id\",\n *   fmfIds: { id: \"FMFID:1\", name: \"FMFID:2\" },\n * });\n *\n * const usersTO = new TableOccurrenceWithIds({\n *   name: \"users\",\n *   baseTable: usersBaseWithIds,\n *   fmtId: \"FMTID:100\",\n *   navigation: {\n *     contacts: () => contactsTO, // Must also be TableOccurrenceWithIds\n *   },\n * });\n * ```\n */\nexport class TableOccurrenceWithIds<\n  BT extends BaseTableWithIds<any, any, any, any> = any,\n  Name extends string = string,\n  Nav extends Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  > = {},\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n> extends TableOccurrence<BT, Name, Nav, DefSelect> {\n  public readonly fmtId: `FMTID:${string}`;\n\n  constructor(config: {\n    readonly name: Name;\n    readonly baseTable: BT;\n    readonly fmtId: `FMTID:${string}`;\n    readonly navigation?: ValidateNavWithIds<Nav>;\n    readonly defaultSelect?: DefSelect;\n  }) {\n    super({\n      ...config,\n      navigation: config.navigation as Nav,\n    });\n    this.fmtId = config.fmtId;\n  }\n}\n\n// Helper function to create TableOccurrenceWithIds with proper type inference\nexport function createTableOccurrenceWithIds<\n  const Name extends string,\n  BT extends BaseTableWithIds<any, any, any, any>,\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n>(config: {\n  name: Name;\n  baseTable: BT;\n  fmtId: `FMTID:${string}`;\n  defaultSelect?: DefSelect;\n}): TableOccurrenceWithIds<BT, Name, {}, DefSelect> {\n  return new TableOccurrenceWithIds(config);\n}\n"],"names":[],"mappings":";;;AAYA,SAAS,wBAMP,WAAwC;AACxC,QAAM,SAAc,CAAC;AAErB,aAAW,OAAO,WAAW;AACpB,WAAA,eAAe,QAAQ,KAAK;AAAA,MACjC,MAAM;AACE,cAAA,UAAU,UAAU,GAAG;AAC7B,eAAO,OAAO,YAAY,aAAa,QAAY,IAAA;AAAA,MACrD;AAAA,MACA,YAAY;AAAA,MACZ,cAAc;AAAA,IAAA,CACf;AAAA,EAAA;AAGI,SAAA;AACT;AAEO,MAAM,gBAYX;AAAA,EAMA,YAAY,QAKT;AAVa;AACA;AACN;AACM;AACA;AAOd,SAAK,OAAO,OAAO;AACnB,SAAK,YAAY,OAAO;AACnB,SAAA,oBAAqB,OAAO,cAAc,CAAC;AAC3C,SAAA,gBAAiB,OAAO,iBAAiB;AAEzC,SAAA,aAAa,wBAAwB,KAAK,iBAAiB;AAAA,EAAA;AAAA,EAGlE,cAME,KAAiE;AACjE,WAAO,IAAI,gBAAgB;AAAA,MACzB,MAAM,KAAK;AAAA,MACX,WAAW,KAAK;AAAA,MAChB,YAAY,EAAE,GAAG,KAAK,mBAAmB,GAAG,IAAI;AAAA,MAChD,eAAe,KAAK;AAAA,IAAA,CACrB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOH,aAAqB;AAEnB,WAAO,WAAW,QAAS,KAAa,QACnC,KAAa,QACd,KAAK;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOX,eAAuB;AACrB,WAAO,KAAK;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMd,iBAA0B;AACjB,WAAA,WAAW,QAAQ,KAAK,UAAU;AAAA,EAAA;AAE7C;AAGO,SAAS,sBAOd,QAI2C;AACpC,SAAA,IAAI,gBAAgB,MAAM;AACnC;AA6CO,MAAM,+BAYH,gBAA0C;AAAA,EAGlD,YAAY,QAMT;AACK,UAAA;AAAA,MACJ,GAAG;AAAA,MACH,YAAY,OAAO;AAAA,IAAA,CACpB;AAZa;AAad,SAAK,QAAQ,OAAO;AAAA,EAAA;AAExB;AAGO,SAAS,6BAOd,QAKkD;AAC3C,SAAA,IAAI,uBAAuB,MAAM;AAC1C;"}
+{"version":3,"file":"table-occurrence.js","sources":["../../../src/client/table-occurrence.ts"],"sourcesContent":["import { BaseTable } from \"./base-table\";\n\n// Helper type to extract schema from BaseTable\ntype ExtractSchema<BT> =\n  BT extends BaseTable<infer S, any, any, any> ? S : never;\n\n// Helper type to resolve navigation functions to their return types\ntype ResolveNavigation<T> = {\n  [K in keyof T]: T[K] extends () => infer R ? R : T[K];\n};\n\n// Helper to create a getter-based navigation object\nfunction createNavigationGetters<\n  Nav extends Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  >,\n>(navConfig: Nav): ResolveNavigation<Nav> {\n  const result: any = {};\n\n  for (const key in navConfig) {\n    Object.defineProperty(result, key, {\n      get() {\n        const navItem = navConfig[key];\n        return typeof navItem === \"function\" ? navItem() : navItem;\n      },\n      enumerable: true,\n      configurable: true,\n    });\n  }\n\n  return result as ResolveNavigation<Nav>;\n}\n\nexport class TableOccurrence<\n  BT extends BaseTable<any, any, any, any> = any,\n  Name extends string = string,\n  Nav extends Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  > = {},\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n> {\n  public readonly name: Name;\n  public readonly baseTable: BT;\n  protected _navigationConfig: Nav;\n  public readonly navigation: ResolveNavigation<Nav>;\n  public readonly defaultSelect: DefSelect;\n  public readonly fmtId?: `FMTID:${string}`;\n  constructor(config: {\n    readonly name: Name;\n    readonly baseTable: BT;\n    readonly navigation?: Nav;\n    readonly defaultSelect?: DefSelect;\n    readonly fmtId?: `FMTID:${string}`;\n  }) {\n    this.name = config.name;\n    this.baseTable = config.baseTable;\n    this._navigationConfig = (config.navigation ?? {}) as Nav;\n    this.defaultSelect = (config.defaultSelect ?? \"schema\") as DefSelect;\n    this.fmtId = config.fmtId;\n    // Create navigation getters that lazily resolve functions\n    this.navigation = createNavigationGetters(this._navigationConfig);\n  }\n\n  addNavigation<\n    NewNav extends Record<\n      string,\n      | TableOccurrence<any, any, any, any>\n      | (() => TableOccurrence<any, any, any, any>)\n    >,\n  >(nav: NewNav): TableOccurrence<BT, Name, Nav & NewNav, DefSelect> {\n    return new TableOccurrence({\n      name: this.name,\n      baseTable: this.baseTable,\n      navigation: { ...this._navigationConfig, ...nav } as Nav & NewNav,\n      defaultSelect: this.defaultSelect,\n      fmtId: this.fmtId,\n    });\n  }\n\n  /**\n   * Returns the FileMaker table occurrence ID (FMTID) if available, or the table name.\n   * @returns The FMTID string or the table name\n   */\n  getTableId(): string {\n    return this.fmtId ?? this.name;\n  }\n\n  /**\n   * Returns the table occurrence name.\n   * @returns The table name\n   */\n  getTableName(): string {\n    return this.name;\n  }\n\n  /**\n   * Returns true if this TableOccurrence is using FileMaker table occurrence IDs.\n   */\n  isUsingTableId(): boolean {\n    return this.fmtId !== undefined;\n  }\n}\n\n// Helper function to create TableOccurrence with proper type inference\nexport function createTableOccurrence<\n  const Name extends string,\n  BT extends BaseTable<any, any, any, any>,\n  DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n>(config: {\n  name: Name;\n  baseTable: BT;\n  defaultSelect?: DefSelect;\n  fmtId?: `FMTID:${string}`;\n}): TableOccurrence<BT, Name, {}, DefSelect> {\n  return new TableOccurrence(config);\n}\n\n/**\n * Creates a TableOccurrence with proper TypeScript type inference.\n *\n * Use this function instead of `new TableOccurrence()` to ensure\n * field names are properly typed.\n *\n * @example Without entity IDs\n * ```ts\n * const users = defineTableOccurrence({\n *   name: \"users\",\n *   baseTable: usersBase,\n * });\n * ```\n *\n * @example With entity IDs\n * ```ts\n * const products = defineTableOccurrence({\n *   name: \"products\",\n *   baseTable: productsBase,\n *   fmtId: \"FMTID:12345\",\n * });\n * ```\n */\nexport function defineTableOccurrence<\n  const Name extends string,\n  BT extends BaseTable<any, any, any, any>,\n  const DefSelect extends\n    | \"all\"\n    | \"schema\"\n    | readonly (keyof ExtractSchema<BT>)[] = \"schema\",\n>(config: {\n  readonly name: Name;\n  readonly baseTable: BT;\n  readonly fmtId?: `FMTID:${string}`;\n  readonly defaultSelect?: DefSelect;\n  readonly navigation?: Record<\n    string,\n    | TableOccurrence<any, any, any, any>\n    | (() => TableOccurrence<any, any, any, any>)\n  >;\n}): TableOccurrence<BT, Name, {}, DefSelect> {\n  return new TableOccurrence(config) as TableOccurrence<\n    BT,\n    Name,\n    {},\n    DefSelect\n  >;\n}\n"],"names":[],"mappings":";;;AAYA,SAAS,wBAMP,WAAwC;AACxC,QAAM,SAAc,CAAC;AAErB,aAAW,OAAO,WAAW;AACpB,WAAA,eAAe,QAAQ,KAAK;AAAA,MACjC,MAAM;AACE,cAAA,UAAU,UAAU,GAAG;AAC7B,eAAO,OAAO,YAAY,aAAa,QAAY,IAAA;AAAA,MACrD;AAAA,MACA,YAAY;AAAA,MACZ,cAAc;AAAA,IAAA,CACf;AAAA,EAAA;AAGI,SAAA;AACT;AAEO,MAAM,gBAYX;AAAA,EAOA,YAAY,QAMT;AAZa;AACA;AACN;AACM;AACA;AACA;AAQd,SAAK,OAAO,OAAO;AACnB,SAAK,YAAY,OAAO;AACnB,SAAA,oBAAqB,OAAO,cAAc,CAAC;AAC3C,SAAA,gBAAiB,OAAO,iBAAiB;AAC9C,SAAK,QAAQ,OAAO;AAEf,SAAA,aAAa,wBAAwB,KAAK,iBAAiB;AAAA,EAAA;AAAA,EAGlE,cAME,KAAiE;AACjE,WAAO,IAAI,gBAAgB;AAAA,MACzB,MAAM,KAAK;AAAA,MACX,WAAW,KAAK;AAAA,MAChB,YAAY,EAAE,GAAG,KAAK,mBAAmB,GAAG,IAAI;AAAA,MAChD,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,IAAA,CACb;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOH,aAAqB;AACZ,WAAA,KAAK,SAAS,KAAK;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAO5B,eAAuB;AACrB,WAAO,KAAK;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMd,iBAA0B;AACxB,WAAO,KAAK,UAAU;AAAA,EAAA;AAE1B;AAGO,SAAS,sBAOd,QAK2C;AACpC,SAAA,IAAI,gBAAgB,MAAM;AACnC;AAyBO,SAAS,sBAOd,QAU2C;AACpC,SAAA,IAAI,gBAAgB,MAAM;AAMnC;"}

package/dist/esm/index.d.ts

@@ -1,5 +1,5 @@
-export { BaseTable, BaseTableWithIds } from './client/base-table.js';
-export { TableOccurrence, createTableOccurrence, TableOccurrenceWithIds, createTableOccurrenceWithIds, } from './client/table-occurrence.js';
+export { BaseTable, defineBaseTable } from './client/base-table.js';
+export { TableOccurrence, createTableOccurrence, defineTableOccurrence, } from './client/table-occurrence.js';
 export { FMServerConnection } from './client/filemaker-odata.js';
 export type { Database } from './client/database.js';
 export type { EntitySet } from './client/entity-set.js';

package/dist/esm/index.js

@@ -1,12 +1,11 @@
-import { BaseTable, BaseTableWithIds } from "./client/base-table.js";
-import { TableOccurrence, TableOccurrenceWithIds, createTableOccurrence, createTableOccurrenceWithIds } from "./client/table-occurrence.js";
+import { BaseTable, defineBaseTable } from "./client/base-table.js";
+import { TableOccurrence, createTableOccurrence, defineTableOccurrence } from "./client/table-occurrence.js";
 import { FMServerConnection } from "./client/filemaker-odata.js";
 import { AbortError, CircuitOpenError, NetworkError, RetryLimitError, TimeoutError } from "@fetchkit/ffetch";
 import { FMODataError, HTTPError, ODataError, RecordCountMismatchError, ResponseStructureError, SchemaLockedError, ValidationError, isFMODataError, isHTTPError, isODataError, isRecordCountMismatchError, isResponseStructureError, isSchemaLockedError, isValidationError } from "./errors.js";
 export {
   AbortError,
   BaseTable,
-  BaseTableWithIds,
   CircuitOpenError,
   FMODataError,
   FMServerConnection,
@@ -18,11 +17,11 @@ export {
   RetryLimitError,
   SchemaLockedError,
   TableOccurrence,
-  TableOccurrenceWithIds,
   TimeoutError,
   ValidationError,
   createTableOccurrence,
-  createTableOccurrenceWithIds,
+  defineBaseTable,
+  defineTableOccurrence,
   isFMODataError,
   isHTTPError,
   isODataError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.9",
   "description": "FileMaker OData API client",
   "repository": "git@github.com:proofgeist/proofkit.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",

package/src/client/base-table.ts

@@ -65,25 +65,32 @@ import { StandardSchemaV1 } from "@standard-schema/spec";
 export class BaseTable<
   Schema extends Record<string, StandardSchemaV1> = any,
   IdField extends keyof Schema | undefined = undefined,
-  Required extends readonly (keyof Schema)[] = readonly [],
-  ReadOnly extends readonly (keyof Schema)[] = readonly [],
+  Required extends readonly (keyof Schema | (string & {}))[] = readonly [],
+  ReadOnly extends readonly (keyof Schema | (string & {}))[] = readonly [],
 > {
   public readonly schema: Schema;
   public readonly idField?: IdField;
   public readonly required?: Required;
   public readonly readOnly?: ReadOnly;
-  public readonly fmfIds?: Record<keyof Schema, `FMFID:${string}`>;
+  public readonly fmfIds?: Record<
+    keyof Schema | (string & {}),
+    `FMFID:${string}`
+  >;
 
   constructor(config: {
     schema: Schema;
     idField?: IdField;
     required?: Required;
     readOnly?: ReadOnly;
+    fmfIds?: Record<string, `FMFID:${string}`>;
   }) {
     this.schema = config.schema;
     this.idField = config.idField;
     this.required = config.required;
     this.readOnly = config.readOnly;
+    this.fmfIds = config.fmfIds as
+      | Record<keyof Schema, `FMFID:${string}`>
+      | undefined;
   }
 
   /**
@@ -124,49 +131,45 @@ export class BaseTable<
 }
 
 /**
- * BaseTableWithIds extends BaseTable to require FileMaker field IDs (fmfIds).
- * Use this class when you need to work with FileMaker's internal field identifiers.
+ * Creates a BaseTable with proper TypeScript type inference.
  *
- * @template Schema - Record of field names to StandardSchemaV1 validators
- * @template IdField - The name of the primary key field (optional, automatically read-only)
- * @template Required - Additional field names to require on insert (beyond auto-inferred required fields)
- * @template ReadOnly - Field names that cannot be modified via insert/update (idField is automatically read-only)
+ * This function should be used instead of `new BaseTable()` to ensure
+ * field names are properly typed throughout the library.
  *
- * @example
+ * @example Without entity IDs
  * ```ts
- * import { z } from "zod";
+ * const users = defineBaseTable({
+ *   schema: { id: z.string(), name: z.string() },
+ *   idField: "id",
+ * });
+ * ```
  *
- * const usersTableWithIds = new BaseTableWithIds({
- *   schema: {
- *     id: z.string(),
- *     name: z.string(),
- *     email: z.string().nullable(),
- *   },
+ * @example With entity IDs (FileMaker field IDs)
+ * ```ts
+ * const products = defineBaseTable({
+ *   schema: { id: z.string(), name: z.string() },
  *   idField: "id",
- *   fmfIds: {
- *     id: "FMFID:1",
- *     name: "FMFID:2",
- *     email: "FMFID:3",
- *   },
+ *   fmfIds: { id: "FMFID:1", name: "FMFID:2" },
  * });
  * ```
  */
-export class BaseTableWithIds<
-  Schema extends Record<string, StandardSchemaV1> = any,
+export function defineBaseTable<
+  const Schema extends Record<string, StandardSchemaV1>,
   IdField extends keyof Schema | undefined = undefined,
-  Required extends readonly (keyof Schema)[] = readonly [],
-  ReadOnly extends readonly (keyof Schema)[] = readonly [],
-> extends BaseTable<Schema, IdField, Required, ReadOnly> {
-  public override readonly fmfIds: Record<keyof Schema, `FMFID:${string}`>;
-
-  constructor(config: {
-    schema: Schema;
-    fmfIds: Record<keyof Schema, `FMFID:${string}`>;
-    idField?: IdField;
-    required?: Required;
-    readOnly?: ReadOnly;
-  }) {
-    super(config);
-    this.fmfIds = config.fmfIds;
-  }
+  const Required extends readonly (
+    | keyof Schema
+    | (string & {})
+  )[] = readonly [],
+  const ReadOnly extends readonly (
+    | keyof Schema
+    | (string & {})
+  )[] = readonly [],
+>(config: {
+  schema: Schema;
+  idField?: IdField;
+  required?: Required;
+  readOnly?: ReadOnly;
+  fmfIds?: { [K in keyof Schema | (string & {})]: `FMFID:${string}` };
+}): BaseTable<Schema, IdField, Required, ReadOnly> {
+  return new BaseTable(config);
 }

package/src/client/database.ts

@@ -9,7 +9,7 @@ import { SchemaManager } from "./schema-manager";
 // Helper type to extract schema from a TableOccurrence
 type ExtractSchemaFromOccurrence<O> =
   O extends TableOccurrence<infer BT, any, any, any>
-    ? BT extends BaseTable<infer S, any>
+    ? BT extends BaseTable<infer S, any, any, any>
       ? S
       : never
     : never;
@@ -169,11 +169,11 @@ export class Database<
       type SchemaType = ExtractSchemaFromOccurrence<OccType>;
 
       return EntitySet.create<SchemaType, OccType>({
-        occurrence: occurrence as any,
+        occurrence: occurrence as OccType,
         tableName: name as string,
         databaseName: this.databaseName,
         context: this.context,
-        database: this as any,
+        database: this,
       }) as any;
     } else {
       // Return untyped EntitySet for dynamic table access
@@ -181,7 +181,7 @@ export class Database<
         tableName: name as string,
         databaseName: this.databaseName,
         context: this.context,
-        database: this as any,
+        database: this,
       }) as any;
     }
   }

package/src/client/entity-set.ts

@@ -28,7 +28,7 @@ type ExtractNavigationNames<
 // Helper type to extract schema from a TableOccurrence
 type ExtractSchemaFromOccurrence<O> =
   O extends TableOccurrence<infer BT, any, any, any>
-    ? BT extends BaseTable<infer S, any>
+    ? BT extends BaseTable<infer S, any, any, any>
       ? S
       : never
     : never;
@@ -36,7 +36,7 @@ type ExtractSchemaFromOccurrence<O> =
 // Helper type to extract defaultSelect from a TableOccurrence
 type ExtractDefaultSelect<O> =
   O extends TableOccurrence<infer BT, any, any, infer DefSelect>
-    ? BT extends BaseTable<infer S, any>
+    ? BT extends BaseTable<infer S, any, any, any>
       ? DefSelect extends "all"
         ? keyof S
         : DefSelect extends "schema"
@@ -85,7 +85,7 @@ type GetTargetSchemaType<
 > = [FindNavigationTarget<O, Rel>] extends [
   TableOccurrence<infer BT, any, any, any>,
 ]
-  ? [BT] extends [BaseTable<infer S, any>]
+  ? [BT] extends [BaseTable<infer S, any, any, any>]
     ? [S] extends [Record<string, StandardSchemaV1>]
       ? InferSchemaType<S>
       : Record<string, any>
@@ -181,13 +181,13 @@ export class EntitySet<
         const fields = Object.keys(schema) as (keyof InferSchemaType<Schema>)[];
         // Deduplicate fields (same as select method)
         const uniqueFields = [...new Set(fields)];
-        return builder.select(...uniqueFields);
+        return builder.select(...uniqueFields).top(1000);
       } else if (Array.isArray(defaultSelect)) {
         // Use the provided field names, deduplicated
         const uniqueFields = [
           ...new Set(defaultSelect),
         ] as (keyof InferSchemaType<Schema>)[];
-        return builder.select(...uniqueFields);
+        return builder.select(...uniqueFields).top(1000);
       }
       // If defaultSelect is "all", no changes needed (current behavior)
     }
@@ -199,7 +199,10 @@ export class EntitySet<
       (builder as any).navigateSourceTableName = this.navigateSourceTableName;
       // navigateRecordId is intentionally not set (undefined) to indicate navigation from EntitySet
     }
-    return builder;
+
+    // Apply default pagination limit of 1000 records to prevent stack overflow
+    // with large datasets. Users can override with .top() if needed.
+    return builder.top(1000);
   }
 
   get(

package/src/client/query-builder.ts

@@ -25,6 +25,14 @@ import {
   getTableIdentifiers,
 } from "../transform";
 
+
+/**
+ * Default maximum number of records to return in a list query.
+ * This prevents stack overflow issues with large datasets while still
+ * allowing substantial data retrieval. Users can override with .top().
+ */
+const DEFAULT_TOP = 1000;
+
 // Helper type to extract navigation relation names from an occurrence
 type ExtractNavigationNames<
   O extends TableOccurrence<any, any, any, any> | undefined,
@@ -73,7 +81,7 @@ type GetTargetSchemaType<
 > = [FindNavigationTarget<O, Rel>] extends [
   TableOccurrence<infer BT, any, any, any>,
 ]
-  ? [BT] extends [BaseTable<infer S, any>]
+  ? [BT] extends [BaseTable<infer S, any, any, any>]
     ? [S] extends [Record<string, StandardSchemaV1>]
       ? InferSchemaType<S>
       : Record<string, any>
@@ -391,10 +399,6 @@ export class QueryBuilder<
     count: number,
   ): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands> {
     this.queryOptions.top = count;
-    console.log("top method", {
-      count,
-      databaseUseEntityIds: this.databaseUseEntityIds,
-    });
     return this;
   }
 
@@ -1162,6 +1166,7 @@ export class QueryBuilder<
     if (queryOptionsWithoutExpand.select) {
       queryOptionsWithoutExpand.select = this.formatSelectFields(
         queryOptionsWithoutExpand.select,
+        this.occurrence?.baseTable,
       ) as any;
     }
 
@@ -1228,6 +1233,7 @@ export class QueryBuilder<
     if (queryOptionsWithoutExpand.select) {
       queryOptionsWithoutExpand.select = this.formatSelectFields(
         queryOptionsWithoutExpand.select,
+        this.occurrence?.baseTable,
       ) as any;
     }