@jd-data-limited/easy-fm 4.1.1 → 4.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "dependencies": {
     "@types/follow-redirects": "^1.14.4",
     "follow-redirects": "^1.15.5",

package/src/bin/generateTypes.js

@@ -1,53 +1,10 @@
-"use strict";
 /*
  * Copyright (c) 2024. See LICENSE file for more information
  */
-var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypesCLI = void 0;
-var apiResults_js_1 = require("../models/apiResults.js");
-var inquirer_1 = require("inquirer");
-var FMHost_js_1 = require("../connection/FMHost.js");
-var fs = require("fs");
+import { ApiFieldResultTypes } from "../models/apiResults.js";
+import inquirer from 'inquirer';
+import FMHost from "../connection/FMHost.js";
+import * as fs from "fs";
 function sub(str) {
     return str
         .replace(/[^a-zA-Z0-9_]/g, "") // Remove non-alphanumeric characters
@@ -55,42 +12,38 @@ function sub(str) {
 }
 function generateFieldType(field) {
     switch (field.result) {
-        case apiResults_js_1.ApiFieldResultTypes.TEXT:
+        case ApiFieldResultTypes.TEXT:
             return "Field<string>";
-        case apiResults_js_1.ApiFieldResultTypes.CONTAINER:
+        case ApiFieldResultTypes.CONTAINER:
             return "Field<Container>";
-        case apiResults_js_1.ApiFieldResultTypes.DATE:
+        case ApiFieldResultTypes.DATE:
             return "Field<Date>";
-        case apiResults_js_1.ApiFieldResultTypes.NUMBER:
+        case ApiFieldResultTypes.NUMBER:
             return "Field<number>";
-        case apiResults_js_1.ApiFieldResultTypes.TIME:
+        case ApiFieldResultTypes.TIME:
             return "Field<Date>";
-        case apiResults_js_1.ApiFieldResultTypes.TIMESTAMP:
+        case ApiFieldResultTypes.TIMESTAMP:
             return "Field<Date>";
     }
 }
 function processFieldsChunk(fields) {
-    var existing_fields = [];
-    fields = fields.filter(function (field) {
+    let existing_fields = [];
+    fields = fields.filter(field => {
         if (existing_fields.includes(field.name))
             return false;
         existing_fields.push(field.name);
         return true;
     });
-    return fields.map(function (field) {
+    return fields.map(field => {
         return JSON.stringify(field.name) + ": " + generateFieldType(field);
     });
 }
 function camelToSnakeCase(str) {
     return str.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase();
 }
-function safeStringInjection(str) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
+function safeStringInjection(str, ...args) {
+    let result = "";
+    for (let i = 0; i < str.length; i++) {
         result += str[i];
         if (i < args.length) {
             result += JSON.stringify(args[i].toString());
@@ -98,158 +51,111 @@ function safeStringInjection(str) {
     }
     return result;
 }
-function generateTypesCLI() {
-    return __awaiter(this, void 0, void 0, function () {
-        var data, HOST, DATABASE, stream, layouts, layoutInterfaces, _loop_1, _i, layouts_1, layout, layoutInterfaceLinks, _a, layoutInterfaces_1, layout, _b, layoutInterfaces_2, layout;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    process.stdout.write('\x1Bc');
-                    console.log("For this tool to work, you are required to have access to an account on the target database.\n" +
-                        "This account must have the fmrest extended privilege enabled.\n" +
-                        "This tool can only export type interfaces for layouts that the given account has access to.");
-                    console.log("\n");
-                    return [4 /*yield*/, inquirer_1.default.prompt([
-                            {
-                                type: "input",
-                                name: "hostname",
-                                message: "The IP address/domain of your FileMaker server (must start with either http:// or https://)",
-                                validate: function (input) {
-                                    return input.startsWith("http://") || input.startsWith("https://") || "Please enter a valid IP address/domain starting with http:// or https://";
-                                }
-                            },
-                            {
-                                type: "number",
-                                name: "timezoneOffset",
-                                message: "Server timezone offset (minutes)",
-                                default: 0 - (new Date()).getTimezoneOffset()
-                            },
-                            {
-                                type: "confirm",
-                                name: "verify",
-                                default: true,
-                                message: "Verify your server's identity",
-                                when: function (previousAnswers) {
-                                    return previousAnswers.hostname.startsWith("https://");
-                                }
-                            },
-                            {
-                                type: "input",
-                                name: "database",
-                                message: "Database filename"
-                            },
-                            {
-                                type: "input",
-                                name: "username",
-                                message: "Database username"
-                            },
-                            {
-                                type: "password",
-                                name: "password",
-                                message: "Database password",
-                                mask: "*"
-                            }
-                        ])];
-                case 1:
-                    data = _c.sent();
-                    HOST = new FMHost_js_1.default(data.hostname, data.timezoneOffset, data.verify);
-                    DATABASE = HOST.database({
-                        database: data.database,
-                        credentials: {
-                            method: "filemaker",
-                            username: data.username,
-                            password: data.password
-                        },
-                        externalSources: []
-                    });
-                    return [4 /*yield*/, DATABASE.login()
-                        // Create file write stream
-                    ];
-                case 2:
-                    _c.sent();
-                    stream = fs.createWriteStream("./types.ts");
-                    return [4 /*yield*/, DATABASE.listLayouts()];
-                case 3:
-                    layouts = _c.sent();
-                    stream.write("import FMHost, {Container, FieldBase, LayoutInterface, Portal} from \"@jd-data-limited/easy-fm\";\n");
-                    stream.write("// " + layouts.length + " layouts found\n\n");
-                    layoutInterfaces = new Map();
-                    _loop_1 = function (layout) {
-                        var substituteName, metadata, fields, portals, portalsProcessed, interfaceName;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    substituteName = sub(layout.name);
-                                    if (!substituteName)
-                                        return [2 /*return*/, "continue"];
-                                    console.log(substituteName);
-                                    return [4 /*yield*/, layout.getLayoutMeta()];
-                                case 1:
-                                    metadata = _d.sent();
-                                    fields = processFieldsChunk(metadata.fieldMetaData);
-                                    portals = metadata.portalMetaData;
-                                    portalsProcessed = Object.keys(portals).map(function (portalName) {
-                                        return "".concat(JSON.stringify(portalName), ": Portal<{").concat(processFieldsChunk(portals[portalName]), "}>");
-                                    });
-                                    interfaceName = substituteName + "LayoutInterface";
-                                    layoutInterfaces.set(layout.name, {
-                                        interfaceName: interfaceName,
-                                        interface: "export interface ".concat(interfaceName, " extends LayoutInterface {\n            fields: {").concat(fields.join(",\n    "), "},\n            portals: {").concat(portalsProcessed.join(",\n   "), "}\n        }")
-                                    });
-                                    return [2 /*return*/];
-                            }
-                        });
-                    };
-                    _i = 0, layouts_1 = layouts;
-                    _c.label = 4;
-                case 4:
-                    if (!(_i < layouts_1.length)) return [3 /*break*/, 7];
-                    layout = layouts_1[_i];
-                    return [5 /*yield**/, _loop_1(layout)];
-                case 5:
-                    _c.sent();
-                    _c.label = 6;
-                case 6:
-                    _i++;
-                    return [3 /*break*/, 4];
-                case 7:
-                    layoutInterfaceLinks = [];
-                    for (_a = 0, layoutInterfaces_1 = layoutInterfaces; _a < layoutInterfaces_1.length; _a++) {
-                        layout = layoutInterfaces_1[_a];
-                        layoutInterfaceLinks.push([
-                            "".concat(JSON.stringify(layout[0]), ": ").concat(layout[1].interfaceName),
-                            "".concat(sub(camelToSnakeCase(layout[0]).toUpperCase().replace(" ", "_")), ": HOST.getLayout<").concat(layout[1].interfaceName, ">(").concat(JSON.stringify(layout[0]), ")")
-                        ]);
-                    }
-                    stream.write(safeStringInjection(templateObject_1 || (templateObject_1 = __makeTemplateObject(["const HOST = new FMHost(", ", ", ", ", ");"], ["const HOST = new FMHost(", ", ", ", ", ");"])), data.hostname, data.timezoneOffset, data.verify));
-                    stream.write("HOST.database<{layouts:{".concat(layoutInterfaceLinks.map(function (i) { return i[0]; }).join(","), "}}>();"));
-                    stream.write("\n\n");
-                    stream.write("const LAYOUTS = {".concat(layoutInterfaceLinks.map(function (i) { return i[1]; }).join(","), "};"));
-                    for (_b = 0, layoutInterfaces_2 = layoutInterfaces; _b < layoutInterfaces_2.length; _b++) {
-                        layout = layoutInterfaces_2[_b];
-                        stream.write("\n\n");
-                        stream.write(layout[1].interface + ";");
-                    }
-                    // StructureKind
-                    //
-                    // const project = new Project({
-                    //     tsConfigFilePath: "../tsconfig.json"
-                    // })
-                    // project.resolveSourceFileDependencies()
-                    return [4 /*yield*/, DATABASE.logout()];
-                case 8:
-                    // StructureKind
-                    //
-                    // const project = new Project({
-                    //     tsConfigFilePath: "../tsconfig.json"
-                    // })
-                    // project.resolveSourceFileDependencies()
-                    _c.sent();
-                    console.log("DONE! Wrote database types to ./types.ts");
-                    return [2 /*return*/];
+export async function generateTypesCLI() {
+    process.stdout.write('\x1Bc');
+    console.log("For this tool to work, you are required to have access to an account on the target database.\n" +
+        "This account must have the fmrest extended privilege enabled.\n" +
+        "This tool can only export type interfaces for layouts that the given account has access to.");
+    console.log("\n");
+    const data = await inquirer.prompt([
+        {
+            type: "input",
+            name: "hostname",
+            message: "The IP address/domain of your FileMaker server (must start with either http:// or https://)",
+            validate(input) {
+                return input.startsWith("http://") || input.startsWith("https://") || "Please enter a valid IP address/domain starting with http:// or https://";
             }
-        });
+        },
+        {
+            type: "number",
+            name: "timezoneOffset",
+            message: "Server timezone offset (minutes)",
+            default: 0 - (new Date()).getTimezoneOffset()
+        },
+        {
+            type: "confirm",
+            name: "verify",
+            default: true,
+            message: "Verify your server's identity",
+            when(previousAnswers) {
+                return previousAnswers.hostname.startsWith("https://");
+            }
+        },
+        {
+            type: "input",
+            name: "database",
+            message: "Database filename"
+        },
+        {
+            type: "input",
+            name: "username",
+            message: "Database username"
+        },
+        {
+            type: "password",
+            name: "password",
+            message: "Database password",
+            mask: "*"
+        }
+    ]);
+    const HOST = new FMHost(data.hostname, data.timezoneOffset, data.verify);
+    const DATABASE = HOST.database({
+        database: data.database,
+        credentials: {
+            method: "filemaker",
+            username: data.username,
+            password: data.password
+        },
+        externalSources: []
     });
+    await DATABASE.login();
+    // Create file write stream
+    const stream = fs.createWriteStream("./types.ts");
+    let layouts = await DATABASE.listLayouts();
+    stream.write(`import FMHost, {Container, FieldBase, LayoutInterface, Portal} from "@jd-data-limited/easy-fm";\n`);
+    stream.write("// " + layouts.length + " layouts found\n\n");
+    let layoutInterfaces = new Map();
+    for (let layout of layouts) {
+        let substituteName = sub(layout.name);
+        if (!substituteName)
+            continue;
+        console.log(substituteName);
+        let metadata = await layout.getLayoutMeta();
+        let fields = processFieldsChunk(metadata.fieldMetaData);
+        let portals = metadata.portalMetaData;
+        let portalsProcessed = Object.keys(portals).map(portalName => {
+            return `${JSON.stringify(portalName)}: Portal<{${processFieldsChunk(portals[portalName])}}>`;
+        });
+        let interfaceName = substituteName + "LayoutInterface";
+        layoutInterfaces.set(layout.name, {
+            interfaceName,
+            interface: `export interface ${interfaceName} extends LayoutInterface {
+            fields: {${fields.join(",\n    ")}},
+            portals: {${portalsProcessed.join(",\n   ")}}
+        }`
+        });
+    }
+    let layoutInterfaceLinks = [];
+    for (let layout of layoutInterfaces) {
+        layoutInterfaceLinks.push([
+            `${JSON.stringify(layout[0])}: ${layout[1].interfaceName}`,
+            `${sub(camelToSnakeCase(layout[0]).toUpperCase().replace(" ", "_"))}: HOST.getLayout<${layout[1].interfaceName}>(${JSON.stringify(layout[0])})`
+        ]);
+    }
+    stream.write(safeStringInjection `const HOST = new FMHost(${data.hostname}, ${data.timezoneOffset}, ${data.verify});`);
+    stream.write(`HOST.database<{layouts:{${layoutInterfaceLinks.map(i => i[0]).join(",")}}}>();`);
+    stream.write("\n\n");
+    stream.write(`const LAYOUTS = {${layoutInterfaceLinks.map(i => i[1]).join(",")}};`);
+    for (let layout of layoutInterfaces) {
+        stream.write("\n\n");
+        stream.write(layout[1].interface + ";");
+    }
+    // StructureKind
+    //
+    // const project = new Project({
+    //     tsConfigFilePath: "../tsconfig.json"
+    // })
+    // project.resolveSourceFileDependencies()
+    await DATABASE.logout();
+    console.log("DONE! Wrote database types to ./types.ts");
 }
-exports.generateTypesCLI = generateTypesCLI;
-var templateObject_1;

package/src/connection/database.d.ts

@@ -7,7 +7,7 @@ import { type HostBase } from './HostBase.js';
 import { type DatabaseBase } from './databaseBase.js';
 import { type ApiResults } from '../models/apiResults.js';
 import { type DatabaseStructure } from '../databaseStructure.js';
-import { RequestInfo, RequestInit, Response } from 'node-fetch';
+import { type RequestInfo, type RequestInit, type Response } from 'node-fetch';
 /**
  * Represents a database connection.
  * @template T - The structure of the database.

package/src/connection/database.js

@@ -6,8 +6,8 @@ import { generateAuthorizationHeaders } from './generateAuthorizationHeaders.js'
 import { FMError } from '../FMError.js';
 import { Layout } from '../layouts/layout.js';
 import fetch from 'node-fetch';
-// @ts-ignore
-import fetchWithCookies, { CookieJar } from "node-fetch-cookies";
+// @ts-expect-error
+import fetchWithCookies, { CookieJar } from 'node-fetch-cookies';
 /**
  * Represents a database connection.
  * @template T - The structure of the database.
@@ -57,7 +57,6 @@ export class Database extends EventEmitter {
             }
         });
         await _fetch.json();
-        // console.log(data)
         this._token = '';
     }
     /**
@@ -71,8 +70,6 @@ export class Database extends EventEmitter {
     async login(forceLogin = false) {
         if (this.token !== '' && !forceLogin)
             return;
-        console.log("RELOGGING IN");
-        console.trace();
         // Reset cookies
         this.cookies = new CookieJar();
         await this.host.getMetadata();
@@ -81,7 +78,6 @@ export class Database extends EventEmitter {
             return this.token;
         }
         else {
-            console.time();
             const url = new URL(`${this.endpoint}/sessions`);
             url.hostname = this.host.hostname;
             const res = await fetch(url, {
@@ -94,7 +90,6 @@ export class Database extends EventEmitter {
                     })
                 })
             });
-            console.time();
             const _res = (await res.json());
             if (res.status === 200) {
                 this._token = res.headers.get('x-fm-data-access-token') ?? '';
@@ -128,9 +123,9 @@ export class Database extends EventEmitter {
         // options.headers.cookies = this._generateCookieHeader()
         // console.log(options.headers.cookies)
         // options.rejectUnauthorized = this.host.verify
-        const _fetch = options.useCookieJar ?
-            await fetchWithCookies(this.cookies, url, options) :
-            await fetch(url, options);
+        const _fetch = options.useCookieJar
+            ? await fetchWithCookies(this.cookies, url, options)
+            : await fetch(url, options);
         // if (_fetch.headers.get('set-cookie')) {
         //     console.log(_fetch.headers.get('set-cookie'))
         //     for (const cookie of (_fetch.headers.get("Set-Cookie") ?? "").split("; ")) {
@@ -151,11 +146,11 @@ export class Database extends EventEmitter {
             return _fetch;
     }
     _generateCookieHeader() {
-        let out = [];
-        for (let key of Object.keys(this.cookies)) {
+        const out = [];
+        for (const key of Object.keys(this.cookies)) {
             out.push(`${key}=${this.cookies[key]}`);
         }
-        return out.join("; ");
+        return out.join('; ');
     }
     async _apiRequestJSON(url, options = {}) {
         if (!options.headers)

package/src/connection/database.ts

@@ -12,9 +12,9 @@ import {type HostBase} from './HostBase.js'
 import {type DatabaseBase} from './databaseBase.js'
 import {type ApiLayout, type ApiResults} from '../models/apiResults.js'
 import {type DatabaseStructure} from '../databaseStructure.js'
-import fetch, {HeadersInit, RequestInfo, RequestInit, Response} from 'node-fetch';
-// @ts-ignore
-import fetchWithCookies, {CookieJar} from "node-fetch-cookies"
+import fetch, {type HeadersInit, type RequestInfo, type RequestInit, type Response} from 'node-fetch'
+// @ts-expect-error
+import fetchWithCookies, {CookieJar} from 'node-fetch-cookies'
 
 /**
  * Represents a database connection.
@@ -28,7 +28,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
     readonly name: string
     readonly debug: boolean
 
-    constructor(host: HostBase, conn: databaseOptionsWithExternalSources) {
+    constructor (host: HostBase, conn: databaseOptionsWithExternalSources) {
         super()
         this.host = host
         this.name = conn.database
@@ -37,7 +37,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
     }
 
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    private generateExternalSourceLogin(data: databaseOptionsBase) {
+    private generateExternalSourceLogin (data: databaseOptionsBase) {
         if (data.credentials.method === 'filemaker') {
             const _data = data.credentials
             return {
@@ -45,8 +45,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                 username: _data.username,
                 password: _data.password
             }
-        }
-        else {
+        } else {
             throw new Error('Not yet supported login method')
         }
     }
@@ -58,7 +57,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
      * @returns {Promise<void>} A promise that resolves with no value once the logout is successful.
      * @throws {Error} Throws an error if the user is not logged in.
      */
-    async logout(): Promise<void> {
+    async logout (): Promise<void> {
         if (this.token === '') throw new Error('Not logged in')
 
         const _fetch = await fetch(`${this.endpoint}/sessions/${this.token}`, {
@@ -68,7 +67,6 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
             }
         })
         await _fetch.json()
-        // console.log(data)
         this._token = ''
     }
 
@@ -80,11 +78,9 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
      * @throws {FMError} - Throws an FMError if login fails.
      * @return {Promise<string>} - Returns a promise that resolves to the access token upon successful login.
      */
-    async login(forceLogin = false) {
+    async login (forceLogin = false) {
         if (this.token !== '' && !forceLogin) return
 
-        console.log("RELOGGING IN")
-        console.trace()
         // Reset cookies
         this.cookies = new CookieJar()
 
@@ -93,9 +89,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         if (this.connection_details.credentials.method === 'token') {
             this._token = (this.connection_details.credentials).token
             return this.token
-        }
-        else {
-            console.time()
+        } else {
             const url = new URL(`${this.endpoint}/sessions`)
             url.hostname = this.host.hostname
             const res = await fetch(url, {
@@ -108,13 +102,11 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
                     })
                 })
             })
-            console.time()
             const _res = (await res.json()) as any
             if (res.status === 200) {
                 this._token = res.headers.get('x-fm-data-access-token') ?? ''
                 return this._token
-            }
-            else {
+            } else {
                 throw new FMError(
                     _res.messages[0].code as string | number,
                     _res.status as number,
@@ -124,7 +116,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         }
     }
 
-    get token() {
+    get token () {
         return this._token
     }
 
@@ -133,13 +125,13 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
      *
      * @returns {string} The endpoint URL.
      */
-    get endpoint(): string {
+    get endpoint (): string {
         return `${this.host.hostname}/fmi/data/v2/databases/${this.name}`
     }
 
-    async _apiRequestRaw(url: URL | RequestInfo, options: RequestInit & {
-        headers?: Record<string, string>,
-        useCookieJar?: boolean,
+    async _apiRequestRaw (url: URL | RequestInfo, options: RequestInit & {
+        headers?: Record<string, string>
+        useCookieJar?: boolean
     } = {}, autoRelogin = true): Promise<Response> {
         if (this.debug) console.log(`EASYFM DEBUG: ${JSON.stringify(options)} ${url instanceof Request ? url.url : url}`)
         if (this.token === '') await this.login(true)
@@ -152,9 +144,9 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
         // options.rejectUnauthorized = this.host.verify
 
         const _fetch: Response =
-            options.useCookieJar ?
-                await fetchWithCookies(this.cookies, url, options):
-                await fetch(url, options)
+            options.useCookieJar
+                ? await fetchWithCookies(this.cookies, url, options)
+                : await fetch(url, options)
         // if (_fetch.headers.get('set-cookie')) {
         //     console.log(_fetch.headers.get('set-cookie'))
         //     for (const cookie of (_fetch.headers.get("Set-Cookie") ?? "").split("; ")) {
@@ -170,16 +162,15 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
             console.trace()
             await this.login(true)
             return await this._apiRequestRaw(url, options, false)
-        }
-        else return _fetch
+        } else return _fetch
     }
 
-    private _generateCookieHeader() {
-        let out: string[] = []
-        for (let key of Object.keys(this.cookies)) {
+    private _generateCookieHeader () {
+        const out: string[] = []
+        for (const key of Object.keys(this.cookies)) {
             out.push(`${key}=${this.cookies[key]}`)
         }
-        return out.join("; ")
+        return out.join('; ')
     }
 
     async _apiRequestJSON<T = any>(url: URL | RequestInfo, options: RequestInit & {
@@ -208,7 +199,7 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
      * @returns {Promise<Layout[]>} A promise that resolves to an array of Layout objects.
      * @throws {FMError} If there was an error retrieving the layouts.
      */
-    async listLayouts() {
+    async listLayouts () {
         const req = await this._apiRequestJSON<{ layouts: ApiLayout[] }>(`${this.endpoint}/layouts?page=2`)
         if (!req.response) throw new FMError(req.messages[0].code, req.httpStatus, req.messages[0].message)
 
@@ -225,11 +216,11 @@ export class Database<T extends DatabaseStructure> extends EventEmitter implemen
 
     layout<R extends keyof T['layouts']>(name: R): Layout<T['layouts'][R]>
     layout<R extends LayoutInterface>(name: string): Layout<R>
-    layout(name: string): Layout<any> {
+    layout (name: string): Layout<any> {
         return new Layout<LayoutInterface>(this, name)
     }
 
-    script(name: string, parameter = ''): Script {
+    script (name: string, parameter = ''): Script {
         return ({name, parameter} satisfies Script)
     }
 }

package/src/connection/databaseBase.d.ts

@@ -1,6 +1,6 @@
 import { type HostBase } from './HostBase.js';
 import { type ApiResults } from '../models/apiResults.js';
-import { RequestInfo, RequestInit, Response } from "node-fetch";
+import { type RequestInfo, type RequestInit, type Response } from 'node-fetch';
 export interface DatabaseBase {
     host: HostBase;
     readonly name: string;

package/src/connection/databaseBase.ts

@@ -4,7 +4,7 @@
 
 import {type HostBase} from './HostBase.js'
 import {type ApiResults} from '../models/apiResults.js'
-import {RequestInfo, RequestInit, Response} from "node-fetch";
+import {type RequestInfo, type RequestInit, type Response} from 'node-fetch'
 
 export interface DatabaseBase {
     host: HostBase

package/src/records/field.js

@@ -41,7 +41,7 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 };
 import { RecordTypes } from '../types.js';
 import { ApiFieldDisplayTypes, ApiFieldResultTypes, ApiFieldTypes } from '../models/apiResults.js';
-import { FMError } from "../FMError.js";
+import { FMError } from '../FMError.js';
 /**
  * A class representing a field in a record.
  *
@@ -58,7 +58,7 @@ let Field = (() => {
             _private_streamAsync_decorators = [containerDownloadFunction];
             _arrayBuffer_decorators = [containerDownloadFunction];
             __esDecorate(this, _private_streamAsync_descriptor = { value: __setFunctionName(async function () {
-                    let req = await this.parent.layout.database._apiRequestRaw(this.string, { useCookieJar: true });
+                    const req = await this.parent.layout.database._apiRequestRaw(this.string, { useCookieJar: true });
                     if (!req.ok || !req.body) {
                         throw new Error(`HTTP Error: ${req.status} (${req.statusText})`);
                     }
@@ -178,7 +178,6 @@ let Field = (() => {
             }
             const form = new FormData();
             form.append('upload', file);
-            console.log(`ENDPOINT: ${this.parent.endpoint}/containers/${this.id}/1`);
             const res = await this.parent.layout.database._apiRequestRaw(`${this.parent.endpoint}/containers/${this.id}/1`, {
                 method: 'POST',
                 headers: {
@@ -188,27 +187,23 @@ let Field = (() => {
                 body: form
             });
             if (!res.ok) {
-                console.log("RESULT:", await res.text());
                 throw new Error(`Upload failed with HTTP error: ${res.status} (${res.statusText})`);
             }
             const data = await res.json();
-            if (data.messages[0].code === "0")
+            if (data.messages[0].code === '0')
                 return;
             else {
-                console.log(data);
                 throw new FMError(data.messages[0].code, res.status, res);
             }
         }
         get #streamAsync() { return _private_streamAsync_descriptor.value; }
-        stream() {
-            return this.#streamAsync();
+        async stream() {
+            return await this.#streamAsync();
         }
         async arrayBuffer() {
-            console.log(this.string);
             const req = await this.parent.layout.database._apiRequestRaw(this.string, { useCookieJar: true });
             if (!req.ok)
                 throw new Error(`HTTP Error: ${req.status} (${req.statusText})`);
-            console.log(req);
             return await req.arrayBuffer();
         }
     };
@@ -216,16 +211,15 @@ let Field = (() => {
 export { Field };
 function containerDownloadFunction(originalMethod, context) {
     async function replacementMethod(...args) {
-        return ContainerDownloadExecutor.processTask(() => originalMethod.call(this, ...args));
+        return await ContainerDownloadExecutor.processTask(async () => await originalMethod.call(this, ...args));
     }
     return replacementMethod;
 }
 class ContainerDownloadExecutorClass {
     hasDownloadedFirstContainer = 0;
     waitingFuncs = [];
-    constructor() { }
     async processTask(task) {
-        let isFirstTask = this.hasDownloadedFirstContainer === 0;
+        const isFirstTask = this.hasDownloadedFirstContainer === 0;
         if (isFirstTask) {
             this.hasDownloadedFirstContainer = 1;
             let res;
@@ -234,7 +228,7 @@ class ContainerDownloadExecutorClass {
             }
             catch (e) {
                 this.hasDownloadedFirstContainer = 0;
-                let nextTask = this.waitingFuncs.splice(0, 1)[0];
+                const nextTask = this.waitingFuncs.splice(0, 1)[0];
                 if (nextTask) {
                     this.processTask(nextTask.func)
                         .then(res => nextTask.done(res))
@@ -243,7 +237,7 @@ class ContainerDownloadExecutorClass {
                 throw e;
             }
             this.hasDownloadedFirstContainer = 2;
-            for (let task of this.waitingFuncs) {
+            for (const task of this.waitingFuncs) {
                 task.func()
                     .then((res) => task.done(res))
                     .catch((e) => task.err(e));
@@ -251,7 +245,7 @@ class ContainerDownloadExecutorClass {
             return res;
         }
         else if (this.hasDownloadedFirstContainer === 1) {
-            return new Promise((resolve, reject) => {
+            return await new Promise((resolve, reject) => {
                 this.waitingFuncs.push({
                     func: task,
                     done: resolve,

package/src/records/field.ts

@@ -6,7 +6,7 @@ import {RecordTypes} from '../types.js'
 import {ApiFieldDisplayTypes, type ApiFieldMetadata, ApiFieldResultTypes, ApiFieldTypes} from '../models/apiResults.js'
 import {type LayoutBase} from '../layouts/layoutBase.js'
 import {type Moment} from 'moment'
-import {FMError} from "../FMError.js";
+import {FMError} from '../FMError.js'
 
 export type FieldValue = string | number | Moment | Container
 export type Container = null
@@ -31,7 +31,7 @@ export class Field<T extends FieldValue> {
 
     static firstContainerDownload: Promise<any> | null = null
 
-    constructor(record: Parentable, id: string, contents: T) {
+    constructor (record: Parentable, id: string, contents: T) {
         this.parent = record
         this.id = id
         this._value = contents
@@ -44,13 +44,13 @@ export class Field<T extends FieldValue> {
      * @param {T | null} content - The new content value to be set. Can be either the type T or null.
      * @throws {Error} Cannot set container value using set(). Use upload() instead, if the result is a 'container'.
      */
-    set(content: T | null) {
+    set (content: T | null) {
         if (this.metadata.result === 'container') throw new Error('Cannot set container value using set(). Use upload() instead.')
         else this._value = content
         this.edited = true
     }
 
-    get metadata(): ApiFieldMetadata {
+    get metadata (): ApiFieldMetadata {
         if (!this.parent.layout.metadata) {
             // Default to a regular text field
             return {
@@ -88,8 +88,7 @@ export class Field<T extends FieldValue> {
                     repetitions: 1,
                     valueList: ''
                 }
-        }
-        else {
+        } else {
             return this.parent.layout.metadata.fieldMetaData.find(i => i.name === this.id) ?? {
                 name: this.id.toString(),
                 type: ApiFieldTypes.NORMAL,
@@ -109,16 +108,16 @@ export class Field<T extends FieldValue> {
         }
     }
 
-    get value(): T | null {
+    get value (): T | null {
         // if (this.metadata.result === "container") throw "Use await field.stream() to get the contents of a container field, instead of field.value"
         return this._value
     }
 
-    set value(value: T) {
+    set value (value: T) {
         this._value = value
     }
 
-    get string(): string {
+    get string (): string {
         if (typeof this._value === 'string') {
             return this._value
         }
@@ -135,14 +134,13 @@ export class Field<T extends FieldValue> {
      *
      * @returns {Promise<void>} - A promise that resolves when the file is successfully uploaded.
      */
-    async upload(file: File): Promise<void> {
+    async upload (file: File): Promise<void> {
         if (this.metadata.result !== 'container') {
             throw new Error('Cannot upload a file to the field; ' + this.id + ' (not a container field)')
         }
         const form = new FormData()
         form.append('upload', file)
 
-        console.log(`ENDPOINT: ${this.parent.endpoint}/containers/${this.id}/1`)
         const res = await this.parent.layout.database._apiRequestRaw(`${this.parent.endpoint}/containers/${this.id}/1`, {
             method: 'POST',
             headers: {
@@ -152,43 +150,39 @@ export class Field<T extends FieldValue> {
             body: form
         })
         if (!res.ok) {
-            console.log("RESULT:", await res.text())
             throw new Error(`Upload failed with HTTP error: ${res.status} (${res.statusText})`)
         }
         const data: { messages: Array<{ code: string }> } = await res.json() as any
-        if (data.messages[0].code === "0") return
+        if (data.messages[0].code === '0') return
         else {
-            console.log(data)
             throw new FMError(data.messages[0].code, res.status, res)
         }
     }
 
     @containerDownloadFunction
-    async #streamAsync() {
-        let req = await this.parent.layout.database._apiRequestRaw(this.string, {useCookieJar: true})
+    async #streamAsync () {
+        const req = await this.parent.layout.database._apiRequestRaw(this.string, {useCookieJar: true})
         if (!req.ok || !req.body) {
             throw new Error(`HTTP Error: ${req.status} (${req.statusText})`)
         }
         return req.body
     }
 
-    stream() {
-        return this.#streamAsync()
+    async stream () {
+        return await this.#streamAsync()
     }
 
     @containerDownloadFunction
-    async arrayBuffer() {
-        console.log(this.string)
+    async arrayBuffer () {
         const req = await this.parent.layout.database._apiRequestRaw(this.string, {useCookieJar: true})
         if (!req.ok) throw new Error(`HTTP Error: ${req.status} (${req.statusText})`)
-        console.log(req)
         return await req.arrayBuffer()
     }
 }
 
-function containerDownloadFunction<T extends FieldValue, R = unknown>(originalMethod: (...p: any[]) => Promise<R>, context: ClassMethodDecoratorContext<Field<T>>) {
-    async function replacementMethod(this: Field<T>, ...args: any[]) {
-        return ContainerDownloadExecutor.processTask(() => originalMethod.call(this, ...args))
+function containerDownloadFunction<PROPS extends any[], T extends FieldValue, R = unknown> (originalMethod: (...p: PROPS) => Promise<R>, context: ClassMethodDecoratorContext<Field<T>>) {
+    async function replacementMethod (this: Field<T>, ...args: PROPS) {
+        return await ContainerDownloadExecutor.processTask(async () => await originalMethod.call(this, ...args))
     }
 
     return replacementMethod
@@ -196,24 +190,22 @@ function containerDownloadFunction<T extends FieldValue, R = unknown>(originalMe
 
 class ContainerDownloadExecutorClass {
     hasDownloadedFirstContainer: 0 | 1 | 2 = 0
-    waitingFuncs: {
-        func: (() => any),
-        done: ((...args: any[]) => any),
-        err: ((e: Error) => any)
-    }[] = []
-
-    constructor() {}
+    waitingFuncs: Array<{
+        func: (() => any)
+        done: ((...args: any[]) => any)
+        err: ((e: any) => any)
+    }> = []
 
     async processTask<T extends () => Promise<any>>(task: T) {
-        let isFirstTask = this.hasDownloadedFirstContainer === 0
+        const isFirstTask = this.hasDownloadedFirstContainer === 0
         if (isFirstTask) {
             this.hasDownloadedFirstContainer = 1
             let res
             try {
                 res = await task()
-            } catch(e) {
+            } catch (e) {
                 this.hasDownloadedFirstContainer = 0
-                let nextTask = this.waitingFuncs.splice(0, 1)[0]
+                const nextTask = this.waitingFuncs.splice(0, 1)[0]
                 if (nextTask) {
                     this.processTask(nextTask.func)
                         .then(res => nextTask.done(res))
@@ -222,24 +214,22 @@ class ContainerDownloadExecutorClass {
                 throw e
             }
             this.hasDownloadedFirstContainer = 2
-            for (let task of this.waitingFuncs) {
+            for (const task of this.waitingFuncs) {
                 task.func()
                     .then((res: any) => task.done(res))
                     .catch((e: any) => task.err(e))
             }
             return res
-        }
-        else if (this.hasDownloadedFirstContainer === 1) {
-            return new Promise((resolve, reject) => {
+        } else if (this.hasDownloadedFirstContainer === 1) {
+            return await new Promise((resolve, reject) => {
                 this.waitingFuncs.push({
                     func: task,
                     done: resolve,
                     err: reject
                 })
             })
-        }
-        else return await task()
+        } else return await task()
     }
 }
 
-const ContainerDownloadExecutor = new ContainerDownloadExecutorClass()
+const ContainerDownloadExecutor = new ContainerDownloadExecutorClass()

package/src/records/getOperations/recordGetOperation.js

@@ -135,7 +135,6 @@ export class RecordGetOperation {
                         ? this.layout.database.host.timeFormat
                         : this.layout.database.host.timeStampFormat);
             }).join('');
-            console.log(this.layout.database.host.timeStampFormat, out[key]);
         }
         return out;
     }

package/src/records/getOperations/recordGetOperation.ts

@@ -165,7 +165,6 @@ export class RecordGetOperation<T extends LayoutInterface, OPTIONS extends GetOp
                                 : this.layout.database.host.timeStampFormat
                     )
             }).join('')
-            console.log(this.layout.database.host.timeStampFormat, out[key])
         }
         return out
     }

package/src/records/layoutRecord.js

@@ -153,7 +153,6 @@ export class LayoutRecord extends RecordBase {
         const res = await this.layout.database._apiRequestJSON(this.endpoint, {
             method: 'DELETE'
         });
-        console.log(res);
         if (typeof res.response?.scriptError !== 'undefined' && res.response?.scriptError !== '0') {
             throw new FMError(res.response.scriptError, res.httpStatus, res);
         }

package/src/records/layoutRecord.ts

@@ -177,7 +177,6 @@ export class LayoutRecord<LAYOUT extends LayoutInterface> extends RecordBase<LAY
         const res = await this.layout.database._apiRequestJSON(this.endpoint, {
             method: 'DELETE'
         })
-        console.log(res)
         if (typeof res.response?.scriptError !== 'undefined' && res.response?.scriptError !== '0') {
             throw new FMError(res.response.scriptError, res.httpStatus, res)
         } else if (res.messages[0].code === '0') {