fix: projects might have strictPropertyInitialization set to true

att
cyjake · Aug 24, 2022 · 0387c47 · 0387c47
1 parent 3430f46
commit 0387c47
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 34 deletions.
diff --git a/src/bone.js b/src/bone.js
@@ -10,7 +10,7 @@ const pluralize = require('pluralize');
 const { executeValidator, LeoricValidateError } = require('./validator');
 require('reflect-metadata');
 
-const { DataTypes } = require('./data_types');
+const { default: DataTypes } = require('./data_types');
 const Collection = require('./collection');
 const Spell = require('./spell');
 const Raw = require('./raw');

diff --git a/src/data_types.ts b/src/data_types.ts
@@ -25,18 +25,9 @@ export interface AbstractDataType<T> {
  */
 
 export abstract class DataType {
-  dataType: string;
+  dataType: string = '';
   dataLength?: string | number;
 
-  /**
-   * Check if params is instance of DataType or not
-   * @param {*} params
-   * @returns {boolean}
-   */
-  static is(params: any): boolean {
-    return params instanceof DataType;
-  }
-
   /**
    * cast raw data returned from data packet into js type
    */
@@ -51,21 +42,7 @@ export abstract class DataType {
     return value;
   }
 
-  static get invokable() {
-    return new Proxy(this, {
-      get(target, p) {
-        const value = target[p];
-        if (AllDataTypes.hasOwnProperty(p)) return invokableFunc(value);
-        return value;
-      }
-    }); 
-  }
-
   abstract toSqlString(): string;
-
-  static toSqlString(): string {
-    return '';
-  }
 }
 
 /**
@@ -507,7 +484,7 @@ const AllDataTypes = {
 
 type DATA_TYPE<T> =  AbstractDataType<T> & T;
 
-export class DataTypes extends DataType {
+class DataTypes {
   static STRING: DATA_TYPE<STRING> = STRING as any;
   static TINYINT: DATA_TYPE<TINYINT> = TINYINT as any;
   static SMALLINT: DATA_TYPE<SMALLINT> = SMALLINT as any;
@@ -598,8 +575,23 @@ export class DataTypes extends DataType {
     }
   }
 
-  toSqlString(): string {
-    return '';
+  static get invokable() {
+    return new Proxy(this, {
+      get(target, p) {
+        const value = target[p];
+        if (AllDataTypes.hasOwnProperty(p)) return invokableFunc(value);
+        return value;
+      }
+    }); 
+  }
+
+  /**
+   * Check if params is instance of DataType or not
+   * @param {*} params
+   * @returns {boolean}
+   */
+   static is(params: any): boolean {
+    return params instanceof DataType;
   }
 }
 

diff --git a/src/drivers/mysql/data_types.js b/src/drivers/mysql/data_types.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { DataTypes } = require('../../data_types');
+const { default: DataTypes } = require('../../data_types');
 
 class Mysql_BOOLEAN extends DataTypes.BOOLEAN {
   constructor() {

diff --git a/src/drivers/postgres/data_types.js b/src/drivers/postgres/data_types.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { DataTypes } = require('../../data_types');
+const { default: DataTypes } = require('../../data_types');
 const util = require('util');
 const Raw = require('../../raw');
 
@@ -29,7 +29,7 @@ class Postgres_JSONB extends DataTypes.JSONB {
   }
 }
 
-class Postgres_BINARY extends DataTypes {
+class Postgres_BINARY extends DataTypes.BINARY {
   constructor() {
     super();
     this.dataType = 'bytea';

diff --git a/src/drivers/postgres/index.js b/src/drivers/postgres/index.js
@@ -127,7 +127,8 @@ class PostgresDriver extends AbstractDriver {
     for (const row of rows) {
       const tableName = row.table_name;
       const columns = schemaInfo[tableName] || (schemaInfo[tableName] = []);
-      let { data_type: dataType, character_maximum_length: length } = row;
+      const { character_maximum_length: length } = row;
+      let { data_type: dataType } = row;
 
       if (dataType === 'character varying') dataType = 'varchar';
       if (dataType === 'timestamp without time zone') dataType = 'timestamp';

diff --git a/src/drivers/sqlite/data_types.js b/src/drivers/sqlite/data_types.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { DataTypes } = require('../../data_types');
+const { default: DataTypes } = require('../../data_types');
 
 class Sqlite_DATE extends DataTypes.DATE {
   constructor(precision, timezone) {
@@ -53,7 +53,7 @@ class Sqlite_BIGINT extends DataTypes.BIGINT {
     return this.dataType.toUpperCase();
   }
 }
-class Sqlite_BINARY extends DataTypes {
+class Sqlite_BINARY extends DataTypes.BINARY {
   constructor(dataLength = 255) {
     super(dataLength);
     this.dataLength = dataLength;