so much smarter

.grit/patterns/js/_convert_default_imports.md

@@ -12,7 +12,13 @@ language js
 
 pattern replace_default_import($source, $new_name) {
   or {
-    `import * as $alias from $source` => `import { $new_name as $alias } from $source`,
+    `import * as $alias from $source` as $import where {
+      if ($alias <: $new_name) {
+        $import => `import { $new_name } from $source`
+      } else {
+        $import => `import { $new_name as $alias } from $source`
+      }
+    },
     `import { $imports } from $source` where {
       $imports <: contains `default` => $new_name
     },
@@ -23,7 +29,13 @@ pattern replace_default_import($source, $new_name) {
         $imports += `, $new_name as $alias`
       }
     },
-    `import $alias from $source` => `import { $new_name as $alias } from $source`,
+    `import $alias from $source` as $import where {
+      if ($alias <: contains $new_name) {
+        $import => `import { $new_name } from $source`
+      } else {
+        $import => `import { $new_name as $alias } from $source`
+      }
+    }
   }
 }
 
@@ -128,3 +140,27 @@ import myAlias, { otherImport } from 'star';
 // @filename: here.js
 import { otherImport, myImport as myAlias } from 'star';
 ```
+
+## Handle standalone import without alias
+
+```ts
+// @filename: here.js
+import myImport from 'star';
+```
+
+```ts
+// @filename: here.js
+import { myImport } from 'star';
+```
+
+## Handle standalone import with alias
+
+```ts
+// @filename: here.js
+import myAlias from 'star';
+```
+
+```ts
+// @filename: here.js
+import { myImport as myAlias } from 'star';
+```

.grit/patterns/js/migrate_default_imports.md

@@ -6,7 +6,6 @@ tags: [migration, js, imports, default, multifile]
 
 This pattern combines [convert_default_exports](https://github.com/getgrit/stdlib/blob/9dfce85d25977e08bbd476f693e6cbc07ef08316/.grit/patterns/js/_convert_default_exports.md) and [\_convert_default_imports](https://github.com/getgrit/stdlib/blob/9dfce85d25977e08bbd476f693e6cbc07ef08316/.grit/patterns/js/_convert_default_imports.md#L4) to replace default exports to named exports and replace default imports with named imports.
 
-
 ```grit
 language js
 
@@ -55,7 +54,7 @@ export function name() {
 }
 
 // @filename: foo/module_user.ts
-import { name as name } from 'mymodule';
+import { name } from 'mymodule';
 import other from 'othermodule';
 ```
 
@@ -82,7 +81,7 @@ export function name() {
 }
 
 // @filename: folder2/bar.js
-import { name as name } from '../folder1/foo';
+import { name } from '../folder1/foo';
 
 // @filename: folder3/baz
 // This is a different folder - ignore it