Upgrade dependencies

package.json

@@ -103,7 +103,9 @@
  "wait-on": "^5.0.1"
  },
  "dependencies": {
- "electron-rebuild": "^1.11.0",
  "sqlite3": "^5.0.2"
+ },
+ "resolutions": {
+ "tar": ">4.4.18"
  }
 }

packages/client/extension.ts

@@ -115,8 +115,8 @@ export function activate(context: ExtensionContext) {
 });
 
  // Using the location of the javacript file built by `npm run prepublish`
- const serverModule = context.asAbsolutePath(path.join('packages', 'server', 'dist', 'cli.js'))
- const execArgs = ['up', '--method', 'node-ipc']
+ const serverModule = context.asAbsolutePath(path.join('packages', 'server', 'dist', 'vscodeExtensionServer.js'))
+ const execArgs = ['false'] // [1: debug]
  const debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
  let connectionNames = []
  let connectedConnectionName = ''

packages/client/package.json

@@ -19,7 +19,6 @@
  "onNotebook:jupyter-notebook"
  ],
  "dependencies": {
- "electron-rebuild": "^1.11.0",
  "vscode": "^1.1.37",
  "vscode-languageclient": "^7.0.0",
  "vscode-test": "^1.3.0"

packages/server/bin/cli.ts

@@ -1,32 +1,33 @@
 import yargs from 'yargs'
-import { createServer } from '../src/createServer'
+import { hideBin } from 'yargs/helpers'
+import { ConnectionMethod, createServer } from '../src/createServer'
 
-const cli = yargs
+const cli = yargs(hideBin(process.argv))
  .usage('SQL Language Server Command Line Interface')
- .command('up', 'run sql-language-server', {
- method: {
+ .command('up', 'run sql-language-server', (v) => {
+ return v.option('method', {
  alias: 'm',
  type: 'string',
  default: 'node-ipc',
  choices: ['stdio', 'node-ipc'],
  describe: 'What use to communicate with sql language server'
- },
- 'debug': {
+ }).option('debug', {
  alias: 'd',
  type: 'boolean',
  default: false,
  describe: 'Enable debug logging'
- }
- }, () => {
- createServer()
+ })
+ }, (v) => {
+ createServer({ method: v.method as ConnectionMethod, debug: v.debug })
  process.stdin.resume()
  })
  .example('$0 up --method stdio', ': start up sql-language-server - communicate via stdio')
  .help()
- .argv
 
-if (cli._.length === 0) {
- yargs.showHelp()
+cli.parse()
+
+if ((cli.argv as any)._.length === 0) {
+ cli.showHelp()
 }
 
 process.stdin.on('close', () => {

packages/server/bin/vscodeExtensionServer.ts

@@ -0,0 +1,2 @@
+import { createServer } from '../src/createServer'
+createServer({ method: 'node-ipc', debug: process.argv[2] === 'true' })

packages/server/package.json

@@ -22,12 +22,13 @@
  "license": "MIT",
  "scripts": {
  "compile:cli": "esbuild bin/cli.ts --bundle --platform=node --external:pg-native --outfile=dist/cli.js",
+ "compile:vscode": "esbuild bin/vscodeExtensionServer.ts --bundle --platform=node --external:pg-native --outfile=dist/vscodeExtensionServer.js",
  "compile:index": "tsc -p .",
  "clean": "rm -rf dist",
  "watch:cli": "yarn compile:cli --watch",
  "watch:index": "tsc -w",
  "test": "jest",
- "prepare-vsc-extension": "yarn clean && yarn compile:cli",
+ "prepare-vsc-extension": "yarn clean && yarn compile:vscode",
  "prepublish": "yarn clean && yarn compile:index"
  },
  "files": [
@@ -39,6 +40,7 @@
  "@google-cloud/bigquery": "^5.9.0",
  "@joe-re/sql-parser": "^1.2.0",
  "@types/pg": "^7.4.10",
+ "@types/yargs": "^17.0.8",
  "cardinal": "^2.1.1",
  "jest": "^26.0.1",
  "log4js": "^6.2.1",

packages/server/src/ambient.d.ts

@@ -1 +0,0 @@
-declare module 'yargs'

packages/server/src/createServer.ts

@@ -12,7 +12,6 @@ import cache from './cache'
 import { complete } from './complete'
 import createDiagnostics from './createDiagnostics'
 import createConnection from './createConnection'
-import yargs from 'yargs'
 import SettingStore from './SettingStore'
 import { Schema } from './database_libs/AbstractClient'
 import getDatabaseClient from './database_libs/getDatabaseClient'
@@ -26,14 +25,11 @@ import path from 'path'
 import process from 'process'
 
 export type ConnectionMethod = 'node-ipc' | 'stdio'
-type Args = {
- method?: ConnectionMethod
-}
 
 const TRIGGER_CHARATER = '.'
 
-export function createServerWithConnection(connection: Connection) {
- initializeLogging()
+export function createServerWithConnection(connection: Connection, debug = false) {
+ initializeLogging(debug)
  const logger = log4js.getLogger()
  const documents = new TextDocuments(TextDocument)
  documents.listen(connection);
@@ -325,7 +321,7 @@ export function createServerWithConnection(connection: Connection) {
  return connection
 }
 
-export function createServer() {
- const connection: Connection = createConnection((yargs.argv as Args).method || 'node-ipc')
- return createServerWithConnection(connection)
+export function createServer(params: { method?: ConnectionMethod, debug?: boolean } = {}) {
+ const connection: Connection = createConnection(params.method ?? 'node-ipc')
+ return createServerWithConnection(connection, params.debug)
 }

packages/server/src/initializeLogging.ts

@@ -1,13 +1,12 @@
 import log4js from 'log4js';
 import * as path from 'path'
 import * as os from 'os'
-import yargs from 'yargs'
 
 const MAX_LOG_SIZE = 1024 * 1024
 const MAX_LOG_BACKUPS = 10
 const LOG_FILE_PATH = path.join(os.tmpdir(), 'sql-language-server.log')
 
-export default function initializeLogging() {
+export default function initializeLogging(debug = false) {
  log4js.configure({
  appenders: {
  server: {
@@ -17,7 +16,8 @@ export default function initializeLogging() {
  ackups: MAX_LOG_BACKUPS
  }
  },
- categories: { default: { appenders: ['server'], level: yargs.argv.debug ? 'debug' : 'debug' } }
+ // TODO: Should accept level
+ categories: { default: { appenders: ['server'], level: debug ? 'debug' : 'debug' } }
  })
 
  const logger = log4js.getLogger()