npm - @proofkit/fmdapi - Versions diffs - 5.0.0-beta.0 → 5.0.1-beta.1 - Mend

@proofkit/fmdapi 5.0.0-beta.0 → 5.0.1-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/README.md +1 -103
package/dist/esm/client-types.d.ts +3 -3
package/dist/esm/client-types.js +1 -1
package/dist/esm/client-types.js.map +1 -1
package/dist/esm/client.d.ts +19 -19
package/dist/esm/client.js +7 -6
package/dist/esm/client.js.map +1 -1
package/package.json +7 -7
package/src/client-types.ts +1 -1
package/src/client.ts +13 -8
package/stubs/fmschema.config.stub.js +0 -17
package/stubs/fmschema.config.stub.mjs +0 -17

package/README.md CHANGED Viewed

@@ -5,106 +5,4 @@
 # Claris FileMaker Data API Client for TypeScript
-This package is designed to make working with the FileMaker Data API much easier. Here's just a few key features:
-- Handles token refresh for you automatically
-- [Otto](https://ottofms.com/) Data API proxy support
-- TypeScript support for easy auto-completion of your fields
-- Automated type generation based on layout metadata
-- Supports both node and edge runtimes with a customizable token store
-- Customizable adapters allow usage even within the [FileMaker WebViewer](https://fm-webviewer-fetch.proofgeist.com/).
-## Installation
-This library requires zod as a peer depenency and Node 18 or later
-```sh
-npm install @proofgeist/fmdapi zod
-```
-```sh
-yarn add @proofgeist/fmdapi zod
-```
-## Upgrading to v4
-Version 4 changes the way the client is created to allow for Custom Adapters, but the methods on the client remain the same. If you are using the codegen CLI tool, simply re-run codegen after upgrading to apply the changes.
-## Quick Start
-> Note: For the best experience, use the [codegen tool](https://github.com/proofgeist/fmdapi/wiki/codegen) to generate layout-specific clients and get autocomplete hints in your IDE with your actual field names. This minimal example just demonstrates the basic setup
-Add the following envnironment variables to your project's `.env` file:
-```sh
-FM_DATABASE=filename.fmp12
-FM_SERVER=https://filemaker.example.com
-# if you want to use the OttoFMS Data API Proxy
-OTTO_API_KEY=dk_123456...789
-# otherwise
-FM_USERNAME=admin
-FM_PASSWORD=password
-```
-Initialize the client with credentials, depending on your adapter
-```typescript
-// to use the OttoFMS Data API Proxy
-import { DataApi, OttoAdapter } from "@proofgeist/fmdapi";
-const client = DataApi({
-  adapter: new OttoAdapter({
-    auth: { apiKey: process.env.OTTO_API_KEY },
-    db: process.env.FM_DATABASE,
-    server: process.env.FM_SERVER,
-  }),
-});
-```
-```typescript
-// to use the raw Data API
-import { DataApi, FetchAdapter } from "@proofgeist/fmdapi";
-const client = DataApi({
-  adapter: new FetchAdapter({
-    auth: {
-      username: process.env.FM_USERNAME,
-      password: process.env.FM_PASSWORD,
-    },
-    db: process.env.FM_DATABASE,
-    server: process.env.FM_SERVER,
-  }),
-});
-```
-Then, use the client to query your FileMaker database. [View all available methods here](https://github.com/proofgeist/fmdapi/wiki/methods).
-Basic Example:
-```typescript
-const result = await client.list({ layout: "Contacts" });
-```
-## TypeScript Support
-The basic client will return the generic FileMaker response object by default. You can also create a type for your exepcted response and get a fully typed response that includes your own fields.
-```typescript
-type TContact = {
-  name: string;
-  email: string;
-  phone: string;
-};
-const result = await client.list<TContact>({ layout: "Contacts" });
-```
-💡 TIP: For a more ergonomic TypeScript experience, use the [included codegen tool](https://github.com/proofgeist/fmdapi/wiki/codegen) to generate these types based on your FileMaker layout metadata.
-For full docs, see the [wiki](https://github.com/proofgeist/fmdapi/wiki)
-## Edge Runtime Support (v3.0+)
-Since version 3.0 uses the native `fetch` API, it is compatible with edge runtimes, but there are some additional considerations to avoid overwhelming your FileMaker server with too many connections. If you are developing for the edge, be sure to implement one of the following strategies:
-- ✅ Use a custom token store (see above) with a persistent storage method such as Upstash
-- ✅ Use a proxy such as the [Otto Data API Proxy](https://www.ottofms.com/docs/otto/working-with-otto/proxy-api-keys/data-api) which handles management of the access tokens itself.
-  - Providing an API key to the client instead of username/password will automatically use the Otto proxy
+For full documentation, see [proofkit.dev/docs/fmdapi](https://proofkit.dev/docs/fmdapi).

package/dist/esm/client-types.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 export declare const ZFieldValue: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodNull, z.ZodUnknown]>;
 export type FieldValue = z.infer<typeof ZFieldValue>;
 export declare const ZFieldData: z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodNull, z.ZodUnknown]>>;
@@ -42,7 +42,7 @@ declare const ZScriptResponse: z.ZodObject<{
     "scriptError.prerequest": z.ZodOptional<z.ZodString>;
     "scriptResult.presort": z.ZodOptional<z.ZodString>;
     "scriptError.presort": z.ZodOptional<z.ZodString>;
-}, {}, {}>;
+}, z.core.$strip>;
 export type ScriptResponse = z.infer<typeof ZScriptResponse>;
 export declare const ZDataInfo: z.ZodObject<{
     database: z.ZodString;
@@ -51,7 +51,7 @@ export declare const ZDataInfo: z.ZodObject<{
     totalRecordCount: z.ZodNumber;
     foundCount: z.ZodNumber;
     returnedCount: z.ZodNumber;
-}, {}, {}>;
+}, z.core.$strip>;
 export type DataInfo = z.infer<typeof ZDataInfo>;
 export type CreateParams<U extends GenericPortalData = GenericPortalData> = ScriptParams & {
     portalData?: UpdatePortalsWithIds<U>;

package/dist/esm/client-types.js CHANGED Viewed

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { z } from "zod";
+import { z } from "zod/v4";
 const ZFieldValue = z.union([
   z.string(),
   z.number(),

package/dist/esm/client-types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client-types.js","sources":["../../src/client-types.ts"],"sourcesContent":["import { z } from \"zod\";\n\nexport const ZFieldValue = z.union([\n z.string(),\n z.number(),\n z.null(),\n z.unknown(),\n]);\nexport type FieldValue = z.infer<typeof ZFieldValue>;\n\nexport const ZFieldData = z.record(z.string(), ZFieldValue);\nexport type FieldData = Record<string, unknown>;\n\nexport type GenericPortalData = {\n [key: string]: {\n [x: string]: string \| number \| null \| unknown;\n };\n};\n\nexport type PortalsWithIds<U extends GenericPortalData = GenericPortalData> = {\n [key in keyof U]: Array<\n U[key] & {\n recordId: string;\n modId: string;\n }\n >;\n};\nexport type UpdatePortalsWithIds<\n U extends GenericPortalData = GenericPortalData,\n> = {\n [key in keyof U]: Array<\n U[key] & {\n recordId: string;\n modId?: string;\n }\n >;\n};\n\nexport type FMRecord<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = {\n fieldData: T;\n recordId: string;\n modId: string;\n portalData: PortalsWithIds<U>;\n};\n\nexport type ScriptParams = {\n script?: string;\n \"script.param\"?: string;\n \"script.prerequest\"?: string;\n \"script.prerequest.param\"?: string;\n \"script.presort\"?: string;\n \"script.presort.param\"?: string;\n timeout?: number;\n};\n\nconst ZScriptResponse = z.object({\n scriptResult: z.string().optional(),\n scriptError: z.string().optional(),\n \"scriptResult.prerequest\": z.string().optional(),\n \"scriptError.prerequest\": z.string().optional(),\n \"scriptResult.presort\": z.string().optional(),\n \"scriptError.presort\": z.string().optional(),\n});\nexport type ScriptResponse = z.infer<typeof ZScriptResponse>;\n\nexport const ZDataInfo = z.object({\n database: z.string(),\n layout: z.string(),\n table: z.string(),\n totalRecordCount: z.number(),\n foundCount: z.number(),\n returnedCount: z.number(),\n});\nexport type DataInfo = z.infer<typeof ZDataInfo>;\n\nexport type CreateParams<U extends GenericPortalData = GenericPortalData> =\n ScriptParams & { portalData?: UpdatePortalsWithIds<U> };\n\nexport type CreateResponse = ScriptResponse & {\n recordId: string;\n modId: string;\n};\n\nexport type UpdateParams<U extends GenericPortalData = GenericPortalData> =\n CreateParams<U> & {\n modId?: number;\n };\n\nexport type UpdateResponse = ScriptResponse & {\n modId: string;\n};\n\nexport type DeleteParams = ScriptParams;\n\nexport type DeleteResponse = ScriptResponse;\n\nexport type RangeParams = {\n offset?: number;\n limit?: number;\n};\nexport type RangeParamsRaw = {\n _offset?: number;\n _limit?: number;\n};\n\nexport type PortalRanges<U extends GenericPortalData = GenericPortalData> =\n Partial<{ [key in keyof U]: RangeParams }>;\n\nexport type PortalRangesParams<\n U extends GenericPortalData = GenericPortalData,\n> = {\n portalRanges?: PortalRanges<U>;\n};\n\nexport type GetParams<U extends GenericPortalData = GenericPortalData> =\n ScriptParams &\n PortalRangesParams<U> & {\n \"layout.response\"?: string;\n dateformats?: \"US\" \| \"file_locale\" \| \"ISO8601\";\n };\n\nexport type Sort<T extends FieldData = FieldData> = {\n fieldName: keyof T;\n sortOrder?: \"ascend\" \| \"descend\" \| (string & {});\n};\n\nexport type ListParams<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = GetParams<U> &\n RangeParams & {\n sort?: Sort<T> \| Array<Sort<T>>;\n };\n\nexport type ListParamsRaw<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = GetParams<U> &\n RangeParamsRaw & {\n _sort?: Array<Sort<T>>;\n };\n\nexport type GetResponse<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = ScriptResponse & {\n data: Array<FMRecord<T, U>>;\n dataInfo: DataInfo;\n};\nexport type GetResponseOne<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = ScriptResponse & {\n data: FMRecord<T, U>;\n dataInfo: DataInfo;\n};\n\ntype SecondLevelKeys<T> = {\n [K in keyof T]: keyof T[K];\n}[keyof T];\nexport type Query<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = Partial<{\n [key in keyof T]: T[key] extends number ? number \| string : string;\n}> &\n Partial<{ [key in SecondLevelKeys<U>]?: string }> & {\n omit?: \"true\";\n };\n\nexport type LayoutMetadataResponse = {\n fieldMetaData: FieldMetaData[];\n portalMetaData: { [key: string]: FieldMetaData[] };\n valueLists?: ValueList[];\n};\nexport type ProductInfoMetadataResponse = {\n name: string;\n dateFormat: string;\n timeFormat: string;\n timeStampFormat: string;\n};\nexport type DatabaseMetadataResponse = {\n databases: Array<{\n name: string;\n }>;\n};\n\nexport type FieldMetaData = {\n name: string;\n type: \"normal\" \| \"calculation\" \| \"summary\";\n displayType:\n \| \"editText\"\n \| \"popupList\"\n \| \"popupMenu\"\n \| \"checkBox\"\n \| \"calendar\"\n \| \"radioButtons\"\n \| \"secureText\";\n result: \"text\" \| \"number\" \| \"date\" \| \"time\" \| \"timeStamp\" \| \"container\";\n global: boolean;\n autoEnter: boolean;\n fourDigitYear: boolean;\n maxRepeat: number;\n maxCharacters: number;\n notEmpty: boolean;\n numeric: boolean;\n repetitions: number;\n timeOfDay: boolean;\n valueList?: string;\n};\n\ntype ValueList = {\n name: string;\n // TODO need to test type of value list from other file\n type: \"customList\" \| \"byField\";\n values: Array<{ value: string; displayValue: string }>;\n};\n\n/*\n Represents the data returned by a call to the Data API `layouts` endpoint.\n /\nexport type AllLayoutsMetadataResponse = {\n /\n A list of `Layout` or `LayoutsFolder` objects.\n /\n layouts: LayoutOrFolder[];\n};\n\n/\n Represents a FileMaker layout.\n /\nexport type Layout = {\n /\n The name of the layout\n /\n name: string;\n /\n If the node is a layout, `table` may contain the name of the table\n * the layout is associated with.\n /\n table: string;\n};\n\n/\n Represents a folder of `Layout` or `LayoutsFolder` objects.\n /\nexport type LayoutsFolder = {\n /\n The name of the folder\n /\n name: string;\n isFolder: boolean;\n /\n A list of the Layout or LayoutsFolder objects in the folder.\n /\n folderLayoutNames?: LayoutOrFolder[];\n};\n\nexport type LayoutOrFolder = Layout \| LayoutsFolder;\n\n/\n Represents the data returned by a call to the Data API `scripts` endpoint.\n /\nexport type ScriptsMetadataResponse = {\n /\n A list of `Layout` or `LayoutsFolder` objects.\n */\n scripts: ScriptOrFolder[];\n};\ntype Script = {\n name: string;\n isFolder: false;\n};\ntype ScriptFolder = {\n name: string;\n isFolder: true;\n folderScriptNames: ScriptOrFolder[];\n};\nexport type ScriptOrFolder = Script \| ScriptFolder;\n\nexport type RawFMResponse<T = unknown> = {\n response?: T;\n messages?: [{ code: string }];\n};\n\nexport class FileMakerError extends Error {\n public readonly code: string;\n\n public constructor(code: string, message: string) {\n super(message);\n this.code = code;\n }\n}\n"],"names":[],"mappings":";;;;AAEa,MAAA,cAAc,EAAE,MAAM;AAAA,EACjC,EAAE,OAAO;AAAA,EACT,EAAE,OAAO;AAAA,EACT,EAAE,KAAK;AAAA,EACP,EAAE,QAAQ;AACZ,CAAC;AAGM,MAAM,aAAa,EAAE,OAAO,EAAE,UAAU,WAAW;AAgDlC,EAAE,OAAO;AAAA,EAC/B,cAAc,EAAE,OAAO,EAAE,SAAS;AAAA,EAClC,aAAa,EAAE,OAAO,EAAE,SAAS;AAAA,EACjC,2BAA2B,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/C,0BAA0B,EAAE,OAAO,EAAE,SAAS;AAAA,EAC9C,wBAAwB,EAAE,OAAO,EAAE,SAAS;AAAA,EAC5C,uBAAuB,EAAE,OAAO,EAAE,SAAS;AAC7C,CAAC;AAGY,MAAA,YAAY,EAAE,OAAO;AAAA,EAChC,UAAU,EAAE,OAAO;AAAA,EACnB,QAAQ,EAAE,OAAO;AAAA,EACjB,OAAO,EAAE,OAAO;AAAA,EAChB,kBAAkB,EAAE,OAAO;AAAA,EAC3B,YAAY,EAAE,OAAO;AAAA,EACrB,eAAe,EAAE,OAAO;AAC1B,CAAC;AAqNM,MAAM,uBAAuB,MAAM;AAAA,EAGjC,YAAY,MAAc,SAAiB;AAChD,UAAM,OAAO;AAHC;AAId,SAAK,OAAO;AAAA,EAAA;AAEhB;"}
1	+ {"version":3,"file":"client-types.js","sources":["../../src/client-types.ts"],"sourcesContent":["import { z } from \"zod/v4\";\n\nexport const ZFieldValue = z.union([\n z.string(),\n z.number(),\n z.null(),\n z.unknown(),\n]);\nexport type FieldValue = z.infer<typeof ZFieldValue>;\n\nexport const ZFieldData = z.record(z.string(), ZFieldValue);\nexport type FieldData = Record<string, unknown>;\n\nexport type GenericPortalData = {\n [key: string]: {\n [x: string]: string \| number \| null \| unknown;\n };\n};\n\nexport type PortalsWithIds<U extends GenericPortalData = GenericPortalData> = {\n [key in keyof U]: Array<\n U[key] & {\n recordId: string;\n modId: string;\n }\n >;\n};\nexport type UpdatePortalsWithIds<\n U extends GenericPortalData = GenericPortalData,\n> = {\n [key in keyof U]: Array<\n U[key] & {\n recordId: string;\n modId?: string;\n }\n >;\n};\n\nexport type FMRecord<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = {\n fieldData: T;\n recordId: string;\n modId: string;\n portalData: PortalsWithIds<U>;\n};\n\nexport type ScriptParams = {\n script?: string;\n \"script.param\"?: string;\n \"script.prerequest\"?: string;\n \"script.prerequest.param\"?: string;\n \"script.presort\"?: string;\n \"script.presort.param\"?: string;\n timeout?: number;\n};\n\nconst ZScriptResponse = z.object({\n scriptResult: z.string().optional(),\n scriptError: z.string().optional(),\n \"scriptResult.prerequest\": z.string().optional(),\n \"scriptError.prerequest\": z.string().optional(),\n \"scriptResult.presort\": z.string().optional(),\n \"scriptError.presort\": z.string().optional(),\n});\nexport type ScriptResponse = z.infer<typeof ZScriptResponse>;\n\nexport const ZDataInfo = z.object({\n database: z.string(),\n layout: z.string(),\n table: z.string(),\n totalRecordCount: z.number(),\n foundCount: z.number(),\n returnedCount: z.number(),\n});\nexport type DataInfo = z.infer<typeof ZDataInfo>;\n\nexport type CreateParams<U extends GenericPortalData = GenericPortalData> =\n ScriptParams & { portalData?: UpdatePortalsWithIds<U> };\n\nexport type CreateResponse = ScriptResponse & {\n recordId: string;\n modId: string;\n};\n\nexport type UpdateParams<U extends GenericPortalData = GenericPortalData> =\n CreateParams<U> & {\n modId?: number;\n };\n\nexport type UpdateResponse = ScriptResponse & {\n modId: string;\n};\n\nexport type DeleteParams = ScriptParams;\n\nexport type DeleteResponse = ScriptResponse;\n\nexport type RangeParams = {\n offset?: number;\n limit?: number;\n};\nexport type RangeParamsRaw = {\n _offset?: number;\n _limit?: number;\n};\n\nexport type PortalRanges<U extends GenericPortalData = GenericPortalData> =\n Partial<{ [key in keyof U]: RangeParams }>;\n\nexport type PortalRangesParams<\n U extends GenericPortalData = GenericPortalData,\n> = {\n portalRanges?: PortalRanges<U>;\n};\n\nexport type GetParams<U extends GenericPortalData = GenericPortalData> =\n ScriptParams &\n PortalRangesParams<U> & {\n \"layout.response\"?: string;\n dateformats?: \"US\" \| \"file_locale\" \| \"ISO8601\";\n };\n\nexport type Sort<T extends FieldData = FieldData> = {\n fieldName: keyof T;\n sortOrder?: \"ascend\" \| \"descend\" \| (string & {});\n};\n\nexport type ListParams<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = GetParams<U> &\n RangeParams & {\n sort?: Sort<T> \| Array<Sort<T>>;\n };\n\nexport type ListParamsRaw<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = GetParams<U> &\n RangeParamsRaw & {\n _sort?: Array<Sort<T>>;\n };\n\nexport type GetResponse<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = ScriptResponse & {\n data: Array<FMRecord<T, U>>;\n dataInfo: DataInfo;\n};\nexport type GetResponseOne<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = ScriptResponse & {\n data: FMRecord<T, U>;\n dataInfo: DataInfo;\n};\n\ntype SecondLevelKeys<T> = {\n [K in keyof T]: keyof T[K];\n}[keyof T];\nexport type Query<\n T extends FieldData = FieldData,\n U extends GenericPortalData = GenericPortalData,\n> = Partial<{\n [key in keyof T]: T[key] extends number ? number \| string : string;\n}> &\n Partial<{ [key in SecondLevelKeys<U>]?: string }> & {\n omit?: \"true\";\n };\n\nexport type LayoutMetadataResponse = {\n fieldMetaData: FieldMetaData[];\n portalMetaData: { [key: string]: FieldMetaData[] };\n valueLists?: ValueList[];\n};\nexport type ProductInfoMetadataResponse = {\n name: string;\n dateFormat: string;\n timeFormat: string;\n timeStampFormat: string;\n};\nexport type DatabaseMetadataResponse = {\n databases: Array<{\n name: string;\n }>;\n};\n\nexport type FieldMetaData = {\n name: string;\n type: \"normal\" \| \"calculation\" \| \"summary\";\n displayType:\n \| \"editText\"\n \| \"popupList\"\n \| \"popupMenu\"\n \| \"checkBox\"\n \| \"calendar\"\n \| \"radioButtons\"\n \| \"secureText\";\n result: \"text\" \| \"number\" \| \"date\" \| \"time\" \| \"timeStamp\" \| \"container\";\n global: boolean;\n autoEnter: boolean;\n fourDigitYear: boolean;\n maxRepeat: number;\n maxCharacters: number;\n notEmpty: boolean;\n numeric: boolean;\n repetitions: number;\n timeOfDay: boolean;\n valueList?: string;\n};\n\ntype ValueList = {\n name: string;\n // TODO need to test type of value list from other file\n type: \"customList\" \| \"byField\";\n values: Array<{ value: string; displayValue: string }>;\n};\n\n/*\n Represents the data returned by a call to the Data API `layouts` endpoint.\n /\nexport type AllLayoutsMetadataResponse = {\n /\n A list of `Layout` or `LayoutsFolder` objects.\n /\n layouts: LayoutOrFolder[];\n};\n\n/\n Represents a FileMaker layout.\n /\nexport type Layout = {\n /\n The name of the layout\n /\n name: string;\n /\n If the node is a layout, `table` may contain the name of the table\n * the layout is associated with.\n /\n table: string;\n};\n\n/\n Represents a folder of `Layout` or `LayoutsFolder` objects.\n /\nexport type LayoutsFolder = {\n /\n The name of the folder\n /\n name: string;\n isFolder: boolean;\n /\n A list of the Layout or LayoutsFolder objects in the folder.\n /\n folderLayoutNames?: LayoutOrFolder[];\n};\n\nexport type LayoutOrFolder = Layout \| LayoutsFolder;\n\n/\n Represents the data returned by a call to the Data API `scripts` endpoint.\n /\nexport type ScriptsMetadataResponse = {\n /\n A list of `Layout` or `LayoutsFolder` objects.\n */\n scripts: ScriptOrFolder[];\n};\ntype Script = {\n name: string;\n isFolder: false;\n};\ntype ScriptFolder = {\n name: string;\n isFolder: true;\n folderScriptNames: ScriptOrFolder[];\n};\nexport type ScriptOrFolder = Script \| ScriptFolder;\n\nexport type RawFMResponse<T = unknown> = {\n response?: T;\n messages?: [{ code: string }];\n};\n\nexport class FileMakerError extends Error {\n public readonly code: string;\n\n public constructor(code: string, message: string) {\n super(message);\n this.code = code;\n }\n}\n"],"names":[],"mappings":";;;;AAEa,MAAA,cAAc,EAAE,MAAM;AAAA,EACjC,EAAE,OAAO;AAAA,EACT,EAAE,OAAO;AAAA,EACT,EAAE,KAAK;AAAA,EACP,EAAE,QAAQ;AACZ,CAAC;AAGM,MAAM,aAAa,EAAE,OAAO,EAAE,UAAU,WAAW;AAgDlC,EAAE,OAAO;AAAA,EAC/B,cAAc,EAAE,OAAO,EAAE,SAAS;AAAA,EAClC,aAAa,EAAE,OAAO,EAAE,SAAS;AAAA,EACjC,2BAA2B,EAAE,OAAO,EAAE,SAAS;AAAA,EAC/C,0BAA0B,EAAE,OAAO,EAAE,SAAS;AAAA,EAC9C,wBAAwB,EAAE,OAAO,EAAE,SAAS;AAAA,EAC5C,uBAAuB,EAAE,OAAO,EAAE,SAAS;AAC7C,CAAC;AAGY,MAAA,YAAY,EAAE,OAAO;AAAA,EAChC,UAAU,EAAE,OAAO;AAAA,EACnB,QAAQ,EAAE,OAAO;AAAA,EACjB,OAAO,EAAE,OAAO;AAAA,EAChB,kBAAkB,EAAE,OAAO;AAAA,EAC3B,YAAY,EAAE,OAAO;AAAA,EACrB,eAAe,EAAE,OAAO;AAC1B,CAAC;AAqNM,MAAM,uBAAuB,MAAM;AAAA,EAGjC,YAAY,MAAc,SAAiB;AAChD,UAAM,OAAO;AAHC;AAId,SAAK,OAAO;AAAA,EAAA;AAEhB;"}

package/dist/esm/client.d.ts CHANGED Viewed

@@ -14,7 +14,7 @@ export type ClientObjectProps = {
         /**
          * The schema for the portal data.
          */
-        portalData?: StandardSchemaV1<GenericPortalData>;
+        portalData?: Record<string, StandardSchemaV1<FieldData>>;
     };
 };
 type FetchOptions = {
@@ -25,26 +25,26 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
 }): Omit<Adp, "create" | "delete" | "find" | "get" | "list" | "update" | "layoutMetadata" | "containerUpload"> & {
     layout: Opts["layout"];
     list: {
-        (): Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
-        (args: ListParams<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & FetchOptions): Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
+        (): Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
+        (args: ListParams<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & FetchOptions): Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
     };
     listAll: {
-        <T extends FieldData = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>(): Promise<FMRecord<T, U>[]>;
-        <T extends FieldData = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>(args: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]>;
+        <T extends FieldData = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>(): Promise<FMRecord<T, U>[]>;
+        <T extends FieldData = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>(args: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]>;
     };
-    create: <T extends Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>(args: (import('./client-types.js').ScriptParams & {
+    create: <T extends Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd = Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, U extends Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd = Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>(args: (import('./client-types.js').ScriptParams & {
         portalData?: import('./client-types.js').UpdatePortalsWithIds<U> | undefined;
     } & {
         fieldData: Partial<T>;
     }) & FetchOptions) => Promise<CreateResponse>;
-    get: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    get: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & {
         recordId: number | string;
-    }) & FetchOptions) => Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
+    }) & FetchOptions) => Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
     update: (args: (import('./client-types.js').ScriptParams & {
-        portalData?: import('./client-types.js').UpdatePortalsWithIds<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> | undefined;
+        portalData?: import('./client-types.js').UpdatePortalsWithIds<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> | undefined;
     } & {
         modId?: number;
     } & {
@@ -54,7 +54,7 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
     delete: (args: (import('./client-types.js').ScriptParams & {
         recordId: number | string;
     }) & FetchOptions) => Promise<DeleteResponse>;
-    find: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    find: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & import('./client-types.js').RangeParams & {
@@ -68,8 +68,8 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
          * @default false
          */
         ignoreEmptyResult?: boolean;
-    } & FetchOptions) => Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
-    findOne: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    } & FetchOptions) => Promise<GetResponse<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
+    findOne: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & import('./client-types.js').RangeParams & {
@@ -77,8 +77,8 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
     } & {
         query: Query<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd> | Query<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd>[];
         timeout?: number;
-    }) & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
-    findFirst: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    }) & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
+    findFirst: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & import('./client-types.js').RangeParams & {
@@ -92,8 +92,8 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
          * @default false
          */
         ignoreEmptyResult?: boolean;
-    } & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>>;
-    maybeFindFirst: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    } & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>>;
+    maybeFindFirst: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & import('./client-types.js').RangeParams & {
@@ -107,8 +107,8 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
          * @default false
          */
         ignoreEmptyResult?: boolean;
-    } & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> | null>;
-    findAll: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd> & {
+    } & FetchOptions) => Promise<GetResponseOne<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> | null>;
+    findAll: (args: (import('./client-types.js').ScriptParams & import('./client-types.js').PortalRangesParams<Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd> & {
         "layout.response"?: string;
         dateformats?: "US" | "file_locale" | "ISO8601";
     } & import('./client-types.js').RangeParams & {
@@ -116,7 +116,7 @@ declare function DataApi<Fd extends FieldData = FieldData, Pd extends GenericPor
     } & {
         query: Query<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd> | Query<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd>[];
         timeout?: number;
-    }) & FetchOptions) => Promise<FMRecord<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]> : Pd : Pd>[]>;
+    }) & FetchOptions) => Promise<FMRecord<Opts["schema"] extends object ? StandardSchemaV1.InferOutput<Opts["schema"]["fieldData"]> : Fd, Opts["schema"] extends object ? Opts["schema"]["portalData"] extends object ? { [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<Opts["schema"]["portalData"][K]>; } : Pd : Pd>[]>;
     layoutMetadata: (args?: {
         timeout?: number;
     } & FetchOptions) => Promise<import('./client-types.js').LayoutMetadataResponse>;

package/dist/esm/client.js CHANGED Viewed

@@ -217,6 +217,7 @@ function DataApi(options) {
     });
   }
   async function runSchemaValidationAndTransform(schema2, result) {
+    var _a;
     const fieldDataIssues = [];
     const portalDataIssues = [];
     if (!schema2) return result;
@@ -237,19 +238,19 @@ function DataApi(options) {
         )) {
           const validatedPortalRecords = [];
           for (const portalRecord of portalRecords) {
-            let portalResult = schema2.portalData["~standard"].validate({
-              [portalName]: portalRecord
-            });
+            let portalResult = (_a = schema2.portalData[portalName]) == null ? void 0 : _a["~standard"].validate(
+              portalRecord
+            );
             if (portalResult instanceof Promise)
               portalResult = await portalResult;
-            if ("value" in portalResult) {
+            if (portalResult && "value" in portalResult) {
               validatedPortalRecords.push({
-                ...portalResult.value[portalName],
+                ...portalResult.value,
                 recordId: portalRecord.recordId,
                 modId: portalRecord.modId
               });
             } else {
-              portalDataIssues.push(...portalResult.issues);
+              portalDataIssues.push(...(portalResult == null ? void 0 : portalResult.issues) ?? []);
             }
           }
           record.portalData[portalName] = validatedPortalRecords;

package/dist/esm/client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.js","sources":["../../src/client.ts"],"sourcesContent":["import type { Adapter } from \"./adapters/core.js\";\nimport type {\n CreateParams,\n CreateResponse,\n DeleteParams,\n DeleteResponse,\n FMRecord,\n FieldData,\n GenericPortalData,\n GetParams,\n GetResponse,\n GetResponseOne,\n ListParams,\n PortalsWithIds,\n Query,\n UpdateParams,\n UpdateResponse,\n} from \"./client-types.js\";\nimport { FileMakerError } from \"./index.js\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nfunction asNumber(input: string \| number): number {\n return typeof input === \"string\" ? parseInt(input) : input;\n}\n\nexport type ClientObjectProps = {\n /*\n The layout to use by default for all requests. Can be overrridden on each request.\n /\n layout: string;\n schema?: {\n /\n The schema for the field data.\n /\n fieldData: StandardSchemaV1<FieldData>;\n /\n The schema for the portal data.\n /\n portalData?: StandardSchemaV1<GenericPortalData>;\n };\n};\n\ntype FetchOptions = {\n fetch?: RequestInit;\n};\n\nfunction DataApi<\n Fd extends FieldData = FieldData,\n Pd extends GenericPortalData = GenericPortalData,\n Opts extends ClientObjectProps = ClientObjectProps,\n Adp extends Adapter = Adapter,\n>(options: Opts & { adapter: Adp }) {\n type InferredFieldData = Opts[\"schema\"] extends object\n ? StandardSchemaV1.InferOutput<Opts[\"schema\"][\"fieldData\"]>\n : Fd;\n type InferredPortalData = Opts[\"schema\"] extends object\n ? Opts[\"schema\"][\"portalData\"] extends object\n ? StandardSchemaV1.InferOutput<Opts[\"schema\"][\"portalData\"]>\n : Pd\n : Pd;\n\n if (\"zodValidators\" in options) {\n throw new Error(\n \"zodValidators is no longer supported. Use schema instead, or re-run the typegen command\",\n );\n }\n\n const schema = options.schema;\n const layout = options.layout;\n const {\n create,\n delete: _adapterDelete,\n find,\n get,\n list,\n update,\n layoutMetadata,\n containerUpload,\n ...otherMethods\n } = options.adapter;\n\n type CreateArgs<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = CreateParams<U> & {\n fieldData: Partial<T>;\n };\n type GetArgs<U extends InferredPortalData = InferredPortalData> =\n GetParams<U> & {\n recordId: number \| string;\n };\n type UpdateArgs<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = UpdateParams<U> & {\n fieldData: Partial<T>;\n recordId: number \| string;\n };\n type ContainerUploadArgs<T extends InferredFieldData = InferredFieldData> = {\n containerFieldName: keyof T;\n containerFieldRepetition?: string \| number;\n file: Blob;\n recordId: number \| string;\n modId?: number;\n timeout?: number;\n };\n type DeleteArgs = DeleteParams & {\n recordId: number \| string;\n };\n type IgnoreEmptyResult = {\n /\n If true, a find that returns no results will retun an empty array instead of throwing an error.\n * @default false\n /\n ignoreEmptyResult?: boolean;\n };\n type FindArgs<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = ListParams<T, U> & {\n query: Query<T> \| Array<Query<T>>;\n timeout?: number;\n };\n\n /\n List all records from a given layout, no find criteria applied.\n /\n async function _list(): Promise<\n GetResponse<InferredFieldData, InferredPortalData>\n >;\n async function _list(\n args: ListParams<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>>;\n async function _list(\n args?: ListParams<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const { fetch, timeout, ...params } = args ?? {};\n\n // rename and refactor limit, offset, and sort keys for this request\n if (\"limit\" in params && params.limit !== undefined)\n delete Object.assign(params, { _limit: params.limit })[\"limit\"];\n if (\"offset\" in params && params.offset !== undefined) {\n if (params.offset <= 1) delete params.offset;\n else delete Object.assign(params, { _offset: params.offset })[\"offset\"];\n }\n if (\"sort\" in params && params.sort !== undefined)\n delete Object.assign(params, {\n _sort: Array.isArray(params.sort) ? params.sort : [params.sort],\n })[\"sort\"];\n\n const result = await list({\n layout,\n data: params,\n fetch,\n timeout,\n });\n\n if (result.dataInfo.foundCount > result.dataInfo.returnedCount) {\n // more records found than returned\n if (args?.limit === undefined && args?.offset === undefined) {\n // and the user didn't specify a limit or offset, so we should warn them\n console.warn(\n `🚨 @proofkit/fmdapi: Loaded only ${result.dataInfo.returnedCount} of the ${result.dataInfo.foundCount} records from your \"${layout}\" layout. Use the \"listAll\" method to automatically paginate through all records, or specify a \"limit\" and \"offset\" to handle pagination yourself.`,\n );\n }\n }\n\n return await runSchemaValidationAndTransform(\n schema,\n result as GetResponse<InferredFieldData, InferredPortalData>,\n );\n }\n\n /\n Paginate through all records from a given layout, no find criteria applied.\n * ⚠️ WARNING: Use this method with caution, as it can be slow with large datasets\n /\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(): Promise<FMRecord<T, U>[]>;\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]>;\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args?: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]> {\n let runningData: GetResponse<T, U>[\"data\"] = [];\n const limit = args?.limit ?? 100;\n let offset = args?.offset ?? 1;\n\n // eslint-disable-next-line no-constant-condition\n while (true) {\n const data = (await _list({\n ...args,\n offset,\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n } as any)) as unknown as GetResponse<T, U>;\n runningData = [...runningData, ...data.data];\n if (runningData.length >= data.dataInfo.foundCount) break;\n offset = offset + limit;\n }\n return runningData;\n }\n\n /\n Create a new record in a given layout\n /\n async function _create<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args: CreateArgs<T, U> & FetchOptions): Promise<CreateResponse> {\n const { fetch, timeout, ...params } = args ?? {};\n return await create({\n layout,\n data: params,\n fetch,\n timeout,\n });\n }\n\n /\n Get a single record by Internal RecordId\n /\n async function _get(\n args: GetArgs<InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n\n const result = await get({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n return await runSchemaValidationAndTransform(\n schema,\n result as GetResponse<InferredFieldData, InferredPortalData>,\n );\n }\n\n /\n Update a single record by internal RecordId\n /\n async function _update(\n args: UpdateArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<UpdateResponse> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n return await update({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n }\n\n /\n Delete a single record by internal RecordId\n /\n async function deleteRecord(\n args: DeleteArgs & FetchOptions,\n ): Promise<DeleteResponse> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n\n return _adapterDelete({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n }\n\n /\n Find records in a given layout\n /\n async function _find(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const {\n query: queryInput,\n ignoreEmptyResult = false,\n timeout,\n fetch,\n ...params\n } = args;\n const query = !Array.isArray(queryInput) ? [queryInput] : queryInput;\n\n // rename and refactor limit, offset, and sort keys for this request\n if (\"offset\" in params && params.offset !== undefined) {\n if (params.offset <= 1) delete params.offset;\n }\n if (\"dateformats\" in params && params.dateformats !== undefined) {\n // reassign dateformats to match FileMaker's expected values\n // @ts-expect-error FM wants a string, so this is fine\n params.dateformats = (\n params.dateformats === \"US\"\n ? 0\n : params.dateformats === \"file_locale\"\n ? 1\n : params.dateformats === \"ISO8601\"\n ? 2\n : 0\n ).toString();\n }\n const result = (await find({\n data: { ...params, query },\n layout,\n fetch,\n timeout,\n }).catch((e: unknown) => {\n if (ignoreEmptyResult && e instanceof FileMakerError && e.code === \"401\")\n return { data: [], dataInfo: { foundCount: 0, returnedCount: 0 } };\n throw e;\n })) as GetResponse<InferredFieldData, InferredPortalData>;\n\n if (result.dataInfo.foundCount > result.dataInfo.returnedCount) {\n // more records found than returned\n if (args?.limit === undefined && args?.offset === undefined) {\n console.warn(\n `🚨 @proofkit/fmdapi: Loaded only ${result.dataInfo.returnedCount} of the ${result.dataInfo.foundCount} records from your \"${layout}\" layout. Use the \"findAll\" method to automatically paginate through all records, or specify a \"limit\" and \"offset\" to handle pagination yourself.`,\n );\n }\n }\n\n return await runSchemaValidationAndTransform(schema, result);\n }\n\n /\n Helper method for `find`. Will only return the first result or throw error if there is more than 1 result.\n /\n async function findOne(\n args: FindArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData>> {\n const result = await _find(args);\n if (result.data.length !== 1)\n throw new Error(\n `${result.data.length} records found; expecting exactly 1`,\n );\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n if (!transformedResult.data[0]) throw new Error(\"No data found\");\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find`. Will only return the first result instead of an array.\n /\n async function findFirst(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData>> {\n const result = await _find(args);\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n\n if (!transformedResult.data[0]) throw new Error(\"No data found\");\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find`. Will return the first result or null if no results are found.\n /\n async function maybeFindFirst(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData> \| null> {\n const result = await _find({ ...args, ignoreEmptyResult: true });\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n if (!transformedResult.data[0]) return null;\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find` to page through all found results.\n * ⚠️ WARNING: Use with caution as this can be a slow operation with large datasets\n */\n async function findAll(\n args: FindArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<FMRecord<InferredFieldData, InferredPortalData>[]> {\n let runningData: GetResponse<\n InferredFieldData,\n InferredPortalData\n >[\"data\"] = [];\n const limit = args.limit ?? 100;\n let offset = args.offset ?? 1;\n // eslint-disable-next-line no-constant-condition\n while (true) {\n const data = await _find({\n ...args,\n offset,\n ignoreEmptyResult: true,\n });\n runningData = [...runningData, ...data.data];\n if (\n runningData.length === 0 \|\|\n runningData.length >= data.dataInfo.foundCount\n )\n break;\n offset = offset + limit;\n }\n return runningData;\n }\n\n async function _layoutMetadata(args?: { timeout?: number } & FetchOptions) {\n const { ...restArgs } = args ?? {};\n // Explicitly define the type for params based on FetchOptions\n const params: FetchOptions & { timeout?: number } = restArgs;\n\n return await layoutMetadata({\n layout,\n fetch: params.fetch, // Now should correctly resolve to undefined if not present\n timeout: params.timeout, // Now should correctly resolve to undefined if not present\n });\n }\n\n async function _containerUpload<\n T extends InferredFieldData = InferredFieldData,\n >(args: ContainerUploadArgs<T> & FetchOptions) {\n const { ...params } = args;\n return await containerUpload({\n layout,\n data: {\n ...params,\n containerFieldName: params.containerFieldName as string,\n repetition: params.containerFieldRepetition,\n },\n fetch: params.fetch,\n timeout: params.timeout,\n });\n }\n\n async function runSchemaValidationAndTransform(\n schema: ClientObjectProps[\"schema\"],\n result: GetResponse<InferredFieldData, InferredPortalData>,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const fieldDataIssues: StandardSchemaV1.Issue[] = [];\n const portalDataIssues: StandardSchemaV1.Issue[] = [];\n\n if (!schema) return result;\n const transformedData: FMRecord<InferredFieldData, InferredPortalData>[] =\n [];\n for (const record of result.data) {\n let fieldResult = schema.fieldData[\"~standard\"].validate(\n record.fieldData,\n );\n if (fieldResult instanceof Promise) fieldResult = await fieldResult;\n if (\"value\" in fieldResult) {\n record.fieldData = fieldResult.value as InferredFieldData;\n } else {\n fieldDataIssues.push(...fieldResult.issues);\n }\n\n if (schema.portalData) {\n for (const [portalName, portalRecords] of Object.entries(\n record.portalData,\n )) {\n const validatedPortalRecords: PortalsWithIds<GenericPortalData>[] =\n [];\n for (const portalRecord of portalRecords) {\n let portalResult = schema.portalData[\"~standard\"].validate({\n [portalName]: portalRecord,\n });\n if (portalResult instanceof Promise)\n portalResult = await portalResult;\n if (\"value\" in portalResult) {\n validatedPortalRecords.push({\n ...portalResult.value[portalName],\n recordId: portalRecord.recordId,\n modId: portalRecord.modId,\n });\n } else {\n portalDataIssues.push(...portalResult.issues);\n }\n }\n // @ts-expect-error We know portalName is a valid key, but can't figure out the right assertions\n record.portalData[portalName] = validatedPortalRecords;\n }\n }\n\n transformedData.push(record);\n }\n result.data = transformedData;\n\n if (fieldDataIssues.length > 0 \|\| portalDataIssues.length > 0) {\n console.error(\n `🚨 @proofkit/fmdapi: Validation issues for layout \"${layout}\". Run the typegen command again to generate the latest field definitions from your layout.`,\n {\n fieldDataIssues,\n portalDataIssues,\n },\n );\n throw new Error(\"Schema validation issues\");\n }\n\n return result;\n }\n\n return {\n ...otherMethods,\n layout: options.layout as Opts[\"layout\"],\n list: _list,\n listAll,\n create: _create,\n get: _get,\n update: _update,\n delete: deleteRecord,\n find: _find,\n findOne,\n findFirst,\n maybeFindFirst,\n findAll,\n layoutMetadata: _layoutMetadata,\n containerUpload: _containerUpload,\n };\n}\n\nexport default DataApi;\nexport { DataApi };\n"],"names":["schema"],"mappings":";AAqBA,SAAS,SAAS,OAAgC;AAChD,SAAO,OAAO,UAAU,WAAW,SAAS,KAAK,IAAI;AACvD;AAuBA,SAAS,QAKP,SAAkC;AAUlC,MAAI,mBAAmB,SAAS;AAC9B,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EAAA;AAGF,QAAM,SAAS,QAAQ;AACvB,QAAM,SAAS,QAAQ;AACjB,QAAA;AAAA,IACJ;AAAA,IACA,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,MACD,QAAQ;AAsDZ,iBAAe,MACb,MAC6D;AAC7D,UAAM,EAAE,OAAO,SAAS,GAAG,OAAO,IAAI,QAAQ,CAAC;AAG3C,QAAA,WAAW,UAAU,OAAO,UAAU;AACjC,aAAA,OAAO,OAAO,QAAQ,EAAE,QAAQ,OAAO,OAAO,EAAE,OAAO;AAChE,QAAI,YAAY,UAAU,OAAO,WAAW,QAAW;AACrD,UAAI,OAAO,UAAU,EAAG,QAAO,OAAO;AAAA,UACjC,QAAO,OAAO,OAAO,QAAQ,EAAE,SAAS,OAAO,QAAQ,EAAE,QAAQ;AAAA,IAAA;AAEpE,QAAA,UAAU,UAAU,OAAO,SAAS;AAC/B,aAAA,OAAO,OAAO,QAAQ;AAAA,QAC3B,OAAO,MAAM,QAAQ,OAAO,IAAI,IAAI,OAAO,OAAO,CAAC,OAAO,IAAI;AAAA,MAC/D,CAAA,EAAE,MAAM;AAEL,UAAA,SAAS,MAAM,KAAK;AAAA,MACxB;AAAA,MACA,MAAM;AAAA,MACN;AAAA,MACA;AAAA,IAAA,CACD;AAED,QAAI,OAAO,SAAS,aAAa,OAAO,SAAS,eAAe;AAE9D,WAAI,6BAAM,WAAU,WAAa,6BAAM,YAAW,QAAW;AAEnD,gBAAA;AAAA,UACN,oCAAoC,OAAO,SAAS,aAAa,WAAW,OAAO,SAAS,UAAU,uBAAuB,MAAM;AAAA,QACrI;AAAA,MAAA;AAAA,IACF;AAGF,WAAO,MAAM;AAAA,MACX;AAAA,MACA;AAAA,IACF;AAAA,EAAA;AAeF,iBAAe,QAGb,MAAmE;AACnE,QAAI,cAAyC,CAAC;AACxC,UAAA,SAAQ,6BAAM,UAAS;AACzB,QAAA,UAAS,6BAAM,WAAU;AAG7B,WAAO,MAAM;AACL,YAAA,OAAQ,MAAM,MAAM;AAAA,QACxB,GAAG;AAAA,QACH;AAAA;AAAA,MAAA,CAEM;AACR,oBAAc,CAAC,GAAG,aAAa,GAAG,KAAK,IAAI;AAC3C,UAAI,YAAY,UAAU,KAAK,SAAS,WAAY;AACpD,eAAS,SAAS;AAAA,IAAA;AAEb,WAAA;AAAA,EAAA;AAMT,iBAAe,QAGb,MAAgE;AAChE,UAAM,EAAE,OAAO,SAAS,GAAG,OAAO,IAAI,QAAQ,CAAC;AAC/C,WAAO,MAAM,OAAO;AAAA,MAClB;AAAA,MACA,MAAM;AAAA,MACN;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EAAA;AAMH,iBAAe,KACb,MAC6D;AACxD,SAAA,WAAW,SAAS,KAAK,QAAQ;AACtC,UAAM,EAAE,UAAU,OAAO,SAAS,GAAG,OAAW,IAAA;AAE1C,UAAA,SAAS,MAAM,IAAI;AAAA,MACvB;AAAA,MACA,MAAM,EAAE,GAAG,QAAQ,SAAS;AAAA,MAC5B;AAAA,MACA;AAAA,IAAA,CACD;AACD,WAAO,MAAM;AAAA,MACX;AAAA,MACA;AAAA,IACF;AAAA,EAAA;AAMF,iBAAe,QACb,MACyB;AACpB,SAAA,WAAW,SAAS,KAAK,QAAQ;AACtC,UAAM,EAAE,UAAU,OAAO,SAAS,GAAG,OAAW,IAAA;AAChD,WAAO,MAAM,OAAO;AAAA,MAClB;AAAA,MACA,MAAM,EAAE,GAAG,QAAQ,SAAS;AAAA,MAC5B;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EAAA;AAMH,iBAAe,aACb,MACyB;AACpB,SAAA,WAAW,SAAS,KAAK,QAAQ;AACtC,UAAM,EAAE,UAAU,OAAO,SAAS,GAAG,OAAW,IAAA;AAEhD,WAAO,eAAe;AAAA,MACpB;AAAA,MACA,MAAM,EAAE,GAAG,QAAQ,SAAS;AAAA,MAC5B;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EAAA;AAMH,iBAAe,MACb,MAG6D;AACvD,UAAA;AAAA,MACJ,OAAO;AAAA,MACP,oBAAoB;AAAA,MACpB;AAAA,MACA;AAAA,MACA,GAAG;AAAA,IAAA,IACD;AACE,UAAA,QAAQ,CAAC,MAAM,QAAQ,UAAU,IAAI,CAAC,UAAU,IAAI;AAG1D,QAAI,YAAY,UAAU,OAAO,WAAW,QAAW;AACrD,UAAI,OAAO,UAAU,EAAG,QAAO,OAAO;AAAA,IAAA;AAExC,QAAI,iBAAiB,UAAU,OAAO,gBAAgB,QAAW;AAG/D,aAAO,eACL,OAAO,gBAAgB,OACnB,IACA,OAAO,gBAAgB,gBACrB,IACA,OAAO,gBAAgB,YACrB,IACA,GACR,SAAS;AAAA,IAAA;AAEP,UAAA,SAAU,MAAM,KAAK;AAAA,MACzB,MAAM,EAAE,GAAG,QAAQ,MAAM;AAAA,MACzB;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACD,EAAE,MAAM,CAAC,MAAe;AACvB,UAAI,qBAAqB,aAAa,kBAAkB,EAAE,SAAS;AAC1D,eAAA,EAAE,MAAM,CAAA,GAAI,UAAU,EAAE,YAAY,GAAG,eAAe,IAAI;AAC7D,YAAA;AAAA,IAAA,CACP;AAED,QAAI,OAAO,SAAS,aAAa,OAAO,SAAS,eAAe;AAE9D,WAAI,6BAAM,WAAU,WAAa,6BAAM,YAAW,QAAW;AACnD,gBAAA;AAAA,UACN,oCAAoC,OAAO,SAAS,aAAa,WAAW,OAAO,SAAS,UAAU,uBAAuB,MAAM;AAAA,QACrI;AAAA,MAAA;AAAA,IACF;AAGK,WAAA,MAAM,gCAAgC,QAAQ,MAAM;AAAA,EAAA;AAM7D,iBAAe,QACb,MACgE;AAC1D,UAAA,SAAS,MAAM,MAAM,IAAI;AAC3B,QAAA,OAAO,KAAK,WAAW;AACzB,YAAM,IAAI;AAAA,QACR,GAAG,OAAO,KAAK,MAAM;AAAA,MACvB;AACF,UAAM,oBAAoB,MAAM;AAAA,MAC9B;AAAA,MACA;AAAA,IACF;AACI,QAAA,CAAC,kBAAkB,KAAK,CAAC,EAAS,OAAA,IAAI,MAAM,eAAe;AAC/D,WAAO,EAAE,GAAG,mBAAmB,MAAM,kBAAkB,KAAK,CAAC,EAAE;AAAA,EAAA;AAMjE,iBAAe,UACb,MAGgE;AAC1D,UAAA,SAAS,MAAM,MAAM,IAAI;AAC/B,UAAM,oBAAoB,MAAM;AAAA,MAC9B;AAAA,MACA;AAAA,IACF;AAEI,QAAA,CAAC,kBAAkB,KAAK,CAAC,EAAS,OAAA,IAAI,MAAM,eAAe;AAC/D,WAAO,EAAE,GAAG,mBAAmB,MAAM,kBAAkB,KAAK,CAAC,EAAE;AAAA,EAAA;AAMjE,iBAAe,eACb,MAGuE;AACjE,UAAA,SAAS,MAAM,MAAM,EAAE,GAAG,MAAM,mBAAmB,MAAM;AAC/D,UAAM,oBAAoB,MAAM;AAAA,MAC9B;AAAA,MACA;AAAA,IACF;AACA,QAAI,CAAC,kBAAkB,KAAK,CAAC,EAAU,QAAA;AACvC,WAAO,EAAE,GAAG,mBAAmB,MAAM,kBAAkB,KAAK,CAAC,EAAE;AAAA,EAAA;AAOjE,iBAAe,QACb,MAC4D;AAC5D,QAAI,cAGQ,CAAC;AACP,UAAA,QAAQ,KAAK,SAAS;AACxB,QAAA,SAAS,KAAK,UAAU;AAE5B,WAAO,MAAM;AACL,YAAA,OAAO,MAAM,MAAM;AAAA,QACvB,GAAG;AAAA,QACH;AAAA,QACA,mBAAmB;AAAA,MAAA,CACpB;AACD,oBAAc,CAAC,GAAG,aAAa,GAAG,KAAK,IAAI;AAC3C,UACE,YAAY,WAAW,KACvB,YAAY,UAAU,KAAK,SAAS;AAEpC;AACF,eAAS,SAAS;AAAA,IAAA;AAEb,WAAA;AAAA,EAAA;AAGT,iBAAe,gBAAgB,MAA4C;AACzE,UAAM,EAAE,GAAG,aAAa,QAAQ,CAAC;AAEjC,UAAM,SAA8C;AAEpD,WAAO,MAAM,eAAe;AAAA,MAC1B;AAAA,MACA,OAAO,OAAO;AAAA;AAAA,MACd,SAAS,OAAO;AAAA;AAAA,IAAA,CACjB;AAAA,EAAA;AAGH,iBAAe,iBAEb,MAA6C;AACvC,UAAA,EAAE,GAAG,OAAA,IAAW;AACtB,WAAO,MAAM,gBAAgB;AAAA,MAC3B;AAAA,MACA,MAAM;AAAA,QACJ,GAAG;AAAA,QACH,oBAAoB,OAAO;AAAA,QAC3B,YAAY,OAAO;AAAA,MACrB;AAAA,MACA,OAAO,OAAO;AAAA,MACd,SAAS,OAAO;AAAA,IAAA,CACjB;AAAA,EAAA;AAGY,iBAAA,gCACbA,SACA,QAC6D;AAC7D,UAAM,kBAA4C,CAAC;AACnD,UAAM,mBAA6C,CAAC;AAEhD,QAAA,CAACA,QAAe,QAAA;AACpB,UAAM,kBACJ,CAAC;AACQ,eAAA,UAAU,OAAO,MAAM;AAChC,UAAI,cAAcA,QAAO,UAAU,WAAW,EAAE;AAAA,QAC9C,OAAO;AAAA,MACT;AACI,UAAA,uBAAuB,QAAS,eAAc,MAAM;AACxD,UAAI,WAAW,aAAa;AAC1B,eAAO,YAAY,YAAY;AAAA,MAAA,OAC1B;AACW,wBAAA,KAAK,GAAG,YAAY,MAAM;AAAA,MAAA;AAG5C,UAAIA,QAAO,YAAY;AACrB,mBAAW,CAAC,YAAY,aAAa,KAAK,OAAO;AAAA,UAC/C,OAAO;AAAA,QAAA,GACN;AACD,gBAAM,yBACJ,CAAC;AACH,qBAAW,gBAAgB,eAAe;AACxC,gBAAI,eAAeA,QAAO,WAAW,WAAW,EAAE,SAAS;AAAA,cACzD,CAAC,UAAU,GAAG;AAAA,YAAA,CACf;AACD,gBAAI,wBAAwB;AAC1B,6BAAe,MAAM;AACvB,gBAAI,WAAW,cAAc;AAC3B,qCAAuB,KAAK;AAAA,gBAC1B,GAAG,aAAa,MAAM,UAAU;AAAA,gBAChC,UAAU,aAAa;AAAA,gBACvB,OAAO,aAAa;AAAA,cAAA,CACrB;AAAA,YAAA,OACI;AACY,+BAAA,KAAK,GAAG,aAAa,MAAM;AAAA,YAAA;AAAA,UAC9C;AAGK,iBAAA,WAAW,UAAU,IAAI;AAAA,QAAA;AAAA,MAClC;AAGF,sBAAgB,KAAK,MAAM;AAAA,IAAA;AAE7B,WAAO,OAAO;AAEd,QAAI,gBAAgB,SAAS,KAAK,iBAAiB,SAAS,GAAG;AACrD,cAAA;AAAA,QACN,sDAAsD,MAAM;AAAA,QAC5D;AAAA,UACE;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AACM,YAAA,IAAI,MAAM,0BAA0B;AAAA,IAAA;AAGrC,WAAA;AAAA,EAAA;AAGF,SAAA;AAAA,IACL,GAAG;AAAA,IACH,QAAQ,QAAQ;AAAA,IAChB,MAAM;AAAA,IACN;AAAA,IACA,QAAQ;AAAA,IACR,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,QAAQ;AAAA,IACR,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,EACnB;AACF;"}
1	+ {"version":3,"file":"client.js","sources":["../../src/client.ts"],"sourcesContent":["import type { Adapter } from \"./adapters/core.js\";\nimport type {\n CreateParams,\n CreateResponse,\n DeleteParams,\n DeleteResponse,\n FMRecord,\n FieldData,\n GenericPortalData,\n GetParams,\n GetResponse,\n GetResponseOne,\n ListParams,\n PortalsWithIds,\n Query,\n UpdateParams,\n UpdateResponse,\n} from \"./client-types.js\";\nimport { FileMakerError } from \"./index.js\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nfunction asNumber(input: string \| number): number {\n return typeof input === \"string\" ? parseInt(input) : input;\n}\n\nexport type ClientObjectProps = {\n /*\n The layout to use by default for all requests. Can be overrridden on each request.\n /\n layout: string;\n schema?: {\n /\n The schema for the field data.\n /\n fieldData: StandardSchemaV1<FieldData>;\n /\n The schema for the portal data.\n /\n portalData?: Record<string, StandardSchemaV1<FieldData>>;\n };\n};\n\ntype FetchOptions = {\n fetch?: RequestInit;\n};\n\nfunction DataApi<\n Fd extends FieldData = FieldData,\n Pd extends GenericPortalData = GenericPortalData,\n Opts extends ClientObjectProps = ClientObjectProps,\n Adp extends Adapter = Adapter,\n>(options: Opts & { adapter: Adp }) {\n type InferredFieldData = Opts[\"schema\"] extends object\n ? StandardSchemaV1.InferOutput<Opts[\"schema\"][\"fieldData\"]>\n : Fd;\n type InferredPortalData = Opts[\"schema\"] extends object\n ? Opts[\"schema\"][\"portalData\"] extends object\n ? {\n [K in keyof Opts[\"schema\"][\"portalData\"]]: StandardSchemaV1.InferOutput<\n Opts[\"schema\"][\"portalData\"][K]\n >;\n }\n : Pd\n : Pd;\n\n if (\"zodValidators\" in options) {\n throw new Error(\n \"zodValidators is no longer supported. Use schema instead, or re-run the typegen command\",\n );\n }\n\n const schema = options.schema;\n const layout = options.layout;\n const {\n create,\n delete: _adapterDelete,\n find,\n get,\n list,\n update,\n layoutMetadata,\n containerUpload,\n ...otherMethods\n } = options.adapter;\n\n type CreateArgs<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = CreateParams<U> & {\n fieldData: Partial<T>;\n };\n type GetArgs<U extends InferredPortalData = InferredPortalData> =\n GetParams<U> & {\n recordId: number \| string;\n };\n type UpdateArgs<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = UpdateParams<U> & {\n fieldData: Partial<T>;\n recordId: number \| string;\n };\n type ContainerUploadArgs<T extends InferredFieldData = InferredFieldData> = {\n containerFieldName: keyof T;\n containerFieldRepetition?: string \| number;\n file: Blob;\n recordId: number \| string;\n modId?: number;\n timeout?: number;\n };\n type DeleteArgs = DeleteParams & {\n recordId: number \| string;\n };\n type IgnoreEmptyResult = {\n /\n If true, a find that returns no results will retun an empty array instead of throwing an error.\n * @default false\n /\n ignoreEmptyResult?: boolean;\n };\n type FindArgs<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n > = ListParams<T, U> & {\n query: Query<T> \| Array<Query<T>>;\n timeout?: number;\n };\n\n /\n List all records from a given layout, no find criteria applied.\n /\n async function _list(): Promise<\n GetResponse<InferredFieldData, InferredPortalData>\n >;\n async function _list(\n args: ListParams<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>>;\n async function _list(\n args?: ListParams<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const { fetch, timeout, ...params } = args ?? {};\n\n // rename and refactor limit, offset, and sort keys for this request\n if (\"limit\" in params && params.limit !== undefined)\n delete Object.assign(params, { _limit: params.limit })[\"limit\"];\n if (\"offset\" in params && params.offset !== undefined) {\n if (params.offset <= 1) delete params.offset;\n else delete Object.assign(params, { _offset: params.offset })[\"offset\"];\n }\n if (\"sort\" in params && params.sort !== undefined)\n delete Object.assign(params, {\n _sort: Array.isArray(params.sort) ? params.sort : [params.sort],\n })[\"sort\"];\n\n const result = await list({\n layout,\n data: params,\n fetch,\n timeout,\n });\n\n if (result.dataInfo.foundCount > result.dataInfo.returnedCount) {\n // more records found than returned\n if (args?.limit === undefined && args?.offset === undefined) {\n // and the user didn't specify a limit or offset, so we should warn them\n console.warn(\n `🚨 @proofkit/fmdapi: Loaded only ${result.dataInfo.returnedCount} of the ${result.dataInfo.foundCount} records from your \"${layout}\" layout. Use the \"listAll\" method to automatically paginate through all records, or specify a \"limit\" and \"offset\" to handle pagination yourself.`,\n );\n }\n }\n\n return await runSchemaValidationAndTransform(\n schema,\n result as GetResponse<InferredFieldData, InferredPortalData>,\n );\n }\n\n /\n Paginate through all records from a given layout, no find criteria applied.\n * ⚠️ WARNING: Use this method with caution, as it can be slow with large datasets\n /\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(): Promise<FMRecord<T, U>[]>;\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]>;\n async function listAll<\n T extends FieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args?: ListParams<T, U> & FetchOptions): Promise<FMRecord<T, U>[]> {\n let runningData: GetResponse<T, U>[\"data\"] = [];\n const limit = args?.limit ?? 100;\n let offset = args?.offset ?? 1;\n\n // eslint-disable-next-line no-constant-condition\n while (true) {\n const data = (await _list({\n ...args,\n offset,\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n } as any)) as unknown as GetResponse<T, U>;\n runningData = [...runningData, ...data.data];\n if (runningData.length >= data.dataInfo.foundCount) break;\n offset = offset + limit;\n }\n return runningData;\n }\n\n /\n Create a new record in a given layout\n /\n async function _create<\n T extends InferredFieldData = InferredFieldData,\n U extends InferredPortalData = InferredPortalData,\n >(args: CreateArgs<T, U> & FetchOptions): Promise<CreateResponse> {\n const { fetch, timeout, ...params } = args ?? {};\n return await create({\n layout,\n data: params,\n fetch,\n timeout,\n });\n }\n\n /\n Get a single record by Internal RecordId\n /\n async function _get(\n args: GetArgs<InferredPortalData> & FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n\n const result = await get({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n return await runSchemaValidationAndTransform(\n schema,\n result as GetResponse<InferredFieldData, InferredPortalData>,\n );\n }\n\n /\n Update a single record by internal RecordId\n /\n async function _update(\n args: UpdateArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<UpdateResponse> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n return await update({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n }\n\n /\n Delete a single record by internal RecordId\n /\n async function deleteRecord(\n args: DeleteArgs & FetchOptions,\n ): Promise<DeleteResponse> {\n args.recordId = asNumber(args.recordId);\n const { recordId, fetch, timeout, ...params } = args;\n\n return _adapterDelete({\n layout,\n data: { ...params, recordId },\n fetch,\n timeout,\n });\n }\n\n /\n Find records in a given layout\n /\n async function _find(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const {\n query: queryInput,\n ignoreEmptyResult = false,\n timeout,\n fetch,\n ...params\n } = args;\n const query = !Array.isArray(queryInput) ? [queryInput] : queryInput;\n\n // rename and refactor limit, offset, and sort keys for this request\n if (\"offset\" in params && params.offset !== undefined) {\n if (params.offset <= 1) delete params.offset;\n }\n if (\"dateformats\" in params && params.dateformats !== undefined) {\n // reassign dateformats to match FileMaker's expected values\n // @ts-expect-error FM wants a string, so this is fine\n params.dateformats = (\n params.dateformats === \"US\"\n ? 0\n : params.dateformats === \"file_locale\"\n ? 1\n : params.dateformats === \"ISO8601\"\n ? 2\n : 0\n ).toString();\n }\n const result = (await find({\n data: { ...params, query },\n layout,\n fetch,\n timeout,\n }).catch((e: unknown) => {\n if (ignoreEmptyResult && e instanceof FileMakerError && e.code === \"401\")\n return { data: [], dataInfo: { foundCount: 0, returnedCount: 0 } };\n throw e;\n })) as GetResponse<InferredFieldData, InferredPortalData>;\n\n if (result.dataInfo.foundCount > result.dataInfo.returnedCount) {\n // more records found than returned\n if (args?.limit === undefined && args?.offset === undefined) {\n console.warn(\n `🚨 @proofkit/fmdapi: Loaded only ${result.dataInfo.returnedCount} of the ${result.dataInfo.foundCount} records from your \"${layout}\" layout. Use the \"findAll\" method to automatically paginate through all records, or specify a \"limit\" and \"offset\" to handle pagination yourself.`,\n );\n }\n }\n\n return await runSchemaValidationAndTransform(schema, result);\n }\n\n /\n Helper method for `find`. Will only return the first result or throw error if there is more than 1 result.\n /\n async function findOne(\n args: FindArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData>> {\n const result = await _find(args);\n if (result.data.length !== 1)\n throw new Error(\n `${result.data.length} records found; expecting exactly 1`,\n );\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n if (!transformedResult.data[0]) throw new Error(\"No data found\");\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find`. Will only return the first result instead of an array.\n /\n async function findFirst(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData>> {\n const result = await _find(args);\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n\n if (!transformedResult.data[0]) throw new Error(\"No data found\");\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find`. Will return the first result or null if no results are found.\n /\n async function maybeFindFirst(\n args: FindArgs<InferredFieldData, InferredPortalData> &\n IgnoreEmptyResult &\n FetchOptions,\n ): Promise<GetResponseOne<InferredFieldData, InferredPortalData> \| null> {\n const result = await _find({ ...args, ignoreEmptyResult: true });\n const transformedResult = await runSchemaValidationAndTransform(\n schema,\n result,\n );\n if (!transformedResult.data[0]) return null;\n return { ...transformedResult, data: transformedResult.data[0] };\n }\n\n /\n Helper method for `find` to page through all found results.\n * ⚠️ WARNING: Use with caution as this can be a slow operation with large datasets\n */\n async function findAll(\n args: FindArgs<InferredFieldData, InferredPortalData> & FetchOptions,\n ): Promise<FMRecord<InferredFieldData, InferredPortalData>[]> {\n let runningData: GetResponse<\n InferredFieldData,\n InferredPortalData\n >[\"data\"] = [];\n const limit = args.limit ?? 100;\n let offset = args.offset ?? 1;\n // eslint-disable-next-line no-constant-condition\n while (true) {\n const data = await _find({\n ...args,\n offset,\n ignoreEmptyResult: true,\n });\n runningData = [...runningData, ...data.data];\n if (\n runningData.length === 0 \|\|\n runningData.length >= data.dataInfo.foundCount\n )\n break;\n offset = offset + limit;\n }\n return runningData;\n }\n\n async function _layoutMetadata(args?: { timeout?: number } & FetchOptions) {\n const { ...restArgs } = args ?? {};\n // Explicitly define the type for params based on FetchOptions\n const params: FetchOptions & { timeout?: number } = restArgs;\n\n return await layoutMetadata({\n layout,\n fetch: params.fetch, // Now should correctly resolve to undefined if not present\n timeout: params.timeout, // Now should correctly resolve to undefined if not present\n });\n }\n\n async function _containerUpload<\n T extends InferredFieldData = InferredFieldData,\n >(args: ContainerUploadArgs<T> & FetchOptions) {\n const { ...params } = args;\n return await containerUpload({\n layout,\n data: {\n ...params,\n containerFieldName: params.containerFieldName as string,\n repetition: params.containerFieldRepetition,\n },\n fetch: params.fetch,\n timeout: params.timeout,\n });\n }\n\n async function runSchemaValidationAndTransform(\n schema: ClientObjectProps[\"schema\"],\n result: GetResponse<InferredFieldData, InferredPortalData>,\n ): Promise<GetResponse<InferredFieldData, InferredPortalData>> {\n const fieldDataIssues: StandardSchemaV1.Issue[] = [];\n const portalDataIssues: StandardSchemaV1.Issue[] = [];\n\n if (!schema) return result;\n const transformedData: FMRecord<InferredFieldData, InferredPortalData>[] =\n [];\n for (const record of result.data) {\n let fieldResult = schema.fieldData[\"~standard\"].validate(\n record.fieldData,\n );\n if (fieldResult instanceof Promise) fieldResult = await fieldResult;\n if (\"value\" in fieldResult) {\n record.fieldData = fieldResult.value as InferredFieldData;\n } else {\n fieldDataIssues.push(...fieldResult.issues);\n }\n\n if (schema.portalData) {\n for (const [portalName, portalRecords] of Object.entries(\n record.portalData,\n )) {\n const validatedPortalRecords: PortalsWithIds<GenericPortalData>[] =\n [];\n for (const portalRecord of portalRecords) {\n let portalResult =\n schema.portalData[portalName]?.[\"~standard\"].validate(\n portalRecord,\n );\n if (portalResult instanceof Promise)\n portalResult = await portalResult;\n if (portalResult && \"value\" in portalResult) {\n validatedPortalRecords.push({\n ...portalResult.value,\n recordId: portalRecord.recordId,\n modId: portalRecord.modId,\n });\n } else {\n portalDataIssues.push(...(portalResult?.issues ?? []));\n }\n }\n // @ts-expect-error We know portalName is a valid key, but can't figure out the right assertions\n record.portalData[portalName] = validatedPortalRecords;\n }\n }\n\n transformedData.push(record);\n }\n result.data = transformedData;\n\n if (fieldDataIssues.length > 0 \|\| portalDataIssues.length > 0) {\n console.error(\n `🚨 @proofkit/fmdapi: Validation issues for layout \"${layout}\". Run the typegen command again to generate the latest field definitions from your layout.`,\n {\n fieldDataIssues,\n portalDataIssues,\n },\n );\n throw new Error(\"Schema validation issues\");\n }\n\n return result;\n }\n\n return {\n ...otherMethods,\n layout: options.layout as Opts[\"layout\"],\n list: _list,\n listAll,\n create: _create,\n get: _get,\n update: _update,\n delete: deleteRecord,\n find: _find,\n findOne,\n findFirst,\n maybeFindFirst,\n findAll,\n layoutMetadata: _layoutMetadata,\n containerUpload: _containerUpload,\n };\n}\n\nexport default DataApi;\nexport { DataApi };\n"],"names":["schema"],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmdapi",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.1-beta.1",
   "description": "FileMaker Data API client",
   "repository": "git@github.com:proofgeist/fm-dapi.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",
@@ -39,17 +39,17 @@
   "dependencies": {
     "@standard-schema/spec": "^1.0.0",
     "@tanstack/vite-config": "^0.2.0",
-    "chalk": "4.1.2",
-    "commander": "^9.5.0",
+    "chalk": "5.4.1",
+    "commander": "^14.0.0",
     "dotenv": "^16.4.7",
     "fs-extra": "^11.3.0",
-    "ts-morph": "^25.0.1",
+    "ts-morph": "^26.0.0",
     "vite": "^6.3.4",
-    "zod": "4.0.0-beta.20250505T012514"
+    "zod": "3.25.64"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.32",
     "@typescript-eslint/eslint-plugin": "^8.29.0",
     "@typescript-eslint/parser": "^8.29.0",
     "@upstash/redis": "^1.34.6",
@@ -60,7 +60,7 @@
     "publint": "^0.3.12",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "vitest": "^3.2.3"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/client-types.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from "zod/v4";
 export const ZFieldValue = z.union([
   z.string(),

package/src/client.ts CHANGED Viewed

@@ -36,7 +36,7 @@ export type ClientObjectProps = {
     /**
      * The schema for the portal data.
      */
-    portalData?: StandardSchemaV1<GenericPortalData>;
+    portalData?: Record<string, StandardSchemaV1<FieldData>>;
   };
 };
@@ -55,7 +55,11 @@ function DataApi<
     : Fd;
   type InferredPortalData = Opts["schema"] extends object
     ? Opts["schema"]["portalData"] extends object
-      ? StandardSchemaV1.InferOutput<Opts["schema"]["portalData"]>
+      ? {
+          [K in keyof Opts["schema"]["portalData"]]: StandardSchemaV1.InferOutput<
+            Opts["schema"]["portalData"][K]
+          >;
+        }
       : Pd
     : Pd;
@@ -473,19 +477,20 @@ function DataApi<
           const validatedPortalRecords: PortalsWithIds<GenericPortalData>[] =
             [];
           for (const portalRecord of portalRecords) {
-            let portalResult = schema.portalData["~standard"].validate({
-              [portalName]: portalRecord,
-            });
+            let portalResult =
+              schema.portalData[portalName]?.["~standard"].validate(
+                portalRecord,
+              );
             if (portalResult instanceof Promise)
               portalResult = await portalResult;
-            if ("value" in portalResult) {
+            if (portalResult && "value" in portalResult) {
               validatedPortalRecords.push({
-                ...portalResult.value[portalName],
+                ...portalResult.value,
                 recordId: portalRecord.recordId,
                 modId: portalRecord.modId,
               });
             } else {
-              portalDataIssues.push(...portalResult.issues);
+              portalDataIssues.push(...(portalResult?.issues ?? []));
             }
           }
           // @ts-expect-error We know portalName is a valid key, but can't figure out the right assertions

package/stubs/fmschema.config.stub.js DELETED Viewed

@@ -1,17 +0,0 @@
-/**
- * @type {import("@proofgeist/fmdapi/dist/utils/typegen/types.d.ts").GenerateSchemaOptions}
- */
-const config = {
-  clientSuffix: "Layout",
-  schemas: [
-    // add your layouts and name schemas here
-    { layout: "my_layout", schemaName: "MySchema" },
-    // repeat as needed for each schema...
-    // { layout: "my_other_layout", schemaName: "MyOtherSchema" },
-  ],
-  // change this value to generate the files in a different directory
-  path: "schema",
-  clearOldFiles: true,
-};
-module.exports = config;

package/stubs/fmschema.config.stub.mjs DELETED Viewed

@@ -1,17 +0,0 @@
-/**
- * @type {import("@proofgeist/fmdapi/dist/utils/typegen/types.d.ts").GenerateSchemaOptions}
- */
-export const config = {
-  clientSuffix: "Layout",
-  schemas: [
-    // add your layouts and name schemas here
-    { layout: "my_layout", schemaName: "MySchema" },
-    // repeat as needed for each schema...
-    // { layout: "my_other_layout", schemaName: "MyOtherSchema" },
-  ],
-  // change this value to generate the files in a different directory
-  path: "schema",
-  clearOldFiles: true,
-};