@jd-data-limited/easy-fm 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",

package/src/index.js

@@ -1289,6 +1289,7 @@ export class Layout {
         return this.records.find();
     }
     runScript(script) {
+        let trace = new Error();
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`;
             if (script.parameter)
@@ -1303,7 +1304,7 @@ export class Layout {
                 }
                 else {
                     // console.log(res)
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             })
                 .catch(e => {
@@ -1365,8 +1366,8 @@ class LayoutRecordManager {
     range(start = 0, limit = 100) {
         return new RecordGetRange(this.layout, start, limit);
     }
-    find() {
-        return new Find(this.layout);
+    find(start = 0, limit = 100) {
+        return new Find(this.layout, start, limit);
     }
 }
 export class RecordBase extends EventEmitter {
@@ -1429,6 +1430,7 @@ export class RecordBase extends EventEmitter {
         });
     }
     get() {
+        let trace = new Error();
         if (this.recordId === -1) {
             throw "Cannot get this RecordBase until a commit() is done.";
         }
@@ -1450,7 +1452,7 @@ export class RecordBase extends EventEmitter {
                     resolve(this);
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             })
                 .catch(e => {
@@ -1459,21 +1461,23 @@ export class RecordBase extends EventEmitter {
         }));
     }
     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 (extraBody.scripts.after) {
+            if ((_a = extraBody.scripts) === null || _a === void 0 ? void 0 : _a.after) {
                 data["script"] = extraBody.scripts.after.name;
                 if (extraBody.scripts.after.parameter)
                     data["param"] = extraBody.scripts.after.parameter;
             }
-            if (extraBody.scripts.prerequest) {
+            if ((_b = extraBody.scripts) === null || _b === void 0 ? void 0 : _b.prerequest) {
                 data["script"] = extraBody.scripts.after.name;
                 if (extraBody.scripts.prerequest.parameter)
                     data["param"] = extraBody.scripts.prerequest.parameter;
             }
-            if (extraBody.scripts.presort) {
+            if ((_c = extraBody.scripts) === null || _c === void 0 ? void 0 : _c.presort) {
                 data["script"] = extraBody.scripts.presort.name;
                 if (extraBody.scripts.presort.parameter)
                     data["param"] = extraBody.scripts.presort.parameter;
@@ -1487,7 +1491,7 @@ export class RecordBase extends EventEmitter {
                 })
                     .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res));
+                        reject(new FMError(res.response.scriptError, res.status, res, trace));
                     }
                     else if (res.messages[0].code === "0") {
                         this.recordId = parseInt(res.response.recordId);
@@ -1495,7 +1499,7 @@ export class RecordBase extends EventEmitter {
                         resolve(this);
                     }
                     else {
-                        reject(new FMError(res.messages[0].code, res.status, res));
+                        reject(new FMError(res.messages[0].code, res.status, res, trace));
                     }
                 })
                     .catch(e => {
@@ -1511,7 +1515,7 @@ export class RecordBase extends EventEmitter {
             })
                 .then(res => {
                 if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res));
+                    reject(new FMError(res.response.scriptError, res.status, res, trace));
                 }
                 else if (res.messages[0].code === "0") {
                     this.modId = res.response.modId;
@@ -1519,7 +1523,7 @@ export class RecordBase extends EventEmitter {
                     resolve(this);
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             })
                 .catch(e => {
@@ -1539,6 +1543,7 @@ export class RecordBase extends EventEmitter {
         return this.portals.find(p => p.name === portal);
     }
     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,
@@ -1546,14 +1551,14 @@ export class RecordBase extends EventEmitter {
             })
                 .then(res => {
                 if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res));
+                    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));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             })
                 .catch(e => {
@@ -1562,6 +1567,7 @@ export class RecordBase extends EventEmitter {
         }));
     }
     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,
@@ -1569,7 +1575,7 @@ export class RecordBase extends EventEmitter {
             })
                 .then(res => {
                 if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                    reject(new FMError(res.response.scriptError, res.status, res));
+                    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);
@@ -1578,7 +1584,7 @@ export class RecordBase extends EventEmitter {
                     resolve(_res);
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             })
                 .catch(e => {
@@ -1717,6 +1723,7 @@ export class Field {
         return this._value;
     }
     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)";
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
@@ -1733,7 +1740,7 @@ export class Field {
                     resolve();
                 }
                 else {
-                    reject(new FMError(_res.messages[0].code, _res.status, data));
+                    reject(new FMError(_res.messages[0].code, _res.status, data, trace));
                 }
             })
                 .catch(e => {
@@ -1903,6 +1910,7 @@ export class RecordGetRange extends RecordGetOperation {
         return this.fetch(extraBody);
     }
     fetch(extraBody = {}) {
+        let trace = new Error();
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta().then(() => {
@@ -1922,7 +1930,7 @@ export class RecordGetRange extends RecordGetOperation {
                     resolve(data);
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             }))
                 .catch(e => {
@@ -1932,8 +1940,10 @@ export class RecordGetRange extends RecordGetOperation {
     }
 }
 export class Find extends RecordGetOperation {
-    constructor(layout) {
+    constructor(layout, start = 0, limit = 100) {
         super(layout);
+        this.setOffset(start);
+        this.setLimit(limit);
         this.queries = [];
     }
     toObject() {
@@ -1972,6 +1982,7 @@ export class Find extends RecordGetOperation {
         return this.fetch();
     }
     fetch() {
+        let trace = new Error();
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta()
@@ -1994,7 +2005,7 @@ export class Find extends RecordGetOperation {
                     resolve(data);
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject(new FMError(res.messages[0].code, res.status, res, trace));
                 }
             }))
                 .catch(e => {
@@ -2004,7 +2015,7 @@ export class Find extends RecordGetOperation {
     }
 }
 export class FMError extends Error {
-    constructor(code, httpStatus, res) {
+    constructor(code, httpStatus, res, trace) {
         if (typeof code === "string")
             code = parseInt(code);
         super(errs.find(err => err.e === code).d || "Unknown error");
@@ -2013,6 +2024,8 @@ export class FMError extends Error {
         this.messages = res.messages;
         this.code = typeof code === "string" ? parseInt(code) : code;
         Error.captureStackTrace(this, FMError);
+        if (trace)
+            this.stack = trace.stack;
     }
 }
 function generateAuthorizationHeaders(credentials) {

package/src/index.ts

@@ -1423,14 +1423,14 @@ export class Layout {
     /**
      * @deprecated use layout.records.create() instead
      */
-    createRecord(): Promise<RecordBase | Error | void> {
+    createRecord(): Promise<LayoutRecord> {
         return this.records.create()
     }
 
     /**
      * @deprecated use layout.records.get() instead
      */
-    getRecord(recordId): Promise<RecordBase> {
+    getRecord(recordId): Promise<LayoutRecord> {
         return this.records.get(recordId)
     }
 
@@ -1441,7 +1441,8 @@ export class Layout {
         return this.records.find()
     }
 
-    runScript(script): Promise<string | FMError | Error> {
+    runScript(script): Promise<string> {
+        let trace = new Error()
         return new Promise(async (resolve, reject) => {
             let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`
             if (script.parameter) url += "?script.param=" + encodeURIComponent(script.parameter)
@@ -1455,7 +1456,7 @@ export class Layout {
                     }
                     else {
                         // console.log(res)
-                        reject(new FMError(res.messages[0].code, res.status, res))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -1487,7 +1488,7 @@ class LayoutRecordManager {
         this.layout = layout
     }
 
-    create(): Promise<RecordBase | Error | void> {
+    create(): Promise<LayoutRecord> {
         return new Promise((resolve, reject) => {
             // Get the layout's metadata
             this.layout.getLayoutMeta().then(layout => {
@@ -1504,7 +1505,7 @@ class LayoutRecordManager {
         })
     }
 
-    get(recordId): Promise<RecordBase> {
+    get(recordId): Promise<LayoutRecord> {
         return new Promise((resolve, reject) => {
             let record
             this.layout.getLayoutMeta()
@@ -1525,8 +1526,8 @@ class LayoutRecordManager {
         return new RecordGetRange(this.layout, start, limit)
     }
 
-    find(): Find {
-        return new Find(this.layout)
+    find(start = 0, limit = 100): Find {
+        return new Find(this.layout, start, limit)
     }
 }
 
@@ -1553,20 +1554,6 @@ export class RecordBase extends EventEmitter {
         return !!this.fields.find(i => i.edited)
     }
 
-    protected processPortalData(portalData): void {
-        this.portals = []
-        for (let item of Object.keys(portalData)) {
-            let _portal = new Portal(this, item)
-            _portal.records = portalData[item].map(item => {
-                let fieldData = item;
-                delete fieldData.recordId;
-                delete fieldData.modId;
-                return new PortalRecord(this, _portal, item.recordId, item.modId, fieldData);
-            })
-            this.portals.push(_portal);
-        }
-    }
-
     processFieldData(fieldData): Field[] {
         return Object.keys(fieldData).map(item => {
             let _field = new Field(this, item, fieldData[item])
@@ -1601,51 +1588,91 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-    get() {
-        if (this.recordId === -1) {
-            throw "Cannot get this RecordBase until a commit() is done."
+    _onSave() {
+        this.emit("saved")
+        for (let field of this.fields) field.edited = false
+    }
+
+    getField(field) {
+        return this.fields.find(_field => _field.id === field)
+    }
+
+    toObject(filter = (a) => a.edited,
+             portalFilter = (a) => a.records.find(record => record.edited),
+             portalRowFilter = (a) => a.edited,
+             portalFieldFilter = (a) => a.edited
+    ): recordObject {
+        let fields_processed = {}
+        for (let field of this.fields.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,
+            "modId": this.modId,
+            "fieldData": fields_processed
         }
-        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.fields = 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))
-                    }
-                })
-                .catch(e => {
-                    reject(e)
+        // Check if there's been any edited portal information
+        let portals = this.portals.filter(a => portalFilter(a))
+        if (portals) {
+            obj["portalData"] = {}
+            for (let portal of portals) {
+                obj["portalData"][portal.name] = portal.records.filter(a => portalRowFilter(a)).map(record => {
+                    return record.toObject(portalFieldFilter)
                 })
-        })
+            }
+        }
+        return obj
+    }
+}
+
+export class LayoutRecord extends RecordBase {
+    portals: Portal[];
+
+    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
+        super(layout, recordId, modId);
+        this.fields = this.processFieldData(fieldData)
+        this.portals = []
+        if (portalData) {
+            this.processPortalData(portalData)
+        }
     }
 
-    commit(extraBody: extraBodyOptions = {}): Promise<RecordBase | FMError> {
+    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) {
+            if (extraBody.scripts?.after) {
                 data["script"] = extraBody.scripts.after.name
                 if (extraBody.scripts.after.parameter) data["param"] = extraBody.scripts.after.parameter
             }
-            if (extraBody.scripts.prerequest) {
+            if (extraBody.scripts?.prerequest) {
                 data["script"] = extraBody.scripts.after.name
                 if (extraBody.scripts.prerequest.parameter) data["param"] = extraBody.scripts.prerequest.parameter
             }
-            if (extraBody.scripts.presort) {
+            if (extraBody.scripts?.presort) {
                 data["script"] = extraBody.scripts.presort.name
                 if (extraBody.scripts.presort.parameter) data["param"] = extraBody.scripts.presort.parameter
             }
@@ -1660,7 +1687,7 @@ export class RecordBase extends EventEmitter {
                 })
                     .then(res => {
                         if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                            reject(new FMError(res.response.scriptError, res.status, res))
+                            reject(new FMError(res.response.scriptError, res.status, res, trace))
                         }
                         else if (res.messages[0].code === "0") {
                             this.recordId = parseInt(res.response.recordId)
@@ -1668,7 +1695,7 @@ export class RecordBase extends EventEmitter {
                             resolve(this)
                         }
                         else {
-                            reject(new FMError(res.messages[0].code, res.status, res))
+                            reject(new FMError(res.messages[0].code, res.status, res, trace))
                         }
                     })
                     .catch(e => {
@@ -1686,7 +1713,7 @@ export class RecordBase extends EventEmitter {
             })
                 .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res))
+                        reject(new FMError(res.response.scriptError, res.status, res, trace))
                     }
                     else if (res.messages[0].code === "0") {
                         this.modId = res.response.modId
@@ -1694,7 +1721,7 @@ export class RecordBase extends EventEmitter {
                         resolve(this)
                     }
                     else {
-                        reject(new FMError(res.messages[0].code, res.status, res))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -1703,35 +1730,43 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-    _onSave() {
-        this.emit("saved")
-        for (let field of this.fields) field.edited = false
-    }
-
-    getField(field) {
-        return this.fields.find(_field => _field.id === field)
-    }
-
-    getPortal(portal) {
-        return this.portals.find(p => p.name === portal)
+    protected processPortalData(portalData): void {
+        this.portals = []
+        for (let item of Object.keys(portalData)) {
+            let _portal = new Portal(this, item)
+            _portal.records = portalData[item].map(item => {
+                let fieldData = item;
+                delete fieldData.recordId;
+                delete fieldData.modId;
+                return new PortalRecord(this, _portal, item.recordId, item.modId, fieldData);
+            })
+            this.portals.push(_portal);
+        }
     }
 
-    delete(): Promise<void> {
+    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: "DELETE"
+                method: "GET"
             })
                 .then(res => {
-                    if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res))
-                    }
-                    else if (res.messages[0].code === "0") {
-                        this.emit("deleted")
-                        resolve()
+                    if (res.messages[0].code === "0") {
+                        // console.log(res, res.response.data)
+                        this.modId = res.response.data[0].modId
+                        this.fields = 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))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -1740,7 +1775,12 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-    duplicate(): Promise<RecordBase> {
+    getPortal(portal) {
+        return this.portals.find(p => p.name === portal)
+    }
+
+    duplicate(): Promise<LayoutRecord> {
+        let trace = new Error()
         return new Promise(async (resolve, reject) => {
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
@@ -1748,7 +1788,7 @@ export class RecordBase extends EventEmitter {
             })
                 .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
-                        reject(new FMError(res.response.scriptError, res.status, res))
+                        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)
@@ -1758,7 +1798,7 @@ export class RecordBase extends EventEmitter {
                         resolve(_res)
                     }
                     else {
-                        reject(new FMError(res.messages[0].code, res.status, res))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -1767,65 +1807,29 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-
-    toObject(filter = (a) => a.edited,
-             portalFilter = (a) => a.records.find(record => record.edited),
-             portalRowFilter = (a) => a.edited,
-             portalFieldFilter = (a) => a.edited
-    ): recordObject {
-        let fields_processed = {}
-        for (let field of this.fields.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,
-            "modId": this.modId,
-            "fieldData": fields_processed
-        }
-
-        // Check if there's been any edited portal information
-        let portals = this.portals.filter(a => portalFilter(a))
-        if (portals) {
-            obj["portalData"] = {}
-            for (let portal of portals) {
-                obj["portalData"][portal.name] = portal.records.filter(a => portalRowFilter(a)).map(record => {
-                    return record.toObject(portalFieldFilter)
+    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))
+                    }
                 })
-            }
-        }
-        return obj
-    }
-}
-
-export class LayoutRecord extends RecordBase {
-    portals: Portal[];
-
-    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
-        super(layout, recordId, modId);
-        this.fields = this.processFieldData(fieldData)
-        this.portals = []
-        if (portalData) {
-            this.processPortalData(portalData)
-        }
+                .catch(e => {
+                    reject(e)
+                })
+        })
     }
 }
 
@@ -1919,7 +1923,29 @@ export class Field {
         return this._value
     }
 
-    upload(buffer: Buffer, filename: string, mime: string): Promise<void | FMError> {
+    get string(): string {
+        if (typeof this._value === "string") {
+            return this._value
+        }
+        throw "Field value is not a string"
+    }
+
+    get date(): Date {
+        if (this._value instanceof Date) {
+            return this._value
+        }
+        throw "Field value is not a date"
+    }
+
+    get number(): number {
+        if (typeof this._value === "number") {
+            return this._value
+        }
+        throw "Field value is not a number"
+    }
+
+    upload(buffer: Buffer, filename: string, mime: string): Promise<void> {
+        let trace = new Error()
         if (this.metadata.result !== "container") throw "Cannot upload a file to the field; " + this.id + " (not a container field)"
         return new Promise(async (resolve, reject) => {
             let form = new FormData()
@@ -1936,7 +1962,7 @@ export class Field {
                         resolve()
                     }
                     else {
-                        reject(new FMError(_res.messages[0].code, _res.status, data))
+                        reject(new FMError(_res.messages[0].code, _res.status, data, trace))
                     }
                 })
                 .catch(e => {
@@ -1979,11 +2005,11 @@ export class Field {
 }
 
 export class Portal {
-    readonly record: RecordBase;
+    readonly record: LayoutRecord;
     readonly name: string;
     public records: PortalRecord[];
 
-    constructor(record: RecordBase, name: string) {
+    constructor(record: LayoutRecord, name: string) {
         this.record = record
         this.name = name
     }
@@ -2120,11 +2146,12 @@ export class RecordGetRange extends RecordGetOperation {
     /**
      * @deprecated in favour of .fetch()
      */
-    run(extraBody: extraBodyOptions = {}): Promise<RecordBase[]> {
+    run(extraBody: extraBodyOptions = {}): Promise<LayoutRecord[]> {
         return this.fetch(extraBody)
     }
 
-    fetch(extraBody: extraBodyOptions = {}): Promise<RecordBase[]> {
+    fetch(extraBody: extraBodyOptions = {}): Promise<LayoutRecord[]> {
+        let trace = new Error()
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta().then(() => {
@@ -2143,7 +2170,7 @@ export class RecordGetRange extends RecordGetOperation {
                         resolve(data)
                     }
                     else {
-                        reject(new FMError(res.messages[0].code, res.status, res))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -2156,8 +2183,10 @@ export class RecordGetRange extends RecordGetOperation {
 export class Find extends RecordGetOperation {
     protected queries: object[]
 
-    constructor(layout) {
+    constructor(layout, start = 0, limit = 100) {
         super(layout)
+        this.setOffset(start)
+        this.setLimit(limit)
         this.queries = []
     }
 
@@ -2197,7 +2226,8 @@ export class Find extends RecordGetOperation {
         return this.fetch()
     }
 
-    fetch(): Promise<RecordBase[]> {
+    fetch(): Promise<LayoutRecord[]> {
+        let trace = new Error()
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta()
@@ -2219,7 +2249,7 @@ export class Find extends RecordGetOperation {
                         resolve(data)
                     }
                     else {
-                        reject(new FMError(res.messages[0].code, res.status, res))
+                        reject(new FMError(res.messages[0].code, res.status, res, trace))
                     }
                 })
                 .catch(e => {
@@ -2236,7 +2266,7 @@ export class FMError extends Error {
     readonly message: string
     readonly messages: string
 
-    constructor(code, httpStatus, res) {
+    constructor(code, httpStatus, res, trace?: Error) {
         if (typeof code === "string") code = parseInt(code)
         super(errs.find(err => err.e === code).d || "Unknown error");
         this.httpStatus = httpStatus
@@ -2244,6 +2274,8 @@ export class FMError extends Error {
         this.messages = res.messages
         this.code = typeof code === "string" ? parseInt(code) : code
         Error.captureStackTrace(this, FMError)
+
+        if (trace) this.stack = trace.stack
     }
 }