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

package/README.md

@@ -1,27 +1,29 @@
 # easy-fm
 
-Making NodeJS + FileMaker easier than ever
+A [FileMaker Data API](https://help.claris.com/en/data-api-guide/content/index.html) client for NodeJS
 
 easy-fm is a Node.js module that allows you to interact with
-a [FileMaker database](https://www.claris.com/filemaker/) stored on
-a [FileMaker server](https://www.claris.com/filemaker/server/)
+a [FileMaker database](https://www.claris.com/filemaker/) stored on a [FileMaker server](https://www.claris.com/filemaker/server/)
 or [FileMaker Cloud](https://store.claris.com/filemaker-cloud). This module interacts with your server using the
 [FileMaker Data API](https://help.claris.com/en/data-api-guide/content/index.html).
 <!-- TOC -->
+
 * [easy-fm](#easy-fm)
-  * [FileMaker setup instructions](#filemaker-setup-instructions)
-  * [Before you begin](#before-you-begin)
-  * [Connecting to a database](#connecting-to-a-database)
-  * [Getting records](#getting-records)
-    * [Fetch a range of records](#fetch-a-range-of-records)
-    * [Searching for records](#searching-for-records)
-    * [Fetch a record using its record ID (NOT RECOMMENDED)](#fetch-a-record-using-its-record-id-not-recommended)
-    * [Create a record](#create-a-record)
-    * [Modify a record](#modify-a-record)
+    * [FileMaker setup instructions](#filemaker-setup-instructions)
+    * [Before you begin](#before-you-begin)
+    * [Connecting to a database](#connecting-to-a-database)
+    * [Getting records](#getting-records)
+        * [Fetch a range of records](#fetch-a-range-of-records)
+        * [Searching for records](#searching-for-records)
+        * [Fetch a record using its record ID (NOT RECOMMENDED)](#fetch-a-record-using-its-record-id-not-recommended)
+        * [Create a record](#create-a-record)
+        * [Modify a record](#modify-a-record)
 * [Field names](#field-names)
 * [Portal names](#portal-names)
 * [Typescript Implementation](#typescript-implementation)
+
 <!-- TOC -->
+
 ## FileMaker setup instructions
 
 1. Enable the FileMaker Data API from the server's admin console. This setting is located
@@ -34,7 +36,8 @@ or [FileMaker Cloud](https://store.claris.com/filemaker-cloud). This module inte
 ## Before you begin
 
 - You need to know what your server's UTC time offset (in minutes) is.
-    - Running `0 - (new Date()).getTimezoneOffset()` in javascript will give you the UTC time offset for your current timezone.
+    - Running `0 - (new Date()).getTimezoneOffset()` in javascript will give you the UTC time offset for your current
+      timezone.
 
 ## Connecting to a database
 
@@ -77,26 +80,34 @@ One of (if not the) most common interactions you'll need to use is fetching reco
 
 ```javascript
 let layout = database.getLayout("Your layout name")
-let range_request = layout.records.range()
-
-range_request.setOffset(50) // Starting from the 50th record...
-range_request.setLimit(100) // Fetch 100 records
+let query = layout.records.list({
+    portals: {
+        test: {limit: 10, offset: 1} // Include results from the 'test' portal
+    },
+    limit: 10, // Limit result set to 10 records...
+    offset: 30 // ...starting from the 30th record
+})
 
-let records = await range_request.fetch()
+let records = await query.fetch()
 console.log(records)
 ```
 
 ### Searching for records
+Searching for records uses the same syntax as above, but with additional steps to add your search parameters.
 
 ```javascript
 let layout = database.getLayout("Your layout name")
-let find_request = layout.records.find()
+let query = layout.records.list({
+    portals: {
+        test: {limit: 10, offset: 1} // Include results from the 'test' portal
+    },
+    limit: 10, // Limit result set to 10 records...
+    offset: 30 // ...starting from the 30th record
+})
 
-find_request.addRequests({"GroupID": "abc"}) // Find only the records with field GroupID set to 'abc'
-find_request.setOffset(30) // Starting from the 30th matching record
-find_request.setLimit(10) // Fetch only 10 records
+query.addRequest({"GroupID": "=abc"}) // Add a filter
 
-let records = await range_request.fetch()
+let records = await query.fetch()
 console.log(records)
 ```
 
@@ -152,7 +163,8 @@ When interacting with FileMaker, it is important to remember how FileMaker field
 
 > Please read this section carefully if you are working with portals
 
-It is important to note that a portal's name **is not** the same as the name of the table that it links to. The name of a
+It is important to note that a portal's name **is not** the same as the name of the table that it links to. The name of
+a
 portal matches the object name it was assigned in FileMaker's layout editor.
 
 > **NOTE**: When no name has been manually assigned to it, it will default to the name of the related table.

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.2.8",
+  "version": "4.0.1",
   "dependencies": {
-    "@types/btoa": "^1.2.3",
-    "@types/events": "^3.0.0",
-    "follow-redirects": "^1.15.3",
-    "moment": "^2.29.4",
-    "node-fetch": "3.3.2"
+    "follow-redirects": "^1.15.5",
+    "moment": "^2.29.4"
   },
   "type": "module",
   "main": "src/index.js",
@@ -36,9 +33,15 @@
     "url": "https://github.com/JD-Data-Limited/easy-fm/issues"
   },
   "devDependencies": {
-    "typescript": "^5.2.2",
+    "@types/btoa": "^1.2.3",
+    "@types/events": "^3.0.0",
+    "@types/follow-redirects": "^1.14.4",
+    "dotenv": "^16.3.1",
+    "typescript": "^5.3.3",
     "webpack": "^5.81.0",
-    "webpack-cli": "^5.0.2",
-    "dotenv": "^16.3.1"
+    "webpack-cli": "^5.0.2"
+  },
+  "engines": {
+    "node": ">=20.9.0"
   }
 }

package/src/FMError.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 // @ts-ignore
 export const errs = [
@@ -1021,7 +1021,7 @@ export class FMError extends Error {
     constructor(code, httpStatus, res, trace) {
         if (typeof code === "string")
             code = parseInt(code);
-        super(errs.find(err => err.e === code).d || "Unknown error");
+        super(errs.find(err => err.e === code)?.d || "Unknown error");
         this.httpStatus = httpStatus;
         this.res = res;
         this.messages = res.messages;

package/src/FMError.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
 // @ts-ignore
@@ -1023,7 +1023,7 @@ export class FMError extends Error {
 
     constructor(code: string | number, httpStatus: number, res: any, trace?: Error) {
         if (typeof code === "string") code = parseInt(code)
-        super(errs.find(err => err.e === code).d || "Unknown error");
+        super(errs.find(err => err.e === code)?.d || "Unknown error");
         this.httpStatus = httpStatus
         this.res = res
         this.messages = res.messages

package/src/connection/FMHost.d.ts

@@ -1,6 +1,7 @@
 import { Database } from "./database.js";
 import { HostBase } from "./HostBase.js";
-import { databaseOptionsWithExternalSources, DatabaseStructure, FMHostMetadata, loginOptionsClaris, loginOptionsFileMaker, loginOptionsOAuth } from "../types.js";
+import { databaseOptionsWithExternalSources, FMHostMetadata, loginOptionsClaris, loginOptionsFileMaker, loginOptionsOAuth } from "../types.js";
+import { DatabaseStructure } from "../databaseStructure.js";
 export default class FMHost implements HostBase {
     readonly hostname: string;
     readonly timezoneOffset: number;

package/src/connection/FMHost.js

@@ -1,8 +1,7 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 import { generateAuthorizationHeaders } from "./generateAuthorizationHeaders.js";
-import fetch from "node-fetch";
 import { FMError } from "../FMError.js";
 import { Database } from "./database.js";
 export default class FMHost {

package/src/connection/FMHost.ts

@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
 import {generateAuthorizationHeaders} from "./generateAuthorizationHeaders.js";
-import fetch from "node-fetch";
 import {FMError} from "../FMError.js";
 import {Database} from "./database.js";
 import {HostBase} from "./HostBase.js"
 import {
-    databaseOptionsWithExternalSources, DatabaseStructure,
+    databaseOptionsWithExternalSources,
     FMHostMetadata,
     loginOptionsClaris,
     loginOptionsFileMaker,
     loginOptionsOAuth
 } from "../types.js";
-import {ApiResults} from "../models/apiResults";
+import {ApiResults} from "../models/apiResults.js";
+import {DatabaseStructure} from "../databaseStructure.js";
 
 export default class FMHost implements HostBase {
     readonly hostname: string

package/src/connection/HostBase.d.ts

@@ -1,4 +1,4 @@
-import { FMHostMetadata } from "../types";
+import { FMHostMetadata } from "../types.js";
 export interface HostBase {
     readonly hostname: string;
     readonly timezoneOffset: number;

package/src/connection/HostBase.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/HostBase.ts

@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2023. See LICENSE file for more information
+ * Copyright (c) 2023-2024. See LICENSE file for more information
  */
 
-import {
-    FMHostMetadata
-} from "../types";
+import {FMHostMetadata} from "../types.js";
 
 export interface HostBase {
     readonly hostname: string

package/src/connection/database.d.ts

@@ -1,13 +1,14 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from "events";
-import { Request } from "node-fetch";
 import { LayoutInterface } from "../layouts/layoutInterface.js";
 import { Layout } from "../layouts/layout.js";
-import HTTP_REDIRECT from "follow-redirects";
-import { databaseOptionsWithExternalSources, DatabaseStructure, Script } from "../types.js";
+import { databaseOptionsWithExternalSources, Script } from "../types.js";
 import { HostBase } from "./HostBase.js";
-import { DatabaseBase } from "./databaseBase";
-import { ApiResults } from "../models/apiResults";
+import { DatabaseBase } from "./databaseBase.js";
+import { ApiResults } from "../models/apiResults.js";
+import { DatabaseStructure } from "../databaseStructure.js";
+import { IncomingMessage } from "http";
 export declare class Database<T extends DatabaseStructure> extends EventEmitter implements DatabaseBase {
     private _token;
     readonly host: HostBase;
@@ -22,10 +23,9 @@ export declare class Database<T extends DatabaseStructure> extends EventEmitter
     get endpoint(): string;
     apiRequest<T = any>(url: string | Request, options?: any, autoRelogin?: boolean): Promise<ApiResults<T>>;
     listLayouts(): Promise<Layout<LayoutInterface>[]>;
-    getLayout<R extends string>(name: R): Layout<T["layouts"][R]>;
+    getLayout<R extends keyof T["layouts"]>(name: R): Layout<T["layouts"][R]>;
     getLayout<R extends LayoutInterface>(name: string): Layout<R>;
-    setGlobals(globalFields: any): Promise<void>;
-    script(name: any, parameter?: string): Script;
+    script(name: string, parameter?: string): Script;
     _tokenExpired(): void;
-    streamURL(url: string): Promise<HTTP_REDIRECT.http.IncomingMessage>;
+    streamURL(url: string): Promise<IncomingMessage>;
 }

package/src/connection/database.js

@@ -1,12 +1,11 @@
 /*
- * 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 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;
@@ -57,9 +56,9 @@ export class Database extends EventEmitter {
         }
         else {
             console.time();
-            let res = await fetch(`${this.endpoint}/sessions`, {
-                hostname: this.host.hostname,
-                port: 443,
+            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({
@@ -124,16 +123,6 @@ export class Database extends EventEmitter {
     getLayout(name) {
         return new Layout(this, name);
     }
-    /*
-    @deprecated
-     */
-    async setGlobals(globalFields) {
-        // console.log({globalFields})
-        await this.apiRequest(`${this.endpoint}/globals`, {
-            method: "PATCH",
-            body: JSON.stringify({ globalFields })
-        });
-    }
     script(name, parameter = "") {
         return { name, parameter };
     }
@@ -166,7 +155,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,
+    databaseOptionsWithExternalSources,
     loginOptionsFileMaker,
     loginOptionsToken,
     Script
 } from "../types.js";
 import {HostBase} from "./HostBase.js"
-import {DatabaseBase} from "./databaseBase";
-import {ApiLayout, ApiResults} from "../models/apiResults";
+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
 
@@ -77,9 +78,9 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         }
         else {
             console.time()
-            let res = await fetch(`${this.endpoint}/sessions`, {
-                hostname: this.host.hostname,
-                port: 443,
+            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({
@@ -148,24 +149,13 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         return req.response.layouts.filter(i => !i.isFolder).map(layout => new Layout(this, layout.name))
     }
 
-    getLayout<R extends string>(name: R): Layout<T["layouts"][R]>
+    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)
     }
 
-    /*
-    @deprecated
-     */
-    async setGlobals(globalFields) {
-        // console.log({globalFields})
-        await this.apiRequest(`${this.endpoint}/globals`, {
-            method: "PATCH",
-            body: JSON.stringify({globalFields})
-        })
-    }
-
-    script(name, parameter = ""): Script {
+    script(name: string, parameter = ""): Script {
         return ({name, parameter} as Script)
     }
 
@@ -173,13 +163,13 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         this.emit("token_expired")
     }
 
-    streamURL(url: string): Promise<HTTP_REDIRECT.http.IncomingMessage> {
+    streamURL(url: string): Promise<IncomingMessage> {
         return new Promise((resolve, reject) => {
             if (!url || typeof url !== "string") {
                 throw new Error("URL is empty, or has invalid value")
             }
 
-            let headers = {}
+            let headers: {[key: string]: string} = {}
             if (Object.keys(this.cookies).length !== 0) {
                 headers["Cookie"] = Object.keys(this.cookies)
                     .map(key => {
@@ -188,7 +178,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                     .join("; ")
             }
 
-            const check_for_cookies = (res) => {
+            const check_for_cookies = (res: HTTP_REDIRECT.ResponseDetails) => {
                 // Check for the 'set-cookie' header. If it exists, remember it and strip it for better security.
                 if (res.headers['set-cookie']) {
                     for (let cookie of res.headers['set-cookie']) {
@@ -202,7 +192,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,11 +1,11 @@
+/// <reference types="node" resolution-mode="require"/>
 import { HostBase } from "./HostBase.js";
-import { Request } from "node-fetch";
-import { ApiResults } from "../models/apiResults";
-import HTTP_REDIRECT from "follow-redirects";
+import { ApiResults } from "../models/apiResults.js";
+import { IncomingMessage } from "http";
 export interface DatabaseBase {
     host: HostBase;
     readonly name: string;
     endpoint: string;
     apiRequest<T = unknown>(url: string | Request, options?: any, autoRelogin?: boolean): Promise<ApiResults<T>>;
-    streamURL(url: string): Promise<HTTP_REDIRECT.http.IncomingMessage>;
+    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,12 +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";
-import HTTP_REDIRECT  from "follow-redirects"
+import {ApiResults} from "../models/apiResults.js";
+import {IncomingMessage} from "http";
 
 export interface DatabaseBase {
     host: HostBase,
@@ -16,5 +14,5 @@ export interface DatabaseBase {
     // layouts: DatabaseStructure["layouts"]
 
     apiRequest<T = unknown>(url: string | Request, options?: any, autoRelogin?: boolean): Promise<ApiResults<T>>
-    streamURL(url: string): Promise<HTTP_REDIRECT.http.IncomingMessage>
+    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
 }

package/src/layouts/layout.d.ts

@@ -1,30 +1,16 @@
 import { LayoutRecordManager } from "./layoutRecordManager.js";
-import { LayoutRecord } from "../records/layoutRecord.js";
 import { Script, ScriptResult } from "../types.js";
 import { LayoutInterface } from "./layoutInterface.js";
-import { Find } from "../records/getOperations/find.js";
 import { LayoutBase } from "./layoutBase.js";
-import { DatabaseBase } from "../connection/databaseBase";
-import { ApiLayoutMetadata } from "../models/apiResults";
+import { DatabaseBase } from "../connection/databaseBase.js";
+import { ApiLayoutMetadata } from "../models/apiResults.js";
 export declare class Layout<T extends LayoutInterface> implements LayoutBase {
     readonly database: DatabaseBase;
-    readonly records: LayoutRecordManager<T>;
     readonly name: string;
+    readonly records: LayoutRecordManager<T>;
     metadata: ApiLayoutMetadata;
     constructor(database: DatabaseBase, name: string);
     get endpoint(): string;
-    /**
-     * @deprecated use layout.records.create() instead
-     */
-    createRecord(): Promise<LayoutRecord<T["fields"], T["portals"]>>;
-    /**
-     * @deprecated use layout.records.get() instead
-     */
-    getRecord(recordId: any): Promise<LayoutRecord<T["fields"], T["portals"]>>;
-    /**
-     * @deprecated use layout.records.find() instead
-     */
-    newFind(): Find<T>;
     runScript(script: Script): Promise<ScriptResult>;
     getLayoutMeta(): Promise<ApiLayoutMetadata>;
 }