Merge pull request #61 from kaleidawave/parser-position-improvements

Tokens use start positions rather than Spans

.github/workflows/rust.yml

@@ -34,6 +34,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
+
       - uses: actions/cache@v3
         with:
           path: ${{ env.CACHE_PATHS }}
@@ -45,6 +46,19 @@ jobs:
       - name: Check binary
         run: cargo check --bin ezno
 
+      - uses: brndnmtthws/rust-action-cargo-binstall@v1
+        with:
+          packages: [email protected]
+      - name: Check binary WASM
+        run: |
+          rustup target add wasm32-unknown-unknown
+          npm run check
+        working-directory: src/js-cli-and-library
+
+      - name: Check parser without extras
+        run: 
+          cargo check -p ezno-parser --no-default-features
+
   formating:
     runs-on: ubuntu-latest
     steps:
@@ -89,7 +103,12 @@ jobs:
 
       - name: Run parser tests
         if: steps.changes.outputs.parser == 'true'
-        run: cargo test
+        run: |
+          cargo test
+
+          # TODO test other big libraries
+          curl https://esm.sh/v128/[email protected]/es2022/react-dom.mjs > react.js
+          cargo run -p ezno-parser --example parse react.js
         working-directory: parser
 
       - name: Run checker specification
@@ -100,6 +119,24 @@ jobs:
       - name: Run base tests
         run: cargo test
 
+      - uses: brndnmtthws/rust-action-cargo-binstall@v1
+        with:
+          packages: [email protected]
+
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+      - name: Build and test WASM
+        run: |
+          rustup target add wasm32-unknown-unknown
+          npm ci
+          npm run test
+          node ./dist/cli.cjs info
+          deno run -A ./dist/cli.mjs info
+        working-directory: src/js-cli-and-library
+        shell: bash
+
   fuzzing:
     needs: validity
     runs-on: ubuntu-latest
@@ -159,51 +196,6 @@ jobs:
       - name: Lint code with clippy
         run: cargo clippy
 
-  wasm-test:
-    needs: validity
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHE_PATHS }}
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - uses: brndnmtthws/rust-action-cargo-binstall@v1
-        with:
-          packages: [email protected]
-
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.x
-
-      - name: Build
-        run: |
-          rustup target add wasm32-unknown-unknown
-          npm ci
-          npm run build
-        working-directory: src/js-cli-and-library
-        shell: bash
-
-      - name: Test modules
-        run: |
-          node test.mjs
-          deno run -A test.mjs
-          node test.cjs
-        working-directory: src/js-cli-and-library
-        shell: bash
-
-      - name: Check CLI works
-        run: |
-          node ./dist/cli.cjs info
-          deno run -A ./dist/cli.mjs info
-        working-directory: src/js-cli-and-library
-        shell: bash
-
   publish-ability:
     runs-on: ubuntu-latest
     steps:

Cargo.toml

@@ -5,6 +5,8 @@ members = [
     "parser/generator",
     "checker",
     "checker/binary-serialize-derive",
+    # "lsp/server",
+    # "checker/specification"
 ]
 
 [package]
@@ -44,6 +46,8 @@ codespan-reporting = "0.11.1"
 argh = "0.1.6"
 base64 = "0.13.0"
 enum-variants-strings = "0.2.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.107"
 
 [dependencies.parser]
 path = "./parser"
@@ -53,8 +57,8 @@ package = "ezno-parser"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 wasm-bindgen = "=0.2.87"
-serde = { version = "1.0", features = ["derive"] }
 serde-wasm-bindgen = "0.5.0"
+console_error_panic_hook = "0.1.7"
 js-sys = "0.3"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]

checker/Cargo.toml

@@ -17,7 +17,7 @@ default = []
 ezno-parser = ["parser"]
 
 [dependencies]
-source-map = { version = "0.13", features = ["span-serialize"] }
+source-map = { version = "0.14.2", features = ["serde-serialize"] }
 
 binary-serialize-derive = { path = "./binary-serialize-derive", version = "0.0.1" }
 

checker/definitions/internal.d.ts

@@ -35,7 +35,8 @@ interface Math {
 }
 
 interface string {
-    toUppercase(): string performs const uppercase;
+    toUpperCase(): string performs const uppercase;
+    toLowerCase(): string performs const lowercase;
 }
 
 interface Console {

checker/specification/specification.md

@@ -410,7 +410,7 @@ const z: false = true || 4
 #### String operations
 
 ```ts
-"hi".toUppercase() satisfies number
+"hi".toUpperCase() satisfies number
 ```
 
 - Expected number, found "HI"

checker/specification/test.rs

@@ -30,17 +30,12 @@ fn check_errors(
 	code: &'static str,
 	expected_diagnostics: &[&'static str],
 ) {
-	let mut fs = parser::source_map::MapFileStore::default();
+	let mut fs = parser::source_map::MapFileStore::<parser::source_map::NoPathMap>::default();
 	let source =
 		parser::source_map::FileSystem::new_source_id(&mut fs, PathBuf::default(), code.to_owned());
-	let module = parser::Module::from_string(
-		code.to_owned(),
-		parser::ParseOptions::default(),
-		source,
-		None,
-		Vec::new(),
-	)
-	.unwrap();
+	let module =
+		parser::Module::from_string(code.to_owned(), parser::ParseOptions::default(), source, None)
+			.unwrap();
 
 	// let global_buffer = Arc::new(Mutex::new(String::new()));
 	// let old_panic_hook = panic::take_hook();