@jd-data-limited/easy-fm 4.0.3 → 4.0.5

package/src/connection/database.ts

@@ -7,7 +7,7 @@ import {generateAuthorizationHeaders} from "./generateAuthorizationHeaders.js";
 import {FMError} from "../FMError.js";
 import {LayoutInterface} from "../layouts/layoutInterface.js";
 import {Layout} from "../layouts/layout.js";
-import * as HTTP_REDIRECT from "follow-redirects"
+import HTTP_REDIRECT from "follow-redirects"
 import {
     databaseOptionsBase,
     databaseOptionsWithExternalSources,
@@ -118,7 +118,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
 
         let _fetch = await fetch(url, options)
         if (_fetch.headers.get('set-cookie')) {
-            for (let cookie of _fetch.headers.get('set-cookie')) {
+            for (let cookie of _fetch.headers.get('set-cookie') || []) {
                 let cookie_split = cookie.split("=")
                 this.cookies[cookie_split[0]] = cookie_split[1]
             }
@@ -126,7 +126,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         let data = await _fetch.json() as ApiResults<T>
 
         // Remove response if it is empty. This makes checking for an empty response easier
-        if (Object.keys(data.response).length === 0) delete data.response
+        if (data.response && Object.keys(data.response).length === 0) delete data.response
 
         // console.log(data.messages[0])
         if (data.messages[0].code === "952" && autoRelogin) {
@@ -195,14 +195,14 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                         let cookie_split = cookie.split("=")
                         this.cookies[cookie_split[0]] = cookie_split[1]
                     }
-                    res.headers['set-cookie'] = null
+                    res.headers['set-cookie'] = undefined
                 }
             }
 
             // Automatically switch between the http and https modules, based on which is needed
             (url.startsWith("https") ? HTTP_REDIRECT.https : HTTP_REDIRECT.http).get(url, {
                 headers,
-                beforeRedirect: (options, res) => check_for_cookies(res)
+                beforeRedirect: (options: any, res: any) => check_for_cookies(res)
             }, (res) => {
                 check_for_cookies(res)
 

package/src/index.d.ts

@@ -13,5 +13,6 @@ import { Container, FieldBase } from "./records/fieldBase.js";
 import { RecordGetOperation } from "./records/getOperations/recordGetOperation.js";
 import { LayoutRecordManager } from "./layouts/layoutRecordManager.js";
 import { RecordFieldsMap } from "./layouts/recordFieldsMap.js";
+import { query, queryEscape } from "./utils/query.js";
 export default FMHost;
-export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, LayoutInterface, RecordFieldsMap, PortalInterface, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager, Container, PickPortals };
+export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, LayoutInterface, RecordFieldsMap, PortalInterface, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager, Container, PickPortals, query, queryEscape };

package/src/index.js

@@ -13,5 +13,6 @@ import { Portal } from "./records/portal.js";
 import { FieldBase } from "./records/fieldBase.js";
 import { RecordGetOperation } from "./records/getOperations/recordGetOperation.js";
 import { LayoutRecordManager } from "./layouts/layoutRecordManager.js";
+import { query, queryEscape } from "./utils/query.js";
 export default FMHost;
-export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager };
+export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager, query, queryEscape };

package/src/index.ts

@@ -17,6 +17,7 @@ import {Container, FieldBase} from "./records/fieldBase.js";
 import {RecordGetOperation} from "./records/getOperations/recordGetOperation.js";
 import {LayoutRecordManager} from "./layouts/layoutRecordManager.js";
 import {RecordFieldsMap} from "./layouts/recordFieldsMap.js";
+import {query, queryEscape} from "./utils/query.js";
 
 export default FMHost
 export {
@@ -35,5 +36,7 @@ export {
     RecordGetOperation,
     LayoutRecordManager,
     Container,
-    PickPortals
+    PickPortals,
+    query,
+    queryEscape
 }

package/src/layouts/layout.d.ts

@@ -8,7 +8,7 @@ export declare class Layout<T extends LayoutInterface> implements LayoutBase {
     readonly database: DatabaseBase;
     readonly name: string;
     readonly records: LayoutRecordManager<T>;
-    metadata: ApiLayoutMetadata;
+    metadata: ApiLayoutMetadata | null;
     constructor(database: DatabaseBase, name: string);
     get endpoint(): string;
     runScript(script: Script): Promise<ScriptResult>;

package/src/layouts/layout.js

@@ -7,7 +7,7 @@ export class Layout {
     database;
     name;
     records = new LayoutRecordManager(this);
-    metadata;
+    metadata = null;
     constructor(database, name) {
         this.database = database;
         this.name = name;
@@ -23,19 +23,24 @@ export class Layout {
             port: 443,
             method: "GET"
         });
-        if (res.messages[0].code === "0") {
+        if (res.response && res.messages[0].code === "0") {
             let error = parseInt(res.response.scriptError);
             return {
                 scriptError: error ? new FMError(error, 200, res) : undefined,
                 scriptResult: res.response.scriptResult
             };
         }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res);
+        }
     }
     async getLayoutMeta() {
         if (this.metadata) {
             return this.metadata;
         }
         let res = await this.database.apiRequest(this.endpoint);
+        if (!res.response)
+            throw new FMError(res.messages[0].code, res.httpStatus, res);
         this.metadata = res.response;
         return this.metadata;
     }

package/src/layouts/layout.ts

@@ -14,7 +14,7 @@ export class Layout<T extends LayoutInterface> implements LayoutBase {
     readonly database: DatabaseBase;
     readonly name: string;
     readonly records = new LayoutRecordManager<T>(this)
-    metadata: ApiLayoutMetadata;
+    metadata: ApiLayoutMetadata | null = null;
 
     constructor(database: DatabaseBase, name: string) {
         this.database = database
@@ -33,12 +33,14 @@ export class Layout<T extends LayoutInterface> implements LayoutBase {
             port: 443,
             method: "GET"
         })
-        if (res.messages[0].code === "0") {
+        if (res.response && res.messages[0].code === "0") {
             let error = parseInt(res.response.scriptError)
             return {
                 scriptError: error ? new FMError(error, 200, res) : undefined,
                 scriptResult: res.response.scriptResult
             }
+        } else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res);
         }
     }
 
@@ -48,6 +50,7 @@ export class Layout<T extends LayoutInterface> implements LayoutBase {
         }
 
         let res = await this.database.apiRequest<ApiLayoutMetadata>(this.endpoint)
+        if (!res.response) throw new FMError(res.messages[0].code, res.httpStatus, res)
         this.metadata = res.response
         return this.metadata
     }

package/src/layouts/layoutRecordManager.js

@@ -9,13 +9,13 @@ export class LayoutRecordManager {
         this.layout = layout;
     }
     async create(options) {
-        await this.layout.getLayoutMeta();
+        let metadata = await this.layout.getLayoutMeta();
         let fields = {};
-        for (let _field of this.layout.metadata.fieldMetaData) {
+        for (let _field of metadata.fieldMetaData) {
             fields[_field.name] = "";
         }
         let portals = {};
-        for (let _portal of Object.keys(this.layout.metadata.portalMetaData))
+        for (let _portal of Object.keys(metadata.portalMetaData))
             portals[_portal] = [];
         return new LayoutRecord(this.layout, -1, 0, fields, portals);
     }

package/src/layouts/layoutRecordManager.ts

@@ -18,13 +18,13 @@ export class LayoutRecordManager<T extends LayoutInterface> {
     async create<OPTIONS extends RecordFetchOptions>(options: OPTIONS): Promise<LayoutRecord<
         PickPortals<T, OPTIONS["portals"][number]>
     >> {
-        await this.layout.getLayoutMeta()
+        let metadata = await this.layout.getLayoutMeta()
         let fields: ApiFieldData = {}
-        for (let _field of this.layout.metadata.fieldMetaData) {
+        for (let _field of metadata.fieldMetaData) {
             fields[_field.name] = ""
         }
         let portals: {[key: string]: []} = {}
-        for (let _portal of Object.keys(this.layout.metadata.portalMetaData)) portals[_portal] = []
+        for (let _portal of Object.keys(metadata.portalMetaData)) portals[_portal] = []
         return new LayoutRecord(this.layout, -1, 0, fields, portals)
     }
 

package/src/models/apiResults.d.ts

@@ -94,7 +94,7 @@ export interface ApiRowDataDef {
     portalData: ApiPortalData;
     modId: string;
     recordId: string;
-    portalDataInfo: {
+    portalDataInfo?: {
         database: string;
         table: string;
         foundCount: number;

package/src/models/apiResults.ts

@@ -101,7 +101,7 @@ export interface ApiRowDataDef {
     portalData: ApiPortalData,
     modId: string,
     recordId: string,
-    portalDataInfo: {
+    portalDataInfo?: {
         database: string,
         table: string,
         foundCount: number,

package/src/records/field.d.ts

@@ -1,5 +1,6 @@
 import { RecordBase } from "./recordBase.js";
 import { FieldBase, FieldValue } from "./fieldBase.js";
-export declare class Field<T extends FieldValue> extends FieldBase<T> {
+export declare abstract class Field<T extends FieldValue> extends FieldBase<T> {
     record: RecordBase<any>;
+    protected constructor(record: RecordBase<any>);
 }

package/src/records/field.js

@@ -4,4 +4,8 @@
 import { FieldBase } from "./fieldBase.js";
 export class Field extends FieldBase {
     record;
+    constructor(record) {
+        super();
+        this.record = record;
+    }
 }

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

@@ -5,6 +5,7 @@ import { LayoutRecord } from "../layoutRecord.js";
 export type SortOrder = "ascend" | "descend";
 export type FindRequest = {
     [key: string]: string;
+} & {
     omit?: "true" | "false";
 };
 export type PortalRequest = {
@@ -46,7 +47,7 @@ export declare class RecordGetOperation<T extends LayoutInterface, OPTIONS exten
     [Symbol.asyncIterator](): {
         next: () => Promise<{
             done: boolean;
-            value: LayoutRecord<PickPortals<T, keyof OPTIONS["portals"]>>;
+            value: LayoutRecord<PickPortals<T, keyof OPTIONS["portals"]>> | undefined;
         }>;
     };
 }

package/src/records/getOperations/recordGetOperation.js

@@ -33,20 +33,20 @@ export class RecordGetOperation {
         if (this.scriptData.after?.parameter)
             params["script.param"] = this.scriptData.after.parameter;
         if (this.scriptData.presort)
-            params["script.presort"] = this.scriptData.after.name;
+            params["script.presort"] = this.scriptData.presort.name;
         if (this.scriptData.presort?.parameter)
-            params["script.presort.param"] = this.scriptData.after.parameter;
+            params["script.presort.param"] = this.scriptData.presort.parameter;
         if (this.scriptData.prerequest)
-            params["script.prerequest"] = this.scriptData.after.name;
+            params["script.prerequest"] = this.scriptData.prerequest.name;
         if (this.scriptData.prerequest?.parameter)
-            params["script.prerequest.param"] = this.scriptData.after.parameter;
+            params["script.prerequest.param"] = this.scriptData.prerequest.parameter;
         if (this.queries.length !== 0)
             params["query"] = this.queries;
         let portals = Object.keys(this.portals);
         params["portal"] = portals;
         for (let portal of portals) {
-            params[`offset.${portal}`] = this.portals[portal].offset;
-            params[`limit.${portal}`] = this.portals[portal].limit;
+            params[`offset.${portal.toString()}`] = this.portals[portal]?.offset;
+            params[`limit.${portal.toString()}`] = this.portals[portal]?.limit;
         }
         return params;
     }
@@ -62,17 +62,17 @@ export class RecordGetOperation {
         if (this.scriptData.after?.parameter)
             params.set("script.param", this.scriptData.after.parameter);
         if (this.scriptData.presort)
-            params.set("script.presort", this.scriptData.after.name);
+            params.set("script.presort", this.scriptData.presort.name);
         if (this.scriptData.presort?.parameter)
-            params.set("script.presort.param", this.scriptData.after.parameter);
+            params.set("script.presort.param", this.scriptData.presort.parameter);
         if (this.scriptData.prerequest)
-            params.set("script.prerequest", this.scriptData.after.name);
+            params.set("script.prerequest", this.scriptData.prerequest.name);
         if (this.scriptData.prerequest?.parameter)
-            params.set("script.prerequest.param", this.scriptData.after.parameter);
+            params.set("script.prerequest.param", this.scriptData.prerequest.parameter);
         let portals = Object.keys(this.portals);
         for (let portal of portals) {
-            params.set(`_offset.${portal}`, this.portals[portal].limit.toString());
-            params.set(`_offset.${portal}`, this.portals[portal].offset.toString());
+            params.set(`_offset.${portal.toString()}`, (this.portals[portal]?.limit || "").toString());
+            params.set(`_offset.${portal.toString()}`, (this.portals[portal]?.offset || "").toString());
         }
         params.set('portal', JSON.stringify(portals));
         return params;
@@ -104,21 +104,28 @@ export class RecordGetOperation {
             method: is_find ? "POST" : "GET",
             body: is_find ? JSON.stringify(this.generateParamsBody(offset, limit)) : undefined,
         };
-        let res = await this.layout.database.apiRequest(endpoint, reqData);
-        if (res.messages[0].code === "0") {
-            // 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 if (res.messages[0].code == "401") {
-            // No records found, so return empty set
-            return [];
+        try {
+            let res = await this.layout.database.apiRequest(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);
+            }
         }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+        catch (e) {
+            if (e instanceof FMError) {
+                if (e.code === 401) {
+                    // No records found, so return empty set
+                    return [];
+                }
+            }
+            throw e;
         }
     }
     [Symbol.asyncIterator]() {

package/src/records/getOperations/recordGetOperation.ts

@@ -12,8 +12,8 @@ import {FMError} from "../../FMError.js";
 export type SortOrder = "ascend" | "descend"
 export type FindRequest = {
     [key: string]: string,
-    omit?: "true" | "false"
-}
+} & {omit?: "true" | "false"}
+
 export type PortalRequest = {
     name: string,
 }
@@ -62,19 +62,19 @@ export class RecordGetOperation<T extends LayoutInterface, OPTIONS extends GetOp
         if (this.scriptData.after) params["script"] = this.scriptData.after.name
         if (this.scriptData.after?.parameter) params["script.param"] = this.scriptData.after.parameter
 
-        if (this.scriptData.presort) params["script.presort"] = this.scriptData.after.name
-        if (this.scriptData.presort?.parameter) params["script.presort.param"] = this.scriptData.after.parameter
+        if (this.scriptData.presort) params["script.presort"] = this.scriptData.presort.name
+        if (this.scriptData.presort?.parameter) params["script.presort.param"] = this.scriptData.presort.parameter
 
-        if (this.scriptData.prerequest) params["script.prerequest"] = this.scriptData.after.name
-        if (this.scriptData.prerequest?.parameter) params["script.prerequest.param"] = this.scriptData.after.parameter
+        if (this.scriptData.prerequest) params["script.prerequest"] = this.scriptData.prerequest.name
+        if (this.scriptData.prerequest?.parameter) params["script.prerequest.param"] = this.scriptData.prerequest.parameter
 
         if (this.queries.length !== 0) params["query"] = this.queries
 
-        let portals = Object.keys(this.portals)
+        let portals: (keyof typeof this.portals)[] = Object.keys(this.portals)
         params["portal"] = portals
         for (let portal of portals) {
-            params[`offset.${portal}`] = this.portals[portal].offset
-            params[`limit.${portal}`] = this.portals[portal].limit
+            params[`offset.${portal.toString()}`] = this.portals[portal]?.offset
+            params[`limit.${portal.toString()}`] = this.portals[portal]?.limit
         }
 
         return params
@@ -89,16 +89,16 @@ export class RecordGetOperation<T extends LayoutInterface, OPTIONS extends GetOp
         if (this.scriptData.after) params.set("script", this.scriptData.after.name)
         if (this.scriptData.after?.parameter) params.set("script.param", this.scriptData.after.parameter)
 
-        if (this.scriptData.presort) params.set("script.presort", this.scriptData.after.name)
-        if (this.scriptData.presort?.parameter) params.set("script.presort.param", this.scriptData.after.parameter)
+        if (this.scriptData.presort) params.set("script.presort", this.scriptData.presort.name)
+        if (this.scriptData.presort?.parameter) params.set("script.presort.param", this.scriptData.presort.parameter)
 
-        if (this.scriptData.prerequest) params.set("script.prerequest", this.scriptData.after.name)
-        if (this.scriptData.prerequest?.parameter) params.set("script.prerequest.param", this.scriptData.after.parameter)
+        if (this.scriptData.prerequest) params.set("script.prerequest", this.scriptData.prerequest.name)
+        if (this.scriptData.prerequest?.parameter) params.set("script.prerequest.param", this.scriptData.prerequest.parameter)
 
-        let portals = Object.keys(this.portals)
+        let portals: (keyof typeof this.portals)[] = Object.keys(this.portals)
         for (let portal of portals) {
-            params.set(`_offset.${portal}`, this.portals[portal].limit.toString())
-            params.set(`_offset.${portal}`, this.portals[portal].offset.toString())
+            params.set(`_offset.${portal.toString()}`, (this.portals[portal]?.limit || "").toString())
+            params.set(`_offset.${portal.toString()}`, (this.portals[portal]?.offset || "").toString())
         }
         params.set('portal', JSON.stringify(portals))
 
@@ -139,23 +139,29 @@ export class RecordGetOperation<T extends LayoutInterface, OPTIONS extends GetOp
             body: is_find ? JSON.stringify(this.generateParamsBody(offset, limit)) : undefined,
         }
 
-        let res = await this.layout.database.apiRequest<ApiRecordResponseObj>(
-            endpoint,
-            reqData
-        )
-        if (res.messages[0].code === "0") {
-            // 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 if (res.messages[0].code == "401") {
-            // No records found, so return empty set
-            return []
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res, trace)
+        try {
+            let res = await this.layout.database.apiRequest<ApiRecordResponseObj>(
+                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)
+            }
+        } catch(e) {
+            if (e instanceof FMError) {
+                if (e.code === 401) {
+                    // No records found, so return empty set
+                    return []
+                }
+            }
+            throw e
         }
     }
 

package/src/records/layoutRecord.d.ts

@@ -4,7 +4,7 @@ import { PortalRecord } from "./portalRecord.js";
 import { Portal } from "./portal.js";
 import { LayoutInterface } from "../layouts/layoutInterface.js";
 import { LayoutRecordBase } from "./layoutRecordBase.js";
-import { ApiPortalData } from "../models/apiResults.js";
+import { ApiPortalData, ApiRowDataDef } from "../models/apiResults.js";
 import { LayoutBase } from "../layouts/layoutBase.js";
 import { FieldBase, FieldValue } from "./fieldBase.js";
 export declare class LayoutRecord<LAYOUT extends LayoutInterface> extends RecordBase<LAYOUT["fields"]> implements LayoutRecordBase {
@@ -17,5 +17,6 @@ export declare class LayoutRecord<LAYOUT extends LayoutInterface> extends Record
     get(): Promise<this>;
     duplicate(): Promise<LayoutRecord<LAYOUT>>;
     delete(): Promise<void>;
-    toObject(filter?: (a: FieldBase<FieldValue>) => any, portalFilter?: (a: Portal<any>) => any, portalRowFilter?: (a: PortalRecord<never>) => any, portalFieldFilter?: (a: FieldBase<FieldValue>) => any): Partial<Omit<import("../models/apiResults.js").ApiRowDataDef, "portalDataInfo">>;
+    fieldsToObject(filter?: (a: FieldBase<FieldValue>) => boolean): Omit<ApiRowDataDef, "portalData">;
+    toObject(filter?: (a: FieldBase<FieldValue>) => any, portalFilter?: (a: Portal<any>) => any, portalRowFilter?: (a: PortalRecord<never>) => any, portalFieldFilter?: (a: FieldBase<FieldValue>) => any): ApiRowDataDef;
 }

package/src/records/layoutRecord.js

@@ -5,13 +5,13 @@ import { RecordBase } from "./recordBase.js";
 import { PortalRecord } from "./portalRecord.js";
 import { Portal } from "./portal.js";
 import { FMError } from "../FMError.js";
+import * as moment from "moment/moment.js";
 export class LayoutRecord extends RecordBase {
     // @ts-ignore
     portals = {};
     portalsToInclude;
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null, portalsToInclude = []) {
-        super(layout, parseInt(recordId), parseInt(modId));
-        this.processFieldData(fieldData);
+        super(layout, parseInt(recordId), parseInt(modId), fieldData);
         this.portalsToInclude = portalsToInclude;
         if (portalData) {
             this.processPortalData(portalData);
@@ -30,7 +30,7 @@ export class LayoutRecord extends RecordBase {
                 data["script.param"] = extraBody.scripts.after.parameter;
         }
         if (extraBody.scripts?.prerequest) {
-            data["script.prerequest"] = extraBody.scripts.after.name;
+            data["script.prerequest"] = extraBody.scripts.prerequest.name;
             if (extraBody.scripts.prerequest.parameter)
                 data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter;
         }
@@ -46,7 +46,10 @@ export class LayoutRecord extends RecordBase {
                 method: "POST",
                 body: JSON.stringify(data)
             });
-            if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
+            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") {
@@ -64,7 +67,10 @@ export class LayoutRecord extends RecordBase {
             method: "PATCH",
             body: JSON.stringify(data)
         });
-        if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
+        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") {
@@ -100,7 +106,7 @@ export class LayoutRecord extends RecordBase {
             port: 443,
             method: "GET"
         });
-        if (res.messages[0].code === "0") {
+        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);
@@ -109,6 +115,9 @@ export class LayoutRecord extends RecordBase {
                 this.processPortalData(res.response.data[0].portalData);
             return this;
         }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res);
+        }
     }
     async duplicate() {
         let trace = new Error();
@@ -116,7 +125,10 @@ export class LayoutRecord extends RecordBase {
             port: 443,
             method: "POST"
         });
-        if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
+        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") {
@@ -146,8 +158,41 @@ export class LayoutRecord extends RecordBase {
             throw new FMError(res.messages[0].code, res.httpStatus, res);
         }
     }
+    fieldsToObject(filter = (a) => a.edited) {
+        let fields_processed = {};
+        let field;
+        for (field of this.fieldsArray.filter(field => filter(field))) {
+            let value = field.value;
+            if (value instanceof Date) {
+                // @ts-ignore
+                let _value = moment.default(value)
+                    .utcOffset(this.layout.database.host.timezoneOffset);
+                // @ts-ignore
+                switch (field.metadata.result) {
+                    case "time":
+                        value = _value.format(this.layout.database.host.metadata.productInfo.timeFormat.replace("dd", "DD"));
+                        break;
+                    case "date":
+                        value = _value.format(this.layout.database.host.metadata.productInfo.dateFormat.replace("dd", "DD"));
+                        break;
+                    default:
+                        value = _value.format(this.layout.database.host.metadata.productInfo.timeStampFormat.replace("dd", "DD"));
+                }
+            }
+            fields_processed[field.id] = value;
+        }
+        let obj = {
+            "recordId": this.recordId.toString(),
+            "modId": this.modId.toString(),
+            "fieldData": fields_processed
+        };
+        return obj;
+    }
     toObject(filter = (a) => a.edited, portalFilter = (a) => a.records.find(record => record.edited), portalRowFilter = (a) => a.edited, portalFieldFilter = (a) => a.edited) {
-        let obj = super.toObject(filter);
+        let obj = {
+            ...this.fieldsToObject(filter),
+            portalData: {}
+        };
         // Check if there's been any edited portal information
         let portals = this.portalsArray.filter(a => portalFilter(a));
         if (portals) {