Merge pull request #45 from rtk-incubator/rtkq-0.3-support

RTK Query 0.3 support

Author: msutkowski

src/generate.ts

@@ -121,20 +121,42 @@ export async function generateApi(
     ),
   ]);
 
+  const isUsingFetchBaseQuery = baseQuery === 'fetchBaseQuery';
+
+  function getBasePackageImportsFromOptions() {
+    return hooks
+      ? {
+          ...(isUsingFetchBaseQuery ? { fetchBaseQuery: 'fetchBaseQuery' } : {}),
+        }
+      : {
+          createApi: 'createApi',
+          ...(isUsingFetchBaseQuery ? { fetchBaseQuery: 'fetchBaseQuery' } : {}),
+        };
+  }
+
+  const hasBasePackageImports = Object.keys(getBasePackageImportsFromOptions()).length > 0;
+
   const sourceCode = printer.printNode(
     ts.EmitHint.Unspecified,
     factory.createSourceFile(
       [
-        generateImportNode('@rtk-incubator/rtk-query', {
-          createApi: 'createApi',
-          ...(baseQuery === 'fetchBaseQuery' ? { fetchBaseQuery: 'fetchBaseQuery' } : {}),
-        }),
+        // If hooks are specified, we need to import them from the react entry point in RTKQ >= 0.3
+        ...(hooks
+          ? [
+              generateImportNode('@rtk-incubator/rtk-query/react', {
+                createApi: 'createApi',
+              }),
+            ]
+          : []),
+        ...(hasBasePackageImports
+          ? [generateImportNode('@rtk-incubator/rtk-query', getBasePackageImportsFromOptions())]
+          : []),
         ...(customBaseQueryNode ? [customBaseQueryNode] : []),
         generateCreateApiCall({
           exportName,
           reducerPath,
           createApiFn: factory.createIdentifier('createApi'),
-          baseQuery: baseQuery === 'fetchBaseQuery' ? fetchBaseQueryCall : factory.createIdentifier(baseQuery),
+          baseQuery: isUsingFetchBaseQuery ? fetchBaseQueryCall : factory.createIdentifier(baseQuery),
           entityTypes: generateEntityTypes({ v3Doc, operationDefinitions }),
           endpointDefinitions: factory.createObjectLiteralExpression(
             operationDefinitions.map((operationDefinition) =>

test/__snapshots__/cli.test.ts.snap

@@ -497,7 +497,8 @@ export type User = {
 `;
 
 exports[`CLI options testing should generate react hooks as a part of the output 1`] = `
-import { createApi, fetchBaseQuery } from "@rtk-incubator/rtk-query";
+import { createApi } from "@rtk-incubator/rtk-query/react";
+import { fetchBaseQuery } from "@rtk-incubator/rtk-query";
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/api/v3" }),
   entityTypes: [],

test/cli.test.ts

@@ -88,6 +88,16 @@ describe('CLI options testing', () => {
     expect(numberOfHooks).toEqual(expectedHooks.length);
   });
 
+  it('should contain the right imports when using hooks and a custom base query', async () => {
+    const result = await cli(
+      ['-h', `--baseQuery`, `test/fixtures/customBaseQuery.ts:anotherNamedBaseQuery`, `./test/fixtures/petstore.json`],
+      '.'
+    );
+
+    expect(result.stdout).toContain(`import { createApi } from \"@rtk-incubator/rtk-query/react\";`);
+    expect(result.stdout).toContain(`import { anotherNamedBaseQuery } from \"test/fixtures/customBaseQuery\";`);
+  });
+
   it('should call fetchBaseQuery with the url provided to --baseUrl', async () => {
     const result = await cli([`--baseUrl`, `http://swagger.io`, `./test/fixtures/petstore.json`], '.');