WIP

Author: Rich-Harris

src/handlers.js

@@ -30,9 +30,10 @@ function measure(commands, from, to = commands.length) {
 		if (typeof command === 'string') {
 			total += command.length;
 		} else if (Array.isArray(command)) {
-			total += 2; // assume this is ', '
-		} else if (command.type === 'Chunk') {
-			total += command.content.length;
+			total +=
+				command.length === 0
+					? 2 // assume this is ', '
+					: measure(command, 0);
 		}
 	}
 
@@ -64,17 +65,32 @@ export function handle(node, state) {
 	}
 }
 
+/**
+ * @param {number} line
+ * @param {number} column
+ * @returns {Location}
+ */
+function l(line, column) {
+	return {
+		type: 'Location',
+		line,
+		column
+	};
+}
+
 /**
  * @param {string} content
  * @param {TSESTree.Node} node
  * @returns {Chunk}
  */
 function c(content, node) {
-	return {
-		type: 'Chunk',
-		content,
-		loc: node?.loc ?? null
-	};
+	return node.loc
+		? [
+				l(node.loc.start.line - 1, node.loc.start.column),
+				content,
+				l(node.loc.end.line - 1, node.loc.end.column)
+			]
+		: content;
 }
 
 /**

src/index.js

@@ -87,29 +87,13 @@ export function print(node, opts = {}) {
 		}
 
 		switch (command.type) {
-			case 'Chunk':
-				const loc = command.loc;
-
-				if (loc) {
-					current_line.push([
-						current_column,
-						0, // source index is always zero
-						loc.start.line - 1,
-						loc.start.column
-					]);
-				}
-
-				append(command.content);
-
-				if (loc) {
-					current_line.push([
-						current_column,
-						0, // source index is always zero
-						loc.end.line - 1,
-						loc.end.column
-					]);
-				}
-
+			case 'Location':
+				current_line.push([
+					current_column,
+					0, // source index is always zero
+					command.line,
+					command.column
+				]);
 				break;
 
 			case 'Newline':

src/types.d.ts

@@ -38,13 +38,10 @@ export interface State {
 	quote: "'" | '"';
 }
 
-export interface Chunk {
-	type: 'Chunk';
-	content: string;
-	loc: null | {
-		start: { line: number; column: number };
-		end: { line: number; column: number };
-	};
+export interface Location {
+	type: 'Location';
+	line: number;
+	column: number;
 }
 
 export interface Newline {
@@ -69,7 +66,7 @@ export interface CommentChunk {
 	comment: TSESTree.Comment;
 }
 
-export type Command = string | Chunk | Newline | Indent | Dedent | CommentChunk | Command[];
+export type Command = string | Location | Newline | Indent | Dedent | CommentChunk | Command[];
 
 export interface PrintOptions {
 	sourceMapSource?: string;