@jd-data-limited/easy-fm 3.2.7 → 4.0.0

package/src/connection/database.js

@@ -1,25 +1,19 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. 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";
 import { FMError } from "../FMError.js";
 import { Layout } from "../layouts/layout.js";
-import HTTP_REDIRECT from "follow-redirects";
+import * as 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;
@@ -37,66 +31,53 @@ export class Database extends EventEmitter {
             throw "Not yet supported login method";
         }
     }
-    logout() {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.token)
-                reject(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;
-            resolve();
-        }));
-    }
-    login() {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            // Reset cookies
-            this.cookies = {};
-            try {
-                yield this.host.getMetadata();
-            }
-            catch (e) {
-                reject(e);
-                return;
+    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"
             }
-            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;
-                resolve(this.token);
+        });
+        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 url = new URL(`${this.endpoint}/sessions`);
+            url.hostname = this.host.hostname;
+            let res = await fetch(url, {
+                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;
             }
             else {
-                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);
-                        })
-                    })
-                }).then((res) => __awaiter(this, void 0, void 0, function* () {
-                    let _res = (yield res.json());
-                    if (res.status === 200) {
-                        this._token = res.headers.get('x-fm-data-access-token');
-                        resolve(this._token);
-                    }
-                    else {
-                        reject(new FMError(_res.messages[0].code, _res.status, res));
-                    }
-                }))
-                    .catch(e => {
-                    reject(e);
-                });
+                throw new FMError(_res.messages[0].code, _res.status, res);
             }
-        }));
+        }
     }
     get token() {
         return this._token;
@@ -104,51 +85,52 @@ export class Database extends EventEmitter {
     get endpoint() {
         return `${this.host.hostname}/fmi/data/v2/databases/${this.name}`;
     }
-    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 = yield _fetch.json();
-            // 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);
+    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];
             }
-            return data;
-        });
+        }
+        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;
+    }
+    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));
     }
     getLayout(name) {
         return new Layout(this, name);
     }
-    setGlobals(globalFields) {
+    /*
+    @deprecated
+     */
+    async setGlobals(globalFields) {
         // console.log({globalFields})
-        return new Promise((resolve, reject) => {
-            this.apiRequest(`${this.endpoint}/globals`, {
-                method: "PATCH",
-                body: JSON.stringify({ globalFields })
-            }).then(res => {
-                // console.log(res)
-                if (res.messages[0].code === "0") {
-                    resolve();
-                }
-                else {
-                    reject((res.messages[0].code, res.status, res));
-                }
-            })
-                .catch(e => {
-                reject(e);
-            });
+        await this.apiRequest(`${this.endpoint}/globals`, {
+            method: "PATCH",
+            body: JSON.stringify({ globalFields })
         });
     }
     script(name, parameter = "") {
@@ -157,15 +139,10 @@ export class Database extends EventEmitter {
     _tokenExpired() {
         this.emit("token_expired");
     }
-    streamContainer(field, url) {
+    streamURL(url) {
         return new Promise((resolve, reject) => {
-            if (field.metadata.result !== "container") {
-                reject("Cannot stream the field " + field.id + " as it is not a container");
-                return;
-            }
             if (!url || typeof url !== "string") {
-                reject("Container is empty, or has invalid value");
-                return;
+                throw new Error("URL is empty, or has invalid value");
             }
             let headers = {};
             if (Object.keys(this.cookies).length !== 0) {
@@ -188,7 +165,7 @@ export class Database extends EventEmitter {
             // Automatically switch between the http and https modules, based on which is needed
             (url.startsWith("https") ? HTTP_REDIRECT.https : HTTP_REDIRECT.http).get(url, {
                 headers,
-                beforeRedirect: (options, res, req) => check_for_cookies(res)
+                beforeRedirect: (options, res) => check_for_cookies(res)
             }, (res) => {
                 check_for_cookies(res);
                 resolve(res);

package/src/connection/database.ts

@@ -1,24 +1,25 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
 import {EventEmitter} from "events";
-import fetch, {HeadersInit, Request} from "node-fetch";
 import {generateAuthorizationHeaders} from "./generateAuthorizationHeaders.js";
 import {FMError} from "../FMError.js";
 import {LayoutInterface} from "../layouts/layoutInterface.js";
 import {Layout} from "../layouts/layout.js";
-import HTTP_REDIRECT  from "follow-redirects"
+import * as HTTP_REDIRECT from "follow-redirects"
 import {
     databaseOptionsBase,
-    databaseOptionsWithExternalSources, DatabaseStructure,
-    fileMakerResponse,
+    databaseOptionsWithExternalSources,
     loginOptionsFileMaker,
     loginOptionsToken,
     Script
 } from "../types.js";
 import {HostBase} from "./HostBase.js"
-import {DatabaseBase} from "./databaseBase";
+import {DatabaseBase} from "./databaseBase.js";
+import {ApiLayout, ApiResults} from "../models/apiResults.js";
+import {DatabaseStructure} from "../databaseStructure.js";
+import {IncomingMessage} from "http";
 
 type GetLayoutReturnType<T extends DatabaseStructure, R extends LayoutInterface | string> = R extends string ? T["layouts"][R] : R
 
@@ -50,67 +51,55 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         }
     }
 
-    logout(): Promise<void> {
-        return new Promise(async (resolve, reject) => {
-            if (!this.token) reject(new Error("Not logged in"))
+    async logout(): Promise<void> {
+        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"
-                }
-            })
-            let data = await _fetch.json()
-            // console.log(data)
-            this._token = null
-            resolve()
+        let _fetch = await fetch(`${this.endpoint}/sessions/${this.token}`, {
+            method: "DELETE",
+            headers: {
+                "content-type": "application/json"
+            }
         })
+        let data = await _fetch.json()
+        // console.log(data)
+        this._token = null
     }
 
-    login() {
-        return new Promise<string>(async (resolve, reject) => {
-            // Reset cookies
-            this.cookies = {}
+    async login() {
+        // Reset cookies
+        this.cookies = {}
 
-            try {
-                await this.host.getMetadata()
-            } catch (e) {
-                reject(e)
-                return
-            }
-            if (this.token) throw new Error("Already logged in. Run logout() first")
+        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 = (<loginOptionsToken>this.connection_details.credentials).token
-                resolve(this.token)
-            }
-            else {
-                fetch(`${this.endpoint}/sessions`, {
-                    hostname: this.host.hostname,
-                    port: 443,
-                    method: "POST",
-                    headers: generateAuthorizationHeaders(this.connection_details.credentials) as unknown as HeadersInit,
-                    body: JSON.stringify({
-                        fmDataSource: this.connection_details.externalSources.map(i => {
-                            let _i = <databaseOptionsBase>i
-                            return this.generateExternalSourceLogin(_i)
-                        })
+        if (this.connection_details.credentials.method === "token") {
+            this._token = (<loginOptionsToken>this.connection_details.credentials).token
+            return this.token
+        }
+        else {
+            console.time()
+            let url = new URL(`${this.endpoint}/sessions`)
+            url.hostname = this.host.hostname
+            let res = await fetch(url, {
+                method: "POST",
+                headers: generateAuthorizationHeaders(this.connection_details.credentials) as unknown as HeadersInit,
+                body: JSON.stringify({
+                    fmDataSource: this.connection_details.externalSources.map(i => {
+                        let _i = <databaseOptionsBase>i
+                        return this.generateExternalSourceLogin(_i)
                     })
-                }).then(async res => {
-                    let _res = <any>(await res.json())
-                    if (res.status === 200) {
-                        this._token = res.headers.get('x-fm-data-access-token')
-                        resolve(this._token)
-                    }
-                    else {
-                        reject(new FMError(_res.messages[0].code, _res.status, res))
-                    }
                 })
-                    .catch(e => {
-                        reject(e)
-                    })
+            })
+            console.time()
+            let _res = <any>(await 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() {
@@ -121,7 +110,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         return `${this.host.hostname}/fmi/data/v2/databases/${this.name}`
     }
 
-    async apiRequest<T = any>(url: string | Request, options: any = {}, autoRelogin = true): Promise<T> {
+    async apiRequest<T = any>(url: string | Request, options: any = {}, autoRelogin = true): Promise<ApiResults<T>> {
         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
@@ -134,41 +123,46 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                 this.cookies[cookie_split[0]] = cookie_split[1]
             }
         }
-        let data = await _fetch.json() as fileMakerResponse
+        let data = await _fetch.json() as ApiResults<T>
+
+        // 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) {
+        if (data.messages[0].code === "952" && autoRelogin) {
             this._token = null
             await this.login()
             return await this.apiRequest(url, options, false)
         }
-        return (data as any)
+        else if (data.messages[0].code !== "0") {
+            throw new FMError(data.messages[0].code, _fetch.status, data)
+        }
+
+        data.httpStatus = _fetch.status
+        return data
     }
 
-    getLayout<R extends string>(name: R): Layout<T["layouts"][R]>
+    async listLayouts() {
+        let req = await this.apiRequest<{layouts: ApiLayout[]}>(`${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<R extends keyof T["layouts"]>(name: R): Layout<T["layouts"][R]>
     getLayout<R extends LayoutInterface>(name: string): Layout<R>
-    getLayout(name: string): Layout<LayoutInterface> {
+    getLayout(name: string): Layout<any> {
         return new Layout<LayoutInterface>(this, name)
     }
 
-    setGlobals(globalFields): Promise<void> {
+    /*
+    @deprecated
+     */
+    async setGlobals(globalFields) {
         // console.log({globalFields})
-        return new Promise((resolve, reject) => {
-            this.apiRequest(`${this.endpoint}/globals`, {
-                method: "PATCH",
-                body: JSON.stringify({globalFields})
-            }).then(res => {
-                // console.log(res)
-                if (res.messages[0].code === "0") {
-                    resolve()
-                }
-                else {
-                    reject(
-                        (res.messages[0].code, res.status, res))
-                }
-            })
-                .catch(e => {
-                    reject(e)
-                })
+        await this.apiRequest(`${this.endpoint}/globals`, {
+            method: "PATCH",
+            body: JSON.stringify({globalFields})
         })
     }
 
@@ -180,15 +174,10 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         this.emit("token_expired")
     }
 
-    streamContainer(field, url): Promise<HTTP_REDIRECT.http.IncomingMessage> {
+    streamURL(url: string): Promise<IncomingMessage> {
         return new Promise((resolve, reject) => {
-            if (field.metadata.result !== "container") {
-                reject("Cannot stream the field " + field.id + " as it is not a container")
-                return
-            }
             if (!url || typeof url !== "string") {
-                reject("Container is empty, or has invalid value")
-                return
+                throw new Error("URL is empty, or has invalid value")
             }
 
             let headers = {}
@@ -214,7 +203,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
             // Automatically switch between the http and https modules, based on which is needed
             (url.startsWith("https") ? HTTP_REDIRECT.https : HTTP_REDIRECT.http).get(url, {
                 headers,
-                beforeRedirect: (options, res, req) => check_for_cookies(res)
+                beforeRedirect: (options, res) => check_for_cookies(res)
             }, (res) => {
                 check_for_cookies(res)
 

package/src/connection/databaseBase.d.ts

@@ -1,8 +1,11 @@
+/// <reference types="node" resolution-mode="require"/>
 import { HostBase } from "./HostBase.js";
-import { Request } from "node-fetch";
+import { ApiResults } from "../models/apiResults.js";
+import { IncomingMessage } from "http";
 export interface DatabaseBase {
     host: HostBase;
     readonly name: string;
     endpoint: string;
-    apiRequest(url: string | Request, options?: any, autoRelogin?: boolean): Promise<any>;
+    apiRequest<T = unknown>(url: string | Request, options?: any, autoRelogin?: boolean): Promise<ApiResults<T>>;
+    streamURL(url: string): Promise<IncomingMessage>;
 }

package/src/connection/databaseBase.js

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

package/src/connection/databaseBase.ts

@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
 import {HostBase} from "./HostBase.js"
-import {Request} from "node-fetch";
-import {DatabaseStructure} from "../types";
+import {ApiResults} from "../models/apiResults.js";
+import {IncomingMessage} from "http";
 
 export interface DatabaseBase {
     host: HostBase,
@@ -13,5 +13,6 @@ export interface DatabaseBase {
 
     // layouts: DatabaseStructure["layouts"]
 
-    apiRequest(url: string | Request, options?: any, autoRelogin?: boolean): Promise<any>
+    apiRequest<T = unknown>(url: string | Request, options?: any, autoRelogin?: boolean): Promise<ApiResults<T>>
+    streamURL(url: string): Promise<IncomingMessage>
 }

package/src/databaseStructure.d.ts

@@ -0,0 +1,6 @@
+import { LayoutInterface } from "./layouts/layoutInterface.js";
+export interface DatabaseStructure {
+    layouts: {
+        [key: string]: LayoutInterface;
+    };
+}

package/src/databaseStructure.js

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

package/src/databaseStructure.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024. See LICENSE file for more information
+ */
+
+// import * as btoa from "btoa";
+import {LayoutInterface} from "./layouts/layoutInterface.js";
+
+export interface DatabaseStructure {
+    layouts: {
+        [key: string]: LayoutInterface
+    }
+}

package/src/index.d.ts

@@ -8,12 +8,9 @@ import { LayoutRecord } from "./records/layoutRecord.js";
 import { LayoutInterface, PortalInterface } from "./layouts/layoutInterface.js";
 import { PortalRecord } from "./records/portalRecord.js";
 import { Portal } from "./records/portal.js";
-import { Field } from "./records/field.js";
-import { Find } from "./records/getOperations/find.js";
+import { Container, FieldBase } from "./records/fieldBase.js";
 import { RecordGetOperation } from "./records/getOperations/recordGetOperation.js";
-import { RecordGetRange } from "./records/getOperations/recordGetRange.js";
 import { LayoutRecordManager } from "./layouts/layoutRecordManager.js";
-import { RecordFieldsMap } from "./layouts/recordFieldsMap";
-import { Container } from "./records/field.js";
+import { RecordFieldsMap } from "./layouts/recordFieldsMap.js";
 export default FMHost;
-export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, LayoutInterface, RecordFieldsMap, PortalInterface, PortalRecord, Portal, Field, Find, RecordGetOperation, RecordGetRange, LayoutRecordManager, Container };
+export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, LayoutInterface, RecordFieldsMap, PortalInterface, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager, Container };

package/src/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 import FMHost from "./connection/FMHost.js";
 import { FMError } from "./FMError.js";
@@ -10,10 +10,8 @@ import { RecordBase } from "./records/recordBase.js";
 import { LayoutRecord } from "./records/layoutRecord.js";
 import { PortalRecord } from "./records/portalRecord.js";
 import { Portal } from "./records/portal.js";
-import { Field } from "./records/field.js";
-import { Find } from "./records/getOperations/find.js";
+import { FieldBase } from "./records/fieldBase.js";
 import { RecordGetOperation } from "./records/getOperations/recordGetOperation.js";
-import { RecordGetRange } from "./records/getOperations/recordGetRange.js";
 import { LayoutRecordManager } from "./layouts/layoutRecordManager.js";
 export default FMHost;
-export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, PortalRecord, Portal, Field, Find, RecordGetOperation, RecordGetRange, LayoutRecordManager };
+export { FMError, TYPES, Database, Layout, RecordBase, LayoutRecord, PortalRecord, Portal, FieldBase, RecordGetOperation, LayoutRecordManager };

package/src/index.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
 import FMHost from "./connection/FMHost.js";
@@ -12,13 +12,10 @@ import {LayoutRecord} from "./records/layoutRecord.js";
 import {LayoutInterface, PortalInterface} from "./layouts/layoutInterface.js";
 import {PortalRecord} from "./records/portalRecord.js";
 import {Portal} from "./records/portal.js";
-import {Field} from "./records/field.js";
-import {Find} from "./records/getOperations/find.js";
+import {Container, FieldBase} from "./records/fieldBase.js";
 import {RecordGetOperation} from "./records/getOperations/recordGetOperation.js";
-import {RecordGetRange} from "./records/getOperations/recordGetRange.js";
 import {LayoutRecordManager} from "./layouts/layoutRecordManager.js";
-import {RecordFieldsMap} from "./layouts/recordFieldsMap";
-import {Container} from "./records/field.js";
+import {RecordFieldsMap} from "./layouts/recordFieldsMap.js";
 
 export default FMHost
 export {
@@ -33,10 +30,8 @@ export {
     PortalInterface,
     PortalRecord,
     Portal,
-    Field,
-    Find,
+    FieldBase,
     RecordGetOperation,
-    RecordGetRange,
     LayoutRecordManager,
     Container
 }