From 64522222bb14507cdb823168ce802d810f199d78 Mon Sep 17 00:00:00 2001 From: joe-re Date: Mon, 27 Jul 2020 04:38:11 +0800 Subject: [PATCH] release v0.11.2 --- package.json | 10 ++++----- packages/client/package.json | 3 +-- packages/server/npm_bin/cli.js | 2 ++ packages/server/package.json | 14 ++++++------ packages/server/src/SettingStore.ts | 2 +- packages/server/tsconfig.json | 33 +++++++++-------------------- packages/sql-parser/.gitignore | 1 + packages/sql-parser/package.json | 8 ++++++- packages/sql-parser/tsconfig.json | 11 ++++++++++ packages/sqlint/package.json | 7 +++--- packages/sqlint/schema.conf.js | 12 +++++++++++ packages/sqlint/tsconfig.json | 20 ++++++----------- tsconfig.json | 15 ++++++------- 13 files changed, 75 insertions(+), 63 deletions(-) create mode 100644 packages/server/npm_bin/cli.js create mode 100644 packages/sql-parser/tsconfig.json create mode 100644 packages/sqlint/schema.conf.js diff --git a/package.json b/package.json index e752dfff1..baf361dbb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "sql-language-server", "displayName": "SQL Language Server", "description": "SQL Language Server Extension for VSC", - "version": "0.10.8", + "version": "0.11.2", "main": "./packages/client/out/extension", "repository": { "type": "git", @@ -15,9 +15,9 @@ "license": "MIT", "publisher": "joe-re", "scripts": { - "compile": "npm run compile:client && npm run compile:server", - "compile:client": "cd ./packages/client && yarn run compile", - "compile:server": "cd ./packages/server && yarn run compile", + "vsc-compile": "npm run vsc-compile:client && npm run vsc-compile:server", + "vsc-compile:client": "cd ./packages/client && yarn run compile", + "vsc-compile:server": "cd ./packages/server && yarn run prepare-vsc-extension", "watch": "run-p watch:client watch:server", "watch:client": "cd ./packages/client && yarn run watch", "watch:sqlint": "cd ./packages/sqlint && yarn run watch", @@ -25,7 +25,7 @@ "watch:dev-server:client": "cd ./example/monaco_editor && yarn run webpack:watch", "watch:dev-server:server": "wait-on ./packages/server/dist/src/index.js && cd ./example/monaco_editor && yarn run start", "dev": "run-p watch:sqlint watch:server watch:dev-server:client watch:dev-server:server", - "vscode:prepublish": "yarn run compile" + "vscode:prepublish": "yarn run vsc-compile" }, "engines": { "vscode": "^1.45.1" diff --git a/packages/client/package.json b/packages/client/package.json index a5b15e250..31b5a2bef 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -16,7 +16,6 @@ "onLanguage:sql" ], "dependencies": { - "@types/node": "12.12.6", "electron-rebuild": "^1.11.0", "typescript": "^3.9.2", "vscode-languageclient": "^6.1.3", @@ -26,7 +25,7 @@ "@rollup/plugin-commonjs": "^11.1.0", "@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-typescript": "^4.1.1", - "@types/node": "^8.10.0", + "@types/node": "14.0.26", "@types/vscode": "^1.45.1", "rollup": "^2.10.2", "tslib": "^2.0.0", diff --git a/packages/server/npm_bin/cli.js b/packages/server/npm_bin/cli.js new file mode 100644 index 000000000..e4760d21f --- /dev/null +++ b/packages/server/npm_bin/cli.js @@ -0,0 +1,2 @@ +#! /usr/bin/env node +require('../dist/bin/cli') \ No newline at end of file diff --git a/packages/server/package.json b/packages/server/package.json index ae90750a3..f60fc193d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,9 +1,9 @@ { "name": "sql-language-server", - "version": "0.10.0", + "version": "0.11.2", "main": "dist/src/index.js", "bin": { - "sql-language-server": "./dist/bin/cli.js" + "sql-language-server": "./npm_bin/cli.js" }, "license": "MIT", "scripts": { @@ -13,21 +13,23 @@ "watch:cli": "rollup -c -w", "watch:index": "tsc -w", "test": "jest", - "_prepare": "yarn compile:sqlint && yarn compile:cli && yarn compile:index" + "prepare-vsc-extension": "yarn clean && yarn compile:cli", + "prepublish": "yarn clean && yarn compile:index" }, - "type": "module", "files": [ "package.json", + "npm_bin", "dist" ], "dependencies": { + "@joe-re/sql-parser": "^0.11.1", "@types/pg": "^7.4.10", "jest": "^26.0.1", "log4js": "^6.2.1", "mysql2": "^2.1.0", "node-ssh-forward": "^0.6.3", "pg": "^7.4.3", - "sqlint": "^0.9.2", + "sqlint": "^0.11.1", "sqlite3": "^4.2.0", "vscode-languageclient": "^6.1.3", "vscode-languageserver": "^6.1.1", @@ -41,7 +43,7 @@ "@rollup/plugin-typescript": "^4.1.1", "@types/jest": "^25.2.2", "@types/mysql": "^2.15.5", - "@types/node": "12.12.6", + "@types/node": "14.0.26", "@types/sqlite3": "^3.1.6", "jest": "^26.0.1", "rollup": "^2.10.2", diff --git a/packages/server/src/SettingStore.ts b/packages/server/src/SettingStore.ts index 401629884..b59d57e97 100644 --- a/packages/server/src/SettingStore.ts +++ b/packages/server/src/SettingStore.ts @@ -45,7 +45,7 @@ function readFile(filePath: string) { return fs.readFileSync(filePath, "utf8").replace(/^\ufeff/u, ""); } -export default class SettingStore extends EventEmitter { +export default class SettingStore extends EventEmitter.EventEmitter { private personalConfig: PersonalConfig = { connections: []} private state: Settings = { name: null, diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index ecd01f4ee..aecf1ebf6 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,24 +1,11 @@ { - "compilerOptions": { - "strict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "target": "es2017", - "module": "CommonJS", - "lib": [ "es2018", "es2019" ], - "moduleResolution": "node", - "esModuleInterop": true, - "outDir": "dist", - "declaration": true, - "baseUrl": ".", - }, - "include": [ - "bin/**/*", - "src/**/*", - ], - "exclude": [ - "node_modules" - ] - } - - \ No newline at end of file + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist" + }, + "exclude": [ + "node_modules", + "dist", + "test" + ], +} \ No newline at end of file diff --git a/packages/sql-parser/.gitignore b/packages/sql-parser/.gitignore index d5f19d89b..87807d97c 100644 --- a/packages/sql-parser/.gitignore +++ b/packages/sql-parser/.gitignore @@ -1,2 +1,3 @@ node_modules package-lock.json +dist diff --git a/packages/sql-parser/package.json b/packages/sql-parser/package.json index 2e8ba627f..0f9eaf52c 100644 --- a/packages/sql-parser/package.json +++ b/packages/sql-parser/package.json @@ -2,7 +2,7 @@ "author": "joe-re", "name": "@joe-re/sql-parser", "description": "sql parser for nodejs", - "version": "0.3.3", + "version": "0.11.1", "typings": "index.d.ts", "scripts": { "test": "jest", @@ -10,6 +10,12 @@ "generateParser": "pegjs -o ./base/parser.js parser.pegjs", "generateFromClauseParser": "pegjs -o ./base/fromClauseParser.js --allowed-start-rules extract_from_clause parser.pegjs" }, + "files": [ + "base", + "index.js", + "index.d.ts", + "package.json" + ], "engines": { "node": ">=0.8.0" }, diff --git a/packages/sql-parser/tsconfig.json b/packages/sql-parser/tsconfig.json new file mode 100644 index 000000000..8f0f42453 --- /dev/null +++ b/packages/sql-parser/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "composite": true + }, + "exclude": [ + "node_modules", + "dist" + ], +} \ No newline at end of file diff --git a/packages/sqlint/package.json b/packages/sqlint/package.json index f2a1d3be3..c14dedbf1 100644 --- a/packages/sqlint/package.json +++ b/packages/sqlint/package.json @@ -1,6 +1,6 @@ { "name": "sqlint", - "version": "0.9.2", + "version": "0.11.2", "main": "dist/src/index", "bin": { "sqlint": "bin/cli.js" @@ -20,17 +20,18 @@ ], "types": "./dist/src", "dependencies": { + "@joe-re/sql-parser": "^0.11.1", "ajv": "^6.12.2", "chalk": "^4.0.0", - "jest": "^26.0.1", "js-yaml": "^3.14.0", "yargs": "^15.3.1" }, "devDependencies": { "@types/ajv": "^1.0.0", "@types/js-yaml": "^3.12.4", - "@types/node": "^14.0.5", + "@types/node": "14.0.26", "@types/yargs": "^15.0.5", + "jest": "^26.0.1", "ts-jest": "^26.0.0", "typescript": "^3.9.3" } diff --git a/packages/sqlint/schema.conf.js b/packages/sqlint/schema.conf.js new file mode 100644 index 000000000..0ae7d867e --- /dev/null +++ b/packages/sqlint/schema.conf.js @@ -0,0 +1,12 @@ +"use strict"; +exports.__esModule = true; +var config = { + type: 'object', + properties: { + rules: { + type: 'object' + } + }, + additionalProperties: false +}; +exports["default"] = config; diff --git a/packages/sqlint/tsconfig.json b/packages/sqlint/tsconfig.json index be803cba4..5fc531c8e 100644 --- a/packages/sqlint/tsconfig.json +++ b/packages/sqlint/tsconfig.json @@ -1,19 +1,13 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "noUnusedLocals": true, - "noUnusedParameters": true, - "strict": true, - "target": "es2017", - "module": "CommonJS", - "lib": [ "es2018", "es2019" ], - "moduleResolution": "node", - "sourceMap": true, - "esModuleInterop": true, - "outDir": "dist", - "declaration": true + "rootDir": ".", + "outDir": "dist" }, "exclude": [ "node_modules", - "dist" - ] + "dist", + "test" + ], + "references": [{ "path": "../sql-parser" }] } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 589a764be..6739cdab4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,22 +1,19 @@ { "compilerOptions": { - "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, + "strict": true, "target": "es2017", - "module": "es6", + "module": "CommonJS", "lib": [ "es2018", "es2019" ], "moduleResolution": "node", + "sourceMap": true, "esModuleInterop": true, + "declaration": true, "baseUrl": ".", "paths": { - "@sql-language-server/sqlint": ["packages/sqlint/dist"] + "@joe-re/sql-parser": ["packages/sql-parser/*"], + "sqlint": ["packages/sqlint"] } }, - "include": ["../sqlint"], - "exclude": [ - "node_modules", - "example" - ] } -