diff --git a/.vscode/settings.json b/.vscode/settings.json index ad2947b..d95ac8d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,21 +1,18 @@ { - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.formatOnSave": true, - "eslint.alwaysShowStatus": true, - "editor.codeActionsOnSave": { - "source.fixAll.eslint": true - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "eslint.validate": [ - "typescript", - "typescriptreact", - ], - "prettier.eslintIntegration": true, -} \ No newline at end of file + "editor.defaultFormatter": "dbaeumer.vscode-eslint", + "editor.formatOnSave": true, + "eslint.alwaysShowStatus": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + }, + "eslint.validate": ["typescript", "typescriptreact"], + "prettier.eslintIntegration": true +} diff --git a/package-lock.json b/package-lock.json index a7b0fdd..b54e804 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dashpress/bacteria", - "version": "0.0.10", + "version": "0.0.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dashpress/bacteria", - "version": "0.0.10", + "version": "0.0.14", "license": "MIT", "dependencies": { "@types/fs-extra": "^9.0.13", diff --git a/package.json b/package.json index 1b20729..5d77fb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dashpress/bacteria", - "version": "0.0.13", + "version": "0.0.14", "license": "MIT", "main": "dist/index.js", "typings": "dist/index.d.ts", diff --git a/src/drivers/MssqlDriver.ts b/src/drivers/MssqlDriver.ts index be4a4d2..e0faf79 100644 --- a/src/drivers/MssqlDriver.ts +++ b/src/drivers/MssqlDriver.ts @@ -97,7 +97,7 @@ export default class MssqlDriver extends AbstractDriver { let tscType = ""; switch (resp.DATA_TYPE) { case "bigint": - tscType = "string"; + tscType = "number"; break; case "bit": tscType = "boolean"; diff --git a/src/drivers/MysqlDriver.ts b/src/drivers/MysqlDriver.ts index a6d65d1..9a1ccdd 100644 --- a/src/drivers/MysqlDriver.ts +++ b/src/drivers/MysqlDriver.ts @@ -110,7 +110,7 @@ export default class MysqlDriver extends AbstractDriver { tscType = "number"; break; case "bigint": - tscType = "string"; + tscType = "number"; break; case "float": tscType = "number"; diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts index 9abd8ba..7b40fc0 100644 --- a/src/drivers/PostgresDriver.ts +++ b/src/drivers/PostgresDriver.ts @@ -204,7 +204,7 @@ export default class PostgresDriver extends AbstractDriver { ret.tsType = "number"; break; case "int8": - ret.tsType = "string"; + ret.tsType = "number"; break; case "smallint": ret.tsType = "number"; @@ -213,13 +213,13 @@ export default class PostgresDriver extends AbstractDriver { ret.tsType = "number"; break; case "bigint": - ret.tsType = "string"; + ret.tsType = "number"; break; case "decimal": - ret.tsType = "string"; + ret.tsType = "number"; break; case "numeric": - ret.tsType = "string"; + ret.tsType = "number"; break; case "real": ret.tsType = "number"; @@ -237,7 +237,7 @@ export default class PostgresDriver extends AbstractDriver { ret.tsType = "number"; break; case "money": - ret.tsType = "string"; + ret.tsType = "number"; break; case "character varying": ret.tsType = "string"; diff --git a/src/drivers/SqliteDriver.ts b/src/drivers/SqliteDriver.ts index f1f8e90..1cfd2a0 100644 --- a/src/drivers/SqliteDriver.ts +++ b/src/drivers/SqliteDriver.ts @@ -95,10 +95,10 @@ export default class SqliteDriver extends AbstractDriver { tscType = "number"; break; case "bigint": - tscType = "string"; + tscType = "number"; break; case "unsigned big int": - tscType = "string"; + tscType = "number"; break; case "character": tscType = "string"; @@ -149,7 +149,7 @@ export default class SqliteDriver extends AbstractDriver { tscType = "boolean"; break; case "date": - tscType = "string"; + tscType = "Date"; break; case "datetime": tscType = "Date";