@saltcorn/data 0.6.2 → 0.6.3-beta.3

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,CAY3B;IAED;;OAEG;IACH,2BAMC;IAED;;;OAGG;IACH,kBAFa,MAAM,CAqClB;CACF"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../models/form.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,YAAY,EACZ,gBAAgB,IAAI,iBAAiB,EACtC,MAAM,+CAA+C,CAAC;AAMvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAQzD;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IAET;;;OAGG;gBACS,CAAC,EAAE,OAAO;IA6BtB;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI;IAY7B;;OAEG;IACG,iBAAiB,CAAC,gBAAgB,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzE;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;IAc9B;;OAEG;IACH,IAAI,YAAY,IAAI,MAAM,CAMzB;IAED;;;OAGG;IACH,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,GAAG;QAAE,MAAM,EAAE,GAAG,CAAA;KAAE;CA4CrD;AAiBD,kBAAU,IAAI,CAAC;IACb,KAAY,OAAO,GAAG;QACpB,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,WAAW,GAAG,SAAS,CAAC,CAAC;QAC/C,MAAM,CAAC,EAAE,GAAG,CAAC;QACb,MAAM,CAAC,EAAE,GAAG,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,iBAAiB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;QAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,GAAG,CAAC,EAAE,GAAG,CAAC;QACV,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,EAAE,CAAC,EAAE,GAAG,CAAC;KACV,CAAC;IAEF,KAAY,gBAAgB,GAAG,iBAAiB,CAAC;CAClD;AACD,aAAK,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;AAE5B,SAAS,IAAI,CAAC"}

package/dist/models/form.js

@@ -1,13 +1,13 @@
 "use strict";
-/**
- * Role Database Access Layer
- * @category saltcorn-data
- * @module models/form
- * @subcategory models
- */
-const { contract, is } = require("contractis");
-const db = require("../db");
-const Field = require("./field");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const common_types_1 = require("@saltcorn/types/common_types");
+const field_1 = __importDefault(require("./field"));
+const { is } = require("contractis");
+const isFieldLike = (object) => {
+    return object.constructor.name === Object.name;
+};
 /**
  * Form Class
  * @category saltcorn-data
@@ -18,7 +18,9 @@ class Form {
      * @param o
      */
     constructor(o) {
-        this.fields = o.fields.map((f) => f.constructor.name === Object.name ? new Field(f) : f);
+        this.fields = o.fields.map((f) => {
+            return isFieldLike(f) ? new field_1.default(f) : f;
+        });
         this.errors = o.errors || {};
         this.values = o.values || {};
         this.action = o.action;
@@ -43,7 +45,6 @@ class Form {
         this.__ = o.__ || (o.req && o.req.__);
         if (o.validate)
             this.validate(o.validate);
-        contract.class(this);
     }
     /**
      * @param {object} ks
@@ -51,7 +52,7 @@ class Form {
     hidden(...ks) {
         ks.forEach((k) => {
             !this.fields.map((f) => f.name).includes(k) &&
-                this.fields.push(new Field({
+                this.fields.push(new field_1.default({
                     name: k,
                     input_type: "hidden",
                 }));
@@ -63,7 +64,8 @@ class Form {
     async fill_fkey_options(force_allow_none = false) {
         //console.log(this.values);
         for (const f of this.fields) {
-            await f.fill_fkey_options(force_allow_none, undefined, this.values);
+            if (hasFieldMembers(f))
+                await f.fill_fkey_options(force_allow_none, undefined, this.values);
         }
     }
     /**
@@ -72,11 +74,14 @@ class Form {
     async generate() {
         var r = {};
         for (const f of this.fields) {
-            if (f.input_type === "hidden")
-                r[f.name] = this.values[f.name];
-            else if (f.required || is.bool.generate()) {
-                r[f.name] = await f.generate();
-            }
+            if (hasFieldMembers(f))
+                if (f.input_type === "hidden")
+                    r[f.name] = this.values[f.name];
+                else if (f.name.endsWith("_fml"))
+                    r[f.name] = "";
+                else if (f.required || is.bool.generate()) {
+                    r[f.name] = await f.generate();
+                }
         }
         return r;
     }
@@ -84,7 +89,7 @@ class Form {
      * @type {string}
      */
     get errorSummary() {
-        let strs = [];
+        let strs = new Array();
         Object.entries(this.errors).forEach(([k, v]) => {
             strs.push(`${k}: ${v}`);
         });
@@ -98,27 +103,33 @@ class Form {
         this.hasErrors = false;
         this.errors = {};
         this.fields.forEach((f) => {
-            if (f.disabled || f.calculated)
-                return;
-            if (f.fieldview && f.type && f.type.fieldviews) {
-                const fv = f.type.fieldviews[f.fieldview];
-                if (fv && !fv.isEdit)
+            if (hasFieldMembers(f)) {
+                if (f.disabled || f.calculated)
                     return;
+                if (f.fieldview &&
+                    f.type &&
+                    (0, common_types_1.instanceOfType)(f.type) &&
+                    f.type.fieldviews) {
+                    const fv = f.type.fieldviews[f.fieldview];
+                    if (fv && !fv.isEdit)
+                        return;
+                }
             }
             const valres = f.validate(v);
-            if (valres.error) {
+            if ((0, common_types_1.instanceOfErrorMsg)(valres)) {
                 this.errors[f.name] = valres.error;
                 this.values[f.name] = v[f.name];
                 this.hasErrors = true;
             }
-            else {
-                if (f.parent_field) {
+            else if ((0, common_types_1.instanceOfSuccessMsg)(valres)) {
+                if (hasParentField(f) && f.parent_field) {
                     if (!this.values[f.parent_field])
                         this.values[f.parent_field] = {};
                     this.values[f.parent_field][f.name] = valres.success;
                 }
-                else
+                else {
                     this.values[f.name] = valres.success;
+                }
             }
         });
         if (Object.keys(this.errors).length > 0) {
@@ -137,27 +148,16 @@ class Form {
         }
     }
 }
-Form.contract = {
-    variables: {
-        fields: is.array(is.or(is.class("Field"), is.class("FieldRepeat"))),
-        values: is.obj(),
-        errors: is.obj(),
-        action: is.maybe(is.str),
-        labelCols: is.maybe(is.posint),
-        hasErrors: is.bool,
-        submitLabel: is.maybe(is.str),
-        blurb: is.maybe(is.or(is.str, is.array(is.str))),
-        class: is.maybe(is.str),
-        isStateForm: is.bool,
-        formStyle: is.str,
-        methodGET: is.bool,
-    },
-    methods: {
-        validate: is.fun(is.obj(), is.or(is.obj({ errors: is.obj() }), is.obj({ success: is.obj() }))),
-        generate: is.fun([], is.promise(is.obj())),
-        fill_fkey_options: is.fun(is.maybe(is.bool), is.promise()),
-        hidden: is.fun(is.any, is.eq(undefined)),
-    },
+const hasFieldMembers = (object) => {
+    return (object &&
+        "fill_fkey_options" in object &&
+        "input_type" in object &&
+        "required" in object &&
+        "disabled" in object &&
+        "calculated" in object);
+};
+const hasParentField = (object) => {
+    return object && "parent_field" in object;
 };
 module.exports = Form;
 //# sourceMappingURL=form.js.map

package/dist/models/form.js.map

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

package/dist/models/index.d.ts

@@ -1 +1,40 @@
+/**
+ * @category saltcorn-data
+ * @subcategory models
+ * @module models/index
+ */
+/**
+ * All files in the models module.
+ * @namespace models_overview
+ * @property {module:models/backup} backup
+ * @property {module:models/config} config
+ * @property {module:models/crash} crash
+ * @property {module:models/discovery} discovery
+ * @property {module:models/email} email
+ * @property {module:models/eventlog} eventlog
+ * @property {module:models/expression} expression
+ * @property {module:models/field} field
+ * @property {module:models/fieldrepeat} fieldrepeat
+ * @property {module:models/file} file
+ * @property {module:models/form} form
+ * @property {module:models/layout} layout
+ * @property {module:models/library} library
+ * @property {module:models/pack} pack
+ * @property {module:models/page} page
+ * @property {module:models/plugin} plugin
+ * @property {module:models/random} random
+ * @property {module:models/role} role
+ * @property {module:models/scheduler} scheduler
+ * @property {module:models/table_constraints} table_constraints
+ * @property {module:models/table} table
+ * @property {module:models/tenant} tenant
+ * @property {module:models/trigger} trigger
+ * @property {module:models/user} user
+ * @property {module:models/view} view
+ * @property {module:models/workflow} workflow
+ *
+ *
+ * @category saltcorn-data
+ * @subcategory models
+ */
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../models/index.js"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../models/index.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG"}

package/dist/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../models/index.js"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../models/index.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG"}

package/dist/models/layout.d.ts

@@ -1,34 +1,19 @@
 /**
- * @param {object} layout
- * @param {*} f
- * @returns {void}
+ * @category saltcorn-data
+ * @module models/layout
+ * @subcategory models
  */
-export function eachView(layout: object, f: any): void;
-/**
- * @param {object} layout
- * @returns {Promise<object[]>}
- */
-export function getViews(layout: object): Promise<object[]>;
-/**
- * @param {object} layout
- * @param {object[]} visitors
- * @returns {Promise<void>}
- */
-export function traverse(layout: object, visitors: object[]): Promise<void>;
-/**
- * @param {object} layout
- * @param {object[]} visitors
- * @returns {void}
- */
-export function traverseSync(layout: object, visitors: object[]): void;
-/**
- * @param {object} layout
- * @returns {string[]}
- */
-export function getStringsForI18n(layout: object): string[];
-/**
- * @param {object} layout
- * @param {object} locale
- */
-export function translateLayout(layout: object, locale: object): void;
+import { Layout } from "@saltcorn/types/base_types";
+declare type Visitors = {
+    [key: string]: (segment: any) => void;
+};
+declare const _default: {
+    eachView: (layout: Layout, f: any) => Promise<void>;
+    getViews: (layout: Layout) => Promise<any[]>;
+    traverse: (layout: Layout, visitors: Visitors) => Promise<void>;
+    traverseSync: (layout: Layout, visitors: Visitors) => void;
+    getStringsForI18n: (layout: Layout) => string[];
+    translateLayout: (layout: Layout, locale: string) => void;
+};
+export = _default;
 //# sourceMappingURL=layout.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../models/layout.js"],"names":[],"mappings":"AAsEA;;;;GAIG;AACH,iCAJW,MAAM,WAEJ,IAAI,CAE4C;AAE7D;;;GAGG;AACH,iCAHW,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAQ7B;AAjDD;;;;GAIG;AACH,iCAJW,MAAM,YACN,MAAM,EAAE,GACN,QAAQ,IAAI,CAAC,CA2BzB;AA7DD;;;;GAIG;AACH,qCAJW,MAAM,YACN,MAAM,EAAE,GACN,IAAI,CA0BhB;AAqDD;;;GAGG;AACH,0CAHW,MAAM,GACJ,MAAM,EAAE,CAoBpB;AAED;;;GAGG;AACH,wCAHW,MAAM,UACN,MAAM,QAoBhB"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../models/layout.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,aAAK,QAAQ,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;CAAE,CAAC;;;;;;;;;AAsI1D,kBAOE"}

package/dist/models/layout.js

@@ -23,7 +23,7 @@ const traverseSync = (layout, visitors) => {
             return;
         }
         if (segment.contents) {
-            if (typeof contents !== "string")
+            if (typeof segment.contents !== "string")
                 go(segment.contents);
             return;
         }
@@ -59,7 +59,7 @@ const traverse = async (layout, visitors) => {
             return;
         }
         if (segment.contents) {
-            if (typeof contents !== "string")
+            if (typeof segment.contents !== "string")
                 await go(segment.contents);
             return;
         }
@@ -140,8 +140,6 @@ const translateLayout = (layout, locale) => {
         },
     });
 };
-//getViews: is.fun([], is.promise(is.array(is.obj()))),
-//eachView: is.fun(is.fun(is.obj(), is.any), is.promise(is.undefined)),
 module.exports = {
     eachView,
     getViews,

package/dist/models/layout.js.map

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

package/dist/models/library.d.ts

@@ -1,42 +1,43 @@
-export = Library;
+import type { Where, SelectOptions, Row } from "@saltcorn/db-common/internal";
+import type { LibraryCfg } from "@saltcorn/types/model-abstracts/abstract_library";
 /**
  * Library Class
  * @category saltcorn-data
  */
 declare class Library {
+    id: number;
+    name: string;
+    icon: string;
+    layout: any;
+    /**
+     * Library constructor
+     * @param {object} o
+     */
+    constructor(o: LibraryCfg | Library);
     /**
      * @param {object} lib_in
      */
-    static create(lib_in: object): Promise<void>;
+    static create(lib_in: LibraryCfg): Promise<void>;
+    /**
+     * @type {...*}
+     */
+    get toJson(): any;
     /**
      * @param {*} where
      * @param {*} selectopts
      * @returns {Library[]}
      */
-    static find(where: any, selectopts: any): Library[];
+    static find(where: Where, selectopts?: SelectOptions): Promise<Library[]>;
     /**
      * @param {*} where
      * @returns {Library}
      */
-    static findOne(where: any): Library;
-    /**
-     * Library constructor
-     * @param {object} o
-     */
-    constructor(o: object);
-    id: any;
-    name: any;
-    icon: any;
-    layout: any;
-    /**
-     * @type {...*}
-     */
-    get toJson(): any;
+    static findOne(where: Where): Promise<Library>;
     /**
      * @param {*} what
      * @returns {object}
      */
-    suitableFor(what: any): object;
+    suitableFor(what: string): any;
     /**
      * @returns {Promise<void>}
      */
@@ -45,6 +46,7 @@ declare class Library {
      * @param {*} row
      * @returns {Promise<void>}
      */
-    update(row: any): Promise<void>;
+    update(row: Row): Promise<void>;
 }
+export = Library;
 //# sourceMappingURL=library.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../models/library.js"],"names":[],"mappings":";AAUA;;;GAGG;AACH;IAaE;;OAEG;IACH,sBAFW,MAAM,iBAShB;IAUD;;;;OAIG;IACH,0CAFa,OAAO,EAAE,CAKrB;IAED;;;OAGG;IACH,4BAFa,OAAO,CAKnB;IAjDD;;;OAGG;IACH,eAFW,MAAM,EAQhB;IALC,QAAc;IACd,UAAkB;IAClB,UAAkB;IAClB,YACgE;IAelE;;OAEG;IACH,kBAGC;IAqBD;;;OAGG;IACH,wBAFa,MAAM,CA+ClB;IAED;;OAEG;IACH,UAFa,QAAQ,IAAI,CAAC,CAKzB;IAED;;;OAGG;IACH,kBAFa,QAAQ,IAAI,CAAC,CAIzB;CACF"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../models/library.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAInF;;;GAGG;AACH,cAAM,OAAO;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IAEZ;;;OAGG;gBACS,CAAC,EAAE,UAAU,GAAG,OAAO;IAQnC;;OAEG;WACU,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;OAEG;IACH,IAAI,MAAM,IAAI,GAAG,CAGhB;IAED;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,EAAE,CAAC;IAKrB;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG;IA+C9B;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;OAGG;IACG,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAGtC;AAED,SAAS,OAAO,CAAC"}