Merge PR #487: Use NodeNext for Typescript module resolution

.eslintrc

@@ -31,6 +31,7 @@
     "prefer-template": "off",
     "default-case": "off",
     "import/prefer-default-export": "off",
+    "import/extensions": ["error", "always"],
     "prettier/prettier": ["error"],
     "@typescript-eslint/no-use-before-define": "off",
     "@typescript-eslint/comma-dangle": "off",

package.json

@@ -154,7 +154,7 @@
     "ts-loader": "^9.3.1",
     "ttypescript": "^1.5.13",
     "typescript": "^4.7.4",
-    "webpack": "^5.64.1",
+    "webpack": "^5.74.0",
     "webpack-cli": "^4.9.1",
     "webpack-merge": "^5.8.0"
   },
@@ -168,7 +168,7 @@
       "src/**/*.ts"
     ],
     "moduleNameMapper": {
-      "src/(.*)": "<rootDir>/src/$1"
+      "^\\.(.+)\\.js": ".$1"
     }
   }
 }

src/FormatOptions.ts

@@ -1,8 +1,8 @@
 // import only type to avoid ESLint no-cycle rule producing an error
-import type { SqlLanguage } from './sqlFormatter';
-import { ParamItems } from './formatter/Params';
-import Formatter from './formatter/Formatter';
-import { ParamTypes } from './lexer/TokenizerOptions';
+import type { SqlLanguage } from './sqlFormatter.js';
+import { ParamItems } from './formatter/Params.js';
+import Formatter from './formatter/Formatter.js';
+import { ParamTypes } from './lexer/TokenizerOptions.js';
 
 export type IndentStyle = 'standard' | 'tabularLeft' | 'tabularRight';
 

src/formatter/ExpressionFormatter.ts

@@ -1,9 +1,9 @@
-import { FormatOptions } from 'src/FormatOptions';
-import { equalizeWhitespace, isMultiline } from 'src/utils';
+import { FormatOptions } from '../FormatOptions.js';
+import { equalizeWhitespace, isMultiline } from '../utils.js';
 
-import Params from 'src/formatter/Params';
-import { isTabularStyle } from 'src/formatter/config';
-import { TokenType } from 'src/lexer/token';
+import Params from './Params.js';
+import { isTabularStyle } from './config.js';
+import { TokenType } from '../lexer/token.js';
 import {
   AllColumnsAsteriskNode,
   ArraySubscriptNode,
@@ -28,11 +28,11 @@ import {
   CaseExpressionNode,
   CaseWhenNode,
   CaseElseNode,
-} from 'src/parser/ast';
+} from '../parser/ast.js';
 
-import Layout, { WS } from './Layout';
-import toTabularFormat, { isTabularToken } from './tabularStyle';
-import InlineLayout, { InlineLayoutError } from './InlineLayout';
+import Layout, { WS } from './Layout.js';
+import toTabularFormat, { isTabularToken } from './tabularStyle.js';
+import InlineLayout, { InlineLayoutError } from './InlineLayout.js';
 
 interface ExpressionFormatterParams {
   cfg: FormatOptions;

src/formatter/Formatter.ts

@@ -1,16 +1,16 @@
-import { FormatOptions } from 'src/FormatOptions';
-import { indentString } from 'src/formatter/config';
-import Params from 'src/formatter/Params';
-import Tokenizer from 'src/lexer/Tokenizer';
+import { FormatOptions } from '../FormatOptions.js';
+import { indentString } from './config.js';
+import Params from './Params.js';
+import Tokenizer from '../lexer/Tokenizer.js';
 
-import { createParser } from 'src/parser/createParser';
-import { StatementNode } from 'src/parser/ast';
+import { createParser } from '../parser/createParser.js';
+import { StatementNode } from '../parser/ast.js';
 
-import formatCommaPositions from './formatCommaPositions';
-import formatAliasPositions from './formatAliasPositions';
-import ExpressionFormatter, { DialectFormatOptions } from './ExpressionFormatter';
-import Layout, { WS } from './Layout';
-import Indentation from './Indentation';
+import formatCommaPositions from './formatCommaPositions.js';
+import formatAliasPositions from './formatAliasPositions.js';
+import ExpressionFormatter, { DialectFormatOptions } from './ExpressionFormatter.js';
+import Layout, { WS } from './Layout.js';
+import Indentation from './Indentation.js';
 
 /** Main formatter class that produces a final output string from list of tokens */
 export default class Formatter {

src/formatter/Indentation.ts

@@ -1,4 +1,4 @@
-import { last } from 'src/utils';
+import { last } from '../utils.js';
 
 const INDENT_TYPE_TOP_LEVEL = 'top-level';
 const INDENT_TYPE_BLOCK_LEVEL = 'block-level';

src/formatter/InlineLayout.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line max-classes-per-file
-import Indentation from './Indentation';
-import Layout, { WS } from './Layout';
+import Indentation from './Indentation.js';
+import Layout, { WS } from './Layout.js';
 
 /**
  * Like Layout, but only formats single-line expressions.

src/formatter/Layout.ts

@@ -1,6 +1,6 @@
-import { last } from 'src/utils';
+import { last } from '../utils.js';
 
-import Indentation from './Indentation';
+import Indentation from './Indentation.js';
 
 /** Whitespace modifiers to be used with add() method */
 export enum WS {

src/formatter/config.ts

@@ -1,4 +1,4 @@
-import { FormatOptions } from 'src/FormatOptions';
+import { FormatOptions } from '../FormatOptions.js';
 
 // Utility functions for config options
 

src/formatter/formatAliasPositions.ts

@@ -1,4 +1,4 @@
-import { maxLength } from 'src/utils';
+import { maxLength } from '../utils.js';
 
 /**
  * Handles select alias placement - tabulates if enabled

src/formatter/formatCommaPositions.ts

@@ -1,5 +1,5 @@
-import { CommaPosition } from 'src/FormatOptions';
-import { maxLength } from 'src/utils';
+import { CommaPosition } from '../FormatOptions.js';
+import { maxLength } from '../utils.js';
 
 const PRECEDING_WHITESPACE_REGEX = /^\s+/u;
 

src/formatter/tabularStyle.ts

@@ -1,5 +1,5 @@
-import { IndentStyle } from 'src/FormatOptions';
-import { isLogicalOperator, TokenType } from 'src/lexer/token';
+import { IndentStyle } from '../FormatOptions.js';
+import { isLogicalOperator, TokenType } from '../lexer/token.js';
 
 /**
  * When tabular style enabled,

src/index.ts

@@ -1,11 +1,11 @@
-export * from './sqlFormatter';
+export * from './sqlFormatter.js';
 export type {
   IndentStyle,
   KeywordCase,
   CommaPosition,
   LogicalOperatorNewline,
   FormatOptions,
-} from './FormatOptions';
-export { default as Formatter } from './formatter/Formatter';
-export { default as Tokenizer } from './lexer/Tokenizer';
-export { expandPhrases } from './expandPhrases';
+} from './FormatOptions.js';
+export { default as Formatter } from './formatter/Formatter.js';
+export { default as Tokenizer } from './lexer/Tokenizer.js';
+export { expandPhrases } from './expandPhrases.js';

src/languages/bigquery/bigquery.formatter.ts

@@ -1,9 +1,9 @@
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { EOF_TOKEN, isToken, TokenType, Token } from 'src/lexer/token';
-import { expandPhrases } from 'src/expandPhrases';
-import { keywords } from './bigquery.keywords';
-import { functions } from './bigquery.functions';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { EOF_TOKEN, isToken, TokenType, Token } from '../../lexer/token.js';
+import { expandPhrases } from '../../expandPhrases.js';
+import { keywords } from './bigquery.keywords.js';
+import { functions } from './bigquery.functions.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]']);
 

src/languages/bigquery/bigquery.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions

src/languages/bigquery/bigquery.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords

src/languages/db2/db2.formatter.ts

@@ -1,8 +1,8 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { functions } from './db2.functions';
-import { keywords } from './db2.keywords';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { functions } from './db2.functions.js';
+import { keywords } from './db2.keywords.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
 

src/languages/db2/db2.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://www.ibm.com/docs/en/db2-for-zos/11?topic=functions-aggregate

src/languages/db2/db2.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://www.ibm.com/docs/en/db2-for-zos/11?topic=words-reserved#db2z_reservedwords__newresword

src/languages/hive/hive.formatter.ts

@@ -1,8 +1,8 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { functions } from './hive.functions';
-import { keywords } from './hive.keywords';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { functions } from './hive.functions.js';
+import { keywords } from './hive.keywords.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
 

src/languages/hive/hive.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF

src/languages/hive/hive.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl

src/languages/mariadb/mariadb.formatter.ts

@@ -1,9 +1,9 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { EOF_TOKEN, isToken, Token, TokenType } from 'src/lexer/token';
-import { keywords } from './mariadb.keywords';
-import { functions } from './mariadb.functions';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+import { keywords } from './mariadb.keywords.js';
+import { functions } from './mariadb.functions.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT | DISTINCTROW]']);
 

src/languages/mariadb/mariadb.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/

src/languages/mariadb/mariadb.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://mariadb.com/kb/en/information-schema-keywords-table/

src/languages/mysql/mysql.formatter.ts

@@ -1,9 +1,9 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { EOF_TOKEN, isToken, Token, TokenType } from 'src/lexer/token';
-import { keywords } from './mysql.keywords';
-import { functions } from './mysql.functions';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { EOF_TOKEN, isToken, Token, TokenType } from '../../lexer/token.js';
+import { keywords } from './mysql.keywords.js';
+import { functions } from './mysql.functions.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT | DISTINCTROW]']);
 

src/languages/mysql/mysql.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html

src/languages/mysql/mysql.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html

src/languages/n1ql/n1ql.formatter.ts

@@ -1,8 +1,8 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { functions } from './n1ql.functions';
-import { keywords } from './n1ql.keywords';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { functions } from './n1ql.functions.js';
+import { keywords } from './n1ql.keywords.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
 

src/languages/n1ql/n1ql.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html

src/languages/n1ql/n1ql.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html

src/languages/plsql/plsql.formatter.ts

@@ -1,10 +1,10 @@
-import { expandPhrases } from 'src/expandPhrases';
-import Formatter from 'src/formatter/Formatter';
-import { DialectFormatOptions } from 'src/formatter/ExpressionFormatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { EOF_TOKEN, isReserved, isToken, Token, TokenType } from 'src/lexer/token';
-import { keywords } from './plsql.keywords';
-import { functions } from './plsql.functions';
+import { expandPhrases } from '../../expandPhrases.js';
+import Formatter from '../../formatter/Formatter.js';
+import { DialectFormatOptions } from '../../formatter/ExpressionFormatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { EOF_TOKEN, isReserved, isToken, Token, TokenType } from '../../lexer/token.js';
+import { keywords } from './plsql.keywords.js';
+import { functions } from './plsql.functions.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT | UNIQUE]']);
 

src/languages/plsql/plsql.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm

src/languages/plsql/plsql.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm

src/languages/postgresql/postgresql.formatter.ts

@@ -1,9 +1,9 @@
-import { expandPhrases } from 'src/expandPhrases';
-import { DialectFormatOptions } from 'src/formatter/ExpressionFormatter';
-import Formatter from 'src/formatter/Formatter';
-import Tokenizer from 'src/lexer/Tokenizer';
-import { functions } from './postgresql.functions';
-import { keywords } from './postgresql.keywords';
+import { expandPhrases } from '../../expandPhrases.js';
+import { DialectFormatOptions } from '../../formatter/ExpressionFormatter.js';
+import Formatter from '../../formatter/Formatter.js';
+import Tokenizer from '../../lexer/Tokenizer.js';
+import { functions } from './postgresql.functions.js';
+import { keywords } from './postgresql.keywords.js';
 
 const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
 

src/languages/postgresql/postgresql.functions.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const functions = flatKeywordList({
   // https://www.postgresql.org/docs/14/functions.html

src/languages/postgresql/postgresql.keywords.ts

@@ -1,4 +1,4 @@
-import { flatKeywordList } from '../../utils';
+import { flatKeywordList } from '../../utils.js';
 
 export const keywords = flatKeywordList({
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html