daniqss · daniqss · Mar 1, 2026 · Mar 1, 2026 · Mar 1, 2026
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -27,6 +27,13 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-25.11
 
+      - name: Run interpreter tests
+        run: |
+          nix develop --command bash -c "
+            cd interpreter
+            npm run test
+          "
+
       - name: Build site
         env:
           STEPCODE_ENV: production

diff --git a/interpreter/cli.js b/interpreter/cli.js
@@ -18,7 +18,15 @@
 
 import fs from 'fs';
 import readline from 'readline';
-import { parse, step } from '../static/js/index.js';
+import { Lexer } from './static/lexer.js';
+import { Parser } from './static/parser.js';
+import { step } from './static/interpreter.js';
+
+function parse(input) {
+  const lexer = new Lexer(input);
+  const parser = new Parser(lexer.tokenize());
+  return parser.parse();
+}
 
 const file = process.argv[2];
 

diff --git a/static/js/interpreter.js → interpreter/static/interpreter.js b/static/js/interpreter.js → interpreter/static/interpreter.js
diff --git a/static/js/lexer.js → interpreter/static/lexer.js b/static/js/lexer.js → interpreter/static/lexer.js
diff --git a/static/js/parser.js → interpreter/static/parser.js b/static/js/parser.js → interpreter/static/parser.js
diff --git a/interpreter/tests/interpreter.test.js b/interpreter/tests/interpreter.test.js
@@ -1,6 +1,14 @@
 import { test } from 'node:test';
 import * as assert from 'node:assert';
-import { step, parse } from '../../static/js/index.js';
+import { Lexer } from '../static/lexer.js';
+import { Parser } from '../static/parser.js';
+import { step } from '../static/interpreter.js';
+
+function parse(input) {
+  const lexer = new Lexer(input);
+  const parser = new Parser(lexer.tokenize());
+  return parser.parse();
+}
 
 test('Interpreter: basic assignment and arithmetic', () => {
   const ast = parse(`

diff --git a/interpreter/tests/parser.test.js b/interpreter/tests/parser.test.js
@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import * as assert from 'node:assert';
-import { Lexer } from '../../static/js/lexer.js';
-import { Parser } from '../../static/js/parser.js';
+import { Lexer } from '../static/lexer.js';
+import { Parser } from '../static/parser.js';
 
 test('Lexer: basic tokenization', () => {
   const input = `n := 4

diff --git a/src/generate.py b/src/generate.py
@@ -29,6 +29,7 @@
 </head>
 <body>
     <nav>
+        <a href="{index_path}"><h2>Index</h2></a>
         <h3>Table of Contents</h3>
         {nav_tree}
     </nav>
@@ -226,7 +227,8 @@ def process_node(node, output_root, site_root, flat_tree, current_path=''):
         os.makedirs(os.path.dirname(output_file), exist_ok=True)
 
         css_relative_path = get_asset_path(node.path, 'static/base.css')
-        js_relative_path = get_asset_path(node.path, 'static/js/index.js')
+        js_relative_path = get_asset_path(node.path, 'static/index.js')
+        index_relative_path = get_asset_path(node.path, 'index.html')
 
         nav_html = render_nav_tree(site_root, node.path)
 
@@ -262,6 +264,7 @@ def process_node(node, output_root, site_root, flat_tree, current_path=''):
                 content=node.page.render(),
                 css_path=css_relative_path,
                 js_path=js_relative_path,
+                index_path=index_relative_path,
                 nav_tree=nav_html,
                 navigation=navigation_html,
                 FOOTER=FOOTER,
@@ -281,8 +284,24 @@ def write_output(root_node: DirNode, output_path: str) -> None:
     flat_tree = flatten_tree(root_node)
     process_node(root_node, output_path, root_node, flat_tree)
 
+    static_dest = os.path.join(output_path, 'static')
+    os.makedirs(static_dest, exist_ok=True)
+
     if os.path.exists('static'):
-        shutil.copytree('static', os.path.join(output_path, 'static'))
-        print('copied static directory')
+        for filename in ['base.css', 'index.js']:
+            src = os.path.join('static', filename)
+            if os.path.exists(src):
+                shutil.copy2(src, os.path.join(static_dest, filename))
+        print('copied base.css and index.js from static directory')
     else:
         print('Warning: static directory not found in root directory')
+
+    interpreter_static = os.path.join('interpreter', 'static')
+    if os.path.exists(interpreter_static):
+        for filename in os.listdir(interpreter_static):
+            src = os.path.join(interpreter_static, filename)
+            if os.path.isfile(src):
+                shutil.copy2(src, os.path.join(static_dest, filename))
+        print('copied interpreter files from interpreter/static')
+    else:
+        print('Warning: interpreter/static directory not found')
diff --git a/static/js/index.js → static/index.js b/static/js/index.js → static/index.js