Add support for static inner classes

.eslintrc.json

@@ -11,7 +11,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": "tsconfig.json",
+    "project": ["tsconfig.json", "tsconfig.conductor.json"],
     "sourceType": "module"
   },
   "plugins": [

.github/workflows/build-deploy.yml

@@ -0,0 +1,58 @@
+name: Build and deploy runner
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build runner
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Typecheck conductor evaluator
+        run: yarn typecheck:conductor
+
+      - name: Test conductor evaluator
+        run: yarn test:conductor
+
+      - name: Build conductor evaluator bundle
+        run: yarn build:conductor
+
+      - name: Upload artifacts
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist-conductor/
+
+  deploy:
+    needs: build
+    name: Deploy runner
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1,5 +1,6 @@
 # compiled output
 /dist
+/dist-conductor
 /node_modules
 tsconfig.tsbuildinfo
 

jest.conductor.config.mjs

@@ -0,0 +1,9 @@
+/** @type {import('jest').Config} */
+export default {
+  testEnvironment: 'node',
+  testMatch: ['<rootDir>/src/conductor/**/*.test.ts'],
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.tsx?$': ['ts-jest', { useESM: true, tsconfig: '<rootDir>/tsconfig.conductor.json' }]
+  }
+}

jest.config.js

@@ -5,6 +5,7 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/node_modules/',
     '<rootDir>/src/compiler/__tests__/tests/',
+    '<rootDir>/src/conductor/',
     '__utils__'
   ]
 }

package.json

@@ -14,14 +14,22 @@
   "scripts": {
     "build": "tsc --build --force",
     "build:lib-info": "tsc --build --force && node dist/compiler/import/build-lib-info.js",
+    "build:conductor": "rollup -c rollup.config.conductor.mjs",
+    "typecheck:conductor": "tsc --noEmit -p tsconfig.conductor.json",
     "test": "jest",
     "test:watch": "jest --watch",
+    "test:conductor": "node --experimental-vm-modules node_modules/.bin/jest --config jest.conductor.config.mjs",
     "jsdoc": "typedoc --plugin typedoc-plugin-rename-defaults",
     "eslint": "ESLINT_USE_FLAT_CONFIG=false eslint --ext \".ts\" src",
     "format": "prettier --write src/**/*.ts",
     "prepare": "husky"
   },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^29.0.3",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^1.0.0",
+    "@rollup/plugin-typescript": "^12.3.0",
     "@types/jest": "^29.5.4",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -32,13 +40,16 @@
     "jest": "^29.6.4",
     "jest-environment-jsdom": "^29.6.4",
     "prettier": "^3.2.5",
+    "rollup": "^4.63.5",
     "ts-jest": "^29.1.1",
+    "tslib": "^2.8.1",
     "typedoc": "^0.25.12",
     "typedoc-plugin-markdown": "^3.17.1",
     "typedoc-plugin-rename-defaults": "^0.7.0",
     "typescript": "^5.2.2"
   },
   "dependencies": {
+    "@sourceacademy/conductor": "^0.8.3",
     "@types/lodash": "^4.14.198",
     "java-parser": "^2.0.5",
     "lodash": "^4.17.21",

rollup.config.conductor.mjs

@@ -0,0 +1,21 @@
+import commonjs from '@rollup/plugin-commonjs'
+import json from '@rollup/plugin-json'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import terser from '@rollup/plugin-terser'
+import typescript from '@rollup/plugin-typescript'
+
+export default {
+  input: 'src/conductor/initialise.ts',
+  output: {
+    file: 'dist-conductor/index.js',
+    format: 'iife',
+    sourcemap: true
+  },
+  plugins: [
+    nodeResolve(),
+    commonjs(),
+    json(),
+    typescript({ tsconfig: 'tsconfig.conductor.json', outDir: undefined, declaration: false }),
+    terser()
+  ]
+}

src/ast/__tests__/class-extractor.test.ts

@@ -124,3 +124,39 @@ describe("extract multiple NormalClassDeclaration correctly", () => {
     expect(ast).toEqual(expectedAst);
   });
 });
+
+describe("extract nested NormalClassDeclaration correctly", () => {
+  it("extract a static nested class inside a class body correctly", () => {
+    const programStr = `
+      class Outer {
+        static class Inner {}
+      }
+    `;
+
+    const expectedAst: AST = {
+      kind: "CompilationUnit",
+      importDeclarations: [],
+      topLevelClassOrInterfaceDeclarations: [
+        {
+          kind: "NormalClassDeclaration",
+          classModifier: [],
+          typeIdentifier: "Outer",
+          classBody: [
+            {
+              kind: "NormalClassDeclaration",
+              classModifier: ["static"],
+              typeIdentifier: "Inner",
+              classBody: [],
+              location: expect.anything(),
+            },
+          ],
+          location: expect.anything(),
+        },
+      ],
+      location: expect.anything(),
+    };
+
+    const ast = parse(programStr);
+    expect(ast).toEqual(expectedAst);
+  });
+});

src/ast/astExtractor/class-extractor.ts

@@ -91,5 +91,12 @@ export class ClassExtractor extends BaseJavaCstVisitorWithDefaults {
         this.body.push(methodNode);
       })
     }
+    if (ctx.classDeclaration) {
+      ctx.classDeclaration.forEach(x => {
+        const classExtractor = new ClassExtractor();
+        const classNode = classExtractor.extract(x);
+        this.body.push(classNode);
+      })
+    }
   }
 }

src/ast/types/classes.ts

@@ -43,7 +43,7 @@ export type ClassModifier =
   | "strictfp"
   | "enum";
 
-export type ClassBodyDeclaration = ClassMemberDeclaration | ConstructorDeclaration | EnumDeclaration;
+export type ClassBodyDeclaration = ClassMemberDeclaration | ConstructorDeclaration | EnumDeclaration | NormalClassDeclaration;
 export type ClassMemberDeclaration = MethodDeclaration | FieldDeclaration;
 
 export interface ConstructorDeclaration extends BaseNode {

src/compiler/__tests__/classOrdering.test.ts

@@ -11,7 +11,7 @@ describe('compiled class ordering', () => {
       }
     `
     const classes = compileFromSource(program)
-    expect(classes.map(c => c.className)).toEqual(['Main', 'Day'])
+    expect(classes.map(c => c.className)).toEqual(['Main', 'Main$Day'])
   })
 
   it('keeps top-level declaration order, with member enums appended', () => {
@@ -24,7 +24,9 @@ describe('compiled class ordering', () => {
     `
     const classes = compileFromSource(program)
     expect(classes[0].className).toBe('Main')
-    expect(new Set(classes.map(c => c.className))).toEqual(new Set(['Main', 'A', 'B']))
+    expect(new Set(classes.map(c => c.className))).toEqual(
+      new Set(['Main', 'Main$A', 'Main$B'])
+    )
   })
 
   it('is unchanged when there is no enum', () => {

src/compiler/__tests__/index.ts

@@ -10,6 +10,7 @@ import { importTest } from "./tests/import.test";
 import { arrayTest } from "./tests/array.test";
 import { classTest } from "./tests/class.test";
 import { enumTest } from "./tests/enum.test";
+import { nestedClassesTest } from "./tests/nestedClasses.test";
 import { typeConversionTest } from "./tests/typeConversion.test";
 
 describe("compiler tests", () => {
@@ -25,5 +26,6 @@ describe("compiler tests", () => {
   arrayTest();
   classTest();
   enumTest();
+  nestedClassesTest();
   typeConversionTest();
 })

src/compiler/__tests__/tests/class.test.ts

@@ -103,6 +103,19 @@ const testCases: testCase[] = [
     `,
     expectedLines: ["in f"],
   },
+  {
+    comment: "instance field with an inline initializer",
+    program: `
+      public class Main {
+        public int one = 1;
+        public static void main(String[] args) {
+          Main m = new Main();
+          System.out.println(m.one);
+        }
+      }
+    `,
+    expectedLines: ["1"],
+  },
   {
     comment: "instance field",
     program: `