leoric 2.8.6 → 2.8.7

package/History.md

@@ -1,3 +1,13 @@
+2.8.7 / 2022-10-11
+==================
+
+## What's Changed
+* fix: enable strictNullChecks by @cyjake in https://github.com/cyjake/leoric/pull/357
+* fix: declaration types of realm.query() and static update values by @cyjake in https://github.com/cyjake/leoric/pull/358
+
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.8.6...v2.8.7
+
 2.8.6 / 2022-10-11
 ==================
 

package/index.d.ts

@@ -74,7 +74,7 @@ export default class Realm {
 
   escape(value: Literal): string;
 
-  query<T extends typeof Bone>(sql: string, values?: Array<Literal>, options?: RawQueryOptions & { model?: T }): Promise<{ rows: T extends typeof Bone ? InstanceType<T>[] : Object[], fields?: Object[], affectedRows?: number }>;
+  query<T>(sql: string, values?: Array<Literal>, options?: RawQueryOptions & { model?: T }): Promise<{ rows: T extends typeof Bone ? InstanceType<T>[] : Record<string, Literal>[], fields?: Record<string, ColumnMeta>[], affectedRows?: number }>;
 
   transaction<T extends (options: { connection: Connection }) => Generator>(callback: T): Promise<GeneratorReturnType<ReturnType<T>>>;
   transaction<T extends (options: { connection: Connection }) => Promise<any>>(callback: T): Promise<ReturnType<T>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "index.d.ts",

package/src/data_types.ts

@@ -65,7 +65,7 @@ class STRING extends DataType {
     return chunks.join(' ');
   }
 
-  uncast(value: string | Raw | null): string | Raw {
+  uncast(value: string | Raw | null): string | Raw | null {
     if (value == null || value instanceof Raw) return value;
     return '' + value;
   }
@@ -304,7 +304,7 @@ class DATE extends DataType {
     return this._round(value);
   }
 
-  uncast(value: null | Raw | string | Date | { toDate: () => Date }, _strict?: boolean): string | Date | Raw {
+  uncast(value: null | Raw | string | Date | { toDate: () => Date }, _strict?: boolean): string | Date | Raw | null | undefined {
     const originValue = value;
 
     // type narrowing doesn't handle `return value` correctly

package/src/types/abstract_bone.d.ts

@@ -32,7 +32,7 @@ export class AbstractBone {
   /**
    * The driver that powers the model
    */
-  static driver: AbstractDriver;
+  static driver: AbstractDriver | null;
 
   /**
    * The connected models structured as `{ [model.name]: model }`, e.g. `Bone.model.Post => Post`

package/src/types/common.d.ts

@@ -177,7 +177,9 @@ export type WhereConditions<T extends typeof AbstractBone> = {
 // https://stackoverflow.com/a/68077021/179691
 export type PickTypeKeys<Obj, Type, T extends keyof Obj = keyof Obj> = ({ [P in keyof Obj]: Obj[P] extends Type ? P : never })[T];
 
-export type Values<T> = Partial<Omit<T, PickTypeKeys<T, Function> | 'isNewRecord' | 'Model' | 'dataValues'>>;
+export type NullablePartial<T> = { [P in keyof T]?: T[P] | null };
+
+export type Values<T> = NullablePartial<Omit<T, PickTypeKeys<T, Function> | 'isNewRecord' | 'Model' | 'dataValues'>>;
 
 export type BoneColumns<T extends typeof AbstractBone, Key extends keyof InstanceType<T> = keyof Values<InstanceType<T>>> = Key;