Refactor (#121)

* split identifier from complete.ts

* move some functions to utils

* define error types on parser

* fix the logics getting location from error

* remove unused function

* remove any type from complete.ts

* move getColumnRefByPos to utils

* move makeColumnName to utils

* move createTablesFromFromNodes to utils

* move findColumnAtPosition to utils

* move getAllNestedFromNodes to utils

* integrate prettier

* add import rules

* remove semi column and force to use single quote

* build before lint

Author: joe-re

.eslintignore

@@ -10,4 +10,6 @@ migrations/
 webpack.config.js
 */monaco_editor/models/
 */monaco_editor/config/config.js
+*/monaco_editor/src/client/client.ts
+*/monaco_editor/src/server/server.ts
 .eslintrc.js

.eslintrc.js

@@ -2,14 +2,54 @@ module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   plugins: [
+    'import',
     '@typescript-eslint',
   ],
+  settings: {
+    node: {
+      tryExtensions: ['.ts', '.js'],
+    },
+  },
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+    'prettier',
+    'plugin:node/recommended',
   ],
   rules: {
     "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
+    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
+    'node/no-unsupported-features/es-syntax': 'off',
+    'node/no-extraneous-import': 'off',
+    "node/no-missing-import": ["error", {
+      "allowModules": ["vscode"]
+    }],
+    'import/first': 0,
+    'import/named': 2,
+    'import/namespace': 2,
+    'import/default': 2,
+    'import/export': 2,
+    'import/order': [
+      'error',
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index',
+        ],
+        pathGroups: [
+          {
+            pattern: '@classdo/**',
+            group: 'internal',
+          },
+        ],
+        pathGroupsExcludedImportTypes: [],
+        'newlines-between': 'never',
+      },
+    ],
   }
 };

.github/workflows/test.yaml

@@ -14,6 +14,7 @@ jobs:
         env:
           PYTHON_VERSION: 3.8.12
       - run: yarn install
+      - run: yarn npm:prepublish
       - run: yarn lint
       - run: yarn vsc-compile:client
       - run: yarn vsc-compile:server

.gitignore

@@ -15,3 +15,4 @@ packages/server/dist/*
 !.yarn/versions
 .pnp.*
 .node-version
+yarn-error.log

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "singleQuote": true
+}

example/monaco_editor/src/client/client.ts

@@ -1,5 +1,5 @@
-import * as monaco from 'monaco-editor-core';
-import { listen } from '@codingame/monaco-jsonrpc';
+import * as monaco from "monaco-editor-core";
+import { listen } from "@codingame/monaco-jsonrpc";
 import {
   MonacoLanguageClient,
   MonacoServices,
@@ -8,11 +8,11 @@ import {
   MessageConnection,
 } from "monaco-languageclient";
 import ReconnectingWebSocket from "reconnecting-websocket";
-import { URI } from 'vscode-uri'
+import { URI } from "vscode-uri";
 
 let languageClient: MonacoLanguageClient;
-let connectionNames: string[] = []
-let connectedConnectionName = ''
+let connectionNames: string[] = [];
+let connectedConnectionName = "";
 
 export function initClient() {
   monaco.languages.register({
@@ -44,14 +44,16 @@ export function initClient() {
       const disposable = languageClient.start();
       connection.onClose(() => disposable.dispose());
       languageClient.onReady().then(() => {
-        languageClient.onNotification('sqlLanguageServer.finishSetup', (params) => {
-          connectionNames =
-            params.personalConfig?.connections?.
-              map((v: { name: string}) => v.name).
-              filter((v: string) => !!v)
-          connectedConnectionName = params.config?.name || ''
-        })
-      })
+        languageClient.onNotification(
+          "sqlLanguageServer.finishSetup",
+          (params) => {
+            connectionNames = params.personalConfig?.connections
+              ?.map((v: { name: string }) => v.name)
+              .filter((v: string) => !!v);
+            connectedConnectionName = params.config?.name || "";
+          }
+        );
+      });
     },
   });
 
@@ -63,10 +65,10 @@ export function initClient() {
       clientOptions: {
         documentSelector: ["sql"],
         workspaceFolder: {
-          uri: URI.file('/opt/sql-language-server/example/monaco_editor'),
-          name: 'workspace',
-          index: 0
-        }
+          uri: URI.file("/opt/sql-language-server/example/monaco_editor"),
+          name: "workspace",
+          index: 0,
+        },
       },
       connectionProvider: {
         get: (errorHandler, closeHandler) => {
@@ -97,18 +99,18 @@ export function getLanguageClient() {
 
 export function executeFixAllFixableProblemsCommand() {
   const params: ExecuteCommandParams = {
-    command: 'fixAllFixableProblems',
-    arguments: ['inmemory://model.sql']
-}
-  languageClient.sendRequest('workspace/executeCommand', params)
+    command: "fixAllFixableProblems",
+    arguments: ["inmemory://model.sql"],
+  };
+  languageClient.sendRequest("workspace/executeCommand", params);
 }
 
 export function executeSwitchDatabaseCommand(db: string) {
   const params: ExecuteCommandParams = {
-    command: 'switchDatabaseConnection',
-    arguments: [db]
-  }
-  languageClient.sendRequest('workspace/executeCommand', params)
+    command: "switchDatabaseConnection",
+    arguments: [db],
+  };
+  languageClient.sendRequest("workspace/executeCommand", params);
 }
 
 export function executeWorkspaceConfig(_db: string) {
@@ -120,9 +122,9 @@ export function executeWorkspaceConfig(_db: string) {
 }
 
 export function getConnectionList() {
-  return connectionNames
+  return connectionNames;
 }
 
 export function getCurrecntConnection() {
-  return connectedConnectionName
-}
+  return connectedConnectionName;
+}

example/monaco_editor/src/client/index.ts

@@ -1,17 +1,16 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import App from './App.svelte'
 import { initClient } from './client'
-
-(self as any).MonacoEnvironment = {
-    getWorkerUrl: () => './editor.worker.bundle.js'
+;(self as any).MonacoEnvironment = {
+  getWorkerUrl: () => './editor.worker.bundle.js',
 }
 
 const app = new App({
   target: document.body,
-});
+})
 
-(window as any).app = app;
+;(window as any).app = app
 
 initClient()
 
-// export default app;
+// export default app;

example/monaco_editor/src/client/main.ts

@@ -1,2 +1 @@
-
-require('./client');
+require('./client')

example/monaco_editor/src/server/launchServer.ts

@@ -1,16 +1,15 @@
-import * as rpc from "@codingame/monaco-jsonrpc";
-import { createConnection } from 'vscode-languageserver/node';
+import * as rpc from '@codingame/monaco-jsonrpc'
+import { createConnection } from 'vscode-languageserver/node'
 import { createServerWithConnection } from 'sql-language-server/src/createServer'
 
 export function launchServer(socket: rpc.IWebSocket) {
-  const reader = new rpc.WebSocketMessageReader(socket);
-  const writer = new rpc.WebSocketMessageWriter(socket);
+  const reader = new rpc.WebSocketMessageReader(socket)
+  const writer = new rpc.WebSocketMessageWriter(socket)
   const asExternalProccess =
-    process.argv.findIndex((value) => value === "--external") !== -1;
+    process.argv.findIndex((value) => value === '--external') !== -1
   if (asExternalProccess) {
     // start the language server as an external process
     // TODO: implement it
-
     // const extJsonServerPath = path.resolve(__dirname, "ext-json-server.js");
     // const socketConnection = server.createConnection(reader, writer, () =>
     //   socket.dispose()

example/monaco_editor/src/server/server.ts

@@ -14,19 +14,19 @@ process.on("uncaughtException", function (err: any) {
   }
 });
 
-let server: http.Server
- 
+let server: http.Server;
+
 function startServer() {
   const app = express();
   app.use(express.static(`${process.cwd()}/dist`));
   server = app.listen(3000);
-  console.log('startServer')
+  console.log("startServer");
 
   const wss = new ws.Server({
     noServer: true,
     perMessageDeflate: false,
   });
-  
+
   server.on(
     "upgrade",
     (request: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
@@ -60,4 +60,4 @@ function startServer() {
   );
 }
 
-startServer()
+startServer();

package.json

@@ -97,8 +97,13 @@
     "@typescript-eslint/eslint-plugin": "^5.10.1",
     "@typescript-eslint/parser": "^5.10.1",
     "eslint": "^8.8.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "lerna": "^4.0.0",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.5.1",
     "typescript": "^4.5.5",
     "wait-on": "^5.0.1"
   },