@saltcorn/data 0.6.3-beta.0 → 0.6.3

package/dist/models/fieldrepeat.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldrepeat.js","sourceRoot":"","sources":["../../models/fieldrepeat.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"fieldrepeat.js","sourceRoot":"","sources":["../../models/fieldrepeat.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/C,oDAA4B;AAI5B;;;GAGG;AACH,MAAM,WAAW;IAQf;;;OAGG;IACH,YAAY,CAAiB;QAP7B,aAAQ,GAAG,IAAI,CAAC;QAQd,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,CAAC,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,eAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAQ,EAAE,CAAC;QAChB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC7C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC3B,IAAI,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;oBACpC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC9C;aACF;SACF;IACH,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,SAAc;QACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,SAAc,EAAE,EAAU;QACzC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,GAAG,GAAQ,EAAE,CAAC;QAElB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACxB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE;gBAC/B,OAAO,GAAG,IAAI,CAAC;gBACf,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;YACtD,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;SAC5C;;YAAM,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF;AAWD,iBAAS,WAAW,CAAC"}

package/dist/models/file.d.ts

@@ -1,4 +1,10 @@
-export = File;
+/**
+ * File Database Access Layer
+ * @category saltcorn-data
+ * @module models/file
+ * @subcategory models
+ */
+import type { Where, SelectOptions, Row } from "@saltcorn/db-common/internal";
 /**
  * File Descriptor class
  *
@@ -11,20 +17,35 @@ export = File;
  * @category saltcorn-data
  */
 declare class File {
+    filename: string;
+    location: string;
+    mime_super: string;
+    mime_sub: string;
+    uploaded_at: Date;
+    size_kb: number;
+    id?: number;
+    user_id?: number;
+    min_role_read: number;
+    s3_store: boolean;
+    /**
+     * Constructor
+     * @param o {object}
+     */
+    constructor(o: FileCfg);
     /**
      * Select list of file descriptors
      * @param where
      * @param selectopts
      * @returns {Promise<*>}
      */
-    static find(where: any, selectopts?: {}): Promise<any>;
+    static find(where: Where, selectopts?: SelectOptions): Promise<Array<File>>;
     /**
      * Select one file descriptor
      *
      * @param where
      * @returns {Promise<File|null>}
      */
-    static findOne(where: any): Promise<File | null>;
+    static findOne(where: Where): Promise<File | null>;
     /**
      * Update File descriptor
      *
@@ -32,14 +53,14 @@ declare class File {
      * @param row - row data
      * @returns {Promise<void>} no returns
      */
-    static update(id: any, row: any): Promise<void>;
+    static update(id: number, row: Row): Promise<void>;
     /**
      * Get absolute path to new file in db.connectObj.file_store.
      *
      * @param suggest - path to file inside file store. If undefined that autogenerated uudv4 is used.
      * @returns {string} - path to file
      */
-    static get_new_path(suggest: any): string;
+    static get_new_path(suggest?: string): string;
     /**
      * Ensure that file_store path is physically exists in file system.
      * In reality just recursively creates full absolute path to db.connectObj.file_store.
@@ -54,69 +75,46 @@ declare class File {
      * @param min_role_read
      * @returns {Promise<File>}
      */
-    static from_req_files(file: any, user_id: any, min_role_read?: number): Promise<File>;
-    /**
-     * Create file
-     * @param f
-     * @returns {Promise<File>}
-     */
-    static create(f: any): Promise<File>;
-    /**
-     * Constructor
-     * @param o {object}
-     */
-    constructor(o: object);
-    filename: any;
-    location: any;
-    uploaded_at: any;
-    size_kb: any;
-    id: any;
-    user_id: any;
-    mime_super: any;
-    mime_sub: any;
-    min_role_read: any;
-    s3_store: boolean;
+    static from_req_files(file: {
+        mimetype: string;
+        name: string;
+        mv: Function;
+        size: number;
+        s3object?: boolean;
+    }, user_id: number, min_role_read?: number): Promise<File>;
     /**
      * Delete file
      * @returns {Promise<{error}>}
      */
-    delete(unlinker: any): Promise<{
-        error: any;
-    }>;
+    delete(unlinker?: (arg0: File) => Promise<void>): Promise<{
+        error: string;
+    } | void>;
     /**
      * MIME type of the file
      * @type {string}
      */
     get mimetype(): string;
+    /**
+     * Create file
+     * @param f
+     * @returns {Promise<File>}
+     */
+    static create(f: FileCfg): Promise<File>;
 }
 declare namespace File {
-    namespace contract {
-        namespace variables {
-            const filename: any;
-            const location: any;
-            const mime_super: any;
-            const mime_sub: any;
-            const uploaded_at: any;
-            const size_kb: any;
-            const id: any;
-            const user_id: any;
-            const min_role_read: any;
-            const s3_store: any;
-        }
-        namespace methods {
-            const _delete: any;
-            export { _delete as delete };
-            export const mimetype: any;
-        }
-        namespace static_methods {
-            const find: any;
-            const findOne: any;
-            const create: any;
-            const from_req_files: any;
-            const update: any;
-            const ensure_file_store: any;
-            const get_new_path: any;
-        }
-    }
+    type FileCfg = {
+        filename: string;
+        location: string;
+        uploaded_at: string | number | Date;
+        size_kb: number;
+        id?: number;
+        user_id?: number;
+        mime_super: string;
+        mime_sub: string;
+        min_role_read: number;
+        s3_store?: boolean;
+    };
 }
+declare type FileCfg = File.FileCfg;
+export = File;
 //# sourceMappingURL=file.d.ts.map

package/dist/models/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../models/file.js"],"names":[],"mappings":";AAcA;;;;;;;;;;GAUG;AACH;IAsBE;;;;;OAKG;IACH,0CAFa,YAAU,CAYtB;IAED;;;;;OAKG;IACH,4BAFa,QAAQ,IAAI,GAAC,IAAI,CAAC,CAU9B;IAED;;;;;;OAMG;IACH,kCAFa,QAAQ,IAAI,CAAC,CAKzB;IAED;;;;;OAKG;IACH,mCAFa,MAAM,CAYlB;IAED;;;;;OAKG;IAEH,4BAHa,QAAQ,IAAI,CAAC,CAUzB;IAED;;;;;;OAMG;IACH,wEAFa,QAAQ,IAAI,CAAC,CA2BzB;IA6BD;;;;OAIG;IACH,uBAFa,QAAQ,IAAI,CAAC,CAWzB;IAhLD;;;OAGG;IACH,eAFa,MAAM,EAiBlB;IAdC,cAA0B;IAC1B,cAA0B;IAC1B,iBAEiB;IACjB,aAAwB;IACxB,QAAc;IACd,aAAwB;IACxB,gBAA8B;IAC9B,cAA0B;IAC1B,mBAAoC;IACpC,kBAA4B;IAuH9B;;;OAGG;IACH;;OAaC;IAED;;;OAGG;IACH,uBAEC;CAiBF"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../models/file.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAE9E;;;;;;;;;;GAUG;AACH,cAAM,IAAI;IACR,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,IAAI,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAElB;;;OAGG;gBACS,CAAC,EAAE,OAAO;IAiBtB;;;;;OAKG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,GAAE,aAAkB,GAC7B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAavB;;;;;OAKG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAUxD;;;;;;OAMG;WACU,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAY7C;;;;;OAKG;WAEU,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS/C;;;;;;OAMG;WACU,cAAc,CACzB,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,QAAQ,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EACD,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,IAAI,CAAC;IA2BhB;;;OAGG;IAEG,MAAM,CACV,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,GACvC,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAepC;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED;;;;OAIG;WACU,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAU/C;AAED,kBAAU,IAAI,CAAC;IACb,KAAY,OAAO,GAAG;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;QACpC,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH;AACD,aAAK,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;AAE5B,SAAS,IAAI,CAAC"}

package/dist/models/file.js

@@ -5,12 +5,14 @@
  * @module models/file
  * @subcategory models
  */
-const db = require("../db");
-const { contract, is } = require("contractis");
-const { v4: uuidv4 } = require("uuid");
-const path = require("path");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const db_1 = __importDefault(require("../db"));
+const uuid_1 = require("uuid");
+const path_1 = require("path");
 const { asyncMap } = require("../utils");
-const fs = require("fs").promises;
+const promises_1 = require("fs/promises");
 /**
  * File Descriptor class
  *
@@ -30,9 +32,10 @@ class File {
     constructor(o) {
         this.filename = o.filename;
         this.location = o.location;
-        this.uploaded_at = ["string", "number"].includes(typeof o.uploaded_at)
-            ? new Date(o.uploaded_at)
-            : o.uploaded_at;
+        this.uploaded_at =
+            typeof o.uploaded_at === "string" || typeof o.uploaded_at === "number"
+                ? new Date(o.uploaded_at)
+                : o.uploaded_at;
         this.size_kb = o.size_kb;
         this.id = o.id;
         this.user_id = o.user_id;
@@ -41,7 +44,6 @@ class File {
         this.min_role_read = o.min_role_read;
         this.s3_store = !!o.s3_store;
         // TBD add checksum this.checksum = o.checksum;
-        contract.class(this);
     }
     /**
      * Select list of file descriptors
@@ -52,10 +54,11 @@ class File {
     static async find(where, selectopts = {}) {
         if (selectopts.cached) {
             const { getState } = require("../db/state");
+            // TODO ch migrate State and replace any
             const files = Object.values(getState().files).sort((a, b) => a.filename > b.filename ? 1 : -1);
             return files.map((t) => new File(t));
         }
-        const db_flds = await db.select("_sc_files", where, selectopts);
+        const db_flds = await db_1.default.select("_sc_files", where, selectopts);
         return db_flds.map((dbf) => new File(dbf));
     }
     /**
@@ -71,7 +74,7 @@ class File {
             if (cf)
                 return new File(cf);
         }
-        const f = await db.selectMaybeOne("_sc_files", where);
+        const f = await db_1.default.selectMaybeOne("_sc_files", where);
         return f ? new File(f) : null;
     }
     /**
@@ -82,7 +85,7 @@ class File {
      * @returns {Promise<void>} no returns
      */
     static async update(id, row) {
-        await db.update("_sc_files", row, id);
+        await db_1.default.update("_sc_files", row, id);
         await require("../db/state").getState().refresh_files();
     }
     /**
@@ -95,9 +98,9 @@ class File {
         const { getState } = require("../db/state");
         // Check if it uses S3, then use a default "saltcorn" folder
         const useS3 = getState().getConfig("storage_s3_enabled");
-        const file_store = !useS3 ? db.connectObj.file_store : "saltcorn/";
-        const newFnm = suggest || uuidv4();
-        const newPath = path.join(file_store, newFnm);
+        const file_store = !useS3 ? db_1.default.connectObj.file_store : "saltcorn/";
+        const newFnm = suggest || (0, uuid_1.v4)();
+        const newPath = (0, path_1.join)(file_store, newFnm);
         return newPath;
     }
     /**
@@ -110,8 +113,8 @@ class File {
     static async ensure_file_store() {
         const { getState } = require("../db/state");
         if (!getState().getConfig("storage_s3_enabled")) {
-            const file_store = db.connectObj.file_store;
-            await fs.mkdir(file_store, { recursive: true });
+            const file_store = db_1.default.connectObj.file_store;
+            await (0, promises_1.mkdir)(file_store, { recursive: true });
         }
     }
     /**
@@ -153,12 +156,14 @@ class File {
     async delete(unlinker) {
         try {
             // delete file from database
-            await db.deleteWhere("_sc_files", { id: this.id });
+            await db_1.default.deleteWhere("_sc_files", { id: this.id });
             // delete name and possible file from file system
             if (unlinker)
                 await unlinker(this);
             else
-                await fs.unlink(this.location);
+                await (0, promises_1.unlink)(this.location);
+            if (db_1.default.reset_sequence)
+                await db_1.default.reset_sequence("_sc_files");
             // reload file list cache
             await require("../db/state").getState().refresh_files();
         }
@@ -182,43 +187,11 @@ class File {
         const file = new File(f);
         const { id, ...rest } = file;
         // insert file descriptor row to database
-        file.id = await db.insert("_sc_files", rest);
+        file.id = await db_1.default.insert("_sc_files", rest);
         // refresh file list cache
         await require("../db/state").getState().refresh_files();
         return file;
     }
 }
-File.contract = {
-    variables: {
-        filename: is.str,
-        location: is.str,
-        mime_super: is.str,
-        mime_sub: is.str,
-        uploaded_at: is.class("Date"),
-        size_kb: is.posint,
-        id: is.maybe(is.posint),
-        user_id: is.maybe(is.posint),
-        min_role_read: is.posint,
-        s3_store: is.bool,
-        // tdb add checksum
-    },
-    methods: {
-        delete: is.fun([], is.promise(is.or(is.obj({ error: is.str }), is.undefined))),
-        mimetype: is.getter(is.str),
-    },
-    static_methods: {
-        find: is.fun([is.maybe(is.obj()), is.maybe(is.obj())], is.promise(is.array(is.class("File")))),
-        findOne: is.fun(is.obj(), is.promise(is.maybe(is.class("File")))),
-        create: is.fun(is.obj(), is.promise(is.class("File"))),
-        from_req_files: is.fun([
-            is.or(is.obj(), is.array(is.obj())),
-            is.maybe(is.posint),
-            is.maybe(is.posint),
-        ], is.promise(is.or(is.class("File"), is.array(is.class("File"))))),
-        update: is.fun([is.posint, is.obj()], is.promise(is.undefined)),
-        ensure_file_store: is.fun([], is.promise(is.undefined)),
-        get_new_path: is.fun(is.maybe(is.str), is.str),
-    },
-};
 module.exports = File;
 //# sourceMappingURL=file.js.map

package/dist/models/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../models/file.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../models/file.ts"],"names":[],"mappings":"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"}

package/dist/models/form.d.ts

@@ -1,49 +1,59 @@
-export = Form;
+/**
+ * Role Database Access Layer
+ * @category saltcorn-data
+ * @module models/form
+ * @subcategory models
+ */
+import { AbstractForm, AdditionalButton as _AdditionalButton } from "@saltcorn/types/model-abstracts/abstract_form";
+import type { FieldLike } from "@saltcorn/types/base_types";
+import Field from "./field";
+import FieldRepeat from "./fieldrepeat";
+import type { Layout } from "@saltcorn/types/base_types";
 /**
  * Form Class
  * @category saltcorn-data
  */
-declare class Form {
-    /**
-     * Constructor
-     * @param o
-     */
-    constructor(o: any);
-    fields: any;
+declare class Form implements AbstractForm {
+    fields: Array<Field | FieldRepeat>;
     errors: any;
     values: any;
-    action: any;
-    layout: any;
-    id: any;
-    labelCols: any;
-    collapsedSummary: any;
+    action?: string;
+    layout?: Layout;
+    id?: string;
+    labelCols?: number;
+    collapsedSummary?: string;
     isStateForm: boolean;
-    formStyle: any;
-    class: any;
+    formStyle: string;
+    class?: string;
     methodGET: boolean;
-    blurb: any;
-    submitLabel: any;
-    submitButtonClass: any;
-    noSubmitButton: any;
-    additionalButtons: any;
-    onChange: any;
-    validator: any;
+    blurb?: string | string[];
+    submitLabel?: string;
+    submitButtonClass?: string;
+    noSubmitButton?: boolean;
+    additionalButtons?: Array<_AdditionalButton>;
+    onChange?: string;
+    validator?: (arg0: any) => any;
     hasErrors: boolean;
     xhrSubmit: boolean;
     req: any;
-    __: any;
+    __?: any;
+    /**
+     * Constructor
+     * @param o
+     */
+    constructor(o: FormCfg);
     /**
      * @param {object} ks
      */
-    hidden(...ks: object): void;
+    hidden(...ks: string[]): void;
     /**
      * @param {boolean} [force_allow_none = false]
      */
-    fill_fkey_options(force_allow_none?: boolean | undefined): Promise<void>;
+    fill_fkey_options(force_allow_none?: boolean): Promise<void>;
     /**
      * @returns {Promise<object>}
      */
-    generate(): Promise<object>;
+    generate(): Promise<any>;
     /**
      * @type {string}
      */
@@ -52,31 +62,40 @@ declare class Form {
      * @param {*} v
      * @returns {object}
      */
-    validate(v: any): object;
+    validate(v: any): {
+        success: any;
+    } | {
+        errors: any;
+    };
 }
 declare namespace Form {
-    namespace contract {
-        namespace variables {
-            export const fields: any;
-            export const values: any;
-            export const errors: any;
-            export const action: any;
-            export const labelCols: any;
-            export const hasErrors: any;
-            export const submitLabel: any;
-            export const blurb: any;
-            const _class: any;
-            export { _class as class };
-            export const isStateForm: any;
-            export const formStyle: any;
-            export const methodGET: any;
-        }
-        namespace methods {
-            const validate: any;
-            const generate: any;
-            const fill_fkey_options: any;
-            const hidden: any;
-        }
-    }
+    type FormCfg = {
+        fields: Array<Field | FieldRepeat | FieldLike>;
+        errors?: any;
+        values?: any;
+        action?: string;
+        layout?: Layout;
+        id?: string;
+        labelCols?: number;
+        collapsedSummary?: string;
+        isStateForm?: boolean;
+        formStyle?: string;
+        class?: string;
+        methodGET?: boolean;
+        blurb?: string | string[];
+        submitLabel?: string;
+        submitButtonClass?: string;
+        noSubmitButton?: boolean;
+        additionalButtons?: Array<_AdditionalButton>;
+        onChange?: string;
+        validator?: (arg0: any) => any;
+        xhrSubmit?: boolean;
+        req?: any;
+        validate?: any;
+        __?: any;
+    };
+    type AdditionalButton = _AdditionalButton;
 }
+declare type FormCfg = Form.FormCfg;
+export = Form;
 //# sourceMappingURL=form.d.ts.map

package/dist/models/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../models/form.js"],"names":[],"mappings":";AAUA;;;GAGG;AACH;IACE;;;OAGG;IACH,oBA4BC;IA3BC,YAEC;IACD,YAA4B;IAC5B,YAA4B;IAC5B,YAAsB;IACtB,YAAsB;IACtB,QAAc;IACd,eAA4B;IAC5B,sBAA0C;IAC1C,qBAAkC;IAClC,eAAuC;IACvC,WAAoB;IACpB,mBAA8B;IAC9B,WAAoB;IACpB,iBAAgC;IAChC,uBAA4C;IAC5C,oBAAsC;IACtC,uBAA4C;IAC5C,cAA0B;IAC1B,eAA4B;IAC5B,mBAAsB;IACtB,mBAA8B;IAC9B,SAAgB;IAChB,QAAqC;IAKvC;;OAEG;IACH,cAFW,MAAM,QAYhB;IAED;;OAEG;IACH,yEAKC;IAED;;OAEG;IACH,YAFa,QAAQ,MAAM,CAAC,CAa3B;IAED;;OAEG;IACH,2BAMC;IAED;;;OAGG;IACH,kBAFa,MAAM,CAqClB;CACF"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../models/form.ts"],"names":[],"mappings":"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"}