@jd-data-limited/easy-fm 3.2.6 → 3.2.8

package/src/records/layoutRecord.ts

@@ -10,6 +10,7 @@ import {PortalInterface} from "../layouts/layoutInterface.js";
 import {FMError} from "../FMError.js";
 import {RecordFieldsMap} from "../layouts/recordFieldsMap";
 import {LayoutRecordBase} from "./layoutRecordBase";
+import {ApiRecordResponseObj, ApiResultSetObj} from "../models/apiResults";
 
 export class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface> extends RecordBase<T> implements LayoutRecordBase {
     // @ts-ignore
@@ -27,77 +28,68 @@ export class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface>
         return Object.values(this.portals)
     }
 
-    commit(extraBody: extraBodyOptions = {}): Promise<this> {
-        let trace = new Error()
-        return new Promise(async (resolve, reject) => {
-            let data = this.toObject()
-            delete data.recordId
-            delete data.modId
-
-            if (extraBody.scripts?.after) {
-                data["script"] = extraBody.scripts.after.name
-                if (extraBody.scripts.after.parameter) data["script.param"] = extraBody.scripts.after.parameter
-            }
-            if (extraBody.scripts?.prerequest) {
-                data["script.prerequest"] = extraBody.scripts.after.name
-                if (extraBody.scripts.prerequest.parameter) data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter
-            }
-            if (extraBody.scripts?.presort) {
-                data["script.presort"] = extraBody.scripts.presort.name
-                if (extraBody.scripts.presort.parameter) data["script.presort.param"] = extraBody.scripts.presort.parameter
-            }
+    async commit(extraBody: extraBodyOptions = {}): Promise<this> {
+        let data = this.toObject()
+        delete data.recordId
+        delete data.modId
 
-            if (this.recordId === -1) {
-                // This is a new LayoutRecord
+        if (extraBody.scripts?.after) {
+            data["script"] = extraBody.scripts.after.name
+            if (extraBody.scripts.after.parameter) data["script.param"] = extraBody.scripts.after.parameter
+        }
+        if (extraBody.scripts?.prerequest) {
+            data["script.prerequest"] = extraBody.scripts.after.name
+            if (extraBody.scripts.prerequest.parameter) data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter
+        }
+        if (extraBody.scripts?.presort) {
+            data["script.presort"] = extraBody.scripts.presort.name
+            if (extraBody.scripts.presort.parameter) data["script.presort.param"] = extraBody.scripts.presort.parameter
+        }
 
-                this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
+        if (this.recordId === -1) {
+            // This is a new LayoutRecord
+             let res = await this.layout.database.apiRequest<{ recordId: string, modId: string }>(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
                     body: JSON.stringify(data)
                 })
-                    .then(res => {
-                        if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                            reject(new FMError(res.response.scriptError, res.status, res, trace))
-                        }
-                        else if (res.messages[0].code === "0") {
-                            this.recordId = parseInt(res.response.recordId)
-                            this.modId = parseInt(res.response.modId)
-                            resolve(this)
-                        }
-                        else {
-                            reject(new FMError(res.messages[0].code, res.status, res, trace))
-                        }
-                    })
-                    .catch(e => {
-                        reject(e)
-                    })
-
-                return
-            }
 
-            // for (let item of Object.keys(data)) extraBody[item] = data[item]
-            this.layout.database.apiRequest(this.endpoint, {
-                port: 443,
-                method: "PATCH",
-                body: JSON.stringify(data)
-            })
-                .then(res => {
-                    if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res, trace))
-                    }
-                    else if (res.messages[0].code === "0") {
-                        this.modId = res.response.modId
-                        this._onSave()
-                        resolve(this)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+                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)
+                }
+        }
+
+        // for (let item of Object.keys(data)) extraBody[item] = data[item]
+        let res = await this.layout.database.apiRequest<{
+            modId: string, newPortalRecordInfo: {
+                tableName: string,
+                recordId: string,
+                modId: string
+            }[]
+        }>(this.endpoint, {
+            port: 443,
+            method: "PATCH",
+            body: JSON.stringify(data)
         })
+        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)
+        }
     }
 
     protected processPortalData(portalData): void {
@@ -115,92 +107,68 @@ export class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface>
         }
     }
 
-    get(): Promise<this> {
+    async get(): Promise<this> {
         let trace = new Error()
         if (this.recordId === -1) {
             throw "Cannot get this RecordBase until a commit() is done."
         }
-        return new Promise(async (resolve, reject) => {
-            if (!this.layout.metadata) await this.layout.getLayoutMeta()
-
-            this.layout.database.apiRequest(this.endpoint, {
-                port: 443,
-                method: "GET"
-            })
-                .then(res => {
-                    if (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)
-                        resolve(this)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+        if (!this.layout.metadata) await this.layout.getLayoutMeta()
+        let res = await this.layout.database.apiRequest<ApiRecordResponseObj>(this.endpoint, {
+            port: 443,
+            method: "GET"
         })
+
+        if (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
+        }
     }
 
     getPortal(portal) {
         return this.portalsArray.find(p => p.name === portal)
     }
 
-    duplicate(): Promise<LayoutRecord<T,P>> {
+    async duplicate(): Promise<LayoutRecord<T, P>> {
         let trace = new Error()
-        return new Promise(async (resolve, reject) => {
-            this.layout.database.apiRequest(this.endpoint, {
-                port: 443,
-                method: "POST"
-            })
-                .then(res => {
-                    if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res, trace))
-                    }
-                    else if (res.messages[0].code === "0") {
-                        let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false)
-                        let _res = new LayoutRecord<T,P>(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData)
-
-                        this.emit("duplicated")
-                        resolve(_res)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+        let res = await this.layout.database.apiRequest<{recordId: string, modId: string}>(this.endpoint, {
+            port: 443,
+            method: "POST"
         })
+        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") {
+            let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false)
+            let _res = new LayoutRecord<T, P>(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)
+        }
     }
 
-    delete(): Promise<void> {
-        let trace = new Error()
-        return new Promise(async (resolve, reject) => {
-            this.layout.database.apiRequest(this.endpoint, {
-                port: 443,
-                method: "DELETE"
-            })
-                .then(res => {
-                    if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res, trace))
-                    }
-                    else if (res.messages[0].code === "0") {
-                        this.emit("deleted")
-                        resolve()
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+    async delete(): Promise<void> {
+        let res = await this.layout.database.apiRequest(this.endpoint, {
+            port: 443,
+            method: "DELETE"
         })
+        console.log(res)
+        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")
+            return
+        }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res)
+        }
     }
 
     toObject(filter: (a) => any = (a) => a.edited, portalFilter: (a) => any = (a) => a.records.find(record => record.edited), portalRowFilter: (a) => any = (a) => a.edited, portalFieldFilter: (a) => any = (a) => a.edited): recordObject {

package/src/records/portal.js

@@ -3,6 +3,9 @@
  */
 import { PortalRecord } from "./portalRecord.js";
 export class Portal {
+    record;
+    name;
+    records;
     constructor(record, name) {
         this.record = record;
         this.name = name;

package/src/records/portalRecord.js

@@ -3,9 +3,10 @@
  */
 import { RecordBase, RecordTypes } from "./recordBase.js";
 export class PortalRecord extends RecordBase {
+    portal;
+    type = RecordTypes.PORTAL;
     constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId);
-        this.type = RecordTypes.PORTAL;
         this.portal = portal;
         this.processFieldData(fieldData);
     }

package/src/records/recordBase.js

@@ -11,9 +11,14 @@ export var RecordTypes;
     RecordTypes[RecordTypes["PORTAL"] = 2] = "PORTAL";
 })(RecordTypes || (RecordTypes = {}));
 export class RecordBase extends EventEmitter {
+    layout;
+    type = RecordTypes.UNKNOWN;
+    recordId;
+    modId;
+    fields;
+    portalData;
     constructor(layout, recordId, modId = recordId) {
         super();
-        this.type = RecordTypes.UNKNOWN;
         this.layout = layout;
         this.recordId = recordId;
         this.modId = modId;

package/src/types.d.ts

@@ -65,10 +65,6 @@ export interface recordObject {
     fieldData: any;
     portalData?: portalDataObject;
 }
-export interface fileMakerResponse {
-    response: any;
-    messages: any[];
-}
 export interface portalDataObject {
     [key: string]: recordObject;
 }

package/src/types.ts

@@ -83,11 +83,6 @@ export interface recordObject {
     portalData?: portalDataObject
 }
 
-export interface fileMakerResponse {
-    response: any,
-    messages: any[]
-}
-
 export interface portalDataObject {
     [key: string]: recordObject
 }
@@ -152,5 +147,4 @@ export interface AuthorizationHeadersOAuth {
     "Content-Type": "application/json"
     "X-FM-Data-OAuth-RequestId": string,
     "X-FM-Data-OAuth-Identifier": string
-}
-
+}

package/.expo/README.md

@@ -1,15 +0,0 @@
-> Why do I have a folder named ".expo" in my project?
-
-The ".expo" folder is created when an Expo project is started using "expo start" command.
-
-> What do the files contain?
-
-- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
-- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator.
-- "settings.json": contains the server configuration that is used to serve the application manifest.
-
-> Should I commit the ".expo" folder?
-
-No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
-
-Upon project creation, the ".expo" folder is already added to your ".gitignore" file.

package/.expo/settings.json

@@ -1,8 +0,0 @@
-{
-  "hostType": "lan",
-  "lanType": "ip",
-  "dev": true,
-  "minify": false,
-  "urlRandomness": null,
-  "https": false
-}

package/.idea/compiler.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="TypeScriptCompiler">
-    <option name="recompileOnChanges" value="true" />
-    <option name="versionType" value="EMBEDDED" />
-  </component>
-</project>

package/.idea/copyright/JD_Data.xml

@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright (c) &amp;#36;originalComment.match(&quot;Copyright \(c\) (\d+)&quot;, 1, &quot;-&quot;, &quot;&amp;#36;today.year&quot;)&amp;#36;today.year. See LICENSE file for more information" />
-    <option name="myName" value="JD-Data" />
-  </copyright>
-</component>

package/.idea/copyright/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="JD-Data">
-    <module2copyright>
-      <element module="Project Files" copyright="JD-Data" />
-    </module2copyright>
-  </settings>
-</component>

package/.idea/discord.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="ASK" />
-    <option name="description" value="" />
-  </component>
-</project>

package/.idea/easy-fm.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/easy-fm.iml" filepath="$PROJECT_DIR$/.idea/easy-fm.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/php.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

package/decs.d.ts

@@ -1,7 +0,0 @@
-declare module "fs"
-declare module "events"
-declare module "path"
-declare module "url"
-declare module "node-fetch"
-declare module "btoa"
-declare module "buffer"