[oden] Load typescript kinda

Cargo.toml

@@ -13,5 +13,11 @@ image = { version = "0.24", default-features = false, features = ["png"] }
 log = "0.4"
 oden-js = { path = "oden-js" }
 pollster = "0.3"
+swc_common = "0.31.16"
+swc_ecma_codegen = "0.141.10"
+swc_ecma_parser = "0.136.7"
+swc_ecma_transforms_base = "0.129.13"
+swc_ecma_transforms_typescript = "0.179.18"
+swc_ecma_visit = "0.92.5"
 wgpu = "0.16"
 winit = "0.28"

oden-js/src/conversion/into.rs

@@ -119,6 +119,7 @@ impl TryIntoValue for Error {
             Error::Exception(v, d) => Err(Error::Exception(v.dup(ctx), d)),
             Error::OutOfMemory => Err(Error::OutOfMemory),
             Error::IOError(e) => Err(Error::IOError(e)),
+            Error::ParseError(name, err) => Err(Error::ParseError(name, err)),
         }
     }
 }

oden-js/src/lib.rs

@@ -45,6 +45,8 @@ pub enum Error {
     OutOfMemory,
     #[error("an io error occurred: {0}")]
     IOError(std::io::Error),
+    #[error("one or more errors occurred parsing {0}: {1}")]
+    ParseError(String, String),
 }
 
 impl From<NulError> for Error {

src/graphics.js

@@ -1,15 +0,0 @@
-import * as core from "graphics-core";
-
-export function cls(r, g, b) {
-  core.cls(r, g, b);
-}
-
-export function print(...args) {
-  core.print(args.join(" "));
-}
-
-export function spr(x, y, w, h, sx, sy, sw = undefined, sh = undefined) {
-  sw = sw | w;
-  sh = sh | h;
-  core.spr(x, y, w, h, sx, sy, sw, sh);
-}

src/graphics.ts

@@ -0,0 +1,24 @@
+import * as core from "graphics-core";
+
+export function cls(r: number, g: number, b: number) {
+  core.cls(r, g, b);
+}
+
+export function print(...args: string[]) {
+  core.print(args.join(" "));
+}
+
+export function spr(
+  x: number,
+  y: number,
+  w: number,
+  h: number,
+  sx: number,
+  sy: number,
+  sw: number | undefined = undefined,
+  sh: number | undefined = undefined
+) {
+  sw = sw || w;
+  sh = sh || h;
+  core.spr(x, y, w, h, sx, sy, sw, sh);
+}

src/main.js

@@ -1,4 +1,4 @@
-import { cls, print, spr } from "./src/graphics.js";
+import { cls, print, spr } from "./src/graphics.ts";
 
 export function init() {
   print("Hello world!");

src/script.rs

@@ -1,16 +1,165 @@
 use oden_js::{
     module::loader::{ModuleLoader, ModuleSource},
-    Context, ContextRef, Result, Runtime, Value,
+    Context, ContextRef, Error, Result, Runtime, Value,
 };
+use std::cell::RefCell;
 use std::ffi::OsStr;
 use std::path::Path;
+use std::rc::Rc;
 use std::sync::mpsc::{channel, Receiver};
 
+use swc_common::{
+    self, comments::SingleThreadedComments, errors::Diagnostic, sync::Lrc, FileName, Globals, Mark,
+    SourceMap, GLOBALS,
+};
+use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
+use swc_ecma_parser::{lexer::Lexer, Parser, StringInput, Syntax};
+use swc_ecma_transforms_base::{fixer::fixer, hygiene::hygiene, resolver};
+use swc_ecma_transforms_typescript::strip;
+use swc_ecma_visit::FoldWith;
+
 pub mod graphics;
 use graphics::GraphicsCommand;
 
-fn transpile_to_javascript(_path: &str, input: String) -> Result<String> {
+struct DiagnosticCollector {
-    Ok(input)
+    cell: Rc<RefCell<Vec<Diagnostic>>>,
+}
+
+impl DiagnosticCollector {
+    pub fn into_handler(self) -> swc_common::errors::Handler {
+        swc_common::errors::Handler::with_emitter(true, false, Box::new(self))
+    }
+}
+
+impl swc_common::errors::Emitter for DiagnosticCollector {
+    fn emit(&mut self, db: &swc_common::errors::DiagnosticBuilder<'_>) {
+        use std::ops::Deref;
+        self.cell.borrow_mut().push(db.deref().clone());
+    }
+}
+
+fn is_fatal_swc_diagnostic(diagnostic: &Diagnostic) -> bool {
+    use swc_common::errors::Level;
+    match diagnostic.level {
+        Level::Bug
+        | Level::Cancelled
+        | Level::FailureNote
+        | Level::Fatal
+        | Level::PhaseFatal
+        | Level::Error => true,
+        Level::Help | Level::Note | Level::Warning => false,
+    }
+}
+fn format_swc_diagnostic(source_map: &SourceMap, diagnostic: &Diagnostic) -> String {
+    if let Some(span) = &diagnostic.span.primary_span() {
+        let file_name = source_map.span_to_filename(*span);
+        let loc = source_map.lookup_char_pos(span.lo);
+        format!(
+            "{} at {}:{}:{}",
+            diagnostic.message(),
+            file_name,
+            loc.line,
+            loc.col_display + 1,
+        )
+    } else {
+        diagnostic.message()
+    }
+}
+
+fn ensure_no_fatal_swc_diagnostics<'a>(
+    name: &str,
+    source_map: &SourceMap,
+    diagnostics: impl Iterator<Item = &'a Diagnostic>,
+) -> Result<()> {
+    let fatal_diagnostics = diagnostics
+        .filter(|d| is_fatal_swc_diagnostic(d))
+        .collect::<Vec<_>>();
+    if !fatal_diagnostics.is_empty() {
+        Err(Error::ParseError(
+            name.into(),
+            fatal_diagnostics
+                .iter()
+                .map(|d| format_swc_diagnostic(source_map, d))
+                .collect::<Vec<_>>()
+                .join("\n\n"),
+        ))
+    } else {
+        Ok(())
+    }
+}
+
+fn transpile_to_javascript(path: &str, input: String) -> Result<String> {
+    // NOTE: This was taken almost verbatim from
+    //       https://github.com/swc-project/swc/blob/main/crates/swc_ecma_transforms_typescript/examples/ts_to_js.rs
+    //       This appears to be similar to what deno_ast does, but this has
+    //       the advantage of actually compiling. :P
+    let cm: Lrc<SourceMap> = Default::default();
+    let diagnostics_cell: Rc<RefCell<Vec<Diagnostic>>> = Rc::new(RefCell::new(Vec::new()));
+    let handler = DiagnosticCollector {
+        cell: diagnostics_cell.clone(),
+    }
+    .into_handler();
+
+    let fm = cm.new_source_file(FileName::Custom(path.into()), input.into());
+    let comments = SingleThreadedComments::default();
+
+    let lexer = Lexer::new(
+        Syntax::Typescript(Default::default()),
+        Default::default(),
+        StringInput::from(&*fm),
+        Some(&comments),
+    );
+
+    let mut parser = Parser::new_from(lexer);
+
+    for e in parser.take_errors() {
+        e.into_diagnostic(&handler).emit();
+    }
+
+    let module = parser
+        .parse_module()
+        .map_err(|e| e.into_diagnostic(&handler).emit())
+        .expect("failed to parse module.");
+
+    let globals = Globals::default();
+    GLOBALS.set(&globals, || {
+        let unresolved_mark = Mark::new();
+        let top_level_mark = Mark::new();
+
+        // Optionally transforms decorators here before the resolver pass
+        // as it might produce runtime declarations.
+
+        // Conduct identifier scope analysis
+        let module = module.fold_with(&mut resolver(unresolved_mark, top_level_mark, true));
+
+        // Remove typescript types
+        let module = module.fold_with(&mut strip(top_level_mark));
+
+        // Fix up any identifiers with the same name, but different contexts
+        let module = module.fold_with(&mut hygiene());
+
+        // Ensure that we have enough parenthesis.
+        let module = module.fold_with(&mut fixer(Some(&comments)));
+
+        let mut buf = vec![];
+        {
+            let mut emitter = Emitter {
+                cfg: swc_ecma_codegen::Config {
+                    minify: false,
+                    ..Default::default()
+                },
+                cm: cm.clone(),
+                comments: Some(&comments),
+                wr: JsWriter::new(cm.clone(), "\n", &mut buf, None),
+            };
+
+            emitter.emit_module(&module).unwrap();
+        }
+
+        let diagnostics = diagnostics_cell.borrow();
+        ensure_no_fatal_swc_diagnostics(path, &cm, diagnostics.iter())?;
+        Ok(String::from_utf8(buf).expect("non-utf8?"))
+    })
 }
 
 struct Loader {}

tsconfig.json

@@ -0,0 +1,113 @@
+{
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "es2020",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "lib": [                                             /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+      "ES2020",
+    ],
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+    "moduleDetection": "force",                          /* Control what method is used to detect module-format JS files. */
+
+    /* Modules */
+    "module": "ES2020",                                  /* Specify what module code is generated. */
+    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    "typeRoots": [                                       /* Specify multiple folders that act like './node_modules/@types'. */
+      "./types",
+    ],
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+    "allowImportingTsExtensions": true,                  /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
+    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
+    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
+    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
+    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    "allowJs": true,                                     /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    "checkJs": true,                                     /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+
+    /* Emit */
+    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    // "removeComments": true,                           /* Disable emitting comments. */
+    "noEmit": true,                                      /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+  }
+}

types/graphics-core.d.ts

@@ -0,0 +1,12 @@
+export function cls(r: number, g: number, b: number);
+export function print(msg: string);
+export function spr(
+  x: number,
+  y: number,
+  w: number,
+  h: number,
+  sx: number,
+  sy: number,
+  sw: number,
+  sh: number
+);