Skip to content
This repository has been archived by the owner on Dec 14, 2024. It is now read-only.

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
DonIsaac committed Aug 21, 2024
1 parent 5a219f4 commit b52f6d4
Show file tree
Hide file tree
Showing 10 changed files with 1,794 additions and 971 deletions.
7 changes: 0 additions & 7 deletions napi/transform/__test__/index.spec.mjs

This file was deleted.

5 changes: 5 additions & 0 deletions napi/transform/__tests__/index.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const sum = (a, b) => a + b

test('sum', (t) => {
expect(sum(1, 2)).toBe(3)
})
200 changes: 200 additions & 0 deletions napi/transform/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
/**
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

/** @type {import('jest').Config} */
const config = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/jv/1jqrnpqx03s7yj76s5m7q7_r0000gn/T/jest_dx",

// Automatically clear mock calls, instances, contexts and results before every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// The default configuration for fake timers
// fakeTimers: {
// "enableGlobally": false
// },

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "mjs",
// "cjs",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
// testEnvironment: "jest-environment-node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
testMatch: [
"**/__tests__/**/*.[mjt]s?(x)",
"**/?(*.)+(spec|test).[mtj]s?(x)"
],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// A map from regular expressions to paths to transformers
transform: {
'\\.[tjcm]sx?$': 'oxc-jest'
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};

module.exports = config;
11 changes: 5 additions & 6 deletions napi/transform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@
"license": "MIT",
"devDependencies": {
"@napi-rs/cli": "^2.18.3",
"ava": "^6.0.1"
},
"ava": {
"timeout": "3m"
"jest": "^29.7.0",
"@types/jest": "^29.5.12"
},
"engines": {
"node": ">= 10"
Expand All @@ -40,9 +38,10 @@
"build:debug": "napi build --platform && yarn postbuild",
"postbuild": "node bin/typegen-hack.js",
"prepublishOnly": "napi prepublish -t npm",
"test": "ava",
"test": "NODE_OPTIONS='--experimental-vm-modules' jest",
"universal": "napi universal",
"version": "napi version",
"typecheck": "tsc"
"typecheck": "tsc",
"clean": "rm *.node || true"
}
}
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"license": "MIT",
"private": true,
"type": "module",
"packageManager": "[email protected]",
"workspaces": [
"napi/*",
Expand All @@ -20,7 +21,9 @@
"scripts": {
"build": "yarn workspaces foreach -Apt run build",
"build:debug": "yarn workspaces foreach -Apt run 'build:debug'",
"lint": "oxlint --jest-plugin -D correctness -W suspicious -D no-await-in-loop -D no-accumulating-spread -D no-var-requires -D no-var -D throw-new-error"
"lint": "oxlint --jest-plugin -D correctness -W suspicious -D no-await-in-loop -D no-accumulating-spread -D no-var-requires -D no-var -D throw-new-error",
"clean": "yarn clean:js && cargo clean",
"clean:js": "yarn workspaces foreach -A run clean"
},
"devDependencies": {
"oxlint": "^0.4.4",
Expand Down
5 changes: 3 additions & 2 deletions packages/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
"types": "dist/index.d.ts",
"scripts": {
"build": "tsc",
"build:debug": "tsc"
"build:debug": "tsc",
"clean": "rm -rf dist || true"
},
"dependencies": {
"@jest/create-cache-key-function": "^29.7.0",
"@oxc-jest/transform": "file:../../napi/transform",
"@oxc-jest/transform": "*",
"jsonc-parser": "^3.3.1",
"zod": "^3.23.8"
},
Expand Down
33 changes: 10 additions & 23 deletions packages/jest/src/factory.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Transformer, TransformerCreator, TransformerFactory } from '@jest/transform'
import { Transformer, TransformerCreator } from '@jest/transform'
import { transform, transformAsync } from '@oxc-jest/transform'

import { Options, Config, createTransformConfig } from './options'
Expand All @@ -7,45 +7,32 @@ import createCacheKey from '@jest/create-cache-key-function'
/**
* @note this must be exactly named `createTransformer` to be picked up by Jest.
*/
export const createTransformer: TransformerCreator<Transformer<Options>, Options> = async options => {

export const createTransformer: TransformerCreator<
Transformer<Options>,
Options
> = async options => {
const config: Config = await createTransformConfig(options)
console.log('[oxc-jest] createTransformer')
console.log(config)
const getCacheKey = createCacheKey(
// files that affect computed cache key
['package.json', 'tsconfig.json'],
// values that affect computed cache key
[JSON.stringify(config)]
)

const IS_TS = /\.tsx?$/
const isTs = (path: string) => IS_TS.test(path)
console.log('[oxc-jest] called')
return {
canInstrument: false,
getCacheKey: getCacheKey as Transformer<Options>['getCacheKey'],
process(sourceText, sourcePath, jestOptions) {
console.log('[oxc-jest] process', sourcePath)
const { sourceText: code, sourceMap: map } = transform(sourcePath, sourceText)
if (isTs(sourcePath)) {
console.log('[oxc-jest] process ts:', sourcePath)
console.log(code)
}
process(sourceText, sourcePath, _jestOptions) {
const { sourceText: code, sourceMap: _map } = transform(sourcePath, sourceText)
return { code, map: undefined }
},
async processAsync(sourceText, sourcePath, jestOptions) {
console.log('[oxc-jest] processAsync', sourcePath)
const { sourceText: code, sourceMap: map } = await transformAsync(
async processAsync(sourceText, sourcePath, _jestOptions) {
const { sourceText: code, sourceMap: _map } = await transformAsync(
sourcePath,
sourceText,
config
)
if (isTs(sourcePath)) {
console.log('[oxc-jest] processAsync:', sourcePath)
console.log(code)
}
return { code , map: undefined }
return { code, map: undefined }
},
} satisfies Transformer<Options>
}
4 changes: 2 additions & 2 deletions packages/jest/src/merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ type DeepMerge<T extends AnyRecord, U extends AnyRecord> = {
: U[K]
: U[K]
: K extends keyof T
? T[K]
: never
? T[K]
: never
}

/**
Expand Down
39 changes: 24 additions & 15 deletions packages/jest/src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,31 @@ const OptionsSchema = z.object({
}
}),
})
.optional().default({ runtime: 'automatic', jsxPlugin: false }),
.optional()
.default({ runtime: 'automatic', jsxPlugin: false }),

codegen: z.object({
compress: z.union([
z.boolean(),
z.enum(['none', 'whitespace', 'fold']).transform(compress => {
switch (compress) {
case 'none': return 0
case 'whitespace': return 1
case 'fold': return 2
default: return 0
}
})
]).default('none'),
sourceMap: z.boolean().default(true)
}).default({})
codegen: z
.object({
compress: z
.union([
z.boolean(),
z.enum(['none', 'whitespace', 'fold']).transform(compress => {
switch (compress) {
case 'none':
return 0
case 'whitespace':
return 1
case 'fold':
return 2
default:
return 0
}
}),
])
.default('none'),
sourceMap: z.boolean().default(true),
})
.default({}),
})

/**
Expand Down
Loading

0 comments on commit b52f6d4

Please sign in to comment.