@zuzjs/orm 0.1.7 → 0.1.9

package/dist/drivers/mysql/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySqlDriver = exports.MySQLErrorMap = exports.parseConnectionString = void 0;
-const promise_1 = __importDefault(require("mysql2/promise"));
 const fs_1 = __importDefault(require("fs"));
+const promise_1 = __importDefault(require("mysql2/promise"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const index_js_1 = require("../../core/index.js");
@@ -152,7 +152,6 @@ class MySqlDriver {
             const imports = [];
             const _imports = [`Entity`, `BaseEntity`];
             // Get table structure
-            // const [columns]: [any[], any] = await self.pool!.execute(`DESCRIBE ${tableName}`);
             const [columns] = await this.pool.execute(`SELECT COLUMN_NAME as \`Field\`, COLUMN_TYPE as \`Type\`, COLUMN_KEY as \`Key\`, IS_NULLABLE as \`Null\`, COLUMN_DEFAULT as \`Default\`, EXTRA as \`Extra\`, COLUMN_COMMENT as \`Comment\`
                  FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? ORDER BY ORDINAL_POSITION ASC`, [this.conn.database, tableName]);
             const entityCode = [];
@@ -187,7 +186,7 @@ class MySqlDriver {
                 if (Comment && Comment.length > 0) {
                     entityCode.push(`\t/** @comment ${Comment} */`);
                 }
-                entityCode.push(`\t${Field}!: ${tsType};\n`);
+                entityCode.push(`\t${Field}!: ${Key == `PRI` && [`int`, `bigint`].includes(Type) ? `number` : tsType};\n`);
             }
             // Add foreign key relationships
             if (foreignKeys[tableName]) {

package/dist/drivers/queryBuilder.d.ts

@@ -10,12 +10,16 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
     private queryValues;
     private usePromise;
     private whereCount;
+    private isActiveRecord;
+    private activeRecord;
     constructor(repository: Repository<T>, _action: QueryAction, _usePromise?: boolean);
     _create(): this;
     upsert(): this;
     _update(): this;
     _delete(): this;
     _getRawQuery(): [string, any[]];
+    active(): this;
+    _saveActiveRecord(activeRecord: T): Promise<T | null>;
     /**
      * Sets the values for an insert or update query.
      * @param data - The data to be inserted or updated.

package/dist/drivers/queryBuilder.js

@@ -10,6 +10,8 @@ class ZormQueryBuilder extends Promise {
     queryValues = null;
     usePromise;
     whereCount = 0;
+    isActiveRecord = false;
+    activeRecord;
     constructor(repository, _action, _usePromise) {
         super(() => { }); // Required for extending Promise
         this.repository = repository;
@@ -17,6 +19,7 @@ class ZormQueryBuilder extends Promise {
         this.queryBuilder = repository.createQueryBuilder(this.entityAlias);
         this.action = _action;
         this.usePromise = _usePromise || false;
+        this.activeRecord = null;
     }
     _create() {
         if (this.queryValues) {
@@ -68,6 +71,15 @@ class ZormQueryBuilder extends Promise {
     _getRawQuery() {
         return this.queryBuilder.getQueryAndParameters();
     }
+    active() {
+        this.isActiveRecord = true;
+        return this;
+    }
+    async _saveActiveRecord(activeRecord) {
+        // if (!this.activeRecord) throw new Error("No active record found. Use `findOne` first.");
+        return this.repository.save(activeRecord);
+        // return this
+    }
     /**
      * Sets the values for an insert or update query.
      * @param data - The data to be inserted or updated.
@@ -316,12 +328,16 @@ class ZormQueryBuilder extends Promise {
                 case "select":
                 default:
                     const _select = await this.queryBuilder.getMany();
-                    return {
+                    const _result = {
                         hasRows: _select.length > 0,
                         count: _select.length,
                         row: _select.length > 0 ? _select[0] : null,
-                        rows: _select.length > 1 ? _select : []
+                        rows: _select.length > 1 ? _select : [],
                     };
+                    if (this.isActiveRecord) {
+                        _result.save = () => this._saveActiveRecord(_select[0]);
+                    }
+                    return _result;
             }
         }
         catch (err) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
+import "reflect-metadata";
 import { EntitySchema, EntityTarget, MixedList, ObjectLiteral, Repository } from "typeorm";
 import ZormQueryBuilder from "./drivers/queryBuilder.js";
 import { DeleteQueryResult, InsertQueryResult, SelectQueryResult, UpdateQueryResult } from "./types.js";
-import "reflect-metadata";
 /**
  * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
  */

package/dist/index.js

@@ -18,12 +18,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
+const picocolors_1 = __importDefault(require("picocolors"));
+require("reflect-metadata");
 const typeorm_1 = require("typeorm");
 const index_js_1 = require("./core/index.js");
-const picocolors_1 = __importDefault(require("picocolors"));
 const index_js_2 = require("./drivers/mysql/index.js");
 const queryBuilder_js_1 = __importDefault(require("./drivers/queryBuilder.js"));
-require("reflect-metadata");
 /**
  * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
  */

package/dist/types.d.ts

@@ -36,6 +36,7 @@ export type SelectQueryResult = {
     row?: any;
     rows?: any[];
     error?: QueryError;
+    save?: () => void;
 };
 export type UpdateQueryResult = {
     updated: boolean;
@@ -48,4 +49,4 @@ export type DeleteQueryResult = {
     count: number;
     error?: QueryError;
 };
-export { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity, OneToOne, JoinColumn, } from "typeorm";
+export { BaseEntity, Column, Entity, JoinColumn, OneToOne, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";

package/dist/types.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JoinColumn = exports.OneToOne = exports.BaseEntity = exports.Column = exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.Entity = void 0;
+exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.OneToOne = exports.JoinColumn = exports.Entity = exports.Column = exports.BaseEntity = void 0;
 var typeorm_1 = require("typeorm");
+Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return typeorm_1.BaseEntity; } });
+Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return typeorm_1.Column; } });
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return typeorm_1.Entity; } });
+Object.defineProperty(exports, "JoinColumn", { enumerable: true, get: function () { return typeorm_1.JoinColumn; } });
+Object.defineProperty(exports, "OneToOne", { enumerable: true, get: function () { return typeorm_1.OneToOne; } });
 Object.defineProperty(exports, "PrimaryColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryColumn; } });
 Object.defineProperty(exports, "PrimaryGeneratedColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryGeneratedColumn; } });
-Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return typeorm_1.Column; } });
-Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return typeorm_1.BaseEntity; } });
-Object.defineProperty(exports, "OneToOne", { enumerable: true, get: function () { return typeorm_1.OneToOne; } });
-Object.defineProperty(exports, "JoinColumn", { enumerable: true, get: function () { return typeorm_1.JoinColumn; } });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zuzjs/orm",
-    "version": "0.1.7",
+    "version": "0.1.9",
     "keywords": [
         "orm",
         "zuz",