esrap 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",
@@ -20,10 +20,10 @@
   "types": "./types/index.d.ts",
   "devDependencies": {
     "@changesets/cli": "^2.27.11",
+    "@sveltejs/acorn-typescript": "^1.0.5",
     "@typescript-eslint/types": "^8.2.0",
     "@vitest/ui": "^2.1.1",
     "acorn": "^8.11.3",
-    "acorn-typescript": "^1.4.13",
     "dts-buddy": "^0.5.4",
     "prettier": "^3.0.3",
     "typescript": "^5.7.2",

package/src/handlers.js

@@ -116,15 +116,10 @@ function prepend_comments(comments, state, newlines) {
  */
 function quote(string, char) {
 	let out = char;
-	let escaped = false;
 
 	for (const c of string) {
-		if (escaped) {
-			out += c;
-			escaped = false;
-		} else if (c === '\\') {
+		if (c === '\\') {
 			out += '\\\\';
-			escaped = true;
 		} else if (c === char) {
 			out += '\\' + c;
 		} else if (c === '\n') {
@@ -501,8 +496,9 @@ function handle_type_annotation(node, state) {
 		case 'TSTypeReference':
 			handle(node.typeName, state);
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
-			if (node.typeParameters) handle_type_annotation(node.typeParameters, state);
+			if (node.typeArguments) {
+				handle_type_annotation(node.typeArguments, state);
+			}
 			break;
 		case 'TSTypeParameterInstantiation':
 		case 'TSTypeParameterDeclaration':
@@ -514,7 +510,7 @@ function handle_type_annotation(node, state) {
 			state.commands.push('>');
 			break;
 		case 'TSTypeParameter':
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			state.commands.push(node.name);
 
 			if (node.constraint) {
@@ -536,14 +532,14 @@ function handle_type_annotation(node, state) {
 		case 'TSFunctionType':
 			if (node.typeParameters) handle_type_annotation(node.typeParameters, state);
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			const parameters = node.parameters;
 			state.commands.push('(');
 			sequence(parameters, state, false, handle);
 
 			state.commands.push(') => ');
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			handle_type_annotation(node.typeAnnotation.typeAnnotation, state);
 			break;
 		case 'TSIndexSignature':
@@ -552,19 +548,19 @@ function handle_type_annotation(node, state) {
 			sequence(indexParameters, state, false, handle);
 			state.commands.push(']');
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			handle_type_annotation(node.typeAnnotation, state);
 			break;
 		case 'TSMethodSignature':
 			handle(node.key, state);
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			const parametersSignature = node.parameters;
 			state.commands.push('(');
 			sequence(parametersSignature, state, false, handle);
 			state.commands.push(')');
 
-			// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+			// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 			handle_type_annotation(node.typeAnnotation, state);
 			break;
 		case 'TSExpressionWithTypeArguments':
@@ -715,8 +711,7 @@ const shared = {
 			state.commands.push('?.');
 		}
 
-		// @ts-expect-error
-		if (node.typeParameters) handle_type_annotation(node.typeParameters, state);
+		if (node.typeArguments) handle_type_annotation(node.typeArguments, state);
 
 		const open = create_sequence();
 		const join = create_sequence();
@@ -852,7 +847,7 @@ const shared = {
 		state.commands.push('...');
 		handle(node.argument, state);
 
-		// @ts-expect-error `acorn-typescript` and `@typescript-esling/types` have slightly different type definitions
+		// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
 		if (node.typeAnnotation) handle_type_annotation(node.typeAnnotation, state);
 	}
 };
@@ -1054,7 +1049,8 @@ const handlers = {
 		if (
 			node.expression.type === 'ObjectExpression' ||
 			(node.expression.type === 'AssignmentExpression' &&
-				node.expression.left.type === 'ObjectPattern')
+				node.expression.left.type === 'ObjectPattern') ||
+			node.expression.type === 'FunctionExpression'
 		) {
 			// is an AssignmentExpression to an ObjectPattern
 			state.commands.push('(');
@@ -1169,12 +1165,34 @@ const handlers = {
 
 		state.commands.push(' from ');
 		handle(node.source, state);
+		if (node.attributes) {
+			state.commands.push(' with { ');
+			for (let index = 0; index < node.attributes.length; index++) {
+				const { key, value } = node.attributes[index];
+				handle(key, state);
+				state.commands.push(': ');
+				handle(value, state);
+				if (index + 1 !== node.attributes.length) {
+					state.commands.push(', ');
+				}
+			}
+			state.commands.push(' }');
+		}
 		state.commands.push(';');
 	},
 
 	ImportExpression(node, state) {
 		state.commands.push('import(');
 		handle(node.source, state);
+		//@ts-expect-error for some reason the types haven't been updated
+		if (node.arguments) {
+			//@ts-expect-error
+			for (let index = 0; index < node.arguments.length; index++) {
+				state.commands.push(', ');
+				//@ts-expect-error
+				handle(node.arguments[index], state);
+			}
+		}
 		state.commands.push(')');
 	},
 
@@ -1518,7 +1536,7 @@ const handlers = {
 
 	TSModuleBlock(node, state) {
 		state.commands.push(' {', indent, newline);
-		sequence(node.body, state, false, handle);
+		handle_body(node.body, state);
 		state.commands.push(dedent, newline, '}');
 	},
 
@@ -1538,7 +1556,7 @@ const handlers = {
 	},
 
 	TSInterfaceBody(node, state) {
-		sequence(node.body, state, false, handle_type_annotation, ';');
+		sequence(node.body, state, true, handle_type_annotation, ';');
 	},
 
 	TSInterfaceDeclaration(node, state) {