@entity-access/entity-access 1.2.11 → 1.2.12

package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts

@@ -4,8 +4,6 @@ import { IColumn } from "../../decorators/IColumn.js";
 import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
 import { IIndex } from "../../decorators/IIndex.js";
 import { isSpatialType } from "../../decorators/ISqlType.js";
-import { BaseConnection } from "../../drivers/base/BaseDriver.js";
-import ExistingSchema from "../../drivers/base/ExistingSchema.js";
 import { SqlServerLiteral } from "../../drivers/sql-server/SqlServerLiteral.js";
 import EntityType from "../../entity-query/EntityType.js";
 import type EntityContext from "../../model/EntityContext.js";
@@ -117,7 +115,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
 
     async migrateIndex(context: EntityContext, index: IIndex, type: EntityType) {
 
-        const driver = context.connection;
         const name = type.schema
             ? type.schema + "." + type.name
             : type.name;
@@ -171,8 +168,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             text += ` and schema_name = ${schema}`;
         }
 
-        const driver = context.connection;
-
         const r = await this.executeQuery(text);
         if (r.rows?.length === 0) {
             if (r.rows["c1"] > 0) {
@@ -192,8 +187,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             return;
         }
 
-        const driver = context.connection;
-
         // sql server does not allow self referencing FK
         // so we will not create it
 
@@ -242,8 +235,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         : type.name;
 
 
-        const driver = context.connection;
-
         const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
 
         try {

package/src/migrations/sql-server/SqlServerMigrations.ts

@@ -142,6 +142,7 @@ export default abstract class SqlServerMigrations extends Migrations {
             case "Geography":
                 return "geography";
         }
+        // @ts-expect-error unused
         const a: never = iterator.dataType;
         throw new Error("Not Defined");
     }

package/src/model/EntityContext.ts

@@ -1,10 +1,8 @@
 import { BaseConnection, BaseDriver } from "../drivers/base/BaseDriver.js";
 import ChangeSet from "./changes/ChangeSet.js";
 import EntityModel from "./EntityModel.js";
-import { Expression } from "../query/ast/Expressions.js";
 import { IClassOf } from "../decorators/IClassOf.js";
 import VerificationSession from "./verification/VerificationSession.js";
-import EntityType from "../entity-query/EntityType.js";
 import EntityEvents from "./events/EntityEvents.js";
 import ChangeEntry from "./changes/ChangeEntry.js";
 import ContextEvents from "./events/ContextEvents.js";
@@ -16,8 +14,6 @@ import { traceSymbol } from "../common/symbols/symbols.js";
 
 const isChanging = Symbol("isChanging");
 
-const empty = {};
-
 export interface ISaveOptions {
     trace?: (text: string) => void;
     signal?: AbortSignal;
@@ -274,13 +270,13 @@ export default class EntityContext {
         }
     }
 
-    private async executeExpression(expression: Expression, { signal , trace }: ISaveOptions = empty) {
-        const { text, values } = this.driver.compiler.compileExpression(null, expression);
-        if (trace) {
-            trace(text);
-        }
-        const r = await this.connection.executeQuery({ text, values }, signal);
-        return r.rows?.[0];
-    }
+    // private async executeExpression(expression: Expression, { signal , trace }: ISaveOptions = empty) {
+    //     const { text, values } = this.driver.compiler.compileExpression(null, expression);
+    //     if (trace) {
+    //         trace(text);
+    //     }
+    //     const r = await this.connection.executeQuery({ text, values }, signal);
+    //     return r.rows?.[0];
+    // }
 
 }

package/src/model/EntityModel.ts

@@ -2,9 +2,7 @@ import type EntityContext from "./EntityContext.js";
 import { IClassOf } from "../decorators/IClassOf.js";
 import SchemaRegistry from "../decorators/SchemaRegistry.js";
 import { EntitySource } from "./EntitySource.js";
-import { BaseDriver } from "../drivers/base/BaseDriver.js";
 import EntityType from "../entity-query/EntityType.js";
-import { IStringTransformer } from "../query/ast/IStringTransformer.js";
 import { IEntityRelation } from "../decorators/IColumn.js";
 import type QueryCompiler from "../compiler/QueryCompiler.js";
 import { Expression } from "../query/ast/Expressions.js";

package/src/model/EntityQuery.ts

@@ -4,7 +4,7 @@ import { modelSymbol } from "../common/symbols/symbols.js";
 import { AsyncDisposableScope } from "../common/usingAsync.js";
 import { IDbReader } from "../drivers/base/BaseDriver.js";
 import EntityType from "../entity-query/EntityType.js";
-import { BinaryExpression, CallExpression, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, JoinExpression, MemberExpression, NewObjectExpression, NumberLiteral, OrderByExpression, ParameterExpression, SelectStatement, TableLiteral, UpdateStatement } from "../query/ast/Expressions.js";
+import { BinaryExpression, CallExpression, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, JoinExpression, MemberExpression, NewObjectExpression, NumberLiteral, OrderByExpression, ParameterExpression, SelectStatement, UpdateStatement } from "../query/ast/Expressions.js";
 import { QueryExpander } from "../query/expander/QueryExpander.js";
 import EntityContext from "./EntityContext.js";
 import type { EntitySource } from "./EntitySource.js";
@@ -38,7 +38,6 @@ export default class EntityQuery<T = any>
 
     insertInTo(es: EntitySource) {
         const model = es[modelSymbol] as EntityType;
-        const table = model.fullyQualifiedName as TableLiteral;
         const fields = [] as string[];
         for (const iterator of this.selectStatement.fields) {
             if (iterator.type !== "ExpressionAs") {

package/src/model/EntitySource.ts

@@ -2,8 +2,7 @@ import type EntityContext from "./EntityContext.js";
 import type EntityType from "../entity-query/EntityType.js";
 import type { IEntityQuery } from "./IFilterWithParameter.js";
 import { contextSymbol, modelSymbol, traceSymbol } from "../common/symbols/symbols.js";
-import { Expression, ExpressionAs, Identifier, InsertStatement, TableLiteral } from "../query/ast/Expressions.js";
-import { DirectSaveType } from "../drivers/base/BaseDriver.js";
+import { Expression, Identifier } from "../query/ast/Expressions.js";
 import IdentityService from "./identity/IdentityService.js";
 import sleep from "../common/sleep.js";
 import EntityAccessError from "../common/EntityAccessError.js";

package/src/model/changes/ChangeEntry.ts

@@ -38,14 +38,11 @@ export default class ChangeEntry<T = any> implements IChanges {
 
     private pending: (() => void)[];
 
-    private dependents: Set<ChangeEntry>;
-
     constructor(p: IChanges, changeSet: ChangeSet) {
         Object.setPrototypeOf(p, ChangeEntry.prototype);
         const ce = p as ChangeEntry;
         ce.changeSet = changeSet;
         ce.pending = [];
-        ce.dependents = new Set();
         ce.modified = new Map();
         ce.order = 1;
         return ce;
@@ -239,7 +236,7 @@ export default class ChangeEntry<T = any> implements IChanges {
 
         // we will only apply the columns defined
         if (dbValues !== void 0) {
-            const { entity, type } = this;
+            const { entity } = this;
             for (const key in dbValues) {
                 if (Object.hasOwn(dbValues, key)) {
                     const element = dbValues[key];

package/src/model/changes/ChangeSet.ts

@@ -1,5 +1,4 @@
 import EntityAccessError from "../../common/EntityAccessError.js";
-import EventSet from "../../common/EventSet.js";
 import { identityMapSymbol } from "../../common/symbols/symbols.js";
 import EntityContext from "../EntityContext.js";
 import IdentityMap from "../identity/IdentityMap.js";
@@ -28,8 +27,6 @@ export default class ChangeSet {
      */
     private readonly identityMap = new IdentityMap();
 
-    private nextId = 1;
-
     private pending = void 0 as ChangeEntry[];
 
     constructor(private context: EntityContext) {

package/src/model/events/ContextEvents.ts

@@ -1,8 +1,5 @@
 import EntityAccessError from "../../common/EntityAccessError.js";
 import { IClassOf } from "../../decorators/IClassOf.js";
-import { ServiceProvider } from "../../di/di.js";
-import { NotSupportedError } from "../../query/parser/NotSupportedError.js";
-import type EntityContext from "../EntityContext.js";
 import type EntityEvents from "./EntityEvents.js";
 import { entityNameSymbol } from "./EntityEvents.js";
 

package/src/model/identity/IdentityService.ts

@@ -1,5 +1,4 @@
 import { identitySymbol } from "../../common/symbols/symbols.js";
-import SchemaRegistry from "../../decorators/SchemaRegistry.js";
 import type EntityType from "../../entity-query/EntityType.js";
 
 export default class IdentityService {

package/src/model/identity/RelationMapper.ts

@@ -1,4 +1,3 @@
-import EventEmitter from "events";
 import type ChangeEntry from "../changes/ChangeEntry.js";
 import type ChangeSet from "../changes/ChangeSet.js";
 import { IColumn } from "../../decorators/IColumn.js";
@@ -17,7 +16,7 @@ export default class RelationMapper {
     private events: Map<string, Function[]> = new Map();
 
     constructor(
-        private changeSet: ChangeSet,
+        changeSet: ChangeSet,
         private identityMap = changeSet[identityMapSymbol]
     ) {
     }

package/src/query/ast/ExpressionToSql.ts

@@ -15,10 +15,10 @@ interface IPropertyChain {
     chain: { member: string, args?: Expression[], isCollectionMethod?: boolean }[]
 }
 
-interface IPropertyMethods {
-    identifier?: Identifier;
-    parameter?: ParameterExpression;
-}
+// interface IPropertyMethods {
+//     identifier?: Identifier;
+//     parameter?: ParameterExpression;
+// }
 
 export interface IMappingModel {
     parameter: ParameterExpression;
@@ -386,7 +386,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
     visitMemberExpression(me: MemberExpression): ITextQuery {
         const propertyChain = this.getPropertyChain(me);
         if (propertyChain) {
-            const { parameter, identifier, chain } = propertyChain;
+            const { parameter, chain } = propertyChain;
             if (parameter) {
                 if (parameter === this.root) {
                     // we have a parameter...

package/src/query/ast/Expressions.ts

@@ -1,10 +1,6 @@
 import { IClassOf } from "../../decorators/IClassOf.js";
-import { ITextQuery } from "./IStringTransformer.js";
 import type EntityType from "../../entity-query/EntityType.js";
 import DebugStringVisitor from "./DebugStringVisitor.js";
-import { IEntityRelation } from "../../decorators/IColumn.js";
-
-const flattenedSelf = Symbol("flattenedSelf");
 
 /**
  * The reason we are using our own Expression type is to keep
@@ -146,23 +142,23 @@ export abstract class Expression {
         return r as T;
     }
 
-    private static shallowCopy(expression, constants: Expression[]) {
-        const copy = {} as any;
-        for (const key in expression) {
-            if (Object.hasOwn(expression, key)) {
-                const element = expression[key];
-                if (key === "type" || key === "is") {
-                    continue;
-                }
-                if (element instanceof Constant) {
-                    constants.push(element);
-                }
-                copy[key] = element;
-            }
-        }
-        Object.setPrototypeOf(copy, Object.getPrototypeOf(expression));
-        return copy;
-    }
+    // private static shallowCopy(expression, constants: Expression[]) {
+    //     const copy = {} as any;
+    //     for (const key in expression) {
+    //         if (Object.hasOwn(expression, key)) {
+    //             const element = expression[key];
+    //             if (key === "type" || key === "is") {
+    //                 continue;
+    //             }
+    //             if (element instanceof Constant) {
+    //                 constants.push(element);
+    //             }
+    //             copy[key] = element;
+    //         }
+    //     }
+    //     Object.setPrototypeOf(copy, Object.getPrototypeOf(expression));
+    //     return copy;
+    // }
 
     readonly type: ExpressionType["type"];
 

package/src/query/ast/Visitor.ts

@@ -80,6 +80,7 @@ export default abstract class Visitor<T = any> {
             case "NegateExpression":
                 return this.visitNegateExpression(e);
         }
+        // @ts-expect-error unused
         const c: never = e;
         throw new Error(`${e1.type} Not implemented`);
     }

package/src/query/expander/QueryExpander.ts

@@ -1,12 +1,8 @@
 import { cloner } from "../../common/cloner.js";
-import { IEntityRelation } from "../../decorators/IColumn.js";
 import EntityType from "../../entity-query/EntityType.js";
 import EntityContext from "../../model/EntityContext.js";
 import EntityQuery from "../../model/EntityQuery.js";
-import DebugStringVisitor from "../ast/DebugStringVisitor.js";
-import { ArrowFunctionExpression, ExistsExpression, Expression, ExpressionType, JoinExpression, NumberLiteral, ParameterExpression, SelectStatement, TableSource } from "../ast/Expressions.js";
-import ReplaceParameter from "../ast/ReplaceParameter.js";
-import ArrowToExpression from "../parser/ArrowToExpression.js";
+import { ArrowFunctionExpression, Expression, ExpressionType, JoinExpression, SelectStatement } from "../ast/Expressions.js";
 import { NotSupportedError } from "../parser/NotSupportedError.js";
 
 export class QueryExpander {
@@ -23,8 +19,8 @@ export class QueryExpander {
 
     constructor(
         private context: EntityContext,
-        private select: SelectStatement,
-        private filter: boolean
+        select: SelectStatement,
+        filter: boolean
     ) {
 
     }
@@ -98,8 +94,6 @@ export class QueryExpander {
         // let where: Expression;
         // let joinWhere: Expression;
 
-        const fk = relation.fkMap ?? relation.relatedRelation.fkMap;
-
         key += "." + relation.name;
 
         let relationSet = this.included.get(key);

package/src/query/parser/ArrowToExpression.ts

@@ -5,9 +5,6 @@ import * as bpe from "@babel/types";
 import Restructure from "./Restructure.js";
 import { NotSupportedError } from "./NotSupportedError.js";
 
-type IQueryFragment = string | { name?: string, value?: any };
-
-const defaultObject = {};
 
 export default class ArrowToExpression extends BabelVisitor<Expression> {
 

package/src/query/parser/BabelVisitor.ts

@@ -1,4 +1,3 @@
-import * as bp from "@babel/parser";
 import * as bpe from "@babel/types";
 
 export abstract class BabelVisitor<T> {

package/src/query/parser/Restructure.ts

@@ -1,5 +1,4 @@
 import * as bpe from "@babel/types";
-import { BabelVisitor } from "./BabelVisitor.js";
 import { NotSupportedError } from "./NotSupportedError.js";
 import TransformVisitor from "./TransformVisitor.js";
 

package/src/sql/ISql.ts

@@ -8,10 +8,6 @@ interface IGeometry {
     srid: number;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface IGeography extends IGeometry {
-}
-
 export interface ISql {
 
     in<T>(a: T, array: T[]): boolean;

package/src/types/TimeSpan.ts

@@ -1,6 +1,6 @@
-function isEmpty(n: number): boolean {
-    return n === undefined || n === null || n === 0 || isNaN(n);
-}
+// function isEmpty(n: number): boolean {
+//     return n === undefined || n === null || n === 0 || isNaN(n);
+// }
 
 export const msMinutes = 60000;
 
@@ -52,8 +52,11 @@ export default class TimeSpan {
             throw new Error("Invalid time format");
         }
         let isPM: boolean = false;
-        // tslint:disable-next-line: one-variable-per-declaration
-        let d: number, h: number, m: number, s: number, ms: number;
+        let d: number;
+        let h: number;
+        let m: number;
+        let s: number;
+        let ms: number;
         const tokens = text.split(/:/);
         // split last...
         const last = tokens[tokens.length - 1];
@@ -94,8 +97,6 @@ export default class TimeSpan {
         return new TimeSpan(d, isPM ? h + 12 : h, m, s, ms);
     }
 
-    private msSinceEpoch: number;
-
     public get totalSeconds(): number {
         return this.msSinceEpoch * secondsPerMS;
     }
@@ -151,9 +152,10 @@ export default class TimeSpan {
         return new TimeSpan(Math.ceil(this.msSinceEpoch % msDays));
     }
 
+    private msSinceEpoch: number;
     constructor(ms: number);
     // tslint:disable-next-line: unified-signatures
-    constructor(days: number, hours: number, minutes?: number, seconds?: number, milliseconds?: number)
+    constructor(days: number, hours: number, minutes?: number, seconds?: number, milliseconds?: number);
     constructor(days: number, hours?: number, minutes?: number, seconds?: number, milliseconds?: number) {
         if (arguments.length === 1) {
                 this.msSinceEpoch = days;

package/src/workflows/WorkflowContext.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
-import { randomBytes, randomUUID } from "crypto";
+import { randomBytes } from "crypto";
 import EntityAccessError from "../common/EntityAccessError.js";
 import { IClassOf } from "../decorators/IClassOf.js";
-import Inject, { RegisterSingleton, ServiceProvider, injectServiceKeysSymbol } from "../di/di.js";
+import Inject, { ServiceProvider, injectServiceKeysSymbol } from "../di/di.js";
 import DateTime from "../types/DateTime.js";
 import type Workflow from "./Workflow.js";
 import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
@@ -332,7 +332,7 @@ export default class WorkflowContext {
         // run...
         for (const iterator of pending) {
             try {
-                using l = iterator;
+                using _l = iterator;
                 await this.run(iterator.item, iterator.signal);
             } catch (error) {
                 EALogger.error(error);

package/src/workflows/WorkflowStorage.ts

@@ -2,10 +2,8 @@
 import { randomUUID } from "crypto";
 import Inject, { RegisterSingleton } from "../di/di.js";
 import { BaseDriver } from "../drivers/base/BaseDriver.js";
-import { CallExpression, Expression, NullExpression, NumberLiteral, UpdateStatement } from "../query/ast/Expressions.js";
 import DateTime from "../types/DateTime.js";
 import WorkflowClock from "./WorkflowClock.js";
-import RawQuery from "../compiler/RawQuery.js";
 import { loadedFromDb, WorkflowDbContext, WorkflowItem } from "./WorkflowDbContext.js";
 import WorkflowTask from "./WorkflowTask.js";
 import Sql from "../sql/Sql.js";
@@ -261,8 +259,8 @@ export default class WorkflowStorage {
                 )
                 && x.isWorkflow === true
                 && x.taskGroup === p.taskGroup)
-            .orderBy({}, (x, p) => x.eta)
-            .thenBy({}, (x, p) => x.priority)
+            .orderBy((x) => x.eta)
+            .thenBy((x) => x.priority)
             .limit(20)
             .withSignal(signal)
             .updateSelect({ uuid}, (x, p) => ({

package/tsconfig.json

@@ -15,6 +15,7 @@
         "skipLibCheck": true,
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
+        "noUnusedLocals": true,
         "lib": [
             "ES2022",
             "ESNext.Disposable",

package/dist/TestRunner.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=TestRunner.d.ts.map

package/dist/TestRunner.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TestRunner.d.ts","sourceRoot":"","sources":["../src/TestRunner.ts"],"names":[],"mappings":""}

package/dist/TestRunner.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=TestRunner.js.map

package/dist/TestRunner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TestRunner.js","sourceRoot":"","sources":["../src/TestRunner.ts"],"names":[],"mappings":""}

package/src/TestRunner.ts

@@ -1,2 +0,0 @@
-import { readdir } from "fs/promises";
-import PostgreSqlDriver from "./drivers/postgres/PostgreSqlDriver.js";