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

package/src/records/getOperations/find.ts

@@ -7,6 +7,7 @@ import {LayoutRecord} from "../layoutRecord.js";
 import {LayoutInterface} from "../../layouts/layoutInterface";
 import {LayoutBase} from "../../layouts/layoutBase.js";
 import {FMError} from "../../FMError.js";
+import {ApiRecordResponseObj} from "../../models/apiResults";
 
 export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
     protected queries: object[]
@@ -54,35 +55,23 @@ export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
         return this.fetch()
     }
 
-    fetch(): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
+    async fetch(): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
         let trace = new Error()
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta()
-                .then(() => {
-                    return this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
-                        port: 443,
-                        method: "POST",
-                        body: JSON.stringify(this.toObject())
-                    })
-                })
-                .then(async res => {
-                    // // console.log(res)
-                    if (res.messages[0].code === "0") {
-                        // console.log("RESOLVING")
-                        if (!this.layout.metadata) await this.layout.getLayoutMeta()
-                        let data = res.response.data.map(item => {
-                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
-                        })
-                        resolve(data)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
+        await this.layout.getLayoutMeta()
+        let res = await this.layout.database.apiRequest<ApiRecordResponseObj>(`${this.layout.endpoint}/_find`, {
+            port: 443,
+            method: "POST",
+            body: JSON.stringify(this.toObject())
         })
+        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 {
+            throw new FMError(res.messages[0].code, res.httpStatus, res, trace)
+        }
     }
 }

package/src/records/getOperations/recordGetOperation.js

@@ -2,10 +2,13 @@
  * Copyright (c) 2023. See LICENSE file for more information
  */
 export class RecordGetOperation {
+    layout;
+    limit = 100;
+    scripts;
+    sort;
+    limitPortals = [];
+    offset = 0;
     constructor(layout) {
-        this.limit = 100;
-        this.limitPortals = [];
-        this.offset = 0;
         this.layout = layout;
         this.scripts = {
             "script": null,
@@ -37,7 +40,7 @@ export class RecordGetOperation {
     setOffset(offset) {
         if (offset < 0)
             throw "Record offset too low";
-        this.limit = offset;
+        this.offset = offset;
         return this;
     }
 }

package/src/records/getOperations/recordGetOperation.ts

@@ -48,7 +48,7 @@ export class RecordGetOperation<T extends LayoutInterface> {
 
     setOffset(offset: number) {
         if (offset < 0) throw "Record offset too low"
-        this.limit = offset
+        this.offset = offset
         return this
     }
 }

package/src/records/getOperations/recordGetRange.js

@@ -1,15 +1,6 @@
 /*
  * Copyright (c) 2023. See LICENSE file for more information
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { RecordGetOperation } from "./recordGetOperation.js";
 import { LayoutRecord } from "../layoutRecord.js";
 import { FMError } from "../../FMError.js";
@@ -63,33 +54,24 @@ export class RecordGetRange extends RecordGetOperation {
     run(extraBody = {}) {
         return this.fetch(extraBody);
     }
-    fetch(extraBody = {}) {
+    async fetch(extraBody = {}) {
         let trace = new Error();
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta().then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
-                    method: "GET"
-                });
-            })
-                .then((res) => __awaiter(this, void 0, void 0, function* () {
-                // // console.log(res)
-                if (res.messages[0].code === "0") {
-                    // console.log("RESOLVING")
-                    if (!this.layout.metadata)
-                        yield this.layout.getLayoutMeta();
-                    let data = res.response.data.map(item => {
-                        return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
-                    });
-                    resolve(data);
-                }
-                else {
-                    reject(new FMError(res.messages[0].code, res.status, res, trace));
-                }
-            }))
-                .catch(e => {
-                reject(e);
+        let res = await this.layout.getLayoutMeta().then(() => {
+            return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
+                method: "GET"
             });
         });
+        if (res.messages[0].code === "0") {
+            // console.log("RESOLVING")
+            if (!this.layout.metadata)
+                await this.layout.getLayoutMeta();
+            let data = res.response.data.map(item => {
+                return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+            });
+            return data;
+        }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
+        }
     }
 }

package/src/records/getOperations/recordGetRange.ts

@@ -7,6 +7,7 @@ import {RecordGetOperation} from "./recordGetOperation.js";
 import {LayoutRecord} from "../layoutRecord.js";
 import {extraBodyOptions} from "../../types.js";
 import {FMError} from "../../FMError.js";
+import {ApiRecordResponseObj} from "../../models/apiResults";
 
 export class RecordGetRange<T extends LayoutInterface> extends RecordGetOperation<T> {
     constructor(layout, start = 0, limit = 100) {
@@ -53,32 +54,24 @@ export class RecordGetRange<T extends LayoutInterface> extends RecordGetOperatio
         return this.fetch(extraBody)
     }
 
-    fetch(extraBody: extraBodyOptions = {}): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
+    async fetch(extraBody: extraBodyOptions = {}): Promise<LayoutRecord<T["fields"], T["portals"]>[]> {
         let trace = new Error()
-        return new Promise((resolve, reject) => {
-            // console.log(this.#toObject())
-            this.layout.getLayoutMeta().then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
-                    method: "GET"
-                })
+        let res = await this.layout.getLayoutMeta().then(() => {
+            return this.layout.database.apiRequest<ApiRecordResponseObj>(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
+                method: "GET"
             })
-                .then(async res => {
-                    // // console.log(res)
-                    if (res.messages[0].code === "0") {
-                        // console.log("RESOLVING")
-                        if (!this.layout.metadata) await this.layout.getLayoutMeta()
-                        let data = res.response.data.map(item => {
-                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
-                        })
-                        resolve(data)
-                    }
-                    else {
-                        reject(new FMError(res.messages[0].code, res.status, res, trace))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
-                })
         })
+
+        if (res.messages[0].code === "0") {
+            // console.log("RESOLVING")
+            if (!this.layout.metadata) await this.layout.getLayoutMeta()
+            let data = res.response.data.map(item => {
+                return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
+            })
+            return data
+        }
+        else {
+            throw new FMError(res.messages[0].code, res.httpStatus, res, trace)
+        }
     }
 }

package/src/records/layoutRecord.js

@@ -1,24 +1,15 @@
 /*
  * Copyright (c) 2023. See LICENSE file for more information
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { RecordBase } from "./recordBase.js";
 import { PortalRecord } from "./portalRecord.js";
 import { Portal } from "./portal.js";
 import { FMError } from "../FMError.js";
 export class LayoutRecord extends RecordBase {
+    // @ts-ignore
+    portals = {};
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
         super(layout, recordId, modId);
-        // @ts-ignore
-        this.portals = {};
         this.processFieldData(fieldData);
         if (portalData) {
             this.processPortalData(portalData);
@@ -27,76 +18,61 @@ export class LayoutRecord extends RecordBase {
     get portalsArray() {
         return Object.values(this.portals);
     }
-    commit(extraBody = {}) {
-        let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            let data = this.toObject();
-            delete data.recordId;
-            delete data.modId;
-            if ((_a = extraBody.scripts) === null || _a === void 0 ? void 0 : _a.after) {
-                data["script"] = extraBody.scripts.after.name;
-                if (extraBody.scripts.after.parameter)
-                    data["script.param"] = extraBody.scripts.after.parameter;
-            }
-            if ((_b = extraBody.scripts) === null || _b === void 0 ? void 0 : _b.prerequest) {
-                data["script.prerequest"] = extraBody.scripts.after.name;
-                if (extraBody.scripts.prerequest.parameter)
-                    data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter;
-            }
-            if ((_c = extraBody.scripts) === null || _c === void 0 ? void 0 : _c.presort) {
-                data["script.presort"] = extraBody.scripts.presort.name;
-                if (extraBody.scripts.presort.parameter)
-                    data["script.presort.param"] = extraBody.scripts.presort.parameter;
-            }
-            if (this.recordId === -1) {
-                // This is a new LayoutRecord
-                this.layout.database.apiRequest(`${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, {
+    async commit(extraBody = {}) {
+        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;
+        }
+        if (this.recordId === -1) {
+            // This is a new LayoutRecord
+            let res = await this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                 port: 443,
-                method: "PATCH",
+                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.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(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);
+        }
     }
     processPortalData(portalData) {
         for (let portalName of Object.keys(portalData)) {
@@ -111,89 +87,65 @@ export class LayoutRecord extends RecordBase {
             this.portals[portalName] = _portal;
         }
     }
-    get() {
+    async get() {
         let trace = new Error();
         if (this.recordId === -1) {
             throw "Cannot get this RecordBase until a commit() is done.";
         }
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.layout.metadata)
-                yield 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(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() {
+    async duplicate() {
         let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            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(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(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(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() {
-        let trace = new Error();
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            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() {
+        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) => a.edited, portalFilter = (a) => a.records.find(record => record.edited), portalRowFilter = (a) => a.edited, portalFieldFilter = (a) => a.edited) {
         let obj = super.toObject(filter, portalFilter, portalRowFilter, portalFieldFilter);