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
22 changes: 11 additions & 11 deletions .github/generated/ast_changes_watch_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

src:
- '.github/generated/ast_changes_watch_list.yml'
- 'apps/oxlint/src-js/generated/constants.mjs'
- 'apps/oxlint/src-js/generated/constants.js'
- 'apps/oxlint/src/generated/raw_transfer_constants.rs'
- 'crates/oxc_allocator/src/generated/assert_layouts.rs'
- 'crates/oxc_allocator/src/generated/fixed_size_constants.rs'
Expand Down Expand Up @@ -66,16 +66,16 @@ src:
- 'crates/oxc_syntax/src/serialize.rs'
- 'crates/oxc_syntax/src/symbol.rs'
- 'crates/oxc_traverse/src/generated/scopes_collector.rs'
- 'napi/parser/generated/constants.mjs'
- 'napi/parser/generated/deserialize/js.mjs'
- 'napi/parser/generated/deserialize/ts.mjs'
- 'napi/parser/generated/lazy/constructors.mjs'
- 'napi/parser/generated/lazy/types.mjs'
- 'napi/parser/generated/lazy/walk.mjs'
- 'napi/parser/generated/visit/keys.mjs'
- 'napi/parser/generated/visit/types.mjs'
- 'napi/parser/generated/visit/visitor.d.mts'
- 'napi/parser/generated/visit/walk.mjs'
- 'napi/parser/generated/constants.js'
- 'napi/parser/generated/deserialize/js.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/generated/visit/keys.js'
- 'napi/parser/generated/visit/types.js'
- 'napi/parser/generated/visit/visitor.d.ts'
- 'napi/parser/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
2 changes: 1 addition & 1 deletion .github/workflows/release_oxlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:

- name: Generate npm packages
run: |
node npm/oxlint/scripts/generate-packages.mjs
node npm/oxlint/scripts/generate-packages.js
cat npm/oxlint/package.json
for package in npm/oxlint*; do cat $package/package.json ; echo ; done

Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "oxlint",
"version": "1.16.0",
"type": "module",
"main": "dist/index.js",
"bin": "dist/cli.js",
"type": "module",
"scripts": {
"build": "pnpm run build-napi-release && pnpm run build-js",
"build-dev": "pnpm run build-napi && pnpm run build-js",
Expand Down
18 changes: 9 additions & 9 deletions apps/oxlint/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ console.log('Copying files from parser...');
const parserFilePaths = [
// Lazy implementation
/*
'src-js/raw-transfer/lazy-common.mjs',
'src-js/raw-transfer/node-array.mjs',
'generated/lazy/constructors.mjs',
'generated/lazy/types.mjs',
'generated/lazy/walk.mjs',
'src-js/raw-transfer/lazy-common.js',
'src-js/raw-transfer/node-array.js',
'generated/lazy/constructors.js',
'generated/lazy/types.js',
'generated/lazy/walk.js',
*/
'generated/deserialize/ts.mjs',
'generated/visit/types.mjs',
'generated/visit/visitor.d.mts',
'generated/visit/walk.mjs',
'generated/deserialize/ts.js',
'generated/visit/types.js',
'generated/visit/visitor.d.ts',
'generated/visit/walk.js',
];

for (const parserFilePath of parserFilePaths) {
Expand Down
10 changes: 5 additions & 5 deletions apps/oxlint/src-js/plugins/lint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
SOURCE_LEN_OFFSET,
// TODO(camc314): we need to generate `.d.ts` file for this module.
// @ts-expect-error
} from '../generated/constants.mjs';
} from '../generated/constants.js';
import { diagnostics, setupContextForFile } from './context.js';
import { registeredRules } from './load.js';
import { assertIs } from './utils.js';
Expand All @@ -12,15 +12,15 @@ import { addVisitorToCompiled, compiledVisitor, finalizeCompiledVisitor, initCom
// Lazy implementation
/*
// @ts-expect-error we need to generate `.d.ts` file for this module.
import { TOKEN } from '../../dist/src-js/raw-transfer/lazy-common.mjs';
import { TOKEN } from '../../dist/src-js/raw-transfer/lazy-common.js';
// @ts-expect-error we need to generate `.d.ts` file for this module.
import { walkProgram } from '../../dist/generated/lazy/walk.mjs';
import { walkProgram } from '../../dist/generated/lazy/walk.js';
*/

// @ts-expect-error we need to generate `.d.ts` file for this module
import { deserializeProgramOnly } from '../../dist/generated/deserialize/ts.mjs';
import { deserializeProgramOnly } from '../../dist/generated/deserialize/ts.js';
// @ts-expect-error we need to generate `.d.ts` file for this module
import { walkProgram } from '../../dist/generated/visit/walk.mjs';
import { walkProgram } from '../../dist/generated/visit/walk.js';

import type { AfterHook } from './types.ts';

Expand Down
2 changes: 1 addition & 1 deletion apps/oxlint/src-js/plugins/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface Visitor {
}
*/

import type { VisitorObject as Visitor } from '../../dist/generated/visit/visitor.d.mts';
import type { VisitorObject as Visitor } from '../../dist/generated/visit/visitor.d.ts';
export type { Visitor };

// Hook function that runs before traversal.
Expand Down
4 changes: 2 additions & 2 deletions apps/oxlint/src-js/plugins/visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
// 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 '../../dist/generated/lazy/types.mjs';
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/lazy/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 '../../dist/generated/visit/types.mjs';
import { LEAF_NODE_TYPES_COUNT, NODE_TYPE_IDS_MAP, NODE_TYPES_COUNT } from '../../dist/generated/visit/types.js';
import { assertIs } from './utils.js';

import type { CompiledVisitorEntry, EnterExit, Node, VisitFn, Visitor } from './types.ts';
Expand Down
4 changes: 2 additions & 2 deletions apps/oxlint/test/compile-visitor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
/*
// TODO(camc314): we need to generate `.d.ts` file for this module.
// @ts-expect-error
import { NODE_TYPE_IDS_MAP } from '../dist/generated/lazy/types.mjs';
import { NODE_TYPE_IDS_MAP } from '../dist/generated/lazy/types.js';
*/
// TODO(camc314): we need to generate `.d.ts` file for this module
// @ts-expect-error
import { NODE_TYPE_IDS_MAP } from '../dist/generated/visit/types.mjs';
import { NODE_TYPE_IDS_MAP } from '../dist/generated/visit/types.js';
import {
addVisitorToCompiled,
compiledVisitor,
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
"napi/{parser,transform,minify,playground}/**/wasi-worker-browser.mjs",
"napi/{parser,transform,minify,playground}/**/wasi-worker.mjs",
"napi/{parser,transform,minify,playground}/**/browser.js",
"napi/parser/src-js/bindings.mjs",
"napi/parser/src-js/index.d.mts",
"napi/parser/src-js/bindings.js",
"npm/*/package.json",
"npm/oxlint/configuration_schema.json",
"npm/oxc-wasm/**",
Expand Down
18 changes: 9 additions & 9 deletions napi/parser/bench.bench.mjs → napi/parser/bench.bench.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { writeFile } from 'node:fs/promises';
import { join as pathJoin } from 'node:path';
import { bench, describe } from 'vitest';
import { parseSyncRaw } from './src-js/bindings.mjs';
import { parseAsync, parseSync } from './src-js/index.mjs';
import { parseSyncRaw } from './src-js/bindings.js';
import { parseAsync, parseSync } from './src-js/index.js';

// Internals
import { DATA_POINTER_POS_32, PROGRAM_OFFSET } from './generated/constants.mjs';
import { deserialize as deserializeJS } from './generated/deserialize/js.mjs';
import { deserialize as deserializeTS } from './generated/deserialize/ts.mjs';
import { walkProgram } from './generated/lazy/walk.mjs';
import { isJsAst, prepareRaw, returnBufferToCache } from './src-js/raw-transfer/common.mjs';
import { TOKEN } from './src-js/raw-transfer/lazy-common.mjs';
import { getVisitorsArr, Visitor } from './src-js/raw-transfer/visitor.mjs';
import { DATA_POINTER_POS_32, PROGRAM_OFFSET } from './generated/constants.js';
import { deserialize as deserializeJS } from './generated/deserialize/js.js';
import { deserialize as deserializeTS } from './generated/deserialize/ts.js';
import { walkProgram } from './generated/lazy/walk.js';
import { isJsAst, prepareRaw, returnBufferToCache } from './src-js/raw-transfer/common.js';
import { TOKEN } from './src-js/raw-transfer/lazy-common.js';
import { getVisitorsArr, Visitor } from './src-js/raw-transfer/visitor.js';

// Same fixtures as used in Rust parser benchmarks
let fixtureUrls = [
Expand Down
4 changes: 2 additions & 2 deletions napi/parser/example.mjs → napi/parser/example.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import fs from 'node:fs';
import path from 'node:path';
import { parseArgs } from 'node:util';
import { parseSync } from './src-js/index.mjs';
import { parseSync } from './src-js/index.js';

// usage:
// node napi/parser/example.mjs test.ts
// node napi/parser/example.js test.ts

process.chdir(path.join(import.meta.dirname, '../..'));

Expand Down
File renamed without changes.
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.mjs';
import { NodeArray } from '../../src-js/raw-transfer/node-array.mjs';
import { constructorError, TOKEN } from '../../src-js/raw-transfer/lazy-common.js';
import { NodeArray } from '../../src-js/raw-transfer/node-array.js';

const textDecoder = new TextDecoder('utf-8', { ignoreBOM: true }),
decodeStr = textDecoder.decode.bind(textDecoder),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ import {
WhileStatement,
WithStatement,
YieldExpression,
} from './constructors.mjs';
} from './constructors.js';

export { walkProgram };

Expand Down
64 changes: 32 additions & 32 deletions napi/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
"name": "oxc-parser",
"version": "0.91.0",
"type": "module",
"main": "src-js/index.mjs",
"browser": "src-js/wasm.mjs",
"main": "src-js/index.js",
"browser": "src-js/wasm.js",
"scripts": {
"build-dev": "napi build --esm --platform --js bindings.mjs --dts index.d.mts --output-dir src-js",
"build-dev": "napi build --esm --platform --js bindings.js --dts index.d.ts --output-dir src-js",
"build-test": "pnpm run build-dev --profile coverage",
"build": "pnpm run build-dev --features allocator --release",
"postbuild-dev": "node scripts/patch.mjs",
"postbuild-dev": "node scripts/patch.js",
"build-wasi": "pnpm run build-dev --release --target wasm32-wasip1-threads",
"build-npm-dir": "rm -rf npm-dir && napi create-npm-dirs --npm-dir npm-dir && pnpm napi artifacts --npm-dir npm-dir --output-dir src-js",
"build-browser-bundle": "node scripts/build-browser-bundle.mjs",
"build-browser-bundle": "node scripts/build-browser-bundle.js",
"test": "tsc && pnpm run test-node run",
"test-node": "vitest --dir ./test",
"test-browser": "vitest -c vitest.config.browser.mts",
"bench": "vitest bench --run ./bench.bench.mjs"
"test-browser": "vitest -c vitest.config.browser.ts",
"bench": "vitest bench --run ./bench.bench.js"
},
"engines": {
"node": "^20.19.0 || >=22.12.0"
Expand All @@ -38,31 +38,31 @@
"url": "https://github.com/sponsors/Boshen"
},
"files": [
"generated/constants.mjs",
"generated/deserialize/js.mjs",
"generated/deserialize/ts.mjs",
"generated/lazy/constructors.mjs",
"generated/lazy/types.mjs",
"generated/lazy/walk.mjs",
"generated/visit/keys.mjs",
"generated/visit/types.mjs",
"generated/visit/visitor.d.mts",
"generated/visit/walk.mjs",
"src-js/bindings.mjs",
"src-js/index.d.mts",
"src-js/index.mjs",
"src-js/wasm.mjs",
"generated/constants.js",
"generated/deserialize/js.js",
"generated/deserialize/ts.js",
"generated/lazy/constructors.js",
"generated/lazy/types.js",
"generated/lazy/walk.js",
"generated/visit/keys.js",
"generated/visit/types.js",
"generated/visit/visitor.d.ts",
"generated/visit/walk.js",
"src-js/bindings.js",
"src-js/index.d.ts",
"src-js/index.js",
"src-js/wasm.js",
"src-js/webcontainer-fallback.cjs",
"src-js/wrap.mjs",
"src-js/raw-transfer/common.mjs",
"src-js/raw-transfer/eager.mjs",
"src-js/raw-transfer/lazy.mjs",
"src-js/raw-transfer/lazy-common.mjs",
"src-js/raw-transfer/node-array.mjs",
"src-js/raw-transfer/supported.mjs",
"src-js/raw-transfer/visitor.mjs",
"src-js/visit/index.mjs",
"src-js/visit/visitor.mjs"
"src-js/wrap.js",
"src-js/raw-transfer/common.js",
"src-js/raw-transfer/eager.js",
"src-js/raw-transfer/lazy.js",
"src-js/raw-transfer/lazy-common.js",
"src-js/raw-transfer/node-array.js",
"src-js/raw-transfer/supported.js",
"src-js/raw-transfer/visitor.js",
"src-js/visit/index.js",
"src-js/visit/visitor.js"
],
"publishConfig": {
"registry": "https://registry.npmjs.org/",
Expand Down Expand Up @@ -107,6 +107,6 @@
"fs": false
}
},
"dtsHeaderFile": "src-js/header.d.mts"
"dtsHeaderFile": "src-js/header.d.ts"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ async function main() {
},
});

// bundle wasm.mjs -> browser-bundle.mjs
// bundle wasm.js -> browser-bundle.js
await esbuild.build({
entryPoints: ['./src-js/wasm.mjs'],
outfile: 'browser-bundle.mjs',
entryPoints: ['./src-js/wasm.js'],
outfile: 'browser-bundle.js',
alias: {
'@oxc-parser/binding-wasm32-wasi': './src-js/parser.wasi-browser.js',
},
Expand Down Expand Up @@ -48,14 +48,14 @@ async function main() {
if (args.values.npmDir) {
const pkgDir = path.resolve(args.values.npmDir, 'wasm32-wasi');

// add `browser-bundle.mjs` to `package.json:files`
// add `browser-bundle.js` to `package.json:files`
const pkgFile = path.join(pkgDir, 'package.json');
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf8'));
pkg.files.push('browser-bundle.mjs');
pkg.files.push('browser-bundle.js');
fs.writeFileSync(pkgFile, JSON.stringify(pkg, null, 2));

// copy `browser-bundle.mjs` to `<npmDir>/wasm32-wasi`
fs.cpSync('browser-bundle.mjs', path.join(pkgDir, 'browser-bundle.mjs'));
// copy `browser-bundle.js` to `<npmDir>/wasm32-wasi`
fs.cpSync('browser-bundle.js', path.join(pkgDir, 'browser-bundle.js'));
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'node:fs';

const filename = './src-js/bindings.mjs';
const filename = './src-js/bindings.js';
let data = fs.readFileSync(filename, 'utf-8');

data = data.replace(
Expand Down
File renamed without changes.
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.mts';
import type { VisitorObject } from '../generated/visit/visitor.d.ts';

export * from '@oxc-project/types';

Expand Down
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.mts';
import type { VisitorObject } from '../generated/visit/visitor.d.ts';

export * from '@oxc-project/types';

Expand Down
Loading
Loading