mythix-orm 1.6.1 → 1.6.3

package/lib/model.d.ts

@@ -146,16 +146,18 @@ export declare class Model {
   public static getWhereWithConnection(options?: { connection: ConnectionBase }): QueryEngine;
   public getWhereWithConnection(options?: { connection: ConnectionBase }): QueryEngine;
 
-  public static create(models: Array<Model | GenericObject>, options?: GenericObject): Promise<Array<Model>>;
-  public static create(models: Model | GenericObject, options?: GenericObject): Promise<Model>;
+  public static create<T extends Model = Model>(models: Array<T>, options?: GenericObject): Promise<Array<T>>;
+  public static create<T extends Model = Model>(models: T, options?: GenericObject): Promise<T>;
+  public static create<T extends Model = Model>(models: Array<GenericObject>, options?: GenericObject): Promise<Array<T>>;
+  public static create<T extends Model = Model>(models: GenericObject, options?: GenericObject): Promise<T>;
   public static count(options?: GenericObject): Promise<number>;
-  public static all(options?: GenericObject): Promise<Array<Model>>;
-  public static fetchAll(options?: GenericObject): AsyncGenerator<Model>;
-  public static first(limit?: number, options?: GenericObject): Promise<Model | undefined>;
-  public static last(limit?: number, options?: GenericObject): Promise<Model | undefined>;
+  public static all<T extends Model = Model>(options?: GenericObject): Promise<Array<T>>;
+  public static fetchAll<T extends Model = Model>(options?: GenericObject): AsyncGenerator<T>;
+  public static first<T extends Model = Model>(limit?: number, options?: GenericObject): Promise<T | undefined>;
+  public static last<T extends Model = Model>(limit?: number, options?: GenericObject): Promise<T | undefined>;
   public static pluck(fields: string | Array<string>, options?: GenericObject): Promise<Array<any>>;
 
-  public constructor(data: GenericObject, _options?: ModelOptions);
+  public constructor(data?: GenericObject, _options?: ModelOptions);
   public getOptions(): ModelOptions;
   public _constructor(data?: GenericObject): void;
   public _constructFields(): void;
@@ -183,7 +185,7 @@ export declare class Model {
   public onAfterCreate(context: HookContext): Promise<any>;
   public onAfterUpdate(context: HookContext): Promise<any>;
   public onAfterSave(context: HookContext): Promise<any>;
-  public save(options?: GenericObject): Promise<Model | boolean>;
+  public save(options?: GenericObject): Promise<this | boolean>;
   public reload(options?: GenericObject): Promise<void>;
   public destroy(options?: GenericObject): Promise<number>;
   public toString(): string;

package/lib/query-engine/query-engine.d.ts

@@ -53,11 +53,11 @@ export declare class QueryEngine<T = ConnectionBase> {
   public unscoped(context?: GenericObject): QueryEngine;
   public toString(options?: GenericObject): string;
   public MERGE(queryEngine: QueryEngine): QueryEngine;
-  public all(options?: GenericObject): Promise<Array<Model>>;
-  public fetchAll(options?: GenericObject): AsyncGenerator<Model>;
-  public first(limit?: number | null | undefined, options?: GenericObject): Promise<Model | undefined>;
-  public last(limit?: number | null | undefined, options?: GenericObject): Promise<Model | undefined>;
-  public update(attributes: Model | GenericObject, options?: GenericObject): Promise<number>;
+  public all<T extends Model = Model>(options?: GenericObject): Promise<Array<T>>;
+  public fetchAll<T extends Model = Model>(options?: GenericObject): AsyncGenerator<T>;
+  public first<T extends Model = Model>(limit?: number | null | undefined, options?: GenericObject): Promise<T | undefined>;
+  public last<T extends Model = Model>(limit?: number | null | undefined, options?: GenericObject): Promise<T | undefined>;
+  public update<T extends Model = Model>(attributes: T | GenericObject, options?: GenericObject): Promise<number>;
   public destroy(options?: GenericObject): Promise<number>;
   public average(field: Field | string, options?: GenericObject): Promise<number>;
   public count(field: Field | string, options?: GenericObject): Promise<number>;
@@ -78,51 +78,71 @@ export declare class QueryEngine<T = ConnectionBase> {
 
   declare public NOT: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public AND: {
     (query: QueryEngine): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public OR: {
     (query: QueryEngine): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public DISTINCT: {
     (fullyQualifiedName: string | Field): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public INNER_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public LEFT_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public RIGHT_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public FULL_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public CROSS_JOIN: {
     (): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
   declare public JOIN: {
     (type: string | LiteralBase): QueryEngine;
+
+    name: QueryEngine;
     [ key: string ]: QueryEngine;
   };
 
@@ -137,6 +157,7 @@ export declare class QueryEngine<T = ConnectionBase> {
   public LIKE(value: string, options?: { caseSensitive: boolean }): QueryEngine;
   public NOT_LIKE(value: string, options?: { caseSensitive: boolean }): QueryEngine;
 
+  name: QueryEngine;
   [ key: string ]: any;
 }
 

package/lib/utils/model-utils.d.ts

@@ -64,7 +64,7 @@ export declare function createAndSaveAllRelatedModels(
   options?: GenericObject,
 ): Promise<Array<Model> | undefined>;
 
-export declare function setRelationalValues<T = Model>(
+export declare function setRelationalValues<T extends Model = Model>(
   connection: ConnectionBase,
   TargetModel: ModelClass,
   targetModelInstance: T,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",
@@ -34,21 +34,21 @@
   "homepage": "https://github.com/th317erd/mythix-orm#readme",
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "@types/node": "^18.7.16",
+    "@types/node": "^18.7.17",
     "better-sqlite3": "^7.6.2",
     "colors": "^1.4.0",
     "diff": "^5.1.0",
-    "eslint": "^8.13.0",
-    "jasmine": "^4.1.0",
+    "eslint": "^8.23.1",
+    "jasmine": "^4.4.0",
     "nyc": "^15.1.0"
   },
   "dependencies": {
     "events": "^3.3.0",
     "inflection": "^1.13.2",
-    "moment": "^2.29.3",
-    "nife": "^1.11.3",
+    "moment": "^2.29.4",
+    "nife": "^1.12.1",
     "sqlstring": "^2.3.3",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "xid-js": "^1.0.1"
   },
   "nyc": {