Merge branch 'antlr:dev' into dev

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11 AS builder
+FROM eclipse-temurin:21 AS builder
 
 WORKDIR /opt/antlr4
 
@@ -14,23 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install maven git -
     && mvn -DskipTests install --projects tool --also-make \
     && mv ./tool/target/antlr4-*-complete.jar antlr4-tool.jar
 
-FROM eclipse-temurin:11-jre
-
-ARG user=appuser
-ARG group=appuser
-ARG uid=1000
-ARG gid=1000
-
-RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --no-create-home \
-    --uid "${uid}" \
-    "${user}"
+FROM eclipse-temurin:21-jre
 
 COPY --from=builder /opt/antlr4/antlr4/antlr4-tool.jar /usr/local/lib/
 WORKDIR /work
 ENTRYPOINT ["java", "-Xmx500M", "-cp", "/usr/local/lib/antlr4-tool.jar", "org.antlr.v4.Tool"]
-
-

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/TypeScript.test.stg

@@ -1,5 +1,5 @@
-writeln(s) ::= <<console.log(<s> || '');>>
-write(s) ::= <<process.stdout.write(<s> || '');>>
+writeln(s) ::= <<console.log(<s>);>>
+write(s) ::= <<process.stdout.write(<s>);>>
 writeList(s) ::= <<console.log(<s; separator="+">);>>
 
 False() ::= "false"

runtime/JavaScript/package.json

@@ -47,7 +47,8 @@
   },
   "scripts": {
     "build": "webpack",
-    "test": "jasmine",
+    "test": "jasmine && npm run test:builds",
+    "test:builds": "bash test-builds.sh",
     "coverage": "c8 jasmine",
     "lint": "eslint src/antlr4/"
   },

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/test-builds.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd spec/imports/builds/node-esm-ts
+npm run test
+cd ../node-cjs-ts
+npm run test