@jd-data-limited/easy-fm 4.1.15 → 5.0.0-beta.2

package/dist/records/fields/valueField.d.ts

@@ -0,0 +1,41 @@
+import { BaseField, Parentable, RawValueData } from "./baseField.js";
+import { Temporal } from "temporal-polyfill";
+import { FieldResultTypes } from "../../models/apiResults.js";
+export declare abstract class ValueFieldBase<T, API_FIELD_RESULT extends FieldResultTypes> extends BaseField<T, API_FIELD_RESULT> {
+    #private;
+    /**
+     * @internal
+     * Use `layout.records.create()` instead to create a new LayoutRecord, as this may be safer.
+     * @param record
+     * @param id
+     * @param value
+     * @protected
+     */
+    constructor(record: Parentable, id: string, value: RawValueData);
+    set(content: T): void;
+    /** `true` if this field has changed since it was last loaded or saved. */
+    get edited(): boolean;
+    /**
+     * Resets the 'edited' state of this field, without changing its value
+     */
+    updateOriginalContents(): void;
+    set value(value: T);
+    get value(): T;
+}
+export declare class TextField<T extends string = string> extends ValueFieldBase<T, 'text'> {
+}
+export declare class NumberField<T extends number | null = number | null> extends ValueFieldBase<T, 'number'> {
+}
+export declare class TimeStampField extends ValueFieldBase<Temporal.PlainDateTime | null, 'timeStamp'> {
+    parseRawValue(value: RawValueData): Temporal.PlainDateTime | null;
+    serializeRawValue(): RawValueData;
+}
+export declare class DateField extends ValueFieldBase<Temporal.PlainDate | null, 'date'> {
+    parseRawValue(value: RawValueData): Temporal.PlainDate | null;
+    serializeRawValue(): RawValueData;
+}
+export declare class TimeField extends ValueFieldBase<Temporal.PlainTime | null, 'time'> {
+    parseRawValue(value: RawValueData): Temporal.PlainTime | null;
+    serializeRawValue(): RawValueData;
+}
+export type ValueField = TextField | NumberField | TimeStampField | DateField | TimeField;

package/dist/records/fields/valueField.js

@@ -0,0 +1,108 @@
+import { BaseField } from "./baseField.js";
+import { Temporal } from "temporal-polyfill";
+import { stringToTemporal, temporalToString } from "../../utils/temporal.js";
+export class ValueFieldBase extends BaseField {
+    #originalContents;
+    /**
+     * @internal
+     * Use `layout.records.create()` instead to create a new LayoutRecord, as this may be safer.
+     * @param record
+     * @param id
+     * @param value
+     * @protected
+     */
+    constructor(record, id, value) {
+        super(record, id, value);
+        this.#originalContents = value;
+    }
+    set(content) {
+        /**
+         * Sets the value of the field.
+         *
+         * @param {T | null} content - The new content value to be set. Can be either the type T or null.
+         * @throws {Error} Cannot set container value using set(). Use upload() instead, if the result is a 'container'.
+         */
+        if (this.isCalculationField() || this.isSummaryField()) {
+            throw new Error('Cannot modify the value of an immutable calculation or sumamry field.');
+        }
+        else
+            this._value = content;
+    }
+    /** `true` if this field has changed since it was last loaded or saved. */
+    get edited() {
+        return this.#originalContents !== this.serializeRawValue();
+    }
+    /**
+     * Resets the 'edited' state of this field, without changing its value
+     */
+    updateOriginalContents() {
+        this.#originalContents = this.serializeRawValue();
+    }
+    set value(value) {
+        this.set(value);
+    }
+    get value() {
+        return super.value;
+    }
+}
+export class TextField extends ValueFieldBase {
+}
+export class NumberField extends ValueFieldBase {
+}
+export class TimeStampField extends ValueFieldBase {
+    parseRawValue(value) {
+        if (value === '' || value === null)
+            return null;
+        if (typeof value !== 'string')
+            throw new Error("Received an invalid value for a temporal field.");
+        try {
+            return stringToTemporal(value, 'timestamp', this.parent.layout.database.host.timeStampFormat);
+        }
+        catch {
+            return Temporal.PlainDateTime.from(value);
+        }
+    }
+    serializeRawValue() {
+        if (this._value === null)
+            return '';
+        return temporalToString(this._value, this.parent.layout.database.host.timeStampFormat);
+    }
+}
+export class DateField extends ValueFieldBase {
+    parseRawValue(value) {
+        if (value === '' || value === null)
+            return null;
+        if (typeof value !== 'string')
+            throw new Error("Received an invalid value for a temporal field.");
+        try {
+            return stringToTemporal(value, 'date', this.parent.layout.database.host.dateFormat);
+        }
+        catch {
+            return Temporal.PlainDate.from(value);
+        }
+    }
+    serializeRawValue() {
+        if (this._value === null)
+            return '';
+        return temporalToString(this._value, this.parent.layout.database.host.dateFormat);
+    }
+}
+export class TimeField extends ValueFieldBase {
+    parseRawValue(value) {
+        if (value === '' || value === null)
+            return null;
+        if (typeof value !== 'string')
+            throw new Error("Received an invalid value for a temporal field.");
+        try {
+            return stringToTemporal(value, 'time', this.parent.layout.database.host.timeFormat);
+        }
+        catch {
+            return Temporal.PlainTime.from(value);
+        }
+    }
+    serializeRawValue() {
+        if (this._value === null)
+            return '';
+        return temporalToString(this._value, this.parent.layout.database.host.timeFormat);
+    }
+}

package/dist/records/getOperations/recordGetOperation.d.ts

@@ -4,7 +4,9 @@ import { type LayoutBase } from '../../layouts/layoutBase.js';
 import { LayoutRecord } from '../layoutRecord.js';
 import { type Query } from '../../utils/query.js';
 export type SortOrder = 'ascend' | 'descend';
+/** Raw FileMaker find request strings, already escaped/formatted. */
 export type FindRequestRaw = Record<string, string>;
+/** Safe find request built from `query` tagged template helpers. */
 export type FindRequest = Record<string, Query>;
 export interface PortalRequest {
     name: string;
@@ -24,6 +26,7 @@ export interface GetOperationOptions<T extends LayoutInterface> {
     limit?: number;
     offset?: number;
 }
+/** Builder/executor for list and find operations against one layout. */
 export declare class RecordGetOperation<T extends LayoutInterface, OPTIONS extends GetOperationOptions<T>> {
     protected layout: LayoutBase;
     protected limit: number;
@@ -51,7 +54,7 @@ export declare class RecordGetOperation<T extends LayoutInterface, OPTIONS exten
      */
     scripts(scripts: ScriptRequestData): this;
     /**
-     * Sorts the data based on the given field name and sort order.
+     * Add sort clause in request order.
      *
      * @param {string} fieldName - The name of the field by which the data should be sorted.
      * @param {SortOrder} sortOrder - The sort order to be applied (either "asc" for ascending or "desc" for descending).
@@ -61,7 +64,7 @@ export declare class RecordGetOperation<T extends LayoutInterface, OPTIONS exten
     sort(fieldName: string, sortOrder: SortOrder): this;
     private parseFindRequest;
     /**
-     * Adds a new request/query to the list of queries.
+     * Add one FileMaker find request block.
      *
      * @param {FindRequest} query - The find request to be added.
      * @param {boolean} [omit=false] - Flag to indicate if the find request should be omitted.
@@ -69,14 +72,14 @@ export declare class RecordGetOperation<T extends LayoutInterface, OPTIONS exten
      */
     addRequest(query: FindRequest, omit?: boolean): this;
     /**
-     * Perform a fetch operation.
+     * Execute request and return current page of records.
      *
      * @returns {Promise} A promise that resolves with the result of the fetch operation.
      */
     fetch(): Promise<LayoutRecord<PickPortals<T, keyof OPTIONS["portals"]>>[]>;
     private performFind;
     /**
-     * Creates an iterator that iterates throguh all results
+     * Create async iterator that pages through results lazily.
      * @param pageSize min: 1, max: 999
      */
     iterate(pageSize?: number): {

package/dist/records/getOperations/recordGetOperation.js

@@ -2,8 +2,12 @@
  * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 import { LayoutRecord } from '../layoutRecord.js';
+import { ApiRecordResponseObj } from '../../models/apiResults.js';
 import { FMError } from '../../FMError.js';
 import { FindRequestSymbol } from '../../utils/query.js';
+import { Temporal } from "temporal-polyfill";
+import { temporalToString } from "../../utils/temporal.js";
+/** Builder/executor for list and find operations against one layout. */
 export class RecordGetOperation {
     layout;
     limit = 100;
@@ -111,7 +115,7 @@ export class RecordGetOperation {
         return this;
     }
     /**
-     * Sorts the data based on the given field name and sort order.
+     * Add sort clause in request order.
      *
      * @param {string} fieldName - The name of the field by which the data should be sorted.
      * @param {SortOrder} sortOrder - The sort order to be applied (either "asc" for ascending or "desc" for descending).
@@ -129,21 +133,18 @@ export class RecordGetOperation {
                 if (typeof item === 'string')
                     return item;
                 // Re-write date into correct format
-                return item
-                    .moment
-                    .clone()
-                    .utcOffset(this.layout.database.host.timezoneOffsetFunc(item.moment))
-                    .format(item.type === 'date'
-                    ? this.layout.database.host.dateFormat
-                    : item.type == 'time'
-                        ? this.layout.database.host.timeFormat
-                        : this.layout.database.host.timeStampFormat);
+                if (item instanceof Temporal.PlainDateTime)
+                    return temporalToString(item, this.layout.database.host.timeStampFormat);
+                if (item instanceof Temporal.PlainDate)
+                    return temporalToString(item, this.layout.database.host.dateFormat);
+                if (item instanceof Temporal.PlainTime)
+                    return temporalToString(item, this.layout.database.host.timeFormat);
             }).join('');
         }
         return out;
     }
     /**
-     * Adds a new request/query to the list of queries.
+     * Add one FileMaker find request block.
      *
      * @param {FindRequest} query - The find request to be added.
      * @param {boolean} [omit=false] - Flag to indicate if the find request should be omitted.
@@ -154,7 +155,7 @@ export class RecordGetOperation {
         return this;
     }
     /**
-     * Perform a fetch operation.
+     * Execute request and return current page of records.
      *
      * @returns {Promise} A promise that resolves with the result of the fetch operation.
      */
@@ -162,7 +163,6 @@ export class RecordGetOperation {
         return await this.performFind(this.offset, this.limit);
     }
     async performFind(offset, limit) {
-        const trace = new Error();
         await this.layout.getLayoutMeta();
         const isFind = this.isFindRequest;
         let endpoint = this.layout.endpoint + (isFind ? '/_find' : '/records');
@@ -171,21 +171,17 @@ export class RecordGetOperation {
         const reqData = {
             // port: 443,
             method: isFind ? 'POST' : 'GET',
+            type: ApiRecordResponseObj,
             body: isFind ? JSON.stringify(this.generateParamsBody(offset, limit)) : undefined
         };
         try {
-            const res = await this.layout.database._apiRequestJSON(endpoint, reqData);
-            if (res.messages[0].code === '0' && res.response) {
-                // console.log("RESOLVING")
-                if (!this.layout.metadata)
-                    await this.layout.getLayoutMeta();
-                return res.response.data.map(item => {
-                    return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
-                });
-            }
-            else {
-                throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
-            }
+            const res = await this.layout.database.fetchJSON(endpoint, reqData);
+            // console.log("RESOLVING")
+            if (!this.layout.metadata)
+                await this.layout.getLayoutMeta();
+            return res.data.map(item => {
+                return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+            });
         }
         catch (e) {
             if (e instanceof FMError) {
@@ -198,7 +194,7 @@ export class RecordGetOperation {
         }
     }
     /**
-     * Creates an iterator that iterates throguh all results
+     * Create async iterator that pages through results lazily.
      * @param pageSize min: 1, max: 999
      */
     iterate(pageSize = 100) {

package/dist/records/layoutRecord.d.ts

@@ -4,33 +4,51 @@ import { PortalRecord } from './portalRecord.js';
 import { Portal } from './portal.js';
 import { type LayoutInterface } from '../layouts/layoutInterface.js';
 import { type LayoutRecordBase } from './layoutRecordBase.js';
-import { type ApiPortalData, type ApiRowDataDef } from '../models/apiResults.js';
+import { type ApiFieldData, ApiFieldMetadata, type ApiPortalData, type ApiRowDataDef } from '../models/apiResults.js';
 import { type LayoutBase } from '../layouts/layoutBase.js';
-import { type Field, type FieldValue } from './field.js';
+import z from 'zod';
+import { Field } from "./fields/field.js";
 export declare class LayoutRecord<LAYOUT extends LayoutInterface> extends RecordBase<LAYOUT['fields']> implements LayoutRecordBase {
     portals: LAYOUT['portals'];
     private readonly portalsToInclude;
-    constructor(layout: LayoutBase, recordId: number | string, modId?: string | number, fieldData?: Record<string, string | number>, portalData?: ApiPortalData | null, portalsToInclude?: Array<keyof LAYOUT['portals']>);
+    constructor(layout: LayoutBase, recordId: number | string, modId?: string | number, fieldData?: z.infer<typeof ApiFieldData>, portalData?: z.infer<typeof ApiPortalData> | null, portalsToInclude?: Array<keyof LAYOUT['portals']>);
+    /** Returns all loaded portals on this record as an array. */
     get portalsArray(): Array<Portal<any>>;
     /**
-     * Asynchronously commits the changes made to the current record.
+     * Saves this record back to FileMaker.
      * @param {extraBodyOptions} extraBody - The options for the extra body elements.
      * @returns {Promise<this>} - A promise that resolves with the modified object.
      * @throws {FMError} - If an error occurs during the commit process.
      */
     commit(extraBody?: extraBodyOptions): Promise<this>;
-    protected processPortalData(portalData: ApiPortalData): void;
+    getFieldMetadata(fieldId: string): z.infer<typeof ApiFieldMetadata>;
+    protected processPortalData(portalData: z.infer<typeof ApiPortalData>): void;
     /**
-     * Re-fetches the current record from the database server.
-     * Throws an error if commit() has not been called.
+     * Reloads this record from FileMaker.
+     * Throws if this record has not been saved yet.
      *
      * @return {Promise<this>} A Promise that resolves to this RecordBase instance if the record is successfully retrieved.
      * @throws {Error} If commit() has not been called.
      * @throws {FMError} If the retrieval fails.
      */
     get(): Promise<this>;
+    /** Creates a duplicate of this record in FileMaker. */
     duplicate(): Promise<LayoutRecord<LAYOUT>>;
+    /** Deletes this record from FileMaker. */
     delete(): Promise<void>;
-    fieldsToObject(filter?: (a: Field<FieldValue>) => boolean): Omit<ApiRowDataDef, 'portalData'>;
-    toObject(filter?: (a: Field<FieldValue>) => any, portalFilter?: (a: Portal<any>) => any, portalRowFilter?: (a: PortalRecord<any>) => any, portalFieldFilter?: (a: Field<FieldValue>) => any): ApiRowDataDef;
+    /** Returns this record's edited fields as a FileMaker API payload. */
+    fieldsToObject(filter?: (a: Field) => boolean): Omit<z.infer<typeof ApiRowDataDef>, 'portalData'>;
+    /** Returns this record and its portal edits as a FileMaker API payload. */
+    toObject(filter?: (a: Field) => any, portalFilter?: (a: Portal<any>) => any, portalRowFilter?: (a: PortalRecord<any>) => any, portalFieldFilter?: (a: Field) => any): {
+        fieldData: Record<string, string | number | null>;
+        portalData: Record<string, Record<string, string | number | null>[]>;
+        modId: string;
+        recordId: string;
+        portalDataInfo?: {
+            database: string;
+            table: string;
+            foundCount: number;
+            returnedCount: number;
+        }[] | undefined;
+    };
 }

package/dist/records/layoutRecord.js

@@ -5,7 +5,9 @@ import { RecordBase } from './recordBase.js';
 import { PortalRecord } from './portalRecord.js';
 import { Portal } from './portal.js';
 import { FMError } from '../FMError.js';
-import moment from 'moment';
+import { ApiRecordResponseObj } from '../models/apiResults.js';
+import z from 'zod';
+import { ValueFieldBase } from "./fields/valueField.js";
 export class LayoutRecord extends RecordBase {
     portals = {};
     portalsToInclude;
@@ -16,11 +18,12 @@ export class LayoutRecord extends RecordBase {
             this.processPortalData(portalData);
         }
     }
+    /** Returns all loaded portals on this record as an array. */
     get portalsArray() {
         return Object.values(this.portals);
     }
     /**
-     * Asynchronously commits the changes made to the current record.
+     * Saves this record back to FileMaker.
      * @param {extraBodyOptions} extraBody - The options for the extra body elements.
      * @returns {Promise<this>} - A promise that resolves with the modified object.
      * @throws {FMError} - If an error occurs during the commit process.
@@ -50,44 +53,52 @@ export class LayoutRecord extends RecordBase {
             data.fieldData.deleteRelated = extraBody.deleteRelatedRecords.map(i => `${i.table}.${i.recordId}`);
         if (this.recordId === -1) {
             // This is a new LayoutRecord
-            const res = await this.layout.database._apiRequestJSON(`${this.layout.endpoint}/records`, {
+            const res = await this.layout.database.fetchJSON(`${this.layout.endpoint}/records`, {
                 method: 'POST',
-                body: JSON.stringify(data)
+                body: JSON.stringify(data),
+                type: z.object({
+                    recordId: z.string(),
+                    modId: z.string(),
+                    scriptError: z.string().optional()
+                })
             });
-            if (!res.response) {
-                throw new FMError(res.messages[0].code, res.httpStatus, res);
-            }
-            else if (typeof res.response.scriptError !== 'undefined' && res.response.scriptError !== '0') {
-                throw new FMError(res.response.scriptError, res.httpStatus, res);
-            }
-            else if (res.messages[0].code === '0') {
-                this.recordId = parseInt(res.response.recordId);
-                this.modId = parseInt(res.response.modId);
-                return this;
-            }
-            else {
-                throw new FMError(res.messages[0].code, res.httpStatus, res);
+            if (typeof res.scriptError !== 'undefined' && res.scriptError !== '0') {
+                throw new FMError(res.scriptError, res.httpStatus, res);
             }
+            this.recordId = parseInt(res.recordId);
+            this.modId = parseInt(res.modId);
+            this._onSave();
+            return this;
         }
         // for (let item of Object.keys(data)) extraBody[item] = data[item]
-        const res = await this.layout.database._apiRequestJSON(this.endpoint, {
+        const res = await this.layout.database.fetchJSON(this.endpoint, {
             method: 'PATCH',
-            body: JSON.stringify(data)
+            body: JSON.stringify(data),
+            type: z.object({
+                modId: z.string(),
+                newPortalRecordInfo: z.array(z.object({
+                    tableName: z.string(),
+                    recordId: z.string(),
+                    modId: z.string()
+                })).optional(),
+                scriptError: z.string().optional()
+            })
         });
-        if (!res.response) {
-            throw new FMError(res.messages[0].code, res.httpStatus, res);
-        }
-        else if (typeof res.response.scriptError !== 'undefined' && res.response.scriptError !== '0') {
-            throw new FMError(res.response.scriptError, res.httpStatus, res);
-        }
-        else if (res.messages[0].code === '0') {
-            this.modId = +res.response.modId;
-            this._onSave();
-            return this;
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res);
+        if (typeof res.scriptError !== 'undefined' && res.scriptError !== '0') {
+            throw new FMError(res.scriptError, res.httpStatus, res);
         }
+        this.modId = +res.modId;
+        this._onSave();
+        return this;
+    }
+    getFieldMetadata(fieldId) {
+        if (!this.layout.metadata) {
+            throw new Error("Field metadata not found. Ensure you run layout.getLayoutMeta() first.");
+        }
+        let result = this.layout.metadata.fieldMetaData.find(i => i.name === fieldId);
+        if (!result)
+            throw new Error("Field metadata not found. Ensure you run layout.getLayoutMeta() first.");
+        return result;
     }
     processPortalData(portalData) {
         for (const portalName of Object.keys(portalData)) {
@@ -103,8 +114,8 @@ export class LayoutRecord extends RecordBase {
         }
     }
     /**
-     * Re-fetches the current record from the database server.
-     * Throws an error if commit() has not been called.
+     * Reloads this record from FileMaker.
+     * Throws if this record has not been saved yet.
      *
      * @return {Promise<this>} A Promise that resolves to this RecordBase instance if the record is successfully retrieved.
      * @throws {Error} If commit() has not been called.
@@ -116,87 +127,63 @@ export class LayoutRecord extends RecordBase {
         }
         if (!this.layout.metadata)
             await this.layout.getLayoutMeta();
-        const res = await this.layout.database._apiRequestJSON(this.endpoint, {
-            method: 'GET'
+        const res = await this.layout.database.fetchJSON(this.endpoint, {
+            type: ApiRecordResponseObj
         });
-        if (res.response && res.messages[0].code === '0') {
-            // console.log(res, res.response.data)
-            this.modId = +res.response.data[0].modId;
-            this.processFieldData(res.response.data[0].fieldData);
-            this.portalData = [];
-            if (res.response.data[0].portalData)
-                this.processPortalData(res.response.data[0].portalData);
-            return this;
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res);
-        }
+        // console.log(res, res.response.data)
+        this.modId = +res.data[0].modId;
+        this.processFieldData(res.data[0].fieldData);
+        this.portalData = [];
+        if (res.data[0].portalData)
+            this.processPortalData(res.data[0].portalData);
+        return this;
     }
+    /** Creates a duplicate of this record in FileMaker. */
     async duplicate() {
         const trace = new Error();
-        const res = await this.layout.database._apiRequestJSON(this.endpoint, {
-            method: 'POST'
+        const res = await this.layout.database.fetchJSON(this.endpoint, {
+            method: 'POST',
+            type: z.object({
+                recordId: z.string(),
+                modId: z.string(),
+                scriptError: z.string().optional()
+            })
         });
-        if (!res.response) {
-            throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
-        }
-        else if (typeof res.response.scriptError !== 'undefined' && res.response.scriptError !== '0') {
-            throw new FMError(res.response.scriptError, res.httpStatus, res, trace);
-        }
-        else if (res.messages[0].code === '0') {
-            const data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false);
-            const _res = new LayoutRecord(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData);
-            this.emit('duplicated');
-            return _res;
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+        if (typeof res.scriptError !== 'undefined' && res.scriptError !== '0') {
+            throw new FMError(res.scriptError, res.httpStatus, res, trace);
         }
+        const data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false);
+        const _res = new LayoutRecord(this.layout, res.recordId, res.modId, data.fieldData, data.portalData);
+        this.emit('duplicated');
+        return _res;
     }
+    /** Deletes this record from FileMaker. */
     async delete() {
-        const res = await this.layout.database._apiRequestJSON(this.endpoint, {
-            method: 'DELETE'
+        const res = await this.layout.database.fetchJSON(this.endpoint, {
+            method: 'DELETE',
+            type: z.object({
+                scriptError: z.string().optional()
+            }).optional()
         });
-        if (typeof res.response?.scriptError !== 'undefined' && res.response?.scriptError !== '0') {
-            throw new FMError(res.response.scriptError, res.httpStatus, res);
-        }
-        else if (res.messages[0].code === '0') {
-            this.emit('deleted');
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res);
+        if (typeof res.scriptError !== 'undefined' && res.scriptError !== '0') {
+            throw new FMError(res.scriptError, res.httpStatus, res);
         }
+        this.emit('deleted');
     }
-    fieldsToObject(filter = (a) => a.edited) {
+    /** Returns this record's edited fields as a FileMaker API payload. */
+    fieldsToObject(filter = (a) => a instanceof ValueFieldBase && a.edited) {
         const fieldsProcessed = {};
-        let field;
-        for (field of this.fieldsArray.filter(field => filter(field))) {
-            let value = field.value;
-            if (value instanceof Date) {
-                let _value = moment(value);
-                _value = _value
-                    .utcOffset(this.layout.database.host.timezoneOffsetFunc(_value));
-                switch (field.metadata.result) {
-                    case 'time':
-                        value = _value.format(this.layout.database.host.timeFormat);
-                        break;
-                    case 'date':
-                        value = _value.format(this.layout.database.host.dateFormat);
-                        break;
-                    default:
-                        value = _value.format(this.layout.database.host.timeStampFormat);
-                }
-            }
-            fieldsProcessed[field.id] = value;
+        for (const field of this.fieldsArray.filter(field => filter(field))) {
+            fieldsProcessed[field.id] = field.serializeRawValue();
         }
-        const obj = {
+        return {
             recordId: this.recordId.toString(),
             modId: this.modId.toString(),
             fieldData: fieldsProcessed
         };
-        return obj;
     }
-    toObject(filter = (a) => a.edited, portalFilter = (a) => a.records.find(record => record.edited), portalRowFilter = (a) => a.edited, portalFieldFilter = (a) => a.edited) {
+    /** Returns this record and its portal edits as a FileMaker API payload. */
+    toObject(filter = (a) => a instanceof ValueFieldBase && a.edited, portalFilter = (a) => a.records.find(record => record.edited), portalRowFilter = (a) => a.edited, portalFieldFilter = (a) => a instanceof ValueFieldBase && a.edited) {
         const obj = {
             ...this.fieldsToObject(filter),
             portalData: {}

package/dist/records/portal.d.ts

@@ -1,13 +1,11 @@
 import { PortalRecord } from './portalRecord.js';
-import { type RecordFieldsMap } from '../layouts/recordFieldsMap.js';
 import { type PortalBase } from './portalBase.js';
 import { type LayoutRecord } from './layoutRecord.js';
+import { RecordFieldsMap } from "../layouts/layoutInterface.js";
 /**
  * Represents a portal.
  *
  * @template T - The type of RecordFieldsMap.
- * @class
- * @implements {PortalBase<T>}
  */
 export declare class Portal<T extends RecordFieldsMap> implements PortalBase<T> {
     readonly record: LayoutRecord<any>;
@@ -16,8 +14,6 @@ export declare class Portal<T extends RecordFieldsMap> implements PortalBase<T>
     constructor(record: LayoutRecord<any>, name: string);
     /**
      * Add a new record to the portal
-     * @function create
-     * @async
      * @summary Creates a new record.
      * @returns {Promise<PortalRecord<T>>} A Promise that resolves to the newly created record.
      */

package/dist/records/portal.js

@@ -6,8 +6,6 @@ import { PortalRecord } from './portalRecord.js';
  * Represents a portal.
  *
  * @template T - The type of RecordFieldsMap.
- * @class
- * @implements {PortalBase<T>}
  */
 export class Portal {
     record;
@@ -19,8 +17,6 @@ export class Portal {
     }
     /**
      * Add a new record to the portal
-     * @function create
-     * @async
      * @summary Creates a new record.
      * @returns {Promise<PortalRecord<T>>} A Promise that resolves to the newly created record.
      */