Refactor

Author: fisker

src/parse.ts

@@ -5,10 +5,10 @@ import { createRoot } from "./factories/root.js";
 import { removeCstBlankLine } from "./preprocess.js";
 import Context from "./transforms/context.js";
 import { transformError } from "./transforms/error.js";
+import type { Document } from "./types.js";
 import { type ParseOptions, type Root } from "./types.js";
 import { removeFakeNodes } from "./utils/remove-fake-nodes.js";
 import { updatePositions } from "./utils/update-positions.js";
-import type { Document } from "./types.js";
 
 const MAP_KEY_DUPLICATE_ERROR_MESSAGE_PREFIX = 'Map keys must be unique; "';
 const MAP_KEY_DUPLICATE_ERROR_MESSAGE_SUFFIX = '" is repeated';
@@ -32,17 +32,11 @@ function shouldIgnoreError(
 
 export function parse(text: string, options?: ParseOptions): Root {
   const allowDuplicateKeysInMap = options?.allowDuplicateKeysInMap;
-  const context = new Context(text);
-
+  const cst = YAML.parseCST(text);
+  const context = new Context(cst, text);
   const documents: Document[] = [];
 
-  const root = createRoot(
-    context.transformRange({ origStart: 0, origEnd: text.length }),
-    documents,
-    context.comments,
-  );
-
-  for (const cstDocument of context.cst) {
+  for (const cstDocument of cst) {
     const yamlDocument = new YAML.Document({
       merge: false,
       keepCstNodes: true,
@@ -61,6 +55,12 @@ export function parse(text: string, options?: ParseOptions): Root {
     documents.push(document);
   }
 
+  const root = createRoot(
+    context.transformRange({ origStart: 0, origEnd: text.length }),
+    documents,
+    context.comments,
+  );
+
   attachComments(root);
   updatePositions(root);
   removeFakeNodes(root);

src/transforms/context.ts

@@ -1,7 +1,14 @@
-import YAML from "yaml";
+import type * as YAML from "yaml";
 import type * as YAMLTypes from "yaml/types";
 import { createPosition } from "../factories/position.js";
-import type { Comment, Content, Point, Position, Range } from "../types.js";
+import type {
+  Comment,
+  Content,
+  ParsedCST,
+  Point,
+  Position,
+  Range,
+} from "../types.js";
 import { transformContent } from "./content.js";
 import { transformNode, type YamlNode, type YamlToUnist } from "./transform.js";
 
@@ -22,30 +29,30 @@ let rangeAsLinePosGetter: RangeAsLinePosGetter;
 class Context {
   text;
   comments: Comment[] = [];
-  cst;
+  #cst;
   #cstContext: CSTContext | undefined;
 
-  constructor(text: string) {
+  constructor(cst: ParsedCST, text: string) {
     this.text = text;
-    this.cst = YAML.parseCST(text);
+    this.#cst = cst;
     this.setOrigRanges();
   }
 
   setOrigRanges() {
-    if (this.cst.setOrigRanges()) {
+    if (this.#cst.setOrigRanges()) {
       return;
     }
 
     // From `yaml/parse-cst`
     // https://github.com/eemeli/yaml/blob/4cdcde632ece71155f3108ec0120c1a0329a6914/src/cst/parse.js#L22
-    for (const document of this.cst) {
+    for (const document of this.#cst) {
       document.setOrigRanges([], 0);
     }
   }
 
   #getRangePosition(range: Range): { start: Point; end: Point } {
     if (!rangeAsLinePosGetter) {
-      const [document] = this.cst;
+      const [document] = this.#cst;
       const Node = Object.getPrototypeOf(
         Object.getPrototypeOf(document),
       ) as YAML.CST.Node;