@autofleet/sadot 1.6.18-beta.12 → 1.6.18-beta.15

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

@@ -1,12 +1,45 @@
 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_mat_path_state = require('../../../mat-path-state.cjs');
+const require_FieldPolicy = require('../../../models/FieldPolicy.cjs');
 const require_field_policy = require('../../../repository/field-policy.cjs');
 let sequelize = require("sequelize");
 let _autofleet_node_common = require("@autofleet/node-common");
 
 //#region src/api/v1/field-policies/index.ts
 const router = (0, _autofleet_node_common.Router)({ logger: require_index.default });
+const tableName = require_FieldPolicy.default.getTableName();
+router.get("/:entityType/effective", async (req, res) => {
+	const EFFECTIVE_POLICY_QUERY = `
+  SELECT fp.*
+  FROM "${tableName}" fp
+  LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
+    AND cep.entity_id = fp.context_id
+    AND cep.entity_type = 'context'
+    AND cep.path @> ANY(current_setting('mat_path.paths', true)::ltree[])
+  WHERE fp.entity_type = $1
+  ORDER BY COALESCE(nlevel(cep.path), 0) DESC
+  LIMIT 1
+`;
+	const { withMatPath } = require_mat_path_state.matPathState;
+	if (!withMatPath) return res.status(501).json({ error: "Effective field policy resolution is not configured" });
+	if (!req.headers["x-request-paths"]) return res.status(400).json({ error: "x-request-paths header is required" });
+	const { entityType } = req.params;
+	try {
+		const [policy] = await withMatPath(tableName, (transaction) => require_FieldPolicy.default.sequelize.query(EFFECTIVE_POLICY_QUERY, {
+			bind: [entityType],
+			type: sequelize.QueryTypes.SELECT,
+			transaction
+		}));
+		return res.status(200).json(policy ?? null);
+	} catch (err) {
+		return require_errors.default(err, res, {
+			logger: require_index.default,
+			message: "Error resolving effective field policy"
+		});
+	}
+});
 router.get("/", async (_req, res) => {
 	try {
 		const policies = await require_field_policy.findAll();

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

@@ -1,11 +1,44 @@
 import logger_default from "../../../utils/logger/index.js";
 import errors_default from "../errors.js";
+import { matPathState } from "../../../mat-path-state.js";
+import FieldPolicy_default from "../../../models/FieldPolicy.js";
 import { create, findAll, remove, update } from "../../../repository/field-policy.js";
-import { UniqueConstraintError } from "sequelize";
+import { QueryTypes, UniqueConstraintError } from "sequelize";
 import { Router } from "@autofleet/node-common";
 
 //#region src/api/v1/field-policies/index.ts
 const router = Router({ logger: logger_default });
+const tableName = FieldPolicy_default.getTableName();
+router.get("/:entityType/effective", async (req, res) => {
+	const EFFECTIVE_POLICY_QUERY = `
+  SELECT fp.*
+  FROM "${tableName}" fp
+  LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
+    AND cep.entity_id = fp.context_id
+    AND cep.entity_type = 'context'
+    AND cep.path @> ANY(current_setting('mat_path.paths', true)::ltree[])
+  WHERE fp.entity_type = $1
+  ORDER BY COALESCE(nlevel(cep.path), 0) DESC
+  LIMIT 1
+`;
+	const { withMatPath } = matPathState;
+	if (!withMatPath) return res.status(501).json({ error: "Effective field policy resolution is not configured" });
+	if (!req.headers["x-request-paths"]) return res.status(400).json({ error: "x-request-paths header is required" });
+	const { entityType } = req.params;
+	try {
+		const [policy] = await withMatPath(tableName, (transaction) => FieldPolicy_default.sequelize.query(EFFECTIVE_POLICY_QUERY, {
+			bind: [entityType],
+			type: QueryTypes.SELECT,
+			transaction
+		}));
+		return res.status(200).json(policy ?? null);
+	} catch (err) {
+		return errors_default(err, res, {
+			logger: logger_default,
+			message: "Error resolving effective field policy"
+		});
+	}
+});
 router.get("/", async (_req, res) => {
 	try {
 		const policies = await findAll();

package/dist/api/v1/index.cjs

@@ -9,7 +9,7 @@ let _autofleet_node_common = require("@autofleet/node-common");
 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/:modelName", require_index$3.default);
+router.use("/field-policies", require_index$3.default);
 var v1_default = router;
 
 //#endregion

package/dist/api/v1/index.js

@@ -8,7 +8,7 @@ import { Router } from "@autofleet/node-common";
 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/:modelName", field_policies_default);
+router.use("/field-policies", field_policies_default);
 var v1_default = router;
 
 //#endregion

package/dist/index.cjs

@@ -26,8 +26,9 @@ const sadotInitState = new require_init_state.SadotInitializationState();
 */
 const internalUseCustomFields = async (app, getModel, options) => {
 	require_index.tryAddingTraceIdMiddleware();
-	const { models, useCustomFieldsEntries, useModelTypeMapping, isMatPathEnabled, runLegacyMigrations } = options;
+	const { models, useCustomFieldsEntries, useModelTypeMapping, isMatPathEnabled, runLegacyMigrations, withMatPath } = options;
 	require_mat_path_state.matPathState.isMatPathEnabled = isMatPathEnabled;
+	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);

package/dist/index.js

@@ -25,8 +25,9 @@ const sadotInitState = new SadotInitializationState();
 */
 const internalUseCustomFields = async (app, getModel, options) => {
 	tryAddingTraceIdMiddleware();
-	const { models, useCustomFieldsEntries, useModelTypeMapping, isMatPathEnabled, runLegacyMigrations } = options;
+	const { models, useCustomFieldsEntries, useModelTypeMapping, isMatPathEnabled, runLegacyMigrations, withMatPath } = options;
 	matPathState.isMatPathEnabled = isMatPathEnabled;
+	matPathState.withMatPath = withMatPath;
 	if (app) app.use("/api", api_default);
 	const sequelize = options.sequelize ?? db_default(options.databaseConfig);
 	if (process.env.NODE_ENV === "test") await initTestModels(sequelize);

package/dist/types/index.d.cts

@@ -64,6 +64,12 @@ interface CustomFieldOptions {
   * Pass `matPathManager.isScopingRequest` if using `@autofleet/mat-path-mvp`.
   */
   isMatPathEnabled?: () => boolean;
+  /**
+  * Optional hook for the effective field-policy route. When provided, sadot mounts
+  * GET /field-policies/:entityType/effective and delegates scoped queries through this callback.
+  * Typically: (table, cb) => { matPathManager.setScopingMode({ [table]: SCOPING_MODE.ANCESTORS }); return matPathManager.withPaths(cb); }
+  */
+  withMatPath?: (tableName: string, callback: (transaction: any) => Promise<any>) => Promise<any>;
 }
 //#endregion
 export { CustomFieldOptions, ModelFetcher, Models };

package/dist/types/index.d.ts

@@ -65,6 +65,12 @@ interface CustomFieldOptions {
   * Pass `matPathManager.isScopingRequest` if using `@autofleet/mat-path-mvp`.
   */
   isMatPathEnabled?: () => boolean;
+  /**
+  * Optional hook for the effective field-policy route. When provided, sadot mounts
+  * GET /field-policies/:entityType/effective and delegates scoped queries through this callback.
+  * Typically: (table, cb) => { matPathManager.setScopingMode({ [table]: SCOPING_MODE.ANCESTORS }); return matPathManager.withPaths(cb); }
+  */
+  withMatPath?: (tableName: string, callback: (transaction: any) => Promise<any>) => Promise<any>;
 }
 //#endregion
 export { CustomFieldOptions, ModelFetcher, Models };

package/dist/utils/db/index.js

@@ -1,4 +1,4 @@
-import "sequelize";
+import { QueryTypes } from "sequelize";
 import { Sequelize } from "sequelize-typescript";
 
 //#region src/utils/db/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.6.18-beta.12",
+  "version": "1.6.18-beta.15",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,15 +22,6 @@
     "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": [
@@ -44,28 +35,28 @@
     }
   },
   "dependencies": {
-    "@autofleet/common-types": "catalog:",
-    "@autofleet/events": "workspace:^",
+    "@autofleet/common-types": "5.42.0",
     "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": "catalog:",
+    "pg": "^8.16.3",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "catalog:",
-    "sequelize-typescript": "catalog:",
-    "umzug": "^3.8.3"
+    "sequelize": "^6.37.7",
+    "sequelize-typescript": "^2.1.6",
+    "umzug": "^3.8.3",
+    "@autofleet/events": "^5.3.22"
   },
   "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"
+    "supertest": "^7.0.0",
+    "@autofleet/errors": "^3.3.7",
+    "@autofleet/logger": "^4.7.0",
+    "@autofleet/zehut": "^4.13.4",
+    "@autofleet/node-common": "^4.3.22"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",
@@ -78,5 +69,14 @@
     "node": ">=18.0.0"
   },
   "author": "Autofleet",
-  "license": "ISC"
-}
+  "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"
+  }
+}