@autofleet/sadot 1.6.18-beta.22 → 1.6.18-beta.24

package/dist/_virtual/rolldown_runtime.cjs

@@ -5,19 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (all, symbols) => {
-	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
-	return target;
-};
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") {
 		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
@@ -39,5 +26,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 
-exports.__export = __export;
 exports.__toESM = __toESM;

package/dist/_virtual/rolldown_runtime.js

@@ -1,21 +1,7 @@
 import { createRequire } from "node:module";
 
 //#region rolldown:runtime
-var __defProp = Object.defineProperty;
-var __export = (all, symbols) => {
-	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
-	return target;
-};
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
-export { __export, __require };
+export { __require };

package/dist/api/v1/definition/index.cjs

@@ -3,6 +3,7 @@ const require_index = require('../../../utils/logger/index.cjs');
 const require_definition = require('../../../repository/definition.cjs');
 const require_errors = require('../errors.cjs');
 const require_validations = require('./validations.cjs');
+const require_index$1 = require('../../../utils/helpers/index.cjs');
 const require_mat_path_state = require('../../../mat-path-state.cjs');
 let _autofleet_errors = require("@autofleet/errors");
 let _autofleet_node_common = require("@autofleet/node-common");
@@ -10,13 +11,12 @@ let _autofleet_node_common = require("@autofleet/node-common");
 //#region src/api/v1/definition/index.ts
 const router = (0, _autofleet_node_common.Router)({ logger: require_index.default });
 const ENTITY = "CustomFieldDefinition";
-const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (subStr) => subStr.replace(/-/, "").toUpperCase());
 /**
 * Create
 */
 router.post("/", async (req, res) => {
 	const { modelName } = req.params;
-	const modelType = toPascalCase(modelName);
+	const modelType = require_index$1.toPascalCase(modelName);
 	try {
 		const validatedPayload = await require_validations.validateCustomFieldDefinitionCreation(req.body);
 		const customFieldDefinition = await require_definition.create({
@@ -54,7 +54,7 @@ router.get("/:customFieldDefinitionId", async (req, res) => {
 */
 router.get("/", async (req, res) => {
 	const { params: { modelName }, query: { entityIds, modelTypeId } } = req;
-	const modelType = toPascalCase(modelName);
+	const modelType = require_index$1.toPascalCase(modelName);
 	try {
 		const applyEntityIdsFilter = !require_mat_path_state.matPathState.isMatPathEnabled?.() && entityIds && entityIds.length > 0;
 		if (modelTypeId) {
@@ -87,7 +87,7 @@ router.get("/", async (req, res) => {
 */
 router.patch("/:customFieldDefinitionId", async (req, res) => {
 	const { customFieldDefinitionId, modelName } = req.params;
-	const modelType = toPascalCase(modelName);
+	const modelType = require_index$1.toPascalCase(modelName);
 	try {
 		const validatedPayload = await require_validations.validateCustomFieldDefinitionUpdate(req.body);
 		if (!await require_definition.findByWhere({

package/dist/api/v1/index.cjs

@@ -2,14 +2,12 @@ const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
 const require_index = require('../../utils/logger/index.cjs');
 const require_index$1 = require('./definition/index.cjs');
 const require_index$2 = require('./validator/index.cjs');
-const require_index$3 = require('./field-policies/index.cjs');
 let _autofleet_node_common = require("@autofleet/node-common");
 
 //#region src/api/v1/index.ts
 const router = (0, _autofleet_node_common.Router)({ logger: require_index.default });
 router.use("/custom-field-definitions/:modelName", require_index$1.default);
 router.use("/custom-validators/:modelName", require_index$2.default);
-router.use("/field-policies/:entityType", require_index$3.default);
 var v1_default = router;
 
 //#endregion

package/dist/api/v1/validator/index.cjs

@@ -1,6 +1,7 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
 const require_index = require('../../../utils/logger/index.cjs');
 const require_errors = require('../errors.cjs');
+const require_index$1 = require('../../../utils/helpers/index.cjs');
 const require_mat_path_state = require('../../../mat-path-state.cjs');
 const require_validator = require('../../../repository/validator.cjs');
 const require_validations = require('./validations.cjs');
@@ -62,8 +63,9 @@ router.get("/effective", async (req, res) => {
 	if (!withMatPath) return res.status(http_status_codes.StatusCodes.NOT_IMPLEMENTED).json({ error: "Effective validator resolution is not configured" });
 	try {
 		const { modelName } = req.params;
-		const [validator] = await require_validator.findEffective(modelName, "AF.1");
-		return res.status(http_status_codes.StatusCodes.OK).json(validator ?? null);
+		const modelType = require_index$1.toPascalCase(modelName);
+		const validators = await require_validator.findEffective(modelType);
+		return res.status(http_status_codes.StatusCodes.OK).json(validators ?? null);
 	} catch (err) {
 		return require_errors.default(err, res, {
 			logger: require_index.default,

package/dist/index.cjs

@@ -5,14 +5,11 @@ const require_CustomFieldValue = require('./models/CustomFieldValue.cjs');
 const require_CustomFieldDefinition = require('./models/CustomFieldDefinition.cjs');
 const require_CustomFieldEntries = require('./models/CustomFieldEntries.cjs');
 const require_CustomValidator = require('./models/CustomValidator.cjs');
-const require_index$2 = require('./migrations/index.cjs');
-const require_index$3 = require('./models/index.cjs');
+const require_index$2 = require('./models/index.cjs');
+const require_index$3 = require('./utils/helpers/index.cjs');
 const require_mat_path_state = require('./mat-path-state.cjs');
-const require_FieldPolicy = require('./models/FieldPolicy.cjs');
-const require_field_policy = require('./repository/field-policy.cjs');
 const require_index$4 = require('./api/index.cjs');
 const require_index$5 = require('./utils/db/index.cjs');
-const require_index$6 = require('./utils/helpers/index.cjs');
 const require_filter = require('./scopes/filter.cjs');
 const require_init = require('./utils/init.cjs');
 const require_init_state = require('./init-state.cjs');
@@ -31,16 +28,14 @@ const internalUseCustomFields = async (app, getModel, options) => {
 	require_mat_path_state.matPathState.withMatPath = withMatPath;
 	if (app) app.use("/api", require_index$4.default);
 	const sequelize = options.sequelize ?? require_index$5.default(options.databaseConfig);
-	if (process.env.NODE_ENV === "test") await require_index$3.initTestModels(sequelize);
-	sequelize.addModels([require_FieldPolicy.default]);
+	if (process.env.NODE_ENV === "test") await require_index$2.initTestModels(sequelize);
 	require_init.addHooks(models, getModel, { useCustomFieldsEntries });
-	await require_index$3.initTables(sequelize, options.getUser, {
+	await require_index$2.initTables(sequelize, options.getUser, {
 		useCustomFieldsEntries,
 		useModelTypeMapping,
 		isMatPathEnabled,
 		runLegacyMigrations
 	});
-	await require_index$2.runSadotMigrations(sequelize);
 	require_init.addScopes(models, getModel, { useCustomFieldsEntries });
 	require_init.applyCustomAssociation(models);
 	require_index.default.debug("sadot - custom fields finished initializing with models", models);
@@ -68,17 +63,11 @@ exports.CustomFieldEntries = require_CustomFieldEntries.default;
 exports.CustomFieldValue = require_CustomFieldValue.default;
 exports.CustomFieldsSchema = require_custom_fields.CustomFieldsSchema;
 exports.CustomValidator = require_CustomValidator.default;
-exports.FieldPolicy = require_FieldPolicy.default;
-Object.defineProperty(exports, 'FieldPolicyRepo', {
-  enumerable: true,
-  get: function () {
-    return require_field_policy.field_policy_exports;
-  }
-});
 exports.customFieldsSortScope = require_filter.customFieldsSortScope;
 exports.default = src_default;
 exports.disableCustomFields = disableCustomFields;
-exports.generateCustomFieldSearchQueryPayload = require_index$6.generateCustomFieldSearchQueryPayload;
-exports.generateRandomString = require_index$6.generateRandomString;
+exports.generateCustomFieldSearchQueryPayload = require_index$3.generateCustomFieldSearchQueryPayload;
+exports.generateRandomString = require_index$3.generateRandomString;
 exports.sadotInitState = sadotInitState;
-exports.supportedEntities = require_index$1.supportedEntities;
+exports.supportedEntities = require_index$1.supportedEntities;
+exports.toPascalCase = require_index$3.toPascalCase;

package/dist/index.d.cts

@@ -1,15 +1,14 @@
-import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./utils/constants/index.cjs";
-import { CustomFieldValue } from "./models/CustomFieldValue.cjs";
-import { CustomFieldDefinition } from "./models/CustomFieldDefinition.cjs";
-import { CustomValidator } from "./models/CustomValidator.cjs";
-import { CustomFieldOptions, ModelFetcher, Models } from "./types/index.cjs";
-import { SadotInitializationState } from "./init-state.cjs";
-import { CustomFieldsSchema } from "./utils/validations/schema/custom-fields.cjs";
-import { generateCustomFieldSearchQueryPayload, generateRandomString } from "./utils/helpers/index.cjs";
-import { customFieldsSortScope } from "./scopes/filter.cjs";
-import { CustomFieldEntries } from "./models/CustomFieldEntries.cjs";
-import { FieldPolicy, ModelInclusion, ModelMode } from "./models/FieldPolicy.cjs";
-import { field_policy_d_exports } from "./repository/field-policy.cjs";
+import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./sadot/src/utils/constants/index.cjs";
+import { CustomFieldValue } from "./sadot/src/models/CustomFieldValue.cjs";
+import { CustomFieldDefinition } from "./sadot/src/models/CustomFieldDefinition.cjs";
+import { CustomValidator } from "./sadot/src/models/CustomValidator.cjs";
+import { CustomFieldOptions, ModelFetcher, Models } from "./sadot/src/types/index.cjs";
+import { SadotInitializationState } from "./sadot/src/init-state.cjs";
+import { CustomFieldsSchema } from "./sadot/src/utils/validations/schema/custom-fields.cjs";
+import { generateCustomFieldSearchQueryPayload, generateRandomString, toPascalCase } from "./sadot/src/utils/helpers/index.cjs";
+import { customFieldsSortScope } from "./sadot/src/scopes/filter.cjs";
+import { CustomFieldEntries } from "./sadot/src/models/CustomFieldEntries.cjs";
+import "./sadot/src/models/index.cjs";
 import { Application } from "express";
 import { Sequelize } from "sequelize-typescript";
 
@@ -22,4 +21,4 @@ declare const sadotInitState: SadotInitializationState;
 declare const useCustomFields: (app: Pick<Application, "use"> | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
 declare const disableCustomFields: (models: Models[], getModel: ModelFetcher) => void;
 //#endregion
-export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries, CustomFieldValue, CustomFieldsSchema, CustomValidator, FieldPolicy, field_policy_d_exports as FieldPolicyRepo, type ModelInclusion, type ModelMode, customFieldsSortScope, useCustomFields as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities };
+export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries, CustomFieldValue, CustomFieldsSchema, CustomValidator, customFieldsSortScope, useCustomFields as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities, toPascalCase };

package/dist/index.d.ts

@@ -1,16 +1,14 @@
-import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./utils/constants/index.js";
-import { CustomFieldValue } from "./models/CustomFieldValue.js";
-import { CustomFieldDefinition } from "./models/CustomFieldDefinition.js";
-import { CustomValidator } from "./models/CustomValidator.js";
-import { CustomFieldOptions, ModelFetcher, Models } from "./types/index.js";
-import { SadotInitializationState } from "./init-state.js";
-import { CustomFieldsSchema } from "./utils/validations/schema/custom-fields.js";
-import { generateCustomFieldSearchQueryPayload, generateRandomString } from "./utils/helpers/index.js";
-import { customFieldsSortScope } from "./scopes/filter.js";
-import { CustomFieldEntries } from "./models/CustomFieldEntries.js";
-import "./models/index.js";
-import { FieldPolicy, ModelInclusion, ModelMode } from "./models/FieldPolicy.js";
-import { field_policy_d_exports } from "./repository/field-policy.js";
+import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./sadot/src/utils/constants/index.js";
+import { CustomFieldValue } from "./sadot/src/models/CustomFieldValue.js";
+import { CustomFieldDefinition } from "./sadot/src/models/CustomFieldDefinition.js";
+import { CustomValidator } from "./sadot/src/models/CustomValidator.js";
+import { CustomFieldOptions, ModelFetcher, Models } from "./sadot/src/types/index.js";
+import { SadotInitializationState } from "./sadot/src/init-state.js";
+import { CustomFieldsSchema } from "./sadot/src/utils/validations/schema/custom-fields.js";
+import { generateCustomFieldSearchQueryPayload, generateRandomString, toPascalCase } from "./sadot/src/utils/helpers/index.js";
+import { customFieldsSortScope } from "./sadot/src/scopes/filter.js";
+import { CustomFieldEntries } from "./sadot/src/models/CustomFieldEntries.js";
+import "./sadot/src/models/index.js";
 import { Sequelize } from "sequelize-typescript";
 import { Application } from "express";
 
@@ -23,4 +21,4 @@ declare const sadotInitState: SadotInitializationState;
 declare const useCustomFields: (app: Pick<Application, "use"> | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
 declare const disableCustomFields: (models: Models[], getModel: ModelFetcher) => void;
 //#endregion
-export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries, CustomFieldValue, CustomFieldsSchema, CustomValidator, FieldPolicy, field_policy_d_exports as FieldPolicyRepo, type ModelInclusion, type ModelMode, customFieldsSortScope, useCustomFields as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities };
+export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries, CustomFieldValue, CustomFieldsSchema, CustomValidator, customFieldsSortScope, useCustomFields as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities, toPascalCase };

package/dist/index.js

@@ -1,21 +1,18 @@
-import logger_default, { tryAddingTraceIdMiddleware } from "./utils/logger/index.js";
-import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./utils/constants/index.js";
-import CustomFieldValue_default from "./models/CustomFieldValue.js";
-import CustomFieldDefinition_default from "./models/CustomFieldDefinition.js";
-import CustomFieldEntries_default from "./models/CustomFieldEntries.js";
-import CustomValidator_default from "./models/CustomValidator.js";
-import { runSadotMigrations } from "./migrations/index.js";
-import { initTables, initTestModels } from "./models/index.js";
-import { matPathState } from "./mat-path-state.js";
-import FieldPolicy_default from "./models/FieldPolicy.js";
-import { field_policy_exports } from "./repository/field-policy.js";
-import api_default from "./api/index.js";
-import db_default from "./utils/db/index.js";
-import { generateCustomFieldSearchQueryPayload, generateRandomString } from "./utils/helpers/index.js";
-import { customFieldsSortScope } from "./scopes/filter.js";
-import { addHooks, addScopes, applyCustomAssociation, removeHooks } from "./utils/init.js";
-import { SadotInitializationState } from "./init-state.js";
-import { CustomFieldsSchema } from "./utils/validations/schema/custom-fields.js";
+import logger_default, { tryAddingTraceIdMiddleware } from "./sadot/src/utils/logger/index.js";
+import { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinitionType, supportedEntities } from "./sadot/src/utils/constants/index.js";
+import CustomFieldValue_default from "./sadot/src/models/CustomFieldValue.js";
+import CustomFieldDefinition_default from "./sadot/src/models/CustomFieldDefinition.js";
+import CustomFieldEntries_default from "./sadot/src/models/CustomFieldEntries.js";
+import CustomValidator_default from "./sadot/src/models/CustomValidator.js";
+import { initTables, initTestModels } from "./sadot/src/models/index.js";
+import { generateCustomFieldSearchQueryPayload, generateRandomString, toPascalCase } from "./sadot/src/utils/helpers/index.js";
+import { matPathState } from "./sadot/src/mat-path-state.js";
+import api_default from "./sadot/src/api/index.js";
+import db_default from "./sadot/src/utils/db/index.js";
+import { customFieldsSortScope } from "./sadot/src/scopes/filter.js";
+import { addHooks, addScopes, applyCustomAssociation, removeHooks } from "./sadot/src/utils/init.js";
+import { SadotInitializationState } from "./sadot/src/init-state.js";
+import { CustomFieldsSchema } from "./sadot/src/utils/validations/schema/custom-fields.js";
 
 //#region src/index.ts
 const sadotInitState = new SadotInitializationState();
@@ -31,7 +28,6 @@ const internalUseCustomFields = async (app, getModel, options) => {
 	if (app) app.use("/api", api_default);
 	const sequelize = options.sequelize ?? db_default(options.databaseConfig);
 	if (process.env.NODE_ENV === "test") await initTestModels(sequelize);
-	sequelize.addModels([FieldPolicy_default]);
 	addHooks(models, getModel, { useCustomFieldsEntries });
 	await initTables(sequelize, options.getUser, {
 		useCustomFieldsEntries,
@@ -39,7 +35,6 @@ const internalUseCustomFields = async (app, getModel, options) => {
 		isMatPathEnabled,
 		runLegacyMigrations
 	});
-	await runSadotMigrations(sequelize);
 	addScopes(models, getModel, { useCustomFieldsEntries });
 	applyCustomAssociation(models);
 	logger_default.debug("sadot - custom fields finished initializing with models", models);
@@ -60,4 +55,4 @@ const disableCustomFields = (models, getModel) => {
 };
 
 //#endregion
-export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition_default as CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries_default as CustomFieldEntries, CustomFieldValue_default as CustomFieldValue, CustomFieldsSchema, CustomValidator_default as CustomValidator, FieldPolicy_default as FieldPolicy, field_policy_exports as FieldPolicyRepo, customFieldsSortScope, src_default as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities };
+export { CUSTOM_FIELDS_FILTER_SCOPE, CustomFieldDefinition_default as CustomFieldDefinition, CustomFieldDefinitionType, CustomFieldEntries_default as CustomFieldEntries, CustomFieldValue_default as CustomFieldValue, CustomFieldsSchema, CustomValidator_default as CustomValidator, customFieldsSortScope, src_default as default, disableCustomFields, generateCustomFieldSearchQueryPayload, generateRandomString, sadotInitState, supportedEntities, toPascalCase };

package/dist/migrations/index.cjs

@@ -2,8 +2,6 @@ const require_index = require('../utils/logger/index.cjs');
 const require_001_create_core_tables = require('./001-create-core-tables.cjs');
 const require_002_create_custom_field_entries = require('./002-create-custom-field-entries.cjs');
 const require_003_create_custom_field_model_type_map = require('./003-create-custom-field-model-type-map.cjs');
-const require_004_create_field_policy_tables = require('./004-create-field-policy-tables.cjs');
-const require_005_add_entity_type_to_field_policies = require('./005-add-entity-type-to-field-policies.cjs');
 
 //#region src/migrations/index.ts
 const { Umzug, SequelizeStorage } = require("umzug");
@@ -24,17 +22,7 @@ const buildMigrationList = (options) => {
 			name: "003-create-custom-field-model-type-map",
 			up: require_003_create_custom_field_model_type_map.up,
 			down: require_003_create_custom_field_model_type_map.down
-		}] : [],
-		{
-			name: "004-create-field-policy-tables",
-			up: require_004_create_field_policy_tables.up,
-			down: require_004_create_field_policy_tables.down
-		},
-		{
-			name: "005-add-entity-type-to-field-policies",
-			up: require_005_add_entity_type_to_field_policies.up,
-			down: require_005_add_entity_type_to_field_policies.down
-		}
+		}] : []
 	];
 };
 const SADOT_MIGRATION_LOCK_ID = 839274628;

package/dist/repository/validator.cjs

@@ -2,9 +2,8 @@ const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
 const require_index = require('../utils/logger/index.cjs');
 const require_CustomValidator = require('../models/CustomValidator.cjs');
 require('../models/index.cjs');
+const require_mat_path_state = require('../mat-path-state.cjs');
 let sequelize = require("sequelize");
-let sequelize_lib_sequelize = require("sequelize/lib/sequelize");
-sequelize_lib_sequelize = require_rolldown_runtime.__toESM(sequelize_lib_sequelize);
 
 //#region src/repository/validator.ts
 const create = async (validatorAttributes, options = {}) => {
@@ -53,28 +52,27 @@ const disable = async (id, options) => {
 	require_index.default.debug("custom-validator - disable validator");
 	return update(id, { disabled: true }, options);
 };
-const findEffective = async (entityType = "Vehicle", requestPath) => {
+const findEffective = async (modelType) => {
+	const { withMatPath } = require_mat_path_state.matPathState;
+	if (!withMatPath) return null;
 	const QUERY = `
- 	SELECT DISTINCT ON (cv.model_type) cv.*, cep.path
-	FROM custom_validators cv
-	LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
- 	AND cep.entity_id = cv.entity_id
- 	AND cep.entity_type = cv.entity_type
- 	AND cep.path @> ANY(ARRAY['${requestPath}']::ltree[])
-	WHERE cv.model_type IN ($1) AND cv.disabled = false
-	ORDER BY cv.model_type, COALESCE(nlevel(cep.path), 0) DESC;`;
-	try {
-		await sequelize_lib_sequelize.default.query(QUERY, {
-			bind: [entityType],
-			type: sequelize.QueryTypes.SELECT
-		});
-		return {
-			...result.schema.properties.after,
-			path: result.path
-		};
-	} catch (err) {
-		throw err;
-	}
+    SELECT cv.*, cep.path
+    FROM custom_validators cv
+    INNER JOIN context_entity_path cep ON cep.deleted_at IS NULL
+      AND cep.entity_id = cv.entity_id
+      AND cep.entity_type = cv.entity_type
+      AND cep.path @> ANY(current_setting('mat_path.paths', true)::ltree[])
+    WHERE cv.model_type = :modelType 
+      AND cv.disabled = false
+    ORDER BY COALESCE(nlevel(cep.path), 0) DESC
+    LIMIT 1;
+  `;
+	const [row] = await withMatPath("custom_validators", async (transaction) => require_CustomValidator.default.sequelize.query(QUERY, {
+		replacements: { modelType },
+		type: sequelize.QueryTypes.SELECT,
+		transaction
+	}));
+	return row;
 };
 
 //#endregion

package/dist/{api → sadot/src/api}/v1/definition/index.js

@@ -2,6 +2,7 @@ import logger_default from "../../../utils/logger/index.js";
 import { create, findAll, findById, findByModelTypeId, findByWhere, update } from "../../../repository/definition.js";
 import errors_default from "../errors.js";
 import { validateCustomFieldDefinitionCreation, validateCustomFieldDefinitionUpdate } from "./validations.js";
+import { toPascalCase } from "../../../utils/helpers/index.js";
 import { matPathState } from "../../../mat-path-state.js";
 import { ResourceNotFoundError } from "@autofleet/errors";
 import { Router } from "@autofleet/node-common";
@@ -9,7 +10,6 @@ import { Router } from "@autofleet/node-common";
 //#region src/api/v1/definition/index.ts
 const router = Router({ logger: logger_default });
 const ENTITY = "CustomFieldDefinition";
-const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (subStr) => subStr.replace(/-/, "").toUpperCase());
 /**
 * Create
 */

package/dist/{api → sadot/src/api}/v1/index.js

@@ -1,14 +1,12 @@
 import logger_default from "../../utils/logger/index.js";
 import definition_default from "./definition/index.js";
 import validator_default from "./validator/index.js";
-import field_policies_default from "./field-policies/index.js";
 import { Router } from "@autofleet/node-common";
 
 //#region src/api/v1/index.ts
 const router = Router({ logger: logger_default });
 router.use("/custom-field-definitions/:modelName", definition_default);
 router.use("/custom-validators/:modelName", validator_default);
-router.use("/field-policies/:entityType", field_policies_default);
 var v1_default = router;
 
 //#endregion

package/dist/{api → sadot/src/api}/v1/validator/index.js

@@ -1,5 +1,6 @@
 import logger_default from "../../../utils/logger/index.js";
 import errors_default from "../errors.js";
+import { toPascalCase } from "../../../utils/helpers/index.js";
 import { matPathState } from "../../../mat-path-state.js";
 import { create, disable, findAll, findEffective, update } from "../../../repository/validator.js";
 import validations_default from "./validations.js";
@@ -61,8 +62,9 @@ router.get("/effective", async (req, res) => {
 	if (!withMatPath) return res.status(StatusCodes.NOT_IMPLEMENTED).json({ error: "Effective validator resolution is not configured" });
 	try {
 		const { modelName } = req.params;
-		const [validator] = await findEffective(modelName, "AF.1");
-		return res.status(StatusCodes.OK).json(validator ?? null);
+		const modelType = toPascalCase(modelName);
+		const validators = await findEffective(modelType);
+		return res.status(StatusCodes.OK).json(validators ?? null);
 	} catch (err) {
 		return errors_default(err, res, {
 			logger: logger_default,

package/dist/{migrations → sadot/src/migrations}/index.js

@@ -1,10 +1,8 @@
-import { __require } from "../_virtual/rolldown_runtime.js";
+import { __require } from "../../../_virtual/rolldown_runtime.js";
 import logger_default from "../utils/logger/index.js";
 import { down, up } from "./001-create-core-tables.js";
 import { down as down$1, up as up$1 } from "./002-create-custom-field-entries.js";
 import { down as down$2, up as up$2 } from "./003-create-custom-field-model-type-map.js";
-import { down as down$3, up as up$3 } from "./004-create-field-policy-tables.js";
-import { down as down$4, up as up$4 } from "./005-add-entity-type-to-field-policies.js";
 
 //#region src/migrations/index.ts
 const { Umzug, SequelizeStorage } = __require("umzug");
@@ -25,17 +23,7 @@ const buildMigrationList = (options) => {
 			name: "003-create-custom-field-model-type-map",
 			up: up$2,
 			down: down$2
-		}] : [],
-		{
-			name: "004-create-field-policy-tables",
-			up: up$3,
-			down: down$3
-		},
-		{
-			name: "005-add-entity-type-to-field-policies",
-			up: up$4,
-			down: down$4
-		}
+		}] : []
 	];
 };
 const SADOT_MIGRATION_LOCK_ID = 839274628;

package/dist/{models → sadot/src/models}/CustomFieldDefinition.js

@@ -4,8 +4,8 @@ import { CustomValidationTypes } from "../utils/validations/validators/index.js"
 import { sendDimEvent } from "../events/index.js";
 import { InvalidValueError, UnsupportedCustomFieldTypeError, UnsupportedCustomValidationError } from "../errors/index.js";
 import { validateValue } from "../utils/validations/index.js";
-import { __decorateMetadata } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import CustomFieldValue_default from "./CustomFieldValue.js";
 import { AfterSave, BeforeCreate, Column, DataType, DefaultScope, HasMany, Is, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/CustomFieldEntries.js

@@ -1,8 +1,8 @@
 import { sendDimEvent } from "../events/index.js";
 import { validateInstanceCustomFieldEntries } from "../utils/validations/index.js";
 import { getCustomFieldDefinitionsDictionary } from "../repository/definition.js";
-import { __decorateMetadata } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import { AfterUpsert, Column, DataType, Model, PrimaryKey, Table } from "sequelize-typescript";
 
 //#region src/models/CustomFieldEntries.ts

package/dist/{models → sadot/src/models}/CustomFieldModelTypeMap.js

@@ -1,5 +1,5 @@
-import { __decorateMetadata } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import CustomFieldDefinition_default from "./CustomFieldDefinition.js";
 import { Column, DataType, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/CustomFieldValue.js

@@ -2,8 +2,8 @@ import { sendDimEvent } from "../events/index.js";
 import { InvalidFieldTypeError, InvalidValueError } from "../errors/index.js";
 import { validateFieldType, validateValue } from "../utils/validations/index.js";
 import { findById, findByIds } from "../repository/definition.js";
-import { __decorateMetadata } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import CustomFieldDefinition_default from "./CustomFieldDefinition.js";
 import { AfterUpsert, BeforeBulkCreate, BeforeBulkUpdate, BeforeCreate, BeforeUpdate, BeforeUpsert, BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/CustomValidator.js

@@ -1,6 +1,6 @@
 import { sendDimEvent } from "../events/index.js";
-import { __decorateMetadata } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import { AfterUpsert, Column, DataType, Default, DefaultScope, Model, PrimaryKey, Table } from "sequelize-typescript";
 import { randomUUID } from "node:crypto";
 

package/dist/sadot/src/models/index.d.cts

@@ -0,0 +1,7 @@
+import { CustomFieldValue } from "./CustomFieldValue.cjs";
+import { CustomFieldModelTypeMap } from "./CustomFieldModelTypeMap.cjs";
+import { CustomFieldDefinition } from "./CustomFieldDefinition.cjs";
+import { CustomValidator } from "./CustomValidator.cjs";
+import "../types/index.cjs";
+import { CustomFieldEntries } from "./CustomFieldEntries.cjs";
+import { Sequelize } from "sequelize-typescript";

package/dist/{models → sadot/src/models}/tests/AssociatedTestModel.js

@@ -1,5 +1,5 @@
-import { __decorateMetadata } from "../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import TestModel_default from "./TestModel.js";
 import { BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/tests/TestModel.js

@@ -1,5 +1,5 @@
-import { __decorateMetadata } from "../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import AssociatedTestModel_default from "./AssociatedTestModel.js";
 import { Column, DataType, HasMany, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/tests/contextAwareModels/ContextAwareTestModel.js

@@ -1,5 +1,5 @@
-import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import ContextTestModel_default from "./ContextTestModel.js";
 import { BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
 

package/dist/{models → sadot/src/models}/tests/contextAwareModels/ContextTestModel.js

@@ -1,5 +1,5 @@
-import { __decorateMetadata } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
-import { __decorate } from "../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
+import { __decorateMetadata } from "../../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorateMetadata.js";
+import { __decorate } from "../../../../../_virtual/_@oxc-project_runtime@0.103.0/helpers/decorate.js";
 import { Column, DataType, Model, PrimaryKey, Table } from "sequelize-typescript";
 
 //#region src/models/tests/contextAwareModels/ContextTestModel.ts