Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/generated/ast_changes_watch_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ src:
- 'crates/oxc_syntax/src/serialize.rs'
- 'crates/oxc_syntax/src/symbol.rs'
- 'crates/oxc_traverse/src/generated/scopes_collector.rs'
- 'napi/parser/deserialize-js.js'
- 'napi/parser/deserialize-ts.js'
- 'napi/parser/generated/deserialize/js.js'
- 'napi/parser/generated/deserialize/ts.js'
- 'napi/parser/src/generated/assert_layouts.rs'
- 'napi/parser/src/generated/derive_estree.rs'
- 'napi/parser/src/raw_transfer_types.rs'
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions napi/parser/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const bindings = require('./bindings.js');
const deserializeJS = require('./deserialize-js.js');
const deserializeTS = require('./deserialize-ts.js');
const deserializeJS = require('./generated/deserialize/js.js');
const deserializeTS = require('./generated/deserialize/ts.js');
const { wrap } = require('./wrap.cjs');

module.exports.ParseResult = bindings.ParseResult;
Expand Down
4 changes: 2 additions & 2 deletions napi/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"wasm.mjs",
"bindings.js",
"webcontainer-fallback.js",
"deserialize-js.js",
"deserialize-ts.js"
"generated/deserialize/js.js",
"generated/deserialize/ts.js"
],
"publishConfig": {
"registry": "https://registry.npmjs.org/",
Expand Down
12 changes: 9 additions & 3 deletions tasks/ast_tools/src/generators/raw_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use lazy_regex::{Captures, Lazy, Regex, lazy_regex, regex::Replacer};
use rustc_hash::FxHashSet;

use crate::{
Generator, RAW_TRANSFER_JS_DESERIALIZER_PATH, RAW_TRANSFER_TS_DESERIALIZER_PATH,
Generator, NAPI_PARSER_PACKAGE_PATH,
codegen::{Codegen, DeriveId},
derives::estree::{
get_fieldless_variant_value, get_struct_field_name, should_flatten_field,
Expand Down Expand Up @@ -39,8 +39,14 @@ impl Generator for RawTransferGenerator {
fn generate_many(&self, schema: &Schema, codegen: &Codegen) -> Vec<Output> {
let Codes { js, ts, .. } = generate_deserializers(schema, codegen);
vec![
Output::Javascript { path: RAW_TRANSFER_JS_DESERIALIZER_PATH.to_string(), code: js },
Output::Javascript { path: RAW_TRANSFER_TS_DESERIALIZER_PATH.to_string(), code: ts },
Output::Javascript {
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/js.js"),
code: js,
},
Output::Javascript {
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/ts.js"),
code: ts,
},
]
}
}
Expand Down
5 changes: 2 additions & 3 deletions tasks/ast_tools/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,8 @@ const TRAVERSE_CRATE_PATH: &str = "crates/oxc_traverse";
/// Path to write TS type definitions to
const TYPESCRIPT_DEFINITIONS_PATH: &str = "npm/oxc-types/types.d.ts";

// Paths to write raw deserializer to
const RAW_TRANSFER_JS_DESERIALIZER_PATH: &str = "napi/parser/deserialize-js.js";
const RAW_TRANSFER_TS_DESERIALIZER_PATH: &str = "napi/parser/deserialize-ts.js";
/// Path to NAPI parser package
const NAPI_PARSER_PACKAGE_PATH: &str = "napi/parser";

/// Path to write AST changes filter list to
const AST_CHANGES_WATCH_LIST_PATH: &str = ".github/generated/ast_changes_watch_list.yml";
Expand Down
Loading