working

Author: Rich-Harris

src/handlers.js

@@ -11,11 +11,10 @@ const indent = { type: 'Indent' };
 const dedent = { type: 'Dedent' };
 
 /**
- * @param {Command[]} children
- * @returns {Sequence}
+ * @returns {Command[]}
  */
-function create_sequence(...children) {
-	return { type: 'Sequence', children };
+function create_sequence() {
+	return [];
 }
 
 /**
@@ -31,7 +30,7 @@ function measure(commands, from, to = commands.length) {
 		if (typeof command === 'string') {
 			total += command.length;
 		} else if (Array.isArray(command)) {
-			total += measure(command, 0, command.length);
+			total += 2; // TODO `measure(command, 0, command.length)`;
 		} else if (command.type === 'Chunk') {
 			total += command.content.length;
 		}
@@ -287,7 +286,7 @@ const handle_body = (nodes, state) => {
 				grouped_expression_types.includes(last_statement.type)) &&
 				last_statement.type !== statement.type)
 		) {
-			margin.children.push('\n');
+			margin.push('\n');
 		}
 
 		let add_newline = false;
@@ -331,11 +330,11 @@ const handle_var_declaration = (node, state) => {
 
 	if (multiline) {
 		state.multiline = true;
-		if (node.declarations.length > 1) open.children.push(indent);
-		join.children.push(',', newline);
+		if (node.declarations.length > 1) open.push(indent);
+		join.push(',', newline);
 		if (node.declarations.length > 1) state.commands.push(dedent);
 	} else {
-		join.children.push(', ');
+		join.push(', ');
 	}
 };
 
@@ -407,13 +406,13 @@ function sequence(nodes, state, spaces, fn, separator = ',') {
 	if (multiline) {
 		state.multiline = true;
 
-		open.children.push(indent, newline);
-		join.children.push(newline);
-		close.children.push(dedent, newline);
+		open.push(indent, newline);
+		join.push(newline);
+		close.push(dedent, newline);
 	} else {
-		if (spaces) open.children.push(' ');
-		join.children.push(' ');
-		if (spaces) close.children.push(' ');
+		if (spaces) open.push(' ');
+		join.push(' ');
+		if (spaces) close.push(' ');
 	}
 }
 
@@ -709,11 +708,11 @@ const shared = {
 		}
 
 		if (multiline) {
-			open.children.push(indent, newline);
-			join.children.push(',', newline);
-			close.children.push(dedent, newline);
+			open.push(indent, newline);
+			join.push(',', newline);
+			close.push(dedent, newline);
 		} else {
-			join.children.push(', ');
+			join.push(', ');
 		}
 	},
 
@@ -905,12 +904,12 @@ const handlers = {
 		const multiline = child_state.multiline;
 
 		if (multiline) {
-			if_true.children.push(indent, newline, '? ');
-			if_false.children.push(newline, ': ');
+			if_true.push(indent, newline, '? ');
+			if_false.push(newline, ': ');
 			state.commands.push(dedent);
 		} else {
-			if_true.children.push(' ? ');
-			if_false.children.push(' : ');
+			if_true.push(' ? ');
+			if_false.push(' : ');
 		}
 	},