diff --git a/packages/server/package.json b/packages/server/package.json index bb412093..6b49ace1 100644 --- a/packages/server/package.json +++ b/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", diff --git a/packages/server/src/complete/AstUtils.ts b/packages/server/src/complete/AstUtils.ts index 564e2ec5..7b851dd0 100644 --- a/packages/server/src/complete/AstUtils.ts +++ b/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' diff --git a/packages/server/src/complete/StringUtils.ts b/packages/server/src/complete/StringUtils.ts index 484de348..ed6a26da 100644 --- a/packages/server/src/complete/StringUtils.ts +++ b/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' diff --git a/packages/server/src/complete/candidates/createAliasCandidates.ts b/packages/server/src/complete/candidates/createAliasCandidates.ts index 9d085553..5ba3ccdd 100644 --- a/packages/server/src/complete/candidates/createAliasCandidates.ts +++ b/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( diff --git a/packages/server/src/complete/candidates/createColumnCandidates.ts b/packages/server/src/complete/candidates/createColumnCandidates.ts index 63dd34e4..f05e0766 100644 --- a/packages/server/src/complete/candidates/createColumnCandidates.ts +++ b/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' diff --git a/packages/server/src/complete/candidates/createJoinCandidates.ts b/packages/server/src/complete/candidates/createJoinCandidates.ts index b69cd8b9..30f862ed 100644 --- a/packages/server/src/complete/candidates/createJoinCandidates.ts +++ b/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' diff --git a/packages/server/src/complete/candidates/createJoinTableCndidates.ts b/packages/server/src/complete/candidates/createJoinTableCndidates.ts index a34cf34e..ff14ef64 100644 --- a/packages/server/src/complete/candidates/createJoinTableCndidates.ts +++ b/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, diff --git a/packages/server/src/complete/candidates/createKeywordCandidatesFromExpectedLiterals.ts b/packages/server/src/complete/candidates/createKeywordCandidatesFromExpectedLiterals.ts index fa2007e8..b7eee336 100644 --- a/packages/server/src/complete/candidates/createKeywordCandidatesFromExpectedLiterals.ts +++ b/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' diff --git a/packages/server/src/complete/candidates/createSelectAllColumnsCandidates.ts b/packages/server/src/complete/candidates/createSelectAllColumnsCandidates.ts index f30989b5..1ca1fb71 100644 --- a/packages/server/src/complete/candidates/createSelectAllColumnsCandidates.ts +++ b/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' diff --git a/packages/server/src/complete/complete.ts b/packages/server/src/complete/complete.ts index 468529e2..5ca934cf 100644 --- a/packages/server/src/complete/complete.ts +++ b/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' diff --git a/packages/server/src/createDiagnostics.ts b/packages/server/src/createDiagnostics.ts index c7c10ce6..77448faa 100644 --- a/packages/server/src/createDiagnostics.ts +++ b/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' diff --git a/packages/sql-parser/package.json b/packages/sql-parser/package.json index e9a9d492..119d9f92 100644 --- a/packages/sql-parser/package.json +++ b/packages/sql-parser/package.json @@ -1,6 +1,6 @@ { "author": "joe-re", - "name": "@joe-re/sql-parser", + "name": "@deepnote/sql-parser", "description": "sql parser for nodejs", "version": "1.7.0", "typings": "index.d.ts", diff --git a/packages/sqlint/package.json b/packages/sqlint/package.json index bcf03a89..86fe9966 100644 --- a/packages/sqlint/package.json +++ b/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", diff --git a/packages/sqlint/src/rules/alignColumnToTheFirst.ts b/packages/sqlint/src/rules/alignColumnToTheFirst.ts index ca934e22..d10000b7 100644 --- a/packages/sqlint/src/rules/alignColumnToTheFirst.ts +++ b/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 = { diff --git a/packages/sqlint/src/rules/alignWhereClauseToTheFirst.ts b/packages/sqlint/src/rules/alignWhereClauseToTheFirst.ts index edb76be2..df22c9b2 100644 --- a/packages/sqlint/src/rules/alignWhereClauseToTheFirst.ts +++ b/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 = { diff --git a/packages/sqlint/src/rules/columnNewLine.ts b/packages/sqlint/src/rules/columnNewLine.ts index 9ca5cd0b..2ffe714a 100644 --- a/packages/sqlint/src/rules/columnNewLine.ts +++ b/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 } diff --git a/packages/sqlint/src/rules/index.ts b/packages/sqlint/src/rules/index.ts index ea015e86..1ba8b867 100644 --- a/packages/sqlint/src/rules/index.ts +++ b/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' diff --git a/packages/sqlint/src/rules/linebreakAfterClauseKeyword.ts b/packages/sqlint/src/rules/linebreakAfterClauseKeyword.ts index 4b5dc359..71e82577 100644 --- a/packages/sqlint/src/rules/linebreakAfterClauseKeyword.ts +++ b/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 = { diff --git a/packages/sqlint/src/rules/requireAsToRenameColumn.ts b/packages/sqlint/src/rules/requireAsToRenameColumn.ts index b13de02e..d1b6e300 100644 --- a/packages/sqlint/src/rules/requireAsToRenameColumn.ts +++ b/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 = { diff --git a/packages/sqlint/src/rules/reservedWordCase.ts b/packages/sqlint/src/rules/reservedWordCase.ts index 38bf205d..93b25343 100644 --- a/packages/sqlint/src/rules/reservedWordCase.ts +++ b/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' diff --git a/packages/sqlint/src/rules/spaceSurroundingOperators.ts b/packages/sqlint/src/rules/spaceSurroundingOperators.ts index 713f336a..c5322f40 100644 --- a/packages/sqlint/src/rules/spaceSurroundingOperators.ts +++ b/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' diff --git a/packages/sqlint/src/rules/whereClauseNewLine.ts b/packages/sqlint/src/rules/whereClauseNewLine.ts index 861bfde6..45748afb 100644 --- a/packages/sqlint/src/rules/whereClauseNewLine.ts +++ b/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 } diff --git a/tsconfig.json b/tsconfig.json index 44fe5b47..3930485f 100644 --- a/tsconfig.json +++ b/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/*"] } }, diff --git a/yarn.lock b/yarn.lock index 40c28abf..53603463 100644 --- a/yarn.lock +++ b/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"