@jd-data-limited/easy-fm 3.1.5 → 3.1.6

package/src/records/field.ts

@@ -2,14 +2,15 @@
  * Copyright (c) 2023. See LICENSE file for more information
  */
 
-import {RecordBase} from "./recordBase.js";
+import {RecordBase, RecordTypes} from "./recordBase.js";
 import fetch, {File, FormData} from "node-fetch";
 import * as http from "http";
 import {ContainerBufferResult, DOWNLOAD_MODES, FieldMetaData} from "../types.js";
-import {PortalRecord} from "./portalRecord.js";
-import {FieldValue} from "../layouts/layoutInterface.js";
 import {FMError} from "../FMError.js";
 
+export type FieldValue = string | number | Date | Container
+export type Container = null
+
 export class Field<T extends FieldValue> {
     record: RecordBase<any>;
     id: string;
@@ -60,7 +61,8 @@ export class Field<T extends FieldValue> {
                 repetitionEnd: 1
             } as FieldMetaData
         }
-        if (this.record instanceof PortalRecord) {
+        if (this.record.type === RecordTypes.PORTAL) {
+            // @ts-ignore
             return this.record.layout.metadata.portalMetaData[this.record.portal.name || "portal not attached"].find(i => i.name === this.id) as FieldMetaData || {
                 name: this.id.toString(),
                 type: 'normal',
@@ -137,6 +139,7 @@ export class Field<T extends FieldValue> {
 
             let _fetch = await fetch(`${this.record.endpoint}/containers/${this.id}/1`, {
                 method: "POST",
+                // @ts-ignore
                 headers: {"Authorization": "Bearer " + this.record.layout.database.token},
                 body: form
             }).then(res => res.json())
@@ -159,6 +162,7 @@ export class Field<T extends FieldValue> {
     download(mode: DOWNLOAD_MODES.Buffer): Promise<ContainerBufferResult>
     download(mode: DOWNLOAD_MODES = DOWNLOAD_MODES.Stream): Promise<http.IncomingMessage | ContainerBufferResult> {
         return new Promise((resolve, reject) => {
+            // @ts-ignore
             this.record.layout.database.streamContainer(this, this._value)
                 .then(stream => {
                     if (mode === DOWNLOAD_MODES.Stream) {

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

@@ -1,10 +1,10 @@
 import { RecordGetOperation } from "./recordGetOperation.js";
 import { LayoutRecord } from "../layoutRecord.js";
 import { LayoutInterface } from "../../layouts/layoutInterface";
-import { Layout } from "../../layouts/layout.js";
+import { LayoutBase } from "../../layouts/layoutBase.js";
 export declare class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
     protected queries: object[];
-    constructor(layout: Layout<T>, start?: number, limit?: number);
+    constructor(layout: LayoutBase, start?: number, limit?: number);
     private toObject;
     addRequests(...requests: any[]): this;
     /**

package/src/records/getOperations/find.js

@@ -36,10 +36,10 @@ export class Find extends RecordGetOperation {
         if (this.offset !== 0)
             out["offset"] = this.offset;
         if (this.limitPortals.length > 0) {
-            out["portal"] = this.limitPortals.map(p => p.portal.name);
+            out["portal"] = this.limitPortals.map(p => p.portalName);
             for (let item of this.limitPortals) {
-                out["offset." + item.portal.name.replace(/[^0-9A-z]/g, "")] = item.offset;
-                out["limit." + item.portal.name.replace(/[^0-9A-z]/g, "")] = item.limit;
+                out["offset." + item.portalName.replace(/[^0-9A-z]/g, "")] = item.offset;
+                out["limit." + item.portalName.replace(/[^0-9A-z]/g, "")] = item.limit;
             }
         }
         return out;

package/src/records/getOperations/find.ts

@@ -5,13 +5,13 @@
 import {RecordGetOperation} from "./recordGetOperation.js";
 import {LayoutRecord} from "../layoutRecord.js";
 import {LayoutInterface} from "../../layouts/layoutInterface";
-import {Layout} from "../../layouts/layout.js";
+import {LayoutBase} from "../../layouts/layoutBase.js";
 import {FMError} from "../../FMError.js";
 
 export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
     protected queries: object[]
 
-    constructor(layout: Layout<T>, start = 0, limit = 100) {
+    constructor(layout: LayoutBase, start = 0, limit = 100) {
         super(layout)
         this.setOffset(start)
         this.setLimit(limit)
@@ -32,10 +32,10 @@ export class Find<T extends LayoutInterface> extends RecordGetOperation<T> {
         if (this.limit !== 100) out["limit"] = this.limit
         if (this.offset !== 0) out["offset"] = this.offset
         if (this.limitPortals.length > 0) {
-            out["portal"] = this.limitPortals.map(p => p.portal.name)
+            out["portal"] = this.limitPortals.map(p => p.portalName)
             for (let item of this.limitPortals) {
-                out["offset." + item.portal.name.replace(/[^0-9A-z]/g, "")] = item.offset
-                out["limit." + item.portal.name.replace(/[^0-9A-z]/g, "")] = item.limit
+                out["offset." + item.portalName.replace(/[^0-9A-z]/g, "")] = item.offset
+                out["limit." + item.portalName.replace(/[^0-9A-z]/g, "")] = item.limit
             }
         }
 

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

@@ -1,15 +1,15 @@
 import { LayoutInterface } from "../../layouts/layoutInterface.js";
-import { Layout } from "../../layouts/layout.js";
 import { Portal } from "../portal.js";
 import { limitPortalsInterface } from "../../types.js";
+import { LayoutBase } from "../../layouts/layoutBase.js";
 export declare class RecordGetOperation<T extends LayoutInterface> {
-    protected layout: Layout<T>;
+    protected layout: LayoutBase;
     protected limit: number;
     protected scripts: object;
     protected sort: object[];
     protected limitPortals: limitPortalsInterface[];
     protected offset: number;
-    constructor(layout: Layout<T>);
+    constructor(layout: LayoutBase);
     addToPortalLimit(portal: Portal<any>, offset?: number, limit?: number): this;
     setLimit(limit: number): this;
     addSort(fieldName: any, sortOrder: any): this;

package/src/records/getOperations/recordGetOperation.js

@@ -21,7 +21,7 @@ export class RecordGetOperation {
     addToPortalLimit(portal, offset = 0, limit = 100) {
         if (offset < 0)
             throw "Portal offset cannot be less than 0";
-        this.limitPortals.push({ portal, offset, limit });
+        this.limitPortals.push({ portalName: portal.name, offset, limit });
         return this;
     }
     setLimit(limit) {

package/src/records/getOperations/recordGetOperation.ts

@@ -3,19 +3,19 @@
  */
 
 import {LayoutInterface} from "../../layouts/layoutInterface.js";
-import {Layout} from "../../layouts/layout.js";
 import {Portal} from "../portal.js";
 import {limitPortalsInterface} from "../../types.js";
+import {LayoutBase} from "../../layouts/layoutBase.js"
 
 export class RecordGetOperation<T extends LayoutInterface> {
-    protected layout: Layout<T>
+    protected layout: LayoutBase
     protected limit: number = 100
     protected scripts: object
     protected sort: object[]
     protected limitPortals: limitPortalsInterface[] = []
     protected offset: number = 0
 
-    constructor(layout: Layout<T>) {
+    constructor(layout: LayoutBase) {
         this.layout = layout
         this.scripts = {
             "script": null, // Runs after everything
@@ -31,7 +31,7 @@ export class RecordGetOperation<T extends LayoutInterface> {
     */
     addToPortalLimit(portal: Portal<any>, offset = 0, limit = 100) {
         if (offset < 0) throw "Portal offset cannot be less than 0"
-        this.limitPortals.push({portal, offset, limit})
+        this.limitPortals.push({portalName: portal.name, offset, limit})
         return this
     }
 

package/src/records/getOperations/recordGetRange.js

@@ -28,12 +28,12 @@ export class RecordGetRange extends RecordGetOperation {
         if (this.sort.length > 0)
             params.push("_sort=" + encodeURI(JSON.stringify(this.sort)));
         if (this.limitPortals.length > 0) {
-            params.push("portal=" + encodeURI(JSON.stringify(this.limitPortals.map(p => p.portal.name))));
+            params.push("portal=" + encodeURI(JSON.stringify(this.limitPortals.map(p => p.portalName))));
             for (let item of this.limitPortals) {
                 if (item.offset !== 0)
-                    params.push("_offset." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.offset);
+                    params.push("_offset." + item.portalName.replace(/[^0-9A-z]/g, "") + "=" + item.offset);
                 if (item.limit !== 100)
-                    params.push("_limit." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.limit);
+                    params.push("_limit." + item.portalName.replace(/[^0-9A-z]/g, "") + "=" + item.limit);
             }
         }
         if (extraBody.scripts) {

package/src/records/getOperations/recordGetRange.ts

@@ -21,10 +21,10 @@ export class RecordGetRange<T extends LayoutInterface> extends RecordGetOperatio
         if (this.offset !== 0) params.push("_offset=" + this.offset)
         if (this.sort.length > 0) params.push("_sort=" + encodeURI(JSON.stringify(this.sort)))
         if (this.limitPortals.length > 0) {
-            params.push("portal=" + encodeURI(JSON.stringify(this.limitPortals.map(p => p.portal.name))))
+            params.push("portal=" + encodeURI(JSON.stringify(this.limitPortals.map(p => p.portalName))))
             for (let item of this.limitPortals) {
-                if (item.offset !== 0) params.push("_offset." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.offset)
-                if (item.limit !== 100) params.push("_limit." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.limit)
+                if (item.offset !== 0) params.push("_offset." + item.portalName.replace(/[^0-9A-z]/g, "") + "=" + item.offset)
+                if (item.limit !== 100) params.push("_limit." + item.portalName.replace(/[^0-9A-z]/g, "") + "=" + item.limit)
             }
         }
         if (extraBody.scripts) {

package/src/records/layoutRecord.d.ts

@@ -1,8 +1,10 @@
 import { extraBodyOptions, recordObject } from "../types.js";
 import { RecordBase } from "./recordBase.js";
 import { Portal } from "./portal.js";
-import { PortalInterface, RecordFieldsMap } from "../layouts/layoutInterface.js";
-export declare class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface> extends RecordBase<T> {
+import { PortalInterface } from "../layouts/layoutInterface.js";
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+import { LayoutRecordBase } from "./layoutRecordBase";
+export declare class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface> extends RecordBase<T> implements LayoutRecordBase {
     portals: P;
     constructor(layout: any, recordId: any, modId?: any, fieldData?: {}, portalData?: any);
     get portalsArray(): Portal<any>[];

package/src/records/layoutRecord.js

@@ -17,6 +17,8 @@ import { FMError } from "../FMError.js";
 export class LayoutRecord extends RecordBase {
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
         super(layout, recordId, modId);
+        // @ts-ignore
+        this.portals = {};
         this.processFieldData(fieldData);
         if (portalData) {
             this.processPortalData(portalData);

package/src/records/layoutRecord.ts

@@ -6,11 +6,14 @@ import {extraBodyOptions, recordObject} from "../types.js";
 import {RecordBase} from "./recordBase.js";
 import {PortalRecord} from "./portalRecord.js";
 import {Portal} from "./portal.js";
-import {PortalInterface, RecordFieldsMap} from "../layouts/layoutInterface.js";
+import {PortalInterface} from "../layouts/layoutInterface.js";
 import {FMError} from "../FMError.js";
+import {RecordFieldsMap} from "../layouts/recordFieldsMap";
+import {LayoutRecordBase} from "./layoutRecordBase";
 
-export class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface> extends RecordBase<T> {
-    portals: P
+export class LayoutRecord<T extends RecordFieldsMap, P extends PortalInterface> extends RecordBase<T> implements LayoutRecordBase {
+    // @ts-ignore
+    portals: P = {}
 
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
         super(layout, recordId, modId);

package/src/records/layoutRecordBase.d.ts

@@ -0,0 +1,5 @@
+import { LayoutBase } from "../layouts/layoutBase.js";
+export interface LayoutRecordBase {
+    layout: LayoutBase;
+    commit(extraBody: object): Promise<this>;
+}

package/src/records/layoutRecordBase.js

@@ -0,0 +1,4 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+export {};

package/src/records/layoutRecordBase.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+
+import {LayoutBase} from "../layouts/layoutBase.js"
+
+export interface LayoutRecordBase {
+    layout: LayoutBase
+    commit(extraBody: object): Promise<this>
+}

package/src/records/portal.d.ts

@@ -1,7 +1,8 @@
-import { LayoutRecord } from "./layoutRecord.js";
 import { PortalRecord } from "./portalRecord.js";
-import { RecordFieldsMap } from "../layouts/layoutInterface";
-export declare class Portal<T extends RecordFieldsMap> {
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+import { PortalBase } from "./portalBase";
+import { LayoutRecord } from "./layoutRecord";
+export declare class Portal<T extends RecordFieldsMap> implements PortalBase<T> {
     readonly record: LayoutRecord<any, any>;
     readonly name: string;
     records: PortalRecord<T>[];

package/src/records/portal.ts

@@ -2,11 +2,13 @@
  * Copyright (c) 2023. See LICENSE file for more information
  */
 
-import {LayoutRecord} from "./layoutRecord.js";
 import {PortalRecord} from "./portalRecord.js";
-import {LayoutInterface, PortalInterface, RecordFieldsMap} from "../layouts/layoutInterface";
+import {RecordFieldsMap} from "../layouts/recordFieldsMap";
+import {PortalBase} from "./portalBase";
+import {LayoutRecordBase} from "./layoutRecordBase";
+import {LayoutRecord} from "./layoutRecord";
 
-export class Portal<T extends RecordFieldsMap> {
+export class Portal<T extends RecordFieldsMap> implements PortalBase<T> {
     readonly record: LayoutRecord<any, any>;
     readonly name: string;
     public records: PortalRecord<T>[];

package/src/records/portalBase.d.ts

@@ -0,0 +1,8 @@
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+import { RecordBase } from "./recordBase";
+import { LayoutRecord } from "./layoutRecord";
+export interface PortalBase<T extends RecordFieldsMap> {
+    readonly record: LayoutRecord<any, any>;
+    readonly name: string;
+    records: RecordBase<T>[];
+}

package/src/records/portalBase.js

@@ -0,0 +1,4 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+export {};

package/src/records/portalBase.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+
+import {RecordFieldsMap} from "../layouts/recordFieldsMap";
+import {LayoutRecordBase} from "./layoutRecordBase";
+import {RecordBase} from "./recordBase";
+import {LayoutRecord} from "./layoutRecord";
+
+export interface PortalBase<T extends RecordFieldsMap> {
+    readonly record: LayoutRecord<any, any>
+    readonly name: string
+    records: RecordBase<T>[]
+}

package/src/records/portalRecord.d.ts

@@ -1,12 +1,13 @@
-import { RecordBase } from "./recordBase.js";
+import { RecordBase, RecordTypes } from "./recordBase.js";
 import { extraBodyOptions } from "../types.js";
-import { Portal } from "./portal.js";
-import { RecordFieldsMap } from "../layouts/layoutInterface.js";
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+import { PortalBase } from "./portalBase";
 export declare class PortalRecord<T extends RecordFieldsMap> extends RecordBase<T> {
-    readonly portal: Portal<any>;
+    readonly portal: PortalBase<T>;
+    readonly type = RecordTypes.PORTAL;
     constructor(record: any, portal: any, recordId: any, modId?: any, fieldData?: {});
     _onSave(): void;
     commit(extraBody?: extraBodyOptions): Promise<import("./layoutRecord.js").LayoutRecord<any, any>>;
     toObject(fieldFilter: any): any;
-    getField(field: any): import("./field.js").Field<import("../layouts/layoutInterface.js").FieldValue>;
+    getField(field: any): import("./field.js").Field<import("./field.js").FieldValue>;
 }

package/src/records/portalRecord.js

@@ -1,10 +1,11 @@
 /*
  * Copyright (c) 2023. See LICENSE file for more information
  */
-import { RecordBase } from "./recordBase.js";
+import { RecordBase, RecordTypes } from "./recordBase.js";
 export class PortalRecord extends RecordBase {
     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/portalRecord.ts

@@ -2,13 +2,15 @@
  * Copyright (c) 2023. See LICENSE file for more information
  */
 
-import {RecordBase} from "./recordBase.js";
+import {RecordBase, RecordTypes} from "./recordBase.js";
 import {extraBodyOptions, recordObject} from "../types.js";
-import {Portal} from "./portal.js";
-import {RecordFieldsMap} from "../layouts/layoutInterface.js";
+
+import {RecordFieldsMap} from "../layouts/recordFieldsMap";
+import {PortalBase} from "./portalBase";
 
 export class PortalRecord<T extends RecordFieldsMap> extends RecordBase<T> {
-    readonly portal: Portal<any>;
+    readonly portal: PortalBase<T>;
+    readonly type = RecordTypes.PORTAL
 
     constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId);

package/src/records/portalRecordBase.d.ts

@@ -0,0 +1,4 @@
+import { RecordBase } from "./recordBase";
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+export declare class PortalRecordBase<T extends RecordFieldsMap> extends RecordBase<T> {
+}

package/src/records/portalRecordBase.js

@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+import { RecordBase } from "./recordBase";
+export class PortalRecordBase extends RecordBase {
+}

package/src/records/recordBase.d.ts

@@ -1,10 +1,17 @@
+/// <reference types="node" />
 import { EventEmitter } from "events";
 import { Field } from "./field.js";
 import { Layout } from "../layouts/layout.js";
-import { RecordFieldsMap } from "../layouts/layoutInterface.js";
 import { recordObject } from "../types.js";
+import { RecordFieldsMap } from "../layouts/recordFieldsMap";
+export declare enum RecordTypes {
+    UNKNOWN = 0,
+    LAYOUT = 1,
+    PORTAL = 2
+}
 export declare class RecordBase<T extends RecordFieldsMap> extends EventEmitter {
     readonly layout: Layout<any>;
+    readonly type: RecordTypes;
     recordId: number;
     modId: number;
     fields: T;
@@ -12,9 +19,8 @@ export declare class RecordBase<T extends RecordFieldsMap> extends EventEmitter
     constructor(layout: any, recordId: any, modId?: any);
     get endpoint(): string;
     get edited(): boolean;
-    get fieldsArray(): Field<import("../layouts/layoutInterface.js").FieldValue>[];
+    get fieldsArray(): Field<import("./field.js").FieldValue>[];
     protected processFieldData(fieldData: any): T;
     _onSave(): void;
-    getField(field: any): Field<import("../layouts/layoutInterface.js").FieldValue>;
     toObject(filter?: (a: any) => any, portalFilter?: (a: any) => any, portalRowFilter?: (a: any) => any, portalFieldFilter?: (a: any) => any): recordObject;
 }

package/src/records/recordBase.js

@@ -2,11 +2,18 @@
  * Copyright (c) 2023. See LICENSE file for more information
  */
 import { EventEmitter } from "events";
-import * as moment from "moment/moment.js";
+import * as moment from "moment";
 import { Field } from "./field.js";
+export var RecordTypes;
+(function (RecordTypes) {
+    RecordTypes[RecordTypes["UNKNOWN"] = 0] = "UNKNOWN";
+    RecordTypes[RecordTypes["LAYOUT"] = 1] = "LAYOUT";
+    RecordTypes[RecordTypes["PORTAL"] = 2] = "PORTAL";
+})(RecordTypes || (RecordTypes = {}));
 export class RecordBase extends EventEmitter {
     constructor(layout, recordId, modId = recordId) {
         super();
+        this.type = RecordTypes.UNKNOWN;
         this.layout = layout;
         this.recordId = recordId;
         this.modId = modId;
@@ -60,9 +67,6 @@ export class RecordBase extends EventEmitter {
         for (let field of this.fieldsArray)
             field.edited = false;
     }
-    getField(field) {
-        return this.fieldsArray.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) {
         let fields_processed = {};
         for (let field of this.fieldsArray.filter(field => filter(field))) {

package/src/records/recordBase.ts

@@ -3,17 +3,24 @@
  */
 
 import {EventEmitter} from "events";
-import * as moment from "moment/moment.js";
+import * as moment from "moment";
 import {Field} from "./field.js";
 import {Layout} from "../layouts/layout.js";
-import {RecordFieldsMap} from "../layouts/layoutInterface.js";
 import {recordObject} from "../types.js";
+import {RecordFieldsMap} from "../layouts/recordFieldsMap";
+
+export enum RecordTypes {
+    UNKNOWN,
+    LAYOUT,
+    PORTAL
+}
 
 export class RecordBase<T extends RecordFieldsMap> extends EventEmitter {
     readonly layout: Layout<any>;
+    readonly type: RecordTypes = RecordTypes.UNKNOWN;
     public recordId: number;
     modId: number;
-    fields: T
+    fields: T;
     protected portalData: any[];
 
     constructor(layout, recordId, modId = recordId) {
@@ -78,10 +85,6 @@ export class RecordBase<T extends RecordFieldsMap> extends EventEmitter {
         for (let field of this.fieldsArray) field.edited = false
     }
 
-    getField(field) {
-        return this.fieldsArray.find(_field => _field.id === field)
-    }
-
     toObject(filter = (a) => a.edited,
              portalFilter = (a) => a.records.find(record => record.edited),
              portalRowFilter = (a) => a.edited,

package/src/types.d.ts

@@ -1,8 +1,13 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as http from "http";
-import { Portal } from "./records/portal.js";
 import { FMError } from "./FMError.js";
+import { LayoutInterface } from "./layouts/layoutInterface";
+export interface DatabaseStructure {
+    layouts: {
+        [key: string]: LayoutInterface;
+    };
+}
 export interface databaseOptionsBase {
     database: string;
     credentials: loginOptionsOAuth | loginOptionsFileMaker | loginOptionsClaris | loginOptionsToken;
@@ -35,7 +40,7 @@ export interface loginOptionsClaris {
     };
 }
 export interface limitPortalsInterface {
-    portal: Portal<any>;
+    portalName: string;
     offset: number;
     limit: number;
 }

package/src/types.ts

@@ -4,12 +4,17 @@
 
 // const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
 // @ts-ignore
-import * as moment from "moment"
 import * as http from "http";
-import {Portal} from "./records/portal.js";
 import {FMError} from "./FMError.js";
+import {LayoutInterface} from "./layouts/layoutInterface";
 
 // import * as btoa from "btoa";
+export interface DatabaseStructure {
+    layouts: {
+        [key: string]: LayoutInterface
+    }
+}
+
 export interface databaseOptionsBase {
     database: string
     credentials: loginOptionsOAuth | loginOptionsFileMaker | loginOptionsClaris | loginOptionsToken,
@@ -48,7 +53,7 @@ export interface loginOptionsClaris {
 }
 
 export interface limitPortalsInterface {
-    portal: Portal<any>,
+    portalName: string,
     offset: number,
     limit: number
 }

package/test.d.ts

@@ -1 +1,2 @@
-export {};
+import FMHost from "./src/index.js";
+export default FMHost;

package/test.js

@@ -1,4 +1,30 @@
 /*
  * Copyright (c) 2023. See LICENSE file for more information
  */
-export {};
+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 FMHost from "./src/index.js";
+export default FMHost;
+const host = new FMHost("https://lab.farmmedix.com");
+const database = host.database({
+    database: "Snapshot_2.fmp12",
+    credentials: {
+        method: "filemaker",
+        username: "Developer",
+        password: "1df e53 0tx"
+    },
+    externalSources: []
+});
+database.login()
+    .then(() => __awaiter(void 0, void 0, void 0, function* () {
+    const layout = database.getLayout("RoleInfo");
+    const records = yield layout.records.range().fetch();
+    console.log(records[0]);
+}));

package/test.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023. See LICENSE file for more information
+ */
+
+import FMHost, {Field, Layout} from "./src/index.js";
+export default FMHost
+
+const host = new FMHost("https://lab.farmmedix.com")
+const database = host.database<{
+    layouts: {
+        RoleInfo: {
+            fields: {
+                field1: Field<string>
+            },
+            portals: {}
+        }
+    }
+}>({
+    database: "Snapshot_2.fmp12",
+    credentials: {
+        method: "filemaker",
+        username: "Developer",
+        password: "1df e53 0tx"
+    },
+    externalSources: []
+})
+
+database.login()
+    .then(async () => {
+        const layout = database.getLayout("RoleInfo")
+        const records = await layout.records.range().fetch()
+        console.log(records[0])
+    })

package/test2.d.ts

@@ -0,0 +1 @@
+export {};