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

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.2.8",
+  "version": "3.2.10",
   "dependencies": {
-    "@types/btoa": "^1.2.3",
-    "@types/events": "^3.0.0",
-    "follow-redirects": "^1.15.3",
+    "follow-redirects": "^1.15.5",
     "moment": "^2.29.4",
     "node-fetch": "3.3.2"
   },
@@ -36,9 +34,11 @@
     "url": "https://github.com/JD-Data-Limited/easy-fm/issues"
   },
   "devDependencies": {
+    "@types/btoa": "^1.2.3",
+    "@types/events": "^3.0.0",
+    "dotenv": "^16.3.1",
     "typescript": "^5.2.2",
     "webpack": "^5.81.0",
-    "webpack-cli": "^5.0.2",
-    "dotenv": "^16.3.1"
+    "webpack-cli": "^5.0.2"
   }
 }

package/src/FMError.js

@@ -1013,11 +1013,6 @@ export const errs = [
     }
 ];
 export class FMError extends Error {
-    httpStatus;
-    res;
-    code;
-    message;
-    messages;
     constructor(code, httpStatus, res, trace) {
         if (typeof code === "string")
             code = parseInt(code);

package/src/connection/FMHost.js

@@ -1,15 +1,20 @@
 /*
  * 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 { generateAuthorizationHeaders } from "./generateAuthorizationHeaders.js";
 import fetch from "node-fetch";
 import { FMError } from "../FMError.js";
 import { Database } from "./database.js";
 export default class FMHost {
-    hostname;
-    timezoneOffset;
-    verify;
-    metadata;
     constructor(_hostname, timezoneOffset = 0 - (new Date()).getTimezoneOffset(), verify = true) {
         if (!(/^https?:\/\//).test(_hostname))
             throw "hostname MUST begin with either http:// or https://";
@@ -17,43 +22,47 @@ export default class FMHost {
         this.timezoneOffset = timezoneOffset;
         this.verify = verify;
     }
-    async listDatabases(credentials) {
-        let headers = {};
-        if (credentials) {
-            headers = generateAuthorizationHeaders(credentials);
-        }
-        let _fetch = await fetch(`${this.hostname}/fmi/data/v2/databases`, {
-            method: "GET",
-            headers
+    listDatabases(credentials) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let headers = {};
+            if (credentials) {
+                headers = generateAuthorizationHeaders(credentials);
+            }
+            let _fetch = yield fetch(`${this.hostname}/fmi/data/v2/databases`, {
+                method: "GET",
+                headers
+            });
+            let data = yield _fetch.json();
+            // console.log(data.messages[0])
+            if (data.messages[0].code === "0") {
+                return data.response.databases;
+            }
+            else {
+                // @ts-ignore
+                throw new FMError(data.messages[0].code, data.status, data);
+            }
         });
-        let data = await _fetch.json();
-        // console.log(data.messages[0])
-        if (data.messages[0].code === "0") {
-            return data.response.databases;
-        }
-        else {
-            // @ts-ignore
-            throw new FMError(data.messages[0].code, data.status, data);
-        }
     }
     database(data) {
         return new Database(this, data);
     }
-    async getMetadata() {
-        if (this.metadata)
-            return this.metadata;
-        let _fetch = await fetch(`${this.hostname}/fmi/data/v2/productInfo`, {
-            method: "GET",
+    getMetadata() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.metadata)
+                return this.metadata;
+            let _fetch = yield fetch(`${this.hostname}/fmi/data/v2/productInfo`, {
+                method: "GET",
+            });
+            let data = yield _fetch.json();
+            // console.log(data.messages[0])
+            if (data.messages[0].code === "0") {
+                this.metadata = data.response;
+                return data.response;
+            }
+            else {
+                // @ts-ignore
+                throw new FMError(data.messages[0].code, data.status, data);
+            }
         });
-        let data = await _fetch.json();
-        // console.log(data.messages[0])
-        if (data.messages[0].code === "0") {
-            this.metadata = data.response;
-            return data.response;
-        }
-        else {
-            // @ts-ignore
-            throw new FMError(data.messages[0].code, data.status, data);
-        }
     }
 }

package/src/connection/database.js

@@ -1,6 +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 { EventEmitter } from "events";
 import fetch from "node-fetch";
 import { generateAuthorizationHeaders } from "./generateAuthorizationHeaders.js";
@@ -8,13 +17,9 @@ import { FMError } from "../FMError.js";
 import { Layout } from "../layouts/layout.js";
 import HTTP_REDIRECT from "follow-redirects";
 export class Database extends EventEmitter {
-    _token;
-    host;
-    connection_details;
-    cookies = {};
-    name;
     constructor(host, conn) {
         super();
+        this.cookies = {};
         this.host = host;
         this.name = conn.database;
         this.connection_details = conn;
@@ -32,53 +37,57 @@ export class Database extends EventEmitter {
             throw "Not yet supported login method";
         }
     }
-    async logout() {
-        if (!this.token)
-            throw new Error("Not logged in");
-        let _fetch = await fetch(`${this.endpoint}/sessions/${this.token}`, {
-            method: "DELETE",
-            headers: {
-                "content-type": "application/json"
-            }
+    logout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.token)
+                throw new Error("Not logged in");
+            let _fetch = yield fetch(`${this.endpoint}/sessions/${this.token}`, {
+                method: "DELETE",
+                headers: {
+                    "content-type": "application/json"
+                }
+            });
+            let data = yield _fetch.json();
+            // console.log(data)
+            this._token = null;
         });
-        let data = await _fetch.json();
-        // console.log(data)
-        this._token = null;
     }
-    async login() {
-        // Reset cookies
-        this.cookies = {};
-        await this.host.getMetadata();
-        if (this.token)
-            throw new Error("Already logged in. Run logout() first");
-        if (this.connection_details.credentials.method === "token") {
-            this._token = this.connection_details.credentials.token;
-            return this.token;
-        }
-        else {
-            console.time();
-            let res = await fetch(`${this.endpoint}/sessions`, {
-                hostname: this.host.hostname,
-                port: 443,
-                method: "POST",
-                headers: generateAuthorizationHeaders(this.connection_details.credentials),
-                body: JSON.stringify({
-                    fmDataSource: this.connection_details.externalSources.map(i => {
-                        let _i = i;
-                        return this.generateExternalSourceLogin(_i);
-                    })
-                })
-            });
-            console.time();
-            let _res = (await res.json());
-            if (res.status === 200) {
-                this._token = res.headers.get('x-fm-data-access-token');
-                return this._token;
+    login() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Reset cookies
+            this.cookies = {};
+            yield this.host.getMetadata();
+            if (this.token)
+                throw new Error("Already logged in. Run logout() first");
+            if (this.connection_details.credentials.method === "token") {
+                this._token = this.connection_details.credentials.token;
+                return this.token;
             }
             else {
-                throw new FMError(_res.messages[0].code, _res.status, res);
+                console.time();
+                let res = yield fetch(`${this.endpoint}/sessions`, {
+                    hostname: this.host.hostname,
+                    port: 443,
+                    method: "POST",
+                    headers: generateAuthorizationHeaders(this.connection_details.credentials),
+                    body: JSON.stringify({
+                        fmDataSource: this.connection_details.externalSources.map(i => {
+                            let _i = i;
+                            return this.generateExternalSourceLogin(_i);
+                        })
+                    })
+                });
+                console.time();
+                let _res = (yield res.json());
+                if (res.status === 200) {
+                    this._token = res.headers.get('x-fm-data-access-token');
+                    return this._token;
+                }
+                else {
+                    throw new FMError(_res.messages[0].code, _res.status, res);
+                }
             }
-        }
+        });
     }
     get token() {
         return this._token;
@@ -86,40 +95,44 @@ export class Database extends EventEmitter {
     get endpoint() {
         return `${this.host.hostname}/fmi/data/v2/databases/${this.name}`;
     }
-    async apiRequest(url, options = {}, autoRelogin = true) {
-        if (!options.headers)
-            options.headers = {};
-        options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json";
-        options.headers["authorization"] = "Bearer " + this._token;
-        options.rejectUnauthorized = this.host.verify;
-        let _fetch = await fetch(url, options);
-        if (_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];
+    apiRequest(url, options = {}, autoRelogin = true) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.headers)
+                options.headers = {};
+            options.headers["content-type"] = options.headers["content-type"] ? options.headers["content-type"] : "application/json";
+            options.headers["authorization"] = "Bearer " + this._token;
+            options.rejectUnauthorized = this.host.verify;
+            let _fetch = yield fetch(url, options);
+            if (_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];
+                }
             }
-        }
-        let data = await _fetch.json();
-        // Remove response if it is empty. This makes checking for an empty response easier
-        if (Object.keys(data.response).length === 0)
-            delete data.response;
-        // console.log(data.messages[0])
-        if (data.messages[0].code === "952" && autoRelogin) {
-            this._token = null;
-            await this.login();
-            return await this.apiRequest(url, options, false);
-        }
-        else if (data.messages[0].code !== "0") {
-            throw new FMError(data.messages[0].code, _fetch.status, data);
-        }
-        data.httpStatus = _fetch.status;
-        return data;
+            let data = yield _fetch.json();
+            // Remove response if it is empty. This makes checking for an empty response easier
+            if (Object.keys(data.response).length === 0)
+                delete data.response;
+            // console.log(data.messages[0])
+            if (data.messages[0].code === "952" && autoRelogin) {
+                this._token = null;
+                yield this.login();
+                return yield this.apiRequest(url, options, false);
+            }
+            else if (data.messages[0].code !== "0") {
+                throw new FMError(data.messages[0].code, _fetch.status, data);
+            }
+            data.httpStatus = _fetch.status;
+            return data;
+        });
     }
-    async listLayouts() {
-        let req = await this.apiRequest(`${this.endpoint}/layouts`);
-        if (!req.response)
-            throw new FMError(req.messages[0].code, req.httpStatus, req.messages[0].message);
-        return req.response.layouts.filter(i => !i.isFolder).map(layout => new Layout(this, layout.name));
+    listLayouts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let req = yield this.apiRequest(`${this.endpoint}/layouts`);
+            if (!req.response)
+                throw new FMError(req.messages[0].code, req.httpStatus, req.messages[0].message);
+            return req.response.layouts.filter(i => !i.isFolder).map(layout => new Layout(this, layout.name));
+        });
     }
     getLayout(name) {
         return new Layout(this, name);
@@ -127,11 +140,13 @@ export class Database extends EventEmitter {
     /*
     @deprecated
      */
-    async setGlobals(globalFields) {
-        // console.log({globalFields})
-        await this.apiRequest(`${this.endpoint}/globals`, {
-            method: "PATCH",
-            body: JSON.stringify({ globalFields })
+    setGlobals(globalFields) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // console.log({globalFields})
+            yield this.apiRequest(`${this.endpoint}/globals`, {
+                method: "PATCH",
+                body: JSON.stringify({ globalFields })
+            });
         });
     }
     script(name, parameter = "") {

package/src/layouts/layout.js

@@ -1,14 +1,20 @@
 /*
  * 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 { LayoutRecordManager } from "./layoutRecordManager.js";
 import { FMError } from "../FMError.js";
 export class Layout {
-    database;
-    records = new LayoutRecordManager(this);
-    name;
-    metadata;
     constructor(database, name) {
+        this.records = new LayoutRecordManager(this);
         this.database = database;
         this.name = name;
     }
@@ -33,28 +39,32 @@ export class Layout {
     newFind() {
         return this.records.find();
     }
-    async runScript(script) {
-        let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`;
-        if (script.parameter)
-            url += "?script.param=" + encodeURIComponent(script.parameter);
-        let res = await this.database.apiRequest(url, {
-            port: 443,
-            method: "GET"
+    runScript(script) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`;
+            if (script.parameter)
+                url += "?script.param=" + encodeURIComponent(script.parameter);
+            let res = yield this.database.apiRequest(url, {
+                port: 443,
+                method: "GET"
+            });
+            if (res.messages[0].code === "0") {
+                let error = parseInt(res.response.scriptError);
+                return {
+                    scriptError: error ? new FMError(error, 200, res) : undefined,
+                    scriptResult: res.response.scriptResult
+                };
+            }
         });
-        if (res.messages[0].code === "0") {
-            let error = parseInt(res.response.scriptError);
-            return {
-                scriptError: error ? new FMError(error, 200, res) : undefined,
-                scriptResult: res.response.scriptResult
-            };
-        }
     }
-    async getLayoutMeta() {
-        if (this.metadata) {
+    getLayoutMeta() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.metadata) {
+                return this.metadata;
+            }
+            let res = yield this.database.apiRequest(this.endpoint);
+            this.metadata = res.response;
             return this.metadata;
-        }
-        let res = await this.database.apiRequest(this.endpoint);
-        this.metadata = res.response;
-        return this.metadata;
+        });
     }
 }

package/src/layouts/layoutRecordManager.js

@@ -1,30 +1,42 @@
 /*
  * 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 { LayoutRecord } from "../records/layoutRecord.js";
 import { RecordGetRange } from "../records/getOperations/recordGetRange.js";
 import { Find } from "../records/getOperations/find.js";
 export class LayoutRecordManager {
-    layout;
     constructor(layout) {
         this.layout = layout;
     }
-    async create() {
-        await this.layout.getLayoutMeta();
-        let fields = {};
-        for (let _field of this.layout.metadata.fieldMetaData) {
-            fields[_field.name] = "";
-        }
-        let portals = {};
-        for (let _portal of Object.keys(this.layout.metadata.portalMetaData))
-            portals[_portal] = [];
-        return new LayoutRecord(this.layout, -1, 0, fields, portals);
+    create() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.layout.getLayoutMeta();
+            let fields = {};
+            for (let _field of this.layout.metadata.fieldMetaData) {
+                fields[_field.name] = "";
+            }
+            let portals = {};
+            for (let _portal of Object.keys(this.layout.metadata.portalMetaData))
+                portals[_portal] = [];
+            return new LayoutRecord(this.layout, -1, 0, fields, portals);
+        });
     }
-    async get(recordId) {
-        await this.layout.getLayoutMeta();
-        let record = new LayoutRecord(this.layout, recordId);
-        await record.get();
-        return record;
+    get(recordId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.layout.getLayoutMeta();
+            let record = new LayoutRecord(this.layout, recordId);
+            yield record.get();
+            return record;
+        });
     }
     range(start = 0, limit = 100) {
         return new RecordGetRange(this.layout, start, limit);

package/src/records/field.js

@@ -1,15 +1,20 @@
 /*
  * 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 { RecordTypes } from "./recordBase.js";
 import { File, FormData } from "node-fetch";
 import { DOWNLOAD_MODES } from "../types.js";
 import { ApiFieldDisplayTypes, ApiFieldResultTypes, ApiFieldTypes } from "../models/apiResults.js";
 export class Field {
-    record;
-    id;
-    _value;
-    edited;
     constructor(record, id, contents) {
         this.record = record;
         this.id = id;
@@ -116,39 +121,43 @@ export class Field {
         }
         throw "Field value is not a number";
     }
-    async upload(buffer, filename, mime) {
-        let trace = new Error();
-        if (this.metadata.result !== "container")
-            throw "Cannot upload a file to the field; " + this.id + " (not a container field)";
-        let form = new FormData();
-        form.append("upload", new File([buffer], filename, { type: mime }));
-        await this.record.layout.database.apiRequest(`${this.record.endpoint}/containers/${this.id}/1`, {
-            method: "POST",
-            // @ts-ignore
-            headers: { "Authorization": "Bearer " + this.record.layout.database.token },
-            body: form
+    upload(buffer, filename, mime) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            if (this.metadata.result !== "container")
+                throw "Cannot upload a file to the field; " + this.id + " (not a container field)";
+            let form = new FormData();
+            form.append("upload", new File([buffer], filename, { type: mime }));
+            yield this.record.layout.database.apiRequest(`${this.record.endpoint}/containers/${this.id}/1`, {
+                method: "POST",
+                // @ts-ignore
+                headers: { "Authorization": "Bearer " + this.record.layout.database.token, "content-type": "multipart/form-data" },
+                body: form
+            });
         });
     }
-    async download(mode = DOWNLOAD_MODES.Stream) {
-        if (this.metadata.result !== ApiFieldResultTypes.CONTAINER)
-            throw new Error("Cannot perform download() on a non-container field");
-        let stream = await this.record.layout.database.streamURL(this.string);
-        if (mode === DOWNLOAD_MODES.Stream) {
-            return stream;
-        }
-        let body = [];
-        return new Promise((resolve, reject) => {
-            stream.on("data", chunk => {
-                body.push(chunk);
-            });
-            stream.on("error", (e) => {
-                reject(e);
-            });
-            stream.on("end", () => {
-                resolve({
-                    buffer: Buffer.concat(body),
-                    mime: stream.headers["content-type"],
-                    request: stream
+    download(mode = DOWNLOAD_MODES.Stream) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.metadata.result !== ApiFieldResultTypes.CONTAINER)
+                throw new Error("Cannot perform download() on a non-container field");
+            let stream = yield this.record.layout.database.streamURL(this.string);
+            if (mode === DOWNLOAD_MODES.Stream) {
+                return stream;
+            }
+            let body = [];
+            return new Promise((resolve, reject) => {
+                stream.on("data", chunk => {
+                    body.push(chunk);
+                });
+                stream.on("error", (e) => {
+                    reject(e);
+                });
+                stream.on("end", () => {
+                    resolve({
+                        buffer: Buffer.concat(body),
+                        mime: stream.headers["content-type"],
+                        request: stream
+                    });
                 });
             });
         });

package/src/records/field.ts

@@ -140,7 +140,7 @@ export class Field<T extends FieldValue> {
         await this.record.layout.database.apiRequest<null>(`${this.record.endpoint}/containers/${this.id}/1`, {
             method: "POST",
             // @ts-ignore
-            headers: {"Authorization": "Bearer " + this.record.layout.database.token},
+            headers: {"Authorization": "Bearer " + this.record.layout.database.token, "content-type": "multipart/form-data"},
             body: form
         })
     }

package/src/records/getOperations/find.js

@@ -1,11 +1,19 @@
 /*
  * 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";
 export class Find extends RecordGetOperation {
-    queries;
     constructor(layout, start = 0, limit = 100) {
         super(layout);
         this.setOffset(start);
@@ -47,24 +55,26 @@ export class Find extends RecordGetOperation {
     run() {
         return this.fetch();
     }
-    async fetch() {
-        let trace = new Error();
-        await this.layout.getLayoutMeta();
-        let res = await this.layout.database.apiRequest(`${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);
+    fetch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            yield this.layout.getLayoutMeta();
+            let res = yield this.layout.database.apiRequest(`${this.layout.endpoint}/_find`, {
+                port: 443,
+                method: "POST",
+                body: JSON.stringify(this.toObject())
             });
-        }
-        else {
-            throw new FMError(res.messages[0].code, res.httpStatus, res, trace);
-        }
+            if (res.messages[0].code === "0") {
+                // console.log("RESOLVING")
+                if (!this.layout.metadata)
+                    yield 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,13 +2,10 @@
  * 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,

package/src/records/getOperations/recordGetRange.js

@@ -1,6 +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 { RecordGetOperation } from "./recordGetOperation.js";
 import { LayoutRecord } from "../layoutRecord.js";
 import { FMError } from "../../FMError.js";
@@ -54,24 +63,26 @@ export class RecordGetRange extends RecordGetOperation {
     run(extraBody = {}) {
         return this.fetch(extraBody);
     }
-    async fetch(extraBody = {}) {
-        let trace = new Error();
-        let res = await this.layout.getLayoutMeta().then(() => {
-            return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
-                method: "GET"
+    fetch(extraBody = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            let res = yield 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)
+                    yield 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);
+            }
         });
-        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,15 +1,24 @@
 /*
  * 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);
@@ -18,61 +27,64 @@ export class LayoutRecord extends RecordBase {
     get portalsArray() {
         return Object.values(this.portals);
     }
-    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`, {
+    commit(extraBody = {}) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            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
+                let res = yield this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
+                    port: 443,
+                    method: "POST",
+                    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.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 = yield this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
-                method: "POST",
+                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.recordId = parseInt(res.response.recordId);
-                this.modId = parseInt(res.response.modId);
+                this.modId = +res.response.modId;
+                this._onSave();
                 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)) {
@@ -87,65 +99,72 @@ export class LayoutRecord extends RecordBase {
             this.portals[portalName] = _portal;
         }
     }
-    async get() {
-        let trace = new Error();
-        if (this.recordId === -1) {
-            throw "Cannot get this RecordBase until a commit() is done.";
-        }
-        if (!this.layout.metadata)
-            await this.layout.getLayoutMeta();
-        let res = await this.layout.database.apiRequest(this.endpoint, {
-            port: 443,
-            method: "GET"
+    get() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            if (this.recordId === -1) {
+                throw "Cannot get this RecordBase until a commit() is done.";
+            }
+            if (!this.layout.metadata)
+                yield this.layout.getLayoutMeta();
+            let res = yield 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;
+            }
         });
-        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);
     }
-    async duplicate() {
-        let trace = new Error();
-        let res = await this.layout.database.apiRequest(this.endpoint, {
-            port: 443,
-            method: "POST"
+    duplicate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let trace = new Error();
+            let res = yield 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);
+            }
         });
-        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);
-        }
     }
-    async delete() {
-        let res = await this.layout.database.apiRequest(this.endpoint, {
-            port: 443,
-            method: "DELETE"
+    delete() {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield this.layout.database.apiRequest(this.endpoint, {
+                port: 443,
+                method: "DELETE"
+            });
+            console.log(res);
+            if (typeof ((_a = res.response) === null || _a === void 0 ? void 0 : _a.scriptError) !== "undefined" && ((_b = res.response) === null || _b === void 0 ? void 0 : _b.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);
+            }
         });
-        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);

package/src/records/portal.js

@@ -3,9 +3,6 @@
  */
 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,10 +3,9 @@
  */
 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,14 +11,9 @@ 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;