diff --git a/.github/generated/ast_changes_watch_list.yml b/.github/generated/ast_changes_watch_list.yml index 4f3b319532cad..99b3b0e0fe380 100644 --- a/.github/generated/ast_changes_watch_list.yml +++ b/.github/generated/ast_changes_watch_list.yml @@ -36,31 +36,31 @@ src: - 'crates/oxc_span/src/**' - 'crates/oxc_syntax/src/**' - 'crates/oxc_traverse/src/generated/scopes_collector.rs' - - 'napi/parser/generated/constants.js' - - 'napi/parser/generated/deserialize/js.d.ts' - - 'napi/parser/generated/deserialize/js.js' - - 'napi/parser/generated/deserialize/js_parent.d.ts' - - 'napi/parser/generated/deserialize/js_parent.js' - - 'napi/parser/generated/deserialize/js_range.d.ts' - - 'napi/parser/generated/deserialize/js_range.js' - - 'napi/parser/generated/deserialize/js_range_parent.d.ts' - - 'napi/parser/generated/deserialize/js_range_parent.js' - - 'napi/parser/generated/deserialize/ts.d.ts' - - 'napi/parser/generated/deserialize/ts.js' - - 'napi/parser/generated/deserialize/ts_parent.d.ts' - - 'napi/parser/generated/deserialize/ts_parent.js' - - 'napi/parser/generated/deserialize/ts_range.d.ts' - - 'napi/parser/generated/deserialize/ts_range.js' - - 'napi/parser/generated/deserialize/ts_range_parent.d.ts' - - 'napi/parser/generated/deserialize/ts_range_parent.js' - - 'napi/parser/generated/lazy/constructors.js' - - 'napi/parser/generated/lazy/type_ids.js' - - 'napi/parser/generated/lazy/walk.js' - - 'napi/parser/generated/visit/keys.js' - - 'napi/parser/generated/visit/type_ids.js' - - 'napi/parser/generated/visit/visitor.d.ts' - - 'napi/parser/generated/visit/walk.d.ts' - - 'napi/parser/generated/visit/walk.js' + - 'napi/parser/src-js/generated/constants.js' + - 'napi/parser/src-js/generated/deserialize/js.d.ts' + - 'napi/parser/src-js/generated/deserialize/js.js' + - 'napi/parser/src-js/generated/deserialize/js_parent.d.ts' + - 'napi/parser/src-js/generated/deserialize/js_parent.js' + - 'napi/parser/src-js/generated/deserialize/js_range.d.ts' + - 'napi/parser/src-js/generated/deserialize/js_range.js' + - 'napi/parser/src-js/generated/deserialize/js_range_parent.d.ts' + - 'napi/parser/src-js/generated/deserialize/js_range_parent.js' + - 'napi/parser/src-js/generated/deserialize/ts.d.ts' + - 'napi/parser/src-js/generated/deserialize/ts.js' + - 'napi/parser/src-js/generated/deserialize/ts_parent.d.ts' + - 'napi/parser/src-js/generated/deserialize/ts_parent.js' + - 'napi/parser/src-js/generated/deserialize/ts_range.d.ts' + - 'napi/parser/src-js/generated/deserialize/ts_range.js' + - 'napi/parser/src-js/generated/deserialize/ts_range_parent.d.ts' + - 'napi/parser/src-js/generated/deserialize/ts_range_parent.js' + - 'napi/parser/src-js/generated/lazy/constructors.js' + - 'napi/parser/src-js/generated/lazy/type_ids.js' + - 'napi/parser/src-js/generated/lazy/walk.js' + - 'napi/parser/src-js/generated/visit/keys.js' + - 'napi/parser/src-js/generated/visit/type_ids.js' + - 'napi/parser/src-js/generated/visit/visitor.d.ts' + - 'napi/parser/src-js/generated/visit/walk.d.ts' + - 'napi/parser/src-js/generated/visit/walk.js' - 'napi/parser/src/generated/assert_layouts.rs' - 'napi/parser/src/generated/derive_estree.rs' - 'napi/parser/src/generated/raw_transfer_constants.rs' diff --git a/napi/parser/package.json b/napi/parser/package.json index f2a608a4d0898..75c677cc071d7 100644 --- a/napi/parser/package.json +++ b/napi/parser/package.json @@ -22,19 +22,19 @@ "main": "src-js/index.js", "browser": "src-js/wasm.js", "files": [ - "generated/constants.js", - "generated/deserialize/js.js", - "generated/deserialize/js_range.js", - "generated/deserialize/ts.js", - "generated/deserialize/ts_range.js", - "generated/lazy/constructors.js", - "generated/lazy/type_ids.js", - "generated/lazy/walk.js", - "generated/visit/keys.js", - "generated/visit/type_ids.js", - "generated/visit/visitor.d.ts", - "generated/visit/walk.js", "src-js/bindings.js", + "src-js/generated/constants.js", + "src-js/generated/deserialize/js.js", + "src-js/generated/deserialize/js_range.js", + "src-js/generated/deserialize/ts.js", + "src-js/generated/deserialize/ts_range.js", + "src-js/generated/lazy/constructors.js", + "src-js/generated/lazy/type_ids.js", + "src-js/generated/lazy/walk.js", + "src-js/generated/visit/keys.js", + "src-js/generated/visit/type_ids.js", + "src-js/generated/visit/visitor.d.ts", + "src-js/generated/visit/walk.js", "src-js/index.d.ts", "src-js/index.js", "src-js/raw-transfer/common.js", diff --git a/napi/parser/generated/constants.js b/napi/parser/src-js/generated/constants.js similarity index 100% rename from napi/parser/generated/constants.js rename to napi/parser/src-js/generated/constants.js diff --git a/napi/parser/generated/deserialize/js.d.ts b/napi/parser/src-js/generated/deserialize/js.d.ts similarity index 100% rename from napi/parser/generated/deserialize/js.d.ts rename to napi/parser/src-js/generated/deserialize/js.d.ts diff --git a/napi/parser/generated/deserialize/js.js b/napi/parser/src-js/generated/deserialize/js.js similarity index 100% rename from napi/parser/generated/deserialize/js.js rename to napi/parser/src-js/generated/deserialize/js.js diff --git a/napi/parser/generated/deserialize/js_parent.d.ts b/napi/parser/src-js/generated/deserialize/js_parent.d.ts similarity index 100% rename from napi/parser/generated/deserialize/js_parent.d.ts rename to napi/parser/src-js/generated/deserialize/js_parent.d.ts diff --git a/napi/parser/generated/deserialize/js_parent.js b/napi/parser/src-js/generated/deserialize/js_parent.js similarity index 100% rename from napi/parser/generated/deserialize/js_parent.js rename to napi/parser/src-js/generated/deserialize/js_parent.js diff --git a/napi/parser/generated/deserialize/js_range.d.ts b/napi/parser/src-js/generated/deserialize/js_range.d.ts similarity index 100% rename from napi/parser/generated/deserialize/js_range.d.ts rename to napi/parser/src-js/generated/deserialize/js_range.d.ts diff --git a/napi/parser/generated/deserialize/js_range.js b/napi/parser/src-js/generated/deserialize/js_range.js similarity index 100% rename from napi/parser/generated/deserialize/js_range.js rename to napi/parser/src-js/generated/deserialize/js_range.js diff --git a/napi/parser/generated/deserialize/js_range_parent.d.ts b/napi/parser/src-js/generated/deserialize/js_range_parent.d.ts similarity index 100% rename from napi/parser/generated/deserialize/js_range_parent.d.ts rename to napi/parser/src-js/generated/deserialize/js_range_parent.d.ts diff --git a/napi/parser/generated/deserialize/js_range_parent.js b/napi/parser/src-js/generated/deserialize/js_range_parent.js similarity index 100% rename from napi/parser/generated/deserialize/js_range_parent.js rename to napi/parser/src-js/generated/deserialize/js_range_parent.js diff --git a/napi/parser/generated/deserialize/ts.d.ts b/napi/parser/src-js/generated/deserialize/ts.d.ts similarity index 100% rename from napi/parser/generated/deserialize/ts.d.ts rename to napi/parser/src-js/generated/deserialize/ts.d.ts diff --git a/napi/parser/generated/deserialize/ts.js b/napi/parser/src-js/generated/deserialize/ts.js similarity index 100% rename from napi/parser/generated/deserialize/ts.js rename to napi/parser/src-js/generated/deserialize/ts.js diff --git a/napi/parser/generated/deserialize/ts_parent.d.ts b/napi/parser/src-js/generated/deserialize/ts_parent.d.ts similarity index 100% rename from napi/parser/generated/deserialize/ts_parent.d.ts rename to napi/parser/src-js/generated/deserialize/ts_parent.d.ts diff --git a/napi/parser/generated/deserialize/ts_parent.js b/napi/parser/src-js/generated/deserialize/ts_parent.js similarity index 100% rename from napi/parser/generated/deserialize/ts_parent.js rename to napi/parser/src-js/generated/deserialize/ts_parent.js diff --git a/napi/parser/generated/deserialize/ts_range.d.ts b/napi/parser/src-js/generated/deserialize/ts_range.d.ts similarity index 100% rename from napi/parser/generated/deserialize/ts_range.d.ts rename to napi/parser/src-js/generated/deserialize/ts_range.d.ts diff --git a/napi/parser/generated/deserialize/ts_range.js b/napi/parser/src-js/generated/deserialize/ts_range.js similarity index 100% rename from napi/parser/generated/deserialize/ts_range.js rename to napi/parser/src-js/generated/deserialize/ts_range.js diff --git a/napi/parser/generated/deserialize/ts_range_parent.d.ts b/napi/parser/src-js/generated/deserialize/ts_range_parent.d.ts similarity index 100% rename from napi/parser/generated/deserialize/ts_range_parent.d.ts rename to napi/parser/src-js/generated/deserialize/ts_range_parent.d.ts diff --git a/napi/parser/generated/deserialize/ts_range_parent.js b/napi/parser/src-js/generated/deserialize/ts_range_parent.js similarity index 100% rename from napi/parser/generated/deserialize/ts_range_parent.js rename to napi/parser/src-js/generated/deserialize/ts_range_parent.js diff --git a/napi/parser/generated/lazy/constructors.js b/napi/parser/src-js/generated/lazy/constructors.js similarity index 99% rename from napi/parser/generated/lazy/constructors.js rename to napi/parser/src-js/generated/lazy/constructors.js index 38698a956e038..d2cb3ad062690 100644 --- a/napi/parser/generated/lazy/constructors.js +++ b/napi/parser/src-js/generated/lazy/constructors.js @@ -1,8 +1,8 @@ // Auto-generated code, DO NOT EDIT DIRECTLY! // To edit this generated file you have to edit `tasks/ast_tools/src/generators/raw_transfer_lazy.rs`. -import { constructorError, TOKEN } from "../../src-js/raw-transfer/lazy-common.js"; -import { NodeArray } from "../../src-js/raw-transfer/node-array.js"; +import { constructorError, TOKEN } from "../raw-transfer/lazy-common.js"; +import { NodeArray } from "../raw-transfer/node-array.js"; const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }), decodeStr = textDecoder.decode.bind(textDecoder), diff --git a/napi/parser/generated/lazy/type_ids.js b/napi/parser/src-js/generated/lazy/type_ids.js similarity index 100% rename from napi/parser/generated/lazy/type_ids.js rename to napi/parser/src-js/generated/lazy/type_ids.js diff --git a/napi/parser/generated/lazy/walk.js b/napi/parser/src-js/generated/lazy/walk.js similarity index 100% rename from napi/parser/generated/lazy/walk.js rename to napi/parser/src-js/generated/lazy/walk.js diff --git a/napi/parser/generated/visit/keys.js b/napi/parser/src-js/generated/visit/keys.js similarity index 100% rename from napi/parser/generated/visit/keys.js rename to napi/parser/src-js/generated/visit/keys.js diff --git a/napi/parser/generated/visit/type_ids.js b/napi/parser/src-js/generated/visit/type_ids.js similarity index 100% rename from napi/parser/generated/visit/type_ids.js rename to napi/parser/src-js/generated/visit/type_ids.js diff --git a/napi/parser/generated/visit/visitor.d.ts b/napi/parser/src-js/generated/visit/visitor.d.ts similarity index 100% rename from napi/parser/generated/visit/visitor.d.ts rename to napi/parser/src-js/generated/visit/visitor.d.ts diff --git a/napi/parser/generated/visit/walk.d.ts b/napi/parser/src-js/generated/visit/walk.d.ts similarity index 100% rename from napi/parser/generated/visit/walk.d.ts rename to napi/parser/src-js/generated/visit/walk.d.ts diff --git a/napi/parser/generated/visit/walk.js b/napi/parser/src-js/generated/visit/walk.js similarity index 100% rename from napi/parser/generated/visit/walk.js rename to napi/parser/src-js/generated/visit/walk.js diff --git a/napi/parser/src-js/header.d.ts b/napi/parser/src-js/header.d.ts index 5b717d5bdc81a..5009925828d93 100644 --- a/napi/parser/src-js/header.d.ts +++ b/napi/parser/src-js/header.d.ts @@ -2,7 +2,7 @@ /* eslint-disable */ import type { Program } from "@oxc-project/types"; -import type { VisitorObject } from "../generated/visit/visitor.d.ts"; +import type { VisitorObject } from "./generated/visit/visitor.d.ts"; export * from "@oxc-project/types"; diff --git a/napi/parser/src-js/index.d.ts b/napi/parser/src-js/index.d.ts index 3fec101b176c3..c26127222cd53 100644 --- a/napi/parser/src-js/index.d.ts +++ b/napi/parser/src-js/index.d.ts @@ -2,7 +2,7 @@ /* eslint-disable */ import type { Program } from "@oxc-project/types"; -import type { VisitorObject } from "../generated/visit/visitor.d.ts"; +import type { VisitorObject } from "./generated/visit/visitor.d.ts"; export * from "@oxc-project/types"; diff --git a/napi/parser/src-js/index.js b/napi/parser/src-js/index.js index 98341762dd979..9b1d9be032709 100644 --- a/napi/parser/src-js/index.js +++ b/napi/parser/src-js/index.js @@ -2,7 +2,7 @@ import { createRequire } from "node:module"; import { parse as parseBinding, parseSync as parseSyncBinding } from "./bindings.js"; import { wrap } from "./wrap.js"; -export { default as visitorKeys } from "../generated/visit/keys.js"; +export { default as visitorKeys } from "./generated/visit/keys.js"; export { Visitor } from "./visit/index.js"; export { diff --git a/napi/parser/src-js/raw-transfer/common.js b/napi/parser/src-js/raw-transfer/common.js index 05e9c74007796..1f03dfff07662 100644 --- a/napi/parser/src-js/raw-transfer/common.js +++ b/napi/parser/src-js/raw-transfer/common.js @@ -1,5 +1,5 @@ import os from "node:os"; -import { BUFFER_ALIGN, BUFFER_SIZE, IS_TS_FLAG_POS } from "../../generated/constants.js"; +import { BUFFER_ALIGN, BUFFER_SIZE, IS_TS_FLAG_POS } from "../generated/constants.js"; import { getBufferOffset, parseRaw as parseRawBinding, diff --git a/napi/parser/src-js/raw-transfer/eager.js b/napi/parser/src-js/raw-transfer/eager.js index 5691b77dbdf6b..2c635e3bbf6cc 100644 --- a/napi/parser/src-js/raw-transfer/eager.js +++ b/napi/parser/src-js/raw-transfer/eager.js @@ -71,7 +71,7 @@ function deserialize(buffer, sourceText, sourceByteLen, options) { let deserializeThis = deserializers[deserializerIndex]; if (deserializeThis === null) { deserializeThis = deserializers[deserializerIndex] = require( - `../../generated/deserialize/${deserializerNames[deserializerIndex]}.js`, + `../generated/deserialize/${deserializerNames[deserializerIndex]}.js`, ).deserialize; } diff --git a/napi/parser/src-js/raw-transfer/lazy.js b/napi/parser/src-js/raw-transfer/lazy.js index 12d6b563d4004..5d05c9ced85ff 100644 --- a/napi/parser/src-js/raw-transfer/lazy.js +++ b/napi/parser/src-js/raw-transfer/lazy.js @@ -1,6 +1,6 @@ -import { DATA_POINTER_POS_32, PROGRAM_OFFSET } from "../../generated/constants.js"; -import { RawTransferData } from "../../generated/lazy/constructors.js"; -import { walkProgram } from "../../generated/lazy/walk.js"; +import { DATA_POINTER_POS_32, PROGRAM_OFFSET } from "../generated/constants.js"; +import { RawTransferData } from "../generated/lazy/constructors.js"; +import { walkProgram } from "../generated/lazy/walk.js"; import { parseAsyncRawImpl, parseSyncRawImpl, returnBufferToCache } from "./common.js"; import { TOKEN } from "./lazy-common.js"; import { getVisitorsArr } from "./visitor.js"; diff --git a/napi/parser/src-js/raw-transfer/visitor.js b/napi/parser/src-js/raw-transfer/visitor.js index 39315d547f2b7..cd18ec8757850 100644 --- a/napi/parser/src-js/raw-transfer/visitor.js +++ b/napi/parser/src-js/raw-transfer/visitor.js @@ -2,7 +2,7 @@ import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT, -} from "../../generated/lazy/type_ids.js"; +} from "../generated/lazy/type_ids.js"; // Getter for private `#visitorsArr` property of `Visitor` class. Initialized in class body below. let getVisitorsArrTemp; diff --git a/napi/parser/src-js/visit/index.js b/napi/parser/src-js/visit/index.js index 1f56692112ee4..a52f291e1cb0f 100644 --- a/napi/parser/src-js/visit/index.js +++ b/napi/parser/src-js/visit/index.js @@ -15,7 +15,7 @@ export class Visitor { constructor(visitor) { if (walkProgram === null) { const require = createRequire(import.meta.url); - ({ walkProgram } = require("../../generated/visit/walk.js")); + ({ walkProgram } = require("../generated/visit/walk.js")); ({ addVisitorToCompiled, createCompiledVisitor, diff --git a/napi/parser/src-js/visit/visitor.js b/napi/parser/src-js/visit/visitor.js index 5b1b33a249a29..aaeabc1546a3e 100644 --- a/napi/parser/src-js/visit/visitor.js +++ b/napi/parser/src-js/visit/visitor.js @@ -76,7 +76,7 @@ import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT, -} from "../../generated/visit/type_ids.js"; +} from "../generated/visit/type_ids.js"; const { isArray } = Array; diff --git a/tasks/ast_tools/src/generators/estree_visit.rs b/tasks/ast_tools/src/generators/estree_visit.rs index b3f12ac3f6471..289213283ddce 100644 --- a/tasks/ast_tools/src/generators/estree_visit.rs +++ b/tasks/ast_tools/src/generators/estree_visit.rs @@ -57,23 +57,23 @@ impl Generator for ESTreeVisitGenerator { vec![ Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/walk.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/visit/walk.js"), code: walk_parser, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/walk.d.ts"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/visit/walk.d.ts"), code: walk_dts_parser, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/keys.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/visit/keys.js"), code: visitor_keys.clone(), }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/type_ids.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/visit/type_ids.js"), code: type_ids_map_parser, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/visitor.d.ts"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/visit/visitor.d.ts"), code: visitor_type_parser, }, Output::Javascript { diff --git a/tasks/ast_tools/src/generators/raw_transfer.rs b/tasks/ast_tools/src/generators/raw_transfer.rs index b9d74d8c3e0a9..3efa0dcb80e33 100644 --- a/tasks/ast_tools/src/generators/raw_transfer.rs +++ b/tasks/ast_tools/src/generators/raw_transfer.rs @@ -81,7 +81,7 @@ impl Generator for RawTransferGenerator { outputs.extend([ Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/constants.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/constants.js"), code: constants_js.clone(), }, Output::Javascript { @@ -280,7 +280,7 @@ fn generate_deserializers( for range in [false, true] { for parent in [false, true] { self.variant_paths.push(format!( - "{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/{}{}{}.js", + "{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/deserialize/{}{}{}.js", if is_ts { "ts" } else { "js" }, if range { "_range" } else { "" }, if parent { "_parent" } else { "" }, @@ -331,7 +331,7 @@ fn generate_deserializers( for parent in [false, true] { outputs.push(( format!( - "{NAPI_PARSER_PACKAGE_PATH}/generated/deserialize/{}{}{}.d.ts", + "{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/deserialize/{}{}{}.d.ts", if is_ts { "ts" } else { "js" }, if range { "_range" } else { "" }, if parent { "_parent" } else { "" }, diff --git a/tasks/ast_tools/src/generators/raw_transfer_lazy.rs b/tasks/ast_tools/src/generators/raw_transfer_lazy.rs index 52afa5f98d276..15f49dbafb161 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/lazy/constructors.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/lazy/constructors.js"), code: constructors, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/walk.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/lazy/walk.js"), code: walkers, }, Output::Javascript { - path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/type_ids.js"), + path: format!("{NAPI_PARSER_PACKAGE_PATH}/src-js/generated/lazy/type_ids.js"), code: node_type_ids_map, }, ] @@ -157,8 +157,8 @@ fn generate( let constructors = &state.constructors; #[rustfmt::skip] let constructors = format!(" - import {{ constructorError, TOKEN }} from '../../src-js/raw-transfer/lazy-common.js'; - import {{ NodeArray }} from '../../src-js/raw-transfer/node-array.js'; + import {{ constructorError, TOKEN }} from '../raw-transfer/lazy-common.js'; + import {{ NodeArray }} from '../raw-transfer/node-array.js'; const textDecoder = new TextDecoder('utf-8', {{ ignoreBOM: true }}), decodeStr = textDecoder.decode.bind(textDecoder),