release v0.11.2

joe-re · joe-re · commit 64522222bb14 · 2020-07-27T04:38:11.000+08:00
diff --git 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,17 +15,17 @@
   "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",
     "watch:server": "wait-on ./packages/sqlint/dist/src/index.js && cd ./packages/server && yarn run watch:index",
     "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
@@ -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
@@ -0,0 +1,2 @@
+#! /usr/bin/env node
+require('../dist/bin/cli')
diff --git 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
@@ -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
@@ -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"
-    ]
-  }
-  
-  
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "test"
+  ],
+}
diff --git 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
@@ -2,14 +2,20 @@
   "author": "joe-re<joe.tialtngo@gmail.com>",
   "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",
     "build": "npm run generateParser && npm run generateFromClauseParser",
     "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
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "composite": true
+  },
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
+}
diff --git 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
@@ -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
@@ -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" }]
 }
diff --git 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"
-  ]
 }
-

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#! /usr/bin/env node`
	`2`	`+require('../dist/bin/cli')`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ function readFile(filePath: string) {`
`45`	`45`	`return fs.readFileSync(filePath, "utf8").replace(/^\ufeff/u, "");`
`46`	`46`	`}`
`47`	`47`
`48`		`-export default class SettingStore extends EventEmitter {`
	`48`	`+export default class SettingStore extends EventEmitter.EventEmitter {`
`49`	`49`	`private personalConfig: PersonalConfig = { connections: []}`
`50`	`50`	`private state: Settings = {`
`51`	`51`	`name: null,`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`node_modules`
`2`	`2`	`package-lock.json`
	`3`	`+dist`