@an5/orm 1.0.4 → 1.0.6

package/README.md

@@ -1,18 +1,18 @@
 # @an5/orm
-
-SQL Server ORM. Proxy client. CRUD. Vector search. Middleware. Raw queries. Transactions.
-
-## Features
-
--   **Proxy Client.** Model access. `db.modelName` syntax.
--   **CRUD.** `findMany`, `findFirst`, `findUnique`, `create`, `update`, `delete`, `upsert`.
--   **Advanced Queries.** OR/AND, nested relations, aggregates, `groupBy`.
--   **Vector Search.** Native SQL Server `VECTOR_DISTANCE`. In-memory fallback.
--   **Middleware.** Hook ORM operations: logging, auth, validation.
--   **Raw Queries.** `$queryRaw`, `$executeRaw`. Auto `NOLOCK`.
--   **Transactions.** `$transaction`. Rollback support.
--   **Schema Generator.** Parse `.an5` files. Generate TypeScript/Python/.NET code.
-
+
+SQL Server ORM. Proxy client. CRUD. Vector search. Middleware. Raw queries. Transactions.
+
+## Features
+
+-   **Proxy Client.** Model access. `db.modelName` syntax.
+-   **CRUD.** `findMany`, `findFirst`, `findUnique`, `create`, `update`, `delete`, `upsert`.
+-   **Advanced Queries.** OR/AND, nested relations, aggregates, `groupBy`.
+-   **Vector Search.** Native SQL Server `VECTOR_DISTANCE`. In-memory fallback.
+-   **Middleware.** Hook ORM operations: logging, auth, validation.
+-   **Raw Queries.** `$queryRaw`, `$executeRaw`. Auto `NOLOCK`.
+-   **Transactions.** `$transaction`. Rollback support.
+-   **Schema Generator.** Parse `.an5` files. Generate TypeScript/Python/.NET code.
+
 ## Quick Start
 
 ### Installation
@@ -20,17 +20,17 @@ SQL Server ORM. Proxy client. CRUD. Vector search. Middleware. Raw queries. Tran
 ```bash
 npm install @an5/orm
 ```
-
-### Configuration
-
-```bash
-cp .env.example .env
-# Edit .env. Set DATABASE_URL.
-```
-
-### Development Commands
-
-```bash
+
+### Configuration
+
+```bash
+cp .env.example .env
+# Edit .env. Set DATABASE_URL.
+```
+
+### Development Commands
+
+```bash
 # Generate code from schema
 npx an5 generate
 
@@ -45,103 +45,103 @@ npx an5 db:seed
 
 # Compare schema with database
 npx an5 db:migrate diff
-
-# Run tests
-npm test
-```
-
-## Usage
-
-```typescript
+
+# Run tests
+npm test
+```
+
+## Usage
+
+```typescript
 import { An5ORM } from '@an5/orm';
-
-const db = new An5ORM();
-
-// CRUD Operations
-const users = await db.user.findMany({
-  where: { email: { contains: '@example.com' } },
-  orderBy: { createdAt: 'desc' },
-  take: 10,
-});
-
-const user = await db.user.create({
-  data: { email: 'john@example.com', name: 'John' },
-});
-
-// Relations
-const orders = await db.user.findMany({
-  include: { orders: true },
-});
-
-// Vector Search
-const similar = await db.document.vectorSearch({
-  vector: [0.1, 0.2, 0.3],
-  take: 5,
-  distanceMetric: 'cosine',
-});
-
-// Transactions
-await db.$transaction(async (tx) => {
-  const user = await tx.user.create({ data: { email: 'jane@example.com' } });
-  await tx.order.create({ data: { userId: user.id, total: 100 } });
-});
-
-// Raw Queries
-const results = await db.$queryRaw`SELECT * FROM users WHERE id = ${id}`;
-```
-
-## Schema Definition
-
-Schema files: `.an5`. Path: `an5Schema/`. SQL Server types.
-
-```an5
-model User {
-  id        NVARCHAR(1000) @id @default(uuid())
-  email     NVARCHAR(255)  @unique
-  name      NVARCHAR(255)?
-  createdAt DATETIME2      @default(now())
-  orders    Order[]
-
-  @@map("users")
-}
-
-model Order {
-  id        NVARCHAR(1000) @id @default(uuid())
-  userId    NVARCHAR(1000)
-  total     INT            @default(0)
-  user      User           @relation(fields: [userId], references: [id])
-
-  @@map("orders")
-}
-```
-
-## Supported SQL Server Types
-
-Type mapping: `.an5` to TypeScript.
-
-| Schema Type | TypeScript |
-|-------------|------------|
-| `NVARCHAR(n)`, `VARCHAR(n)`, `CHAR(n)`, `TEXT` | `string` |
-| `INT`, `SMALLINT`, `TINYINT`, `FLOAT`, `REAL`, `DECIMAL`, `NUMERIC` | `number` |
-| `BIGINT` | `number \| bigint` |
-| `BIT` | `boolean` |
-| `DATETIME`, `DATETIME2`, `DATE`, `TIME` | `Date` |
-| `UNIQUEIDENTIFIER` | `string` |
-| `VARBINARY`, `BINARY`, `IMAGE` | `Buffer` |
-
-## Testing
-
-```bash
-# Unit tests
-node test/unit.test.js
-
-# Generator tests
-node test/generator.test.js
-
-# Smoke test
-npm test
-```
-
-## License
-
+
+const db = new An5ORM();
+
+// CRUD Operations
+const users = await db.user.findMany({
+  where: { email: { contains: '@example.com' } },
+  orderBy: { createdAt: 'desc' },
+  take: 10,
+});
+
+const user = await db.user.create({
+  data: { email: 'john@example.com', name: 'John' },
+});
+
+// Relations
+const orders = await db.user.findMany({
+  include: { orders: true },
+});
+
+// Vector Search
+const similar = await db.document.vectorSearch({
+  vector: [0.1, 0.2, 0.3],
+  take: 5,
+  distanceMetric: 'cosine',
+});
+
+// Transactions
+await db.$transaction(async (tx) => {
+  const user = await tx.user.create({ data: { email: 'jane@example.com' } });
+  await tx.order.create({ data: { userId: user.id, total: 100 } });
+});
+
+// Raw Queries
+const results = await db.$queryRaw`SELECT * FROM users WHERE id = ${id}`;
+```
+
+## Schema Definition
+
+Schema files: `.an5`. Path: `an5Schema/`. SQL Server types.
+
+```an5
+model User {
+  id        NVARCHAR(1000) @id @default(uuid())
+  email     NVARCHAR(255)  @unique
+  name      NVARCHAR(255)?
+  createdAt DATETIME2      @default(now())
+  orders    Order[]
+
+  @@map("users")
+}
+
+model Order {
+  id        NVARCHAR(1000) @id @default(uuid())
+  userId    NVARCHAR(1000)
+  total     INT            @default(0)
+  user      User           @relation(fields: [userId], references: [id])
+
+  @@map("orders")
+}
+```
+
+## Supported SQL Server Types
+
+Type mapping: `.an5` to TypeScript.
+
+| Schema Type | TypeScript |
+|-------------|------------|
+| `NVARCHAR(n)`, `VARCHAR(n)`, `CHAR(n)`, `TEXT` | `string` |
+| `INT`, `SMALLINT`, `TINYINT`, `FLOAT`, `REAL`, `DECIMAL`, `NUMERIC` | `number` |
+| `BIGINT` | `number \| bigint` |
+| `BIT` | `boolean` |
+| `DATETIME`, `DATETIME2`, `DATE`, `TIME` | `Date` |
+| `UNIQUEIDENTIFIER` | `string` |
+| `VARBINARY`, `BINARY`, `IMAGE` | `Buffer` |
+
+## Testing
+
+```bash
+# Unit tests
+node test/unit.test.js
+
+# Generator tests
+node test/generator.test.js
+
+# Smoke test
+npm test
+```
+
+## License
+
 MIT

package/dist/an5Orm.js

@@ -238,11 +238,11 @@ async function resolveIncludes(modelName, rows, include, executor) {
                             rows.forEach(r => { r._count = { ...r._count, [countField]: 0 }; });
                             continue;
                         }
-                        const sqlText = `
-              SELECT ${rel.foreignKey} as parentId, COUNT(*) as count 
-              FROM ${relTable} WITH (NOLOCK)
-              WHERE ${rel.foreignKey} IN (${localKeys.map((_, i) => `@lk_${i}`).join(", ")})
-              GROUP BY ${rel.foreignKey}
+                        const sqlText = `
+              SELECT ${rel.foreignKey} as parentId, COUNT(*) as count 
+              FROM ${relTable} WITH (NOLOCK)
+              WHERE ${rel.foreignKey} IN (${localKeys.map((_, i) => `@lk_${i}`).join(", ")})
+              GROUP BY ${rel.foreignKey}
             `;
                         const countParams = {};
                         localKeys.forEach((lk, i) => { countParams[`lk_${i}`] = lk; });
@@ -1065,15 +1065,15 @@ class TableClient {
                 }
                 return `target.[${k}] = @upw_${k}`;
             }).join(" AND ");
-            const sqlText = `
-        MERGE INTO ${this.tableName} WITH (HOLDLOCK) AS target
-        USING (SELECT ${sourceSelect}) AS source
-        ON (${onClause})
-        WHEN MATCHED THEN
-          UPDATE SET ${updateSets}
-        WHEN NOT MATCHED THEN
-          INSERT (${insertCols}) VALUES (${insertVals})
-        OUTPUT inserted.*;
+            const sqlText = `
+        MERGE INTO ${this.tableName} WITH (HOLDLOCK) AS target
+        USING (SELECT ${sourceSelect}) AS source
+        ON (${onClause})
+        WHEN MATCHED THEN
+          UPDATE SET ${updateSets}
+        WHEN NOT MATCHED THEN
+          INSERT (${insertCols}) VALUES (${insertVals})
+        OUTPUT inserted.*;
       `;
             try {
                 const rows = await this.executor(sqlText, p);

package/dist/cleanup.js

@@ -10,7 +10,10 @@ const path_1 = __importDefault(require("path"));
 const rootDir = process.cwd();
 let config = {};
 try {
-    const configPath = path_1.default.join(rootDir, "an5Orm.config.js");
+    let configPath = path_1.default.join(rootDir, "an5Orm.config.js");
+    if (!fs_1.default.existsSync(configPath)) {
+        configPath = path_1.default.join(rootDir, "an5Orm.config.cjs");
+    }
     if (fs_1.default.existsSync(configPath)) {
         config = require(configPath);
     }
@@ -68,8 +71,8 @@ async function cleanup() {
     // Also include the capitalization variations from an5Metadata if we can, 
     // but schema.an5 is the source of truth.
     console.log("Valid tables from schema:", Array.from(validTables));
-    const dbTables = await (await getDb()).$queryRawUnsafe(`
-    SELECT name FROM sys.tables WHERE is_ms_shipped = 0
+    const dbTables = await (await getDb()).$queryRawUnsafe(`
+    SELECT name FROM sys.tables WHERE is_ms_shipped = 0
   `);
     const tablesToDrop = dbTables
         .map(t => t.name)
@@ -92,10 +95,10 @@ async function cleanup() {
             console.error(`❌ Failed to drop [${table}]: ${err.message}`);
             if (err.message.includes("FOREIGN KEY constraint")) {
                 console.log(`Attempting to find and drop constraints for [${table}]...`);
-                const constraints = await (await getDb()).$queryRawUnsafe(`
-            SELECT fk.name AS constraint_name, OBJECT_NAME(fk.parent_object_id) AS table_name
-            FROM sys.foreign_keys AS fk
-            WHERE OBJECT_NAME(fk.referenced_object_id) = @p_0 OR OBJECT_NAME(fk.parent_object_id) = @p_0
+                const constraints = await (await getDb()).$queryRawUnsafe(`
+            SELECT fk.name AS constraint_name, OBJECT_NAME(fk.parent_object_id) AS table_name
+            FROM sys.foreign_keys AS fk
+            WHERE OBJECT_NAME(fk.referenced_object_id) = @p_0 OR OBJECT_NAME(fk.parent_object_id) = @p_0
           `, table);
                 for (const c of constraints) {
                     console.log(`Dropping constraint [${c.constraint_name}] on [${c.table_name}]...`);

package/dist/generator/src/code-generator.js

@@ -21,45 +21,45 @@ class CodeGenerator {
         this.generateIndexTs(models);
     }
     generateBaseTs() {
-        const baseTs = `
-export namespace An5 {
-  export class An5ClientKnownRequestError extends Error {
-    code!: string;
-    meta?: any;
-    constructor(message: string, { code, clientVersion }: { code: string; clientVersion: string }) {
-      super(message);
-      this.code = code;
-    }
-  }
-  export type SortOrder = 'asc' | 'desc';
-  export type StringFilter = { equals?: string; in?: string[]; notIn?: string[]; lt?: string; lte?: string; gt?: string; gte?: string; contains?: string; startsWith?: string; endsWith?: string; not?: string | StringFilter; };
-  export type StringNullableFilter = { equals?: string | null; in?: (string | null)[]; notIn?: (string | null)[]; lt?: string; lte?: string; gt?: string; gte?: string; contains?: string; startsWith?: string; endsWith?: string; not?: string | StringNullableFilter | null; };
-  export type NumberFilter = { equals?: number; in?: number[]; notIn?: number[]; lt?: number; lte?: number; gt?: number; gte?: number; not?: number | NumberFilter; };
-  export type IntFieldUpdateOperationsInput = { set?: number; increment?: number; decrement?: number; multiply?: number; divide?: number; };
-  export type FloatFieldUpdateOperationsInput = { set?: number; increment?: number; decrement?: number; multiply?: number; divide?: number; };
-  export type NumberNullableFilter = { equals?: number | null; in?: (number | null)[]; notIn?: (number | null)[]; lt?: number; lte?: number; gt?: number; gte?: number; not?: number | NumberNullableFilter | null; };
-  export type BooleanFilter = { equals?: boolean; not?: boolean | BooleanFilter; };
-  export type BooleanNullableFilter = { equals?: boolean | null; not?: boolean | BooleanNullableFilter | null; };
-  export type DateTimeFilter = { equals?: Date; in?: Date[]; notIn?: Date[]; lt?: Date; lte?: Date; gt?: Date; gte?: Date; not?: Date | DateTimeFilter; };
-  export type DateTimeNullableFilter = { equals?: Date | null; in?: (Date | null)[]; notIn?: (Date | null)[]; lt?: Date; lte?: Date; gt?: Date; gte?: Date; not?: Date | DateTimeNullableFilter | null; };
-}
-
-export interface TableClient<T, WhereInput = any, Select = any, Include = any, CreateInput = any, UpdateInput = any, FindManyArgs = any, FindFirstArgs = any, FindUniqueArgs = any, CreateArgs = any, UpdateArgs = any, UpsertArgs = any, DeleteArgs = any> {
-  findMany(args?: FindManyArgs): Promise<T[]>;
-  vectorSearch(args: { vector: number[]; take?: number; where?: WhereInput; include?: Include; vectorField?: string; distanceMetric?: 'cosine' | 'euclidean' | 'dot'; }): Promise<(T & { distance: number })[]>;
-  findFirst(args?: FindFirstArgs): Promise<T | null>;
-  findUnique(args?: FindUniqueArgs): Promise<T | null>;
-  count(args?: { where?: WhereInput; }): Promise<number>;
-  create(args: CreateArgs): Promise<T>;
-  createMany(args: { data: CreateInput[]; skipDuplicates?: boolean; }): Promise<{ count: number }>;
-  update(args: UpdateArgs): Promise<T>;
-  updateMany(args: { where?: WhereInput; data: UpdateInput; }): Promise<{ count: number }>;
-  delete(args: DeleteArgs): Promise<T>;
-  deleteMany(args?: { where?: WhereInput; }): Promise<{ count: number }>;
-  aggregate(args: any): Promise<any>;
-  groupBy(args: any): Promise<any[]>;
-  upsert(args: UpsertArgs): Promise<T>;
-}
+        const baseTs = `
+export namespace An5 {
+  export class An5ClientKnownRequestError extends Error {
+    code!: string;
+    meta?: any;
+    constructor(message: string, { code, clientVersion }: { code: string; clientVersion: string }) {
+      super(message);
+      this.code = code;
+    }
+  }
+  export type SortOrder = 'asc' | 'desc';
+  export type StringFilter = { equals?: string; in?: string[]; notIn?: string[]; lt?: string; lte?: string; gt?: string; gte?: string; contains?: string; startsWith?: string; endsWith?: string; not?: string | StringFilter; };
+  export type StringNullableFilter = { equals?: string | null; in?: (string | null)[]; notIn?: (string | null)[]; lt?: string; lte?: string; gt?: string; gte?: string; contains?: string; startsWith?: string; endsWith?: string; not?: string | StringNullableFilter | null; };
+  export type NumberFilter = { equals?: number; in?: number[]; notIn?: number[]; lt?: number; lte?: number; gt?: number; gte?: number; not?: number | NumberFilter; };
+  export type IntFieldUpdateOperationsInput = { set?: number; increment?: number; decrement?: number; multiply?: number; divide?: number; };
+  export type FloatFieldUpdateOperationsInput = { set?: number; increment?: number; decrement?: number; multiply?: number; divide?: number; };
+  export type NumberNullableFilter = { equals?: number | null; in?: (number | null)[]; notIn?: (number | null)[]; lt?: number; lte?: number; gt?: number; gte?: number; not?: number | NumberNullableFilter | null; };
+  export type BooleanFilter = { equals?: boolean; not?: boolean | BooleanFilter; };
+  export type BooleanNullableFilter = { equals?: boolean | null; not?: boolean | BooleanNullableFilter | null; };
+  export type DateTimeFilter = { equals?: Date; in?: Date[]; notIn?: Date[]; lt?: Date; lte?: Date; gt?: Date; gte?: Date; not?: Date | DateTimeFilter; };
+  export type DateTimeNullableFilter = { equals?: Date | null; in?: (Date | null)[]; notIn?: (Date | null)[]; lt?: Date; lte?: Date; gt?: Date; gte?: Date; not?: Date | DateTimeNullableFilter | null; };
+}
+
+export interface TableClient<T, WhereInput = any, Select = any, Include = any, CreateInput = any, UpdateInput = any, FindManyArgs = any, FindFirstArgs = any, FindUniqueArgs = any, CreateArgs = any, UpdateArgs = any, UpsertArgs = any, DeleteArgs = any> {
+  findMany(args?: FindManyArgs): Promise<T[]>;
+  vectorSearch(args: { vector: number[]; take?: number; where?: WhereInput; include?: Include; vectorField?: string; distanceMetric?: 'cosine' | 'euclidean' | 'dot'; }): Promise<(T & { distance: number })[]>;
+  findFirst(args?: FindFirstArgs): Promise<T | null>;
+  findUnique(args?: FindUniqueArgs): Promise<T | null>;
+  count(args?: { where?: WhereInput; }): Promise<number>;
+  create(args: CreateArgs): Promise<T>;
+  createMany(args: { data: CreateInput[]; skipDuplicates?: boolean; }): Promise<{ count: number }>;
+  update(args: UpdateArgs): Promise<T>;
+  updateMany(args: { where?: WhereInput; data: UpdateInput; }): Promise<{ count: number }>;
+  delete(args: DeleteArgs): Promise<T>;
+  deleteMany(args?: { where?: WhereInput; }): Promise<{ count: number }>;
+  aggregate(args: any): Promise<any>;
+  groupBy(args: any): Promise<any[]>;
+  upsert(args: UpsertArgs): Promise<T>;
+}
 `;
         fs_1.default.writeFileSync(path_1.default.join(this.outputDir, 'base.ts'), baseTs);
     }