Use deepnote/sql-parser instead of joe-re/sql-parser

packages/server/package.json

@@ -40,7 +40,7 @@
   ],
   "dependencies": {
     "@google-cloud/bigquery": "^5.9.0",
-    "@joe-re/sql-parser": "file:../sql-parser",
+    "@deepnote/sql-parser": "^1.7.0",
     "@types/pg": "^8.6.6",
     "@types/yargs": "^17.0.8",
     "cardinal": "^2.1.1",

packages/server/src/complete/AstUtils.ts

@@ -3,7 +3,7 @@ import {
   FromTableNode,
   SelectStatement,
   NodeRange,
-} from '@joe-re/sql-parser'
+} from '@deepnote/sql-parser'
 import { Table } from '../database_libs/AbstractClient'
 import { stubLogger } from '../logger'
 import { Pos } from './complete'

packages/server/src/complete/StringUtils.ts

@@ -1,4 +1,4 @@
-import { FromTableNode } from '@joe-re/sql-parser'
+import { FromTableNode } from '@deepnote/sql-parser'
 import { Table } from '../database_libs/AbstractClient'
 import { Pos } from './complete'
 

packages/server/src/complete/candidates/createAliasCandidates.ts

@@ -1,5 +1,5 @@
 import { CompletionItem } from 'vscode-languageserver-types'
-import { FromTableNode } from '@joe-re/sql-parser'
+import { FromTableNode } from '@deepnote/sql-parser'
 import { toCompletionItemForAlias } from '../CompletionItemUtils'
 
 export function createAliasCandidates(

packages/server/src/complete/candidates/createColumnCandidates.ts

@@ -1,5 +1,5 @@
 import { CompletionItem } from 'vscode-languageserver-types'
-import { FromTableNode } from '@joe-re/sql-parser'
+import { FromTableNode } from '@deepnote/sql-parser'
 import { Table } from '../../database_libs/AbstractClient'
 import { getAliasFromFromTableNode, makeColumnName } from '../StringUtils'
 import { isTableMatch } from '../AstUtils'

packages/server/src/complete/candidates/createJoinCandidates.ts

@@ -1,5 +1,5 @@
 import { CompletionItem } from 'vscode-languageserver-types'
-import { SelectStatement } from '@joe-re/sql-parser'
+import { SelectStatement } from '@deepnote/sql-parser'
 import { getNearestFromTableFromPos } from '../AstUtils'
 import { Table } from '../../database_libs/AbstractClient'
 import { toCompletionItemForKeyword } from '../CompletionItemUtils'

packages/server/src/complete/candidates/createJoinTableCndidates.ts

@@ -1,4 +1,4 @@
-import { FromTableNode, ExpectedLiteralNode } from '@joe-re/sql-parser'
+import { FromTableNode, ExpectedLiteralNode } from '@deepnote/sql-parser'
 import { CompletionItem } from 'vscode-languageserver-types'
 import {
   getAliasFromFromTableNode,

packages/server/src/complete/candidates/createKeywordCandidatesFromExpectedLiterals.ts

@@ -1,4 +1,4 @@
-import { ExpectedLiteralNode } from '@joe-re/sql-parser'
+import { ExpectedLiteralNode } from '@deepnote/sql-parser'
 import { CompletionItem } from 'vscode-languageserver-types'
 import { toCompletionItemForKeyword } from '../CompletionItemUtils'
 

packages/server/src/complete/candidates/createSelectAllColumnsCandidates.ts

@@ -1,4 +1,4 @@
-import { FromTableNode } from '@joe-re/sql-parser'
+import { FromTableNode } from '@deepnote/sql-parser'
 import { Table } from '../../database_libs/AbstractClient'
 import { makeColumnName } from '../StringUtils'
 import { getAliasFromFromTableNode } from '../StringUtils'

packages/server/src/complete/complete.ts

@@ -11,7 +11,7 @@ import {
   AST,
   AlterTableStatement,
   DropTableStatement,
-} from '@joe-re/sql-parser'
+} from '@deepnote/sql-parser'
 import { CompletionItem } from 'vscode-languageserver-types'
 import { Schema, Table } from '../database_libs/AbstractClient'
 import { stubLogger } from '../logger'

packages/server/src/createDiagnostics.ts

@@ -1,4 +1,4 @@
-import { parse, ParseError } from '@joe-re/sql-parser'
+import { parse, ParseError } from '@deepnote/sql-parser'
 import { PublishDiagnosticsParams, Diagnostic } from 'vscode-languageserver'
 import { DiagnosticSeverity } from 'vscode-languageserver-types'
 import { lint, ErrorLevel, LintResult, RawConfig } from 'sqlint'

packages/sql-parser/package.json

@@ -1,6 +1,6 @@
 {
   "author": "joe-re<[email protected]>",
-  "name": "@joe-re/sql-parser",
+  "name": "@deepnote/sql-parser",
   "description": "sql parser for nodejs",
   "version": "1.7.0",
   "typings": "index.d.ts",

packages/sqlint/package.json

@@ -32,7 +32,7 @@
   ],
   "types": "./dist/src",
   "dependencies": {
-    "@joe-re/sql-parser": "^1.7.0",
+    "@deepnote/sql-parser": "^1.7.0",
     "ajv": "^6.12.2",
     "chalk": "^4.0.0",
     "js-yaml": "^3.14.0",

packages/sqlint/src/rules/alignColumnToTheFirst.ts

@@ -1,4 +1,4 @@
-import { SelectStatement } from '@joe-re/sql-parser'
+import { SelectStatement } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 const META = {

packages/sqlint/src/rules/alignWhereClauseToTheFirst.ts

@@ -1,4 +1,4 @@
-import { SelectStatement, BinaryExpressionNode } from '@joe-re/sql-parser'
+import { SelectStatement, BinaryExpressionNode } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 const META = {

packages/sqlint/src/rules/columnNewLine.ts

@@ -1,4 +1,4 @@
-import { SelectStatement } from '@joe-re/sql-parser'
+import { SelectStatement } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 type Options = { allowMultipleColumnsPerLine: boolean }

packages/sqlint/src/rules/index.ts

@@ -1,4 +1,4 @@
-import { parseAll, NodeRange, AST, Node, BaseNode } from '@joe-re/sql-parser'
+import { parseAll, NodeRange, AST, Node, BaseNode } from '@deepnote/sql-parser'
 import { Fixer, FixDescription, createFixer } from '../fixer'
 import { reservedWordCase } from './reservedWordCase'
 import { spaceSurroundingOperators } from './spaceSurroundingOperators'

packages/sqlint/src/rules/linebreakAfterClauseKeyword.ts

@@ -1,4 +1,4 @@
-import { KeywordNode } from '@joe-re/sql-parser'
+import { KeywordNode } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 const META = {

packages/sqlint/src/rules/requireAsToRenameColumn.ts

@@ -1,4 +1,4 @@
-import { SelectStatement } from '@joe-re/sql-parser'
+import { SelectStatement } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 const META = {

packages/sqlint/src/rules/reservedWordCase.ts

@@ -1,4 +1,4 @@
-import { KeywordNode } from '@joe-re/sql-parser'
+import { KeywordNode } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 type Option = 'upper' | 'lower'

packages/sqlint/src/rules/spaceSurroundingOperators.ts

@@ -1,4 +1,4 @@
-import { BinaryExpressionNode } from '@joe-re/sql-parser'
+import { BinaryExpressionNode } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 type Option = 'always' | 'never'

packages/sqlint/src/rules/whereClauseNewLine.ts

@@ -1,4 +1,4 @@
-import { SelectStatement, BinaryExpressionNode } from '@joe-re/sql-parser'
+import { SelectStatement, BinaryExpressionNode } from '@deepnote/sql-parser'
 import { Rule, RuleConfig } from './index'
 
 type Options = { allowMultipleColumnsPerLine: boolean }

tsconfig.json

@@ -14,7 +14,7 @@
     "composite": true,
     "paths": {
       "sql-language-server": ["packages/server/*"],
-      "@joe-re/sql-parser": ["packages/sql-parser/*"],
+      "@deepnote/sql-parser": ["packages/sql-parser/*"],
       "sqlint": ["packages/sqlint/*"]
     }
   },

yarn.lock

@@ -618,11 +618,6 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@joe-re/sql-parser@file:packages/sql-parser":
-  version "1.7.0"
-  dependencies:
-    peggy "^3.0.2"
-
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"