@autofleet/sadot 1.6.18-beta.7 → 1.6.18-beta.8

package/dist/api/v1/field-policies/index.cjs

@@ -19,7 +19,7 @@ router.get("/", async (_req, res) => {
 	}
 });
 router.post("/", async (req, res) => {
-	const { contextId, name, fields, models } = req.body;
+	const { contextId, name, entityType, fields, models } = req.body;
 	if (!contextId || !name) {
 		res.status(400).json({ error: "contextId and name are required" });
 		return;
@@ -28,6 +28,7 @@ router.post("/", async (req, res) => {
 		const policy = await require_field_policy.create({
 			contextId,
 			name,
+			entityType,
 			fields,
 			models
 		});
@@ -45,9 +46,10 @@ router.post("/", async (req, res) => {
 });
 router.put("/:policyId", async (req, res) => {
 	const { policyId } = req.params;
-	const { fields, models } = req.body;
+	const { entityType, fields, models } = req.body;
 	try {
 		const updated = await require_field_policy.update(policyId, {
+			entityType,
 			fields,
 			models
 		});

package/dist/api/v1/field-policies/index.js

@@ -18,7 +18,7 @@ router.get("/", async (_req, res) => {
 	}
 });
 router.post("/", async (req, res) => {
-	const { contextId, name, fields, models } = req.body;
+	const { contextId, name, entityType, fields, models } = req.body;
 	if (!contextId || !name) {
 		res.status(400).json({ error: "contextId and name are required" });
 		return;
@@ -27,6 +27,7 @@ router.post("/", async (req, res) => {
 		const policy = await create({
 			contextId,
 			name,
+			entityType,
 			fields,
 			models
 		});
@@ -44,9 +45,10 @@ router.post("/", async (req, res) => {
 });
 router.put("/:policyId", async (req, res) => {
 	const { policyId } = req.params;
-	const { fields, models } = req.body;
+	const { entityType, fields, models } = req.body;
 	try {
 		const updated = await update(policyId, {
+			entityType,
 			fields,
 			models
 		});

package/dist/migrations/005-add-entity-type-to-field-policies.cjs

@@ -0,0 +1,20 @@
+
+//#region src/migrations/005-add-entity-type-to-field-policies.ts
+const up = async ({ context: queryInterface }) => {
+	const { sequelize } = queryInterface;
+	await sequelize.query(`
+    ALTER TABLE "field_policies"
+    ADD COLUMN IF NOT EXISTS "entity_type" VARCHAR
+  `);
+};
+const down = async ({ context: queryInterface }) => {
+	const { sequelize } = queryInterface;
+	await sequelize.query(`
+    ALTER TABLE "field_policies"
+    DROP COLUMN IF EXISTS "entity_type"
+  `);
+};
+
+//#endregion
+exports.down = down;
+exports.up = up;

package/dist/migrations/005-add-entity-type-to-field-policies.js

@@ -0,0 +1,18 @@
+//#region src/migrations/005-add-entity-type-to-field-policies.ts
+const up = async ({ context: queryInterface }) => {
+	const { sequelize } = queryInterface;
+	await sequelize.query(`
+    ALTER TABLE "field_policies"
+    ADD COLUMN IF NOT EXISTS "entity_type" VARCHAR
+  `);
+};
+const down = async ({ context: queryInterface }) => {
+	const { sequelize } = queryInterface;
+	await sequelize.query(`
+    ALTER TABLE "field_policies"
+    DROP COLUMN IF EXISTS "entity_type"
+  `);
+};
+
+//#endregion
+export { down, up };

package/dist/migrations/index.cjs

@@ -3,6 +3,7 @@ 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");
@@ -28,6 +29,11 @@ const buildMigrationList = (options) => {
 			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
 		}
 	];
 };

package/dist/migrations/index.js

@@ -4,6 +4,7 @@ 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");
@@ -29,6 +30,11 @@ const buildMigrationList = (options) => {
 			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
 		}
 	];
 };

package/dist/models/FieldPolicy.cjs

@@ -19,6 +19,10 @@ require_decorate.__decorate([(0, sequelize_typescript.Column)({
 	type: sequelize_typescript.DataType.UUID,
 	allowNull: false
 }), require_decorateMetadata.__decorateMetadata("design:type", String)], FieldPolicy.prototype, "contextId", void 0);
+require_decorate.__decorate([(0, sequelize_typescript.Column)({
+	type: sequelize_typescript.DataType.STRING,
+	allowNull: true
+}), require_decorateMetadata.__decorateMetadata("design:type", Object)], FieldPolicy.prototype, "entityType", void 0);
 require_decorate.__decorate([(0, sequelize_typescript.Column)({
 	type: sequelize_typescript.DataType.STRING,
 	allowNull: false

package/dist/models/FieldPolicy.d.cts

@@ -1,6 +1,7 @@
 import { Model } from "sequelize-typescript";
 
 //#region src/models/FieldPolicy.d.ts
+type EntityType = "vehicle" | "driver";
 type ModelMode = "full" | "partial";
 type ModelInclusion = {
   name: string;
@@ -13,6 +14,7 @@ type ModelInclusion = {
 declare class FieldPolicy extends Model {
   id: string;
   contextId: string;
+  entityType: EntityType | null;
   name: string;
   /** Base-level field names to include */
   fields: string[];
@@ -20,4 +22,4 @@ declare class FieldPolicy extends Model {
   models: ModelInclusion[];
 }
 //#endregion
-export { FieldPolicy, ModelInclusion, ModelMode };
+export { EntityType, FieldPolicy, ModelInclusion, ModelMode };

package/dist/models/FieldPolicy.d.ts

@@ -1,6 +1,7 @@
 import { Model } from "sequelize-typescript";
 
 //#region src/models/FieldPolicy.d.ts
+type EntityType = "vehicle" | "driver";
 type ModelMode = "full" | "partial";
 type ModelInclusion = {
   name: string;
@@ -13,6 +14,7 @@ type ModelInclusion = {
 declare class FieldPolicy extends Model {
   id: string;
   contextId: string;
+  entityType: EntityType | null;
   name: string;
   /** Base-level field names to include */
   fields: string[];
@@ -20,4 +22,4 @@ declare class FieldPolicy extends Model {
   models: ModelInclusion[];
 }
 //#endregion
-export { FieldPolicy, ModelInclusion, ModelMode };
+export { EntityType, FieldPolicy, ModelInclusion, ModelMode };

package/dist/models/FieldPolicy.js

@@ -18,6 +18,10 @@ __decorate([Column({
 	type: DataType.UUID,
 	allowNull: false
 }), __decorateMetadata("design:type", String)], FieldPolicy.prototype, "contextId", void 0);
+__decorate([Column({
+	type: DataType.STRING,
+	allowNull: true
+}), __decorateMetadata("design:type", Object)], FieldPolicy.prototype, "entityType", void 0);
 __decorate([Column({
 	type: DataType.STRING,
 	allowNull: false

package/dist/models/index.d.ts

@@ -3,9 +3,5 @@ import { CustomFieldModelTypeMap } from "./CustomFieldModelTypeMap.js";
 import { CustomFieldDefinition } from "./CustomFieldDefinition.js";
 import { CustomValidator } from "./CustomValidator.js";
 import "../types/index.js";
-import "./tests/AssociatedTestModel.js";
-import "./tests/TestModel.js";
-import "./tests/contextAwareModels/ContextTestModel.js";
-import "./tests/contextAwareModels/ContextAwareTestModel.js";
 import { CustomFieldEntries } from "./CustomFieldEntries.js";
 import { Sequelize } from "sequelize-typescript";

package/dist/repository/field-policy.cjs

@@ -20,9 +20,10 @@ const findById = (id) => require_FieldPolicy.default.findByPk(id);
 const findAllByContext = (contextId) => require_FieldPolicy.default.findAll({ where: { contextId } });
 const findAll = () => require_FieldPolicy.default.findAll();
 const findAllByContextIds = (contextIds) => require_FieldPolicy.default.findAll({ where: { contextId: contextIds } });
-const create = ({ contextId, name, fields, models }) => require_FieldPolicy.default.create({
+const create = ({ contextId, name, entityType, fields, models }) => require_FieldPolicy.default.create({
 	contextId,
 	name,
+	entityType,
 	fields,
 	models
 });

package/dist/repository/field-policy.d.cts

@@ -1,4 +1,4 @@
-import { FieldPolicy, ModelInclusion } from "../models/FieldPolicy.cjs";
+import { EntityType, FieldPolicy, ModelInclusion } from "../models/FieldPolicy.cjs";
 
 //#region src/repository/field-policy.d.ts
 declare namespace field_policy_d_exports {
@@ -7,10 +7,12 @@ declare namespace field_policy_d_exports {
 interface CreateFieldPolicyData {
   contextId: string;
   name: string;
+  entityType?: EntityType;
   fields?: string[];
   models?: ModelInclusion[];
 }
 interface UpdateFieldPolicyData {
+  entityType?: EntityType;
   fields?: string[];
   models?: ModelInclusion[];
 }
@@ -22,6 +24,7 @@ declare const findAllByContextIds: (contextIds: string[]) => Promise<FieldPolicy
 declare const create: ({
   contextId,
   name,
+  entityType,
   fields,
   models
 }: CreateFieldPolicyData) => Promise<FieldPolicy>;

package/dist/repository/field-policy.d.ts

@@ -1,4 +1,4 @@
-import { FieldPolicy, ModelInclusion } from "../models/FieldPolicy.js";
+import { EntityType, FieldPolicy, ModelInclusion } from "../models/FieldPolicy.js";
 
 //#region src/repository/field-policy.d.ts
 declare namespace field_policy_d_exports {
@@ -7,10 +7,12 @@ declare namespace field_policy_d_exports {
 interface CreateFieldPolicyData {
   contextId: string;
   name: string;
+  entityType?: EntityType;
   fields?: string[];
   models?: ModelInclusion[];
 }
 interface UpdateFieldPolicyData {
+  entityType?: EntityType;
   fields?: string[];
   models?: ModelInclusion[];
 }
@@ -22,6 +24,7 @@ declare const findAllByContextIds: (contextIds: string[]) => Promise<FieldPolicy
 declare const create: ({
   contextId,
   name,
+  entityType,
   fields,
   models
 }: CreateFieldPolicyData) => Promise<FieldPolicy>;

package/dist/repository/field-policy.js

@@ -20,9 +20,10 @@ const findById = (id) => FieldPolicy_default.findByPk(id);
 const findAllByContext = (contextId) => FieldPolicy_default.findAll({ where: { contextId } });
 const findAll = () => FieldPolicy_default.findAll();
 const findAllByContextIds = (contextIds) => FieldPolicy_default.findAll({ where: { contextId: contextIds } });
-const create = ({ contextId, name, fields, models }) => FieldPolicy_default.create({
+const create = ({ contextId, name, entityType, fields, models }) => FieldPolicy_default.create({
 	contextId,
 	name,
+	entityType,
 	fields,
 	models
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.6.18-beta.7",
+  "version": "1.6.18-beta.8",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,6 +22,15 @@
     "dist",
     "README.md"
   ],
+  "scripts": {
+    "build": "pnpm -w tsdown -W ./packages/sadot",
+    "linter": "eslint .",
+    "test": "vitest",
+    "test-debug": "node --inspect-brk node_modules/.bin/vitest --testTimeout=10000000",
+    "coverage": "vitest --coverage",
+    "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
+    "watch": "npm-watch build-to-local-repo"
+  },
   "watch": {
     "build-to-local-repo": {
       "extensions": [
@@ -35,28 +44,28 @@
     }
   },
   "dependencies": {
-    "@autofleet/common-types": "5.42.0",
+    "@autofleet/common-types": "catalog:",
+    "@autofleet/events": "workspace:^",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "http-status-codes": "^2.3.0",
     "joi": "^17.7.0",
-    "pg": "^8.16.3",
+    "pg": "catalog:",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.37.7",
-    "sequelize-typescript": "^2.1.6",
-    "umzug": "^3.8.3",
-    "@autofleet/events": "^5.3.22"
+    "sequelize": "catalog:",
+    "sequelize-typescript": "catalog:",
+    "umzug": "^3.8.3"
   },
   "devDependencies": {
+    "@autofleet/errors": "workspace:^",
+    "@autofleet/logger": "workspace:^",
+    "@autofleet/node-common": "workspace:^",
+    "@autofleet/zehut": "workspace:^",
     "@types/express": "^4.17.17",
     "express": "^4.21.2",
     "npm-watch": "^0.11.0",
-    "supertest": "^7.0.0",
-    "@autofleet/logger": "^4.7.0",
-    "@autofleet/errors": "^3.3.7",
-    "@autofleet/node-common": "^4.3.22",
-    "@autofleet/zehut": "^4.13.3"
+    "supertest": "^7.0.0"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",
@@ -69,14 +78,5 @@
     "node": ">=18.0.0"
   },
   "author": "Autofleet",
-  "license": "ISC",
-  "scripts": {
-    "build": "pnpm -w tsdown -W ./packages/sadot",
-    "linter": "eslint .",
-    "test": "vitest",
-    "test-debug": "node --inspect-brk node_modules/.bin/vitest --testTimeout=10000000",
-    "coverage": "vitest --coverage",
-    "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
-    "watch": "npm-watch build-to-local-repo"
-  }
-}
+  "license": "ISC"
+}

package/dist/models/tests/AssociatedTestModel.d.ts

@@ -1,2 +0,0 @@
-import "./TestModel.js";
-import { Model } from "sequelize-typescript";

package/dist/models/tests/TestModel.d.ts

@@ -1,2 +0,0 @@
-import "./AssociatedTestModel.js";
-import { Model } from "sequelize-typescript";

package/dist/models/tests/contextAwareModels/ContextAwareTestModel.d.ts

@@ -1,2 +0,0 @@
-import "./ContextTestModel.js";
-import { Model } from "sequelize-typescript";

package/dist/models/tests/contextAwareModels/ContextTestModel.d.ts

@@ -1 +0,0 @@
-import { Model } from "sequelize-typescript";