Use named export in core.js (#14325)

src/index.js

@@ -1,6 +1,6 @@
 import vnopts from "vnopts";
 import fastGlob from "fast-glob";
-import core from "./main/core.js";
+import * as core from "./main/core.js";
 import { getSupportInfo as getSupportInfoWithoutPlugins } from "./main/support.js";
 import getFileInfoWithoutPlugins from "./common/get-file-info.js";
 import {
@@ -92,7 +92,7 @@ const sharedWithCli = {
 
 const debugApis = {
   parse: withPlugins(core.parse),
-  formatAST: withPlugins(core.formatAST),
+  formatAST: withPlugins(core.formatAst),
   formatDoc: withPlugins(core.formatDoc),
   printToDoc: withPlugins(core.printToDoc),
   printDocToString: withPlugins(core.printDocToString),

src/main/core.js

@@ -1,6 +1,6 @@
 import { diffArrays } from "diff";
 
-import { printDocToString } from "../document/printer.js";
+import { printDocToString as printDocToStringWithoutNormalizeOptions } from "../document/printer.js";
 import { printDocToDebug } from "../document/debug.js";
 import { getAlignmentSize } from "../common/util.js";
 import {
@@ -13,7 +13,7 @@ import { normalize as normalizeOptions } from "./options.js";
 import massageAst from "./massage-ast.js";
 import { attach } from "./comments/attach.js";
 import { ensureAllCommentsPrinted } from "./comments/print.js";
-import { parse, resolveParser } from "./parser.js";
+import { parse as parseText, resolveParser } from "./parser.js";
 import printAstToDoc from "./ast-to-doc.js";
 import { calculateRange, findNodeAtOffset } from "./range-util.js";
 
@@ -38,7 +38,7 @@ async function coreFormat(originalText, opts, addAlignmentSize = 0) {
     return { formatted: "", cursorOffset: -1, comments: [] };
   }
 
-  const { ast, text } = await parse(originalText, opts);
+  const { ast, text } = await parseText(originalText, opts);
 
   if (opts.cursorOffset >= 0) {
     const nodeResult = findNodeAtOffset(ast, opts.cursorOffset, opts);
@@ -50,7 +50,7 @@ async function coreFormat(originalText, opts, addAlignmentSize = 0) {
   const astComments = attachComments(text, ast, opts);
   const doc = await printAstToDoc(ast, opts, addAlignmentSize);
 
-  const result = printDocToString(doc, opts);
+  const result = printDocToStringWithoutNormalizeOptions(doc, opts);
 
   ensureAllCommentsPrinted(astComments);
   // Remove extra leading indentation as well as the added indentation after last newline
@@ -144,7 +144,7 @@ async function coreFormat(originalText, opts, addAlignmentSize = 0) {
 }
 
 async function formatRange(originalText, opts) {
-  const { ast, text } = await parse(originalText, opts);
+  const { ast, text } = await parseText(originalText, opts);
   const { rangeStart, rangeEnd } = calculateRange(text, opts, ast);
   const rangeString = text.slice(rangeStart, rangeEnd);
 
@@ -322,56 +322,62 @@ async function formatWithCursor(originalText, originalOptions) {
   return result;
 }
 
-const prettier = {
-  formatWithCursor,
-
-  async parse(originalText, originalOptions, devOptions) {
-    const { text, options } = normalizeInputAndOptions(
-      originalText,
-      await normalizeOptions(originalOptions)
-    );
-    const parsed = await parse(text, options);
-    if (devOptions) {
-      if (devOptions.massage) {
-        parsed.ast = massageAst(parsed.ast, options);
-      }
-      if (devOptions.preprocessForPrint) {
-        attachComments(parsed.text, parsed.ast, options);
-        if (options.printer.preprocess) {
-          parsed.ast = await options.printer.preprocess(parsed.ast, options);
-        }
+async function parse(originalText, originalOptions, devOptions) {
+  const { text, options } = normalizeInputAndOptions(
+    originalText,
+    await normalizeOptions(originalOptions)
+  );
+  const parsed = await parseText(text, options);
+  if (devOptions) {
+    if (devOptions.massage) {
+      parsed.ast = massageAst(parsed.ast, options);
+    }
+    if (devOptions.preprocessForPrint) {
+      attachComments(parsed.text, parsed.ast, options);
+      if (options.printer.preprocess) {
+        parsed.ast = await options.printer.preprocess(parsed.ast, options);
       }
     }
-    return parsed;
-  },
+  }
+  return parsed;
+}
 
-  async formatAST(ast, options) {
-    options = await normalizeOptions(options);
-    const doc = await printAstToDoc(ast, options);
-    return printDocToString(doc, options);
-  },
+async function formatAst(ast, options) {
+  options = await normalizeOptions(options);
+  const doc = await printAstToDoc(ast, options);
+  return printDocToStringWithoutNormalizeOptions(doc, options);
+}
 
-  // Doesn't handle shebang for now
-  async formatDoc(doc, options) {
-    const text = printDocToDebug(doc);
-    const { formatted } = await formatWithCursor(text, {
-      ...options,
-      parser: "__js_expression",
-    });
+// Doesn't handle shebang for now
+async function formatDoc(doc, options) {
+  const text = printDocToDebug(doc);
+  const { formatted } = await formatWithCursor(text, {
+    ...options,
+    parser: "__js_expression",
+  });
 
-    return formatted;
-  },
+  return formatted;
+}
 
-  async printToDoc(originalText, options) {
-    options = await normalizeOptions(options);
-    const { ast, text } = await parse(originalText, options);
-    attachComments(text, ast, options);
-    return printAstToDoc(ast, options);
-  },
+async function printToDoc(originalText, options) {
+  options = await normalizeOptions(options);
+  const { ast, text } = await parseText(originalText, options);
+  attachComments(text, ast, options);
+  return printAstToDoc(ast, options);
+}
 
-  async printDocToString(doc, options) {
-    return printDocToString(doc, await normalizeOptions(options));
-  },
+async function printDocToString(doc, options) {
+  return printDocToStringWithoutNormalizeOptions(
+    doc,
+    await normalizeOptions(options)
+  );
+}
+
+export {
+  formatWithCursor,
+  parse,
+  formatAst,
+  formatDoc,
+  printToDoc,
+  printDocToString,
 };
-
-export default prettier;

src/standalone.js

@@ -1,4 +1,4 @@
-import core from "./main/core.js";
+import * as core from "./main/core.js";
 import { getSupportInfo as getSupportInfoWithoutPlugins } from "./main/support.js";
 import * as languages from "./languages.js";
 
@@ -44,7 +44,7 @@ const getSupportInfo = withPlugins(getSupportInfoWithoutPlugins, 0);
 
 const debugApis = {
   parse: withPlugins(core.parse),
-  formatAST: withPlugins(core.formatAST),
+  formatAST: withPlugins(core.formatAst),
   formatDoc: withPlugins(core.formatDoc),
   printToDoc: withPlugins(core.printToDoc),
   printDocToString: withPlugins(core.printDocToString),