ts-prorm-orm 1.2.3 → 2.1.0

package/dist/types/index.js

@@ -110,15 +110,20 @@ var ValidateOn;
 })(ValidateOn || (exports.ValidateOn = ValidateOn = {}));
 /**
  * Lock types for row-level locking
- * - 'UPDATE': FOR UPDATE (PostgreSQL/MySQL) - prevents other transactions from modifying the rows
- * - 'SHARE': FOR SHARE (PostgreSQL) / LOCK IN SHARE MODE (MySQL) - allows other transactions to read but not modify
- * - 'KEY SHARE': FOR KEY SHARE (PostgreSQL only) - prevents key updates but allows row updates
+ * - 'UPDATE': FOR UPDATE (PostgreSQL/MySQL/MariaDB/Oracle/Db2/HANA, UPDLOCK on SQL Server) - prevents other transactions from modifying the rows
+ * - 'SHARE': FOR SHARE (PostgreSQL) / LOCK IN SHARE MODE (MySQL/MariaDB, or FOR SHARE when a modifier is used) / HOLDLOCK (SQL Server) - allows other transactions to read but not modify
+ * - 'KEY SHARE': FOR KEY SHARE (PostgreSQL/CockroachDB only) - prevents key updates but allows row updates
+ * - 'NO KEY UPDATE': FOR NO KEY UPDATE (PostgreSQL/CockroachDB only) - like UPDATE but does not block KEY SHARE lockers
+ *
+ * A dialect that cannot express the requested level throws when the query is
+ * built, rather than silently falling back to a weaker lock (or to none).
  */
 var LockLevel;
 (function (LockLevel) {
     LockLevel["Share"] = "SHARE";
     LockLevel["Update"] = "UPDATE";
     LockLevel["KeyShare"] = "KEY SHARE";
+    LockLevel["NoKeyUpdate"] = "NO KEY UPDATE";
 })(LockLevel || (exports.LockLevel = LockLevel = {}));
 // ==================== Transaction Options ====================
 /**
@@ -166,15 +171,5 @@ var IsolationLevel;
  * prorm.query('SELECT * FROM users', { type: QueryTypes.SELECT })
  * prorm.query('INSERT INTO users VALUES(...)', { type: QueryTypes.INSERT })
  */
-var QueryTypes;
-(function (QueryTypes) {
-    QueryTypes["SELECT"] = "SELECT";
-    QueryTypes["INSERT"] = "INSERT";
-    QueryTypes["UPDATE"] = "UPDATE";
-    QueryTypes["DELETE"] = "DELETE";
-    QueryTypes["BULKINSERT"] = "BULKINSERT";
-    QueryTypes["BULKUPDATE"] = "BULKUPDATE";
-    QueryTypes["BULKDELETE"] = "BULKDELETE";
-    QueryTypes["RAW"] = "RAW";
-    QueryTypes["CALL"] = "CALL";
-})(QueryTypes || (exports.QueryTypes = QueryTypes = {}));
+const query_types_1 = require("./query-types");
+Object.defineProperty(exports, "QueryTypes", { enumerable: true, get: function () { return query_types_1.QueryTypes; } });

package/dist/types/query-types.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Query type discriminator, used by `prorm.query()` to decide how to shape a
+ * raw result.
+ *
+ * This enum existed twice with *different members*: `src/prorm.ts` declared
+ * UPSERT/VERSION/SHOWTABLES/DESCRIBE, while `src/types/index.ts` declared
+ * BULKUPDATE/CALL. The package root explicitly re-exported the prorm.ts one, so
+ * `QueryTypes.CALL` and `QueryTypes.BULKUPDATE` were unreachable for consumers
+ * even though internal code in types/index.ts referred to them. This is the
+ * union of both, defined once; both modules now re-export it.
+ */
+export declare enum QueryTypes {
+    SELECT = "SELECT",
+    INSERT = "INSERT",
+    UPDATE = "UPDATE",
+    DELETE = "DELETE",
+    UPSERT = "UPSERT",
+    BULKINSERT = "BULKINSERT",
+    BULKUPDATE = "BULKUPDATE",
+    BULKDELETE = "BULKDELETE",
+    VERSION = "VERSION",
+    SHOWTABLES = "SHOWTABLES",
+    DESCRIBE = "DESCRIBE",
+    CALL = "CALL",
+    RAW = "RAW"
+}

package/dist/types/query-types.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryTypes = void 0;
+/**
+ * Query type discriminator, used by `prorm.query()` to decide how to shape a
+ * raw result.
+ *
+ * This enum existed twice with *different members*: `src/prorm.ts` declared
+ * UPSERT/VERSION/SHOWTABLES/DESCRIBE, while `src/types/index.ts` declared
+ * BULKUPDATE/CALL. The package root explicitly re-exported the prorm.ts one, so
+ * `QueryTypes.CALL` and `QueryTypes.BULKUPDATE` were unreachable for consumers
+ * even though internal code in types/index.ts referred to them. This is the
+ * union of both, defined once; both modules now re-export it.
+ */
+var QueryTypes;
+(function (QueryTypes) {
+    QueryTypes["SELECT"] = "SELECT";
+    QueryTypes["INSERT"] = "INSERT";
+    QueryTypes["UPDATE"] = "UPDATE";
+    QueryTypes["DELETE"] = "DELETE";
+    QueryTypes["UPSERT"] = "UPSERT";
+    QueryTypes["BULKINSERT"] = "BULKINSERT";
+    QueryTypes["BULKUPDATE"] = "BULKUPDATE";
+    QueryTypes["BULKDELETE"] = "BULKDELETE";
+    QueryTypes["VERSION"] = "VERSION";
+    QueryTypes["SHOWTABLES"] = "SHOWTABLES";
+    QueryTypes["DESCRIBE"] = "DESCRIBE";
+    QueryTypes["CALL"] = "CALL";
+    QueryTypes["RAW"] = "RAW";
+})(QueryTypes || (exports.QueryTypes = QueryTypes = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-prorm-orm",
-  "version": "1.2.3",
+  "version": "2.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Malcolm Stone",
@@ -29,16 +29,36 @@
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
+    "./cache": {
+      "types": "./dist/cache/index.d.ts",
+      "import": "./dist/cache/index.js",
+      "require": "./dist/cache/index.js"
+    },
+    "./audit": {
+      "types": "./dist/audit/index.d.ts",
+      "import": "./dist/audit/index.js",
+      "require": "./dist/audit/index.js"
+    },
+    "./graph": {
+      "types": "./dist/graph/index.d.ts",
+      "import": "./dist/graph/index.js",
+      "require": "./dist/graph/index.js"
+    },
+    "./prisma-migrate": {
+      "types": "./dist/prisma-migrate/index.d.ts",
+      "import": "./dist/prisma-migrate/index.js",
+      "require": "./dist/prisma-migrate/index.js"
+    },
     "./package.json": "./package.json"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "npm run clean && tsc",
     "clean": "rm -rf dist",
     "dev": "tsc --watch",
     "test": "jest",
     "test:legacy": "node dist/test.js",
     "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
+    "test:coverage": "jest --coverage --maxWorkers=50%",
     "model:create": "ts-node src/cli.ts model:create",
     "model:create:help": "ts-node src/cli.ts help",
     "diagram:model": "ts-node src/cli.ts diagram:model",
@@ -55,7 +75,8 @@
     "prepublishOnly": "npm run build && npm run check:package && npm run test",
     "prepare": "husky",
     "docs:reference": "typedoc",
-    "check:package": "node scripts/check-package.mjs"
+    "check:package": "node scripts/check-package.mjs",
+    "build:incremental": "tsc"
   },
   "bin": {
     "prorm": "dist/cli.js",
@@ -80,7 +101,7 @@
     "@libsql/client": "^0.17.4",
     "@opensearch-project/opensearch": "^3.6.0",
     "@pinecone-database/pinecone": "^8.0.0",
-    "@qdrant/js-client-rest": "^1.18.0",
+    "@qdrant/js-client-rest": "~1.18.0",
     "@xmldom/xmldom": "^0.9.10",
     "@zilliz/milvus2-sdk-node": "^3.0.3",
     "arangojs": "^10.3.1",
@@ -101,7 +122,6 @@
     "pg-hstore": "^2.3.4",
     "reflect-metadata": "^0.2.2",
     "snowflake-sdk": "^3.0.0",
-    "sqlite3": "^5.1.7",
     "tedious": "^18.0.0",
     "weaviate-client": "^3.13.1"
   },
@@ -180,7 +200,13 @@
       "jest-junit"
     ],
     "workerIdleMemoryLimit": "256MB",
-    "coverageProvider": "v8"
+    "coverageProvider": "v8",
+    "collectCoverageFrom": [
+      "src/**/*.ts",
+      "!src/test.ts",
+      "!src/models/virtual-field-example.ts",
+      "!src/**/*.d.ts"
+    ]
   },
   "jest-junit": {
     "outputDirectory": ".",
@@ -200,7 +226,12 @@
     "pg-copy-streams": "^7.0.0"
   },
   "allowScripts": {
-    "better-sqlite3@12.8.0": true,
+    "better-sqlite3@12.8.0 || 12.11.1": true,
     "duckdb@1.4.4": true
+  },
+  "overrides": {
+    "adm-zip": "^0.6.0",
+    "node-gyp": "^11.4.2",
+    "toml": "^5.0.0"
   }
 }

package/dist/decorators/belongs-to-many.js

@@ -1,115 +0,0 @@
-"use strict";
-/**
- * BelongsToMany decorator for the ORM.
- *
- * Defines a many-to-many relationship between models via a join table/model.
- *
- * Usage:
- *
- *   @BelongsToMany(() => Role, { through: 'user_roles' })
- *   roles: Role[];
- *
- *   @BelongsToMany(() => Role, { through: UserRole, as: 'assignedRoles' })
- *   assignedRoles: Role[];
- *
- *   // With options
- *   @BelongsToMany(() => Tag, {
- *     through: 'post_tags',
- *     foreignKey: 'post_id',
- *     otherKey: 'tag_id',
- *     onDelete: 'CASCADE'
- *   })
- *   tags: Tag[];
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBelongsToMany = getBelongsToMany;
-exports.getAllBelongsToMany = getAllBelongsToMany;
-exports.BelongsToMany = BelongsToMany;
-exports.processBelongsToManyDecorators = processBelongsToManyDecorators;
-// ==================== Metadata Storage ====================
-const BELONGS_TO_MANY_KEY = '__orm_belongs_to_many__';
-/**
- * Get all @BelongsToMany annotations attached to a model constructor.
- */
-function getBelongsToMany(target) {
-    return target[BELONGS_TO_MANY_KEY] || [];
-}
-/**
- * Get all belongsToMany associations including inherited ones.
- */
-function getAllBelongsToMany(target) {
-    const associations = [];
-    let current = target;
-    while (current && current.prototype) {
-        const meta = getBelongsToMany(current);
-        associations.push(...meta);
-        current = Object.getPrototypeOf(current);
-        if (current === Object.prototype)
-            break;
-    }
-    return associations;
-}
-// ==================== Decorator ====================
-/**
- * Define a many-to-many relationship.
- *
- * This decorator stores metadata on the model class that can be used
- * by the ORM to establish the association at model initialization time.
- *
- * @param target - A function that returns the target model class
- * @param options - Configuration for the association (through is required)
- */
-function BelongsToMany(target, options) {
-    return function (prototype, propertyKey) {
-        const ModelClass = prototype.constructor;
-        if (!ModelClass[BELONGS_TO_MANY_KEY]) {
-            ModelClass[BELONGS_TO_MANY_KEY] = [];
-        }
-        ModelClass[BELONGS_TO_MANY_KEY].push({
-            target,
-            options: {
-                as: options.as || propertyKey.toString(),
-                through: options.through,
-                foreignKey: options.foreignKey,
-                otherKey: options.otherKey,
-                constraints: options.constraints,
-                onDelete: options.onDelete,
-                onUpdate: options.onUpdate,
-                targetKey: options.targetKey,
-                sourceKey: options.sourceKey,
-            },
-        });
-    };
-}
-/**
- * Process @BelongsToMany decorators and create association configuration.
- *
- * Call this to get the raw association definitions from decorators.
- *
- * @param ModelClass - The model class with @BelongsToMany decorators
- * @returns Array of association configurations
- */
-function processBelongsToManyDecorators(ModelClass) {
-    const decorators = getAllBelongsToMany(ModelClass);
-    return decorators.map(({ target, options }) => {
-        const targetModel = target();
-        const foreignKey = typeof options.foreignKey === 'string'
-            ? options.foreignKey
-            : options.foreignKey?.name
-                ? options.foreignKey.name
-                : `${ModelClass.name}Id`;
-        return {
-            source: ModelClass,
-            target: targetModel,
-            foreignKey,
-            as: options.as || '',
-            options,
-        };
-    });
-}
-exports.default = {
-    BelongsToMany,
-    getBelongsToMany,
-    getAllBelongsToMany,
-    processBelongsToManyDecorators,
-};

package/dist/decorators/belongs-to.js

@@ -1,115 +0,0 @@
-"use strict";
-/**
- * BelongsTo decorator for the ORM.
- *
- * Defines a many-to-one (inverse of hasOne/hasMany) relationship between models.
- *
- * Usage:
- *
- *   @BelongsTo(() => User)
- *   user: User;
- *
- *   @BelongsTo(() => User, { as: 'author' })
- *   author: User;
- *
- *   // With options
- *   @BelongsTo(() => Category, {
- *     foreignKey: { name: 'category_id', allowNull: false },
- *     onDelete: 'CASCADE'
- *   })
- *   category: Category;
- *
- *   // Self-referential
- *   @BelongsTo(() => User, { as: 'manager', foreignKey: 'manager_id' })
- *   manager: User;
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBelongsTo = getBelongsTo;
-exports.getAllBelongsTo = getAllBelongsTo;
-exports.BelongsTo = BelongsTo;
-exports.processBelongsToDecorators = processBelongsToDecorators;
-// ==================== Metadata Storage ====================
-const BELONGS_TO_KEY = '__orm_belongs_to__';
-/**
- * Get all @BelongsTo annotations attached to a model constructor.
- */
-function getBelongsTo(target) {
-    return target[BELONGS_TO_KEY] || [];
-}
-/**
- * Get all belongsTo associations including inherited ones.
- */
-function getAllBelongsTo(target) {
-    const associations = [];
-    let current = target;
-    while (current && current.prototype) {
-        const meta = getBelongsTo(current);
-        associations.push(...meta);
-        current = Object.getPrototypeOf(current);
-        if (current === Object.prototype)
-            break;
-    }
-    return associations;
-}
-// ==================== Decorator ====================
-/**
- * Define a many-to-one relationship.
- *
- * This decorator stores metadata on the model class that can be used
- * by the ORM to establish the association at model initialization time.
- *
- * @param target - A function that returns the target model class
- * @param options - Optional configuration for the association
- */
-function BelongsTo(target, options = {}) {
-    return function (prototype, propertyKey) {
-        const ModelClass = prototype.constructor;
-        if (!ModelClass[BELONGS_TO_KEY]) {
-            ModelClass[BELONGS_TO_KEY] = [];
-        }
-        ModelClass[BELONGS_TO_KEY].push({
-            target,
-            options: {
-                as: options.as || propertyKey.toString(),
-                foreignKey: options.foreignKey,
-                constraints: options.constraints,
-                onDelete: options.onDelete,
-                onUpdate: options.onUpdate,
-                targetKey: options.targetKey,
-                sourceKey: options.sourceKey,
-            },
-        });
-    };
-}
-/**
- * Process @BelongsTo decorators and create association configuration.
- *
- * Call this to get the raw association definitions from decorators.
- *
- * @param ModelClass - The model class with @BelongsTo decorators
- * @returns Array of association configurations
- */
-function processBelongsToDecorators(ModelClass) {
-    const decorators = getAllBelongsTo(ModelClass);
-    return decorators.map(({ target, options }) => {
-        const targetModel = target();
-        const foreignKey = typeof options.foreignKey === 'string'
-            ? options.foreignKey
-            : options.foreignKey?.name
-                ? options.foreignKey.name
-                : `${targetModel.name}Id`;
-        return {
-            source: ModelClass,
-            target: targetModel,
-            foreignKey,
-            as: options.as || '',
-            options,
-        };
-    });
-}
-exports.default = {
-    BelongsTo,
-    getBelongsTo,
-    getAllBelongsTo,
-    processBelongsToDecorators,
-};

package/dist/decorators/has-many.js

@@ -1,127 +0,0 @@
-"use strict";
-/**
- * HasMany decorator for the ORM.
- *
- * Defines a one-to-many relationship between models.
- *
- * Usage:
- *
- *   @HasMany(() => Post)
- *   posts: Post[];
- *
- *   @HasMany(() => Post, { as: 'articles' })
- *   articles: Post[];
- *
- *   // With options
- *   @HasMany(() => Order, {
- *     foreignKey: { name: 'user_id', allowNull: false },
- *     onDelete: 'CASCADE',
- *     through: 'user_orders'  // For belongsToMany
- *   })
- *   orders: Order[];
- *
- *   // Self-referential
- *   @HasMany(() => Category, { as: 'children', foreignKey: 'parent_id' })
- *   children: Category[];
- *
- *   // Nested hasMany with scope
- *   @HasMany(() => Comment, {
- *     as: 'replies',
- *     foreignKey: 'parent_id',
- *     scope: { deleted: false }
- *   })
- *   replies: Comment[];
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHasMany = getHasMany;
-exports.getAllHasMany = getAllHasMany;
-exports.HasMany = HasMany;
-exports.processHasManyDecorators = processHasManyDecorators;
-// ==================== Metadata Storage ====================
-const HAS_MANY_KEY = '__orm_has_many__';
-/**
- * Get all @HasMany annotations attached to a model constructor.
- */
-function getHasMany(target) {
-    return target[HAS_MANY_KEY] || [];
-}
-/**
- * Get all hasMany associations including inherited ones.
- */
-function getAllHasMany(target) {
-    const associations = [];
-    let current = target;
-    while (current && current.prototype) {
-        const meta = getHasMany(current);
-        associations.push(...meta);
-        current = Object.getPrototypeOf(current);
-        if (current === Object.prototype)
-            break;
-    }
-    return associations;
-}
-// ==================== Decorator ====================
-/**
- * Define a one-to-many relationship.
- *
- * This decorator stores metadata on the model class that can be used
- * by the ORM to establish the association at model initialization time.
- *
- * @param target - A function that returns the target model class
- * @param options - Optional configuration for the association
- */
-function HasMany(target, options = {}) {
-    return function (prototype, propertyKey) {
-        const ModelClass = prototype.constructor;
-        if (!ModelClass[HAS_MANY_KEY]) {
-            ModelClass[HAS_MANY_KEY] = [];
-        }
-        ModelClass[HAS_MANY_KEY].push({
-            target,
-            options: {
-                as: options.as || propertyKey.toString(),
-                foreignKey: options.foreignKey,
-                constraints: options.constraints,
-                onDelete: options.onDelete,
-                onUpdate: options.onUpdate,
-                targetKey: options.targetKey,
-                sourceKey: options.sourceKey,
-                scope: options.scope,
-                through: options.through,
-                inverse: options.inverse,
-            },
-        });
-    };
-}
-/**
- * Process @HasMany decorators and create association configuration.
- *
- * Call this to get the raw association definitions from decorators.
- *
- * @param ModelClass - The model class with @HasMany decorators
- * @returns Array of association configurations
- */
-function processHasManyDecorators(ModelClass) {
-    const decorators = getAllHasMany(ModelClass);
-    return decorators.map(({ target, options }) => {
-        const targetModel = target();
-        const foreignKey = typeof options.foreignKey === 'string'
-            ? options.foreignKey
-            : options.foreignKey?.name
-                ? options.foreignKey.name
-                : `${ModelClass.name}Id`;
-        return {
-            source: ModelClass,
-            target: targetModel,
-            foreignKey,
-            as: options.as || '',
-            options,
-        };
-    });
-}
-exports.default = {
-    HasMany,
-    getHasMany,
-    getAllHasMany,
-    processHasManyDecorators,
-};

package/dist/decorators/has-one.js

@@ -1,116 +0,0 @@
-"use strict";
-/**
- * HasOne decorator for the ORM.
- *
- * Defines a one-to-one relationship between models.
- *
- * Usage:
- *
- *   @HasOne(() => Profile)
- *   profile: Profile;
- *
- *   @HasOne(() => Profile, { as: 'userProfile' })
- *   userProfile: Profile;
- *
- *   // With options
- *   @HasOne(() => Profile, {
- *     foreignKey: { name: 'user_id', allowNull: false },
- *     onDelete: 'CASCADE'
- *   })
- *   profile: Profile;
- *
- *   // Self-referential
- *   @HasOne(() => User, { as: 'manager', foreignKey: 'manager_id' })
- *   manager: User;
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHasOne = getHasOne;
-exports.getAllHasOne = getAllHasOne;
-exports.HasOne = HasOne;
-exports.processHasOneDecorators = processHasOneDecorators;
-// ==================== Metadata Storage ====================
-const HAS_ONE_KEY = '__orm_has_one__';
-/**
- * Get all @HasOne annotations attached to a model constructor.
- */
-function getHasOne(target) {
-    return target[HAS_ONE_KEY] || [];
-}
-/**
- * Get all hasOne associations including inherited ones.
- */
-function getAllHasOne(target) {
-    const associations = [];
-    let current = target;
-    while (current && current.prototype) {
-        const meta = getHasOne(current);
-        associations.push(...meta);
-        current = Object.getPrototypeOf(current);
-        if (current === Object.prototype)
-            break;
-    }
-    return associations;
-}
-// ==================== Decorator ====================
-/**
- * Define a one-to-one relationship.
- *
- * This decorator stores metadata on the model class that can be used
- * by the ORM to establish the association at model initialization time.
- *
- * @param target - A function that returns the target model class
- * @param options - Optional configuration for the association
- */
-function HasOne(target, options = {}) {
-    return function (prototype, propertyKey) {
-        const ModelClass = prototype.constructor;
-        if (!ModelClass[HAS_ONE_KEY]) {
-            ModelClass[HAS_ONE_KEY] = [];
-        }
-        ModelClass[HAS_ONE_KEY].push({
-            target,
-            options: {
-                as: options.as || propertyKey.toString(),
-                foreignKey: options.foreignKey,
-                constraints: options.constraints,
-                onDelete: options.onDelete,
-                onUpdate: options.onUpdate,
-                targetKey: options.targetKey,
-                sourceKey: options.sourceKey,
-                inverse: options.inverse,
-            },
-        });
-    };
-}
-/**
- * Process @HasOne decorators and create association configuration.
- *
- * Call this to get the raw association definitions from decorators.
- *
- * @param ModelClass - The model class with @HasOne decorators
- * @returns Array of association configurations
- */
-function processHasOneDecorators(ModelClass) {
-    const decorators = getAllHasOne(ModelClass);
-    return decorators.map(({ target, options }) => {
-        const targetModel = target();
-        const foreignKey = typeof options.foreignKey === 'string'
-            ? options.foreignKey
-            : options.foreignKey?.name
-                ? options.foreignKey.name
-                : `${ModelClass.name}Id`;
-        return {
-            source: ModelClass,
-            target: targetModel,
-            foreignKey,
-            as: options.as || '',
-            options,
-        };
-    });
-}
-exports.default = {
-    HasOne,
-    getHasOne,
-    getAllHasOne,
-    processHasOneDecorators,
-};