@autofleet/sadot 0.0.1-beta.2 → 0.0.1-beta.20

package/dist/index.js

@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.disableCustomFields = void 0;
 const sequelize_1 = require("sequelize");
 const models_1 = require("./models");
 const api_1 = __importDefault(require("./api"));
@@ -45,12 +46,13 @@ const addHooks = (models, getModel) => {
             model.refreshAttributes();
             // TODO: Uncomment after tests are passed
             // model.addHook('afterFind', workaround);
-            model.addHook('afterFind', hooks_1.afterFind);
-            model.addHook('beforeBulkCreate', hooks_1.beforeBulkCreate);
-            model.addHook('afterFind', (0, hooks_1.afterFind)(scopeAttributes));
-            model.addHook('beforeBulkUpdate', hooks_1.beforeBulkUpdate);
-            model.addHook('beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
-            model.addHook('beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
+            model.addHook('beforeFind', 'sadot-beforeFind', (0, hooks_1.beforeFind)(scopeAttributes));
+            model.addHook('beforeBulkCreate', 'sadot-beforeBulkCreate', hooks_1.beforeBulkCreate);
+            model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', hooks_1.beforeBulkUpdate);
+            model.addHook('beforeCreate', 'sadot-beforeCreate', (0, hooks_1.beforeCreate)(scopeAttributes));
+            model.addHook('beforeUpdate', 'sadot-beforeUpdate', (0, hooks_1.beforeUpdate)(scopeAttributes));
+            model.addHook('afterFind', 'sadot-afterFind', (0, hooks_1.enrichResults)(scopeAttributes));
+            model.addHook('afterUpdate', 'sadot-afterUpdate', (0, hooks_1.enrichResults)(scopeAttributes));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
@@ -62,19 +64,41 @@ const addHooks = (models, getModel) => {
  * @see {@link 'custom-fields/config'} for configurations
  */
 const useCustomFields = (app, getModel, options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { innerSequelize, models } = options;
-    // deepAfterFindWorkAround(sequelize);
+    const { models } = options;
     if (app) {
         app.use('/api', api_1.default);
     }
-    if (!innerSequelize) {
-        const moreInnerSequelize = (0, db_1.default)(options.databaseConfig);
-        yield (0, models_1.initTables)(moreInnerSequelize);
-    }
-    else {
-        yield (0, models_1.initTables)(innerSequelize);
-    }
+    const sequelize = (0, db_1.default)(options.databaseConfig);
+    yield (0, models_1.initTables)(sequelize, options.getUser);
     addHooks(models, getModel);
 });
 exports.default = useCustomFields;
+const removeHooks = (models, getModel) => {
+    models.forEach(({ name }) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const model = getModel(name);
+            if (!model)
+                return;
+            if (model.rawAttributes.customFields) {
+                delete model.rawAttributes.customFields;
+                model.refreshAttributes();
+            }
+            // model.removeHook('afterFind', 'sadot-workaround');
+            model.removeHook('beforeFind', 'sadot-beforeFind');
+            model.removeHook('beforeBulkCreate', 'sadot-beforeBulkCreate');
+            model.removeHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate');
+            model.removeHook('beforeCreate', 'sadot-beforeCreate');
+            model.removeHook('beforeUpdate', 'sadot-beforeUpdate');
+            model.removeHook('afterFind', 'sadot-afterFind');
+            model.removeHook('afterUpdate', 'sadot-afterUpdate');
+        }
+        catch (e) {
+            logger_1.default.error(`Could not add custom fields hook to model ${name}. `, e);
+        }
+    }));
+};
+const disableCustomFields = (models, getModel) => {
+    removeHooks(models, getModel);
+};
+exports.disableCustomFields = disableCustomFields;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAAsC;AACtC,qCAAsC;AACtC,gDAAwB;AACxB,mCAAoG;AACpG,oDAAgC;AAChC,4DAAoC;AAGpC,oEAAkD;AAElD,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAE,QAAsB,EAAE,EAAE;IAClE,MAAM,CAAC,OAAO,CAAC,CAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE;QACjD,IAAI;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,KAAK,CAAC,aAAa,CAAC,YAAY,GAAG;gBACjC,IAAI,EAAE,qBAAS,CAAC,OAAO;aACxB,CAAC;YACF,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,yCAAyC;YACzC,0CAA0C;YAC1C,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAS,CAAC,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,wBAAgB,CAAC,CAAC;YACpD,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAA,iBAAS,EAAC,eAAe,CAAC,CAAC,CAAC;YACvD,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,wBAAgB,CAAC,CAAC;YACpD,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;YAC7D,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;SAC9D;QAAC,OAAO,CAAC,EAAE;YACV,gBAAM,CAAC,KAAK,CAAC,6CAA6C,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;SACxE;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,eAAe,GAAG,CACtB,GAAuB,EACvB,QAAsB,EACtB,OAA2B,EACZ,EAAE;IACjB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3C,sCAAsC;IACtC,IAAI,GAAG,EAAE;QACP,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAG,CAAC,CAAC;KACtB;IACD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,kBAAkB,GAAG,IAAA,YAAM,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC1D,MAAM,IAAA,mBAAU,EAAC,kBAAkB,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,IAAA,mBAAU,EAAC,cAAc,CAAC,CAAC;KAClC;IACD,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAA,CAAC;AAEF,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/models/CustomFieldDefinition.js

@@ -9,24 +9,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomFieldDefinitionType = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable indent */
 const sequelize_typescript_1 = require("sequelize-typescript");
+const custom_1 = require("../utils/validations/custom");
+const type_1 = require("../utils/validations/type");
 const _1 = require(".");
 const events_1 = require("../events");
-/**
- * Supported custom field types
- */
-var CustomFieldDefinitionType;
-(function (CustomFieldDefinitionType) {
-    CustomFieldDefinitionType["NUMBER"] = "number";
-    CustomFieldDefinitionType["BOOLEAN"] = "boolean";
-    CustomFieldDefinitionType["DATE"] = "date";
-    CustomFieldDefinitionType["DATETIME"] = "datetime";
-    CustomFieldDefinitionType["TEXT"] = "text";
-    CustomFieldDefinitionType["IMAGE"] = "image";
-    CustomFieldDefinitionType["ENUM"] = "enum";
-})(CustomFieldDefinitionType = exports.CustomFieldDefinitionType || (exports.CustomFieldDefinitionType = {}));
+const errors_1 = require("../errors");
 let CustomFieldDefinition = class CustomFieldDefinition extends sequelize_typescript_1.Model {
     static displayNameDefaultValue(instance) {
         if (!(instance === null || instance === void 0 ? void 0 : instance.displayName)) {
@@ -66,6 +56,11 @@ __decorate([
     __metadata("design:type", String)
 ], CustomFieldDefinition.prototype, "displayName", void 0);
 __decorate([
+    (0, sequelize_typescript_1.Is)('SupportedType', (value) => {
+        if (!Object.values(type_1.CustomFieldDefinitionType).includes(value)) {
+            throw new errors_1.UnsupportedCustomFieldTypeError(`"${value}" is not a supported type.`);
+        }
+    }),
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.STRING,
         allowNull: false,
@@ -151,9 +146,20 @@ CustomFieldDefinition = __decorate([
     (0, sequelize_typescript_1.DefaultScope)(() => ({ where: { disabled: false } })),
     (0, sequelize_typescript_1.Table)({
         indexes: [
-            { name: "unique_name_model_type", fields: ["name", "model_type", "entity_id"], unique: true },
+            {
+                name: 'unique_name_model_type',
+                fields: ['name', 'model_type', 'entity_id'],
+                unique: true,
+            },
         ],
         timestamps: true,
+        validate: {
+            validationByType() {
+                if (!(0, custom_1.validateValidation)(this.fieldType, this.validation)) {
+                    throw new errors_1.UnsupportedCustomValidationError(`Validation provided for "${this.fieldType}" is not supported`);
+                }
+            },
+        },
     })
 ], CustomFieldDefinition);
 exports.default = CustomFieldDefinition;

package/dist/models/CustomFieldDefinition.js.map

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

package/dist/models/CustomFieldValue.js

@@ -45,17 +45,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable indent */
 const sequelize_typescript_1 = require("sequelize-typescript");
 const events_1 = require("../events");
 const _1 = require(".");
 const validations_1 = __importDefault(require("../utils/validations"));
 const CustomFieldDefinitionRepo = __importStar(require("../repository/definition"));
-const logger_1 = __importDefault(require("../utils/logger"));
+const errors_1 = require("../errors");
 let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Model {
     static validateValues(instances) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.default.info('CustomFieldValue BeforeBulkCreate/BeforeBulkUpdate', { instances });
-            const ids = instances.map(instance => instance.customFieldDefinitionId);
+            const ids = instances.map((instance) => instance.customFieldDefinitionId);
             const uniqueIds = [...new Set(ids)];
             const definitions = yield CustomFieldDefinitionRepo.findByIds(uniqueIds, { withDisabled: true });
             if (!definitions || definitions.length !== uniqueIds.length) {
@@ -63,28 +63,27 @@ let CustomFieldValue = class CustomFieldValue extends sequelize_typescript_1.Mod
             }
             instances.forEach((instance) => {
                 const { validation, fieldType, } = definitions
-                    .find(definition => definition.id === instance.customFieldDefinitionId);
+                    .find((definition) => definition.id === instance.customFieldDefinitionId);
                 const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
                 if (!isValid) {
-                    throw new Error('Invalid value');
+                    throw new errors_1.InvalidValueError(instance.value, fieldType);
                 }
             });
         });
     }
     static validateValue(instance) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.default.info('CustomFieldValue BeforeCreate/BeforeUpdate', { instance });
             const { customFieldDefinitionId } = instance;
+            // eslint-disable-next-line max-len
             const cfd = yield CustomFieldDefinitionRepo.findById(customFieldDefinitionId, { withDisabled: true });
             const { validation, fieldType } = cfd;
             const isValid = (0, validations_1.default)(instance.value, fieldType, validation);
             if (!isValid) {
-                throw new Error('Invalid value');
+                throw new errors_1.InvalidValueError(instance.value, fieldType);
             }
         });
     }
     static afterSaveHandler(instance, options) {
-        logger_1.default.info('CustomFieldValue afterSave', { instance });
         if (options.transaction) {
             options.transaction.afterCommit(() => (0, events_1.sendDimEvent)(instance[0]));
         }
@@ -113,7 +112,7 @@ __decorate([
 __decorate([
     (0, sequelize_typescript_1.Column)({
         type: sequelize_typescript_1.DataType.JSONB,
-        allowNull: false,
+        allowNull: true,
     }),
     __metadata("design:type", Object)
 ], CustomFieldValue.prototype, "value", void 0);

package/dist/models/CustomFieldValue.js.map

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

package/dist/models/index.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initTables = exports.AssociatedTestModel = exports.TestModel = exports.CustomFieldDefinition = exports.CustomFieldValue = void 0;
 const logger_1 = __importDefault(require("../utils/logger"));
-// import addPermanentHooks from '../hooks/permanent-hooks';
 const CustomFieldDefinition_1 = __importDefault(require("./CustomFieldDefinition"));
 exports.CustomFieldDefinition = CustomFieldDefinition_1.default;
 const CustomFieldValue_1 = __importDefault(require("./CustomFieldValue"));
@@ -23,18 +22,17 @@ const TestModel_1 = __importDefault(require("./tests/TestModel"));
 exports.TestModel = TestModel_1.default;
 const AssociatedTestModel_1 = __importDefault(require("./tests/AssociatedTestModel"));
 exports.AssociatedTestModel = AssociatedTestModel_1.default;
-// export const CustomFieldDefinition = CustomFieldDefinitionModel;
-// export { default as CustomFieldDefinition } from './custom-field-definition.model';
 const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.default];
 const testModels = [...productionModels, TestModel_1.default, AssociatedTestModel_1.default];
-const initTables = (sequelize) => __awaiter(void 0, void 0, void 0, function* () {
+const initTables = (sequelize, getUser) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.default.info('custom-fields: initialize custom-fields tables');
     // Detect models and import them to the orm
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
     if (!sequelize.addModels) {
         throw new Error('sequelize instance must have addModels function');
     }
-    sequelize.addModels(process.env.NODE_ENV === 'test' ? testModels : productionModels);
+    const models = process.env.NODE_ENV === 'test' ? testModels : productionModels;
+    sequelize.addModels(models);
     yield sequelize.dropSchema('custom-fields', { logging: false });
     yield sequelize.createSchema('custom-fields', { logging: false });
     logger_1.default.info('custom-fields: models added');
@@ -45,6 +43,21 @@ const initTables = (sequelize) => __awaiter(void 0, void 0, void 0, function* ()
         yield AssociatedTestModel_1.default.sync({ alter: true });
     }
     logger_1.default.info('custom-fields: models synced');
+    CustomFieldDefinition_1.default.addScope('userScope', () => {
+        const user = getUser();
+        if (user === null || user === void 0 ? void 0 : user.permissions) {
+            return {
+                where: {
+                    entityId: [
+                        ...Object.keys(user.permissions.fleets),
+                        ...Object.keys(user.permissions.businessModels),
+                        ...Object.keys(user.permissions.demandSources),
+                    ],
+                },
+            };
+        }
+        return {};
+    });
 });
 exports.initTables = initTables;
 //# sourceMappingURL=index.js.map

package/dist/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6DAAqC;AACrC,4DAA4D;AAE5D,oFAA4D;AAmC1D,gCAnCK,+BAAqB,CAmCL;AAlCvB,0EAAkD;AAiChD,2BAjCK,0BAAgB,CAiCL;AAhClB,kEAA0C;AAkCxC,oBAlCK,mBAAS,CAkCL;AAjCX,sFAA8D;AAkC5D,8BAlCK,6BAAmB,CAkCL;AAhCrB,mEAAmE;AACnE,sFAAsF;AAEtF,MAAM,gBAAgB,GAAG,CAAC,+BAAqB,EAAE,0BAAgB,CAAC,CAAC;AACnE,MAAM,UAAU,GAAG,CAAC,GAAG,gBAAgB,EAAE,mBAAS,EAAE,6BAAmB,CAAC,CAAC;AAEzE,MAAM,UAAU,GAAG,CAAO,SAAoB,EAAiB,EAAE;IAC/D,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IAC9D,2CAA2C;IAC3C,4EAA4E;IAC5E,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IACD,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACrF,MAAM,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAChE,MAAM,SAAS,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,gBAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,+BAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,0BAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;QACnC,MAAM,mBAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,6BAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACjD;IACD,gBAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC;AAOA,gCAAU"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,6DAAqC;AACrC,oFAA4D;AAmD1D,gCAnDK,+BAAqB,CAmDL;AAlDvB,0EAAkD;AAiDhD,2BAjDK,0BAAgB,CAiDL;AAhDlB,kEAA0C;AAkDxC,oBAlDK,mBAAS,CAkDL;AAjDX,sFAA8D;AAkD5D,8BAlDK,6BAAmB,CAkDL;AAhDrB,MAAM,gBAAgB,GAAG,CAAC,+BAAqB,EAAE,0BAAgB,CAAC,CAAC;AACnE,MAAM,UAAU,GAAG,CAAC,GAAG,gBAAgB,EAAE,mBAAS,EAAE,6BAAmB,CAAC,CAAC;AAEzE,MAAM,UAAU,GAAG,CAAO,SAAoB,EAAE,OAAO,EAAiB,EAAE;IACxE,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IAC9D,2CAA2C;IAC3C,4EAA4E;IAC5E,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE/E,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAChE,MAAM,SAAS,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,gBAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,+BAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,0BAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;QACnC,MAAM,mBAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,6BAAmB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACjD;IACD,gBAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAE5C,+BAAqB,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QAC/C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;QACvB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAE;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;wBACvC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC;wBAC/C,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;qBAC/C;iBACF;aACF,CAAC;SACH;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAOA,gCAAU"}

package/dist/repository/definition.js

@@ -14,17 +14,11 @@ const sequelize_1 = require("sequelize");
 const models_1 = require("../models");
 const create = (data) => models_1.CustomFieldDefinition.create(data);
 exports.create = create;
-const findAll = (query, options = { withDisabled: false }) => {
+const findAll = (where, options = { withDisabled: false }) => {
     if (options.withDisabled) {
-        return models_1.CustomFieldDefinition.unscoped().findAll({
-            where: query,
-            include: [models_1.CustomFieldValue],
-        });
+        return models_1.CustomFieldDefinition.unscoped().scope('userScope').findAll({ where });
     }
-    return models_1.CustomFieldDefinition.findAll({
-        where: query,
-        include: [models_1.CustomFieldValue],
-    });
+    return models_1.CustomFieldDefinition.scope('userScope').findAll({ where });
 };
 exports.findAll = findAll;
 const findByIds = (ids, options = { withDisabled: false }) => (0, exports.findAll)({ id: { [sequelize_1.Op.in]: ids } }, options);
@@ -32,13 +26,9 @@ exports.findByIds = findByIds;
 const findById = (id, options = { withDisabled: false }) => {
     const { withDisabled } = options;
     if (withDisabled) {
-        return models_1.CustomFieldDefinition.unscoped().findByPk(id, {
-            include: [models_1.CustomFieldValue],
-        });
+        return models_1.CustomFieldDefinition.unscoped().scope('userScope').findByPk(id);
     }
-    return models_1.CustomFieldDefinition.findByPk(id, {
-        include: [models_1.CustomFieldValue],
-    });
+    return models_1.CustomFieldDefinition.scope('userScope').findByPk(id);
 };
 exports.findById = findById;
 const findByEntityId = (entityId, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
@@ -48,7 +38,7 @@ const findByEntityId = (entityId, options = {}) => __awaiter(void 0, void 0, voi
     });
 });
 exports.findByEntityId = findByEntityId;
-const findByWhere = (where) => models_1.CustomFieldDefinition.findOne({
+const findByWhere = (where) => models_1.CustomFieldDefinition.scope('userScope').findOne({
     where,
     include: [models_1.CustomFieldValue],
 });
@@ -63,7 +53,7 @@ const findDefinitionsByModels = (modelTypes, options) => __awaiter(void 0, void
 });
 exports.findDefinitionsByModels = findDefinitionsByModels;
 const update = (id, data) => __awaiter(void 0, void 0, void 0, function* () {
-    const updatedDefinition = (yield models_1.CustomFieldDefinition.update(data, {
+    const updatedDefinition = (yield models_1.CustomFieldDefinition.scope('userScope').update(data, {
         where: { id },
         returning: true,
         individualHooks: true,
@@ -100,7 +90,7 @@ const getRequiredFields = (modelType, modelId, entityId, onlyNull = false) => __
         },
         logging: true,
     });
-    const requiredFieldsNames = requiredFields.map(definition => definition.name);
+    const requiredFieldsNames = requiredFields.map((definition) => definition.name);
     return [...new Set(requiredFieldsNames)];
 });
 exports.getRequiredFields = getRequiredFields;

package/dist/repository/definition.js.map

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

package/dist/repository/value.js

@@ -37,10 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteValue = exports.updateValues = exports.findValuesByModelIds = exports.findValuesByModelId = exports.findAllValues = exports.create = exports.findByModelIdAndDefinition = void 0;
 /* eslint-disable max-len */
-const sequelize_1 = require("sequelize");
 const models_1 = require("../models");
 const DefinitionRepo = __importStar(require("./definition"));
 const logger_1 = __importDefault(require("../utils/logger"));
+const errors_1 = require("../errors");
 const findByModelIdAndDefinition = (modelId, customFieldDefinitionId) => __awaiter(void 0, void 0, void 0, function* () { return models_1.CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [models_1.CustomFieldDefinition] }); });
 exports.findByModelIdAndDefinition = findByModelIdAndDefinition;
 const create = (data, withAssociations = false) => __awaiter(void 0, void 0, void 0, function* () {
@@ -80,25 +80,25 @@ exports.findValuesByModelIds = findValuesByModelIds;
  * Create new value record if not exists, but fails if value's definition not exist.
  * Return the updated values
  */
-const updateValues = (modelType, modelId, valuesToUpdate, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const updateValues = (modelType, modelId, identifiers, valuesToUpdate, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
     const names = Object.keys(valuesToUpdate);
-    const fieldDefinitions = (yield DefinitionRepo.findAll({ modelType, name: { [sequelize_1.Op.in]: names } }, { withDisabled: true, transaction: options.transaction })) || [];
-    const disabledDefinitions = fieldDefinitions.filter(def => def.disabled);
+    const fieldDefinitions = (yield DefinitionRepo.findAll({ modelType, name: names, entityId: identifiers }, { withDisabled: true, transaction: options.transaction })) || [];
+    const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
-        const missingDefinitions = names.filter(name => !fieldDefinitions.some(def => def.name === name));
-        throw new Error(`custom-fields: missing definitions for ${missingDefinitions.join(', ')}`);
+        const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
+        throw new errors_1.MissingDefinitionError(missingDefinitions);
     }
-    const disabledNames = (disabledDefinitions === null || disabledDefinitions === void 0 ? void 0 : disabledDefinitions.map(def => def.name)) || [];
-    const valuesWithDisabledDefinitions = names.filter(name => disabledNames.includes(name));
+    const disabledNames = (disabledDefinitions === null || disabledDefinitions === void 0 ? void 0 : disabledDefinitions.map((def) => def.name)) || [];
+    const valuesWithDisabledDefinitions = names.filter((name) => disabledNames.includes(name));
     if ((valuesWithDisabledDefinitions === null || valuesWithDisabledDefinitions === void 0 ? void 0 : valuesWithDisabledDefinitions.length) > 0) {
         logger_1.default.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
     }
-    const values = names.map(name => ({
+    const values = names.map((name) => ({
         modelId,
         value: valuesToUpdate[name],
         updatedAt: new Date(),
-        customFieldDefinitionId: fieldDefinitions.find(def => def.name === name).id,
+        customFieldDefinitionId: fieldDefinitions.find((def) => def.name === name).id,
     }));
     return Promise.all(values.map((value) => __awaiter(void 0, void 0, void 0, function* () {
         const [cfv] = yield models_1.CustomFieldValue.upsert(value, {

package/dist/repository/value.js.map

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

package/dist/tests/helpers/database-config.js

@@ -4,7 +4,7 @@ exports.default = {
     test: {
         username: process.env.DB_USERNAME || '',
         password: process.env.DB_PASSWORD || null,
-        database: process.env.DB_NAME || 'vehicles_service_test',
+        database: process.env.DB_NAME || 'sadot_package_test',
         host: process.env.DB_HOST || '127.0.0.1',
         dialect: process.env.DB_TYPE || 'postgres',
         define: {

package/dist/tests/helpers/database-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-config.js","sourceRoot":"","sources":["../../../src/tests/helpers/database-config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;QACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI;QACzC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,uBAAuB;QACxD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW;QACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;QAC1C,MAAM,EAAE;YACN,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK;KACf;CACF,CAAC"}
+{"version":3,"file":"database-config.js","sourceRoot":"","sources":["../../../src/tests/helpers/database-config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;QACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI;QACzC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,oBAAoB;QACrD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW;QACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;QAC1C,MAAM,EAAE;YACN,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK;KACf;CACF,CAAC"}

package/dist/tests/mocks/{index.js → definition.mock.js}

@@ -22,10 +22,8 @@ exports.booleanField = booleanField;
 const enumField = (modelType, options) => ({
     name: 'choices',
     modelType,
-    fieldType: 'enum',
-    validation: {
-        enum: options,
-    },
+    fieldType: 'select',
+    validation: options,
     entityId: (0, uuid_1.v4)(),
     entityType: 'fleetId',
 });
@@ -41,6 +39,7 @@ const rangeField = (modelType) => ({
     entityType: 'fleetId',
 });
 exports.rangeField = rangeField;
+// eslint-disable-next-line max-len
 const createDefinition = (defaults) => ({
     name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
     modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
@@ -49,7 +48,7 @@ const createDefinition = (defaults) => ({
     entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
 });
 exports.createDefinition = createDefinition;
-const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map(_ => ({
+const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map((_) => ({
     name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
     modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
     fieldType: (defaults === null || defaults === void 0 ? void 0 : defaults.fieldType) || 'boolean',
@@ -57,4 +56,4 @@ const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map(
     entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
 })));
 exports.createDefinitions = createDefinitions;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=definition.mock.js.map

package/dist/tests/mocks/definition.mock.js.map

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

package/dist/tests/mocks/events.mock.js

@@ -0,0 +1,20 @@
+"use strict";
+/* eslint-disable no-param-reassign */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mockDimCustomFieldValueEvent = exports.mockDimCustomFieldDefinitionEvent = exports.mockEvent = void 0;
+const mockEvent = (events, eventName, numberOfEvents) => {
+    events.sendObject = jest.fn();
+    return [
+        events.sendObject,
+        () => {
+            const matchingEvents = events.sendObject.mock.calls.filter((call) => call[0] === eventName);
+            expect(matchingEvents.length).toEqual(numberOfEvents);
+        },
+    ];
+};
+exports.mockEvent = mockEvent;
+const mockDimCustomFieldDefinitionEvent = (events, numberOfEvents) => (0, exports.mockEvent)(events, 'dim_custom_field_definition', numberOfEvents);
+exports.mockDimCustomFieldDefinitionEvent = mockDimCustomFieldDefinitionEvent;
+const mockDimCustomFieldValueEvent = (events, numberOfEvents) => (0, exports.mockEvent)(events, 'dim_custom_field_value', numberOfEvents);
+exports.mockDimCustomFieldValueEvent = mockDimCustomFieldValueEvent;
+//# sourceMappingURL=events.mock.js.map

package/dist/tests/mocks/events.mock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.mock.js","sourceRoot":"","sources":["../../../src/tests/mocks/events.mock.ts"],"names":[],"mappings":";AAAA,sCAAsC;;;AAE/B,MAAM,SAAS,GAAG,CAAC,MAAW,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC9B,OAAO;QACL,MAAM,CAAC,UAAU;QACjB,GAAS,EAAE;YACT,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;YAC5F,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACxD,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,SAAS,aASpB;AAEK,MAAM,iCAAiC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAC1E,IAAA,iBAAS,EAAC,MAAM,EAAE,6BAA6B,EAAE,cAAc,CAAC,CAAC;AADtD,QAAA,iCAAiC,qCACqB;AAE5D,MAAM,4BAA4B,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CACrE,IAAA,iBAAS,EAAC,MAAM,EAAE,wBAAwB,EAAE,cAAc,CAAC,CAAC;AADjD,QAAA,4BAA4B,gCACqB"}

package/dist/tests/mocks/testModel.js

@@ -21,23 +21,25 @@ const createTestModels = (fleetId, total) => {
     return Promise.all(models);
 };
 exports.createTestModels = createTestModels;
-const upsertTestModel = payload => models_1.TestModel.upsert(payload);
+const upsertTestModel = (payload) => models_1.TestModel.upsert(payload);
 exports.upsertTestModel = upsertTestModel;
 const destroyTestModels = () => models_1.TestModel.destroy({ truncate: true });
 exports.destroyTestModels = destroyTestModels;
-const getTestModel = (id) => models_1.TestModel.findByPk(id);
+const getTestModel = (id, options = {}) => models_1.TestModel.findByPk(id, options);
 exports.getTestModel = getTestModel;
-const getSomeTestModels = (limit = 1) => models_1.TestModel.findAll({ limit });
+const getSomeTestModels = (options = { limit: 1 }) => models_1.TestModel.findAll(options);
 exports.getSomeTestModels = getSomeTestModels;
 const updateTestModel = (payload, query) => models_1.TestModel.update(payload, query);
 exports.updateTestModel = updateTestModel;
 // Associations
 const createTestModelWithAssociation = () => __awaiter(void 0, void 0, void 0, function* () {
     const model = yield models_1.TestModel.create({});
-    const associatedTestModel = yield models_1.AssociatedTestModel.create({ testModelId: model.id });
+    yield models_1.AssociatedTestModel.create({ testModelId: model.id });
     return model;
 });
 exports.createTestModelWithAssociation = createTestModelWithAssociation;
-const getTestModelWithAssociation = (limit = 1) => models_1.TestModel.findAll({ limit, include: [models_1.AssociatedTestModel] });
+const getTestModelWithAssociation = (limit = 1) => models_1.TestModel.findAll({
+    limit, include: [models_1.AssociatedTestModel],
+});
 exports.getTestModelWithAssociation = getTestModelWithAssociation;
 //# sourceMappingURL=testModel.js.map

package/dist/tests/mocks/testModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"testModel.js","sourceRoot":"","sources":["../../../src/tests/mocks/testModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8D;AAGvD,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAA9D,QAAA,eAAe,mBAA+C;AAEpE,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,KAAa,EAAE,EAAE;IACzD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;KAC3C;IACD,OAAO,OAAO,CAAC,GAAG,CAAY,MAAM,CAAC,CAAC;AACxC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAAvD,QAAA,eAAe,mBAAwC;AAE7D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAAhE,QAAA,iBAAiB,qBAA+C;AAEtE,MAAM,YAAY,GAAG,CAAC,EAAU,EAAsB,EAAE,CAAC,kBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAA1E,QAAA,YAAY,gBAA8D;AAEhF,MAAM,iBAAiB,GAAG,CAAC,KAAK,GAAG,CAAC,EAAwB,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;AAAtF,QAAA,iBAAiB,qBAAqE;AAE5F,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAAvE,QAAA,eAAe,mBAAwD;AAEpF,eAAe;AACR,MAAM,8BAA8B,GAAG,GAAS,EAAE;IACvD,MAAM,KAAK,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,mBAAmB,GAAG,MAAM,4BAAmB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACxF,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAJW,QAAA,8BAA8B,kCAIzC;AAEK,MAAM,2BAA2B,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,4BAAmB,CAAC,EAAE,CAAC,CAAC;AAA1G,QAAA,2BAA2B,+BAA+E"}
+{"version":3,"file":"testModel.js","sourceRoot":"","sources":["../../../src/tests/mocks/testModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8D;AAEvD,MAAM,eAAe,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAA9D,QAAA,eAAe,mBAA+C;AAEpE,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,KAAa,EAAE,EAAE;IACzD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;KAC3C;IACD,OAAO,OAAO,CAAC,GAAG,CAAY,MAAM,CAAC,CAAC;AACxC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAAzD,QAAA,eAAe,mBAA0C;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAAhE,QAAA,iBAAiB,qBAA+C;AAEtE,MAAM,YAAY,GAAG,CAC1B,EAAU,EACV,OAAO,GAAG,EAAE,EACQ,EAAE,CAAC,kBAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;AAH5C,QAAA,YAAY,gBAGgC;AAElD,MAAM,iBAAiB,GAAG,CAC/B,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EACA,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAFzC,QAAA,iBAAiB,qBAEwB;AAE/C,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,kBAAS,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAAvE,QAAA,eAAe,mBAAwD;AAEpF,eAAe;AACR,MAAM,8BAA8B,GAAG,GAAS,EAAE;IACvD,MAAM,KAAK,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,4BAAmB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5D,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAJW,QAAA,8BAA8B,kCAIzC;AAEK,MAAM,2BAA2B,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAS,CAAC,OAAO,CAAC;IAC1E,KAAK,EAAE,OAAO,EAAE,CAAC,4BAAmB,CAAC;CACtC,CAAC,CAAC;AAFU,QAAA,2BAA2B,+BAErC"}