From 9ae081590d7feea15fe08f6d7928db6a13278709 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Sun, 6 Jul 2025 11:29:05 +0000 Subject: [PATCH] refactor(napi/parser): move files (#12088) Pure refactor. Move generated files for lazy deserialization into a separate directory from generated files for raw transfer. --- .github/generated/ast_changes_watch_list.yml | 6 +++--- napi/parser/bench.bench.mjs | 2 +- .../{deserialize/lazy.js => lazy/constructors.js} | 0 .../{deserialize/lazy-types.js => lazy/types.js} | 0 .../generated/{deserialize/lazy-visit.js => lazy/walk.js} | 2 +- napi/parser/package.json | 6 +++--- napi/parser/raw-transfer/lazy.js | 4 ++-- napi/parser/raw-transfer/visitor.js | 2 +- tasks/ast_tools/src/generators/raw_transfer_lazy.rs | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) rename napi/parser/generated/{deserialize/lazy.js => lazy/constructors.js} (100%) rename napi/parser/generated/{deserialize/lazy-types.js => lazy/types.js} (100%) rename napi/parser/generated/{deserialize/lazy-visit.js => lazy/walk.js} (99%) diff --git a/.github/generated/ast_changes_watch_list.yml b/.github/generated/ast_changes_watch_list.yml index 233324aa10155..4c15e24edeaa2 100644 --- a/.github/generated/ast_changes_watch_list.yml +++ b/.github/generated/ast_changes_watch_list.yml @@ -61,10 +61,10 @@ src: - 'crates/oxc_syntax/src/symbol.rs' - 'crates/oxc_traverse/src/generated/scopes_collector.rs' - 'napi/parser/generated/deserialize/js.js' - - 'napi/parser/generated/deserialize/lazy-types.js' - - 'napi/parser/generated/deserialize/lazy-visit.js' - - 'napi/parser/generated/deserialize/lazy.js' - 'napi/parser/generated/deserialize/ts.js' + - 'napi/parser/generated/lazy/constructors.js' + - 'napi/parser/generated/lazy/types.js' + - 'napi/parser/generated/lazy/walk.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/bench.bench.mjs b/napi/parser/bench.bench.mjs index cde37bade8d4c..8769c072abee3 100644 --- a/napi/parser/bench.bench.mjs +++ b/napi/parser/bench.bench.mjs @@ -13,7 +13,7 @@ const deserializeTS = require('./generated/deserialize/ts.js'); const { isJsAst, prepareRaw, returnBufferToCache } = require('./raw-transfer/common.js'); const { getVisitorsArr } = require('./raw-transfer/visitor.js'); const { TOKEN } = require('./raw-transfer/lazy-common.js'); -const walkProgram = require('./generated/deserialize/lazy-visit.js'); +const walkProgram = require('./generated/lazy/walk.js'); // Same fixtures as used in Rust parser benchmarks let fixtureUrls = [ diff --git a/napi/parser/generated/deserialize/lazy.js b/napi/parser/generated/lazy/constructors.js similarity index 100% rename from napi/parser/generated/deserialize/lazy.js rename to napi/parser/generated/lazy/constructors.js diff --git a/napi/parser/generated/deserialize/lazy-types.js b/napi/parser/generated/lazy/types.js similarity index 100% rename from napi/parser/generated/deserialize/lazy-types.js rename to napi/parser/generated/lazy/types.js diff --git a/napi/parser/generated/deserialize/lazy-visit.js b/napi/parser/generated/lazy/walk.js similarity index 99% rename from napi/parser/generated/deserialize/lazy-visit.js rename to napi/parser/generated/lazy/walk.js index e9cb54e01b72b..023d903d03f54 100644 --- a/napi/parser/generated/deserialize/lazy-visit.js +++ b/napi/parser/generated/lazy/walk.js @@ -182,7 +182,7 @@ const { JSDocNullableType, JSDocNonNullableType, JSDocUnknownType, -} = require('./lazy.js').constructors; +} = require('./constructors.js').constructors; module.exports = walkProgram; diff --git a/napi/parser/package.json b/napi/parser/package.json index 67e2c7d3a1ecc..b4686e4b803d5 100644 --- a/napi/parser/package.json +++ b/napi/parser/package.json @@ -45,9 +45,9 @@ "webcontainer-fallback.js", "generated/deserialize/js.js", "generated/deserialize/ts.js", - "generated/deserialize/lazy.js", - "generated/deserialize/lazy-types.js", - "generated/deserialize/lazy-visit.js", + "generated/lazy/constructors.js", + "generated/lazy/types.js", + "generated/lazy/walk.js", "raw-transfer/common.js", "raw-transfer/eager.js", "raw-transfer/lazy.js", diff --git a/napi/parser/raw-transfer/lazy.js b/napi/parser/raw-transfer/lazy.js index 74ea4bfc0d8f4..0e3525ae745f6 100644 --- a/napi/parser/raw-transfer/lazy.js +++ b/napi/parser/raw-transfer/lazy.js @@ -2,8 +2,8 @@ const { parseSyncRawImpl, parseAsyncRawImpl, returnBufferToCache } = require('./common.js'), { TOKEN } = require('./lazy-common.js'), - constructLazyData = require('../generated/deserialize/lazy.js').construct, - walkProgram = require('../generated/deserialize/lazy-visit.js'), + constructLazyData = require('../generated/lazy/constructors.js').construct, + walkProgram = require('../generated/lazy/walk.js'), { Visitor, getVisitorsArr } = require('./visitor.js'); module.exports = { parseSyncLazy, parseAsyncLazy, Visitor }; diff --git a/napi/parser/raw-transfer/visitor.js b/napi/parser/raw-transfer/visitor.js index 25540dc44a7f0..eebf3ef6364a4 100644 --- a/napi/parser/raw-transfer/visitor.js +++ b/napi/parser/raw-transfer/visitor.js @@ -4,7 +4,7 @@ const { NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT, LEAF_NODE_TYPES_COUNT, -} = require('../generated/deserialize/lazy-types.js'); +} = require('../generated/lazy/types.js'); // Getter for private `#visitorsArr` property of `Visitor` class. Initialized in class body below. let getVisitorsArr; diff --git a/tasks/ast_tools/src/generators/raw_transfer_lazy.rs b/tasks/ast_tools/src/generators/raw_transfer_lazy.rs index 1308b3d279a8f..207908df1f09d 100644 --- a/tasks/ast_tools/src/generators/raw_transfer_lazy.rs +++ b/tasks/ast_tools/src/generators/raw_transfer_lazy.rs @@ -37,15 +37,15 @@ impl Generator for RawTransferLazyGenerator { vec![ Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/lazy.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/constructors.js"), code: constructors, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/lazy-visit.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/walk.js"), code: walkers, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/lazy-types.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/types.js"), code: node_type_ids_map, }, ] @@ -182,7 +182,7 @@ fn generate( const {{ {constructor_names} - }} = require('./lazy.js').constructors; + }} = require('./constructors.js').constructors; module.exports = walkProgram;