moving parse and format into it's own file

Author: Janther

tests/config/constants.js

@@ -9,3 +9,5 @@ export const FORMAT_TEST_DIRECTORY = normalizeDirectory(
 );
 
 export const CURSOR_PLACEHOLDER = "<|>";
+export const RANGE_START_PLACEHOLDER = "<<<PRETTIER_RANGE_START>>>";
+export const RANGE_END_PLACEHOLDER = "<<<PRETTIER_RANGE_END>>>";

tests/config/run-format-test.js

@@ -16,15 +16,14 @@ import {
   isAstUnstable,
   isUnstable,
 } from "./failed-format-tests.js";
+import { format, parse } from "./run-prettier.js";
 
 const { __dirname } = createEsmUtils(import.meta);
 
 const { FULL_TEST } = process.env;
 const BOM = "\uFEFF";
 
 const CURSOR_PLACEHOLDER = "<|>";
-const RANGE_START_PLACEHOLDER = "<<<PRETTIER_RANGE_START>>>";
-const RANGE_END_PLACEHOLDER = "<<<PRETTIER_RANGE_END>>>";
 
 const testsWithAstChanges = new Map(
   [
@@ -370,83 +369,4 @@ function shouldSkipEolTest(code, options) {
   return false;
 }
 
-async function parse(source, options) {
-  const prettier = await getPrettier();
-
-  const { ast } = await prettier.__debug.parse(
-    source,
-    { ...options, plugins: await getPlugins() },
-    { massage: true },
-  );
-  return ast;
-}
-
-const indexProperties = [
-  {
-    property: "cursorOffset",
-    placeholder: CURSOR_PLACEHOLDER,
-  },
-  {
-    property: "rangeStart",
-    placeholder: RANGE_START_PLACEHOLDER,
-  },
-  {
-    property: "rangeEnd",
-    placeholder: RANGE_END_PLACEHOLDER,
-  },
-];
-function replacePlaceholders(originalText, originalOptions) {
-  const indexes = indexProperties
-    .map(({ property, placeholder }) => {
-      const value = originalText.indexOf(placeholder);
-      return value === -1 ? undefined : { property, value, placeholder };
-    })
-    .filter(Boolean)
-    .sort((a, b) => a.value - b.value);
-
-  const options = { ...originalOptions };
-  let text = originalText;
-  let offset = 0;
-  for (const { property, value, placeholder } of indexes) {
-    text = text.replace(placeholder, "");
-    options[property] = value + offset;
-    offset -= placeholder.length;
-  }
-  return { text, options };
-}
-
-const insertCursor = (text, cursorOffset) =>
-  cursorOffset >= 0
-    ? text.slice(0, cursorOffset) +
-      CURSOR_PLACEHOLDER +
-      text.slice(cursorOffset)
-    : text;
-async function format(originalText, originalOptions) {
-  const { text: input, options } = replacePlaceholders(
-    originalText,
-    originalOptions,
-  );
-  const inputWithCursor = insertCursor(input, options.cursorOffset);
-  const prettier = await getPrettier();
-
-  const { formatted: output, cursorOffset } = await prettier.formatWithCursor(
-    input,
-    { ...options, plugins: await getPlugins() },
-  );
-  const outputWithCursor = insertCursor(output, cursorOffset);
-  const eolVisualizedOutput = visualizeEndOfLine(outputWithCursor);
-
-  const changed = outputWithCursor !== inputWithCursor;
-
-  return {
-    changed,
-    options,
-    input,
-    inputWithCursor,
-    output,
-    outputWithCursor,
-    eolVisualizedOutput,
-  };
-}
-
 export default runFormatTest;

tests/config/run-prettier.js

@@ -0,0 +1,91 @@
+import getPrettier from "./get-prettier.js";
+import getPlugins from "./get-plugins.js";
+import {
+  CURSOR_PLACEHOLDER,
+  RANGE_START_PLACEHOLDER,
+  RANGE_END_PLACEHOLDER,
+} from "./constants.js";
+import visualizeEndOfLine from "./utils/visualize-end-of-line.js";
+
+async function parse(source, options) {
+  const prettier = await getPrettier();
+
+  const { ast } = await prettier.__debug.parse(
+    source,
+    { ...options, plugins: await getPlugins() },
+    { massage: true },
+  );
+  return ast;
+}
+
+async function format(originalText, originalOptions) {
+  const { text: input, options } = replacePlaceholders(
+    originalText,
+    originalOptions,
+  );
+  const inputWithCursor = insertCursor(input, options.cursorOffset);
+  const prettier = await getPrettier();
+
+  const { formatted: output, cursorOffset } = await prettier.formatWithCursor(
+    input,
+    { ...options, plugins: await getPlugins() },
+  );
+  const outputWithCursor = insertCursor(output, cursorOffset);
+  const eolVisualizedOutput = visualizeEndOfLine(outputWithCursor);
+
+  const changed = outputWithCursor !== inputWithCursor;
+
+  return {
+    changed,
+    options,
+    input,
+    inputWithCursor,
+    output,
+    outputWithCursor,
+    eolVisualizedOutput,
+  };
+}
+
+const insertCursor = (text, cursorOffset) =>
+  cursorOffset >= 0
+    ? text.slice(0, cursorOffset) +
+      CURSOR_PLACEHOLDER +
+      text.slice(cursorOffset)
+    : text;
+
+const indexProperties = [
+  {
+    property: "cursorOffset",
+    placeholder: CURSOR_PLACEHOLDER,
+  },
+  {
+    property: "rangeStart",
+    placeholder: RANGE_START_PLACEHOLDER,
+  },
+  {
+    property: "rangeEnd",
+    placeholder: RANGE_END_PLACEHOLDER,
+  },
+];
+
+function replacePlaceholders(originalText, originalOptions) {
+  const indexes = indexProperties
+    .map(({ property, placeholder }) => {
+      const value = originalText.indexOf(placeholder);
+      return value === -1 ? undefined : { property, value, placeholder };
+    })
+    .filter(Boolean)
+    .sort((a, b) => a.value - b.value);
+
+  const options = { ...originalOptions };
+  let text = originalText;
+  let offset = 0;
+  for (const { property, value, placeholder } of indexes) {
+    text = text.replace(placeholder, "");
+    options[property] = value + offset;
+    offset -= placeholder.length;
+  }
+  return { text, options };
+}
+
+export { format, parse };