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
2 changes: 1 addition & 1 deletion .github/generated/ast_changes_watch_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ src:
- '.github/generated/ast_changes_watch_list.yml'
- 'apps/oxlint/src-js/generated/constants.ts'
- 'apps/oxlint/src-js/generated/deserialize.js'
- 'apps/oxlint/src-js/generated/keys.js'
- 'apps/oxlint/src-js/generated/keys.ts'
- 'apps/oxlint/src-js/generated/type_ids.ts'
- 'apps/oxlint/src-js/generated/types.d.ts'
- 'apps/oxlint/src-js/generated/visitor.d.ts'
Expand Down
3 changes: 1 addition & 2 deletions apps/oxlint/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const parserFilePaths = [
'generated/lazy/type_ids.js',
'generated/lazy/walk.js',
'generated/deserialize/ts_range_loc_parent_no_parens.js',
'generated/visit/keys.js',
];

for (const parserFilePath of parserFilePaths) {
Expand All @@ -44,7 +43,7 @@ for (const parserFilePath of parserFilePaths) {
// Copy files from `src-js/generated` to `dist/generated`
console.log('Copying generated files...');

const generatedFilePaths = ['deserialize.js', 'keys.js'];
const generatedFilePaths = ['deserialize.js'];
for (const filePath of generatedFilePaths) {
copyFile(join(oxlintDirPath, 'src-js/generated', filePath), join(distDirPath, 'generated', filePath));
}
Expand Down
9 changes: 1 addition & 8 deletions apps/oxlint/src-js/plugins/source_code.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { createRequire } from 'node:module';
import { DATA_POINTER_POS_32, SOURCE_LEN_OFFSET } from '../generated/constants.js';

// We use the deserializer which removes `ParenthesizedExpression`s from AST,
// and with `range`, `loc`, and `parent` properties on AST nodes, to match ESLint
// @ts-expect-error we need to generate `.d.ts` file for this module
import { deserializeProgramOnly } from '../../dist/generated/deserialize.js';

import visitorKeys from '../generated/keys.js';
import {
getLineColumnFromOffset,
getNodeLoc,
Expand All @@ -19,8 +19,6 @@ import type { Program } from '../generated/types.d.ts';
import type { Scope, ScopeManager, Variable } from './scope.ts';
import type { BufferWithArrays, Comment, Node, NodeOrToken, Ranged, Token } from './types.ts';

const require = createRequire(import.meta.url);

const { max } = Math;

// Text decoder, for decoding source text from buffer
Expand All @@ -38,9 +36,6 @@ export let sourceText: string | null = null;
let sourceByteLen: number = 0;
export let ast: Program | null = null;

// Lazily populated when `SOURCE_CODE.visitorKeys` is accessed.
let visitorKeys: { [key: string]: string[] } | null = null;

/**
* Set up source for the file about to be linted.
* @param bufferInput - Buffer containing AST
Expand Down Expand Up @@ -120,8 +115,6 @@ export const SOURCE_CODE = Object.freeze({

// Get visitor keys to traverse this AST.
get visitorKeys(): { [key: string]: string[] } {
// This is the path relative to `plugins.js` file in `dist` directory
if (visitorKeys === null) visitorKeys = require('./generated/keys.js').default;
return visitorKeys;
},

Expand Down
3 changes: 2 additions & 1 deletion tasks/ast_tools/src/generators/estree_visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ impl Generator for ESTreeVisitGenerator {
code: walk,
},
Output::Javascript {
path: format!("{OXLINT_APP_PATH}/src-js/generated/keys.js"),
// This file is also valid as TS
path: format!("{OXLINT_APP_PATH}/src-js/generated/keys.ts"),
code: visitor_keys,
},
Output::Javascript {
Expand Down
Loading