@proofkit/fmodata 0.1.0-alpha.0 → 0.1.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/README.md +1624 -18
  2. package/dist/esm/client/base-table.d.ts +117 -5
  3. package/dist/esm/client/base-table.js +43 -5
  4. package/dist/esm/client/base-table.js.map +1 -1
  5. package/dist/esm/client/batch-builder.d.ts +54 -0
  6. package/dist/esm/client/batch-builder.js +179 -0
  7. package/dist/esm/client/batch-builder.js.map +1 -0
  8. package/dist/esm/client/batch-request.d.ts +61 -0
  9. package/dist/esm/client/batch-request.js +252 -0
  10. package/dist/esm/client/batch-request.js.map +1 -0
  11. package/dist/esm/client/database.d.ts +55 -6
  12. package/dist/esm/client/database.js +118 -15
  13. package/dist/esm/client/database.js.map +1 -1
  14. package/dist/esm/client/delete-builder.d.ts +21 -2
  15. package/dist/esm/client/delete-builder.js +96 -32
  16. package/dist/esm/client/delete-builder.js.map +1 -1
  17. package/dist/esm/client/entity-set.d.ts +25 -11
  18. package/dist/esm/client/entity-set.js +31 -11
  19. package/dist/esm/client/entity-set.js.map +1 -1
  20. package/dist/esm/client/filemaker-odata.d.ts +23 -4
  21. package/dist/esm/client/filemaker-odata.js +124 -29
  22. package/dist/esm/client/filemaker-odata.js.map +1 -1
  23. package/dist/esm/client/insert-builder.d.ts +38 -3
  24. package/dist/esm/client/insert-builder.js +231 -34
  25. package/dist/esm/client/insert-builder.js.map +1 -1
  26. package/dist/esm/client/query-builder.d.ts +27 -6
  27. package/dist/esm/client/query-builder.js +457 -210
  28. package/dist/esm/client/query-builder.js.map +1 -1
  29. package/dist/esm/client/record-builder.d.ts +96 -9
  30. package/dist/esm/client/record-builder.js +378 -39
  31. package/dist/esm/client/record-builder.js.map +1 -1
  32. package/dist/esm/client/response-processor.d.ts +38 -0
  33. package/dist/esm/client/schema-manager.d.ts +57 -0
  34. package/dist/esm/client/schema-manager.js +132 -0
  35. package/dist/esm/client/schema-manager.js.map +1 -0
  36. package/dist/esm/client/table-occurrence.d.ts +48 -1
  37. package/dist/esm/client/table-occurrence.js +29 -2
  38. package/dist/esm/client/table-occurrence.js.map +1 -1
  39. package/dist/esm/client/update-builder.d.ts +34 -11
  40. package/dist/esm/client/update-builder.js +135 -31
  41. package/dist/esm/client/update-builder.js.map +1 -1
  42. package/dist/esm/errors.d.ts +73 -0
  43. package/dist/esm/errors.js +148 -0
  44. package/dist/esm/errors.js.map +1 -0
  45. package/dist/esm/index.d.ts +10 -3
  46. package/dist/esm/index.js +28 -5
  47. package/dist/esm/index.js.map +1 -1
  48. package/dist/esm/transform.d.ts +65 -0
  49. package/dist/esm/transform.js +114 -0
  50. package/dist/esm/transform.js.map +1 -0
  51. package/dist/esm/types.d.ts +89 -5
  52. package/dist/esm/validation.d.ts +6 -3
  53. package/dist/esm/validation.js +104 -33
  54. package/dist/esm/validation.js.map +1 -1
  55. package/package.json +10 -1
  56. package/src/client/base-table.ts +158 -8
  57. package/src/client/batch-builder.ts +265 -0
  58. package/src/client/batch-request.ts +485 -0
  59. package/src/client/database.ts +175 -18
  60. package/src/client/delete-builder.ts +149 -48
  61. package/src/client/entity-set.ts +114 -23
  62. package/src/client/filemaker-odata.ts +179 -35
  63. package/src/client/insert-builder.ts +350 -40
  64. package/src/client/query-builder.ts +616 -237
  65. package/src/client/query-builder.ts.bak +1457 -0
  66. package/src/client/record-builder.ts +692 -65
  67. package/src/client/response-processor.ts +103 -0
  68. package/src/client/schema-manager.ts +246 -0
  69. package/src/client/table-occurrence.ts +78 -3
  70. package/src/client/update-builder.ts +235 -49
  71. package/src/errors.ts +217 -0
  72. package/src/index.ts +59 -2
  73. package/src/transform.ts +249 -0
  74. package/src/types.ts +201 -35
  75. package/src/validation.ts +120 -36
@@ -0,0 +1,57 @@
1
+ import { FFetchOptions } from '@fetchkit/ffetch';
2
+ import { ExecutionContext } from '../types.js';
3
+ type GenericField = {
4
+ name: string;
5
+ nullable?: boolean;
6
+ primary?: boolean;
7
+ unique?: boolean;
8
+ global?: boolean;
9
+ repetitions?: number;
10
+ };
11
+ type StringField = GenericField & {
12
+ type: "string";
13
+ maxLength?: number;
14
+ default?: "USER" | "USERNAME" | "CURRENT_USER";
15
+ };
16
+ type NumericField = GenericField & {
17
+ type: "numeric";
18
+ };
19
+ type DateField = GenericField & {
20
+ type: "date";
21
+ default?: "CURRENT_DATE" | "CURDATE";
22
+ };
23
+ type TimeField = GenericField & {
24
+ type: "time";
25
+ default?: "CURRENT_TIME" | "CURTIME";
26
+ };
27
+ type TimestampField = GenericField & {
28
+ type: "timestamp";
29
+ default?: "CURRENT_TIMESTAMP" | "CURTIMESTAMP";
30
+ };
31
+ type ContainerField = GenericField & {
32
+ type: "container";
33
+ externalSecurePath?: string;
34
+ };
35
+ export type Field = StringField | NumericField | DateField | TimeField | TimestampField | ContainerField;
36
+ export type { StringField, NumericField, DateField, TimeField, TimestampField, ContainerField, };
37
+ type FileMakerField = Omit<Field, "type" | "repetitions" | "maxLength"> & {
38
+ type: string;
39
+ };
40
+ type TableDefinition = {
41
+ tableName: string;
42
+ fields: FileMakerField[];
43
+ };
44
+ export declare class SchemaManager {
45
+ private readonly databaseName;
46
+ private readonly context;
47
+ constructor(databaseName: string, context: ExecutionContext);
48
+ createTable(tableName: string, fields: Field[], options?: RequestInit & FFetchOptions): Promise<TableDefinition>;
49
+ addFields(tableName: string, fields: Field[], options?: RequestInit & FFetchOptions): Promise<TableDefinition>;
50
+ deleteTable(tableName: string, options?: RequestInit & FFetchOptions): Promise<void>;
51
+ deleteField(tableName: string, fieldName: string, options?: RequestInit & FFetchOptions): Promise<void>;
52
+ createIndex(tableName: string, fieldName: string, options?: RequestInit & FFetchOptions): Promise<{
53
+ indexName: string;
54
+ }>;
55
+ deleteIndex(tableName: string, fieldName: string, options?: RequestInit & FFetchOptions): Promise<void>;
56
+ private static compileFieldDefinition;
57
+ }
@@ -0,0 +1,132 @@
1
+ class SchemaManager {
2
+ constructor(databaseName, context) {
3
+ this.databaseName = databaseName;
4
+ this.context = context;
5
+ }
6
+ async createTable(tableName, fields, options) {
7
+ const result = await this.context._makeRequest(
8
+ `/${this.databaseName}/FileMaker_Tables`,
9
+ {
10
+ method: "POST",
11
+ body: JSON.stringify({
12
+ tableName,
13
+ fields: fields.map(SchemaManager.compileFieldDefinition)
14
+ }),
15
+ ...options
16
+ }
17
+ );
18
+ if (result.error) {
19
+ throw result.error;
20
+ }
21
+ return result.data;
22
+ }
23
+ async addFields(tableName, fields, options) {
24
+ const result = await this.context._makeRequest(
25
+ `/${this.databaseName}/FileMaker_Tables/${tableName}`,
26
+ {
27
+ method: "PATCH",
28
+ body: JSON.stringify({
29
+ fields: fields.map(SchemaManager.compileFieldDefinition)
30
+ }),
31
+ ...options
32
+ }
33
+ );
34
+ if (result.error) {
35
+ throw result.error;
36
+ }
37
+ return result.data;
38
+ }
39
+ async deleteTable(tableName, options) {
40
+ const result = await this.context._makeRequest(
41
+ `/${this.databaseName}/FileMaker_Tables/${tableName}`,
42
+ { method: "DELETE", ...options }
43
+ );
44
+ if (result.error) {
45
+ throw result.error;
46
+ }
47
+ }
48
+ async deleteField(tableName, fieldName, options) {
49
+ const result = await this.context._makeRequest(
50
+ `/${this.databaseName}/FileMaker_Tables/${tableName}/${fieldName}`,
51
+ {
52
+ method: "DELETE",
53
+ ...options
54
+ }
55
+ );
56
+ if (result.error) {
57
+ throw result.error;
58
+ }
59
+ }
60
+ async createIndex(tableName, fieldName, options) {
61
+ const result = await this.context._makeRequest(
62
+ `/${this.databaseName}/FileMaker_Indexes/${tableName}`,
63
+ {
64
+ method: "POST",
65
+ body: JSON.stringify({ indexName: fieldName }),
66
+ ...options
67
+ }
68
+ );
69
+ if (result.error) {
70
+ throw result.error;
71
+ }
72
+ return result.data;
73
+ }
74
+ async deleteIndex(tableName, fieldName, options) {
75
+ const result = await this.context._makeRequest(
76
+ `/${this.databaseName}/FileMaker_Indexes/${tableName}/${fieldName}`,
77
+ {
78
+ method: "DELETE",
79
+ ...options
80
+ }
81
+ );
82
+ if (result.error) {
83
+ throw result.error;
84
+ }
85
+ }
86
+ static compileFieldDefinition(field) {
87
+ let type = field.type;
88
+ const repetitions = field.repetitions;
89
+ if (field.type === "string") {
90
+ type = "varchar";
91
+ const stringField = field;
92
+ if (stringField.maxLength !== void 0) {
93
+ type += `(${stringField.maxLength})`;
94
+ }
95
+ }
96
+ if (repetitions !== void 0) {
97
+ type += `[${repetitions}]`;
98
+ }
99
+ const result = {
100
+ name: field.name,
101
+ type
102
+ };
103
+ if (field.nullable !== void 0) result.nullable = field.nullable;
104
+ if (field.primary !== void 0) result.primary = field.primary;
105
+ if (field.unique !== void 0) result.unique = field.unique;
106
+ if (field.global !== void 0) result.global = field.global;
107
+ if (field.type === "string") {
108
+ const stringField = field;
109
+ if (stringField.default !== void 0)
110
+ result.default = stringField.default;
111
+ } else if (field.type === "date") {
112
+ const dateField = field;
113
+ if (dateField.default !== void 0) result.default = dateField.default;
114
+ } else if (field.type === "time") {
115
+ const timeField = field;
116
+ if (timeField.default !== void 0) result.default = timeField.default;
117
+ } else if (field.type === "timestamp") {
118
+ const timestampField = field;
119
+ if (timestampField.default !== void 0)
120
+ result.default = timestampField.default;
121
+ } else if (field.type === "container") {
122
+ const containerField = field;
123
+ if (containerField.externalSecurePath !== void 0)
124
+ result.externalSecurePath = containerField.externalSecurePath;
125
+ }
126
+ return result;
127
+ }
128
+ }
129
+ export {
130
+ SchemaManager
131
+ };
132
+ //# sourceMappingURL=schema-manager.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schema-manager.js","sources":["../../../src/client/schema-manager.ts"],"sourcesContent":["import type { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { ExecutionContext } from \"../types\";\n\ntype GenericField = {\n name: string;\n nullable?: boolean;\n primary?: boolean;\n unique?: boolean;\n global?: boolean;\n repetitions?: number;\n};\n\ntype StringField = GenericField & {\n type: \"string\";\n maxLength?: number;\n default?: \"USER\" | \"USERNAME\" | \"CURRENT_USER\";\n};\n\ntype NumericField = GenericField & {\n type: \"numeric\";\n};\n\ntype DateField = GenericField & {\n type: \"date\";\n default?: \"CURRENT_DATE\" | \"CURDATE\";\n};\n\ntype TimeField = GenericField & {\n type: \"time\";\n default?: \"CURRENT_TIME\" | \"CURTIME\";\n};\n\ntype TimestampField = GenericField & {\n type: \"timestamp\";\n default?: \"CURRENT_TIMESTAMP\" | \"CURTIMESTAMP\";\n};\n\ntype ContainerField = GenericField & {\n type: \"container\";\n externalSecurePath?: string;\n};\n\nexport type Field =\n | StringField\n | NumericField\n | DateField\n | TimeField\n | TimestampField\n | ContainerField;\n\nexport type {\n StringField,\n NumericField,\n DateField,\n TimeField,\n TimestampField,\n ContainerField,\n};\n\ntype FileMakerField = Omit<Field, \"type\" | \"repetitions\" | \"maxLength\"> & {\n type: string;\n};\n\ntype TableDefinition = {\n tableName: string;\n fields: FileMakerField[];\n};\n\nexport class SchemaManager {\n public constructor(\n private readonly databaseName: string,\n private readonly context: ExecutionContext,\n ) {}\n\n public async createTable(\n tableName: string,\n fields: Field[],\n options?: RequestInit & FFetchOptions,\n ): Promise<TableDefinition> {\n const result = await this.context._makeRequest<TableDefinition>(\n `/${this.databaseName}/FileMaker_Tables`,\n {\n method: \"POST\",\n body: JSON.stringify({\n tableName,\n fields: fields.map(SchemaManager.compileFieldDefinition),\n }),\n ...options,\n },\n );\n\n if (result.error) {\n throw result.error;\n }\n\n return result.data;\n }\n\n public async addFields(\n tableName: string,\n fields: Field[],\n options?: RequestInit & FFetchOptions,\n ): Promise<TableDefinition> {\n const result = await this.context._makeRequest<TableDefinition>(\n `/${this.databaseName}/FileMaker_Tables/${tableName}`,\n {\n method: \"PATCH\",\n body: JSON.stringify({\n fields: fields.map(SchemaManager.compileFieldDefinition),\n }),\n ...options,\n },\n );\n\n if (result.error) {\n throw result.error;\n }\n\n return result.data;\n }\n\n public async deleteTable(\n tableName: string,\n options?: RequestInit & FFetchOptions,\n ): Promise<void> {\n const result = await this.context._makeRequest(\n `/${this.databaseName}/FileMaker_Tables/${tableName}`,\n { method: \"DELETE\", ...options },\n );\n\n if (result.error) {\n throw result.error;\n }\n }\n\n public async deleteField(\n tableName: string,\n fieldName: string,\n options?: RequestInit & FFetchOptions,\n ): Promise<void> {\n const result = await this.context._makeRequest(\n `/${this.databaseName}/FileMaker_Tables/${tableName}/${fieldName}`,\n {\n method: \"DELETE\",\n ...options,\n },\n );\n\n if (result.error) {\n throw result.error;\n }\n }\n\n public async createIndex(\n tableName: string,\n fieldName: string,\n options?: RequestInit & FFetchOptions,\n ): Promise<{ indexName: string }> {\n const result = await this.context._makeRequest<{ indexName: string }>(\n `/${this.databaseName}/FileMaker_Indexes/${tableName}`,\n {\n method: \"POST\",\n body: JSON.stringify({ indexName: fieldName }),\n ...options,\n },\n );\n\n if (result.error) {\n throw result.error;\n }\n\n return result.data;\n }\n\n public async deleteIndex(\n tableName: string,\n fieldName: string,\n options?: RequestInit & FFetchOptions,\n ): Promise<void> {\n const result = await this.context._makeRequest(\n `/${this.databaseName}/FileMaker_Indexes/${tableName}/${fieldName}`,\n {\n method: \"DELETE\",\n ...options,\n },\n );\n\n if (result.error) {\n throw result.error;\n }\n }\n\n private static compileFieldDefinition(field: Field): FileMakerField {\n let type: string = field.type;\n const repetitions = field.repetitions;\n\n // Handle string fields - convert to varchar and add maxLength if present\n if (field.type === \"string\") {\n type = \"varchar\";\n const stringField = field as StringField;\n if (stringField.maxLength !== undefined) {\n type += `(${stringField.maxLength})`;\n }\n }\n\n // Add repetitions suffix if present\n if (repetitions !== undefined) {\n type += `[${repetitions}]`;\n }\n\n // Build the result object, excluding type, maxLength, and repetitions\n const result: any = {\n name: field.name,\n type,\n };\n\n // Add optional properties that FileMaker expects\n if (field.nullable !== undefined) result.nullable = field.nullable;\n if (field.primary !== undefined) result.primary = field.primary;\n if (field.unique !== undefined) result.unique = field.unique;\n if (field.global !== undefined) result.global = field.global;\n\n // Add type-specific properties\n if (field.type === \"string\") {\n const stringField = field as StringField;\n if (stringField.default !== undefined)\n result.default = stringField.default;\n } else if (field.type === \"date\") {\n const dateField = field as DateField;\n if (dateField.default !== undefined) result.default = dateField.default;\n } else if (field.type === \"time\") {\n const timeField = field as TimeField;\n if (timeField.default !== undefined) result.default = timeField.default;\n } else if (field.type === \"timestamp\") {\n const timestampField = field as TimestampField;\n if (timestampField.default !== undefined)\n result.default = timestampField.default;\n } else if (field.type === \"container\") {\n const containerField = field as ContainerField;\n if (containerField.externalSecurePath !== undefined)\n result.externalSecurePath = containerField.externalSecurePath;\n }\n\n return result as FileMakerField;\n }\n}\n"],"names":[],"mappings":"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"}
@@ -6,20 +6,67 @@ type ResolveNavigation<T> = {
6
6
  export declare class TableOccurrence<BT extends BaseTable<any, any, any, any> = any, Name extends string = string, Nav extends Record<string, TableOccurrence<any, any, any, any> | (() => TableOccurrence<any, any, any, any>)> = {}, DefSelect extends "all" | "schema" | readonly (keyof ExtractSchema<BT>)[] = "schema"> {
7
7
  readonly name: Name;
8
8
  readonly baseTable: BT;
9
- private _navigationConfig;
9
+ protected _navigationConfig: Nav;
10
10
  readonly navigation: ResolveNavigation<Nav>;
11
11
  readonly defaultSelect: DefSelect;
12
+ readonly fmtId?: `FMTID:${string}`;
12
13
  constructor(config: {
13
14
  readonly name: Name;
14
15
  readonly baseTable: BT;
15
16
  readonly navigation?: Nav;
16
17
  readonly defaultSelect?: DefSelect;
18
+ readonly fmtId?: `FMTID:${string}`;
17
19
  });
18
20
  addNavigation<NewNav extends Record<string, TableOccurrence<any, any, any, any> | (() => TableOccurrence<any, any, any, any>)>>(nav: NewNav): TableOccurrence<BT, Name, Nav & NewNav, DefSelect>;
21
+ /**
22
+ * Returns the FileMaker table occurrence ID (FMTID) if available, or the table name.
23
+ * @returns The FMTID string or the table name
24
+ */
25
+ getTableId(): string;
26
+ /**
27
+ * Returns the table occurrence name.
28
+ * @returns The table name
29
+ */
30
+ getTableName(): string;
31
+ /**
32
+ * Returns true if this TableOccurrence is using FileMaker table occurrence IDs.
33
+ */
34
+ isUsingTableId(): boolean;
19
35
  }
20
36
  export declare function createTableOccurrence<const Name extends string, BT extends BaseTable<any, any, any, any>, DefSelect extends "all" | "schema" | readonly (keyof ExtractSchema<BT>)[] = "schema">(config: {
21
37
  name: Name;
22
38
  baseTable: BT;
23
39
  defaultSelect?: DefSelect;
40
+ fmtId?: `FMTID:${string}`;
41
+ }): TableOccurrence<BT, Name, {}, DefSelect>;
42
+ /**
43
+ * Creates a TableOccurrence with proper TypeScript type inference.
44
+ *
45
+ * Use this function instead of `new TableOccurrence()` to ensure
46
+ * field names are properly typed.
47
+ *
48
+ * @example Without entity IDs
49
+ * ```ts
50
+ * const users = defineTableOccurrence({
51
+ * name: "users",
52
+ * baseTable: usersBase,
53
+ * });
54
+ * ```
55
+ *
56
+ * @example With entity IDs
57
+ * ```ts
58
+ * const products = defineTableOccurrence({
59
+ * name: "products",
60
+ * baseTable: productsBase,
61
+ * fmtId: "FMTID:12345",
62
+ * });
63
+ * ```
64
+ */
65
+ export declare function defineTableOccurrence<const Name extends string, BT extends BaseTable<any, any, any, any>, const DefSelect extends "all" | "schema" | readonly (keyof ExtractSchema<BT>)[] = "schema">(config: {
66
+ readonly name: Name;
67
+ readonly baseTable: BT;
68
+ readonly fmtId?: `FMTID:${string}`;
69
+ readonly defaultSelect?: DefSelect;
70
+ readonly navigation?: Record<string, TableOccurrence<any, any, any, any> | (() => TableOccurrence<any, any, any, any>)>;
24
71
  }): TableOccurrence<BT, Name, {}, DefSelect>;
25
72
  export {};
@@ -22,10 +22,12 @@ class TableOccurrence {
22
22
  __publicField(this, "_navigationConfig");
23
23
  __publicField(this, "navigation");
24
24
  __publicField(this, "defaultSelect");
25
+ __publicField(this, "fmtId");
25
26
  this.name = config.name;
26
27
  this.baseTable = config.baseTable;
27
28
  this._navigationConfig = config.navigation ?? {};
28
29
  this.defaultSelect = config.defaultSelect ?? "schema";
30
+ this.fmtId = config.fmtId;
29
31
  this.navigation = createNavigationGetters(this._navigationConfig);
30
32
  }
31
33
  addNavigation(nav) {
@@ -33,15 +35,40 @@ class TableOccurrence {
33
35
  name: this.name,
34
36
  baseTable: this.baseTable,
35
37
  navigation: { ...this._navigationConfig, ...nav },
36
- defaultSelect: this.defaultSelect
38
+ defaultSelect: this.defaultSelect,
39
+ fmtId: this.fmtId
37
40
  });
38
41
  }
42
+ /**
43
+ * Returns the FileMaker table occurrence ID (FMTID) if available, or the table name.
44
+ * @returns The FMTID string or the table name
45
+ */
46
+ getTableId() {
47
+ return this.fmtId ?? this.name;
48
+ }
49
+ /**
50
+ * Returns the table occurrence name.
51
+ * @returns The table name
52
+ */
53
+ getTableName() {
54
+ return this.name;
55
+ }
56
+ /**
57
+ * Returns true if this TableOccurrence is using FileMaker table occurrence IDs.
58
+ */
59
+ isUsingTableId() {
60
+ return this.fmtId !== void 0;
61
+ }
39
62
  }
40
63
  function createTableOccurrence(config) {
41
64
  return new TableOccurrence(config);
42
65
  }
66
+ function defineTableOccurrence(config) {
67
+ return new TableOccurrence(config);
68
+ }
43
69
  export {
44
70
  TableOccurrence,
45
- createTableOccurrence
71
+ createTableOccurrence,
72
+ defineTableOccurrence
46
73
  };
47
74
  //# sourceMappingURL=table-occurrence.js.map
@@ -1 +1 @@
1
- {"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 private _navigationConfig: Nav;\n public readonly navigation: ResolveNavigation<Nav>;\n public readonly defaultSelect: DefSelect;\n\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\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// 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"],"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,QAKT;AAXa;AACA;AACR;AACQ;AACA;AAQd,SAAK,OAAO,OAAO;AACnB,SAAK,YAAY,OAAO;AACnB,SAAA,oBAAqB,OAAO,cAAc,CAAC;AAC3C,SAAA,gBAAiB,OAAO,iBAAiB;AAGzC,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;AAEL;AAGO,SAAS,sBAOd,QAI2C;AACpC,SAAA,IAAI,gBAAgB,MAAM;AACnC;"}
1
+ {"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;"}
@@ -1,4 +1,4 @@
1
- import { ExecutionContext, ExecutableBuilder, Result, WithSystemFields } from '../types.js';
1
+ import { ExecutionContext, ExecutableBuilder, Result, WithSystemFields, ExecuteOptions } from '../types.js';
2
2
  import { TableOccurrence } from './table-occurrence.js';
3
3
  import { BaseTable } from './base-table.js';
4
4
  import { QueryBuilder } from './query-builder.js';
@@ -7,39 +7,43 @@ import { FFetchOptions } from '@fetchkit/ffetch';
7
7
  * Initial update builder returned from EntitySet.update(data)
8
8
  * Requires calling .byId() or .where() before .execute() is available
9
9
  */
10
- export declare class UpdateBuilder<T extends Record<string, any>, BT extends BaseTable<any, any, any, any>> {
10
+ export declare class UpdateBuilder<T extends Record<string, any>, BT extends BaseTable<any, any, any, any>, ReturnPreference extends "minimal" | "representation" = "minimal"> {
11
11
  private tableName;
12
12
  private databaseName;
13
13
  private context;
14
14
  private occurrence?;
15
15
  private data;
16
+ private returnPreference;
17
+ private databaseUseEntityIds;
16
18
  constructor(config: {
17
19
  occurrence?: TableOccurrence<any, any, any, any>;
18
20
  tableName: string;
19
21
  databaseName: string;
20
22
  context: ExecutionContext;
21
23
  data: Partial<T>;
24
+ returnPreference: ReturnPreference;
25
+ databaseUseEntityIds?: boolean;
22
26
  });
23
27
  /**
24
28
  * Update a single record by ID
25
- * Returns the count of updated records (0 or 1)
29
+ * Returns updated count by default, or full record if returnFullRecord was set to true
26
30
  */
27
- byId(id: string | number): ExecutableUpdateBuilder<T, true>;
31
+ byId(id: string | number): ExecutableUpdateBuilder<T, true, ReturnPreference>;
28
32
  /**
29
33
  * Update records matching a filter query
30
- * Returns the count of updated records
34
+ * Returns updated count by default, or full record if returnFullRecord was set to true
31
35
  * @param fn Callback that receives a QueryBuilder for building the filter
32
36
  */
33
- where(fn: (q: QueryBuilder<WithSystemFields<T>>) => QueryBuilder<WithSystemFields<T>>): ExecutableUpdateBuilder<T, true>;
37
+ where(fn: (q: QueryBuilder<WithSystemFields<T>>) => QueryBuilder<WithSystemFields<T>>): ExecutableUpdateBuilder<T, true, ReturnPreference>;
34
38
  }
35
39
  /**
36
40
  * Executable update builder - has execute() method
37
41
  * Returned after calling .byId() or .where()
38
- * Both modes return the count of updated records
42
+ * Can return either updated count or full record based on returnFullRecord option
39
43
  */
40
- export declare class ExecutableUpdateBuilder<T extends Record<string, any>, IsByFilter extends boolean> implements ExecutableBuilder<{
44
+ export declare class ExecutableUpdateBuilder<T extends Record<string, any>, IsByFilter extends boolean, ReturnPreference extends "minimal" | "representation" = "minimal"> implements ExecutableBuilder<ReturnPreference extends "minimal" ? {
41
45
  updatedCount: number;
42
- }> {
46
+ } : T> {
43
47
  private tableName;
44
48
  private databaseName;
45
49
  private context;
@@ -48,6 +52,8 @@ export declare class ExecutableUpdateBuilder<T extends Record<string, any>, IsBy
48
52
  private mode;
49
53
  private recordId?;
50
54
  private queryBuilder?;
55
+ private returnPreference;
56
+ private databaseUseEntityIds;
51
57
  constructor(config: {
52
58
  occurrence?: TableOccurrence<any, any, any, any>;
53
59
  tableName: string;
@@ -57,13 +63,30 @@ export declare class ExecutableUpdateBuilder<T extends Record<string, any>, IsBy
57
63
  mode: "byId" | "byFilter";
58
64
  recordId?: string | number;
59
65
  queryBuilder?: QueryBuilder<any>;
66
+ returnPreference: ReturnPreference;
67
+ databaseUseEntityIds?: boolean;
60
68
  });
61
- execute(options?: RequestInit & FFetchOptions): Promise<Result<{
69
+ /**
70
+ * Helper to merge database-level useEntityIds with per-request options
71
+ */
72
+ private mergeExecuteOptions;
73
+ /**
74
+ * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
75
+ * @param useEntityIds - Optional override for entity ID usage
76
+ */
77
+ private getTableId;
78
+ execute(options?: RequestInit & FFetchOptions & {
79
+ useEntityIds?: boolean;
80
+ }): Promise<Result<ReturnPreference extends "minimal" ? {
62
81
  updatedCount: number;
63
- }>>;
82
+ } : T>>;
64
83
  getRequestConfig(): {
65
84
  method: string;
66
85
  url: string;
67
86
  body?: any;
68
87
  };
88
+ toRequest(baseUrl: string): Request;
89
+ processResponse(response: Response, options?: ExecuteOptions): Promise<Result<ReturnPreference extends "minimal" ? {
90
+ updatedCount: number;
91
+ } : T>>;
69
92
  }