@proofkit/fmodata 0.1.0-alpha.17 → 0.1.0-alpha.18
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/dist/esm/client/builders/select-utils.d.ts +10 -0
- package/dist/esm/client/builders/select-utils.js +10 -2
- package/dist/esm/client/builders/select-utils.js.map +1 -1
- package/dist/esm/client/entity-set.js.map +1 -1
- package/dist/esm/client/error-parser.js.map +1 -1
- package/dist/esm/orm/operators.js +3 -1
- package/dist/esm/orm/operators.js.map +1 -1
- package/dist/esm/orm/table.d.ts +1 -1
- package/dist/esm/orm/table.js.map +1 -1
- package/package.json +1 -1
- package/src/client/builders/select-utils.ts +25 -3
- package/src/client/entity-set.ts +2 -9
- package/src/client/error-parser.ts +4 -10
- package/src/orm/operators.ts +6 -1
- package/src/orm/table.ts +1 -1
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
import { FMTable } from '../../orm/table.js';
|
|
2
|
+
/**
|
|
3
|
+
* Determines if a field name needs to be quoted in OData queries.
|
|
4
|
+
* Per FileMaker docs: field names with special characters (spaces, underscores, etc.) must be quoted.
|
|
5
|
+
* Also quotes "id" as it's an OData reserved word.
|
|
6
|
+
* Entity IDs (FMFID:*, FMTID:*) are not quoted as they're identifiers, not field names.
|
|
7
|
+
*
|
|
8
|
+
* @param fieldName - The field name or identifier to check
|
|
9
|
+
* @returns true if the field name should be quoted in OData queries
|
|
10
|
+
*/
|
|
11
|
+
export declare function needsFieldQuoting(fieldName: string): boolean;
|
|
2
12
|
/**
|
|
3
13
|
* Formats select fields for use in OData query strings.
|
|
4
14
|
* - Transforms field names to FMFIDs if using entity IDs
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
import { transformFieldNamesArray } from "../../transform.js";
|
|
2
|
+
function needsFieldQuoting(fieldName) {
|
|
3
|
+
if (fieldName.startsWith("FMFID:") || fieldName.startsWith("FMTID:")) {
|
|
4
|
+
return false;
|
|
5
|
+
}
|
|
6
|
+
if (fieldName === "id") return true;
|
|
7
|
+
return fieldName.includes(" ") || fieldName.includes("_") || !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fieldName);
|
|
8
|
+
}
|
|
2
9
|
function formatSelectFields(select, table, useEntityIds) {
|
|
3
10
|
if (!select || select.length === 0) return "";
|
|
4
11
|
const selectArray = Array.isArray(select) ? select : [select];
|
|
5
12
|
const transformedFields = table && useEntityIds ? transformFieldNamesArray(selectArray.map(String), table) : selectArray.map(String);
|
|
6
13
|
return transformedFields.map((field) => {
|
|
7
|
-
if (field
|
|
14
|
+
if (needsFieldQuoting(field)) return `"${field}"`;
|
|
8
15
|
const encoded = encodeURIComponent(field);
|
|
9
16
|
return encoded.replace(/%20/g, " ");
|
|
10
17
|
}).join(",");
|
|
11
18
|
}
|
|
12
19
|
export {
|
|
13
|
-
formatSelectFields
|
|
20
|
+
formatSelectFields,
|
|
21
|
+
needsFieldQuoting
|
|
14
22
|
};
|
|
15
23
|
//# sourceMappingURL=select-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-utils.js","sources":["../../../../src/client/builders/select-utils.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { transformFieldNamesArray } from \"../../transform\";\n\n/**\n * Formats select fields for use in OData query strings.\n * - Transforms field names to FMFIDs if using entity IDs\n * - Wraps \"id\" fields in double quotes (OData reserved)\n * - URL-encodes special characters but preserves spaces\n */\nexport function formatSelectFields(\n select: string[] | readonly string[] | undefined,\n table?: FMTable<any, any>,\n useEntityIds?: boolean,\n): string {\n if (!select || select.length === 0) return \"\";\n\n const selectArray = Array.isArray(select) ? select : [select];\n\n // Transform to field IDs if using entity IDs\n const transformedFields =\n table && useEntityIds\n ? transformFieldNamesArray(selectArray.map(String), table)\n : selectArray.map(String);\n\n return transformedFields\n .map((field) => {\n if (field
|
|
1
|
+
{"version":3,"file":"select-utils.js","sources":["../../../../src/client/builders/select-utils.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { transformFieldNamesArray } from \"../../transform\";\n\n/**\n * Determines if a field name needs to be quoted in OData queries.\n * Per FileMaker docs: field names with special characters (spaces, underscores, etc.) must be quoted.\n * Also quotes \"id\" as it's an OData reserved word.\n * Entity IDs (FMFID:*, FMTID:*) are not quoted as they're identifiers, not field names.\n *\n * @param fieldName - The field name or identifier to check\n * @returns true if the field name should be quoted in OData queries\n */\nexport function needsFieldQuoting(fieldName: string): boolean {\n // Entity IDs are identifiers and don't need quoting\n if (fieldName.startsWith(\"FMFID:\") || fieldName.startsWith(\"FMTID:\")) {\n return false;\n }\n // Always quote \"id\" as it's an OData reserved word\n if (fieldName === \"id\") return true;\n // Quote if field name contains spaces, underscores, or other special characters\n return (\n fieldName.includes(\" \") ||\n fieldName.includes(\"_\") ||\n !/^[a-zA-Z][a-zA-Z0-9]*$/.test(fieldName)\n );\n}\n\n/**\n * Formats select fields for use in OData query strings.\n * - Transforms field names to FMFIDs if using entity IDs\n * - Wraps \"id\" fields in double quotes (OData reserved)\n * - URL-encodes special characters but preserves spaces\n */\nexport function formatSelectFields(\n select: string[] | readonly string[] | undefined,\n table?: FMTable<any, any>,\n useEntityIds?: boolean,\n): string {\n if (!select || select.length === 0) return \"\";\n\n const selectArray = Array.isArray(select) ? select : [select];\n\n // Transform to field IDs if using entity IDs\n const transformedFields =\n table && useEntityIds\n ? transformFieldNamesArray(selectArray.map(String), table)\n : selectArray.map(String);\n\n return transformedFields\n .map((field) => {\n if (needsFieldQuoting(field)) return `\"${field}\"`;\n const encoded = encodeURIComponent(field);\n return encoded.replace(/%20/g, \" \");\n })\n .join(\",\");\n}\n"],"names":[],"mappings":";AAYO,SAAS,kBAAkB,WAA4B;AAE5D,MAAI,UAAU,WAAW,QAAQ,KAAK,UAAU,WAAW,QAAQ,GAAG;AAC7D,WAAA;AAAA,EAAA;AAGL,MAAA,cAAc,KAAa,QAAA;AAG7B,SAAA,UAAU,SAAS,GAAG,KACtB,UAAU,SAAS,GAAG,KACtB,CAAC,yBAAyB,KAAK,SAAS;AAE5C;AAQgB,SAAA,mBACd,QACA,OACA,cACQ;AACR,MAAI,CAAC,UAAU,OAAO,WAAW,EAAU,QAAA;AAE3C,QAAM,cAAc,MAAM,QAAQ,MAAM,IAAI,SAAS,CAAC,MAAM;AAG5D,QAAM,oBACJ,SAAS,eACL,yBAAyB,YAAY,IAAI,MAAM,GAAG,KAAK,IACvD,YAAY,IAAI,MAAM;AAErB,SAAA,kBACJ,IAAI,CAAC,UAAU;AACd,QAAI,kBAAkB,KAAK,EAAG,QAAO,IAAI,KAAK;AACxC,UAAA,UAAU,mBAAmB,KAAK;AACjC,WAAA,QAAQ,QAAQ,QAAQ,GAAG;AAAA,EAAA,CACnC,EACA,KAAK,GAAG;AACb;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type { ExecutionContext, InferSchemaType } from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { QueryBuilder } from \"./query/index\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\nimport type {\n FMTable,\n InferSchemaOutputFromFMTable,\n InferInputSchemaFromFMTable,\n InsertDataFromFMTable,\n UpdateDataFromFMTable,\n ValidExpandTarget,\n ExtractTableName,\n FMTableWithColumns,\n InferFieldOutput,\n ColumnMap,\n} from \"../orm/table\";\nimport {\n FMTable as FMTableClass,\n getDefaultSelect,\n getNavigationPaths,\n getTableName,\n getTableColumns,\n getTableFields,\n} from \"../orm/table\";\nimport type { Column } from \"../orm/column\";\nimport type { FieldBuilder } from \"../orm/field-builders\";\nimport { createLogger, InternalLogger } from \"../logger\";\n\n// Helper type to extract defaultSelect from an FMTable\n// Since TypeScript can't extract Symbol-indexed properties at the type level,\n// we simplify to return keyof InferSchemaFromFMTable<O> when O is an FMTable.\n// The actual defaultSelect logic is handled at runtime.\ntype ExtractDefaultSelect<O> =\n O extends FMTable<any, any> ? keyof InferSchemaOutputFromFMTable<O> : never;\n\n/**\n * Helper type to extract properly-typed columns from an FMTable.\n * This preserves the specific column types instead of widening to `any`.\n */\ntype ExtractColumnsFromOcc<T> =\n T extends FMTable<infer TFields, infer TName, any>\n ? TFields extends Record<string, FieldBuilder<any, any, any, any>>\n ? ColumnMap<TFields, TName>\n : never\n : never;\n\nexport class EntitySet<Occ extends FMTable<any, any>> {\n private occurrence: Occ;\n private databaseName: string;\n private context: ExecutionContext;\n private database: Database; // Database instance for accessing occurrences\n private isNavigateFromEntitySet?: boolean;\n private navigateRelation?: string;\n private navigateSourceTableName?: string;\n private navigateBasePath?: string; // Full base path for chained navigations\n private databaseUseEntityIds: boolean;\n private logger: InternalLogger;\n\n constructor(config: {\n occurrence: Occ;\n databaseName: string;\n context: ExecutionContext;\n database?: any;\n }) {\n this.occurrence = config.occurrence;\n this.databaseName = config.databaseName;\n this.context = config.context;\n this.database = config.database;\n // Get useEntityIds from database if available, otherwise default to false\n this.databaseUseEntityIds =\n (config.database as any)?._useEntityIds ?? false;\n this.logger = config.context?._getLogger?.() ?? createLogger();\n }\n\n // Type-only method to help TypeScript infer the schema from table\n static create<Occ extends FMTable<any, any>>(config: {\n occurrence: Occ;\n databaseName: string;\n context: ExecutionContext;\n database: Database;\n }): EntitySet<Occ> {\n return new EntitySet<Occ>({\n occurrence: config.occurrence,\n databaseName: config.databaseName,\n context: config.context,\n database: config.database,\n });\n }\n\n list(): QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n > {\n const builder = new QueryBuilder<Occ>({\n occurrence: this.occurrence as Occ,\n databaseName: this.databaseName,\n context: this.context,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n\n // Apply defaultSelect if occurrence exists and select hasn't been called\n if (this.occurrence) {\n // FMTable - access via helper functions\n const defaultSelectValue = getDefaultSelect(this.occurrence);\n const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n let schema: Record<string, StandardSchemaV1> | undefined;\n\n if (tableSchema) {\n // Extract schema from StandardSchemaV1\n const zodSchema = tableSchema[\"~standard\"]?.schema;\n if (\n zodSchema &&\n typeof zodSchema === \"object\" &&\n \"shape\" in zodSchema\n ) {\n schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n }\n }\n\n if (defaultSelectValue === \"schema\") {\n // Use getTableColumns to get all columns and select them\n // This is equivalent to select(getTableColumns(occurrence))\n // Cast to the declared return type - runtime behavior handles the actual selection\n const allColumns = getTableColumns(\n this.occurrence as any,\n ) as ExtractColumnsFromOcc<Occ>;\n return builder.select(allColumns).top(1000) as QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n >;\n } else if (typeof defaultSelectValue === \"object\") {\n // defaultSelectValue is a select object (Record<string, Column>)\n // Cast to the declared return type - runtime behavior handles the actual selection\n return builder\n .select(defaultSelectValue as ExtractColumnsFromOcc<Occ>)\n .top(1000) as QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n >;\n }\n // If defaultSelect is \"all\", no changes needed (current behavior)\n }\n\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (builder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n // recordId is intentionally not set (undefined) to indicate navigation from EntitySet\n };\n }\n\n // Apply default pagination limit of 1000 records to prevent stack overflow\n // with large datasets. Users can override with .top() if needed.\n return builder.top(1000);\n }\n\n get(\n id: string | number,\n ): RecordBuilder<\n Occ,\n false,\n undefined,\n keyof InferSchemaOutputFromFMTable<Occ>,\n {}\n > {\n const builder = new RecordBuilder<Occ>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n recordId: id,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n\n // Apply defaultSelect if occurrence exists\n if (this.occurrence) {\n // FMTable - access via helper functions\n const defaultSelectValue = getDefaultSelect(this.occurrence);\n const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n let schema: Record<string, StandardSchemaV1> | undefined;\n\n if (tableSchema) {\n // Extract schema from StandardSchemaV1\n const zodSchema = tableSchema[\"~standard\"]?.schema;\n if (\n zodSchema &&\n typeof zodSchema === \"object\" &&\n \"shape\" in zodSchema\n ) {\n schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n }\n }\n\n if (defaultSelectValue === \"schema\") {\n // Use getTableColumns to get all columns and select them\n // This is equivalent to select(getTableColumns(occurrence))\n // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n const allColumns = getTableColumns(\n this.occurrence as any,\n ) as ExtractColumnsFromOcc<Occ>;\n const selectedBuilder = builder.select(allColumns);\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (selectedBuilder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return selectedBuilder as any;\n } else if (\n typeof defaultSelectValue === \"object\" &&\n defaultSelectValue !== null &&\n !Array.isArray(defaultSelectValue)\n ) {\n // defaultSelectValue is a select object (Record<string, Column>)\n // Use it directly with select()\n // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n const selectedBuilder = builder.select(\n defaultSelectValue as ExtractColumnsFromOcc<Occ>,\n );\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (selectedBuilder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return selectedBuilder as any;\n }\n // If defaultSelect is \"all\", no changes needed (current behavior)\n }\n\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (builder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return builder as any;\n }\n\n // Overload: when returnFullRecord is false\n insert(\n data: InsertDataFromFMTable<Occ>,\n options: { returnFullRecord: false },\n ): InsertBuilder<Occ, \"minimal\">;\n\n // Overload: when returnFullRecord is true or omitted (default)\n insert(\n data: InsertDataFromFMTable<Occ>,\n options?: { returnFullRecord?: true },\n ): InsertBuilder<Occ, \"representation\">;\n\n // Implementation\n insert(\n data: InsertDataFromFMTable<Occ>,\n options?: { returnFullRecord?: boolean },\n ): InsertBuilder<Occ, \"minimal\" | \"representation\"> {\n const returnPreference =\n options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n\n return new InsertBuilder<Occ, typeof returnPreference>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n data: data as any, // Input type is validated/transformed at runtime\n returnPreference: returnPreference as any,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n }\n\n // Overload: when returnFullRecord is explicitly true\n update(\n data: UpdateDataFromFMTable<Occ>,\n options: { returnFullRecord: true },\n ): UpdateBuilder<Occ, \"representation\">;\n\n // Overload: when returnFullRecord is false or omitted (default)\n update(\n data: UpdateDataFromFMTable<Occ>,\n options?: { returnFullRecord?: false },\n ): UpdateBuilder<Occ, \"minimal\">;\n\n // Implementation\n update(\n data: UpdateDataFromFMTable<Occ>,\n options?: { returnFullRecord?: boolean },\n ): UpdateBuilder<Occ, \"minimal\" | \"representation\"> {\n const returnPreference =\n options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n\n return new UpdateBuilder<Occ, typeof returnPreference>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n data: data as any, // Input type is validated/transformed at runtime\n returnPreference: returnPreference as any,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n }\n\n delete(): DeleteBuilder<Occ> {\n return new DeleteBuilder<Occ>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n databaseUseEntityIds: this.databaseUseEntityIds,\n }) as any;\n }\n\n // Implementation\n navigate<TargetTable extends FMTable<any, any>>(\n targetTable: ValidExpandTarget<Occ, TargetTable>,\n ): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never> {\n // Check if it's an FMTable object or a string\n let relationName: string;\n\n // FMTable object - extract name and validate\n relationName = getTableName(targetTable);\n\n // Runtime validation: Check if relation name is in navigationPaths\n if (\n this.occurrence &&\n FMTableClass.Symbol.NavigationPaths in this.occurrence\n ) {\n const navigationPaths = (this.occurrence as any)[\n FMTableClass.Symbol.NavigationPaths\n ] as readonly string[];\n if (navigationPaths && !navigationPaths.includes(relationName)) {\n this.logger.warn(\n `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n );\n }\n }\n\n // Create EntitySet with target table\n const entitySet = new EntitySet<any>({\n occurrence: targetTable,\n databaseName: this.databaseName,\n context: this.context,\n database: this.database,\n });\n // Store the navigation info in the EntitySet\n (entitySet as any).isNavigateFromEntitySet = true;\n (entitySet as any).navigateRelation = relationName;\n\n // Build the full base path for chained navigations\n if (this.isNavigateFromEntitySet && this.navigateBasePath) {\n // Already have a base path from previous navigation - extend it with current relation\n (entitySet as any).navigateBasePath =\n `${this.navigateBasePath}/${this.navigateRelation}`;\n (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n } else if (this.isNavigateFromEntitySet && this.navigateRelation) {\n // First chained navigation - create base path from source/relation\n (entitySet as any).navigateBasePath =\n `${this.navigateSourceTableName}/${this.navigateRelation}`;\n (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n } else {\n // Initial navigation - source is just the table name\n (entitySet as any).navigateSourceTableName = getTableName(\n this.occurrence,\n );\n }\n return entitySet;\n }\n}\n"],"names":["FMTableClass"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type { ExecutionContext } from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { QueryBuilder } from \"./query/index\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\nimport type {\n FMTable,\n InferSchemaOutputFromFMTable,\n InsertDataFromFMTable,\n UpdateDataFromFMTable,\n ValidExpandTarget,\n ColumnMap,\n} from \"../orm/table\";\nimport {\n FMTable as FMTableClass,\n getDefaultSelect,\n getTableName,\n getTableColumns,\n} from \"../orm/table\";\nimport type { FieldBuilder } from \"../orm/field-builders\";\nimport { createLogger, InternalLogger } from \"../logger\";\n\n// Helper type to extract defaultSelect from an FMTable\n// Since TypeScript can't extract Symbol-indexed properties at the type level,\n// we simplify to return keyof InferSchemaFromFMTable<O> when O is an FMTable.\n// The actual defaultSelect logic is handled at runtime.\ntype ExtractDefaultSelect<O> =\n O extends FMTable<any, any> ? keyof InferSchemaOutputFromFMTable<O> : never;\n\n/**\n * Helper type to extract properly-typed columns from an FMTable.\n * This preserves the specific column types instead of widening to `any`.\n */\ntype ExtractColumnsFromOcc<T> =\n T extends FMTable<infer TFields, infer TName, any>\n ? TFields extends Record<string, FieldBuilder<any, any, any, any>>\n ? ColumnMap<TFields, TName>\n : never\n : never;\n\nexport class EntitySet<Occ extends FMTable<any, any>> {\n private occurrence: Occ;\n private databaseName: string;\n private context: ExecutionContext;\n private database: Database; // Database instance for accessing occurrences\n private isNavigateFromEntitySet?: boolean;\n private navigateRelation?: string;\n private navigateSourceTableName?: string;\n private navigateBasePath?: string; // Full base path for chained navigations\n private databaseUseEntityIds: boolean;\n private logger: InternalLogger;\n\n constructor(config: {\n occurrence: Occ;\n databaseName: string;\n context: ExecutionContext;\n database?: any;\n }) {\n this.occurrence = config.occurrence;\n this.databaseName = config.databaseName;\n this.context = config.context;\n this.database = config.database;\n // Get useEntityIds from database if available, otherwise default to false\n this.databaseUseEntityIds =\n (config.database as any)?._useEntityIds ?? false;\n this.logger = config.context?._getLogger?.() ?? createLogger();\n }\n\n // Type-only method to help TypeScript infer the schema from table\n static create<Occ extends FMTable<any, any>>(config: {\n occurrence: Occ;\n databaseName: string;\n context: ExecutionContext;\n database: Database;\n }): EntitySet<Occ> {\n return new EntitySet<Occ>({\n occurrence: config.occurrence,\n databaseName: config.databaseName,\n context: config.context,\n database: config.database,\n });\n }\n\n list(): QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n > {\n const builder = new QueryBuilder<Occ>({\n occurrence: this.occurrence as Occ,\n databaseName: this.databaseName,\n context: this.context,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n\n // Apply defaultSelect if occurrence exists and select hasn't been called\n if (this.occurrence) {\n // FMTable - access via helper functions\n const defaultSelectValue = getDefaultSelect(this.occurrence);\n const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n let schema: Record<string, StandardSchemaV1> | undefined;\n\n if (tableSchema) {\n // Extract schema from StandardSchemaV1\n const zodSchema = tableSchema[\"~standard\"]?.schema;\n if (\n zodSchema &&\n typeof zodSchema === \"object\" &&\n \"shape\" in zodSchema\n ) {\n schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n }\n }\n\n if (defaultSelectValue === \"schema\") {\n // Use getTableColumns to get all columns and select them\n // This is equivalent to select(getTableColumns(occurrence))\n // Cast to the declared return type - runtime behavior handles the actual selection\n const allColumns = getTableColumns(\n this.occurrence,\n ) as ExtractColumnsFromOcc<Occ>;\n return builder.select(allColumns).top(1000) as QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n >;\n } else if (typeof defaultSelectValue === \"object\") {\n // defaultSelectValue is a select object (Record<string, Column>)\n // Cast to the declared return type - runtime behavior handles the actual selection\n return builder\n .select(defaultSelectValue as ExtractColumnsFromOcc<Occ>)\n .top(1000) as QueryBuilder<\n Occ,\n keyof InferSchemaOutputFromFMTable<Occ>,\n false,\n false,\n {}\n >;\n }\n // If defaultSelect is \"all\", no changes needed (current behavior)\n }\n\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (builder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n // recordId is intentionally not set (undefined) to indicate navigation from EntitySet\n };\n }\n\n // Apply default pagination limit of 1000 records to prevent stack overflow\n // with large datasets. Users can override with .top() if needed.\n return builder.top(1000);\n }\n\n get(\n id: string | number,\n ): RecordBuilder<\n Occ,\n false,\n undefined,\n keyof InferSchemaOutputFromFMTable<Occ>,\n {}\n > {\n const builder = new RecordBuilder<Occ>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n recordId: id,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n\n // Apply defaultSelect if occurrence exists\n if (this.occurrence) {\n // FMTable - access via helper functions\n const defaultSelectValue = getDefaultSelect(this.occurrence);\n const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n let schema: Record<string, StandardSchemaV1> | undefined;\n\n if (tableSchema) {\n // Extract schema from StandardSchemaV1\n const zodSchema = tableSchema[\"~standard\"]?.schema;\n if (\n zodSchema &&\n typeof zodSchema === \"object\" &&\n \"shape\" in zodSchema\n ) {\n schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n }\n }\n\n if (defaultSelectValue === \"schema\") {\n // Use getTableColumns to get all columns and select them\n // This is equivalent to select(getTableColumns(occurrence))\n // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n const allColumns = getTableColumns(\n this.occurrence as any,\n ) as ExtractColumnsFromOcc<Occ>;\n const selectedBuilder = builder.select(allColumns);\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (selectedBuilder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return selectedBuilder as any;\n } else if (\n typeof defaultSelectValue === \"object\" &&\n defaultSelectValue !== null &&\n !Array.isArray(defaultSelectValue)\n ) {\n // defaultSelectValue is a select object (Record<string, Column>)\n // Use it directly with select()\n // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n const selectedBuilder = builder.select(\n defaultSelectValue as ExtractColumnsFromOcc<Occ>,\n );\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (selectedBuilder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return selectedBuilder as any;\n }\n // If defaultSelect is \"all\", no changes needed (current behavior)\n }\n\n // Propagate navigation context if present\n if (\n this.isNavigateFromEntitySet &&\n this.navigateRelation &&\n this.navigateSourceTableName\n ) {\n (builder as any).navigation = {\n relation: this.navigateRelation,\n sourceTableName: this.navigateSourceTableName,\n basePath: this.navigateBasePath,\n };\n }\n return builder as any;\n }\n\n // Overload: when returnFullRecord is false\n insert(\n data: InsertDataFromFMTable<Occ>,\n options: { returnFullRecord: false },\n ): InsertBuilder<Occ, \"minimal\">;\n\n // Overload: when returnFullRecord is true or omitted (default)\n insert(\n data: InsertDataFromFMTable<Occ>,\n options?: { returnFullRecord?: true },\n ): InsertBuilder<Occ, \"representation\">;\n\n // Implementation\n insert(\n data: InsertDataFromFMTable<Occ>,\n options?: { returnFullRecord?: boolean },\n ): InsertBuilder<Occ, \"minimal\" | \"representation\"> {\n const returnPreference =\n options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n\n return new InsertBuilder<Occ, typeof returnPreference>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n data: data as any, // Input type is validated/transformed at runtime\n returnPreference: returnPreference as any,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n }\n\n // Overload: when returnFullRecord is explicitly true\n update(\n data: UpdateDataFromFMTable<Occ>,\n options: { returnFullRecord: true },\n ): UpdateBuilder<Occ, \"representation\">;\n\n // Overload: when returnFullRecord is false or omitted (default)\n update(\n data: UpdateDataFromFMTable<Occ>,\n options?: { returnFullRecord?: false },\n ): UpdateBuilder<Occ, \"minimal\">;\n\n // Implementation\n update(\n data: UpdateDataFromFMTable<Occ>,\n options?: { returnFullRecord?: boolean },\n ): UpdateBuilder<Occ, \"minimal\" | \"representation\"> {\n const returnPreference =\n options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n\n return new UpdateBuilder<Occ, typeof returnPreference>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n data: data as any, // Input type is validated/transformed at runtime\n returnPreference: returnPreference as any,\n databaseUseEntityIds: this.databaseUseEntityIds,\n });\n }\n\n delete(): DeleteBuilder<Occ> {\n return new DeleteBuilder<Occ>({\n occurrence: this.occurrence,\n databaseName: this.databaseName,\n context: this.context,\n databaseUseEntityIds: this.databaseUseEntityIds,\n }) as any;\n }\n\n // Implementation\n navigate<TargetTable extends FMTable<any, any>>(\n targetTable: ValidExpandTarget<Occ, TargetTable>,\n ): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never> {\n // Check if it's an FMTable object or a string\n let relationName: string;\n\n // FMTable object - extract name and validate\n relationName = getTableName(targetTable);\n\n // Runtime validation: Check if relation name is in navigationPaths\n if (\n this.occurrence &&\n FMTableClass.Symbol.NavigationPaths in this.occurrence\n ) {\n const navigationPaths = (this.occurrence as any)[\n FMTableClass.Symbol.NavigationPaths\n ] as readonly string[];\n if (navigationPaths && !navigationPaths.includes(relationName)) {\n this.logger.warn(\n `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n );\n }\n }\n\n // Create EntitySet with target table\n const entitySet = new EntitySet<any>({\n occurrence: targetTable,\n databaseName: this.databaseName,\n context: this.context,\n database: this.database,\n });\n // Store the navigation info in the EntitySet\n (entitySet as any).isNavigateFromEntitySet = true;\n (entitySet as any).navigateRelation = relationName;\n\n // Build the full base path for chained navigations\n if (this.isNavigateFromEntitySet && this.navigateBasePath) {\n // Already have a base path from previous navigation - extend it with current relation\n (entitySet as any).navigateBasePath =\n `${this.navigateBasePath}/${this.navigateRelation}`;\n (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n } else if (this.isNavigateFromEntitySet && this.navigateRelation) {\n // First chained navigation - create base path from source/relation\n (entitySet as any).navigateBasePath =\n `${this.navigateSourceTableName}/${this.navigateRelation}`;\n (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n } else {\n // Initial navigation - source is just the table name\n (entitySet as any).navigateSourceTableName = getTableName(\n this.occurrence,\n );\n }\n return entitySet;\n }\n}\n"],"names":["FMTableClass"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-parser.js","sources":["../../../src/client/error-parser.ts"],"sourcesContent":["import {\n HTTPError,\n ODataError,\n SchemaLockedError,\n FMODataErrorType,\n} from \"../errors\";\nimport { safeJsonParse } from \"./sanitize-json\";\n\n/**\n * Parses an error response and returns an appropriate error object.\n * This helper is used by builder processResponse methods to handle error responses\n * consistently, particularly important for batch operations where errors need to be\n * properly parsed from the response body.\n *\n * @param response - The Response object (may be from batch or direct request)\n * @param url - The URL that was requested (for error context)\n * @returns An appropriate error object (ODataError, SchemaLockedError, or HTTPError)\n */\nexport async function parseErrorResponse(\n response: Response,\n url: string,\n): Promise<FMODataErrorType> {\n // Try to parse error body if it's JSON\n let errorBody
|
|
1
|
+
{"version":3,"file":"error-parser.js","sources":["../../../src/client/error-parser.ts"],"sourcesContent":["import {\n HTTPError,\n ODataError,\n SchemaLockedError,\n FMODataErrorType,\n} from \"../errors\";\nimport { safeJsonParse } from \"./sanitize-json\";\n\n/**\n * Parses an error response and returns an appropriate error object.\n * This helper is used by builder processResponse methods to handle error responses\n * consistently, particularly important for batch operations where errors need to be\n * properly parsed from the response body.\n *\n * @param response - The Response object (may be from batch or direct request)\n * @param url - The URL that was requested (for error context)\n * @returns An appropriate error object (ODataError, SchemaLockedError, or HTTPError)\n */\nexport async function parseErrorResponse(\n response: Response,\n url: string,\n): Promise<FMODataErrorType> {\n // Try to parse error body if it's JSON\n let errorBody:\n | { error?: { code?: string | number; message?: string } }\n | undefined;\n\n try {\n if (response.headers.get(\"content-type\")?.includes(\"application/json\")) {\n errorBody = await safeJsonParse<typeof errorBody>(response);\n }\n } catch {\n // Ignore JSON parse errors - we'll fall back to HTTPError\n }\n\n // Check if it's an OData error response\n if (errorBody?.error) {\n const errorCode = errorBody.error.code;\n const errorMessage = errorBody.error.message || response.statusText;\n\n // Check for schema locked error (code 303)\n if (errorCode === \"303\" || errorCode === 303) {\n return new SchemaLockedError(url, errorMessage, errorBody.error);\n }\n\n return new ODataError(\n url,\n errorMessage,\n String(errorCode),\n errorBody.error,\n );\n }\n\n // Fall back to generic HTTPError\n return new HTTPError(url, response.status, response.statusText, errorBody);\n}\n"],"names":[],"mappings":";;AAkBsB,eAAA,mBACpB,UACA,KAC2B;;AAEvB,MAAA;AAIA,MAAA;AACF,SAAI,cAAS,QAAQ,IAAI,cAAc,MAAnC,mBAAsC,SAAS,qBAAqB;AAC1D,kBAAA,MAAM,cAAgC,QAAQ;AAAA,IAAA;AAAA,EAC5D,QACM;AAAA,EAAA;AAKR,MAAI,uCAAW,OAAO;AACd,UAAA,YAAY,UAAU,MAAM;AAClC,UAAM,eAAe,UAAU,MAAM,WAAW,SAAS;AAGrD,QAAA,cAAc,SAAS,cAAc,KAAK;AAC5C,aAAO,IAAI,kBAAkB,KAAK,cAAc,UAAU,KAAK;AAAA,IAAA;AAGjE,WAAO,IAAI;AAAA,MACT;AAAA,MACA;AAAA,MACA,OAAO,SAAS;AAAA,MAChB,UAAU;AAAA,IACZ;AAAA,EAAA;AAIF,SAAO,IAAI,UAAU,KAAK,SAAS,QAAQ,SAAS,YAAY,SAAS;AAC3E;"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isColumn } from "./column.js";
|
|
2
|
+
import { needsFieldQuoting } from "../client/builders/select-utils.js";
|
|
2
3
|
class FilterExpression {
|
|
3
4
|
constructor(operator, operands) {
|
|
4
5
|
this.operator = operator;
|
|
@@ -110,7 +111,8 @@ class FilterExpression {
|
|
|
110
111
|
}
|
|
111
112
|
_operandToString(operand, useEntityIds, column) {
|
|
112
113
|
if (isColumn(operand)) {
|
|
113
|
-
|
|
114
|
+
const fieldIdentifier = operand.getFieldIdentifier(useEntityIds);
|
|
115
|
+
return needsFieldQuoting(fieldIdentifier) ? `"${fieldIdentifier}"` : fieldIdentifier;
|
|
114
116
|
}
|
|
115
117
|
let value = operand;
|
|
116
118
|
if (column == null ? void 0 : column.inputValidator) {
|
|
@@ -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 // 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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"}
|
|
1
|
+
{"version":3,"file":"operators.js","sources":["../../../src/orm/operators.ts"],"sourcesContent":["import type { Column } from \"./column\";\nimport { isColumn } from \"./column\";\nimport { needsFieldQuoting } from \"../client/builders/select-utils\";\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 const fieldIdentifier = operand.getFieldIdentifier(useEntityIds);\n // Quote field names in OData filters per FileMaker OData API requirements\n return needsFieldQuoting(fieldIdentifier)\n ? `\"${fieldIdentifier}\"`\n : fieldIdentifier;\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
|
@@ -338,5 +338,5 @@ export declare function getTableId<T extends FMTable<any, any>>(table: T): strin
|
|
|
338
338
|
* @param table - FMTable instance
|
|
339
339
|
* @returns Object with all columns from the table
|
|
340
340
|
*/
|
|
341
|
-
export declare function getTableColumns<T extends
|
|
341
|
+
export declare function getTableColumns<T extends FMTable<any, any>>(table: T): ColumnMap<T[typeof FMTableFields], ExtractTableName<T>>;
|
|
342
342
|
export {};
|
|
@@ -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, 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":"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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 FMTable<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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,30 @@
|
|
|
1
1
|
import type { FMTable } from "../../orm/table";
|
|
2
2
|
import { transformFieldNamesArray } from "../../transform";
|
|
3
3
|
|
|
4
|
+
/**
|
|
5
|
+
* Determines if a field name needs to be quoted in OData queries.
|
|
6
|
+
* Per FileMaker docs: field names with special characters (spaces, underscores, etc.) must be quoted.
|
|
7
|
+
* Also quotes "id" as it's an OData reserved word.
|
|
8
|
+
* Entity IDs (FMFID:*, FMTID:*) are not quoted as they're identifiers, not field names.
|
|
9
|
+
*
|
|
10
|
+
* @param fieldName - The field name or identifier to check
|
|
11
|
+
* @returns true if the field name should be quoted in OData queries
|
|
12
|
+
*/
|
|
13
|
+
export function needsFieldQuoting(fieldName: string): boolean {
|
|
14
|
+
// Entity IDs are identifiers and don't need quoting
|
|
15
|
+
if (fieldName.startsWith("FMFID:") || fieldName.startsWith("FMTID:")) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
// Always quote "id" as it's an OData reserved word
|
|
19
|
+
if (fieldName === "id") return true;
|
|
20
|
+
// Quote if field name contains spaces, underscores, or other special characters
|
|
21
|
+
return (
|
|
22
|
+
fieldName.includes(" ") ||
|
|
23
|
+
fieldName.includes("_") ||
|
|
24
|
+
!/^[a-zA-Z][a-zA-Z0-9]*$/.test(fieldName)
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
|
|
4
28
|
/**
|
|
5
29
|
* Formats select fields for use in OData query strings.
|
|
6
30
|
* - Transforms field names to FMFIDs if using entity IDs
|
|
@@ -24,11 +48,9 @@ export function formatSelectFields(
|
|
|
24
48
|
|
|
25
49
|
return transformedFields
|
|
26
50
|
.map((field) => {
|
|
27
|
-
if (field
|
|
51
|
+
if (needsFieldQuoting(field)) return `"${field}"`;
|
|
28
52
|
const encoded = encodeURIComponent(field);
|
|
29
53
|
return encoded.replace(/%20/g, " ");
|
|
30
54
|
})
|
|
31
55
|
.join(",");
|
|
32
56
|
}
|
|
33
|
-
|
|
34
|
-
|
package/src/client/entity-set.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ExecutionContext
|
|
1
|
+
import type { ExecutionContext } from "../types";
|
|
2
2
|
import type { StandardSchemaV1 } from "@standard-schema/spec";
|
|
3
3
|
import { QueryBuilder } from "./query/index";
|
|
4
4
|
import { RecordBuilder } from "./record-builder";
|
|
@@ -9,24 +9,17 @@ import { Database } from "./database";
|
|
|
9
9
|
import type {
|
|
10
10
|
FMTable,
|
|
11
11
|
InferSchemaOutputFromFMTable,
|
|
12
|
-
InferInputSchemaFromFMTable,
|
|
13
12
|
InsertDataFromFMTable,
|
|
14
13
|
UpdateDataFromFMTable,
|
|
15
14
|
ValidExpandTarget,
|
|
16
|
-
ExtractTableName,
|
|
17
|
-
FMTableWithColumns,
|
|
18
|
-
InferFieldOutput,
|
|
19
15
|
ColumnMap,
|
|
20
16
|
} from "../orm/table";
|
|
21
17
|
import {
|
|
22
18
|
FMTable as FMTableClass,
|
|
23
19
|
getDefaultSelect,
|
|
24
|
-
getNavigationPaths,
|
|
25
20
|
getTableName,
|
|
26
21
|
getTableColumns,
|
|
27
|
-
getTableFields,
|
|
28
22
|
} from "../orm/table";
|
|
29
|
-
import type { Column } from "../orm/column";
|
|
30
23
|
import type { FieldBuilder } from "../orm/field-builders";
|
|
31
24
|
import { createLogger, InternalLogger } from "../logger";
|
|
32
25
|
|
|
@@ -129,7 +122,7 @@ export class EntitySet<Occ extends FMTable<any, any>> {
|
|
|
129
122
|
// This is equivalent to select(getTableColumns(occurrence))
|
|
130
123
|
// Cast to the declared return type - runtime behavior handles the actual selection
|
|
131
124
|
const allColumns = getTableColumns(
|
|
132
|
-
this.occurrence
|
|
125
|
+
this.occurrence,
|
|
133
126
|
) as ExtractColumnsFromOcc<Occ>;
|
|
134
127
|
return builder.select(allColumns).top(1000) as QueryBuilder<
|
|
135
128
|
Occ,
|
|
@@ -21,8 +21,10 @@ export async function parseErrorResponse(
|
|
|
21
21
|
url: string,
|
|
22
22
|
): Promise<FMODataErrorType> {
|
|
23
23
|
// Try to parse error body if it's JSON
|
|
24
|
-
let errorBody:
|
|
25
|
-
|
|
24
|
+
let errorBody:
|
|
25
|
+
| { error?: { code?: string | number; message?: string } }
|
|
26
|
+
| undefined;
|
|
27
|
+
|
|
26
28
|
try {
|
|
27
29
|
if (response.headers.get("content-type")?.includes("application/json")) {
|
|
28
30
|
errorBody = await safeJsonParse<typeof errorBody>(response);
|
|
@@ -52,11 +54,3 @@ export async function parseErrorResponse(
|
|
|
52
54
|
// Fall back to generic HTTPError
|
|
53
55
|
return new HTTPError(url, response.status, response.statusText, errorBody);
|
|
54
56
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
package/src/orm/operators.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Column } from "./column";
|
|
2
2
|
import { isColumn } from "./column";
|
|
3
|
+
import { needsFieldQuoting } from "../client/builders/select-utils";
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
* FilterExpression represents a filter condition that can be used in where() clauses.
|
|
@@ -146,7 +147,11 @@ export class FilterExpression {
|
|
|
146
147
|
column?: Column<any, any, any, any>,
|
|
147
148
|
): string {
|
|
148
149
|
if (isColumn(operand)) {
|
|
149
|
-
|
|
150
|
+
const fieldIdentifier = operand.getFieldIdentifier(useEntityIds);
|
|
151
|
+
// Quote field names in OData filters per FileMaker OData API requirements
|
|
152
|
+
return needsFieldQuoting(fieldIdentifier)
|
|
153
|
+
? `"${fieldIdentifier}"`
|
|
154
|
+
: fieldIdentifier;
|
|
150
155
|
}
|
|
151
156
|
|
|
152
157
|
// If we have a column with an input validator, apply it to transform the value
|
package/src/orm/table.ts
CHANGED
|
@@ -743,7 +743,7 @@ export function getTableId<T extends FMTable<any, any>>(table: T): string {
|
|
|
743
743
|
* @param table - FMTable instance
|
|
744
744
|
* @returns Object with all columns from the table
|
|
745
745
|
*/
|
|
746
|
-
export function getTableColumns<T extends
|
|
746
|
+
export function getTableColumns<T extends FMTable<any, any>>(
|
|
747
747
|
table: T,
|
|
748
748
|
): ColumnMap<T[typeof FMTableFields], ExtractTableName<T>> {
|
|
749
749
|
const fields = table[FMTableFields];
|