remove unused request init import in generated services

vaadin · Aug 5, 2024 · 53601bd · 53601bd
1 parent 54efbc5
commit 53601bd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/packages/ts/generator-plugin-signals/src/SignalProcessor.ts b/packages/ts/generator-plugin-signals/src/SignalProcessor.ts
@@ -94,6 +94,8 @@ function dummy() {
       ),
     ]).transformed;
 
+    this.#removeUnusedRequestInitImports(file);
+
     return createSourceFile(
       [
         ...this.#dependencyManager.imports.toCode(),
@@ -116,4 +118,15 @@ function dummy() {
       }
     });
   }
+
+  #removeUnusedRequestInitImports(file: SourceFile) {
+    const transformedFileText = ts.createPrinter().printFile(file);
+
+    const hasNormalEndpointCalls =
+      transformedFileText.includes('init?: EndpointRequestInit') && transformedFileText.includes('.call(');
+
+    if (!hasNormalEndpointCalls) {
+      this.#dependencyManager.imports.named.remove('@vaadin/hilla-frontend', 'EndpointRequestInit');
+    }
+  }
 }
diff --git a/packages/ts/generator-plugin-signals/test/SignalsEndpoints.spec.ts b/packages/ts/generator-plugin-signals/test/SignalsEndpoints.spec.ts
@@ -30,7 +30,7 @@ describe('SignalsPlugin', () => {
       await expect(await generatedHelloWorldService.text()).toMatchSnapshot(`HelloWorldService`, import.meta.url);
     });
 
-    it('removes init import if not needed', async () => {
+    it('removes unused request init import', async () => {
       const generator = new Generator([BackbonePlugin, SignalsPlugin], {
         logger: new LoggerFactory({ name: 'model-plugin-test', verbose: true }),
       });

diff --git a/packages/ts/generator-plugin-signals/test/fixtures/NumberSignalServiceSignalOnly.snap.ts b/packages/ts/generator-plugin-signals/test/fixtures/NumberSignalServiceSignalOnly.snap.ts
@@ -1,4 +1,3 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import { type NumberSignal as NumberSignal_1, NumberSignalChannel as NumberSignalChannel_1 } from "@vaadin/hilla-react-signals";
 import client_1 from "./connect-client.default.js";
 function counter_1(): NumberSignal_1 { return new NumberSignalChannel_1("NumberSignalService.counter", client_1).signal; }

diff --git a/packages/ts/generator-utils/src/dependencies/ImportManager.ts b/packages/ts/generator-utils/src/dependencies/ImportManager.ts
@@ -25,6 +25,18 @@ export class NamedImportManager extends StatementRecordManager<ImportDeclaration
     return record.id;
   }
 
+  remove(path: string, specifier: string): void {
+    const specifiers = this.#map.get(path);
+
+    if (specifiers) {
+      specifiers.delete(specifier);
+
+      if (specifiers.size === 0) {
+        this.#map.delete(path);
+      }
+    }
+  }
+
   override clear(): void {
     this.#map.clear();
   }