Ast typegen

.github/workflows/publish.yml

@@ -95,7 +95,7 @@ jobs:
       - uses: brndnmtthws/rust-action-cargo-binstall@v1
         if: ${{ inputs.ezno-version != 'none' }}
         with:
-          packages: wasm-bindgen-cli@0.2.89
+          packages: wasm-pack@0.12.1
 
       - name: Set NPM package version & build
         id: set-npm-version

.github/workflows/rust.yml

@@ -139,7 +139,7 @@ jobs:
       - uses: brndnmtthws/rust-action-cargo-binstall@v1
         if: steps.changes.outputs.src == 'true'
         with:
-          packages: wasm-bindgen-cli@0.2.89
+          packages: wasm-pack@0.12.1
       - uses: denoland/setup-deno@v1
         if: steps.changes.outputs.src == 'true'
         with:
@@ -158,9 +158,19 @@ jobs:
           rustup target add wasm32-unknown-unknown
           npm ci
           npm run build
-          npm run test
+          npm run run-tests
+
           node ./dist/cli.cjs info
           deno run -A ./dist/cli.mjs info
+
+          npx -p typescript tsc --strict --pretty ./build/ezno_lib.d.ts
+
+          # TODO temp as the types generated can be a bit unpredicatible
+          echo "::debug::On branch '${{ github.ref_name }}'"
+          if ${{ contains(fromJSON('["main", "ast-typegen-direct"]'), github.ref_name ) }}; then
+            npm run build-release
+            npx -p typescript tsc --strict --pretty ./build/ezno_lib.d.ts
+          fi
         working-directory: src/js-cli-and-library
         shell: bash
 

Cargo.toml

@@ -80,7 +80,10 @@ wasm-bindgen-derive = "0.2.1"
 serde-wasm-bindgen = "0.6.3"
 console_error_panic_hook = "0.1.7"
 js-sys = "0.3"
+tsify = "0.4.5"
+
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 multiline-term-input = "0.1.0"
 notify = "6.1.0"
+

checker/Cargo.toml

@@ -21,7 +21,7 @@ ezno-parser = ["dep:parser"]
 serde-serialize = ["dep:serde"]
 
 [dependencies]
-source-map = { version = "0.14.9", features = [
+source-map = { version = "0.14.10", features = [
   "serde-serialize",
   "self-rust-tokenize",
 ] }
@@ -47,6 +47,11 @@ map_vec = "0.3.0"
 
 serde = { version = "1.0", features = ["derive"], optional = true }
 
+[target.'cfg(target_family = "wasm")'.dependencies]
+tsify = "0.4.5"
+wasm-bindgen = "=0.2.89"
+
+
 [dependencies.parser]
 path = "../parser"
 optional = true

checker/src/diagnostics.rs

@@ -19,6 +19,7 @@ use std::{
 
 #[derive(Debug, Clone, Copy)]
 #[cfg_attr(feature = "serde-serialize", derive(serde::Serialize), serde(rename_all = "lowercase"))]
+#[cfg_attr(target_family = "wasm", derive(tsify::Tsify))]
 pub enum DiagnosticKind {
 	Error,
 	Warning,
@@ -28,6 +29,7 @@ pub enum DiagnosticKind {
 /// Contains information
 #[derive(Debug)]
 #[cfg_attr(feature = "serde-serialize", derive(serde::Serialize), serde(untagged))]
+#[cfg_attr(target_family = "wasm", derive(tsify::Tsify))]
 pub enum Diagnostic {
 	/// Does not have positional information
 	Global {
@@ -103,6 +105,7 @@ impl Diagnostic {
 /// TODO this is one variant, others should pipe strait to stdout or put it on a channel etc
 #[derive(Default)]
 #[cfg_attr(feature = "serde-serialize", derive(serde::Serialize), serde(transparent))]
+#[cfg_attr(target_family = "wasm", derive(tsify::Tsify))]
 pub struct DiagnosticsContainer {
 	diagnostics: Vec<Diagnostic>,
 	// Quick way to check whether a error was added

checker/src/options.rs

@@ -1,6 +1,7 @@
 /// Options for type checking
 /// TODO figure out compat with tsc
 #[cfg_attr(feature = "serde-serialize", derive(serde::Deserialize), serde(default))]
+#[cfg_attr(target_family = "wasm", derive(tsify::Tsify))]
 #[allow(clippy::struct_excessive_bools)]
 pub struct TypeCheckOptions {
 	/// Parameters cannot be reassigned

checker/src/synthesis/classes.rs

@@ -64,7 +64,11 @@ pub(super) fn synthesise_class_declaration<
 		match &member.on {
 			ClassMember::Method(false, method) => {
 				let publicity = match method.name.get_ast_ref() {
-					ParserPropertyKey::Ident(_, _, true) => Publicity::Private,
+					ParserPropertyKey::Ident(
+						_,
+						_,
+						parser::property_key::PublicOrPrivate::Private,
+					) => Publicity::Private,
 					_ => Publicity::Public,
 				};
 				let property_key = parser_property_key_to_checker_property_key(
@@ -109,7 +113,11 @@ pub(super) fn synthesise_class_declaration<
 			}
 			ClassMember::Property(false, property) => {
 				let publicity = match property.key.get_ast_ref() {
-					ParserPropertyKey::Ident(_, _, true) => Publicity::Private,
+					ParserPropertyKey::Ident(
+						_,
+						_,
+						parser::property_key::PublicOrPrivate::Private,
+					) => Publicity::Private,
 					_ => Publicity::Public,
 				};
 				let key = parser_property_key_to_checker_property_key(
@@ -160,7 +168,11 @@ pub(super) fn synthesise_class_declaration<
 		match &member.on {
 			ClassMember::Method(true, method) => {
 				let publicity_kind = match method.name.get_ast_ref() {
-					ParserPropertyKey::Ident(_, _, true) => Publicity::Private,
+					ParserPropertyKey::Ident(
+						_,
+						_,
+						parser::property_key::PublicOrPrivate::Private,
+					) => Publicity::Private,
 					_ => Publicity::Public,
 				};
 				let behavior = FunctionRegisterBehavior::ClassMethod {
@@ -193,7 +205,11 @@ pub(super) fn synthesise_class_declaration<
 			}
 			ClassMember::Property(true, property) => {
 				let publicity_kind = match property.key.get_ast_ref() {
-					ParserPropertyKey::Ident(_, _, true) => Publicity::Private,
+					ParserPropertyKey::Ident(
+						_,
+						_,
+						parser::property_key::PublicOrPrivate::Private,
+					) => Publicity::Private,
 					_ => Publicity::Public,
 				};
 				let value = if let Some(ref value) = property.value {

checker/src/synthesis/functions.rs

@@ -507,7 +507,7 @@ fn param_name_to_string(param: &VariableField<parser::VariableFieldInSourceCode>
 					}
 					parser::ObjectDestructuringField::Map { from, name, .. } => {
 						match from {
-							parser::PropertyKey::Ident(ident, _, ()) => {
+							parser::PropertyKey::Ident(ident, _, _) => {
 								buf.push_str(ident);
 							}
 							parser::PropertyKey::StringLiteral(_, _, _) => todo!(),

checker/src/synthesis/interfaces.rs

@@ -70,7 +70,14 @@ impl SynthesiseInterfaceBehavior for OnToType {
 	) {
 		let (publicity, under) = match key {
 			ParserPropertyKeyType::ClassProperty(key) => (
-				if matches!(key, parser::PropertyKey::Ident(_, _, true)) {
+				if matches!(
+					key,
+					parser::PropertyKey::Ident(
+						_,
+						_,
+						parser::property_key::PublicOrPrivate::Private
+					)
+				) {
 					Publicity::Private
 				} else {
 					Publicity::Public

parser/Cargo.toml

@@ -45,10 +45,12 @@ enum-variants-strings = "0.2"
 
 get-field-by-type = "0.0.3"
 
+macro_rules_attribute = { version = "0.2.0" }
+
 serde = { version = "1.0", features = ["derive"], optional = true }
 self-rust-tokenize = { version = "0.3.3", optional = true }
 
-source-map = { version = "0.14.9", features = [
+source-map = { version = "0.14.10", features = [
   "serde-serialize",
   "self-rust-tokenize",
 ] }
@@ -59,6 +61,8 @@ tokenizer-lib = { version = "1.5.1", features = [
   "buffered",
   "sized-tokens",
 ], default_features = false }
+tsify = "0.4.5"
+wasm-bindgen = "=0.2.89"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokenizer-lib = { version = "1.5.1", features = [