{"files":[{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/package.json"},{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/src\/compiler-utils.ts"},{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/src\/constants.ts"},{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/src\/fixture-utils.ts"},{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/src\/index.ts"},{"status":"A","path":"compiler\/forget\/packages\/fixture-test-utils\/tsconfig.json"},{"status":"M","path":"compiler\/forget\/packages\/snap\/package.json"},{"status":"M","path":"compiler\/forget\/packages\/snap\/src\/compiler-worker.ts"},{"status":"M","path":"compiler\/forget\/packages\/snap\/src\/main.ts"},{"status":"M","path":"compiler\/forget\/packages\/snap\/src\/runner.ts"},{"status":"D","path":"compiler\/forget\/packages\/snap\/src\/utils.ts"}],"patch":"diff --git a\/compiler\/forget\/packages\/fixture-test-utils\/package.json b\/compiler\/forget\/packages\/fixture-test-utils\/package.json\nnew file mode 100644\nindex 0000000000..6c47e26a5c\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/package.json\n@@ -0,0 +1,25 @@\n+{\n+ \"name\": \"fixture-test-utils\",\n+ \"version\": \"1.0.0\",\n+ \"main\": \"dist\/index.js\",\n+ \"license\": \"MIT\",\n+ \"scripts\": {\n+ \"build\": \"rimraf dist && tsc\",\n+ \"test\": \"echo 'no tests'\",\n+ \"prettier\": \"prettier --write src\"\n+ },\n+ \"dependencies\": {\n+ \"@parcel\/watcher\": \"^2.1.0\",\n+ \"chalk\": \"4\",\n+ \"readline\": \"^1.3.0\",\n+ \"typescript\": \"^5.1.0\",\n+ \"yargs\": \"^17.7.1\"\n+ },\n+ \"devDependencies\": {\n+ \"@types\/node\": \"^18.7.18\",\n+ \"@typescript-eslint\/eslint-plugin\": \"^5.51.0\",\n+ \"@typescript-eslint\/parser\": \"^5.51.0\",\n+ \"prettier\": \"2.8.8\",\n+ \"rimraf\": \"^3.0.2\"\n+ }\n+}\ndiff --git a\/compiler\/forget\/packages\/fixture-test-utils\/src\/compiler-utils.ts b\/compiler\/forget\/packages\/fixture-test-utils\/src\/compiler-utils.ts\nnew file mode 100644\nindex 0000000000..c9439efe8b\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/src\/compiler-utils.ts\n@@ -0,0 +1,122 @@\n+import type { runReactForgetBabelPlugin as RunReactForgetBabelPlugin } from \"babel-plugin-react-forget\/src\/Babel\/RunReactForgetBabelPlugin\";\n+import type { Effect, ValueKind } from \"babel-plugin-react-forget\/src\/HIR\";\n+\n+const FlowPragmas = [\/\\\/\\\/\\s@flow$\/gm, \/\\*\\s@flow$\/gm];\n+\n+export function parseLanguage(source: string): \"flow\" | \"typescript\" {\n+ let useFlow = false;\n+ for (const flowPragma of FlowPragmas) {\n+ useFlow ||= !!source.match(flowPragma);\n+ }\n+ return useFlow ? \"flow\" : \"typescript\";\n+}\n+\n+export function transformFixtureInput(\n+ input: string,\n+ basename: string,\n+ pluginFn: typeof RunReactForgetBabelPlugin,\n+ includeAst: boolean = false\n+) {\n+ \/\/ Extract the first line to quickly check for custom test directives\n+ const firstLine = input.substring(0, input.indexOf(\"\\n\"));\n+\n+ let language = parseLanguage(firstLine);\n+ let enableOnlyOnUseForgetDirective = false;\n+ let gating = null;\n+ let instrumentForget = null;\n+ let panicOnBailout = true;\n+ let memoizeJsxElements = true;\n+ let enableAssumeHooksFollowRulesOfReact = false;\n+ let enableTreatHooksAsFunctions = true;\n+ let disableAllMemoization = false;\n+ let validateRefAccessDuringRender = true;\n+ let validateNoSetStateInRender = true;\n+ let enableEmitFreeze = null;\n+ let enableOptimizeFunctionExpressions = true;\n+ let enableOnlyOnReactScript = false;\n+\n+ if (firstLine.indexOf(\"@forgetDirective\") !== -1) {\n+ enableOnlyOnUseForgetDirective = true;\n+ }\n+ if (firstLine.includes(\"@gating\")) {\n+ gating = {\n+ source: \"ReactForgetFeatureFlag\",\n+ importSpecifierName: \"isForgetEnabled_Fixtures\",\n+ };\n+ }\n+ if (firstLine.includes(\"@instrumentForget\")) {\n+ instrumentForget = {\n+ source: \"react-forget-runtime\",\n+ importSpecifierName: \"useRenderCounter\",\n+ };\n+ }\n+ if (firstLine.includes(\"@panicOnBailout false\")) {\n+ panicOnBailout = false;\n+ }\n+ if (firstLine.includes(\"@memoizeJsxElements false\")) {\n+ memoizeJsxElements = false;\n+ }\n+ if (firstLine.includes(\"@enableAssumeHooksFollowRulesOfReact true\")) {\n+ enableAssumeHooksFollowRulesOfReact = true;\n+ }\n+ if (firstLine.includes(\"@enableTreatHooksAsFunctions false\")) {\n+ enableTreatHooksAsFunctions = false;\n+ }\n+ if (firstLine.includes(\"@disableAllMemoization true\")) {\n+ disableAllMemoization = true;\n+ }\n+ if (firstLine.includes(\"@validateRefAccessDuringRender false\")) {\n+ validateRefAccessDuringRender = false;\n+ }\n+ if (firstLine.includes(\"@validateNoSetStateInRender false\")) {\n+ validateNoSetStateInRender = false;\n+ }\n+ if (firstLine.includes(\"@enableOptimizeFunctionExpressions false\")) {\n+ enableOptimizeFunctionExpressions = false;\n+ }\n+ if (firstLine.includes(\"@enableEmitFreeze\")) {\n+ enableEmitFreeze = {\n+ source: \"react-forget-runtime\",\n+ importSpecifierName: \"makeReadOnly\",\n+ };\n+ }\n+ if (firstLine.indexOf(\"@reactScriptDirective\") !== -1) {\n+ enableOnlyOnReactScript = true;\n+ language = \"flow\";\n+ }\n+\n+ return pluginFn(input, basename, language, {\n+ environment: {\n+ customHooks: new Map([\n+ [\n+ \"useFreeze\",\n+ {\n+ valueKind: \"frozen\" as ValueKind,\n+ effectKind: \"freeze\" as Effect,\n+ },\n+ ],\n+ ]),\n+ enableAssumeHooksFollowRulesOfReact,\n+ enableFunctionCallSignatureOptimizations: true,\n+ disableAllMemoization,\n+ enableTreatHooksAsFunctions,\n+ inlineUseMemo: true,\n+ memoizeJsxElements,\n+ validateHooksUsage: true,\n+ validateRefAccessDuringRender,\n+ validateFrozenLambdas: true,\n+ validateNoSetStateInRender,\n+ enableEmitFreeze,\n+ enableOptimizeFunctionExpressions,\n+ assertValidMutableRanges: true,\n+ },\n+ enableOnlyOnUseForgetDirective,\n+ enableOnlyOnReactScript,\n+ logger: null,\n+ gating,\n+ instrumentForget,\n+ panicOnBailout,\n+ isDev: true,\n+ noEmit: false,\n+ });\n+}\ndiff --git a\/compiler\/forget\/packages\/fixture-test-utils\/src\/constants.ts b\/compiler\/forget\/packages\/fixture-test-utils\/src\/constants.ts\nnew file mode 100644\nindex 0000000000..a55c2f1b23\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/src\/constants.ts\n@@ -0,0 +1,24 @@\n+import path from \"path\";\n+\n+\/\/ We assume this is run from `babel-plugin-react-forget`\n+export const COMPILER_PATH = path.join(\n+ process.cwd(),\n+ \"dist\",\n+ \"Babel\",\n+ \"RunReactForgetBabelPlugin.js\"\n+);\n+export const LOGGER_PATH = path.join(\n+ process.cwd(),\n+ \"dist\",\n+ \"Utils\",\n+ \"logger.js\"\n+);\n+export const FIXTURES_PATH = path.join(\n+ process.cwd(),\n+ \"src\",\n+ \"__tests__\",\n+ \"fixtures\",\n+ \"compiler\"\n+);\n+export const FILTER_FILENAME = \"testfilter.txt\";\n+export const FILTER_PATH = path.join(process.cwd(), FILTER_FILENAME);\ndiff --git a\/compiler\/forget\/packages\/fixture-test-utils\/src\/fixture-utils.ts b\/compiler\/forget\/packages\/fixture-test-utils\/src\/fixture-utils.ts\nnew file mode 100644\nindex 0000000000..1cc3bfa557\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/src\/fixture-utils.ts\n@@ -0,0 +1,161 @@\n+import fs from \"fs\/promises\";\n+import glob from \"glob\";\n+import invariant from \"invariant\";\n+import path from \"path\";\n+import { FILTER_PATH, FIXTURES_PATH } from \".\/constants\";\n+\n+export type TestFilter =\n+ | {\n+ kind: \"only\";\n+ paths: Array;\n+ }\n+ | {\n+ kind: \"skip\";\n+ paths: Array;\n+ };\n+\n+async function exists(file: string): Promise {\n+ try {\n+ await fs.access(file);\n+ return true;\n+ } catch {\n+ return false;\n+ }\n+}\n+\n+export async function readTestFilter(): Promise {\n+ if (!(await exists(FILTER_PATH))) {\n+ throw new Error(`testfilter file not found at ${FILTER_PATH}`);\n+ }\n+\n+ const input = await fs.readFile(FILTER_PATH, \"utf8\");\n+ const lines = input.trim().split(\"\\n\");\n+ if (lines.length < 2) {\n+ console.warn(\"Misformed filter file. Expected at least two lines.\");\n+ return null;\n+ }\n+\n+ let filter: \"only\" | \"skip\" | null = null;\n+ if (lines[0]!.indexOf(\"@only\") !== -1) {\n+ filter = \"only\";\n+ }\n+ if (lines[0]!.indexOf(\"@skip\") !== -1) {\n+ filter = \"skip\";\n+ }\n+ if (filter === null) {\n+ console.warn(\n+ \"Misformed filter file. Expected first line to contain @only or @skip\"\n+ );\n+ return null;\n+ }\n+ lines.shift();\n+ return {\n+ kind: filter,\n+ paths: lines,\n+ };\n+}\n+\n+export type TestFixture = {\n+ basename: string;\n+ inputPath: string;\n+ inputExists: boolean;\n+ outputPath: string;\n+ outputExists: boolean;\n+};\n+\n+export function getFixtures(\n+ filter: TestFilter | null\n+): Map {\n+ \/\/ search for fixtures within nested directories\n+ const files = glob.sync(`**\/*.{js,md}`, {\n+ cwd: FIXTURES_PATH,\n+ });\n+ const fixtures: Map = new Map();\n+\n+ for (const filePath of files) {\n+ const basename = path.basename(\n+ path.basename(filePath, \".js\"),\n+ \".expect.md\"\n+ );\n+ \/\/ \"partial\" paths do not include suffixes\n+ const partialRelativePath = path.join(path.dirname(filePath), basename);\n+ \/\/ Replicate jest test behavior\n+ if (basename.startsWith(\"todo.\")) {\n+ continue;\n+ }\n+ if (filter) {\n+ if (\n+ filter.kind === \"only\" &&\n+ filter.paths.indexOf(partialRelativePath) === -1\n+ ) {\n+ continue;\n+ } else if (\n+ filter.kind === \"skip\" &&\n+ filter.paths.indexOf(partialRelativePath) !== -1\n+ ) {\n+ continue;\n+ }\n+ }\n+\n+ let fixtureInfo = fixtures.get(partialRelativePath);\n+ if (fixtureInfo === undefined) {\n+ const partialAbsolutePath = path.join(FIXTURES_PATH, partialRelativePath);\n+ fixtureInfo = {\n+ basename,\n+ inputPath: `${partialAbsolutePath}.js`,\n+ inputExists: false,\n+ outputPath: `${partialAbsolutePath}.expect.md`,\n+ outputExists: false,\n+ };\n+ fixtures.set(partialRelativePath, fixtureInfo);\n+ }\n+\n+ if (filePath.endsWith(\".js\")) {\n+ fixtureInfo.inputExists = true;\n+ } else {\n+ fixtureInfo.outputExists = true;\n+ }\n+ }\n+\n+ return fixtures;\n+}\n+\n+function wrapWithTripleBackticks(s: string, ext: string | null = null): string {\n+ return `\\`\\`\\`${ext ?? \"\"}\n+${s}\n+\\`\\`\\``;\n+}\n+\n+export function writeOutputToString(\n+ input: string,\n+ output: string | null,\n+ error: Error | null\n+) {\n+ \/\/ leading newline intentional\n+ let result = `\n+## Input\n+\n+${wrapWithTripleBackticks(input, \"javascript\")}\n+`; \/\/ trailing newline + space internional\n+\n+ if (output != null) {\n+ result += `\n+## Code\n+\n+${output == null ? \"[ none ]\" : wrapWithTripleBackticks(output, \"javascript\")}\n+`;\n+ } else {\n+ result += \"\\n\";\n+ }\n+\n+ if (error != null) {\n+ const errorMessage = error.message.replace(\/^\\\/.*?:\\s\/, \"\");\n+\n+ result += `\n+## Error\n+\n+${wrapWithTripleBackticks(errorMessage)}\n+ \\n`;\n+ }\n+ return result + ` `;\n+}\ndiff --git a\/compiler\/forget\/packages\/fixture-test-utils\/src\/index.ts b\/compiler\/forget\/packages\/fixture-test-utils\/src\/index.ts\nnew file mode 100644\nindex 0000000000..e3a8824c01\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/src\/index.ts\n@@ -0,0 +1,3 @@\n+export * from \".\/constants\";\n+export * from \".\/fixture-utils\";\n+export * from \".\/compiler-utils\";\ndiff --git a\/compiler\/forget\/packages\/fixture-test-utils\/tsconfig.json b\/compiler\/forget\/packages\/fixture-test-utils\/tsconfig.json\nnew file mode 100644\nindex 0000000000..4420706d67\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/fixture-test-utils\/tsconfig.json\n@@ -0,0 +1,20 @@\n+{\n+ \"extends\": \"@tsconfig\/node16-strictest\/tsconfig.json\",\n+ \"compilerOptions\": {\n+ \"declaration\": true,\n+ \"outDir\": \"dist\",\n+ \"jsx\": \"react-jsxdev\",\n+\n+ \/\/ weaken strictness from preset\n+ \"importsNotUsedAsValues\": \"remove\",\n+ \"noUncheckedIndexedAccess\": false,\n+ \"noUnusedParameters\": false,\n+ \"useUnknownInCatchVariables\": false,\n+ \"target\": \"ES2015\",\n+ \/\/ ideally turn off only during dev, or on a per-file basis\n+ \"noUnusedLocals\": false,\n+ \"sourceMap\": true\n+ },\n+ \"exclude\": [\"node_modules\"],\n+ \"include\": [\"src\/**\/*.ts\"]\n+}\ndiff --git a\/compiler\/forget\/packages\/snap\/package.json b\/compiler\/forget\/packages\/snap\/package.json\nindex 4cc6c25e72..c86bfd3b6b 100644\n--- a\/compiler\/forget\/packages\/snap\/package.json\n+++ b\/compiler\/forget\/packages\/snap\/package.json\n@@ -9,7 +9,7 @@\n \"src\"\n ],\n \"scripts\": {\n- \"build\": \"rimraf dist && tsc\",\n+ \"build\": \"yarn workspace fixture-test-utils run build && rimraf dist && tsc\",\n \"test\": \"echo 'no tests'\",\n \"lint\": \"yarn eslint src\"\n },\n@@ -22,7 +22,8 @@\n \"chalk\": \"4\",\n \"readline\": \"^1.3.0\",\n \"typescript\": \"^5.1.0\",\n- \"yargs\": \"^17.7.1\"\n+ \"yargs\": \"^17.7.1\",\n+ \"fixture-test-utils\": \"*\"\n },\n \"devDependencies\": {\n \"@types\/node\": \"^18.7.18\",\ndiff --git a\/compiler\/forget\/packages\/snap\/src\/compiler-worker.ts b\/compiler\/forget\/packages\/snap\/src\/compiler-worker.ts\nindex f06177ffc6..fd44aaa726 100644\n--- a\/compiler\/forget\/packages\/snap\/src\/compiler-worker.ts\n+++ b\/compiler\/forget\/packages\/snap\/src\/compiler-worker.ts\n@@ -6,9 +6,8 @@\n *\/\n \n import type { runReactForgetBabelPlugin as RunReactForgetBabelPlugin } from 'babel-plugin-react-forget\/src\/Babel\/RunReactForgetBabelPlugin';\n-import type { Effect, ValueKind } from 'babel-plugin-react-forget\/src\/HIR';\n+import { TestFixture, transformFixtureInput, writeOutputToString } from 'fixture-test-utils';\n import fs from \"fs\/promises\";\n-import { exists } from \".\/utils\";\n \n const originalConsoleError = console.error;\n \n@@ -33,12 +32,6 @@ export type TestResult = {\n unexpectedError: string | null;\n };\n \n-export type TestFixture = {\n- basename: string;\n- inputPath: string;\n- outputPath: string;\n-};\n-\n export async function compile(\n compilerPath: string,\n loggerPath: string,\n@@ -54,11 +47,11 @@ export async function compile(\n clearRequireCache();\n }\n version = compilerVersion;\n- const { inputPath, outputPath, basename } = fixture;\n- const input = (await exists(inputPath))\n+ const { inputPath, inputExists, outputPath, outputExists, basename } = fixture;\n+ const input = inputExists\n ? await fs.readFile(inputPath, \"utf8\")\n : null;\n- const expected = (await exists(outputPath))\n+ const expected = outputExists\n ? await fs.readFile(outputPath, \"utf8\")\n : null;\n \n@@ -86,108 +79,7 @@ export async function compile(\n \/\/ since console log order is non-deterministic\n const shouldLogPragma = input.split(\"\\n\")[0].includes(\"@debug\");\n toggleLogging(isOnlyFixture && shouldLogPragma);\n-\n- \/\/ Extract the first line to quickly check for custom test directives\n- const firstLine = input.substring(0, input.indexOf(\"\\n\"));\n- let language = parseLanguage(firstLine);\n-\n- let enableOnlyOnUseForgetDirective = false;\n- let gating = null;\n- let instrumentForget = null;\n- let panicOnBailout = true;\n- let memoizeJsxElements = true;\n- let enableAssumeHooksFollowRulesOfReact = false;\n- let enableTreatHooksAsFunctions = true;\n- let disableAllMemoization = false;\n- let validateRefAccessDuringRender = true;\n- let validateNoSetStateInRender = true;\n- let enableEmitFreeze = null;\n- let enableOptimizeFunctionExpressions = true;\n- let enableOnlyOnReactScript = false;\n- if (firstLine.indexOf(\"@forgetDirective\") !== -1) {\n- enableOnlyOnUseForgetDirective = true;\n- }\n- if (firstLine.includes(\"@gating\")) {\n- gating = {\n- source: \"ReactForgetFeatureFlag\",\n- importSpecifierName: \"isForgetEnabled_Fixtures\",\n- };\n- }\n- if (firstLine.includes(\"@instrumentForget\")) {\n- instrumentForget = {\n- source: \"react-forget-runtime\",\n- importSpecifierName: \"useRenderCounter\",\n- };\n- }\n- if (firstLine.includes(\"@panicOnBailout false\")) {\n- panicOnBailout = false;\n- }\n- if (firstLine.includes(\"@memoizeJsxElements false\")) {\n- memoizeJsxElements = false;\n- }\n- if (firstLine.includes(\"@enableAssumeHooksFollowRulesOfReact true\")) {\n- enableAssumeHooksFollowRulesOfReact = true;\n- }\n- if (firstLine.includes(\"@enableTreatHooksAsFunctions false\")) {\n- enableTreatHooksAsFunctions = false;\n- }\n- if (firstLine.includes(\"@disableAllMemoization true\")) {\n- disableAllMemoization = true;\n- }\n- if (firstLine.includes(\"@validateRefAccessDuringRender false\")) {\n- validateRefAccessDuringRender = false;\n- }\n- if (firstLine.includes(\"@validateNoSetStateInRender false\")) {\n- validateNoSetStateInRender = false;\n- }\n- if (firstLine.includes(\"@enableOptimizeFunctionExpressions false\")) {\n- enableOptimizeFunctionExpressions = false;\n- }\n- if (firstLine.includes(\"@enableEmitFreeze\")) {\n- enableEmitFreeze = {\n- source: \"react-forget-runtime\",\n- importSpecifierName: \"makeReadOnly\",\n- };\n- }\n- if (firstLine.indexOf(\"@reactScriptDirective\") !== -1) {\n- enableOnlyOnReactScript = true;\n- language = \"flow\";\n- }\n-\n- code = runReactForgetBabelPlugin(input, basename, language, {\n- environment: {\n- customHooks: new Map([\n- [\n- \"useFreeze\",\n- {\n- valueKind: \"frozen\" as ValueKind,\n- effectKind: \"freeze\" as Effect,\n- },\n- ],\n- ]),\n- enableAssumeHooksFollowRulesOfReact,\n- enableFunctionCallSignatureOptimizations: true,\n- disableAllMemoization,\n- enableTreatHooksAsFunctions,\n- inlineUseMemo: true,\n- memoizeJsxElements,\n- validateHooksUsage: true,\n- validateRefAccessDuringRender,\n- validateFrozenLambdas: true,\n- validateNoSetStateInRender,\n- enableEmitFreeze,\n- enableOptimizeFunctionExpressions,\n- assertValidMutableRanges: true,\n- },\n- enableOnlyOnUseForgetDirective,\n- enableOnlyOnReactScript,\n- logger: null,\n- gating,\n- instrumentForget,\n- panicOnBailout,\n- isDev: true,\n- noEmit: false,\n- }).code;\n+ code = transformFixtureInput(input, basename, runReactForgetBabelPlugin).code;\n } catch (e) {\n error = e;\n }\n@@ -202,92 +94,28 @@ export async function compile(\n }\n }\n \n- let output: string;\n+ const output = writeOutputToString(input, code, error);\n const expectError = basename.startsWith(\"error.\");\n+ let unexpectedError: string | null = null;\n if (expectError) {\n if (error === null) {\n- return {\n- inputPath,\n- outputPath,\n- actual: code,\n- expected,\n- unexpectedError: `Expected an error to be thrown for fixture: '${basename}', remove the 'error.' prefix if an error is not expected.`,\n- };\n- } else if (code != null) {\n- output = `${formatOutput(code)}\\n${formatErrorOutput(error)}`;\n- } else {\n- output = formatErrorOutput(error);\n+ unexpectedError = `Expected an error to be thrown for fixture: '${basename}', remove the 'error.' prefix if an error is not expected.`;\n }\n } else {\n if (error !== null) {\n- return {\n- inputPath,\n- outputPath,\n- actual: code,\n- expected,\n- unexpectedError: `Expected fixture '${basename}' to succeed but it failed with error:\\n\\n${error.message}`,\n- };\n+ unexpectedError = `Expected fixture '${basename}' to succeed but it failed with error:\\n\\n${error.message}`;\n+ } else if (code == null || code.length === 0) {\n+ unexpectedError = `Expected output for fixture '${basename}'.`;\n }\n- if (code == null || code.length === 0) {\n- return {\n- inputPath,\n- outputPath,\n- actual: code,\n- expected,\n- unexpectedError: `Expected output for fixture '${basename}'.`,\n- };\n- }\n- output = formatOutput(code);\n }\n \n- \/\/ leading newline intentional\n- const actual = `\n-## Input\n-\n-${wrapWithTripleBackticks(input, \"javascript\")}\n-\n-${output}\n- `; \/\/ trailing newline + space internional\n-\n console.error = originalConsoleError;\n \n return {\n inputPath,\n outputPath,\n- actual,\n+ actual: output,\n expected,\n- unexpectedError: null,\n+ unexpectedError,\n };\n }\n-\n-function formatErrorOutput(error: Error): string {\n- error.message = error.message.replace(\/^\\\/.*?:\\s\/, \"\");\n- return `\n-## Error\n-\n-${wrapWithTripleBackticks(error.message)}\n- `;\n-}\n-\n-function formatOutput(code: string): string {\n- return `\n-## Code\n-\n-${wrapWithTripleBackticks(code, \"javascript\")}\n- `.trim();\n-}\n-\n-function wrapWithTripleBackticks(s: string, ext: string | null = null): string {\n- return `\\`\\`\\`${ext ?? \"\"}\n-${s}\n-\\`\\`\\``;\n-}\n-\n-const FlowPragmas = [\/\\\/\\\/\\s@flow$\/gm, \/\\*\\s@flow$\/gm];\n-function parseLanguage(source: string): \"flow\" | \"typescript\" {\n- let useFlow = false;\n- for (const flowPragma of FlowPragmas) {\n- useFlow ||= !!source.match(flowPragma);\n- }\n- return useFlow ? \"flow\" : \"typescript\";\n-}\ndiff --git a\/compiler\/forget\/packages\/snap\/src\/main.ts b\/compiler\/forget\/packages\/snap\/src\/main.ts\nindex 6ee3f7a806..d1ba9c7e38 100644\n--- a\/compiler\/forget\/packages\/snap\/src\/main.ts\n+++ b\/compiler\/forget\/packages\/snap\/src\/main.ts\n@@ -17,7 +17,7 @@ if (process.stdin.isTTY) {\n process.stdin.setRawMode(true);\n }\n \n-process.stdin.on(\"keypress\", function (chunk, key) {\n+process.stdin.on(\"keypress\", function (_, key) {\n if (key && key.name === \"c\" && key.ctrl) {\n \/\/ handle sigint\n if (childProc) {\ndiff --git a\/compiler\/forget\/packages\/snap\/src\/runner.ts b\/compiler\/forget\/packages\/snap\/src\/runner.ts\nindex 1d945cd8f7..8716c3da0d 100644\n--- a\/compiler\/forget\/packages\/snap\/src\/runner.ts\n+++ b\/compiler\/forget\/packages\/snap\/src\/runner.ts\n@@ -7,8 +7,8 @@\n \n import watcher from \"@parcel\/watcher\";\n import chalk from \"chalk\";\n+import { COMPILER_PATH, LOGGER_PATH, FIXTURES_PATH, FILTER_FILENAME, FILTER_PATH, readTestFilter, TestFilter } from 'fixture-test-utils';\n import fs from \"fs\/promises\";\n-import glob from \"glob\";\n import invariant from \"invariant\";\n import { diff } from \"jest-diff\";\n import { Worker } from \"jest-worker\";\n@@ -19,26 +19,10 @@ import ts from \"typescript\";\n import yargs from \"yargs\";\n import { hideBin } from \"yargs\/helpers\";\n import { TestResult } from \".\/compiler-worker\";\n-import * as compiler from \".\/compiler-worker.js\";\n-import { exists } from \".\/utils\";\n+import * as compiler from \".\/compiler-worker\";\n+import {getFixtures} from 'fixture-test-utils';\n \n const WORKER_PATH = require.resolve(\".\/compiler-worker.js\");\n-const COMPILER_PATH = path.join(\n- process.cwd(),\n- \"dist\",\n- \"Babel\",\n- \"RunReactForgetBabelPlugin.js\"\n-);\n-const LOGGER_PATH = path.join(process.cwd(), \"dist\", \"Utils\", \"logger.js\");\n-const FIXTURES_PATH = path.join(\n- process.cwd(),\n- \"src\",\n- \"__tests__\",\n- \"fixtures\",\n- \"compiler\"\n-);\n-const FILTER_FILENAME = \"testfilter.txt\";\n-const FILTER_PATH = path.join(process.cwd(), FILTER_FILENAME);\n \n readline.emitKeypressEvents(process.stdin);\n \n@@ -109,49 +93,6 @@ function clearConsole() {\n console.log(\"\\u001Bc\");\n }\n \n-function getFixtures(\n- filter: TestFilter | null\n-): Map {\n- \/\/ search for fixtures within nested directories\n- const files = glob.sync(`**\/*.{js,md}`, {\n- cwd: FIXTURES_PATH,\n- });\n- const fixtures = new Map();\n-\n- for (const filePath of files) {\n- const basename = path.basename(\n- path.basename(filePath, \".js\"),\n- \".expect.md\"\n- );\n- \/\/ \"partial\" paths do not include suffixes\n- const partialRelativePath = path.join(path.dirname(filePath), basename);\n- const partialAbsolutePath = path.join(FIXTURES_PATH, partialRelativePath);\n- \/\/ Replicate jest test behavior\n- if (basename.startsWith(\"todo.\")) {\n- continue;\n- }\n- if (filter) {\n- if (\n- filter.kind === \"only\" &&\n- filter.paths.indexOf(partialRelativePath) === -1\n- ) {\n- continue;\n- } else if (\n- filter.kind === \"skip\" &&\n- filter.paths.indexOf(partialRelativePath) !== -1\n- ) {\n- continue;\n- }\n- }\n- fixtures.set(partialRelativePath, {\n- basename,\n- inputPath: `${partialAbsolutePath}.js`,\n- outputPath: `${partialAbsolutePath}.expect.md`,\n- });\n- }\n- \/\/ console.log(\"fixtures!\", JSON.stringify(Array.from(fixtures.keys())));\n- return fixtures;\n-}\n \/**\n * Do a test run and return the test results\n *\/\n@@ -395,48 +336,6 @@ enum Mode {\n Update = \"Update\",\n }\n \n-type TestFilter =\n- | {\n- kind: \"only\";\n- paths: Array;\n- }\n- | {\n- kind: \"skip\";\n- paths: Array;\n- };\n-\n-async function readTestFilter(): Promise {\n- if (!(await exists(FILTER_PATH))) {\n- throw new Error(`testfilter file not found at ${FILTER_PATH}`);\n- }\n-\n- const input = await fs.readFile(FILTER_PATH, \"utf8\");\n- const lines = input.trim().split(\"\\n\");\n- if (lines.length < 2) {\n- console.warn(\"Misformed filter file. Expected at least two lines.\");\n- return null;\n- }\n-\n- let filter: \"only\" | \"skip\" | null = null;\n- if (lines[0]!.indexOf(\"@only\") !== -1) {\n- filter = \"only\";\n- }\n- if (lines[0]!.indexOf(\"@skip\") !== -1) {\n- filter = \"skip\";\n- }\n- if (filter === null) {\n- console.warn(\n- \"Misformed filter file. Expected first line to contain @only or @skip\"\n- );\n- return null;\n- }\n- lines.shift();\n- return {\n- kind: filter,\n- paths: lines,\n- };\n-}\n-\n \/**\n * Runs the compiler in watch or single-execution mode\n *\/\ndiff --git a\/compiler\/forget\/packages\/snap\/src\/utils.ts b\/compiler\/forget\/packages\/snap\/src\/utils.ts\ndeleted file mode 100644\nindex ef18f7e432..0000000000\n--- a\/compiler\/forget\/packages\/snap\/src\/utils.ts\n+++ \/dev\/null\n@@ -1,17 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-import fs from \"fs\/promises\";\n-\n-export async function exists(file: string): Promise {\n- try {\n- await fs.access(file);\n- return true;\n- } catch {\n- return false;\n- }\n-}\n","commit":{"revision":"5669fc73c0d0ac00d744e22b067bcfc3312b8314","subject":"[snap] Refactor fixture utils to separate package","shortRevision":"5669fc73c0","authorName":"Mofei Zhang","authorEmail":"feifei0@meta.com","authoredAt":"2023-08-14T19:26:01-04:00"},"body":"--- \n\nMove shared functions to `fixture-test-utils` package.","parents":["02e8cf97909029e0510c1a4e651d9679d2e2cc1b"]}

dillon1000/react

Files changed