@proofkit/fmodata 0.1.0-alpha.14 → 0.1.0-alpha.16
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.
- package/README.md +4 -165
- package/dist/esm/client/batch-builder.d.ts +2 -3
- package/dist/esm/client/batch-builder.js.map +1 -1
- package/dist/esm/client/builders/expand-builder.d.ts +1 -1
- package/dist/esm/client/builders/expand-builder.js.map +1 -1
- package/dist/esm/client/builders/select-mixin.d.ts +2 -2
- package/dist/esm/client/builders/select-mixin.js.map +1 -1
- package/dist/esm/client/delete-builder.d.ts +2 -5
- package/dist/esm/client/delete-builder.js.map +1 -1
- package/dist/esm/client/entity-set.d.ts +3 -13
- package/dist/esm/client/entity-set.js.map +1 -1
- package/dist/esm/client/error-parser.js.map +1 -1
- package/dist/esm/client/insert-builder.d.ts +2 -3
- package/dist/esm/client/insert-builder.js.map +1 -1
- package/dist/esm/client/query/query-builder.d.ts +11 -19
- package/dist/esm/client/query/query-builder.js +7 -76
- package/dist/esm/client/query/query-builder.js.map +1 -1
- package/dist/esm/client/query/types.d.ts +5 -5
- package/dist/esm/client/query-builder.d.ts +1 -1
- package/dist/esm/client/record-builder.d.ts +8 -9
- package/dist/esm/client/record-builder.js.map +1 -1
- package/dist/esm/client/update-builder.d.ts +2 -5
- package/dist/esm/client/update-builder.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/orm/column.d.ts +21 -4
- package/dist/esm/orm/column.js +5 -2
- package/dist/esm/orm/column.js.map +1 -1
- package/dist/esm/orm/field-builders.d.ts +1 -1
- package/dist/esm/orm/field-builders.js +1 -1
- package/dist/esm/orm/field-builders.js.map +1 -1
- package/dist/esm/orm/operators.d.ts +19 -19
- package/dist/esm/orm/operators.js +31 -12
- package/dist/esm/orm/operators.js.map +1 -1
- package/dist/esm/orm/table.d.ts +10 -9
- package/dist/esm/orm/table.js +5 -3
- package/dist/esm/orm/table.js.map +1 -1
- package/dist/esm/transform.js +1 -5
- package/dist/esm/transform.js.map +1 -1
- package/dist/esm/types.d.ts +26 -2
- package/dist/esm/types.js.map +1 -1
- package/package.json +3 -1
- package/src/client/batch-builder.ts +2 -1
- package/src/client/builders/expand-builder.ts +3 -3
- package/src/client/builders/select-mixin.ts +2 -3
- package/src/client/delete-builder.ts +2 -1
- package/src/client/entity-set.ts +26 -8
- package/src/client/error-parser.ts +3 -0
- package/src/client/insert-builder.ts +2 -1
- package/src/client/query/query-builder.ts +27 -126
- package/src/client/query/types.ts +6 -5
- package/src/client/query-builder.ts +1 -1
- package/src/client/record-builder.ts +22 -9
- package/src/client/update-builder.ts +17 -8
- package/src/index.ts +6 -15
- package/src/orm/column.ts +33 -5
- package/src/orm/field-builders.ts +1 -1
- package/src/orm/operators.ts +105 -51
- package/src/orm/table.ts +21 -13
- package/src/types.ts +33 -6
- package/dist/esm/filter-types.d.ts +0 -76
- package/src/filter-types.ts +0 -97
|
@@ -52,26 +52,30 @@ class FilterExpression {
|
|
|
52
52
|
}
|
|
53
53
|
_binaryOp(op, useEntityIds) {
|
|
54
54
|
const [left, right] = this.operands;
|
|
55
|
-
const
|
|
56
|
-
const
|
|
55
|
+
const columnForValue = isColumn(left) && !isColumn(right) ? left : isColumn(right) && !isColumn(left) ? right : void 0;
|
|
56
|
+
const leftStr = this._operandToString(left, useEntityIds, columnForValue);
|
|
57
|
+
const rightStr = this._operandToString(right, useEntityIds, columnForValue);
|
|
57
58
|
return `${leftStr} ${op} ${rightStr}`;
|
|
58
59
|
}
|
|
59
60
|
_functionOp(fnName, useEntityIds) {
|
|
60
61
|
const [column, value] = this.operands;
|
|
62
|
+
const columnInstance = isColumn(column) ? column : void 0;
|
|
61
63
|
const columnStr = this._operandToString(column, useEntityIds);
|
|
62
|
-
const valueStr = this._operandToString(value, useEntityIds);
|
|
64
|
+
const valueStr = this._operandToString(value, useEntityIds, columnInstance);
|
|
63
65
|
return `${fnName}(${columnStr}, ${valueStr})`;
|
|
64
66
|
}
|
|
65
67
|
_inOp(useEntityIds) {
|
|
66
68
|
const [column, values] = this.operands;
|
|
69
|
+
const columnInstance = isColumn(column) ? column : void 0;
|
|
67
70
|
const columnStr = this._operandToString(column, useEntityIds);
|
|
68
|
-
const valuesStr = values.map((v) => this._operandToString(v, useEntityIds)).join(", ");
|
|
71
|
+
const valuesStr = values.map((v) => this._operandToString(v, useEntityIds, columnInstance)).join(", ");
|
|
69
72
|
return `${columnStr} in (${valuesStr})`;
|
|
70
73
|
}
|
|
71
74
|
_notInOp(useEntityIds) {
|
|
72
75
|
const [column, values] = this.operands;
|
|
76
|
+
const columnInstance = isColumn(column) ? column : void 0;
|
|
73
77
|
const columnStr = this._operandToString(column, useEntityIds);
|
|
74
|
-
const valuesStr = values.map((v) => this._operandToString(v, useEntityIds)).join(", ");
|
|
78
|
+
const valuesStr = values.map((v) => this._operandToString(v, useEntityIds, columnInstance)).join(", ");
|
|
75
79
|
return `not (${columnStr} in (${valuesStr}))`;
|
|
76
80
|
}
|
|
77
81
|
_isNullOp(useEntityIds) {
|
|
@@ -104,20 +108,35 @@ class FilterExpression {
|
|
|
104
108
|
}
|
|
105
109
|
throw new Error("NOT operator requires a FilterExpression operand");
|
|
106
110
|
}
|
|
107
|
-
_operandToString(operand, useEntityIds) {
|
|
111
|
+
_operandToString(operand, useEntityIds, column) {
|
|
108
112
|
if (isColumn(operand)) {
|
|
109
113
|
return operand.getFieldIdentifier(useEntityIds);
|
|
110
114
|
}
|
|
111
|
-
|
|
112
|
-
|
|
115
|
+
let value = operand;
|
|
116
|
+
if (column == null ? void 0 : column.inputValidator) {
|
|
117
|
+
try {
|
|
118
|
+
const result = column.inputValidator["~standard"].validate(value);
|
|
119
|
+
if (result instanceof Promise) {
|
|
120
|
+
value = operand;
|
|
121
|
+
} else if ("issues" in result && result.issues) {
|
|
122
|
+
value = operand;
|
|
123
|
+
} else if ("value" in result) {
|
|
124
|
+
value = result.value;
|
|
125
|
+
}
|
|
126
|
+
} catch (error) {
|
|
127
|
+
value = operand;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
if (typeof value === "string") {
|
|
131
|
+
return `'${value.replace(/'/g, "''")}'`;
|
|
113
132
|
}
|
|
114
|
-
if (
|
|
133
|
+
if (value === null || value === void 0) {
|
|
115
134
|
return "null";
|
|
116
135
|
}
|
|
117
|
-
if (
|
|
118
|
-
return
|
|
136
|
+
if (value instanceof Date) {
|
|
137
|
+
return value.toISOString();
|
|
119
138
|
}
|
|
120
|
-
return String(
|
|
139
|
+
return String(value);
|
|
121
140
|
}
|
|
122
141
|
}
|
|
123
142
|
function eq(column, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operators.js","sources":["../../../src/orm/operators.ts"],"sourcesContent":["import type { Column } from \"./column\";\nimport { isColumn } from \"./column\";\n\n/**\n * FilterExpression represents a filter condition that can be used in where() clauses.\n * Internal representation of operator expressions that get converted to OData filter syntax.\n */\nexport class FilterExpression {\n constructor(\n public readonly operator: string,\n public readonly operands: (Column | any | FilterExpression)[],\n ) {}\n\n /**\n * Convert this expression to OData filter syntax.\n * @internal Used by QueryBuilder\n */\n toODataFilter(useEntityIds?: boolean): string {\n switch (this.operator) {\n // Comparison operators\n case \"eq\":\n return this._binaryOp(\"eq\", useEntityIds);\n case \"ne\":\n return this._binaryOp(\"ne\", useEntityIds);\n case \"gt\":\n return this._binaryOp(\"gt\", useEntityIds);\n case \"gte\":\n return this._binaryOp(\"ge\", useEntityIds);\n case \"lt\":\n return this._binaryOp(\"lt\", useEntityIds);\n case \"lte\":\n return this._binaryOp(\"le\", useEntityIds);\n case \"in\":\n return this._inOp(useEntityIds);\n case \"notIn\":\n return this._notInOp(useEntityIds);\n\n // String operators\n case \"contains\":\n return this._functionOp(\"contains\", useEntityIds);\n case \"startsWith\":\n return this._functionOp(\"startswith\", useEntityIds);\n case \"endsWith\":\n return this._functionOp(\"endswith\", useEntityIds);\n\n // Null checks\n case \"isNull\":\n return this._isNullOp(useEntityIds);\n case \"isNotNull\":\n return this._isNotNullOp(useEntityIds);\n\n // Logical operators\n case \"and\":\n return this._logicalOp(\"and\", useEntityIds);\n case \"or\":\n return this._logicalOp(\"or\", useEntityIds);\n case \"not\":\n return this._notOp(useEntityIds);\n\n default:\n throw new Error(`Unknown operator: ${this.operator}`);\n }\n }\n\n private _binaryOp(op: string, useEntityIds?: boolean): string {\n const [left, right] = this.operands;\n const leftStr = this._operandToString(left, useEntityIds);\n const rightStr = this._operandToString(right, useEntityIds);\n return `${leftStr} ${op} ${rightStr}`;\n }\n\n private _functionOp(fnName: string, useEntityIds?: boolean): string {\n const [column, value] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n const valueStr = this._operandToString(value, useEntityIds);\n return `${fnName}(${columnStr}, ${valueStr})`;\n }\n\n private _inOp(useEntityIds?: boolean): string {\n const [column, values] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n const valuesStr = (values as any[])\n .map((v) => this._operandToString(v, useEntityIds))\n .join(\", \");\n return `${columnStr} in (${valuesStr})`;\n }\n\n private _notInOp(useEntityIds?: boolean): string {\n const [column, values] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n const valuesStr = (values as any[])\n .map((v) => this._operandToString(v, useEntityIds))\n .join(\", \");\n return `not (${columnStr} in (${valuesStr}))`;\n }\n\n private _isNullOp(useEntityIds?: boolean): string {\n const [column] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n return `${columnStr} eq null`;\n }\n\n private _isNotNullOp(useEntityIds?: boolean): string {\n const [column] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n return `${columnStr} ne null`;\n }\n\n private _logicalOp(op: string, useEntityIds?: boolean): string {\n const expressions = this.operands.map((expr) => {\n if (expr instanceof FilterExpression) {\n const innerExpr = expr.toODataFilter(useEntityIds);\n // Wrap in parens if it's a logical expression to ensure precedence\n if (expr.operator === \"and\" || expr.operator === \"or\") {\n return `(${innerExpr})`;\n }\n return innerExpr;\n }\n throw new Error(\"Logical operators require FilterExpression operands\");\n });\n return expressions.join(` ${op} `);\n }\n\n private _notOp(useEntityIds?: boolean): string {\n const [expr] = this.operands;\n if (expr instanceof FilterExpression) {\n return `not (${expr.toODataFilter(useEntityIds)})`;\n }\n throw new Error(\"NOT operator requires a FilterExpression operand\");\n }\n\n private _operandToString(operand: any, useEntityIds?: boolean): string {\n if (isColumn(operand)) {\n return operand.getFieldIdentifier(useEntityIds);\n }\n if (typeof operand === \"string\") {\n return `'${operand.replace(/'/g, \"''\")}'`; // Escape single quotes\n }\n if (operand === null || operand === undefined) {\n return \"null\";\n }\n if (operand instanceof Date) {\n return operand.toISOString();\n }\n return String(operand);\n }\n}\n\n// ============================================================================\n// Comparison Operators\n// ============================================================================\n\n/**\n * Equal operator - checks if column equals a value or another column.\n *\n * @example\n * eq(users.name, \"John\") // name equals \"John\"\n * eq(users.id, contacts.id_user) // cross-table comparison\n */\nexport function eq<T>(column: Column<T>, value: T): FilterExpression;\nexport function eq<T>(column1: Column<T>, column2: Column<T>): FilterExpression;\nexport function eq(column: Column, value: any): FilterExpression {\n return new FilterExpression(\"eq\", [column, value]);\n}\n\n/**\n * Not equal operator - checks if column does not equal a value or another column.\n *\n * @example\n * ne(users.status, \"inactive\") // status not equal to \"inactive\"\n * ne(users.id, contacts.id_user) // cross-table comparison\n */\nexport function ne<T>(column: Column<T>, value: T): FilterExpression;\nexport function ne<T>(column1: Column<T>, column2: Column<T>): FilterExpression;\nexport function ne(column: Column, value: any): FilterExpression {\n return new FilterExpression(\"ne\", [column, value]);\n}\n\n/**\n * Greater than operator - checks if column is greater than a value.\n *\n * @example\n * gt(users.age, 18) // age greater than 18\n */\nexport function gt<T extends number | string | Date | null>(\n column: Column<T>,\n value: T,\n): FilterExpression {\n return new FilterExpression(\"gt\", [column, value]);\n}\n\n/**\n * Greater than or equal operator - checks if column is >= a value.\n *\n * @example\n * gte(users.age, 18) // age >= 18\n */\nexport function gte<T extends number | string | Date | null>(\n column: Column<T>,\n value: T,\n): FilterExpression {\n return new FilterExpression(\"gte\", [column, value]);\n}\n\n/**\n * Less than operator - checks if column is less than a value.\n *\n * @example\n * lt(users.age, 65) // age less than 65\n */\nexport function lt<T extends number | string | Date | null>(\n column: Column<T>,\n value: T,\n): FilterExpression {\n return new FilterExpression(\"lt\", [column, value]);\n}\n\n/**\n * Less than or equal operator - checks if column is <= a value.\n *\n * @example\n * lte(users.age, 65) // age <= 65\n */\nexport function lte<T extends number | string | Date | null>(\n column: Column<T>,\n value: T,\n): FilterExpression {\n return new FilterExpression(\"lte\", [column, value]);\n}\n\n// ============================================================================\n// String Operators\n// ============================================================================\n\n/**\n * Contains operator - checks if a string column contains a substring.\n *\n * @example\n * contains(users.name, \"John\") // name contains \"John\"\n */\nexport function contains(\n column: Column<string | null>,\n value: string,\n): FilterExpression {\n return new FilterExpression(\"contains\", [column, value]);\n}\n\n/**\n * Starts with operator - checks if a string column starts with a prefix.\n *\n * @example\n * startsWith(users.email, \"admin\") // email starts with \"admin\"\n */\nexport function startsWith(\n column: Column<string | null>,\n value: string,\n): FilterExpression {\n return new FilterExpression(\"startsWith\", [column, value]);\n}\n\n/**\n * Ends with operator - checks if a string column ends with a suffix.\n *\n * @example\n * endsWith(users.email, \"@example.com\") // email ends with \"@example.com\"\n */\nexport function endsWith(\n column: Column<string | null>,\n value: string,\n): FilterExpression {\n return new FilterExpression(\"endsWith\", [column, value]);\n}\n\n// ============================================================================\n// Array Operators\n// ============================================================================\n\n/**\n * In array operator - checks if column value is in an array of values.\n *\n * @example\n * inArray(users.status, [\"active\", \"pending\"]) // status is \"active\" or \"pending\"\n */\nexport function inArray<T>(\n column: Column<T | null>,\n values: T[],\n): FilterExpression {\n return new FilterExpression(\"in\", [column, values]);\n}\n\n/**\n * Not in array operator - checks if column value is not in an array of values.\n *\n * @example\n * notInArray(users.status, [\"deleted\", \"banned\"]) // status is neither \"deleted\" nor \"banned\"\n */\nexport function notInArray<T>(\n column: Column<T>,\n values: T[],\n): FilterExpression {\n return new FilterExpression(\"notIn\", [column, values]);\n}\n\n// ============================================================================\n// Null Check Operators\n// ============================================================================\n\n/**\n * Is null operator - checks if column value is null.\n *\n * @example\n * isNull(users.deletedAt) // deletedAt is null\n */\nexport function isNull<T>(column: Column<T>): FilterExpression {\n return new FilterExpression(\"isNull\", [column]);\n}\n\n/**\n * Is not null operator - checks if column value is not null.\n *\n * @example\n * isNotNull(users.email) // email is not null\n */\nexport function isNotNull<T>(column: Column<T>): FilterExpression {\n return new FilterExpression(\"isNotNull\", [column]);\n}\n\n// ============================================================================\n// Logical Operators\n// ============================================================================\n\n/**\n * AND operator - combines multiple filter expressions with logical AND.\n * All expressions must be true for the record to match.\n *\n * @example\n * and(\n * eq(users.active, true),\n * gt(users.age, 18)\n * ) // active is true AND age > 18\n */\nexport function and(...expressions: FilterExpression[]): FilterExpression {\n if (expressions.length === 0) {\n throw new Error(\"AND operator requires at least one expression\");\n }\n if (expressions.length === 1 && expressions[0] !== undefined) {\n return expressions[0];\n }\n return new FilterExpression(\"and\", expressions);\n}\n\n/**\n * OR operator - combines multiple filter expressions with logical OR.\n * At least one expression must be true for the record to match.\n *\n * @example\n * or(\n * eq(users.role, \"admin\"),\n * eq(users.role, \"moderator\")\n * ) // role is \"admin\" OR \"moderator\"\n */\nexport function or(...expressions: FilterExpression[]): FilterExpression {\n if (expressions.length === 0) {\n throw new Error(\"OR operator requires at least one expression\");\n }\n if (expressions.length === 1 && expressions[0] !== undefined) {\n return expressions[0];\n }\n return new FilterExpression(\"or\", expressions);\n}\n\n/**\n * NOT operator - negates a filter expression.\n *\n * @example\n * not(eq(users.status, \"deleted\")) // status is NOT \"deleted\"\n */\nexport function not(expression: FilterExpression): FilterExpression {\n return new FilterExpression(\"not\", [expression]);\n}\n\n// ============================================================================\n// OrderBy Operators\n// ============================================================================\n\n/**\n * OrderByExpression represents a sort order specification for a column.\n * Used in orderBy() clauses to provide type-safe sorting with direction.\n */\nexport class OrderByExpression<TableName extends string = string> {\n constructor(\n public readonly column: Column<any, TableName>,\n public readonly direction: \"asc\" | \"desc\",\n ) {}\n}\n\n/**\n * Type guard to check if a value is an OrderByExpression instance.\n */\nexport function isOrderByExpression(\n value: any,\n): value is OrderByExpression {\n return value instanceof OrderByExpression;\n}\n\n/**\n * Ascending order operator - sorts a column in ascending order.\n *\n * @example\n * asc(users.name) // Sort by name ascending\n */\nexport function asc<TableName extends string>(\n column: Column<any, TableName>,\n): OrderByExpression<TableName> {\n return new OrderByExpression(column, \"asc\");\n}\n\n/**\n * Descending order operator - sorts a column in descending order.\n *\n * @example\n * desc(users.age) // Sort by age descending\n */\nexport function desc<TableName extends string>(\n column: Column<any, TableName>,\n): OrderByExpression<TableName> {\n return new OrderByExpression(column, \"desc\");\n}\n"],"names":[],"mappings":";AAOO,MAAM,iBAAiB;AAAA,EAC5B,YACkB,UACA,UAChB;AAFgB,SAAA,WAAA;AACA,SAAA,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOlB,cAAc,cAAgC;AAC5C,YAAQ,KAAK,UAAU;AAAA;AAAA,MAErB,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,UAAU,MAAM,YAAY;AAAA,MAC1C,KAAK;AACI,eAAA,KAAK,MAAM,YAAY;AAAA,MAChC,KAAK;AACI,eAAA,KAAK,SAAS,YAAY;AAAA;AAAA,MAGnC,KAAK;AACI,eAAA,KAAK,YAAY,YAAY,YAAY;AAAA,MAClD,KAAK;AACI,eAAA,KAAK,YAAY,cAAc,YAAY;AAAA,MACpD,KAAK;AACI,eAAA,KAAK,YAAY,YAAY,YAAY;AAAA;AAAA,MAGlD,KAAK;AACI,eAAA,KAAK,UAAU,YAAY;AAAA,MACpC,KAAK;AACI,eAAA,KAAK,aAAa,YAAY;AAAA;AAAA,MAGvC,KAAK;AACI,eAAA,KAAK,WAAW,OAAO,YAAY;AAAA,MAC5C,KAAK;AACI,eAAA,KAAK,WAAW,MAAM,YAAY;AAAA,MAC3C,KAAK;AACI,eAAA,KAAK,OAAO,YAAY;AAAA,MAEjC;AACE,cAAM,IAAI,MAAM,qBAAqB,KAAK,QAAQ,EAAE;AAAA,IAAA;AAAA,EACxD;AAAA,EAGM,UAAU,IAAY,cAAgC;AAC5D,UAAM,CAAC,MAAM,KAAK,IAAI,KAAK;AAC3B,UAAM,UAAU,KAAK,iBAAiB,MAAM,YAAY;AACxD,UAAM,WAAW,KAAK,iBAAiB,OAAO,YAAY;AAC1D,WAAO,GAAG,OAAO,IAAI,EAAE,IAAI,QAAQ;AAAA,EAAA;AAAA,EAG7B,YAAY,QAAgB,cAAgC;AAClE,UAAM,CAAC,QAAQ,KAAK,IAAI,KAAK;AAC7B,UAAM,YAAY,KAAK,iBAAiB,QAAQ,YAAY;AAC5D,UAAM,WAAW,KAAK,iBAAiB,OAAO,YAAY;AAC1D,WAAO,GAAG,MAAM,IAAI,SAAS,KAAK,QAAQ;AAAA,EAAA;AAAA,EAGpC,MAAM,cAAgC;AAC5C,UAAM,CAAC,QAAQ,MAAM,IAAI,KAAK;AAC9B,UAAM,YAAY,KAAK,iBAAiB,QAAQ,YAAY;AAC5D,UAAM,YAAa,OAChB,IAAI,CAAC,MAAM,KAAK,iBAAiB,GAAG,YAAY,CAAC,EACjD,KAAK,IAAI;AACL,WAAA,GAAG,SAAS,QAAQ,SAAS;AAAA,EAAA;AAAA,EAG9B,SAAS,cAAgC;AAC/C,UAAM,CAAC,QAAQ,MAAM,IAAI,KAAK;AAC9B,UAAM,YAAY,KAAK,iBAAiB,QAAQ,YAAY;AAC5D,UAAM,YAAa,OAChB,IAAI,CAAC,MAAM,KAAK,iBAAiB,GAAG,YAAY,CAAC,EACjD,KAAK,IAAI;AACL,WAAA,QAAQ,SAAS,QAAQ,SAAS;AAAA,EAAA;AAAA,EAGnC,UAAU,cAAgC;AAC1C,UAAA,CAAC,MAAM,IAAI,KAAK;AACtB,UAAM,YAAY,KAAK,iBAAiB,QAAQ,YAAY;AAC5D,WAAO,GAAG,SAAS;AAAA,EAAA;AAAA,EAGb,aAAa,cAAgC;AAC7C,UAAA,CAAC,MAAM,IAAI,KAAK;AACtB,UAAM,YAAY,KAAK,iBAAiB,QAAQ,YAAY;AAC5D,WAAO,GAAG,SAAS;AAAA,EAAA;AAAA,EAGb,WAAW,IAAY,cAAgC;AAC7D,UAAM,cAAc,KAAK,SAAS,IAAI,CAAC,SAAS;AAC9C,UAAI,gBAAgB,kBAAkB;AAC9B,cAAA,YAAY,KAAK,cAAc,YAAY;AAEjD,YAAI,KAAK,aAAa,SAAS,KAAK,aAAa,MAAM;AACrD,iBAAO,IAAI,SAAS;AAAA,QAAA;AAEf,eAAA;AAAA,MAAA;AAEH,YAAA,IAAI,MAAM,qDAAqD;AAAA,IAAA,CACtE;AACD,WAAO,YAAY,KAAK,IAAI,EAAE,GAAG;AAAA,EAAA;AAAA,EAG3B,OAAO,cAAgC;AACvC,UAAA,CAAC,IAAI,IAAI,KAAK;AACpB,QAAI,gBAAgB,kBAAkB;AACpC,aAAO,QAAQ,KAAK,cAAc,YAAY,CAAC;AAAA,IAAA;AAE3C,UAAA,IAAI,MAAM,kDAAkD;AAAA,EAAA;AAAA,EAG5D,iBAAiB,SAAc,cAAgC;AACjE,QAAA,SAAS,OAAO,GAAG;AACd,aAAA,QAAQ,mBAAmB,YAAY;AAAA,IAAA;AAE5C,QAAA,OAAO,YAAY,UAAU;AAC/B,aAAO,IAAI,QAAQ,QAAQ,MAAM,IAAI,CAAC;AAAA,IAAA;AAEpC,QAAA,YAAY,QAAQ,YAAY,QAAW;AACtC,aAAA;AAAA,IAAA;AAET,QAAI,mBAAmB,MAAM;AAC3B,aAAO,QAAQ,YAAY;AAAA,IAAA;AAE7B,WAAO,OAAO,OAAO;AAAA,EAAA;AAEzB;AAegB,SAAA,GAAG,QAAgB,OAA8B;AAC/D,SAAO,IAAI,iBAAiB,MAAM,CAAC,QAAQ,KAAK,CAAC;AACnD;AAWgB,SAAA,GAAG,QAAgB,OAA8B;AAC/D,SAAO,IAAI,iBAAiB,MAAM,CAAC,QAAQ,KAAK,CAAC;AACnD;AAQgB,SAAA,GACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,MAAM,CAAC,QAAQ,KAAK,CAAC;AACnD;AAQgB,SAAA,IACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,OAAO,CAAC,QAAQ,KAAK,CAAC;AACpD;AAQgB,SAAA,GACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,MAAM,CAAC,QAAQ,KAAK,CAAC;AACnD;AAQgB,SAAA,IACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,OAAO,CAAC,QAAQ,KAAK,CAAC;AACpD;AAYgB,SAAA,SACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,YAAY,CAAC,QAAQ,KAAK,CAAC;AACzD;AAQgB,SAAA,WACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,cAAc,CAAC,QAAQ,KAAK,CAAC;AAC3D;AAQgB,SAAA,SACd,QACA,OACkB;AAClB,SAAO,IAAI,iBAAiB,YAAY,CAAC,QAAQ,KAAK,CAAC;AACzD;AAYgB,SAAA,QACd,QACA,QACkB;AAClB,SAAO,IAAI,iBAAiB,MAAM,CAAC,QAAQ,MAAM,CAAC;AACpD;AAQgB,SAAA,WACd,QACA,QACkB;AAClB,SAAO,IAAI,iBAAiB,SAAS,CAAC,QAAQ,MAAM,CAAC;AACvD;AAYO,SAAS,OAAU,QAAqC;AAC7D,SAAO,IAAI,iBAAiB,UAAU,CAAC,MAAM,CAAC;AAChD;AAQO,SAAS,UAAa,QAAqC;AAChE,SAAO,IAAI,iBAAiB,aAAa,CAAC,MAAM,CAAC;AACnD;AAgBO,SAAS,OAAO,aAAmD;AACpE,MAAA,YAAY,WAAW,GAAG;AACtB,UAAA,IAAI,MAAM,+CAA+C;AAAA,EAAA;AAEjE,MAAI,YAAY,WAAW,KAAK,YAAY,CAAC,MAAM,QAAW;AAC5D,WAAO,YAAY,CAAC;AAAA,EAAA;AAEf,SAAA,IAAI,iBAAiB,OAAO,WAAW;AAChD;AAYO,SAAS,MAAM,aAAmD;AACnE,MAAA,YAAY,WAAW,GAAG;AACtB,UAAA,IAAI,MAAM,8CAA8C;AAAA,EAAA;AAEhE,MAAI,YAAY,WAAW,KAAK,YAAY,CAAC,MAAM,QAAW;AAC5D,WAAO,YAAY,CAAC;AAAA,EAAA;AAEf,SAAA,IAAI,iBAAiB,MAAM,WAAW;AAC/C;AAQO,SAAS,IAAI,YAAgD;AAClE,SAAO,IAAI,iBAAiB,OAAO,CAAC,UAAU,CAAC;AACjD;AAUO,MAAM,kBAAqD;AAAA,EAChE,YACkB,QACA,WAChB;AAFgB,SAAA,SAAA;AACA,SAAA,YAAA;AAAA,EAAA;AAEpB;AAKO,SAAS,oBACd,OAC4B;AAC5B,SAAO,iBAAiB;AAC1B;AAQO,SAAS,IACd,QAC8B;AACvB,SAAA,IAAI,kBAAkB,QAAQ,KAAK;AAC5C;AAQO,SAAS,KACd,QAC8B;AACvB,SAAA,IAAI,kBAAkB,QAAQ,MAAM;AAC7C;"}
|
|
1
|
+
{"version":3,"file":"operators.js","sources":["../../../src/orm/operators.ts"],"sourcesContent":["import type { Column } from \"./column\";\nimport { isColumn } from \"./column\";\n\n/**\n * FilterExpression represents a filter condition that can be used in where() clauses.\n * Internal representation of operator expressions that get converted to OData filter syntax.\n */\nexport class FilterExpression {\n constructor(\n public readonly operator: string,\n public readonly operands: (Column | any | FilterExpression)[],\n ) {}\n\n /**\n * Convert this expression to OData filter syntax.\n * @internal Used by QueryBuilder\n */\n toODataFilter(useEntityIds?: boolean): string {\n switch (this.operator) {\n // Comparison operators\n case \"eq\":\n return this._binaryOp(\"eq\", useEntityIds);\n case \"ne\":\n return this._binaryOp(\"ne\", useEntityIds);\n case \"gt\":\n return this._binaryOp(\"gt\", useEntityIds);\n case \"gte\":\n return this._binaryOp(\"ge\", useEntityIds);\n case \"lt\":\n return this._binaryOp(\"lt\", useEntityIds);\n case \"lte\":\n return this._binaryOp(\"le\", useEntityIds);\n case \"in\":\n return this._inOp(useEntityIds);\n case \"notIn\":\n return this._notInOp(useEntityIds);\n\n // String operators\n case \"contains\":\n return this._functionOp(\"contains\", useEntityIds);\n case \"startsWith\":\n return this._functionOp(\"startswith\", useEntityIds);\n case \"endsWith\":\n return this._functionOp(\"endswith\", useEntityIds);\n\n // Null checks\n case \"isNull\":\n return this._isNullOp(useEntityIds);\n case \"isNotNull\":\n return this._isNotNullOp(useEntityIds);\n\n // Logical operators\n case \"and\":\n return this._logicalOp(\"and\", useEntityIds);\n case \"or\":\n return this._logicalOp(\"or\", useEntityIds);\n case \"not\":\n return this._notOp(useEntityIds);\n\n default:\n throw new Error(`Unknown operator: ${this.operator}`);\n }\n }\n\n private _binaryOp(op: string, useEntityIds?: boolean): string {\n const [left, right] = this.operands;\n // For binary ops, the column is typically the first operand and value is the second\n // But we also support column-to-column comparisons, so check both\n const columnForValue =\n isColumn(left) && !isColumn(right)\n ? left\n : isColumn(right) && !isColumn(left)\n ? right\n : undefined;\n const leftStr = this._operandToString(left, useEntityIds, columnForValue);\n const rightStr = this._operandToString(right, useEntityIds, columnForValue);\n return `${leftStr} ${op} ${rightStr}`;\n }\n\n private _functionOp(fnName: string, useEntityIds?: boolean): string {\n const [column, value] = this.operands;\n const columnInstance = isColumn(column) ? column : undefined;\n const columnStr = this._operandToString(column, useEntityIds);\n const valueStr = this._operandToString(value, useEntityIds, columnInstance);\n return `${fnName}(${columnStr}, ${valueStr})`;\n }\n\n private _inOp(useEntityIds?: boolean): string {\n const [column, values] = this.operands;\n const columnInstance = isColumn(column) ? column : undefined;\n const columnStr = this._operandToString(column, useEntityIds);\n const valuesStr = (values as any[])\n .map((v) => this._operandToString(v, useEntityIds, columnInstance))\n .join(\", \");\n return `${columnStr} in (${valuesStr})`;\n }\n\n private _notInOp(useEntityIds?: boolean): string {\n const [column, values] = this.operands;\n const columnInstance = isColumn(column) ? column : undefined;\n const columnStr = this._operandToString(column, useEntityIds);\n const valuesStr = (values as any[])\n .map((v) => this._operandToString(v, useEntityIds, columnInstance))\n .join(\", \");\n return `not (${columnStr} in (${valuesStr}))`;\n }\n\n private _isNullOp(useEntityIds?: boolean): string {\n const [column] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n return `${columnStr} eq null`;\n }\n\n private _isNotNullOp(useEntityIds?: boolean): string {\n const [column] = this.operands;\n const columnStr = this._operandToString(column, useEntityIds);\n return `${columnStr} ne null`;\n }\n\n private _logicalOp(op: string, useEntityIds?: boolean): string {\n const expressions = this.operands.map((expr) => {\n if (expr instanceof FilterExpression) {\n const innerExpr = expr.toODataFilter(useEntityIds);\n // Wrap in parens if it's a logical expression to ensure precedence\n if (expr.operator === \"and\" || expr.operator === \"or\") {\n return `(${innerExpr})`;\n }\n return innerExpr;\n }\n throw new Error(\"Logical operators require FilterExpression operands\");\n });\n return expressions.join(` ${op} `);\n }\n\n private _notOp(useEntityIds?: boolean): string {\n const [expr] = this.operands;\n if (expr instanceof FilterExpression) {\n return `not (${expr.toODataFilter(useEntityIds)})`;\n }\n throw new Error(\"NOT operator requires a FilterExpression operand\");\n }\n\n private _operandToString(\n operand: any,\n useEntityIds?: boolean,\n column?: Column<any, any, any, any>,\n ): string {\n if (isColumn(operand)) {\n return operand.getFieldIdentifier(useEntityIds);\n }\n\n // If we have a column with an input validator, apply it to transform the value\n let value = operand;\n if (column?.inputValidator) {\n try {\n const result = column.inputValidator[\"~standard\"].validate(value);\n // Handle async validators (though they shouldn't be async for filters)\n if (result instanceof Promise) {\n // For filters, we can't use async validators, so skip transformation\n // This is a limitation - async validators won't work in filters\n value = operand;\n } else if (\"issues\" in result && result.issues) {\n // Validation failed, use original value\n value = operand;\n } else if (\"value\" in result) {\n // Validation succeeded, use transformed value\n value = result.value;\n }\n } catch (error) {\n // If validation throws, use the original value (will likely cause a query error)\n // This maintains backward compatibility and allows the server to handle validation\n value = operand;\n }\n }\n\n if (typeof value === \"string\") {\n return `'${value.replace(/'/g, \"''\")}'`; // Escape single quotes\n }\n if (value === null || value === undefined) {\n return \"null\";\n }\n if (value instanceof Date) {\n return value.toISOString();\n }\n return String(value);\n }\n}\n\n// ============================================================================\n// Comparison Operators\n// ============================================================================\n\n/**\n * Equal operator - checks if column equals a value or another column.\n *\n * @example\n * eq(users.name, \"John\") // name equals \"John\"\n * eq(users.id, contacts.id_user) // cross-table comparison\n */\nexport function eq<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression;\nexport function eq<TOutput, TInput>(\n column1: Column<TOutput, TInput>,\n column2: Column<TOutput, TInput>,\n): FilterExpression;\nexport function eq(column: Column, value: any): FilterExpression {\n return new FilterExpression(\"eq\", [column, value]);\n}\n\n/**\n * Not equal operator - checks if column does not equal a value or another column.\n *\n * @example\n * ne(users.status, \"inactive\") // status not equal to \"inactive\"\n * ne(users.id, contacts.id_user) // cross-table comparison\n */\nexport function ne<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression;\nexport function ne<TOutput, TInput>(\n column1: Column<TOutput, TInput>,\n column2: Column<TOutput, TInput>,\n): FilterExpression;\nexport function ne(column: Column, value: any): FilterExpression {\n return new FilterExpression(\"ne\", [column, value]);\n}\n\n/**\n * Greater than operator - checks if column is greater than a value.\n *\n * @example\n * gt(users.age, 18) // age greater than 18\n */\nexport function gt<TOutput extends number | string | Date | null, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"gt\", [column, value]);\n}\n\n/**\n * Greater than or equal operator - checks if column is >= a value.\n *\n * @example\n * gte(users.age, 18) // age >= 18\n */\nexport function gte<TOutput extends number | string | Date | null, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"gte\", [column, value]);\n}\n\n/**\n * Less than operator - checks if column is less than a value.\n *\n * @example\n * lt(users.age, 65) // age less than 65\n */\nexport function lt<TOutput extends number | string | Date | null, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"lt\", [column, value]);\n}\n\n/**\n * Less than or equal operator - checks if column is <= a value.\n *\n * @example\n * lte(users.age, 65) // age <= 65\n */\nexport function lte<TOutput extends number | string | Date | null, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"lte\", [column, value]);\n}\n\n// ============================================================================\n// String Operators\n// ============================================================================\n\n/**\n * Contains operator - checks if a string column contains a substring.\n *\n * @example\n * contains(users.name, \"John\") // name contains \"John\"\n */\nexport function contains<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"contains\", [column, value]);\n}\n\n/**\n * Starts with operator - checks if a string column starts with a prefix.\n *\n * @example\n * startsWith(users.email, \"admin\") // email starts with \"admin\"\n */\nexport function startsWith<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"startsWith\", [column, value]);\n}\n\n/**\n * Ends with operator - checks if a string column ends with a suffix.\n *\n * @example\n * endsWith(users.email, \"@example.com\") // email ends with \"@example.com\"\n */\nexport function endsWith<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n value: NoInfer<TInput>,\n): FilterExpression {\n return new FilterExpression(\"endsWith\", [column, value]);\n}\n\n// ============================================================================\n// Array Operators\n// ============================================================================\n\n/**\n * In array operator - checks if column value is in an array of values.\n *\n * @example\n * inArray(users.status, [\"active\", \"pending\"]) // status is \"active\" or \"pending\"\n */\nexport function inArray<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n values: NoInfer<TInput>[],\n): FilterExpression {\n return new FilterExpression(\"in\", [column, values]);\n}\n\n/**\n * Not in array operator - checks if column value is not in an array of values.\n *\n * @example\n * notInArray(users.status, [\"deleted\", \"banned\"]) // status is neither \"deleted\" nor \"banned\"\n */\nexport function notInArray<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n values: NoInfer<TInput>[],\n): FilterExpression {\n return new FilterExpression(\"notIn\", [column, values]);\n}\n\n// ============================================================================\n// Null Check Operators\n// ============================================================================\n\n/**\n * Is null operator - checks if column value is null.\n *\n * @example\n * isNull(users.deletedAt) // deletedAt is null\n */\nexport function isNull<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n): FilterExpression {\n return new FilterExpression(\"isNull\", [column]);\n}\n\n/**\n * Is not null operator - checks if column value is not null.\n *\n * @example\n * isNotNull(users.email) // email is not null\n */\nexport function isNotNull<TOutput, TInput>(\n column: Column<TOutput, TInput>,\n): FilterExpression {\n return new FilterExpression(\"isNotNull\", [column]);\n}\n\n// ============================================================================\n// Logical Operators\n// ============================================================================\n\n/**\n * AND operator - combines multiple filter expressions with logical AND.\n * All expressions must be true for the record to match.\n *\n * @example\n * and(\n * eq(users.active, true),\n * gt(users.age, 18)\n * ) // active is true AND age > 18\n */\nexport function and(...expressions: FilterExpression[]): FilterExpression {\n if (expressions.length === 0) {\n throw new Error(\"AND operator requires at least one expression\");\n }\n if (expressions.length === 1 && expressions[0] !== undefined) {\n return expressions[0];\n }\n return new FilterExpression(\"and\", expressions);\n}\n\n/**\n * OR operator - combines multiple filter expressions with logical OR.\n * At least one expression must be true for the record to match.\n *\n * @example\n * or(\n * eq(users.role, \"admin\"),\n * eq(users.role, \"moderator\")\n * ) // role is \"admin\" OR \"moderator\"\n */\nexport function or(...expressions: FilterExpression[]): FilterExpression {\n if (expressions.length === 0) {\n throw new Error(\"OR operator requires at least one expression\");\n }\n if (expressions.length === 1 && expressions[0] !== undefined) {\n return expressions[0];\n }\n return new FilterExpression(\"or\", expressions);\n}\n\n/**\n * NOT operator - negates a filter expression.\n *\n * @example\n * not(eq(users.status, \"deleted\")) // status is NOT \"deleted\"\n */\nexport function not(expression: FilterExpression): FilterExpression {\n return new FilterExpression(\"not\", [expression]);\n}\n\n// ============================================================================\n// OrderBy Operators\n// ============================================================================\n\n/**\n * OrderByExpression represents a sort order specification for a column.\n * Used in orderBy() clauses to provide type-safe sorting with direction.\n */\nexport class OrderByExpression<TableName extends string = string> {\n constructor(\n public readonly column: Column<any, any, TableName>,\n public readonly direction: \"asc\" | \"desc\",\n ) {}\n}\n\n/**\n * Type guard to check if a value is an OrderByExpression instance.\n */\nexport function isOrderByExpression(value: any): value is OrderByExpression {\n return value instanceof OrderByExpression;\n}\n\n/**\n * Ascending order operator - sorts a column in ascending order.\n *\n * @example\n * asc(users.name) // Sort by name ascending\n */\nexport function asc<TableName extends string>(\n column: Column<any, any, TableName>,\n): OrderByExpression<TableName> {\n return new OrderByExpression(column, \"asc\");\n}\n\n/**\n * Descending order operator - sorts a column in descending order.\n *\n * @example\n * desc(users.age) // Sort by age descending\n */\nexport function desc<TableName extends string>(\n column: Column<any, any, TableName>,\n): OrderByExpression<TableName> {\n return new OrderByExpression(column, \"desc\");\n}\n"],"names":[],"mappings":"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"}
|
package/dist/esm/orm/table.d.ts
CHANGED
|
@@ -89,7 +89,7 @@ export declare class FMTable<TFields extends Record<string, FieldBuilder<any, an
|
|
|
89
89
|
/** @internal */
|
|
90
90
|
[FMTableNavigationPaths]: TNavigationPaths;
|
|
91
91
|
/** @internal */
|
|
92
|
-
[FMTableDefaultSelect]: "all" | "schema" | Record<string, Column<any, TName>>;
|
|
92
|
+
[FMTableDefaultSelect]: "all" | "schema" | Record<string, Column<any, any, TName>>;
|
|
93
93
|
/** @internal */
|
|
94
94
|
[FMTableBaseTableConfig]: {
|
|
95
95
|
schema: Record<keyof TFields, StandardSchemaV1>;
|
|
@@ -107,7 +107,7 @@ export declare class FMTable<TFields extends Record<string, FieldBuilder<any, an
|
|
|
107
107
|
schema: StandardSchemaV1<any, InferSchemaFromFields<TFields>>;
|
|
108
108
|
fields: TFields;
|
|
109
109
|
navigationPaths: TNavigationPaths;
|
|
110
|
-
defaultSelect: "all" | "schema" | Record<string, Column<any, TName>>;
|
|
110
|
+
defaultSelect: "all" | "schema" | Record<string, Column<any, any, TName>>;
|
|
111
111
|
baseTableConfig: {
|
|
112
112
|
schema: Record<keyof TFields, StandardSchemaV1>;
|
|
113
113
|
inputSchema?: Record<keyof TFields, StandardSchemaV1>;
|
|
@@ -123,25 +123,26 @@ export declare class FMTable<TFields extends Record<string, FieldBuilder<any, an
|
|
|
123
123
|
* Type helper to extract the column map from fields.
|
|
124
124
|
* Table name is baked into each column type for validation.
|
|
125
125
|
* Container fields are marked with IsContainer=true.
|
|
126
|
+
* Columns include both output type (for reading) and input type (for writing/filtering).
|
|
126
127
|
*/
|
|
127
128
|
export type ColumnMap<TFields extends Record<string, FieldBuilder<any, any, any, any>>, TName extends string> = {
|
|
128
|
-
[K in keyof TFields]: Column<InferFieldOutput<TFields[K]>, TName, IsContainerField<TFields[K]>>;
|
|
129
|
+
[K in keyof TFields]: Column<InferFieldOutput<TFields[K]>, InferFieldInput<TFields[K]>, TName, IsContainerField<TFields[K]>>;
|
|
129
130
|
};
|
|
130
131
|
/**
|
|
131
132
|
* Extract only selectable (non-container) columns from a table.
|
|
132
133
|
* This is used to prevent selecting container fields in queries.
|
|
133
134
|
*/
|
|
134
135
|
export type SelectableColumnMap<TFields extends Record<string, FieldBuilder<any, any, any, any>>, TName extends string> = {
|
|
135
|
-
[K in SelectableFieldKeys<TFields>]: Column<InferFieldOutput<TFields[K]>, TName, false>;
|
|
136
|
+
[K in SelectableFieldKeys<TFields>]: Column<InferFieldOutput<TFields[K]>, InferFieldInput<TFields[K]>, TName, false>;
|
|
136
137
|
};
|
|
137
138
|
/**
|
|
138
139
|
* Validates that a select object doesn't contain container field columns.
|
|
139
140
|
* Returns never if any container fields are found, otherwise returns the original type.
|
|
140
141
|
*/
|
|
141
|
-
export type ValidateNoContainerFields<TSelect extends Record<string, Column<any, any, any>>> = {
|
|
142
|
-
[K in keyof TSelect]: TSelect[K] extends Column<any, any, true> ? never : TSelect[K];
|
|
142
|
+
export type ValidateNoContainerFields<TSelect extends Record<string, Column<any, any, any, any>>> = {
|
|
143
|
+
[K in keyof TSelect]: TSelect[K] extends Column<any, any, any, true> ? never : TSelect[K];
|
|
143
144
|
} extends TSelect ? TSelect : {
|
|
144
|
-
[K in keyof TSelect]: TSelect[K] extends Column<any, any, true> ? "❌ Container fields cannot be selected. Use .getSingleField() instead." : TSelect[K];
|
|
145
|
+
[K in keyof TSelect]: TSelect[K] extends Column<any, any, any, true> ? "❌ Container fields cannot be selected. Use .getSingleField() instead." : TSelect[K];
|
|
145
146
|
};
|
|
146
147
|
/**
|
|
147
148
|
* Complete table type with both metadata (via Symbols) and column accessors.
|
|
@@ -162,7 +163,7 @@ export interface FMTableOccurrenceOptions<TFields extends Record<string, FieldBu
|
|
|
162
163
|
* - "schema": Select only schema-defined fields (default)
|
|
163
164
|
* - function: Custom selection from columns
|
|
164
165
|
*/
|
|
165
|
-
defaultSelect?: "all" | "schema" | ((columns: ColumnMap<TFields, TName>) => Record<string, Column<any, TName>>);
|
|
166
|
+
defaultSelect?: "all" | "schema" | ((columns: ColumnMap<TFields, TName>) => Record<string, Column<any, any, TName>>);
|
|
166
167
|
/** Navigation paths available from this table (for expand operations) */
|
|
167
168
|
navigationPaths?: readonly string[];
|
|
168
169
|
/** Whether to use entity IDs (FMTID/FMFID) instead of names in queries */
|
|
@@ -283,7 +284,7 @@ export declare function getNavigationPaths<T extends FMTable<any, any>>(table: T
|
|
|
283
284
|
* @param table - FMTable instance
|
|
284
285
|
* @returns Default select configuration
|
|
285
286
|
*/
|
|
286
|
-
export declare function getDefaultSelect<T extends FMTable<any, any>>(table: T): "all" | "schema" | Record<string, Column<any, any, false>>;
|
|
287
|
+
export declare function getDefaultSelect<T extends FMTable<any, any>>(table: T): "all" | "schema" | Record<string, Column<any, any, any, false>>;
|
|
287
288
|
/**
|
|
288
289
|
* Get the base table configuration from an FMTable instance.
|
|
289
290
|
* This provides access to schema, idField, required fields, readOnly fields, and field IDs.
|
package/dist/esm/orm/table.js
CHANGED
|
@@ -119,7 +119,8 @@ function fmTableOccurrence(name, fields, options) {
|
|
|
119
119
|
fieldName: String(fieldName),
|
|
120
120
|
entityId: config.entityId,
|
|
121
121
|
tableName: name,
|
|
122
|
-
tableEntityId: options == null ? void 0 : options.entityId
|
|
122
|
+
tableEntityId: options == null ? void 0 : options.entityId,
|
|
123
|
+
inputValidator: config.inputValidator
|
|
123
124
|
});
|
|
124
125
|
}
|
|
125
126
|
const defaultSelectOption = (options == null ? void 0 : options.defaultSelect) ?? "schema";
|
|
@@ -185,12 +186,13 @@ function getTableColumns(table) {
|
|
|
185
186
|
const baseConfig = table[FMTableBaseTableConfig];
|
|
186
187
|
const columns = {};
|
|
187
188
|
for (const [fieldName, builder] of Object.entries(fields)) {
|
|
188
|
-
builder._getConfig();
|
|
189
|
+
const config = builder._getConfig();
|
|
189
190
|
columns[fieldName] = new Column({
|
|
190
191
|
fieldName: String(fieldName),
|
|
191
192
|
entityId: (_a2 = baseConfig.fmfIds) == null ? void 0 : _a2[fieldName],
|
|
192
193
|
tableName,
|
|
193
|
-
tableEntityId
|
|
194
|
+
tableEntityId,
|
|
195
|
+
inputValidator: config.inputValidator
|
|
194
196
|
});
|
|
195
197
|
}
|
|
196
198
|
return columns;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sources":["../../../src/orm/table.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { FieldBuilder, type ContainerDbType } from \"./field-builders\";\nimport type { FieldBuilder as FieldBuilderType } from \"./field-builders\";\nimport { Column } from \"./column\";\nimport { z } from \"zod/v4\";\n\n/**\n * Extract the output type from a FieldBuilder.\n * This is what you get when reading from the database.\n *\n * This type extracts the TOutput type parameter, which is set by readValidator()\n * and represents the transformed/validated output type.\n */\nexport type InferFieldOutput<F> =\n F extends FieldBuilder<infer TOutput, any, any, any> ? TOutput : never;\n\n/**\n * Extract the input type from a FieldBuilder.\n * This is what you pass when writing to the database.\n *\n * This type extracts the TInput type parameter, which is set by writeValidator()\n * and represents the transformed/validated input type.\n */\ntype InferFieldInput<F> =\n F extends FieldBuilder<any, infer TInput, any, any> ? TInput : never;\n\n/**\n * Build a schema type from field builders (output/read types).\n */\ntype InferSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: InferFieldOutput<TFields[K]>;\n};\n\n/**\n * Build an input schema type from field builders (input/write types).\n * Used for insert and update operations.\n */\ntype InferInputSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: InferFieldInput<TFields[K]>;\n};\n\n/**\n * Check if a field is a container field by inspecting its TDbType.\n * Container fields have a branded TDbType that extends ContainerDbType.\n */\ntype IsContainerField<F> =\n F extends FieldBuilder<any, any, infer TDbType, any>\n ? NonNullable<TDbType> extends ContainerDbType\n ? true\n : false\n : false;\n\n/**\n * Extract only selectable (non-container) field keys from a fields record.\n * Container fields are excluded because they cannot be selected via $select in FileMaker OData.\n */\ntype SelectableFieldKeys<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: IsContainerField<TFields[K]> extends true ? never : K;\n}[keyof TFields];\n\n/**\n * Build a schema type excluding container fields (for query return types).\n * This is used to ensure container fields don't appear in the return type\n * when using defaultSelect: \"schema\" or \"all\".\n */\ntype InferSelectableSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in SelectableFieldKeys<TFields>]: InferFieldOutput<TFields[K]>;\n};\n\n/**\n * Internal Symbols for table properties (hidden from IDE autocomplete).\n * These are used to store internal configuration that shouldn't be visible\n * when users access table columns.\n * @internal - Not exported from public API, only accessible via FMTable.Symbol\n */\nconst FMTableName = Symbol.for(\"fmodata:FMTableName\");\nconst FMTableEntityId = Symbol.for(\"fmodata:FMTableEntityId\");\nconst FMTableSchema = Symbol.for(\"fmodata:FMTableSchema\");\nconst FMTableFields = Symbol.for(\"fmodata:FMTableFields\");\nconst FMTableNavigationPaths = Symbol.for(\"fmodata:FMTableNavigationPaths\");\nconst FMTableDefaultSelect = Symbol.for(\"fmodata:FMTableDefaultSelect\");\nconst FMTableBaseTableConfig = Symbol.for(\"fmodata:FMTableBaseTableConfig\");\nconst FMTableUseEntityIds = Symbol.for(\"fmodata:FMTableUseEntityIds\");\n\n/**\n * Base table class with Symbol-based internal properties.\n * This follows the Drizzle ORM pattern where internal configuration\n * is stored via Symbols, keeping it hidden from IDE autocomplete.\n */\nexport class FMTable<\n TFields extends Record<string, FieldBuilder<any, any, any, any>> = any,\n TName extends string = string,\n TNavigationPaths extends readonly string[] = readonly string[],\n> {\n /**\n * Internal Symbols for accessing table metadata.\n * @internal - Not intended for public use. Access table properties via columns instead.\n */\n static readonly Symbol = {\n Name: FMTableName,\n EntityId: FMTableEntityId,\n UseEntityIds: FMTableUseEntityIds,\n Schema: FMTableSchema,\n Fields: FMTableFields,\n NavigationPaths: FMTableNavigationPaths,\n DefaultSelect: FMTableDefaultSelect,\n BaseTableConfig: FMTableBaseTableConfig,\n };\n\n /** @internal */\n [FMTableName]: TName;\n\n /** @internal */\n [FMTableEntityId]?: `FMTID:${string}`;\n\n /** @internal */\n [FMTableUseEntityIds]?: boolean;\n\n /** @internal */\n [FMTableSchema]: StandardSchemaV1<any, InferSchemaFromFields<TFields>>;\n\n /** @internal */\n [FMTableFields]: TFields;\n\n /** @internal */\n [FMTableNavigationPaths]: TNavigationPaths;\n\n /** @internal */\n [FMTableDefaultSelect]: \"all\" | \"schema\" | Record<string, Column<any, TName>>;\n\n /** @internal */\n [FMTableBaseTableConfig]: {\n schema: Record<keyof TFields, StandardSchemaV1>;\n inputSchema?: Record<keyof TFields, StandardSchemaV1>;\n idField?: keyof TFields;\n required: readonly (keyof TFields)[];\n readOnly: readonly (keyof TFields)[];\n containerFields: readonly (keyof TFields)[];\n fmfIds?: Record<keyof TFields, `FMFID:${string}`>;\n };\n\n constructor(config: {\n name: TName;\n entityId?: `FMTID:${string}`;\n useEntityIds?: boolean;\n schema: StandardSchemaV1<any, InferSchemaFromFields<TFields>>;\n fields: TFields;\n navigationPaths: TNavigationPaths;\n defaultSelect: \"all\" | \"schema\" | Record<string, Column<any, TName>>;\n baseTableConfig: {\n schema: Record<keyof TFields, StandardSchemaV1>;\n inputSchema?: Record<keyof TFields, StandardSchemaV1>;\n idField?: keyof TFields;\n required: readonly (keyof TFields)[];\n readOnly: readonly (keyof TFields)[];\n containerFields: readonly (keyof TFields)[];\n fmfIds?: Record<keyof TFields, `FMFID:${string}`>;\n };\n }) {\n this[FMTableName] = config.name;\n this[FMTableEntityId] = config.entityId;\n this[FMTableUseEntityIds] = config.useEntityIds;\n this[FMTableSchema] = config.schema;\n this[FMTableFields] = config.fields;\n this[FMTableNavigationPaths] = config.navigationPaths;\n this[FMTableDefaultSelect] = config.defaultSelect;\n this[FMTableBaseTableConfig] = config.baseTableConfig;\n }\n}\n\n/**\n * Type helper to extract the column map from fields.\n * Table name is baked into each column type for validation.\n * Container fields are marked with IsContainer=true.\n */\nexport type ColumnMap<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = {\n [K in keyof TFields]: Column<\n InferFieldOutput<TFields[K]>,\n TName,\n IsContainerField<TFields[K]>\n >;\n};\n\n/**\n * Extract only selectable (non-container) columns from a table.\n * This is used to prevent selecting container fields in queries.\n */\nexport type SelectableColumnMap<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = {\n [K in SelectableFieldKeys<TFields>]: Column<\n InferFieldOutput<TFields[K]>,\n TName,\n false\n >;\n};\n\n/**\n * Validates that a select object doesn't contain container field columns.\n * Returns never if any container fields are found, otherwise returns the original type.\n */\nexport type ValidateNoContainerFields<\n TSelect extends Record<string, Column<any, any, any>>,\n> = {\n [K in keyof TSelect]: TSelect[K] extends Column<any, any, true>\n ? never\n : TSelect[K];\n} extends TSelect\n ? TSelect\n : {\n [K in keyof TSelect]: TSelect[K] extends Column<any, any, true>\n ? \"❌ Container fields cannot be selected. Use .getSingleField() instead.\"\n : TSelect[K];\n };\n\n/**\n * Extract the keys from a defaultSelect function's return type.\n * Used to infer which fields are selected by default for type narrowing.\n */\ntype ExtractDefaultSelectKeys<\n TDefaultSelect,\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = TDefaultSelect extends (columns: ColumnMap<TFields, TName>) => infer R\n ? keyof R\n : TDefaultSelect extends \"schema\"\n ? keyof TFields\n : keyof TFields; // \"all\" defaults to all keys\n\n/**\n * Complete table type with both metadata (via Symbols) and column accessors.\n * This is the return type of fmTableOccurrence - users see columns directly,\n * but internal config is hidden via Symbols.\n */\nexport type FMTableWithColumns<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n TNavigationPaths extends readonly string[] = readonly string[],\n> = FMTable<TFields, TName, TNavigationPaths> & ColumnMap<TFields, TName>;\n\n/**\n * Options for fmTableOccurrence function.\n * Provides autocomplete-friendly typing while preserving inference for navigationPaths.\n */\nexport interface FMTableOccurrenceOptions<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> {\n /** The entity ID (FMTID) for this table occurrence */\n entityId?: `FMTID:${string}`;\n\n /**\n * Default select behavior:\n * - \"all\": Select all fields (including related tables)\n * - \"schema\": Select only schema-defined fields (default)\n * - function: Custom selection from columns\n */\n defaultSelect?:\n | \"all\"\n | \"schema\"\n | ((\n columns: ColumnMap<TFields, TName>,\n ) => Record<string, Column<any, TName>>);\n\n /** Navigation paths available from this table (for expand operations) */\n navigationPaths?: readonly string[];\n\n /** Whether to use entity IDs (FMTID/FMFID) instead of names in queries */\n useEntityIds?: boolean;\n}\n\n/**\n * Create a table occurrence with field builders.\n * This is the main API for defining tables in the new ORM style.\n *\n * @example\n * const users = fmTableOccurrence(\"users\", {\n * id: textField().primaryKey().entityId(\"FMFID:1\"),\n * name: textField().notNull().entityId(\"FMFID:6\"),\n * active: numberField()\n * .outputValidator(z.coerce.boolean())\n * .inputValidator(z.boolean().transform(v => v ? 1 : 0))\n * .entityId(\"FMFID:7\"),\n * }, {\n * entityId: \"FMTID:100\",\n * defaultSelect: \"schema\",\n * navigationPaths: [\"contacts\"],\n * });\n *\n * // Access columns\n * users.id // Column<string, \"id\">\n * users.name // Column<string, \"name\">\n *\n * // Use in queries\n * db.from(users).select(\"id\", \"name\").where(eq(users.active, true))\n */\nexport function fmTableOccurrence<\n const TName extends string,\n const TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n const TNavPaths extends readonly string[] = readonly [],\n>(\n name: TName,\n fields: TFields,\n options?: FMTableOccurrenceOptions<TFields, TName> & {\n /** Navigation paths available from this table (for expand operations) */\n navigationPaths?: TNavPaths;\n },\n): FMTableWithColumns<TFields, TName, TNavPaths> {\n // Extract configuration from field builders\n const fieldConfigs = Object.entries(fields).map(([fieldName, builder]) => ({\n fieldName,\n config: (builder as any)._getConfig(),\n }));\n\n // Find primary key field\n const primaryKeyField = fieldConfigs.find((f) => f.config.primaryKey);\n const idField = primaryKeyField?.fieldName;\n\n // Collect required fields (notNull fields)\n const required = fieldConfigs\n .filter((f) => f.config.notNull)\n .map((f) => f.fieldName);\n\n // Collect read-only fields\n const readOnly = fieldConfigs\n .filter((f) => f.config.readOnly)\n .map((f) => f.fieldName);\n\n // Collect container fields (cannot be selected via $select)\n const containerFields = fieldConfigs\n .filter((f) => f.config.fieldType === \"container\")\n .map((f) => f.fieldName);\n\n // Collect entity IDs\n const fmfIds: Record<string, `FMFID:${string}`> = {};\n for (const { fieldName, config } of fieldConfigs) {\n if (config.entityId) {\n fmfIds[fieldName] = config.entityId;\n }\n }\n\n // Build Zod schema from field builders (output/read validators)\n const zodSchema: Record<string, StandardSchemaV1> = {};\n // Build input schema from field builders (input/write validators)\n const inputSchema: Record<string, StandardSchemaV1> = {};\n\n for (const { fieldName, config } of fieldConfigs) {\n // Use outputValidator if provided, otherwise create a basic validator\n if (config.outputValidator) {\n zodSchema[fieldName] = config.outputValidator;\n } else {\n // Create a default validator based on field type and nullability\n let validator: any;\n switch (config.fieldType) {\n case \"text\":\n case \"date\":\n case \"time\":\n case \"timestamp\":\n case \"container\":\n case \"calculated\":\n validator = z.string();\n break;\n case \"number\":\n validator = z.number();\n break;\n default:\n validator = z.unknown();\n }\n\n // Add nullability if not marked as notNull\n if (!config.notNull) {\n validator = validator.nullable();\n }\n\n zodSchema[fieldName] = validator;\n }\n\n // Store inputValidator if provided (for write operations)\n if (config.inputValidator) {\n inputSchema[fieldName] = config.inputValidator;\n }\n }\n\n // Create a schema validator for the entire table\n const tableSchema = z.object(zodSchema) as unknown as StandardSchemaV1<\n any,\n InferSchemaFromFields<TFields>\n >;\n\n // Build BaseTable-compatible config\n const baseTableConfig = {\n schema: zodSchema as Record<keyof TFields, StandardSchemaV1>,\n inputSchema: (Object.keys(inputSchema).length > 0\n ? inputSchema\n : undefined) as Record<keyof TFields, StandardSchemaV1> | undefined,\n idField: idField as keyof TFields | undefined,\n required: required as readonly (keyof TFields)[],\n readOnly: readOnly as readonly (keyof TFields)[],\n containerFields: containerFields as readonly (keyof TFields)[],\n fmfIds: (Object.keys(fmfIds).length > 0 ? fmfIds : undefined) as\n | Record<keyof TFields, `FMFID:${string}`>\n | undefined,\n };\n\n // Create column instances\n const columns: Record<string, Column> = {};\n for (const [fieldName, builder] of Object.entries(fields)) {\n const config = (builder as any)._getConfig();\n columns[fieldName] = new Column({\n fieldName: String(fieldName),\n entityId: config.entityId,\n tableName: name,\n tableEntityId: options?.entityId,\n });\n }\n\n // Resolve defaultSelect: if it's a function, call it with columns; otherwise use as-is\n const defaultSelectOption = options?.defaultSelect ?? \"schema\";\n const resolvedDefaultSelect:\n | \"all\"\n | \"schema\"\n | Record<string, Column<any, TName>> =\n typeof defaultSelectOption === \"function\"\n ? defaultSelectOption(columns as ColumnMap<TFields, TName>)\n : defaultSelectOption;\n\n // Create the FMTable instance with Symbol-based internal properties\n const navigationPaths = (options?.navigationPaths ?? []) as TNavPaths;\n const table = new FMTable<TFields, TName, TNavPaths>({\n name,\n entityId: options?.entityId,\n useEntityIds: options?.useEntityIds,\n schema: tableSchema,\n fields,\n navigationPaths,\n defaultSelect: resolvedDefaultSelect,\n baseTableConfig,\n });\n\n // Assign columns to the table instance (making them accessible directly)\n Object.assign(table, columns);\n\n return table as FMTableWithColumns<TFields, TName, TNavPaths>;\n}\n\n// /**\n// * Type guard to check if a value is a TableOccurrence or FMTable.\n// * Supports both Symbol-based (new) and underscore-prefixed (legacy) formats.\n// */\n// function isTableOccurrence(value: any): value is TableOccurrence {\n// if (!value || typeof value !== \"object\") {\n// return false;\n// }\n\n// // Check for Symbol-based format (new FMTable class)\n// if (\n// FMTableName in value &&\n// FMTableSchema in value &&\n// FMTableFields in value\n// ) {\n// return typeof value[FMTableName] === \"string\";\n// }\n\n// // Check for underscore-prefixed format (legacy interface)\n// if (\"_name\" in value && \"_schema\" in value && \"_fields\" in value) {\n// return typeof value._name === \"string\";\n// }\n\n// return false;\n// }\n\n/**\n * Helper to extract the schema type from a TableOccurrence or FMTable.\n */\nexport type InferTableSchema<T> =\n T extends FMTable<infer TFields, any>\n ? InferSchemaFromFields<TFields>\n : never;\n\n/**\n * Extract the schema type from an FMTable instance.\n * This is used to infer the schema from table objects passed to db.from(), expand(), etc.\n */\nexport type InferSchemaOutputFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? InferSchemaFromFields<TFields>\n : never;\n\n/**\n * Extract the input schema type from an FMTable instance.\n * This is used for insert and update operations where we need write types.\n */\nexport type InferInputSchemaFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? InferInputSchemaFromFields<TFields>\n : never;\n\n/**\n * Helper type to check if a FieldBuilder's input type excludes null and undefined.\n * This checks the TInput type parameter, which preserves nullability from notNull().\n */\ntype FieldInputExcludesNullish<F> =\n F extends FieldBuilder<any, infer TInput, any>\n ? null extends TInput\n ? false\n : undefined extends TInput\n ? false\n : true\n : false;\n\n/**\n * Check if a FieldBuilder is readOnly at the type level\n */\ntype IsFieldReadOnly<F> =\n F extends FieldBuilderType<any, any, any, infer ReadOnly>\n ? ReadOnly extends true\n ? true\n : false\n : false;\n\n/**\n * Compute insert data type from FMTable, making notNull fields required.\n * Fields are required if their FieldBuilder's TInput type excludes null/undefined.\n * All other fields are optional (can be omitted).\n * readOnly fields are excluded (including primaryKey/idField since they're automatically readOnly).\n */\nexport type InsertDataFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : FieldInputExcludesNullish<TFields[K]> extends true\n ? K\n : never]: InferFieldInput<TFields[K]>;\n } & {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : FieldInputExcludesNullish<TFields[K]> extends true\n ? never\n : K]?: InferFieldInput<TFields[K]>;\n }\n : never;\n\n/**\n * Compute update data type from FMTable.\n * All fields are optional, but readOnly fields are excluded (including primaryKey/idField).\n */\nexport type UpdateDataFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : K]?: InferFieldInput<TFields[K]>;\n }\n : never;\n\n/**\n * Extract the table name type from an FMTable.\n * This is a workaround since we can't directly index Symbols in types.\n */\nexport type ExtractTableName<T extends FMTable<any, any>> =\n T extends FMTable<any, infer Name> ? Name : never;\n\n/**\n * Validates that a target table's name matches one of the source table's navigationPaths.\n * Used to ensure type-safe expand/navigate operations.\n */\nexport type ValidExpandTarget<\n SourceTable extends FMTable<any, any, any> | undefined,\n TargetTable extends FMTable<any, any, any>,\n> =\n SourceTable extends FMTable<any, any, infer SourceNavPaths>\n ? ExtractTableName<TargetTable> extends SourceNavPaths[number]\n ? TargetTable\n : never\n : TargetTable;\n\n// ============================================================================\n// Helper Functions for Accessing FMTable Internal Properties\n// ============================================================================\n\n/**\n * Get the table name from an FMTable instance.\n * @param table - FMTable instance\n * @returns The table name\n */\nexport function getTableName<T extends FMTable<any, any>>(table: T): string {\n return table[FMTableName];\n}\n\n/**\n * Get the entity ID (FMTID) from an FMTable instance.\n * @param table - FMTable instance\n * @returns The entity ID or undefined if not using entity IDs\n */\nexport function getTableEntityId<T extends FMTable<any, any>>(\n table: T,\n): string | undefined {\n return table[FMTableEntityId];\n}\n\n/**\n * Get the schema validator from an FMTable instance.\n * @param table - FMTable instance\n * @returns The StandardSchemaV1 validator\n */\nexport function getTableSchema<T extends FMTable<any, any>>(\n table: T,\n): StandardSchemaV1 {\n return table[FMTableSchema];\n}\n\n/**\n * Get the fields from an FMTable instance.\n * @param table - FMTable instance\n * @returns The fields record\n */\nexport function getTableFields<T extends FMTable<any, any>>(table: T) {\n return table[FMTableFields];\n}\n\n/**\n * Get the navigation paths from an FMTable instance.\n * @param table - FMTable instance\n * @returns Array of navigation path names\n */\nexport function getNavigationPaths<T extends FMTable<any, any>>(\n table: T,\n): readonly string[] {\n return table[FMTableNavigationPaths];\n}\n\n/**\n * Get the default select configuration from an FMTable instance.\n * @param table - FMTable instance\n * @returns Default select configuration\n */\nexport function getDefaultSelect<T extends FMTable<any, any>>(table: T) {\n return table[FMTableDefaultSelect];\n}\n\n/**\n * Get the base table configuration from an FMTable instance.\n * This provides access to schema, idField, required fields, readOnly fields, and field IDs.\n * @param table - FMTable instance\n * @returns Base table configuration object\n */\nexport function getBaseTableConfig<T extends FMTable<any, any>>(table: T) {\n return table[FMTableBaseTableConfig];\n}\n\n/**\n * Check if an FMTable instance is using entity IDs (both FMTID and FMFIDs).\n * @param table - FMTable instance\n * @returns True if using entity IDs, false otherwise\n */\nexport function isUsingEntityIds<T extends FMTable<any, any>>(\n table: T,\n): boolean {\n return (\n table[FMTableEntityId] !== undefined &&\n table[FMTableBaseTableConfig].fmfIds !== undefined\n );\n}\n\n/**\n * Get the field ID (FMFID) for a given field name, or the field name itself if not using IDs.\n * @param table - FMTable instance\n * @param fieldName - Field name to get the ID for\n * @returns The FMFID string or the original field name\n */\nexport function getFieldId<T extends FMTable<any, any>>(\n table: T,\n fieldName: string,\n): string {\n const config = table[FMTableBaseTableConfig];\n if (config.fmfIds && fieldName in config.fmfIds) {\n const fieldId = config.fmfIds[fieldName];\n if (fieldId) {\n return fieldId;\n }\n }\n return fieldName;\n}\n\n/**\n * Get the field name for a given field ID (FMFID), or the ID itself if not found.\n * @param table - FMTable instance\n * @param fieldId - The FMFID to get the field name for\n * @returns The field name or the original ID\n */\nexport function getFieldName<T extends FMTable<any, any>>(\n table: T,\n fieldId: string,\n): string {\n const config = table[FMTableBaseTableConfig];\n if (config.fmfIds) {\n for (const [fieldName, fmfId] of Object.entries(config.fmfIds)) {\n if (fmfId === fieldId) {\n return fieldName;\n }\n }\n }\n return fieldId;\n}\n/**\n * Get the table ID (FMTID or name) from an FMTable instance.\n * Returns the FMTID if available, otherwise returns the table name.\n * @param table - FMTable instance\n * @returns The FMTID string or the table name\n */\nexport function getTableId<T extends FMTable<any, any>>(table: T): string {\n return table[FMTableEntityId] ?? table[FMTableName];\n}\n\n/**\n * Get all columns from a table as an object.\n * Useful for selecting all fields except some using destructuring.\n *\n * @example\n * const { password, ...cols } = getTableColumns(users)\n * db.from(users).list().select(cols)\n *\n * @param table - FMTable instance\n * @returns Object with all columns from the table\n */\nexport function getTableColumns<T extends FMTableWithColumns<any, any>>(\n table: T,\n): ColumnMap<T[typeof FMTableFields], ExtractTableName<T>> {\n const fields = table[FMTableFields];\n const tableName = table[FMTableName];\n const tableEntityId = table[FMTableEntityId];\n const baseConfig = table[FMTableBaseTableConfig];\n\n const columns: Record<string, Column> = {};\n for (const [fieldName, builder] of Object.entries(fields)) {\n const config = (builder as any)._getConfig();\n columns[fieldName] = new Column({\n fieldName: String(fieldName),\n entityId: baseConfig.fmfIds?.[fieldName],\n tableName: tableName,\n tableEntityId: tableEntityId,\n });\n }\n\n return columns as ColumnMap<T[typeof FMTableFields], ExtractTableName<T>>;\n}\n"],"names":["_a"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"table.js","sources":["../../../src/orm/table.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { FieldBuilder, type ContainerDbType } from \"./field-builders\";\nimport type { FieldBuilder as FieldBuilderType } from \"./field-builders\";\nimport { Column, createColumn } from \"./column\";\nimport { z } from \"zod/v4\";\n\n/**\n * Extract the output type from a FieldBuilder.\n * This is what you get when reading from the database.\n *\n * This type extracts the TOutput type parameter, which is set by readValidator()\n * and represents the transformed/validated output type.\n */\nexport type InferFieldOutput<F> =\n F extends FieldBuilder<infer TOutput, any, any, any> ? TOutput : never;\n\n/**\n * Extract the input type from a FieldBuilder.\n * This is what you pass when writing to the database.\n *\n * This type extracts the TInput type parameter, which is set by writeValidator()\n * and represents the transformed/validated input type.\n */\ntype InferFieldInput<F> =\n F extends FieldBuilder<any, infer TInput, any, any> ? TInput : never;\n\n/**\n * Build a schema type from field builders (output/read types).\n */\ntype InferSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: InferFieldOutput<TFields[K]>;\n};\n\n/**\n * Build an input schema type from field builders (input/write types).\n * Used for insert and update operations.\n */\ntype InferInputSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: InferFieldInput<TFields[K]>;\n};\n\n/**\n * Check if a field is a container field by inspecting its TDbType.\n * Container fields have a branded TDbType that extends ContainerDbType.\n */\ntype IsContainerField<F> =\n F extends FieldBuilder<any, any, infer TDbType, any>\n ? NonNullable<TDbType> extends ContainerDbType\n ? true\n : false\n : false;\n\n/**\n * Extract only selectable (non-container) field keys from a fields record.\n * Container fields are excluded because they cannot be selected via $select in FileMaker OData.\n */\ntype SelectableFieldKeys<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in keyof TFields]: IsContainerField<TFields[K]> extends true ? never : K;\n}[keyof TFields];\n\n/**\n * Build a schema type excluding container fields (for query return types).\n * This is used to ensure container fields don't appear in the return type\n * when using defaultSelect: \"schema\" or \"all\".\n */\ntype InferSelectableSchemaFromFields<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n> = {\n [K in SelectableFieldKeys<TFields>]: InferFieldOutput<TFields[K]>;\n};\n\n/**\n * Internal Symbols for table properties (hidden from IDE autocomplete).\n * These are used to store internal configuration that shouldn't be visible\n * when users access table columns.\n * @internal - Not exported from public API, only accessible via FMTable.Symbol\n */\nconst FMTableName = Symbol.for(\"fmodata:FMTableName\");\nconst FMTableEntityId = Symbol.for(\"fmodata:FMTableEntityId\");\nconst FMTableSchema = Symbol.for(\"fmodata:FMTableSchema\");\nconst FMTableFields = Symbol.for(\"fmodata:FMTableFields\");\nconst FMTableNavigationPaths = Symbol.for(\"fmodata:FMTableNavigationPaths\");\nconst FMTableDefaultSelect = Symbol.for(\"fmodata:FMTableDefaultSelect\");\nconst FMTableBaseTableConfig = Symbol.for(\"fmodata:FMTableBaseTableConfig\");\nconst FMTableUseEntityIds = Symbol.for(\"fmodata:FMTableUseEntityIds\");\n\n/**\n * Base table class with Symbol-based internal properties.\n * This follows the Drizzle ORM pattern where internal configuration\n * is stored via Symbols, keeping it hidden from IDE autocomplete.\n */\nexport class FMTable<\n TFields extends Record<string, FieldBuilder<any, any, any, any>> = any,\n TName extends string = string,\n TNavigationPaths extends readonly string[] = readonly string[],\n> {\n /**\n * Internal Symbols for accessing table metadata.\n * @internal - Not intended for public use. Access table properties via columns instead.\n */\n static readonly Symbol = {\n Name: FMTableName,\n EntityId: FMTableEntityId,\n UseEntityIds: FMTableUseEntityIds,\n Schema: FMTableSchema,\n Fields: FMTableFields,\n NavigationPaths: FMTableNavigationPaths,\n DefaultSelect: FMTableDefaultSelect,\n BaseTableConfig: FMTableBaseTableConfig,\n };\n\n /** @internal */\n [FMTableName]: TName;\n\n /** @internal */\n [FMTableEntityId]?: `FMTID:${string}`;\n\n /** @internal */\n [FMTableUseEntityIds]?: boolean;\n\n /** @internal */\n [FMTableSchema]: StandardSchemaV1<any, InferSchemaFromFields<TFields>>;\n\n /** @internal */\n [FMTableFields]: TFields;\n\n /** @internal */\n [FMTableNavigationPaths]: TNavigationPaths;\n\n /** @internal */\n [FMTableDefaultSelect]:\n | \"all\"\n | \"schema\"\n | Record<string, Column<any, any, TName>>;\n\n /** @internal */\n [FMTableBaseTableConfig]: {\n schema: Record<keyof TFields, StandardSchemaV1>;\n inputSchema?: Record<keyof TFields, StandardSchemaV1>;\n idField?: keyof TFields;\n required: readonly (keyof TFields)[];\n readOnly: readonly (keyof TFields)[];\n containerFields: readonly (keyof TFields)[];\n fmfIds?: Record<keyof TFields, `FMFID:${string}`>;\n };\n\n constructor(config: {\n name: TName;\n entityId?: `FMTID:${string}`;\n useEntityIds?: boolean;\n schema: StandardSchemaV1<any, InferSchemaFromFields<TFields>>;\n fields: TFields;\n navigationPaths: TNavigationPaths;\n defaultSelect: \"all\" | \"schema\" | Record<string, Column<any, any, TName>>;\n baseTableConfig: {\n schema: Record<keyof TFields, StandardSchemaV1>;\n inputSchema?: Record<keyof TFields, StandardSchemaV1>;\n idField?: keyof TFields;\n required: readonly (keyof TFields)[];\n readOnly: readonly (keyof TFields)[];\n containerFields: readonly (keyof TFields)[];\n fmfIds?: Record<keyof TFields, `FMFID:${string}`>;\n };\n }) {\n this[FMTableName] = config.name;\n this[FMTableEntityId] = config.entityId;\n this[FMTableUseEntityIds] = config.useEntityIds;\n this[FMTableSchema] = config.schema;\n this[FMTableFields] = config.fields;\n this[FMTableNavigationPaths] = config.navigationPaths;\n this[FMTableDefaultSelect] = config.defaultSelect;\n this[FMTableBaseTableConfig] = config.baseTableConfig;\n }\n}\n\n/**\n * Type helper to extract the column map from fields.\n * Table name is baked into each column type for validation.\n * Container fields are marked with IsContainer=true.\n * Columns include both output type (for reading) and input type (for writing/filtering).\n */\nexport type ColumnMap<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = {\n [K in keyof TFields]: Column<\n InferFieldOutput<TFields[K]>,\n InferFieldInput<TFields[K]>,\n TName,\n IsContainerField<TFields[K]>\n >;\n};\n\n/**\n * Extract only selectable (non-container) columns from a table.\n * This is used to prevent selecting container fields in queries.\n */\nexport type SelectableColumnMap<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = {\n [K in SelectableFieldKeys<TFields>]: Column<\n InferFieldOutput<TFields[K]>,\n InferFieldInput<TFields[K]>,\n TName,\n false\n >;\n};\n\n/**\n * Validates that a select object doesn't contain container field columns.\n * Returns never if any container fields are found, otherwise returns the original type.\n */\nexport type ValidateNoContainerFields<\n TSelect extends Record<string, Column<any, any, any, any>>,\n> = {\n [K in keyof TSelect]: TSelect[K] extends Column<any, any, any, true>\n ? never\n : TSelect[K];\n} extends TSelect\n ? TSelect\n : {\n [K in keyof TSelect]: TSelect[K] extends Column<any, any, any, true>\n ? \"❌ Container fields cannot be selected. Use .getSingleField() instead.\"\n : TSelect[K];\n };\n\n/**\n * Extract the keys from a defaultSelect function's return type.\n * Used to infer which fields are selected by default for type narrowing.\n */\ntype ExtractDefaultSelectKeys<\n TDefaultSelect,\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> = TDefaultSelect extends (columns: ColumnMap<TFields, TName>) => infer R\n ? keyof R\n : TDefaultSelect extends \"schema\"\n ? keyof TFields\n : keyof TFields; // \"all\" defaults to all keys\n\n/**\n * Complete table type with both metadata (via Symbols) and column accessors.\n * This is the return type of fmTableOccurrence - users see columns directly,\n * but internal config is hidden via Symbols.\n */\nexport type FMTableWithColumns<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n TNavigationPaths extends readonly string[] = readonly string[],\n> = FMTable<TFields, TName, TNavigationPaths> & ColumnMap<TFields, TName>;\n\n/**\n * Options for fmTableOccurrence function.\n * Provides autocomplete-friendly typing while preserving inference for navigationPaths.\n */\nexport interface FMTableOccurrenceOptions<\n TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n TName extends string,\n> {\n /** The entity ID (FMTID) for this table occurrence */\n entityId?: `FMTID:${string}`;\n\n /**\n * Default select behavior:\n * - \"all\": Select all fields (including related tables)\n * - \"schema\": Select only schema-defined fields (default)\n * - function: Custom selection from columns\n */\n defaultSelect?:\n | \"all\"\n | \"schema\"\n | ((\n columns: ColumnMap<TFields, TName>,\n ) => Record<string, Column<any, any, TName>>);\n\n /** Navigation paths available from this table (for expand operations) */\n navigationPaths?: readonly string[];\n\n /** Whether to use entity IDs (FMTID/FMFID) instead of names in queries */\n useEntityIds?: boolean;\n}\n\n/**\n * Create a table occurrence with field builders.\n * This is the main API for defining tables in the new ORM style.\n *\n * @example\n * const users = fmTableOccurrence(\"users\", {\n * id: textField().primaryKey().entityId(\"FMFID:1\"),\n * name: textField().notNull().entityId(\"FMFID:6\"),\n * active: numberField()\n * .outputValidator(z.coerce.boolean())\n * .inputValidator(z.boolean().transform(v => v ? 1 : 0))\n * .entityId(\"FMFID:7\"),\n * }, {\n * entityId: \"FMTID:100\",\n * defaultSelect: \"schema\",\n * navigationPaths: [\"contacts\"],\n * });\n *\n * // Access columns\n * users.id // Column<string, \"id\">\n * users.name // Column<string, \"name\">\n *\n * // Use in queries\n * db.from(users).select(\"id\", \"name\").where(eq(users.active, true))\n */\nexport function fmTableOccurrence<\n const TName extends string,\n const TFields extends Record<string, FieldBuilder<any, any, any, any>>,\n const TNavPaths extends readonly string[] = readonly [],\n>(\n name: TName,\n fields: TFields,\n options?: FMTableOccurrenceOptions<TFields, TName> & {\n /** Navigation paths available from this table (for expand operations) */\n navigationPaths?: TNavPaths;\n },\n): FMTableWithColumns<TFields, TName, TNavPaths> {\n // Extract configuration from field builders\n const fieldConfigs = Object.entries(fields).map(([fieldName, builder]) => ({\n fieldName,\n config: (builder as any)._getConfig(),\n }));\n\n // Find primary key field\n const primaryKeyField = fieldConfigs.find((f) => f.config.primaryKey);\n const idField = primaryKeyField?.fieldName;\n\n // Collect required fields (notNull fields)\n const required = fieldConfigs\n .filter((f) => f.config.notNull)\n .map((f) => f.fieldName);\n\n // Collect read-only fields\n const readOnly = fieldConfigs\n .filter((f) => f.config.readOnly)\n .map((f) => f.fieldName);\n\n // Collect container fields (cannot be selected via $select)\n const containerFields = fieldConfigs\n .filter((f) => f.config.fieldType === \"container\")\n .map((f) => f.fieldName);\n\n // Collect entity IDs\n const fmfIds: Record<string, `FMFID:${string}`> = {};\n for (const { fieldName, config } of fieldConfigs) {\n if (config.entityId) {\n fmfIds[fieldName] = config.entityId;\n }\n }\n\n // Build Zod schema from field builders (output/read validators)\n const zodSchema: Record<string, StandardSchemaV1> = {};\n // Build input schema from field builders (input/write validators)\n const inputSchema: Record<string, StandardSchemaV1> = {};\n\n for (const { fieldName, config } of fieldConfigs) {\n // Use outputValidator if provided, otherwise create a basic validator\n if (config.outputValidator) {\n zodSchema[fieldName] = config.outputValidator;\n } else {\n // Create a default validator based on field type and nullability\n let validator: any;\n switch (config.fieldType) {\n case \"text\":\n case \"date\":\n case \"time\":\n case \"timestamp\":\n case \"container\":\n case \"calculated\":\n validator = z.string();\n break;\n case \"number\":\n validator = z.number();\n break;\n default:\n validator = z.unknown();\n }\n\n // Add nullability if not marked as notNull\n if (!config.notNull) {\n validator = validator.nullable();\n }\n\n zodSchema[fieldName] = validator;\n }\n\n // Store inputValidator if provided (for write operations)\n if (config.inputValidator) {\n inputSchema[fieldName] = config.inputValidator;\n }\n }\n\n // Create a schema validator for the entire table\n const tableSchema = z.object(zodSchema) as unknown as StandardSchemaV1<\n any,\n InferSchemaFromFields<TFields>\n >;\n\n // Build BaseTable-compatible config\n const baseTableConfig = {\n schema: zodSchema as Record<keyof TFields, StandardSchemaV1>,\n inputSchema: (Object.keys(inputSchema).length > 0\n ? inputSchema\n : undefined) as Record<keyof TFields, StandardSchemaV1> | undefined,\n idField: idField as keyof TFields | undefined,\n required: required as readonly (keyof TFields)[],\n readOnly: readOnly as readonly (keyof TFields)[],\n containerFields: containerFields as readonly (keyof TFields)[],\n fmfIds: (Object.keys(fmfIds).length > 0 ? fmfIds : undefined) as\n | Record<keyof TFields, `FMFID:${string}`>\n | undefined,\n };\n\n // Create column instances\n const columns = {} as ColumnMap<TFields, TName>;\n for (const [fieldName, builder] of Object.entries(fields)) {\n const config = (builder as any)._getConfig();\n (columns as any)[fieldName] = new Column({\n fieldName: String(fieldName),\n entityId: config.entityId,\n tableName: name,\n tableEntityId: options?.entityId,\n inputValidator: config.inputValidator,\n });\n }\n\n // Resolve defaultSelect: if it's a function, call it with columns; otherwise use as-is\n const defaultSelectOption = options?.defaultSelect ?? \"schema\";\n const resolvedDefaultSelect:\n | \"all\"\n | \"schema\"\n | Record<string, Column<any, any, TName>> =\n typeof defaultSelectOption === \"function\"\n ? defaultSelectOption(columns as ColumnMap<TFields, TName>)\n : defaultSelectOption;\n\n // Create the FMTable instance with Symbol-based internal properties\n const navigationPaths = (options?.navigationPaths ?? []) as TNavPaths;\n const table = new FMTable<TFields, TName, TNavPaths>({\n name,\n entityId: options?.entityId,\n useEntityIds: options?.useEntityIds,\n schema: tableSchema,\n fields,\n navigationPaths,\n defaultSelect: resolvedDefaultSelect,\n baseTableConfig,\n });\n\n // Assign columns to the table instance (making them accessible directly)\n Object.assign(table, columns);\n\n return table as FMTableWithColumns<TFields, TName, TNavPaths>;\n}\n\n// /**\n// * Type guard to check if a value is a TableOccurrence or FMTable.\n// * Supports both Symbol-based (new) and underscore-prefixed (legacy) formats.\n// */\n// function isTableOccurrence(value: any): value is TableOccurrence {\n// if (!value || typeof value !== \"object\") {\n// return false;\n// }\n\n// // Check for Symbol-based format (new FMTable class)\n// if (\n// FMTableName in value &&\n// FMTableSchema in value &&\n// FMTableFields in value\n// ) {\n// return typeof value[FMTableName] === \"string\";\n// }\n\n// // Check for underscore-prefixed format (legacy interface)\n// if (\"_name\" in value && \"_schema\" in value && \"_fields\" in value) {\n// return typeof value._name === \"string\";\n// }\n\n// return false;\n// }\n\n/**\n * Helper to extract the schema type from a TableOccurrence or FMTable.\n */\nexport type InferTableSchema<T> =\n T extends FMTable<infer TFields, any>\n ? InferSchemaFromFields<TFields>\n : never;\n\n/**\n * Extract the schema type from an FMTable instance.\n * This is used to infer the schema from table objects passed to db.from(), expand(), etc.\n */\nexport type InferSchemaOutputFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? InferSchemaFromFields<TFields>\n : never;\n\n/**\n * Extract the input schema type from an FMTable instance.\n * This is used for insert and update operations where we need write types.\n */\nexport type InferInputSchemaFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? InferInputSchemaFromFields<TFields>\n : never;\n\n/**\n * Helper type to check if a FieldBuilder's input type excludes null and undefined.\n * This checks the TInput type parameter, which preserves nullability from notNull().\n */\ntype FieldInputExcludesNullish<F> =\n F extends FieldBuilder<any, infer TInput, any>\n ? null extends TInput\n ? false\n : undefined extends TInput\n ? false\n : true\n : false;\n\n/**\n * Check if a FieldBuilder is readOnly at the type level\n */\ntype IsFieldReadOnly<F> =\n F extends FieldBuilderType<any, any, any, infer ReadOnly>\n ? ReadOnly extends true\n ? true\n : false\n : false;\n\n/**\n * Compute insert data type from FMTable, making notNull fields required.\n * Fields are required if their FieldBuilder's TInput type excludes null/undefined.\n * All other fields are optional (can be omitted).\n * readOnly fields are excluded (including primaryKey/idField since they're automatically readOnly).\n */\nexport type InsertDataFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : FieldInputExcludesNullish<TFields[K]> extends true\n ? K\n : never]: InferFieldInput<TFields[K]>;\n } & {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : FieldInputExcludesNullish<TFields[K]> extends true\n ? never\n : K]?: InferFieldInput<TFields[K]>;\n }\n : never;\n\n/**\n * Compute update data type from FMTable.\n * All fields are optional, but readOnly fields are excluded (including primaryKey/idField).\n */\nexport type UpdateDataFromFMTable<T extends FMTable<any, any>> =\n T extends FMTable<infer TFields, any>\n ? {\n [K in keyof TFields as IsFieldReadOnly<TFields[K]> extends true\n ? never\n : K]?: InferFieldInput<TFields[K]>;\n }\n : never;\n\n/**\n * Extract the table name type from an FMTable.\n * This is a workaround since we can't directly index Symbols in types.\n */\nexport type ExtractTableName<T extends FMTable<any, any>> =\n T extends FMTable<any, infer Name> ? Name : never;\n\n/**\n * Validates that a target table's name matches one of the source table's navigationPaths.\n * Used to ensure type-safe expand/navigate operations.\n */\nexport type ValidExpandTarget<\n SourceTable extends FMTable<any, any, any> | undefined,\n TargetTable extends FMTable<any, any, any>,\n> =\n SourceTable extends FMTable<any, any, infer SourceNavPaths>\n ? ExtractTableName<TargetTable> extends SourceNavPaths[number]\n ? TargetTable\n : never\n : TargetTable;\n\n// ============================================================================\n// Helper Functions for Accessing FMTable Internal Properties\n// ============================================================================\n\n/**\n * Get the table name from an FMTable instance.\n * @param table - FMTable instance\n * @returns The table name\n */\nexport function getTableName<T extends FMTable<any, any>>(table: T): string {\n return table[FMTableName];\n}\n\n/**\n * Get the entity ID (FMTID) from an FMTable instance.\n * @param table - FMTable instance\n * @returns The entity ID or undefined if not using entity IDs\n */\nexport function getTableEntityId<T extends FMTable<any, any>>(\n table: T,\n): string | undefined {\n return table[FMTableEntityId];\n}\n\n/**\n * Get the schema validator from an FMTable instance.\n * @param table - FMTable instance\n * @returns The StandardSchemaV1 validator\n */\nexport function getTableSchema<T extends FMTable<any, any>>(\n table: T,\n): StandardSchemaV1 {\n return table[FMTableSchema];\n}\n\n/**\n * Get the fields from an FMTable instance.\n * @param table - FMTable instance\n * @returns The fields record\n */\nexport function getTableFields<T extends FMTable<any, any>>(table: T) {\n return table[FMTableFields];\n}\n\n/**\n * Get the navigation paths from an FMTable instance.\n * @param table - FMTable instance\n * @returns Array of navigation path names\n */\nexport function getNavigationPaths<T extends FMTable<any, any>>(\n table: T,\n): readonly string[] {\n return table[FMTableNavigationPaths];\n}\n\n/**\n * Get the default select configuration from an FMTable instance.\n * @param table - FMTable instance\n * @returns Default select configuration\n */\nexport function getDefaultSelect<T extends FMTable<any, any>>(table: T) {\n return table[FMTableDefaultSelect];\n}\n\n/**\n * Get the base table configuration from an FMTable instance.\n * This provides access to schema, idField, required fields, readOnly fields, and field IDs.\n * @param table - FMTable instance\n * @returns Base table configuration object\n */\nexport function getBaseTableConfig<T extends FMTable<any, any>>(table: T) {\n return table[FMTableBaseTableConfig];\n}\n\n/**\n * Check if an FMTable instance is using entity IDs (both FMTID and FMFIDs).\n * @param table - FMTable instance\n * @returns True if using entity IDs, false otherwise\n */\nexport function isUsingEntityIds<T extends FMTable<any, any>>(\n table: T,\n): boolean {\n return (\n table[FMTableEntityId] !== undefined &&\n table[FMTableBaseTableConfig].fmfIds !== undefined\n );\n}\n\n/**\n * Get the field ID (FMFID) for a given field name, or the field name itself if not using IDs.\n * @param table - FMTable instance\n * @param fieldName - Field name to get the ID for\n * @returns The FMFID string or the original field name\n */\nexport function getFieldId<T extends FMTable<any, any>>(\n table: T,\n fieldName: string,\n): string {\n const config = table[FMTableBaseTableConfig];\n if (config.fmfIds && fieldName in config.fmfIds) {\n const fieldId = config.fmfIds[fieldName];\n if (fieldId) {\n return fieldId;\n }\n }\n return fieldName;\n}\n\n/**\n * Get the field name for a given field ID (FMFID), or the ID itself if not found.\n * @param table - FMTable instance\n * @param fieldId - The FMFID to get the field name for\n * @returns The field name or the original ID\n */\nexport function getFieldName<T extends FMTable<any, any>>(\n table: T,\n fieldId: string,\n): string {\n const config = table[FMTableBaseTableConfig];\n if (config.fmfIds) {\n for (const [fieldName, fmfId] of Object.entries(config.fmfIds)) {\n if (fmfId === fieldId) {\n return fieldName;\n }\n }\n }\n return fieldId;\n}\n/**\n * Get the table ID (FMTID or name) from an FMTable instance.\n * Returns the FMTID if available, otherwise returns the table name.\n * @param table - FMTable instance\n * @returns The FMTID string or the table name\n */\nexport function getTableId<T extends FMTable<any, any>>(table: T): string {\n return table[FMTableEntityId] ?? table[FMTableName];\n}\n\n/**\n * Get all columns from a table as an object.\n * Useful for selecting all fields except some using destructuring.\n *\n * @example\n * const { password, ...cols } = getTableColumns(users)\n * db.from(users).list().select(cols)\n *\n * @param table - FMTable instance\n * @returns Object with all columns from the table\n */\nexport function getTableColumns<T extends FMTableWithColumns<any, any>>(\n table: T,\n): ColumnMap<T[typeof FMTableFields], ExtractTableName<T>> {\n const fields = table[FMTableFields];\n const tableName = table[FMTableName];\n const tableEntityId = table[FMTableEntityId];\n const baseConfig = table[FMTableBaseTableConfig];\n\n const columns = {} as ColumnMap<T[typeof FMTableFields], ExtractTableName<T>>;\n for (const [fieldName, builder] of Object.entries(fields)) {\n const config = (builder as any)._getConfig();\n (columns as any)[fieldName] = new Column({\n fieldName: String(fieldName),\n entityId: baseConfig.fmfIds?.[fieldName],\n tableName: tableName,\n tableEntityId: tableEntityId,\n inputValidator: config.inputValidator,\n });\n }\n\n return columns;\n}\n"],"names":["_a"],"mappings":";;;;;;AAmFA,MAAM,cAAc,OAAO,IAAI,qBAAqB;AACpD,MAAM,kBAAkB,OAAO,IAAI,yBAAyB;AAC5D,MAAM,gBAAgB,OAAO,IAAI,uBAAuB;AACxD,MAAM,gBAAgB,OAAO,IAAI,uBAAuB;AACxD,MAAM,yBAAyB,OAAO,IAAI,gCAAgC;AAC1E,MAAM,uBAAuB,OAAO,IAAI,8BAA8B;AACtE,MAAM,yBAAyB,OAAO,IAAI,gCAAgC;AAC1E,MAAM,sBAAsB,OAAO,IAAI,6BAA6B;AA4BjE,kBAGA,sBAGA,0BAGA,oBAGA,oBAGA,6BAGA,2BAMA;AA7CI,MAAM,QAIX;AAAA,EAmDA,YAAY,QAiBT;AAnDH;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAGD;AAAA,wBAAC;AAMD;AAAA,wBAAC;AA4BM,SAAA,WAAW,IAAI,OAAO;AACtB,SAAA,eAAe,IAAI,OAAO;AAC1B,SAAA,mBAAmB,IAAI,OAAO;AAC9B,SAAA,aAAa,IAAI,OAAO;AACxB,SAAA,aAAa,IAAI,OAAO;AACxB,SAAA,sBAAsB,IAAI,OAAO;AACjC,SAAA,oBAAoB,IAAI,OAAO;AAC/B,SAAA,sBAAsB,IAAI,OAAO;AAAA,EAAA;AAE1C;AAAA;AAAA;AAAA;AAAA;AAzEE,cATW,SASK,UAAS;AAAA,EACvB,MAAM;AAAA,EACN,UAAU;AAAA,EACV,cAAc;AAAA,EACd,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,iBAAiB;AAAA,EACjB,eAAe;AAAA,EACf,iBAAiB;AACnB;AAuMc,SAAA,kBAKd,MACA,QACA,SAI+C;AAEzC,QAAA,eAAe,OAAO,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,WAAW,OAAO,OAAO;AAAA,IACzE;AAAA,IACA,QAAS,QAAgB,WAAW;AAAA,EAAA,EACpC;AAGF,QAAM,kBAAkB,aAAa,KAAK,CAAC,MAAM,EAAE,OAAO,UAAU;AACpE,QAAM,UAAU,mDAAiB;AAGjC,QAAM,WAAW,aACd,OAAO,CAAC,MAAM,EAAE,OAAO,OAAO,EAC9B,IAAI,CAAC,MAAM,EAAE,SAAS;AAGzB,QAAM,WAAW,aACd,OAAO,CAAC,MAAM,EAAE,OAAO,QAAQ,EAC/B,IAAI,CAAC,MAAM,EAAE,SAAS;AAGzB,QAAM,kBAAkB,aACrB,OAAO,CAAC,MAAM,EAAE,OAAO,cAAc,WAAW,EAChD,IAAI,CAAC,MAAM,EAAE,SAAS;AAGzB,QAAM,SAA4C,CAAC;AACnD,aAAW,EAAE,WAAW,OAAO,KAAK,cAAc;AAChD,QAAI,OAAO,UAAU;AACZ,aAAA,SAAS,IAAI,OAAO;AAAA,IAAA;AAAA,EAC7B;AAIF,QAAM,YAA8C,CAAC;AAErD,QAAM,cAAgD,CAAC;AAEvD,aAAW,EAAE,WAAW,OAAO,KAAK,cAAc;AAEhD,QAAI,OAAO,iBAAiB;AAChB,gBAAA,SAAS,IAAI,OAAO;AAAA,IAAA,OACzB;AAED,UAAA;AACJ,cAAQ,OAAO,WAAW;AAAA,QACxB,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACH,sBAAY,EAAE,OAAO;AACrB;AAAA,QACF,KAAK;AACH,sBAAY,EAAE,OAAO;AACrB;AAAA,QACF;AACE,sBAAY,EAAE,QAAQ;AAAA,MAAA;AAItB,UAAA,CAAC,OAAO,SAAS;AACnB,oBAAY,UAAU,SAAS;AAAA,MAAA;AAGjC,gBAAU,SAAS,IAAI;AAAA,IAAA;AAIzB,QAAI,OAAO,gBAAgB;AACb,kBAAA,SAAS,IAAI,OAAO;AAAA,IAAA;AAAA,EAClC;AAII,QAAA,cAAc,EAAE,OAAO,SAAS;AAMtC,QAAM,kBAAkB;AAAA,IACtB,QAAQ;AAAA,IACR,aAAc,OAAO,KAAK,WAAW,EAAE,SAAS,IAC5C,cACA;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAS,OAAO,KAAK,MAAM,EAAE,SAAS,IAAI,SAAS;AAAA,EAGrD;AAGA,QAAM,UAAU,CAAC;AACjB,aAAW,CAAC,WAAW,OAAO,KAAK,OAAO,QAAQ,MAAM,GAAG;AACnD,UAAA,SAAU,QAAgB,WAAW;AAC1C,YAAgB,SAAS,IAAI,IAAI,OAAO;AAAA,MACvC,WAAW,OAAO,SAAS;AAAA,MAC3B,UAAU,OAAO;AAAA,MACjB,WAAW;AAAA,MACX,eAAe,mCAAS;AAAA,MACxB,gBAAgB,OAAO;AAAA,IAAA,CACxB;AAAA,EAAA;AAIG,QAAA,uBAAsB,mCAAS,kBAAiB;AACtD,QAAM,wBAIJ,OAAO,wBAAwB,aAC3B,oBAAoB,OAAoC,IACxD;AAGA,QAAA,mBAAmB,mCAAS,oBAAmB,CAAC;AAChD,QAAA,QAAQ,IAAI,QAAmC;AAAA,IACnD;AAAA,IACA,UAAU,mCAAS;AAAA,IACnB,cAAc,mCAAS;AAAA,IACvB,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA,eAAe;AAAA,IACf;AAAA,EAAA,CACD;AAGM,SAAA,OAAO,OAAO,OAAO;AAErB,SAAA;AACT;AA+IO,SAAS,aAA0C,OAAkB;AAC1E,SAAO,MAAM,WAAW;AAC1B;AAsCO,SAAS,mBACd,OACmB;AACnB,SAAO,MAAM,sBAAsB;AACrC;AAOO,SAAS,iBAA8C,OAAU;AACtE,SAAO,MAAM,oBAAoB;AACnC;AAQO,SAAS,mBAAgD,OAAU;AACxE,SAAO,MAAM,sBAAsB;AACrC;AAOO,SAAS,iBACd,OACS;AACT,SACE,MAAM,eAAe,MAAM,UAC3B,MAAM,sBAAsB,EAAE,WAAW;AAE7C;AAQgB,SAAA,WACd,OACA,WACQ;AACF,QAAA,SAAS,MAAM,sBAAsB;AAC3C,MAAI,OAAO,UAAU,aAAa,OAAO,QAAQ;AACzC,UAAA,UAAU,OAAO,OAAO,SAAS;AACvC,QAAI,SAAS;AACJ,aAAA;AAAA,IAAA;AAAA,EACT;AAEK,SAAA;AACT;AAQgB,SAAA,aACd,OACA,SACQ;AACF,QAAA,SAAS,MAAM,sBAAsB;AAC3C,MAAI,OAAO,QAAQ;AACN,eAAA,CAAC,WAAW,KAAK,KAAK,OAAO,QAAQ,OAAO,MAAM,GAAG;AAC9D,UAAI,UAAU,SAAS;AACd,eAAA;AAAA,MAAA;AAAA,IACT;AAAA,EACF;AAEK,SAAA;AACT;AAOO,SAAS,WAAwC,OAAkB;AACxE,SAAO,MAAM,eAAe,KAAK,MAAM,WAAW;AACpD;AAaO,SAAS,gBACd,OACyD;;AACnD,QAAA,SAAS,MAAM,aAAa;AAC5B,QAAA,YAAY,MAAM,WAAW;AAC7B,QAAA,gBAAgB,MAAM,eAAe;AACrC,QAAA,aAAa,MAAM,sBAAsB;AAE/C,QAAM,UAAU,CAAC;AACjB,aAAW,CAAC,WAAW,OAAO,KAAK,OAAO,QAAQ,MAAM,GAAG;AACnD,UAAA,SAAU,QAAgB,WAAW;AAC1C,YAAgB,SAAS,IAAI,IAAI,OAAO;AAAA,MACvC,WAAW,OAAO,SAAS;AAAA,MAC3B,WAAUA,MAAA,WAAW,WAAX,gBAAAA,IAAoB;AAAA,MAC9B;AAAA,MACA;AAAA,MACA,gBAAgB,OAAO;AAAA,IAAA,CACxB;AAAA,EAAA;AAGI,SAAA;AACT;"}
|
package/dist/esm/transform.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getBaseTableConfig, getFieldId, isUsingEntityIds, getTableId, getFieldName } from "./orm/table.js";
|
|
2
2
|
function transformFieldNamesToIds(data, table) {
|
|
3
3
|
const config = getBaseTableConfig(table);
|
|
4
4
|
if (!config.fmfIds) {
|
|
@@ -11,9 +11,6 @@ function transformFieldNamesToIds(data, table) {
|
|
|
11
11
|
}
|
|
12
12
|
return transformed;
|
|
13
13
|
}
|
|
14
|
-
function transformFieldName(fieldName, table) {
|
|
15
|
-
return getFieldId(table, fieldName);
|
|
16
|
-
}
|
|
17
14
|
function transformResponseFields(data, table, expandConfigs) {
|
|
18
15
|
const config = getBaseTableConfig(table);
|
|
19
16
|
if (!config.fmfIds) {
|
|
@@ -105,7 +102,6 @@ function transformOrderByField(orderByString, table) {
|
|
|
105
102
|
return direction ? `${fieldId} ${direction}` : fieldId;
|
|
106
103
|
}
|
|
107
104
|
export {
|
|
108
|
-
transformFieldName,
|
|
109
105
|
transformFieldNamesArray,
|
|
110
106
|
transformFieldNamesToIds,
|
|
111
107
|
transformOrderByField,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sources":["../../src/transform.ts"],"sourcesContent":["import type { FMTable } from \"./orm/table\";\nimport {\n getBaseTableConfig,\n getFieldId,\n getFieldName,\n getTableId,\n getTableName,\n isUsingEntityIds,\n} from \"./orm/table\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * Transforms field names to FileMaker field IDs (FMFID) in an object\n * @param data - Object with field names as keys\n * @param table - FMTable instance to get field IDs from\n * @returns Object with FMFID keys instead of field names\n */\nexport function transformFieldNamesToIds<T extends Record<string, any>>(\n data: T,\n table: FMTable<any, any>,\n): Record<string, any> {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n const transformed: Record<string, any> = {};\n for (const [fieldName, value] of Object.entries(data)) {\n const fieldId = getFieldId(table, fieldName);\n transformed[fieldId] = value;\n }\n return transformed;\n}\n\n/**\n * Transforms FileMaker field IDs (FMFID) to field names in an object\n * @param data - Object with FMFID keys\n * @param table - FMTable instance to get field names from\n * @returns Object with field names as keys instead of FMFIDs\n */\nexport function transformFieldIdsToNames<T extends Record<string, any>>(\n data: T,\n table: FMTable<any, any>,\n): Record<string, any> {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n const transformed: Record<string, any> = {};\n for (const [key, value] of Object.entries(data)) {\n // Check if this is an OData metadata field (starts with @)\n if (key.startsWith(\"@\")) {\n transformed[key] = value;\n continue;\n }\n\n const fieldName = getFieldName(table, key);\n transformed[fieldName] = value;\n }\n return transformed;\n}\n\n/**\n * Transforms a field name to FMFID or returns the field name if not using IDs\n * @param fieldName - The field name to transform\n * @param table - FMTable instance to get field ID from\n * @returns The FMFID or field name\n */\nexport function transformFieldName(\n fieldName: string,\n table: FMTable<any, any>,\n): string {\n return getFieldId(table, fieldName);\n}\n\n/**\n * Transforms a table name to FMTID or returns the name if not using IDs\n * @param table - FMTable instance to get table ID from\n * @returns The FMTID or table name\n */\nexport function transformTableName(table: FMTable<any, any>): string {\n return getTableId(table);\n}\n\n/**\n * Gets both table name and ID from a table\n * @param table - FMTable instance\n * @returns Object with name (always present) and id (may be undefined if not using IDs)\n */\nexport function getTableIdentifiers(\n table: FMTable<any, any>,\n): { name: string; id: string | undefined } {\n return {\n name: getTableName(table),\n id: isUsingEntityIds(table) ? getTableId(table) : undefined,\n };\n}\n\n/**\n * Transforms response data by converting field IDs back to field names recursively.\n * Handles both single records and arrays of records, as well as nested expand relationships.\n *\n * @param data - Response data from FileMaker (can be single record, array, or wrapped in value property)\n * @param table - FMTable instance for the main table\n * @param expandConfigs - Configuration for expanded relations (optional)\n * @returns Transformed data with field names instead of IDs\n */\nexport function transformResponseFields(\n data: any,\n table: FMTable<any, any>,\n expandConfigs?: Array<{\n relation: string;\n table?: FMTable<any, any>;\n }>,\n): any {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n // Handle null/undefined\n if (data === null || data === undefined) {\n return data;\n }\n\n // Handle OData list response with value array\n if (data.value && Array.isArray(data.value)) {\n return {\n ...data,\n value: data.value.map((record: any) =>\n transformSingleRecord(record, table, expandConfigs),\n ),\n };\n }\n\n // Handle array of records\n if (Array.isArray(data)) {\n return data.map((record) =>\n transformSingleRecord(record, table, expandConfigs),\n );\n }\n\n // Handle single record\n return transformSingleRecord(data, table, expandConfigs);\n}\n\n/**\n * Transforms a single record, converting field IDs to names and handling nested expands\n */\nfunction transformSingleRecord(\n record: any,\n table: FMTable<any, any>,\n expandConfigs?: Array<{\n relation: string;\n table?: FMTable<any, any>;\n }>,\n): any {\n if (!record || typeof record !== \"object\") {\n return record;\n }\n\n const transformed: Record<string, any> = {};\n\n for (const [key, value] of Object.entries(record)) {\n // Preserve OData metadata fields\n if (key.startsWith(\"@\")) {\n transformed[key] = value;\n continue;\n }\n\n // Check if this is an expanded relation (by relation name)\n let expandConfig = expandConfigs?.find((ec) => ec.relation === key);\n\n // If not found by relation name, check if this key is a FMTID\n // (FileMaker returns expanded relations with FMTID keys when using entity IDs)\n if (!expandConfig && key.startsWith(\"FMTID:\")) {\n expandConfig = expandConfigs?.find(\n (ec) =>\n ec.table && isUsingEntityIds(ec.table) && getTableId(ec.table) === key,\n );\n }\n\n if (expandConfig && expandConfig.table) {\n // Transform the expanded relation data recursively\n // Use the relation name (not the FMTID) as the key\n const relationKey = expandConfig.relation;\n\n if (Array.isArray(value)) {\n transformed[relationKey] = value.map((nestedRecord) =>\n transformSingleRecord(\n nestedRecord,\n expandConfig.table!,\n undefined, // Don't pass nested expand configs for now\n ),\n );\n } else if (value && typeof value === \"object\") {\n transformed[relationKey] = transformSingleRecord(\n value,\n expandConfig.table,\n undefined,\n );\n } else {\n transformed[relationKey] = value;\n }\n continue;\n }\n\n // Transform field ID to field name\n const fieldName = getFieldName(table, key);\n transformed[fieldName] = value;\n }\n\n return transformed;\n}\n\n/**\n * Transforms an array of field names to FMFIDs\n * @param fieldNames - Array of field names\n * @param table - FMTable instance to get field IDs from\n * @returns Array of FMFIDs or field names\n */\nexport function transformFieldNamesArray(\n fieldNames: string[],\n table: FMTable<any, any>,\n): string[] {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return fieldNames;\n }\n\n return fieldNames.map((fieldName) => getFieldId(table, fieldName));\n}\n\n/**\n * Transforms a field name in an orderBy string (e.g., \"name desc\" -> \"FMFID:1 desc\")\n * @param orderByString - The orderBy string (field name with optional asc/desc)\n * @param table - FMTable instance to get field ID from\n * @returns Transformed orderBy string with FMFID\n */\nexport function transformOrderByField(\n orderByString: string,\n table: FMTable<any, any> | undefined,\n): string {\n if (!table) {\n return orderByString;\n }\n const config = getBaseTableConfig(table);\n if (!config || !config.fmfIds) {\n return orderByString;\n }\n\n // Parse the orderBy string to extract field name and direction\n const parts = orderByString.trim().split(/\\s+/);\n const fieldName = parts[0];\n if (!fieldName) {\n return orderByString;\n }\n const direction = parts[1]; // \"asc\" or \"desc\" or undefined\n\n const fieldId = getFieldId(table, fieldName);\n return direction ? `${fieldId} ${direction}` : fieldId;\n}\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transform.js","sources":["../../src/transform.ts"],"sourcesContent":["import type { FMTable } from \"./orm/table\";\nimport {\n getBaseTableConfig,\n getFieldId,\n getFieldName,\n getTableId,\n getTableName,\n isUsingEntityIds,\n} from \"./orm/table\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * Transforms field names to FileMaker field IDs (FMFID) in an object\n * @param data - Object with field names as keys\n * @param table - FMTable instance to get field IDs from\n * @returns Object with FMFID keys instead of field names\n */\nexport function transformFieldNamesToIds<T extends Record<string, any>>(\n data: T,\n table: FMTable<any, any>,\n): Record<string, any> {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n const transformed: Record<string, any> = {};\n for (const [fieldName, value] of Object.entries(data)) {\n const fieldId = getFieldId(table, fieldName);\n transformed[fieldId] = value;\n }\n return transformed;\n}\n\n/**\n * Transforms FileMaker field IDs (FMFID) to field names in an object\n * @param data - Object with FMFID keys\n * @param table - FMTable instance to get field names from\n * @returns Object with field names as keys instead of FMFIDs\n */\nexport function transformFieldIdsToNames<T extends Record<string, any>>(\n data: T,\n table: FMTable<any, any>,\n): Record<string, any> {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n const transformed: Record<string, any> = {};\n for (const [key, value] of Object.entries(data)) {\n // Check if this is an OData metadata field (starts with @)\n if (key.startsWith(\"@\")) {\n transformed[key] = value;\n continue;\n }\n\n const fieldName = getFieldName(table, key);\n transformed[fieldName] = value;\n }\n return transformed;\n}\n\n/**\n * Transforms a field name to FMFID or returns the field name if not using IDs\n * @param fieldName - The field name to transform\n * @param table - FMTable instance to get field ID from\n * @returns The FMFID or field name\n */\nexport function transformFieldName(\n fieldName: string,\n table: FMTable<any, any>,\n): string {\n return getFieldId(table, fieldName);\n}\n\n/**\n * Transforms a table name to FMTID or returns the name if not using IDs\n * @param table - FMTable instance to get table ID from\n * @returns The FMTID or table name\n */\nexport function transformTableName(table: FMTable<any, any>): string {\n return getTableId(table);\n}\n\n/**\n * Gets both table name and ID from a table\n * @param table - FMTable instance\n * @returns Object with name (always present) and id (may be undefined if not using IDs)\n */\nexport function getTableIdentifiers(\n table: FMTable<any, any>,\n): { name: string; id: string | undefined } {\n return {\n name: getTableName(table),\n id: isUsingEntityIds(table) ? getTableId(table) : undefined,\n };\n}\n\n/**\n * Transforms response data by converting field IDs back to field names recursively.\n * Handles both single records and arrays of records, as well as nested expand relationships.\n *\n * @param data - Response data from FileMaker (can be single record, array, or wrapped in value property)\n * @param table - FMTable instance for the main table\n * @param expandConfigs - Configuration for expanded relations (optional)\n * @returns Transformed data with field names instead of IDs\n */\nexport function transformResponseFields(\n data: any,\n table: FMTable<any, any>,\n expandConfigs?: Array<{\n relation: string;\n table?: FMTable<any, any>;\n }>,\n): any {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return data;\n }\n\n // Handle null/undefined\n if (data === null || data === undefined) {\n return data;\n }\n\n // Handle OData list response with value array\n if (data.value && Array.isArray(data.value)) {\n return {\n ...data,\n value: data.value.map((record: any) =>\n transformSingleRecord(record, table, expandConfigs),\n ),\n };\n }\n\n // Handle array of records\n if (Array.isArray(data)) {\n return data.map((record) =>\n transformSingleRecord(record, table, expandConfigs),\n );\n }\n\n // Handle single record\n return transformSingleRecord(data, table, expandConfigs);\n}\n\n/**\n * Transforms a single record, converting field IDs to names and handling nested expands\n */\nfunction transformSingleRecord(\n record: any,\n table: FMTable<any, any>,\n expandConfigs?: Array<{\n relation: string;\n table?: FMTable<any, any>;\n }>,\n): any {\n if (!record || typeof record !== \"object\") {\n return record;\n }\n\n const transformed: Record<string, any> = {};\n\n for (const [key, value] of Object.entries(record)) {\n // Preserve OData metadata fields\n if (key.startsWith(\"@\")) {\n transformed[key] = value;\n continue;\n }\n\n // Check if this is an expanded relation (by relation name)\n let expandConfig = expandConfigs?.find((ec) => ec.relation === key);\n\n // If not found by relation name, check if this key is a FMTID\n // (FileMaker returns expanded relations with FMTID keys when using entity IDs)\n if (!expandConfig && key.startsWith(\"FMTID:\")) {\n expandConfig = expandConfigs?.find(\n (ec) =>\n ec.table && isUsingEntityIds(ec.table) && getTableId(ec.table) === key,\n );\n }\n\n if (expandConfig && expandConfig.table) {\n // Transform the expanded relation data recursively\n // Use the relation name (not the FMTID) as the key\n const relationKey = expandConfig.relation;\n\n if (Array.isArray(value)) {\n transformed[relationKey] = value.map((nestedRecord) =>\n transformSingleRecord(\n nestedRecord,\n expandConfig.table!,\n undefined, // Don't pass nested expand configs for now\n ),\n );\n } else if (value && typeof value === \"object\") {\n transformed[relationKey] = transformSingleRecord(\n value,\n expandConfig.table,\n undefined,\n );\n } else {\n transformed[relationKey] = value;\n }\n continue;\n }\n\n // Transform field ID to field name\n const fieldName = getFieldName(table, key);\n transformed[fieldName] = value;\n }\n\n return transformed;\n}\n\n/**\n * Transforms an array of field names to FMFIDs\n * @param fieldNames - Array of field names\n * @param table - FMTable instance to get field IDs from\n * @returns Array of FMFIDs or field names\n */\nexport function transformFieldNamesArray(\n fieldNames: string[],\n table: FMTable<any, any>,\n): string[] {\n const config = getBaseTableConfig(table);\n if (!config.fmfIds) {\n return fieldNames;\n }\n\n return fieldNames.map((fieldName) => getFieldId(table, fieldName));\n}\n\n/**\n * Transforms a field name in an orderBy string (e.g., \"name desc\" -> \"FMFID:1 desc\")\n * @param orderByString - The orderBy string (field name with optional asc/desc)\n * @param table - FMTable instance to get field ID from\n * @returns Transformed orderBy string with FMFID\n */\nexport function transformOrderByField(\n orderByString: string,\n table: FMTable<any, any> | undefined,\n): string {\n if (!table) {\n return orderByString;\n }\n const config = getBaseTableConfig(table);\n if (!config || !config.fmfIds) {\n return orderByString;\n }\n\n // Parse the orderBy string to extract field name and direction\n const parts = orderByString.trim().split(/\\s+/);\n const fieldName = parts[0];\n if (!fieldName) {\n return orderByString;\n }\n const direction = parts[1]; // \"asc\" or \"desc\" or undefined\n\n const fieldId = getFieldId(table, fieldName);\n return direction ? `${fieldId} ${direction}` : fieldId;\n}\n"],"names":[],"mappings":"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"}
|
package/dist/esm/types.d.ts
CHANGED
|
@@ -87,8 +87,6 @@ export type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =
|
|
|
87
87
|
[K in keyof Schema]: Extract<StandardSchemaV1.InferOutput<Schema[K]>, null | undefined> extends never ? K : never;
|
|
88
88
|
}[keyof Schema];
|
|
89
89
|
export type ExcludedFields<IdField extends keyof any | undefined, ReadOnly extends readonly any[]> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];
|
|
90
|
-
export type InsertData<BT> = Partial<Record<string, any>>;
|
|
91
|
-
export type UpdateData<BT> = Partial<Record<string, any>>;
|
|
92
90
|
export type ExecuteOptions = {
|
|
93
91
|
includeODataAnnotations?: boolean;
|
|
94
92
|
skipValidation?: boolean;
|
|
@@ -97,6 +95,32 @@ export type ExecuteOptions = {
|
|
|
97
95
|
*/
|
|
98
96
|
useEntityIds?: boolean;
|
|
99
97
|
};
|
|
98
|
+
/**
|
|
99
|
+
* Type for the fetchHandler callback function.
|
|
100
|
+
* This is a convenience type export that matches the fetchHandler signature in FFetchOptions.
|
|
101
|
+
*
|
|
102
|
+
* @example
|
|
103
|
+
* ```typescript
|
|
104
|
+
* import type { FetchHandler } from '@proofkit/fmodata';
|
|
105
|
+
*
|
|
106
|
+
* const myFetchHandler: FetchHandler = (input, init) => {
|
|
107
|
+
* console.log('Custom fetch:', input);
|
|
108
|
+
* return fetch(input, init);
|
|
109
|
+
* };
|
|
110
|
+
*
|
|
111
|
+
* await query.execute({
|
|
112
|
+
* fetchHandler: myFetchHandler
|
|
113
|
+
* });
|
|
114
|
+
* ```
|
|
115
|
+
*/
|
|
116
|
+
export type FetchHandler = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
|
|
117
|
+
/**
|
|
118
|
+
* Combined type for execute() method options.
|
|
119
|
+
*
|
|
120
|
+
* Uses FFetchOptions from @fetchkit/ffetch to ensure proper type inference.
|
|
121
|
+
* FFetchOptions is re-exported in the package to ensure type availability in consuming packages.
|
|
122
|
+
*/
|
|
123
|
+
export type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> = RequestInit & FFetchOptions & ExecuteOptions & EO;
|
|
100
124
|
/**
|
|
101
125
|
* Get the Accept header value based on includeODataAnnotations option
|
|
102
126
|
* @param includeODataAnnotations - Whether to include OData annotations
|
package/dist/esm/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nexport type Auth = { username: string; password: string } | { apiKey: string };\n\nexport interface ExecutableBuilder<T> {\n execute(): Promise<Result<T>>;\n getRequestConfig(): { method: string; url: string; body?: any };\n\n /**\n * Convert this builder to a native Request object for batch processing.\n * @param baseUrl - The base URL for the OData service\n * @param options - Optional execution options (e.g., includeODataAnnotations)\n * @returns A native Request object\n */\n toRequest(baseUrl: string, options?: ExecuteOptions): Request;\n\n /**\n * Process a raw Response object into a typed Result.\n * This allows builders to apply their own validation and transformation logic.\n * @param response - The native Response object from the batch operation\n * @param options - Optional execution options (e.g., skipValidation, includeODataAnnotations)\n * @returns A typed Result with the builder's expected return type\n */\n processResponse(\n response: Response,\n options?: ExecuteOptions,\n ): Promise<Result<T>>;\n}\n\nexport interface ExecutionContext {\n _makeRequest<T>(\n url: string,\n options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n ): Promise<Result<T>>;\n _setUseEntityIds?(useEntityIds: boolean): void;\n _getUseEntityIds?(): boolean;\n _getBaseUrl?(): string;\n}\n\nexport type InferSchemaType<Schema extends Record<string, StandardSchemaV1>> = {\n [K in keyof Schema]: Schema[K] extends StandardSchemaV1<any, infer Output>\n ? Output\n : never;\n};\n\nexport type WithSystemFields<T> =\n T extends Record<string, any>\n ? T & {\n ROWID: number;\n ROWMODID: number;\n }\n : never;\n\n// Helper type to exclude system fields from a union of keys\nexport type ExcludeSystemFields<T extends keyof any> = Exclude<\n T,\n \"ROWID\" | \"ROWMODID\"\n>;\n\n// Helper type to omit system fields from an object type\nexport type OmitSystemFields<T> = Omit<T, \"ROWID\" | \"ROWMODID\">;\n\n// OData record metadata fields (present on each record)\nexport type ODataRecordMetadata = {\n \"@id\": string;\n \"@editLink\": string;\n};\n\n// OData response wrapper (top-level, internal use only)\nexport type ODataListResponse<T> = {\n \"@context\": string;\n value: (T & ODataRecordMetadata)[];\n};\n\nexport type ODataSingleResponse<T> = T &\n ODataRecordMetadata & {\n \"@context\": string;\n };\n\n// OData response for single field values\nexport type ODataFieldResponse<T> = {\n \"@context\": string;\n value: T;\n};\n\n// Result pattern for execute responses\nexport type Result<T, E = import(\"./errors\").FMODataErrorType> =\n | { data: T; error: undefined }\n | { data: undefined; error: E };\n\n// Batch operation result types\nexport type BatchItemResult<T> = {\n data: T | undefined;\n error: import(\"./errors\").FMODataErrorType | undefined;\n status: number; // HTTP status code (0 for truncated)\n};\n\nexport type BatchResult<T extends readonly any[]> = {\n results: { [K in keyof T]: BatchItemResult<T[K]> };\n successCount: number;\n errorCount: number;\n truncated: boolean;\n firstErrorIndex: number | null;\n};\n\n// Make specific keys required, rest optional\nexport type MakeFieldsRequired<T, Keys extends keyof T> = Partial<T> &\n Required<Pick<T, Keys>>;\n\n// Extract keys from schema where validator doesn't allow null/undefined (auto-required fields)\nexport type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =\n {\n [K in keyof Schema]: Extract<\n StandardSchemaV1.InferOutput<Schema[K]>,\n null | undefined\n > extends never\n ? K\n : never;\n }[keyof Schema];\n\n// Helper type to compute excluded fields (readOnly fields + idField)\nexport type ExcludedFields<\n IdField extends keyof any | undefined,\n ReadOnly extends readonly any[],\n> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];\n\n// Helper type for InsertData computation\ntype ComputeInsertData<\n Schema extends Record<string, StandardSchemaV1>,\n IdField extends keyof Schema | undefined,\n Required extends readonly any[],\n ReadOnly extends readonly any[],\n> = [Required[number]] extends [keyof InferSchemaType<Schema>]\n ? Required extends readonly (keyof InferSchemaType<Schema>)[]\n ? MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<\n AutoRequiredKeys<Schema> | Required[number],\n ExcludedFields<IdField, ReadOnly>\n >\n >\n : MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n >\n : MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n >;\n\n
|
|
1
|
+
{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nexport type Auth = { username: string; password: string } | { apiKey: string };\n\nexport interface ExecutableBuilder<T> {\n execute(): Promise<Result<T>>;\n getRequestConfig(): { method: string; url: string; body?: any };\n\n /**\n * Convert this builder to a native Request object for batch processing.\n * @param baseUrl - The base URL for the OData service\n * @param options - Optional execution options (e.g., includeODataAnnotations)\n * @returns A native Request object\n */\n toRequest(baseUrl: string, options?: ExecuteOptions): Request;\n\n /**\n * Process a raw Response object into a typed Result.\n * This allows builders to apply their own validation and transformation logic.\n * @param response - The native Response object from the batch operation\n * @param options - Optional execution options (e.g., skipValidation, includeODataAnnotations)\n * @returns A typed Result with the builder's expected return type\n */\n processResponse(\n response: Response,\n options?: ExecuteOptions,\n ): Promise<Result<T>>;\n}\n\nexport interface ExecutionContext {\n _makeRequest<T>(\n url: string,\n options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n ): Promise<Result<T>>;\n _setUseEntityIds?(useEntityIds: boolean): void;\n _getUseEntityIds?(): boolean;\n _getBaseUrl?(): string;\n}\n\nexport type InferSchemaType<Schema extends Record<string, StandardSchemaV1>> = {\n [K in keyof Schema]: Schema[K] extends StandardSchemaV1<any, infer Output>\n ? Output\n : never;\n};\n\nexport type WithSystemFields<T> =\n T extends Record<string, any>\n ? T & {\n ROWID: number;\n ROWMODID: number;\n }\n : never;\n\n// Helper type to exclude system fields from a union of keys\nexport type ExcludeSystemFields<T extends keyof any> = Exclude<\n T,\n \"ROWID\" | \"ROWMODID\"\n>;\n\n// Helper type to omit system fields from an object type\nexport type OmitSystemFields<T> = Omit<T, \"ROWID\" | \"ROWMODID\">;\n\n// OData record metadata fields (present on each record)\nexport type ODataRecordMetadata = {\n \"@id\": string;\n \"@editLink\": string;\n};\n\n// OData response wrapper (top-level, internal use only)\nexport type ODataListResponse<T> = {\n \"@context\": string;\n value: (T & ODataRecordMetadata)[];\n};\n\nexport type ODataSingleResponse<T> = T &\n ODataRecordMetadata & {\n \"@context\": string;\n };\n\n// OData response for single field values\nexport type ODataFieldResponse<T> = {\n \"@context\": string;\n value: T;\n};\n\n// Result pattern for execute responses\nexport type Result<T, E = import(\"./errors\").FMODataErrorType> =\n | { data: T; error: undefined }\n | { data: undefined; error: E };\n\n// Batch operation result types\nexport type BatchItemResult<T> = {\n data: T | undefined;\n error: import(\"./errors\").FMODataErrorType | undefined;\n status: number; // HTTP status code (0 for truncated)\n};\n\nexport type BatchResult<T extends readonly any[]> = {\n results: { [K in keyof T]: BatchItemResult<T[K]> };\n successCount: number;\n errorCount: number;\n truncated: boolean;\n firstErrorIndex: number | null;\n};\n\n// Make specific keys required, rest optional\nexport type MakeFieldsRequired<T, Keys extends keyof T> = Partial<T> &\n Required<Pick<T, Keys>>;\n\n// Extract keys from schema where validator doesn't allow null/undefined (auto-required fields)\nexport type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =\n {\n [K in keyof Schema]: Extract<\n StandardSchemaV1.InferOutput<Schema[K]>,\n null | undefined\n > extends never\n ? K\n : never;\n }[keyof Schema];\n\n// Helper type to compute excluded fields (readOnly fields + idField)\nexport type ExcludedFields<\n IdField extends keyof any | undefined,\n ReadOnly extends readonly any[],\n> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];\n\n// Helper type for InsertData computation\ntype ComputeInsertData<\n Schema extends Record<string, StandardSchemaV1>,\n IdField extends keyof Schema | undefined,\n Required extends readonly any[],\n ReadOnly extends readonly any[],\n> = [Required[number]] extends [keyof InferSchemaType<Schema>]\n ? Required extends readonly (keyof InferSchemaType<Schema>)[]\n ? MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<\n AutoRequiredKeys<Schema> | Required[number],\n ExcludedFields<IdField, ReadOnly>\n >\n >\n : MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n >\n : MakeFieldsRequired<\n Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n >;\n\nexport type ExecuteOptions = {\n includeODataAnnotations?: boolean;\n skipValidation?: boolean;\n /**\n * Overrides the default behavior of the database to use entity IDs (rather than field names) in THIS REQUEST ONLY\n */\n useEntityIds?: boolean;\n};\n\n/**\n * Type for the fetchHandler callback function.\n * This is a convenience type export that matches the fetchHandler signature in FFetchOptions.\n *\n * @example\n * ```typescript\n * import type { FetchHandler } from '@proofkit/fmodata';\n *\n * const myFetchHandler: FetchHandler = (input, init) => {\n * console.log('Custom fetch:', input);\n * return fetch(input, init);\n * };\n *\n * await query.execute({\n * fetchHandler: myFetchHandler\n * });\n * ```\n */\nexport type FetchHandler = (\n input: RequestInfo | URL,\n init?: RequestInit,\n) => Promise<Response>;\n\n/**\n * Combined type for execute() method options.\n *\n * Uses FFetchOptions from @fetchkit/ffetch to ensure proper type inference.\n * FFetchOptions is re-exported in the package to ensure type availability in consuming packages.\n */\nexport type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> =\n RequestInit & FFetchOptions & ExecuteOptions & EO;\n\n/**\n * Get the Accept header value based on includeODataAnnotations option\n * @param includeODataAnnotations - Whether to include OData annotations\n * @returns Accept header value\n */\nexport function getAcceptHeader(includeODataAnnotations?: boolean): string {\n return includeODataAnnotations === true\n ? \"application/json\"\n : \"application/json;odata.metadata=none\";\n}\n\nexport type ConditionallyWithODataAnnotations<\n T,\n IncludeODataAnnotations extends boolean,\n> = IncludeODataAnnotations extends true\n ? T & {\n \"@id\": string;\n \"@editLink\": string;\n }\n : T;\n\n// Helper type to extract schema from a FMTable\nexport type ExtractSchemaFromOccurrence<Occ> = Occ extends {\n baseTable: { schema: infer S };\n}\n ? S extends Record<string, StandardSchemaV1>\n ? S\n : Record<string, StandardSchemaV1>\n : Record<string, StandardSchemaV1>;\n\nexport type GenericFieldMetadata = {\n $Nullable?: boolean;\n \"@Index\"?: boolean;\n \"@Calculation\"?: boolean;\n \"@Summary\"?: boolean;\n \"@Global\"?: boolean;\n \"@Org.OData.Core.V1.Permissions\"?: \"Org.OData.Core.V1.Permission@Read\";\n};\n\nexport type StringFieldMetadata = GenericFieldMetadata & {\n $Type: \"Edm.String\";\n $DefaultValue?: \"USER\" | \"USERNAME\" | \"CURRENT_USER\";\n $MaxLength?: number;\n};\n\nexport type DecimalFieldMetadata = GenericFieldMetadata & {\n $Type: \"Edm.Decimal\";\n \"@AutoGenerated\"?: boolean;\n};\n\nexport type DateFieldMetadata = GenericFieldMetadata & {\n $Type: \"Edm.Date\";\n $DefaultValue?: \"CURDATE\" | \"CURRENT_DATE\";\n};\n\nexport type TimeOfDayFieldMetadata = GenericFieldMetadata & {\n $Type: \"Edm.TimeOfDay\";\n $DefaultValue?: \"CURTIME\" | \"CURRENT_TIME\";\n};\n\nexport type DateTimeOffsetFieldMetadata = GenericFieldMetadata & {\n $Type: \"Edm.Date\";\n $DefaultValue?: \"CURTIMESTAMP\" | \"CURRENT_TIMESTAMP\";\n \"@VersionId\"?: boolean;\n};\n\nexport type StreamFieldMetadata = {\n $Type: \"Edm.Stream\";\n $Nullable?: boolean;\n \"@EnclosedPath\": string;\n \"@ExternalOpenPath\": string;\n \"@ExternalSecurePath\"?: string;\n};\n\nexport type FieldMetadata =\n | StringFieldMetadata\n | DecimalFieldMetadata\n | DateFieldMetadata\n | TimeOfDayFieldMetadata\n | DateTimeOffsetFieldMetadata\n | StreamFieldMetadata;\n\nexport type EntityType = {\n $Kind: \"EntityType\";\n $Key: string[];\n} & Record<string, FieldMetadata>;\n\nexport type EntitySet = {\n $Kind: \"EntitySet\";\n $Type: string;\n};\n\nexport type Metadata = Record<string, EntityType | EntitySet>;\n"],"names":[],"mappings":"AAqMO,SAAS,gBAAgB,yBAA2C;AAClE,SAAA,4BAA4B,OAC/B,qBACA;AACN;"}
|