@entity-access/server-pages 1.1.494 → 1.1.496

package/src/routes/api/entity/query/[entity]/index.ts

@@ -1,18 +1,18 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
-import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import Page from "../../../../../Page.js";
 import EntityAccessServer from "../../../../../services/EntityAccessServer.js";
 import { Prepare } from "../../../../../decorators/Prepare.js";
 import { Route } from "../../../../../core/Route.js";
 import SessionSecurity from "../../../../../services/SessionSecurity.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import AppDbContext from "../../../../../core/AppDbContext.js";
 
 @Prepare.authorize
 @Prepare.parseJsonBody
 export default class extends Page {
 
     @Inject
-    private db: EntityContext;
+    db: AppDbContext;
 
     @Route
     entity: string;

package/src/routes/api/entity/run/[entity]/[methodName]/index.ts

@@ -1,5 +1,4 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
-import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import Page from "../../../../../../Page.js";
 import { Route } from "../../../../../../core/Route.js";
 import { Prepare } from "../../../../../../decorators/Prepare.js";
@@ -9,13 +8,14 @@ import ExternalInvoke from "../../../../../../decorators/ExternalInvoke.js";
 import JsonService from "../../../../../../services/DbJsonService.js";
 import SessionSecurity from "../../../../../../services/SessionSecurity.js";
 import Content from "../../../../../../Content.js";
+import AppDbContext from "../../../../../../core/AppDbContext.js";
 
 @Prepare.authorize
 @Prepare.parseJsonBody
 export default class extends Page {
 
     @Inject
-    private db: EntityContext;
+    db: AppDbContext;
 
     @Route
     entity: string;

package/src/services/EntityAccessServer.ts

@@ -1,15 +1,14 @@
 /* eslint-disable no-console */
 import SchemaRegistry from "@entity-access/entity-access/dist/decorators/SchemaRegistry.js";
-import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import { StringHelper } from "./StringHelper.js";
 import ExternalQuery from "../decorators/ExternalQuery.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { FilteredExpression } from "@entity-access/entity-access/dist/model/events/FilteredExpression.js";
 import type { IEntityQuery, IOrderedEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import { SessionUser } from "../core/SessionUser.js";
 import DbJsonService from "./DbJsonService.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SessionSecurity from "./SessionSecurity.js";
+import AppDbContext from "../core/AppDbContext.js";
 
 export type IQueryMethod = [string, string, ... any[]];
 
@@ -58,7 +57,7 @@ const allowedMethods = {
 export default class EntityAccessServer {
 
     public static async query(
-        db: EntityContext,
+        db: AppDbContext,
         options: IEntityQueryOptions) {
 
         db.verifyFilters = true;

package/src/services/ModelService.ts

@@ -1,13 +1,12 @@
 import { IColumn, IEntityRelation } from "@entity-access/entity-access/dist/decorators/IColumn.js";
-import SchemaRegistry from "@entity-access/entity-access/dist/decorators/SchemaRegistry.js";
-import EntityType, { addColumnSymbol } from "@entity-access/entity-access/dist/entity-query/EntityType.js";
-import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
+import EntityType from "@entity-access/entity-access/dist/entity-query/EntityType.js";
 import IndentedStringWriter from "./IndentedStringWriter.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { IClassOf } from "@entity-access/entity-access/dist/decorators/IClassOf.js";
 import EntityEvents from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import ExternalQuery from "../decorators/ExternalQuery.js";
 import ExternalInvoke from "../decorators/ExternalInvoke.js";
+import AppDbContext from "../core/AppDbContext.js";
 
 const modelProperties = Symbol("modelProperty");
 
@@ -243,7 +242,7 @@ export default class ModelService {
         };
     }
 
-    public static getModel(context: EntityContext) {
+    public static getModel(context: AppDbContext) {
         const model = [] as IEntityModel[];
 
         for (const [type] of context.model.sources) {
@@ -253,7 +252,7 @@ export default class ModelService {
         return model;
     }
 
-    public static getModelDeclaration(context: EntityContext) {
+    public static getModelDeclaration(context: AppDbContext) {
         const writer = new IndentedStringWriter("\t");
         writer.writeLine(`import DateTime from "@web-atoms/date-time/dist/DateTime";
             import type IClrEntity from "@web-atoms/entity/dist/models/IClrEntity";