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
50 changes: 25 additions & 25 deletions .github/generated/ast_changes_watch_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
24 changes: 12 additions & 12 deletions napi/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/header.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/raw-transfer/common.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/raw-transfer/eager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions napi/parser/src-js/raw-transfer/lazy.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/raw-transfer/visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/visit/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion napi/parser/src-js/visit/visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions tasks/ast_tools/src/generators/estree_visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tasks/ast_tools/src/generators/raw_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 { "" },
Expand Down Expand Up @@ -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 { "" },
Expand Down
10 changes: 5 additions & 5 deletions tasks/ast_tools/src/generators/raw_transfer_lazy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
]
Expand Down Expand Up @@ -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),
Expand Down
Loading