Handle partial barrel imports

Author: tschaub

readme.md

@@ -17,3 +17,9 @@ See additional options with the `help` command (or `--help` flag).
 # see options for the command
 npx @openlayers/codemod@latest help replace-barrel-imports
 ```
+
+## Development
+
+Run tests with `npm test`. Debug the tests with `npx vitest --inspect-brk --no-file-parallelism` (then visit `chrome://inspect/#devices`).
+
+To run the codemod directly from this repo, so something like `node ./codemod.js replace-barrel-imports --consider-relative-paths ../path/to/other/files`.

src/replace-barrel-imports.js

@@ -229,6 +229,11 @@ function replaceBarrelImports(fileInfo, api, {considerRelativePaths}) {
           barrelFiles[barrelPath],
         );
         if (!declaration) {
+          // not a barrel import, leave as is
+          if (!(importPath in importDeclarations)) {
+            importDeclarations[importPath] = [];
+          }
+          importDeclarations[importPath].push(specifier);
           continue;
         }
 

tests/replace-barrel-imports.test.mjs

@@ -98,6 +98,31 @@ const cases = [
       import OSM from '../src/ol/source/OSM.js';
   `,
   },
+  {
+    name: 'handle partial barrel file',
+    options: {considerRelativePaths: true},
+    input: `
+      import {createXYZ, TileGrid} from '../src/ol/tilegrid.js';
+  `,
+    output: `
+      import TileGrid from '../src/ol/tilegrid/TileGrid.js';
+      import {createXYZ} from '../src/ol/tilegrid.js';
+  `,
+  },
+  {
+    name: 'handle multiple partial barrel files',
+    options: {considerRelativePaths: true},
+    input: `
+      import {get as getProjection} from '../src/ol/proj.js';
+      import {createXYZ, TileGrid, WMTS} from '../src/ol/tilegrid.js';
+  `,
+    output: `
+      import {get as getProjection} from '../src/ol/proj.js';
+      import TileGrid from '../src/ol/tilegrid/TileGrid.js';
+      import WMTS from '../src/ol/tilegrid/WMTS.js';
+      import {createXYZ} from '../src/ol/tilegrid.js';
+  `,
+  },
   {
     name: 'named imports',
     options: {considerRelativePaths: false},
@@ -123,6 +148,11 @@ for (const c of cases) {
       c.options,
     );
 
+    if (!output) {
+      expect(dedent(c.input)).toBe(dedent(c.output));
+      return;
+    }
+
     const o = await format(output);
     expect(o).toBe(dedent(c.output));
   });