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
6 changes: 3 additions & 3 deletions .github/generated/ast_changes_watch_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ src:
- 'apps/oxlint/src-js/generated/constants.js'
- 'apps/oxlint/src-js/generated/deserialize.js'
- 'apps/oxlint/src-js/generated/keys.js'
- 'apps/oxlint/src-js/generated/type_ids.js'
- 'apps/oxlint/src-js/generated/types.d.ts'
- 'apps/oxlint/src-js/generated/types.js'
- 'apps/oxlint/src-js/generated/visitor.d.ts'
- 'apps/oxlint/src-js/generated/walk.js'
- 'apps/oxlint/src/generated/raw_transfer_constants.rs'
Expand Down Expand Up @@ -82,10 +82,10 @@ src:
- 'napi/parser/generated/deserialize/ts_range.js'
- 'napi/parser/generated/deserialize/ts_range_parent.js'
- 'napi/parser/generated/lazy/constructors.js'
- 'napi/parser/generated/lazy/types.js'
- 'napi/parser/generated/lazy/type_ids.js'
- 'napi/parser/generated/lazy/walk.js'
- 'napi/parser/generated/visit/keys.js'
- 'napi/parser/generated/visit/types.js'
- 'napi/parser/generated/visit/type_ids.js'
- 'napi/parser/generated/visit/visitor.d.ts'
- 'napi/parser/generated/visit/walk.js'
- 'napi/parser/src/generated/assert_layouts.rs'
Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const parserFilePaths = [
'src-js/raw-transfer/lazy-common.js',
'src-js/raw-transfer/node-array.js',
'generated/lazy/constructors.js',
'generated/lazy/types.js',
'generated/lazy/type_ids.js',
'generated/lazy/walk.js',
'generated/deserialize/ts_range_loc_parent_no_parens.js',
'generated/visit/keys.js',
Expand Down
8 changes: 1 addition & 7 deletions apps/oxlint/src-js/plugins/visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,9 @@
// for objects created by user code in visitors. If ephemeral user-created objects all fit in new space,
// it will avoid full GC runs, which should greatly improve performance.

// Lazy implementation
/*
// TODO(camc314): we need to generate `.d.ts` file for this module.
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../generated/types.js';
*/

// TODO(camc314): we need to generate `.d.ts` file for this module.
// @ts-expect-error
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../generated/types.js';
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../generated/type_ids.js';
import { assertIs } from './utils.js';

import type { CompiledVisitorEntry, EnterExit, Node, VisitFn, Visitor } from './types.ts';
Expand Down
8 changes: 1 addition & 7 deletions apps/oxlint/test/compile-visitor.test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
// Lazy implementation
/*
// TODO(camc314): we need to generate `.d.ts` file for this module.
// @ts-expect-error
import { NODE_TYPE_IDS_MAP } from '../src-js/generated/types.js';
*/
// TODO(camc314): we need to generate `.d.ts` file for this module
// @ts-expect-error
import { NODE_TYPE_IDS_MAP } from '../src-js/generated/types.js';
import { NODE_TYPE_IDS_MAP } from '../src-js/generated/type_ids.js';
import {
addVisitorToCompiled,
compiledVisitor,
Expand Down
4 changes: 2 additions & 2 deletions napi/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"generated/deserialize/js_range.js",
"generated/deserialize/ts_range.js",
"generated/lazy/constructors.js",
"generated/lazy/types.js",
"generated/lazy/type_ids.js",
"generated/lazy/walk.js",
"generated/visit/keys.js",
"generated/visit/types.js",
"generated/visit/type_ids.js",
"generated/visit/visitor.d.ts",
"generated/visit/walk.js",
"src-js/bindings.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
@@ -1,4 +1,4 @@
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../generated/lazy/types.js';
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../generated/lazy/type_ids.js';

// Getter for private `#visitorsArr` property of `Visitor` class. Initialized in class body below.
let getVisitorsArrTemp;
Expand Down
4 changes: 1 addition & 3 deletions napi/parser/src-js/visit/visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
// for objects created by user code in visitors. If ephemeral user-created objects all fit in new space,
// it will avoid full GC runs, which should greatly improve performance.

// TODO(camc314): we need to generate `.d.ts` file for this module.
// @ts-expect-error
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../generated/visit/types.js';
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../generated/visit/type_ids.js';

const { isArray } = Array;

Expand Down
4 changes: 2 additions & 2 deletions tasks/ast_tools/src/generators/estree_visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl Generator for ESTreeVisitGenerator {
code: visitor_keys.clone(),
},
Output::Javascript {
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/types.js"),
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/visit/type_ids.js"),
code: type_ids_map.clone(),
},
Output::Javascript {
Expand All @@ -78,7 +78,7 @@ impl Generator for ESTreeVisitGenerator {
code: visitor_keys,
},
Output::Javascript {
path: format!("{OXLINT_APP_PATH}/src-js/generated/types.js"),
path: format!("{OXLINT_APP_PATH}/src-js/generated/type_ids.js"),
code: type_ids_map,
},
Output::Javascript {
Expand Down
2 changes: 1 addition & 1 deletion tasks/ast_tools/src/generators/raw_transfer_lazy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Generator for RawTransferLazyGenerator {
code: walkers,
},
Output::Javascript {
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/types.js"),
path: format!("{NAPI_PARSER_PACKAGE_PATH}/generated/lazy/type_ids.js"),
code: node_type_ids_map,
},
]
Expand Down
Loading