clean up tsc build

.vscode/settings.json

@@ -120,7 +120,6 @@
         "unpkg.com"
     ],
     "files.readonlyInclude": {
-        "**/ts/gen/*": true,
         "**/dist/*": true,
         "**/aici-types.d.ts": true
     }

jsctrl/Cargo.toml

@@ -2,6 +2,7 @@
 name = "aici_jsctrl"
 version = "0.1.0"
 edition = "2021"
+build = "build.rs"
 
 [dependencies]
 aici_abi = { path = "../aici_abi" }

jsctrl/build.rs

@@ -0,0 +1,24 @@
+use std::process::Command;
+
+fn run(cmd: &mut Command, msg: &str) {
+    let status = cmd.status().expect(&format!("failed to execute: {msg}"));
+    if !status.success() {
+        panic!("process exited with status: {}; {}", status, msg);
+    }
+}
+
+fn main() {
+    if Command::new("tsc").arg("--version").status().is_err() {
+        println!("cargo:warning=typescript not found, installing...");
+        run(
+            Command::new("npm")
+                .arg("install")
+                .arg("-g")
+                .arg("typescript"),
+            "npm install failed",
+        );
+    }
+
+    run(Command::new("tsc").arg("-p").arg("ts"), "build failed");
+    run(Command::new("node").arg("gen-dts.mjs"), "gen-dts failed");
+}

jsctrl/gen-dts.mjs

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 function gen() {
     const ts = "./ts/"
     const native = fs.readFileSync(ts + '/native.d.ts', 'utf8')
-    let aici = fs.readFileSync(ts + '/gen/aici.d.ts', 'utf8')
+    let aici = fs.readFileSync(ts + '/dist/aici.d.ts', 'utf8')
     aici = aici.replace(/<reference path=".*/g, "")
     aici = aici.replace(/ declare /g, " ")
     aici = aici.replace(/^declare /mg, "")

jsctrl/samples/aici-types.d.ts

@@ -271,6 +271,9 @@ import { TokenSet, tokenize, detokenize, regexConstraint, cfgConstraint, substrC
 export { TokenSet, tokenize, detokenize, getVar, setVar, appendVar, eosToken };
 export type SeqId = number;
 type int = number;
+/**
+ * Return debug representation of the argument, suitable for printing in the console.
+ */
 export function inspect(v: any): string;
 export function log(...args: any[]): void;
 export class AssertionError extends Error {

jsctrl/src/jsctrl.rs

@@ -419,7 +419,7 @@ impl Runner {
             context: Context::full(&rt).unwrap(),
         };
 
-        let aici_js = include_str!("../ts/gen/aici.js");
+        let aici_js = include_str!("../ts/dist/aici.js");
 
         s.with_cb("_new", |ctx| {
             let global = ctx.globals();

jsctrl/ts/aici.ts

@@ -66,6 +66,9 @@ function dbgArg(arg: any, depth: number): string {
   }
 }
 
+/**
+ * Return debug representation of the argument, suitable for printing in the console.
+ */
 export function inspect(v: any) {
   return dbgArg(v, 0);
 }