esrap 1.2.0 → 1.2.2

package/README.md

@@ -38,7 +38,7 @@ If the nodes of the input AST have `loc` properties (e.g. the AST was generated
 You can pass information that will be added to the resulting sourcemap (note that the AST is assumed to come from a single file):
 
 ```js
-const { code, map } = parse(ast, {
+const { code, map } = print(ast, {
   sourceMapSource: 'input.js',
   sourceMapContent: fs.readFileSync('input.js', 'utf-8')
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",

package/src/handlers.js

@@ -616,7 +616,9 @@ const handlers = {
 
 		if (
 			node.body.type === 'ObjectExpression' ||
-			(node.body.type === 'AssignmentExpression' && node.body.left.type === 'ObjectPattern')
+			(node.body.type === 'AssignmentExpression' && node.body.left.type === 'ObjectPattern') ||
+			(node.body.type === 'LogicalExpression' && node.body.left.type === 'ObjectExpression') ||
+			(node.body.type === 'ConditionalExpression' && node.body.test.type === 'ObjectExpression')
 		) {
 			state.commands.push('(');
 			handle(node.body, state);
@@ -871,17 +873,16 @@ const handlers = {
 
 		state.commands.push('import ');
 
-		if (namespace_specifier) {
-			state.commands.push(c('* as ' + namespace_specifier.local.name, namespace_specifier));
-		}
-
 		if (default_specifier) {
 			state.commands.push(c(default_specifier.local.name, default_specifier));
+			if (namespace_specifier || named_specifiers.length > 0) state.commands.push(', ');
 		}
 
-		if (named_specifiers.length > 0) {
-			if (default_specifier) state.commands.push(', ');
+		if (namespace_specifier) {
+			state.commands.push(c('* as ' + namespace_specifier.local.name, namespace_specifier));
+		}
 
+		if (named_specifiers.length > 0) {
 			state.commands.push('{');
 			sequence(named_specifiers, state, true, (s, state) => {
 				if (s.local.name !== s.imported.name) {