From 2811195c7f74d6ef0207fb4c966fb09c6b30599c Mon Sep 17 00:00:00 2001 From: Nicolas DUBIEN Date: Sun, 21 Jan 2024 18:41:49 +0000 Subject: [PATCH] to mjs --- .../test/e2e/__properties__/blockEventLoop.cjs | 18 ------------------ .../test/e2e/__properties__/blockEventLoop.mjs | 15 +++++++++++++++ ...ncurrentAssert.cjs => concurrentAssert.mjs} | 16 ++++++++-------- .../worker/test/e2e/__properties__/failing.cjs | 16 ---------------- .../worker/test/e2e/__properties__/failing.mjs | 13 +++++++++++++ .../worker/test/e2e/__properties__/passing.cjs | 18 ------------------ .../worker/test/e2e/__properties__/passing.mjs | 16 ++++++++++++++++ ...ateIsolation.cjs => predicateIsolation.mjs} | 11 ++++------- ...ertyIsolation.cjs => propertyIsolation.mjs} | 13 +++++-------- .../test/e2e/__properties__/unregistered.cjs | 13 ------------- .../test/e2e/__properties__/unregistered.mjs | 10 ++++++++++ .../worker/test/e2e/blockEventLoop.spec.ts | 2 +- .../worker/test/e2e/concurrentAssert.spec.ts | 2 +- packages/worker/test/e2e/failing.spec.ts | 2 +- packages/worker/test/e2e/passing.spec.ts | 2 +- .../worker/test/e2e/predicateIsolation.spec.ts | 2 +- .../worker/test/e2e/propertyIsolation.spec.ts | 2 +- packages/worker/test/e2e/unregistered.spec.ts | 2 +- 18 files changed, 78 insertions(+), 95 deletions(-) delete mode 100644 packages/worker/test/e2e/__properties__/blockEventLoop.cjs create mode 100644 packages/worker/test/e2e/__properties__/blockEventLoop.mjs rename packages/worker/test/e2e/__properties__/{concurrentAssert.cjs => concurrentAssert.mjs} (72%) delete mode 100644 packages/worker/test/e2e/__properties__/failing.cjs create mode 100644 packages/worker/test/e2e/__properties__/failing.mjs delete mode 100644 packages/worker/test/e2e/__properties__/passing.cjs create mode 100644 packages/worker/test/e2e/__properties__/passing.mjs rename packages/worker/test/e2e/__properties__/{predicateIsolation.cjs => predicateIsolation.mjs} (61%) rename packages/worker/test/e2e/__properties__/{propertyIsolation.cjs => propertyIsolation.mjs} (74%) delete mode 100644 packages/worker/test/e2e/__properties__/unregistered.cjs create mode 100644 packages/worker/test/e2e/__properties__/unregistered.mjs diff --git a/packages/worker/test/e2e/__properties__/blockEventLoop.cjs b/packages/worker/test/e2e/__properties__/blockEventLoop.cjs deleted file mode 100644 index a05b14bcb5a..00000000000 --- a/packages/worker/test/e2e/__properties__/blockEventLoop.cjs +++ /dev/null @@ -1,18 +0,0 @@ -// @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); - -const property = propertyFor(pathToFileURL(__filename)); - -exports.blockEventLoopProperty = property( - fc.integer({ min: -1000, max: 1000 }), - fc.integer({ min: -1000, max: 1000 }), - (from, to) => { - for (let i = from; i !== to; ++i) { - // Loop from "from" to "to" possibly NEVER ending - } - }, -); diff --git a/packages/worker/test/e2e/__properties__/blockEventLoop.mjs b/packages/worker/test/e2e/__properties__/blockEventLoop.mjs new file mode 100644 index 00000000000..b2ccda39ea0 --- /dev/null +++ b/packages/worker/test/e2e/__properties__/blockEventLoop.mjs @@ -0,0 +1,15 @@ +// @ts-check +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; + +const property = propertyFor(new URL(import.meta.url)); + +export const blockEventLoopProperty = property( + fc.integer({ min: -1000, max: 1000 }), + fc.integer({ min: -1000, max: 1000 }), + (from, to) => { + for (let i = from; i !== to; ++i) { + // Loop from "from" to "to" possibly NEVER ending + } + }, +); diff --git a/packages/worker/test/e2e/__properties__/concurrentAssert.cjs b/packages/worker/test/e2e/__properties__/concurrentAssert.mjs similarity index 72% rename from packages/worker/test/e2e/__properties__/concurrentAssert.cjs rename to packages/worker/test/e2e/__properties__/concurrentAssert.mjs index 532d6f46d19..292d0a749e1 100644 --- a/packages/worker/test/e2e/__properties__/concurrentAssert.cjs +++ b/packages/worker/test/e2e/__properties__/concurrentAssert.mjs @@ -1,13 +1,13 @@ // @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require, __dirname */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); -const { writeFileSync, existsSync, rmSync } = require('fs'); -const path = require('path'); +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; +import { writeFileSync, existsSync, rmSync } from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; -const property = propertyFor(pathToFileURL(__filename)); +const __dirname = fileURLToPath(new URL('.', import.meta.url)); + +const property = propertyFor(new URL(import.meta.url)); let index = 0; function nextFilenameQuestion() { diff --git a/packages/worker/test/e2e/__properties__/failing.cjs b/packages/worker/test/e2e/__properties__/failing.cjs deleted file mode 100644 index af3089fa892..00000000000 --- a/packages/worker/test/e2e/__properties__/failing.cjs +++ /dev/null @@ -1,16 +0,0 @@ -// @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); - -const property = propertyFor(pathToFileURL(__filename)); - -exports.failingProperty = property( - fc.integer({ min: -1000, max: 1000 }), - fc.integer({ min: -1000, max: 1000 }), - (_from, _to) => { - throw new Error("I'm a failing property"); - }, -); diff --git a/packages/worker/test/e2e/__properties__/failing.mjs b/packages/worker/test/e2e/__properties__/failing.mjs new file mode 100644 index 00000000000..a18a737c068 --- /dev/null +++ b/packages/worker/test/e2e/__properties__/failing.mjs @@ -0,0 +1,13 @@ +// @ts-check +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; + +const property = propertyFor(new URL(import.meta.url)); + +export const failingProperty = property( + fc.integer({ min: -1000, max: 1000 }), + fc.integer({ min: -1000, max: 1000 }), + (_from, _to) => { + throw new Error("I'm a failing property"); + }, +); diff --git a/packages/worker/test/e2e/__properties__/passing.cjs b/packages/worker/test/e2e/__properties__/passing.cjs deleted file mode 100644 index 2c7970111e1..00000000000 --- a/packages/worker/test/e2e/__properties__/passing.cjs +++ /dev/null @@ -1,18 +0,0 @@ -// @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); - -const property = propertyFor(pathToFileURL(__filename)); - -exports.passingProperty = property( - fc.integer({ min: -1000, max: 1000 }), - fc.integer({ min: -1000, max: 1000 }), - (from, to) => { - for (let i = from; i <= to; ++i) { - // Loop from "from" to "to" ALWAYS finite - } - }, -); diff --git a/packages/worker/test/e2e/__properties__/passing.mjs b/packages/worker/test/e2e/__properties__/passing.mjs new file mode 100644 index 00000000000..65513243e94 --- /dev/null +++ b/packages/worker/test/e2e/__properties__/passing.mjs @@ -0,0 +1,16 @@ +// @ts-check +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; + +console.log(new URL(import.meta.url)) +const property = propertyFor(new URL(import.meta.url)); + +export const passingProperty = property( + fc.integer({ min: -1000, max: 1000 }), + fc.integer({ min: -1000, max: 1000 }), + (from, to) => { + for (let i = from; i <= to; ++i) { + // Loop from "from" to "to" ALWAYS finite + } + }, +); diff --git a/packages/worker/test/e2e/__properties__/predicateIsolation.cjs b/packages/worker/test/e2e/__properties__/predicateIsolation.mjs similarity index 61% rename from packages/worker/test/e2e/__properties__/predicateIsolation.cjs rename to packages/worker/test/e2e/__properties__/predicateIsolation.mjs index cb6e7d3ed83..0e66b1c9f0f 100644 --- a/packages/worker/test/e2e/__properties__/predicateIsolation.cjs +++ b/packages/worker/test/e2e/__properties__/predicateIsolation.mjs @@ -1,13 +1,10 @@ // @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; const counters = {}; function buildProperty(isolationLevel) { - return propertyFor(pathToFileURL(__filename), { isolationLevel })( + return propertyFor(new URL(import.meta.url), { isolationLevel })( fc.integer({ min: -1000, max: 1000 }), fc.integer({ min: -1000, max: 1000 }), (_from, _to) => { @@ -19,7 +16,7 @@ function buildProperty(isolationLevel) { ); } -exports.predicateIsolation = { +export const predicateIsolation = { predicateLevel: buildProperty('predicate'), propertyLevel: buildProperty('property'), fileLevel: buildProperty('file'), diff --git a/packages/worker/test/e2e/__properties__/propertyIsolation.cjs b/packages/worker/test/e2e/__properties__/propertyIsolation.mjs similarity index 74% rename from packages/worker/test/e2e/__properties__/propertyIsolation.cjs rename to packages/worker/test/e2e/__properties__/propertyIsolation.mjs index ab0be8d98f3..ce9ee5b1cab 100644 --- a/packages/worker/test/e2e/__properties__/propertyIsolation.cjs +++ b/packages/worker/test/e2e/__properties__/propertyIsolation.mjs @@ -1,13 +1,10 @@ // @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; const counters = {}; function buildPropertyWarmUp(isolationLevel) { - return propertyFor(pathToFileURL(__filename), { isolationLevel })( + return propertyFor(new URL(import.meta.url), { isolationLevel })( fc.integer({ min: -1000, max: 1000 }), fc.integer({ min: -1000, max: 1000 }), (_from, _to) => { @@ -19,7 +16,7 @@ function buildPropertyWarmUp(isolationLevel) { ); } function buildPropertyRun(isolationLevel) { - return propertyFor(pathToFileURL(__filename), { isolationLevel })( + return propertyFor(new URL(import.meta.url), { isolationLevel })( fc.integer({ min: -1000, max: 1000 }), fc.integer({ min: -1000, max: 1000 }), (_from, _to) => { @@ -31,7 +28,7 @@ function buildPropertyRun(isolationLevel) { ); } -exports.propertyIsolation = { +export const propertyIsolation = { predicateLevelWarmUp: buildPropertyWarmUp('predicate'), predicateLevelRun: buildPropertyRun('predicate'), propertyLevelWarmUp: buildPropertyWarmUp('property'), diff --git a/packages/worker/test/e2e/__properties__/unregistered.cjs b/packages/worker/test/e2e/__properties__/unregistered.cjs deleted file mode 100644 index 15033aacd86..00000000000 --- a/packages/worker/test/e2e/__properties__/unregistered.cjs +++ /dev/null @@ -1,13 +0,0 @@ -// @ts-check -/* eslint-disable @typescript-eslint/no-var-requires */ -/* global __filename, exports, require */ -const { pathToFileURL } = require('node:url'); -const fc = require('fast-check'); -const { propertyFor } = require('@fast-check/worker'); - -const property = propertyFor(pathToFileURL(__filename)); - -exports.buildUnregisteredProperty = () => - property(fc.integer({ min: -1000, max: 1000 }), fc.integer({ min: -1000, max: 1000 }), (_from, _to) => { - return true; // success - }); diff --git a/packages/worker/test/e2e/__properties__/unregistered.mjs b/packages/worker/test/e2e/__properties__/unregistered.mjs new file mode 100644 index 00000000000..65983b082f3 --- /dev/null +++ b/packages/worker/test/e2e/__properties__/unregistered.mjs @@ -0,0 +1,10 @@ +// @ts-check +import fc from 'fast-check'; +import { propertyFor } from '@fast-check/worker'; + +const property = propertyFor(new URL(import.meta.url)); + +export const buildUnregisteredProperty = () => + property(fc.integer({ min: -1000, max: 1000 }), fc.integer({ min: -1000, max: 1000 }), (_from, _to) => { + return true; // success + }); diff --git a/packages/worker/test/e2e/blockEventLoop.spec.ts b/packages/worker/test/e2e/blockEventLoop.spec.ts index d901da8db50..74c38c4a45d 100644 --- a/packages/worker/test/e2e/blockEventLoop.spec.ts +++ b/packages/worker/test/e2e/blockEventLoop.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { blockEventLoopProperty } from './__properties__/blockEventLoop.cjs'; +import { blockEventLoopProperty } from './__properties__/blockEventLoop.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/concurrentAssert.spec.ts b/packages/worker/test/e2e/concurrentAssert.spec.ts index febcf083eda..61f1d4df3d1 100644 --- a/packages/worker/test/e2e/concurrentAssert.spec.ts +++ b/packages/worker/test/e2e/concurrentAssert.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { readerAssert, writerAssert } from './__properties__/concurrentAssert.cjs'; +import { readerAssert, writerAssert } from './__properties__/concurrentAssert.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/failing.spec.ts b/packages/worker/test/e2e/failing.spec.ts index 07ab8837455..1ae1b9d35b3 100644 --- a/packages/worker/test/e2e/failing.spec.ts +++ b/packages/worker/test/e2e/failing.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { failingProperty } from './__properties__/failing.cjs'; +import { failingProperty } from './__properties__/failing.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/passing.spec.ts b/packages/worker/test/e2e/passing.spec.ts index ecc876ef2fb..a64a2b2a69e 100644 --- a/packages/worker/test/e2e/passing.spec.ts +++ b/packages/worker/test/e2e/passing.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { passingProperty } from './__properties__/passing.cjs'; +import { passingProperty } from './__properties__/passing.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/predicateIsolation.spec.ts b/packages/worker/test/e2e/predicateIsolation.spec.ts index bd45948c7a4..65c690a9db4 100644 --- a/packages/worker/test/e2e/predicateIsolation.spec.ts +++ b/packages/worker/test/e2e/predicateIsolation.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { predicateIsolation } from './__properties__/predicateIsolation.cjs'; +import { predicateIsolation } from './__properties__/predicateIsolation.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/propertyIsolation.spec.ts b/packages/worker/test/e2e/propertyIsolation.spec.ts index ec8a3dc0dc4..c6abbe4c66b 100644 --- a/packages/worker/test/e2e/propertyIsolation.spec.ts +++ b/packages/worker/test/e2e/propertyIsolation.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { propertyIsolation } from './__properties__/propertyIsolation.cjs'; +import { propertyIsolation } from './__properties__/propertyIsolation.mjs'; if (isMainThread) { describe('@fast-check/worker', () => { diff --git a/packages/worker/test/e2e/unregistered.spec.ts b/packages/worker/test/e2e/unregistered.spec.ts index 16971f4760c..56dc9dbea4b 100644 --- a/packages/worker/test/e2e/unregistered.spec.ts +++ b/packages/worker/test/e2e/unregistered.spec.ts @@ -4,7 +4,7 @@ import { assert } from '@fast-check/worker'; /* eslint-disable @typescript-eslint/ban-ts-comment */ // @ts-ignore -import { buildUnregisteredProperty } from './__properties__/unregistered.cjs'; +import { buildUnregisteredProperty } from './__properties__/unregistered.mjs'; if (isMainThread) { describe('@fast-check/worker', () => {