Add projects to test typescript support with different compiler options

runtime/JavaScript/package.json

@@ -42,23 +42,24 @@
   },
   "scripts": {
     "build": "webpack",
-    "test": "jasmine",
+    "test": "jasmine && npm run test:builds",
+    "test:builds": "bash test-builds.sh",
     "coverage": "c8 jasmine",
-    "lint": "eslint src/antlr4/"
+    "lint": "eslint src/antlr4/",
+    "prepack": "npm run build"
   },
   "engines": {
     "node": ">=16"
   },
   "exports": {
     ".": {
+      "types": "./src/antlr4/index.d.ts",
       "node": {
-        "types": "./src/antlr4/index.d.ts",
         "import": "./dist/antlr4.node.mjs",
         "require": "./dist/antlr4.node.cjs",
         "default": "./dist/antlr4.node.mjs"
       },
       "browser": {
-        "types": "./src/antlr4/index.d.ts",
         "import": "./dist/antlr4.web.mjs",
         "require": "./dist/antlr4.web.cjs",
         "default": "./dist/antlr4.web.mjs"

runtime/JavaScript/spec/imports/builds/node-cjs-ts/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+
+package-lock.json

runtime/JavaScript/spec/imports/builds/node-cjs-ts/index.ts

@@ -0,0 +1,5 @@
+const { CharStream } = require("antlr4");
+
+const cs = new CharStream("OK");
+
+console.log(cs.toString());

runtime/JavaScript/spec/imports/builds/node-cjs-ts/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "test-import-node-cjs-ts",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "type": "commonjs",
+  "scripts": {
+    "test": "bash test.sh"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "antlr4": "file:../../../.."
+  },
+  "devDependencies": {
+    "typescript": "^5.4.3"
+  }
+}

runtime/JavaScript/spec/imports/builds/node-cjs-ts/test.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+tsconfigFiles=(
+  "tsconfig.node.commonjs.json"
+)
+
+failure=0
+
+for tsconfig in "${tsconfigFiles[@]}"; do
+  echo -n "$tsconfig "
+
+  ./node_modules/.bin/tsc -p $tsconfig || { failure=1 ; echo "FAIL tsc: $tsconfig"; }
+  result=$(node ./tsOutput/index.js)
+  [[ $result == "OK" ]] && echo "OK"
+  [[ $result != "OK" ]] && { failure=1 ; echo "FAIL loading runtime with config: $tsconfig"; }
+  rm -rf ./tsOutput
+done
+
+exit $failure

runtime/JavaScript/spec/imports/builds/node-cjs-ts/tsconfig.node.commonjs.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "outDir": "./tsOutput",
+    "module": "commonjs",
+    "moduleResolution": "node"
+  },
+  "include": ["index.ts"],
+}

runtime/JavaScript/spec/imports/builds/node-esm-ts/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+
+package-lock.json

runtime/JavaScript/spec/imports/builds/node-esm-ts/index.ts

@@ -0,0 +1,5 @@
+import { CharStream } from "antlr4";
+
+const cs = new CharStream("OK");
+
+console.log(cs.toString());

runtime/JavaScript/spec/imports/builds/node-esm-ts/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "test-import-node-esm-ts",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "bash test.sh"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "antlr4": "file:../../../.."
+  },
+  "devDependencies": {
+    "typescript": "^5.4.3"
+  }
+}

runtime/JavaScript/spec/imports/builds/node-esm-ts/test.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+tsconfigFiles=(
+  "tsconfig.node16.json"
+  "tsconfig.bundler.es2022.json"
+)
+
+failure=0
+
+for tsconfig in "${tsconfigFiles[@]}"; do
+  echo -n "$tsconfig "
+
+  ./node_modules/.bin/tsc -p $tsconfig || { failure=1 ; echo "FAIL tsc: $tsconfig"; }
+  result=$(node ./tsOutput/index.js)
+  [[ $result == "OK" ]] && echo "OK"
+  [[ $result != "OK" ]] && { failure=1 ; echo "FAIL loading runtime with config: $tsconfig"; }
+  rm -rf ./tsOutput
+done
+
+exit $failure

runtime/JavaScript/spec/imports/builds/node-esm-ts/tsconfig.bundler.es2022.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "outDir": "./tsOutput",
+    "module": "es2022",
+    "moduleResolution": "bundler"
+  },
+  "include": ["index.ts"],
+}

runtime/JavaScript/spec/imports/builds/node-esm-ts/tsconfig.node16.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "outDir": "./tsOutput",
+    "module": "node16",
+    "moduleResolution": "node16"
+  },
+  "include": ["index.ts"],
+}

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+
+package-lock.json

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/index.ts

@@ -0,0 +1,9 @@
+import { CharStream, ErrorListener } from "antlr4";
+
+const cs = new CharStream("OK");
+
+class MyErrorListener<T> extends ErrorListener<T> {
+
+}
+
+console.log(cs.toString());

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "test-import-pnpm-esm-ts",
+  "version": "1.0.0",
+  "packageManager": "pnpm@9.0.6",
+  "description": "",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "preinstall": "npx only-allow pnpm",
+    "test": "bash test.sh"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "antlr4": "file:../../../.."
+  },
+  "devDependencies": {
+    "typescript": "^5.4.5"
+  }
+}

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/test.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+tsconfigFiles=(
+  "tsconfig.node16.json"
+  "tsconfig.bundler.es2022.json"
+)
+
+failure=0
+
+for tsconfig in "${tsconfigFiles[@]}"; do
+  echo -n "$tsconfig "
+
+  ./node_modules/.bin/tsc -p $tsconfig || { failure=1 ; echo "FAIL tsc: $tsconfig"; }
+  result=$(node ./tsOutput/index.js)
+  [[ $result == "OK" ]] && echo "OK"
+  [[ $result != "OK" ]] && { failure=1 ; echo "FAIL loading runtime with config: $tsconfig"; }
+  rm -rf ./tsOutput
+done
+
+exit $failure

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/tsconfig.bundler.es2022.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "outDir": "./tsOutput",
+    "module": "es2022",
+    "moduleResolution": "bundler"
+  },
+  "include": ["index.ts"],
+}

runtime/JavaScript/spec/imports/builds/pnpm-esm-ts/tsconfig.node16.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "outDir": "./tsOutput",
+    "module": "node16",
+    "moduleResolution": "node16"
+  },
+  "include": ["index.ts"],
+}

runtime/JavaScript/src/antlr4/BufferedTokenStream.d.ts

@@ -1,5 +1,5 @@
-import { TokenStream } from './TokenStream';
-import { Lexer } from "./Lexer";
+import { TokenStream } from './TokenStream.js';
+import { Lexer } from "./Lexer.js";
 
 export declare class BufferedTokenStream extends TokenStream {
 

runtime/JavaScript/src/antlr4/CharStreams.d.ts

@@ -1,4 +1,4 @@
-import {CharStream} from "./CharStream";
+import {CharStream} from './CharStream.js';
 
 export declare class CharStreams {
     static fromString(data: string, decodeToUnicodeCodePoints?: boolean): CharStream;

runtime/JavaScript/src/antlr4/CommonToken.d.ts

@@ -1,6 +1,6 @@
-import { Token } from "./Token";
-import {InputStream} from "./InputStream";
-import {TokenSource} from "./TokenSource";
+import { Token } from './Token.js';
+import {InputStream} from './InputStream.js';
+import {TokenSource} from './TokenSource.js';
 
 export declare class CommonToken extends Token {
     constructor(source: [ TokenSource, InputStream ], type: number, channel: number, start: number, stop: number);

runtime/JavaScript/src/antlr4/CommonTokenStream.d.ts

@@ -1,6 +1,6 @@
-import {Lexer} from "./Lexer";
-import {BufferedTokenStream} from "./BufferedTokenStream";
-import {Token} from "./Token";
+import {Lexer} from './Lexer.js';
+import {BufferedTokenStream} from './BufferedTokenStream.js';
+import {Token} from './Token.js';
 
 export declare class CommonTokenStream extends BufferedTokenStream {
     // properties

runtime/JavaScript/src/antlr4/FileStream.d.ts

@@ -1,4 +1,4 @@
-import {CharStream} from "./CharStream";
+import {CharStream} from './CharStream.js';
 
 export declare class FileStream extends CharStream {
 

runtime/JavaScript/src/antlr4/Lexer.d.ts

@@ -1,7 +1,7 @@
-import {Recognizer} from "./Recognizer";
-import {LexerATNSimulator} from "./atn";
-import {CharStream} from "./CharStream";
-import {Token} from "./Token";
+import {Recognizer} from './Recognizer.js';
+import {LexerATNSimulator} from './atn/index.js';
+import {CharStream} from './CharStream.js';
+import {Token} from './Token.js';
 
 export declare class Lexer extends Recognizer<number> {
 

runtime/JavaScript/src/antlr4/Parser.d.ts

@@ -1,12 +1,12 @@
-import {TokenStream} from "./TokenStream";
-import {Recognizer} from "./Recognizer";
-import {ErrorStrategy, RecognitionException} from "./error";
-import {IntervalSet} from "./misc";
-import {ParserATNSimulator} from "./atn";
-import {Token} from "./Token";
-import {ParserRuleContext} from "./context";
-import {Printer} from "./utils";
-import {ParseTreeListener} from "./tree";
+import {TokenStream} from "./TokenStream.js";
+import {Recognizer} from "./Recognizer.js";
+import {ErrorStrategy, RecognitionException} from "./error/index.js";
+import {IntervalSet} from "./misc/index.js";
+import {ParserATNSimulator} from "./atn/index.js";
+import {Token} from "./Token.js";
+import {ParserRuleContext} from "./context/index.js";
+import {Printer} from "./utils/index.js";
+import {ParseTreeListener} from "./tree/index.js";
 
 export declare class Parser extends Recognizer<Token> {
 

runtime/JavaScript/src/antlr4/Recognizer.d.ts

@@ -1,4 +1,4 @@
-import {ErrorListener} from "./error";
+import {ErrorListener} from './error/index.js';
 
 export declare class Recognizer<TSymbol> {
 

runtime/JavaScript/src/antlr4/Token.d.ts

@@ -1,5 +1,5 @@
-import { TokenSource } from "./TokenSource";
-import { CharStream } from "./CharStream";
+import { TokenSource } from './TokenSource.js';
+import { CharStream } from './CharStream.js';
 
 export declare class Token {
 

runtime/JavaScript/src/antlr4/TokenStream.d.ts

@@ -1,5 +1,5 @@
-import {Interval} from "./misc";
-import {Token} from "./Token";
+import {Interval} from './misc/index.js';
+import {Token} from './Token.js';
 
 export declare class TokenStream {
 

runtime/JavaScript/src/antlr4/TokenStreamRewriter.d.ts

@@ -1,6 +1,6 @@
-import { CommonTokenStream } from "./CommonTokenStream";
-import { Token } from "./Token";
-import { Interval } from "./misc/Interval";
+import { CommonTokenStream } from './CommonTokenStream.js';
+import { Token } from './Token.js';
+import { Interval } from './misc/Interval.js';
 
 type Rewrites = Array<RewriteOperation | undefined>;
 type Text = unknown;

runtime/JavaScript/src/antlr4/atn/ATN.d.ts

@@ -1,6 +1,6 @@
-import {IntervalSet} from "../misc";
-import {RuleContext} from "../context";
-import {ATNState, DecisionState, RuleStartState, RuleStopState} from "../state";
+import {IntervalSet} from "../misc/index.js";
+import {RuleContext} from "../context/index.js";
+import {ATNState, DecisionState, RuleStartState, RuleStopState} from "../state/index.js";
 
 export declare class ATN {