diff --git a/.github/generated/ast_changes_watch_list.yml b/.github/generated/ast_changes_watch_list.yml index bd9fae0f21089..01069b37f1896 100644 --- a/.github/generated/ast_changes_watch_list.yml +++ b/.github/generated/ast_changes_watch_list.yml @@ -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' diff --git a/napi/parser/deserialize-js.js b/napi/parser/generated/deserialize/js.js similarity index 100% rename from napi/parser/deserialize-js.js rename to napi/parser/generated/deserialize/js.js diff --git a/napi/parser/deserialize-ts.js b/napi/parser/generated/deserialize/ts.js similarity index 100% rename from napi/parser/deserialize-ts.js rename to napi/parser/generated/deserialize/ts.js diff --git a/napi/parser/index.js b/napi/parser/index.js index cb39a4ab6bf10..c24d13250fdae 100644 --- a/napi/parser/index.js +++ b/napi/parser/index.js @@ -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; diff --git a/napi/parser/package.json b/napi/parser/package.json index 7d4e3ced30f52..dbc04eab6ad48 100644 --- a/napi/parser/package.json +++ b/napi/parser/package.json @@ -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/", diff --git a/tasks/ast_tools/src/generators/raw_transfer.rs b/tasks/ast_tools/src/generators/raw_transfer.rs index 968233d40b014..05f84c9280ad4 100644 --- a/tasks/ast_tools/src/generators/raw_transfer.rs +++ b/tasks/ast_tools/src/generators/raw_transfer.rs @@ -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, @@ -39,8 +39,14 @@ impl Generator for RawTransferGenerator { fn generate_many(&self, schema: &Schema, codegen: &Codegen) -> Vec { 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, + }, ] } } diff --git a/tasks/ast_tools/src/main.rs b/tasks/ast_tools/src/main.rs index 40d0cddab4f89..9ef0d53650bf6 100644 --- a/tasks/ast_tools/src/main.rs +++ b/tasks/ast_tools/src/main.rs @@ -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";