@saltcorn/data 0.6.3-beta.1 → 0.6.4-beta.1

package/dist/models/random.d.ts

@@ -1,24 +1,21 @@
 /**
- * @param {object} [opts = {}]
- * @returns {Promise<Table>}
+ * View Database Access Layer
+ * @category saltcorn-data
+ * @module models/random
+ * @subcategory models
  */
-export function random_table(opts?: object | undefined): Promise<Table>;
-/**
- * @param {Table} table
- * @returns {Promise<*>}
- */
-export function fill_table_row(table: Table): Promise<any>;
-/**
- * @param {Table} table
- * @param {string} viewtemplate
- * @returns {Promise<View>}
- */
-export function initial_view(table: Table, viewtemplate: string): Promise<View>;
-/**
- * @param {Table} table
- * @returns {Promise<object[]>}
- */
-export function all_views(table: Table): Promise<object[]>;
-import Table = require("./table");
-import View = require("./view");
+import View from "./view";
+import Table from "./table";
+import { GenObj } from "@saltcorn/types/common_types";
+declare const _default: {
+    random_table: (opts?: GenObj) => Promise<Table>;
+    fill_table_row: (table: Table) => Promise<void>;
+    initial_view: (table: Table, viewtemplate: string) => Promise<View>;
+    all_views: (table: Table) => Promise<{
+        list: View;
+        show: View;
+        edit: View;
+    }>;
+};
+export = _default;
 //# sourceMappingURL=random.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../models/random.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,yDAFa,QAAQ,KAAK,CAAC,CAkC1B;AAED;;;GAGG;AACH,sCAHW,KAAK,GACH,YAAU,CAWtB;AA2GD;;;;GAIG;AACH,oCAJW,KAAK,gBACL,MAAM,GACJ,QAAQ,IAAI,CAAC,CAgBzB;AAED;;;GAGG;AACH,iCAHW,KAAK,GACH,QAAQ,MAAM,EAAE,CAAC,CAO7B"}
+{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../models/random.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAK5B,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;;;;;;;;;;;AAsMtD,kBAAmE"}

package/dist/models/random.js

@@ -1,39 +1,41 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 /**
  * View Database Access Layer
  * @category saltcorn-data
  * @module models/random
  * @subcategory models
  */
-const View = require("./view");
-const Field = require("./field");
-const Table = require("./table");
+const view_1 = __importDefault(require("./view"));
+const field_1 = __importDefault(require("./field"));
+const table_1 = __importDefault(require("./table"));
 const { getState } = require("../db/state");
 const { generate_attributes } = require("../plugin-testing");
 const { initial_config_all_fields } = require("../plugin-helper");
-const { contract, is } = require("contractis");
-const db = require("../db");
+const db_1 = __importDefault(require("../db"));
+const common_types_1 = require("@saltcorn/types/common_types");
+const generators_1 = require("@saltcorn/types/generators");
 /**
  * @param {object} [opts = {}]
  * @returns {Promise<Table>}
  */
 const random_table = async (opts = {}) => {
-    const name = is
-        .and(is.sat((s) => db.sqlsanitize(s).length > 2), is.str)
-        .generate();
-    const table = await Table.create(name);
-    if (Math.random() < 0.3 && !opts.force_int_pk && !db.isSQLite) {
+    const name = (0, generators_1.generateString)(3);
+    const table = await table_1.default.create(name);
+    if (Math.random() < 0.3 && !opts.force_int_pk && !db_1.default.isSQLite) {
         const [pk] = await table.getFields();
         await pk.update({ type: "UUID" });
         table.fields = null;
     }
     //fields
-    const nfields = is.integer({ gte: 2, lte: 10 }).generate();
+    const nfields = (0, generators_1.num_between)(3, 10);
     const existing_field_names = ["id"];
     for (let index = 0; index < nfields; index++) {
         const field = await random_field(existing_field_names, table);
         existing_field_names.push(field.label);
-        await Field.create(field);
+        await field_1.default.create(field);
     }
     //fill rows
     for (let index = 0; index < 20; index++) {
@@ -53,7 +55,7 @@ const fill_table_row = async (table) => {
     const fields = await table.getFields();
     const row = {};
     for (const f of fields) {
-        if (!f.calculated && (f.required || is.bool.generate()) && !f.primary_key)
+        if (!f.calculated && (f.required || (0, generators_1.generateBool)()) && !f.primary_key)
             row[f.name] = await f.generate();
     }
     //console.log(fields, row);
@@ -66,13 +68,13 @@ const fill_table_row = async (table) => {
  * @returns {string}
  */
 const random_expression = (type, existing_fields) => {
-    const numField = existing_fields.find((f) => ["Integer", "Float"].includes(f.type));
+    const numField = existing_fields.find((f) => typeof f.type === "string" && ["Integer", "Float"].includes(f.type));
     switch (type) {
         case "Bool":
             if (numField)
                 return `${numField.name}>0`;
             else
-                return is.one_of(["true", "false"]).generate();
+                return (0, generators_1.oneOf)(["true", "false"]);
         case "Float":
             if (numField)
                 return `${numField.name}+1.5`;
@@ -93,7 +95,7 @@ const random_expression = (type, existing_fields) => {
  * @returns {Promise<Field>}
  */
 const random_field = async (existing_field_names, table) => {
-    const tables = await Table.find({});
+    const tables = await table_1.default.find({});
     const tables_with_data = [];
     for (const t of tables) {
         const n = await t.countRows();
@@ -106,26 +108,24 @@ const random_field = async (existing_field_names, table) => {
         "File",
     ];
     const type_options = getState().type_names.concat(fkey_opts || []);
-    const label = is
-        .and(is.sat((s) => s.length > 2 && !existing_field_names.includes(Field.labelToName(s))), is.str)
-        .generate();
-    const type = is.one_of(type_options).generate();
+    const label = (0, generators_1.generateString)(3, existing_field_names);
+    const type = (0, generators_1.oneOf)(type_options);
     if (Math.random() < 0.2 && ["Integer", "Float", "Bool"].includes(type)) {
         const stored = Math.random() < 0.5;
-        const existing_fields = await Field.find({
+        const existing_fields = await field_1.default.find({
             table_id: table.id,
             calculated: false,
         }, {
             orderBy: "RANDOM()",
         });
         const expression = random_expression(type, existing_fields);
-        const f = new Field({ type, label, calculated: true, stored, expression });
+        const f = new field_1.default({ type, label, calculated: true, stored, expression });
         f.table_id = table.id;
         return f;
     }
-    const f = new Field({ type, label });
+    const f = new field_1.default({ type, label });
     f.table_id = table.id;
-    if (f.type.attributes)
+    if ((0, common_types_1.instanceOfType)(f.type) && f.type.attributes)
         f.attributes = generate_attributes(f.type.attributes, f.type.validate_attributes, table.id);
     if (f.is_fkey) {
         if (f.reftable_name === "users") {
@@ -135,10 +135,12 @@ const random_field = async (existing_field_names, table) => {
             f.attributes.summary_field = "email";
         }
         else {
-            const reftable = await Table.findOne({ name: f.reftable_name });
+            const reftable = await table_1.default.findOne({ name: f.reftable_name });
+            if (!reftable)
+                throw new Error(`The table '${f.reftable_name} does not exist'`);
             const reffields = (await reftable.getFields()).filter((f) => !f.calculated || f.stored);
             if (reffields.length > 0) {
-                const reff = is.one_of(reffields).generate();
+                const reff = (0, generators_1.oneOf)(reffields);
                 f.attributes.summary_field = reff.name;
             }
             else {
@@ -150,7 +152,7 @@ const random_field = async (existing_field_names, table) => {
     if (Math.random() < 0.25 && type !== "Bool")
         f.is_unique = true;
     // required?
-    if (is.bool.generate())
+    if ((0, generators_1.generateBool)())
         f.required = true;
     return f;
 };
@@ -162,8 +164,8 @@ const random_field = async (existing_field_names, table) => {
 const initial_view = async (table, viewtemplate) => {
     const configuration = await initial_config_all_fields(viewtemplate === "Edit")({ table_id: table.id });
     //console.log(configuration);
-    const name = is.str.generate();
-    const view = await View.create({
+    const name = (0, generators_1.generateString)();
+    const view = await view_1.default.create({
         name,
         configuration,
         viewtemplate,

package/dist/models/random.js.map

@@ -1 +1 @@
-{"version":3,"file":"random.js","sourceRoot":"","sources":["../../models/random.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"random.js","sourceRoot":"","sources":["../../models/random.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,kDAA0B;AAC1B,oDAA4B;AAC5B,oDAA4B;AAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5C,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC7D,MAAM,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAClE,+CAAuB;AAGvB,+DAA8D;AAC9D,2DAKoC;AAEpC;;;GAGG;AACH,MAAM,YAAY,GAAG,KAAK,EAAE,OAAe,EAAE,EAAkB,EAAE;IAC/D,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,YAAE,CAAC,QAAQ,EAAE;QAC7D,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAClC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;KACrB;IACD,QAAQ;IACR,MAAM,OAAO,GAAG,IAAA,wBAAW,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,oBAAoB,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC9D,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEvC,MAAM,eAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC3B;IACD,WAAW;IACX,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE;QACvC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;KAC7B;IACD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,OAAO,CAAC,CAAC;IACrE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG;QAC9C,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,cAAc,GAAG,KAAK,EAAE,KAAY,EAAiB,EAAE;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACvC,MAAM,GAAG,GAAQ,EAAE,CAAC;IACpB,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACtB,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAA,yBAAY,GAAE,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW;YACnE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;KACpC;IACD,2BAA2B;IAC3B,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,iBAAiB,GAAG,CACxB,IAAY,EACZ,eAA6B,EACrB,EAAE;IACV,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAC3E,CAAC;IACF,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,IAAI,QAAQ;gBAAE,OAAO,GAAG,QAAQ,CAAC,IAAI,IAAI,CAAC;;gBACrC,OAAO,IAAA,kBAAK,EAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACvC,KAAK,OAAO;YACV,IAAI,QAAQ;gBAAE,OAAO,GAAG,QAAQ,CAAC,IAAI,MAAM,CAAC;;gBACvC,OAAO,KAAK,CAAC;QACpB,KAAK,SAAS;YACZ,IAAI,QAAQ;gBAAE,OAAO,GAAG,QAAQ,CAAC,IAAI,IAAI,CAAC;;gBACrC,OAAO,GAAG,CAAC;QAClB;YACE,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,IAAI,CAAC,CAAC;KAC9D;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,YAAY,GAAG,KAAK,EACxB,oBAA8B,EAC9B,KAAY,EACI,EAAE;IAClB,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpC,MAAM,gBAAgB,GAAG,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACtB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC;YAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACrC;IACD,MAAM,SAAS,GAAG;QAChB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;QAClD,cAAc;QACd,MAAM;KACP,CAAC;IACF,MAAM,YAAY,GAAG,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,IAAA,kBAAK,EAAC,YAAY,CAAC,CAAC;IACjC,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;QACnC,MAAM,eAAe,GAAG,MAAM,eAAK,CAAC,IAAI,CACtC;YACE,QAAQ,EAAE,KAAK,CAAC,EAAE;YAClB,UAAU,EAAE,KAAK;SAClB,EACD;YACE,OAAO,EAAE,UAAU;SACpB,CACF,CAAC;QACF,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC5D,MAAM,CAAC,GAAG,IAAI,eAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,CAAC;KACV;IAED,MAAM,CAAC,GAAG,IAAI,eAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC;IACtB,IAAI,IAAA,6BAAc,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU;QAC7C,CAAC,CAAC,UAAU,GAAG,mBAAmB,CAChC,CAAC,CAAC,IAAI,CAAC,UAAU,EACjB,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAC1B,KAAK,CAAC,EAAE,CACT,CAAC;IACJ,IAAI,CAAC,CAAC,OAAO,EAAE;QACb,IAAI,CAAC,CAAC,aAAa,KAAK,OAAO,EAAE;YAC/B,CAAC,CAAC,UAAU,CAAC,aAAa,GAAG,OAAO,CAAC;SACtC;aAAM,IAAI,CAAC,CAAC,aAAa,KAAK,WAAW,EAAE;YAC1C,CAAC,CAAC,UAAU,CAAC,aAAa,GAAG,OAAO,CAAC;SACtC;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ;gBACX,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,aAAa,kBAAkB,CAAC,CAAC;YACnE,MAAM,SAAS,GAAG,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CACnD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,MAAM,CACjC,CAAC;YACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,MAAM,IAAI,GAAG,IAAA,kBAAK,EAAC,SAAS,CAAC,CAAC;gBAC9B,CAAC,CAAC,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;aACxC;iBAAM;gBACL,CAAC,CAAC,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;aACnC;SACF;KACF;IACD,UAAU;IACV,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,IAAI,IAAI,KAAK,MAAM;QAAE,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;IAChE,YAAY;IACZ,IAAI,IAAA,yBAAY,GAAE;QAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;IACtC,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,YAAY,GAAG,KAAK,EACxB,KAAY,EACZ,YAAoB,EACL,EAAE;IACjB,MAAM,aAAa,GAAG,MAAM,yBAAyB,CACnD,YAAY,KAAK,MAAM,CACxB,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1B,6BAA6B;IAC7B,MAAM,IAAI,GAAG,IAAA,2BAAc,GAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,MAAM,CAAC;QAC7B,IAAI;QACJ,aAAa;QACb,YAAY;QACZ,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,QAAQ,EAAE,EAAE;KACb,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,SAAS,GAAG,KAAK,EACrB,KAAY,EACqC,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,iBAAS,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC"}

package/dist/models/role.d.ts

@@ -4,13 +4,14 @@
  * @subcategory models
  */
 import type { Where, SelectOptions, Row } from "@saltcorn/db-common/internal";
+import type { AbstractRole, RoleCfg } from "@saltcorn/types/model-abstracts/abstract_role";
 /**
  * Role class
  * @category saltcorn-data
  */
-declare class Role {
+declare class Role implements AbstractRole {
     id: number;
-    role: Role;
+    role: string;
     /**
      * Role constructor
      * @param {object} o
@@ -44,12 +45,5 @@ declare class Role {
      */
     update(row: Row): Promise<void>;
 }
-declare namespace Role {
-    type RoleCfg = {
-        id: number;
-        role: any;
-    };
-}
-declare type RoleCfg = Role.RoleCfg;
 export = Role;
 //# sourceMappingURL=role.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../models/role.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAE9E;;;GAGG;AACH,cAAM,IAAI;IACR,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;IAEX;;;OAGG;gBACS,CAAC,EAAE,OAAO;IAKtB;;;OAGG;WACiB,MAAM,CAAC,EAAE,EAAE,OAAO;;;IAYtC;;;;OAIG;WACiB,IAAI,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,IAAI,EAAE,CAAC;IAKlB;;;OAGG;WACiB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;OAEG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKpC;;;OAGG;IACU,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAG7C;AAED,kBAAU,IAAI,CAAC;IACb,KAAY,OAAO,GAAG;QACpB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;CACH;AACD,aAAK,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;AAE5B,SAAS,IAAI,CAAC"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../models/role.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACR,MAAM,+CAA+C,CAAC;AAEvD;;;GAGG;AACH,cAAM,IAAK,YAAW,YAAY;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;gBACS,CAAC,EAAE,OAAO;IAKtB;;;OAGG;WACiB,MAAM,CAAC,EAAE,EAAE,OAAO;;;IAYtC;;;;OAIG;WACiB,IAAI,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,IAAI,EAAE,CAAC;IAKlB;;;OAGG;WACiB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;OAEG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKpC;;;OAGG;IACU,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAG7C;AAED,SAAS,IAAI,CAAC"}

package/dist/models/role.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../models/role.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,+CAAuB;AAGvB;;;GAGG;AACH,MAAM,IAAI;IAIR;;;OAGG;IACH,YAAY,CAAU;QACpB,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAW;QACpC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC;QAC7D,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3B,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CACtB,KAAY,EACZ,UAA0B;QAE1B,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3D,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAY;QACtC,MAAM,CAAC,GAAY,MAAM,YAAE,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM;QACjB,MAAM,MAAM,GAAG,YAAE,CAAC,qBAAqB,EAAE,CAAC;QAC1C,MAAM,YAAE,CAAC,KAAK,CAAC,eAAe,MAAM,yBAAyB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,GAAQ;QAC1B,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF;AAUD,iBAAS,IAAI,CAAC"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../models/role.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,+CAAuB;AAOvB;;;GAGG;AACH,MAAM,IAAI;IAIR;;;OAGG;IACH,YAAY,CAAU;QACpB,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAW;QACpC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QAEvB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC;QAC7D,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3B,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CACtB,KAAY,EACZ,UAA0B;QAE1B,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3D,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAY;QACtC,MAAM,CAAC,GAAY,MAAM,YAAE,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM;QACjB,MAAM,MAAM,GAAG,YAAE,CAAC,qBAAqB,EAAE,CAAC;QAC1C,MAAM,YAAE,CAAC,KAAK,CAAC,eAAe,MAAM,yBAAyB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,GAAQ;QAC1B,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF;AAED,iBAAS,IAAI,CAAC"}

package/dist/models/scheduler.d.ts

@@ -1,4 +1,3 @@
-export = runScheduler;
 /**
  * @param {object} opts
  * @param {function} [opts.stop_when]
@@ -8,11 +7,12 @@ export = runScheduler;
  * @param {boolean} opts.disableScheduler
  * @returns {Promise<void>}
  */
-declare function runScheduler({ stop_when, tickSeconds, watchReaper, port, disableScheduler, }?: {
-    stop_when?: Function | undefined;
-    number?: number | undefined;
-    watchReaper: boolean;
-    port: string;
-    disableScheduler: boolean;
-}): Promise<void>;
+declare const runScheduler: ({ stop_when, tickSeconds, watchReaper, port, disableScheduler, }?: {
+    stop_when?: (() => boolean) | undefined;
+    tickSeconds?: number | undefined;
+    watchReaper?: boolean | undefined;
+    port?: number | undefined;
+    disableScheduler?: boolean | undefined;
+}) => Promise<void>;
+export = runScheduler;
 //# sourceMappingURL=scheduler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../models/scheduler.js"],"names":[],"mappings":";AA6FA;;;;;;;;GAQG;AACH;IAP2B,SAAS;IACX,MAAM;IACN,WAAW,EAAzB,OAAO;IACM,IAAI,EAAjB,MAAM;IACQ,gBAAgB,EAA9B,OAAO;IACL,QAAQ,IAAI,CAAC,CA4DzB"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../models/scheduler.ts"],"names":[],"mappings":"AAgGA;;;;;;;;GAQG;AACH,QAAA,MAAM,YAAY;uBAOE,OAAO;;;;;mBAyD1B,CAAC;AAEF,SAAS,YAAY,CAAC"}

package/dist/models/scheduler.js

@@ -1,16 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 /**
  * @category saltcorn-data
  * @module models/scheduler
  * @subcategory models
  */
-const Crash = require("./crash");
+const crash_1 = __importDefault(require("./crash"));
 const { eachTenant } = require("./tenant");
-const Trigger = require("./trigger");
-const db = require("../db");
+const trigger_1 = __importDefault(require("./trigger"));
+const db_1 = __importDefault(require("../db"));
 const { getState } = require("../db/state");
-const fetch = require("node-fetch");
-const EventLog = require("./eventlog");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const eventlog_1 = __importDefault(require("./eventlog"));
 /**
  * @param {Date} date
  * @param {number} plusSeconds
@@ -48,7 +51,7 @@ const getIntervalTriggersDueNow = async (name, hours) => {
     if (due > now)
         return [];
     //console.log("after check", {due, name, now});
-    const triggers = await Trigger.find({ when_trigger: name });
+    const triggers = await trigger_1.default.find({ when_trigger: name });
     due.setHours(due.getHours() + hours);
     if (now > due) {
         // we must have skipped events, e.g. if not running continuously
@@ -56,7 +59,7 @@ const getIntervalTriggersDueNow = async (name, hours) => {
         due.setHours(due.getHours() + hours);
     }
     await state.setConfig(cfgField, due);
-    EventLog.create({
+    eventlog_1.default.create({
         event_type: name,
         channel: null,
         user_id: null,
@@ -72,14 +75,14 @@ let availabilityPassed = false;
  */
 const checkAvailability = async (port) => {
     try {
-        const response = await fetch(`http://127.0.0.1:${port}/auth/login`);
+        const response = await (0, node_fetch_1.default)(`http://127.0.0.1:${port}/auth/login`);
         const pass = response.status < 400;
         if (pass)
             availabilityPassed = true;
         else if (availabilityPassed) {
             console.error("Availability check failed, restarting...");
             try {
-                await Crash.create(new Error("Availability check failed"), {
+                await crash_1.default.create(new Error("Availability check failed"), {
                     url: "/",
                     headers: {},
                 });
@@ -106,7 +109,7 @@ const checkAvailability = async (port) => {
 const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, watchReaper, port, disableScheduler, } = {}) => {
     let stopit;
     const run = async () => {
-        if (watchReaper)
+        if (watchReaper && port)
             await checkAvailability(port);
         if (disableScheduler)
             return;
@@ -114,15 +117,15 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
         if (stopit)
             return;
         await eachTenant(async () => {
-            const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
-            EventLog.create({
+            const isRoot = db_1.default.getTenantSchema() === db_1.default.connectObj.default_schema;
+            eventlog_1.default.create({
                 event_type: "Often",
                 channel: null,
                 user_id: null,
                 payload: null,
                 occur_at: new Date(),
             });
-            const triggers = await Trigger.find({ when_trigger: "Often" });
+            const triggers = await trigger_1.default.find({ when_trigger: "Often" });
             const trsHourly = await getIntervalTriggersDueNow("Hourly", 1);
             const trsDaily = await getIntervalTriggersDueNow("Daily", 24);
             const trsWeekly = await getIntervalTriggersDueNow("Weekly", 24 * 7);
@@ -138,7 +141,7 @@ const runScheduler = async ({ stop_when = () => false, tickSeconds = 60 * 5, wat
                 }
                 catch (e) {
                     if (isRoot)
-                        await Crash.create(e, {
+                        await crash_1.default.create(e, {
                             url: `trigger: action ${trigger.action} id ${trigger.id}`,
                             headers: {},
                         });

package/dist/models/scheduler.js.map

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

package/dist/models/table.d.ts

@@ -1,6 +1,6 @@
 import type { Where, SelectOptions, Row, JoinOptions } from "@saltcorn/db-common/internal";
 import Field from "./field";
-import { AbstractTable } from "@saltcorn/types/model-abstracts/abstract_table";
+import type { AbstractTable, TableCfg, TablePack } from "@saltcorn/types/model-abstracts/abstract_table";
 import type { ResultMessage } from "@saltcorn/types/common_types";
 /**
  * Table class
@@ -9,14 +9,14 @@ import type { ResultMessage } from "@saltcorn/types/common_types";
 declare class Table implements AbstractTable {
     name: string;
     id?: number;
-    min_role_read: string;
-    min_role_write: string;
+    min_role_read: number;
+    min_role_write: number;
     ownership_field_id?: string;
     ownership_formula?: string;
     versioned: boolean;
     external: boolean;
-    description: string;
-    fields?: Field[];
+    description?: string;
+    fields?: Field[] | null;
     /**
      * Table constructor
      * @param {object} o
@@ -48,7 +48,7 @@ declare class Table implements AbstractTable {
      * @param fields - fields list
      * @returns {null|*} null or owner column name
      */
-    owner_fieldname_from_fields(fields?: Field[]): string | null | undefined;
+    owner_fieldname_from_fields(fields?: Field[] | null): string | null | undefined;
     /**
      * Get owner column name
      * @returns {Promise<string|null|*>}
@@ -67,7 +67,7 @@ declare class Table implements AbstractTable {
      * @param options - table fields
      * @returns {Promise<Table>} table
      */
-    static create(name: string, options?: SelectOptions): Promise<Table>;
+    static create(name: string, options?: SelectOptions | TablePack): Promise<Table>;
     /**
      * Drop current table
      * @returns {Promise<void>}
@@ -78,6 +78,7 @@ declare class Table implements AbstractTable {
      * @type {string}
      */
     get sql_name(): string;
+    resetSequence(): Promise<void>;
     /**
      * Delete rows from table
      * @param where - condition
@@ -108,7 +109,7 @@ declare class Table implements AbstractTable {
      * @param where
      * @returns {Promise<number>}
      */
-    countRows(where: Where): Promise<number>;
+    countRows(where?: Where): Promise<number>;
     /**
      * Return distinct Values for column in table
      * ????
@@ -150,14 +151,14 @@ declare class Table implements AbstractTable {
      * @param _userid
      * @returns {Promise<*>}
      */
-    insertRow(v_in: any, _userid: any): Promise<any>;
+    insertRow(v_in: Row, _userid?: number): Promise<any>;
     /**
      * Try to Insert row
      * @param v
      * @param _userid
      * @returns {Promise<{error}|{success: *}>}
      */
-    tryInsertRow(v: any, _userid?: number): Promise<{
+    tryInsertRow(v: Row, _userid?: number): Promise<{
         error: string;
     } | {
         success: any;
@@ -244,7 +245,7 @@ declare class Table implements AbstractTable {
      * @param {object} [opts = {}]
      * @returns {Promise<object[]>}
      */
-    getJoinedRows(opts?: JoinOptions | any): Promise<any>;
+    getJoinedRows(opts?: JoinOptions | any): Promise<Array<Row>>;
     slug_options(): Promise<Array<{
         label: string;
         steps: any;
@@ -257,17 +258,6 @@ declare class Table implements AbstractTable {
     }>;
 }
 declare namespace Table {
-    type TableCfg = {
-        name: string;
-        id?: number;
-        min_role_read: string;
-        min_role_write: string;
-        ownership_field_id?: string;
-        ownership_formula?: string;
-        versioned?: boolean;
-        description: string;
-        fields: Field[];
-    };
     type ParentRelations = {
         parent_relations: {
             key_field: Field;
@@ -284,7 +274,6 @@ declare namespace Table {
         child_field_list: string[];
     };
 }
-declare type TableCfg = Table.TableCfg;
 declare type ParentRelations = Table.ParentRelations;
 declare type ChildRelations = Table.ChildRelations;
 export = Table;

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

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,KAAK,EACL,aAAa,EACb,GAAG,EAEH,WAAW,EAEZ,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACR,SAAS,EACV,MAAM,gDAAgD,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AA+ElE;;;GAGG;AACH,cAAM,KAAM,YAAW,aAAa;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAExB;;;OAGG;gBACS,CAAC,EAAE,QAAQ;IAavB;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI;IAyBlD;;;;;OAKG;WACU,IAAI,CACf,KAAK,CAAC,EAAE,KAAK,EACb,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,EAAE,CAAC;IAUnB;;;;;OAKG;WACU,kBAAkB,CAC7B,MAAM,GAAE,KAAU,EAClB,UAAU,GAAE,aAAiD,GAC5D,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBnB;;;;OAIG;IACH,2BAA2B,CACzB,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,GACtB,MAAM,GAAG,IAAI,GAAG,SAAS;IAM5B;;;OAGG;IACH,eAAe,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAM5C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO;IActC;;;;;OAKG;WACU,MAAM,CACjB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,aAAa,GAAG,SAAc,GACtC,OAAO,CAAC,KAAK,CAAC;IAqCjB;;;OAGG;IACG,MAAM,CAAC,WAAW,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCzD;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,aAAa;IAenB;;;;OAIG;IACG,UAAU,CAAC,KAAK,EAAE,KAAK;IAgB7B;;;;OAIG;IACH,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG;IAUzB;;;;OAIG;IACG,MAAM,CAAC,KAAK,GAAE,KAAU,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAOpD;;;;;OAKG;IACG,OAAO,CAAC,KAAK,GAAE,KAAU,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IASzE;;;;OAIG;IACG,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/C;;;;;OAKG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAOrD;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvE;;;;;;OAMG;IACG,YAAY,CAChB,CAAC,EAAE,GAAG,EACN,EAAE,EAAE,GAAG,EACP,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC;IASzB;;;;;OAKG;IACG,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5D;;;OAGG;IACH,IAAI,OAAO,IAAI,MAAM,CAMpB;IAED;;;;;OAKG;IACG,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAiB1D;;;;;OAKG;IACG,YAAY,CAChB,CAAC,EAAE,GAAG,EACN,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC;IAShD;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAUnC;;;OAGG;IAEG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB3C;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOzC;;;;OAIG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC7C;;;;;OAKG;IACG,MAAM,CAAC,aAAa,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/C;;;;OAIG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAQ7C;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;;OAKG;WACU,eAAe,CAC1B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC;IA6EzB;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,OAAO,EACvB,mBAAmB,CAAC,EAAE,OAAO,GAC5B,OAAO,CAAC,aAAa,CAAC;IAqJzB;;;;;OAKG;IACG,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,mBAAmB,CAAC,EAAE,OAAO,GAC5B,OAAO,CAAC,GAAG,CAAC;IAwCf;;;;OAIG;IACG,oBAAoB,CAAC,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IA2D5E;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,cAAc,CAAC;IAkBpD;;;;OAIG;IACG,cAAc,CAAC,IAAI,GAAE,WAAW,GAAG,GAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAsJhE;;;OAGG;IACG,aAAa,CAAC,IAAI,GAAE,WAAW,GAAG,GAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAShE,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;WA2BtD,cAAc,IAAI,OAAO,CAAC;QACrC,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,CAAC;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,GAAG,CAAA;SAAE,CAAC,CAAC;KACpD,CAAC;CAUH;AAGD,kBAAU,KAAK,CAAC;IACd,KAAY,eAAe,GAAG;QAC5B,gBAAgB,EAAE;YAChB,SAAS,EAAE,KAAK,CAAC;YACjB,KAAK,CAAC,EAAE,KAAK,CAAC;YACd,OAAO,CAAC,EAAE,KAAK,CAAC;SACjB,EAAE,CAAC;QACJ,iBAAiB,EAAE,MAAM,EAAE,CAAC;KAC7B,CAAC;IAEF,KAAY,cAAc,GAAG;QAC3B,eAAe,EAAE;YACf,SAAS,EAAE,KAAK,CAAC;YACjB,KAAK,EAAE,KAAK,CAAC;SACd,EAAE,CAAC;QACJ,gBAAgB,EAAE,MAAM,EAAE,CAAC;KAC5B,CAAC;CACH;AAED,aAAK,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;AAC7C,aAAK,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;AAE3C,SAAS,KAAK,CAAC"}