Merge pull request #50 from rtk-incubator/next

fix(imports): move from rtk-query to redux-toolkit (#49)

Author: msutkowski

package.json

@@ -24,7 +24,7 @@
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.7",
-    "@rtk-incubator/rtk-query": "^0.2.0",
+    "@reduxjs/toolkit": "^1.6.0-alpha.2",
     "@types/commander": "^2.12.2",
     "@types/glob-to-regexp": "^0.4.0",
     "@types/jest": "^26.0.20",

src/generate.ts

@@ -11,8 +11,7 @@ import { createQuestionToken, keywordType } from 'oazapfts/lib/codegen/tscodegen
 import { OpenAPIV3 } from 'openapi-types';
 import { generateReactHooks } from './generators/react-hooks';
 import { GenerationOptions, OperationDefinition } from './types';
-import { capitalize, getOperationDefinitions, getV3Doc, isQuery, MESSAGES } from './utils';
-import { removeUndefined } from './utils/removeUndefined';
+import { capitalize, getOperationDefinitions, getV3Doc, isQuery, MESSAGES, removeUndefined } from './utils';
 import {
   generateCreateApiCall,
   generateEndpointDefinition,
@@ -140,16 +139,16 @@ export async function generateApi(
     ts.EmitHint.Unspecified,
     factory.createSourceFile(
       [
-        // If hooks are specified, we need to import them from the react entry point in RTKQ >= 0.3
+        // If hooks are specified, we need to import them from the react entry point
         ...(hooks
           ? [
-              generateImportNode('@rtk-incubator/rtk-query/react', {
+              generateImportNode('@reduxjs/toolkit/query/react', {
                 createApi: 'createApi',
               }),
             ]
           : []),
         ...(hasBasePackageImports
-          ? [generateImportNode('@rtk-incubator/rtk-query', getBasePackageImportsFromOptions())]
+          ? [generateImportNode('@reduxjs/toolkit/query', getBasePackageImportsFromOptions())]
           : []),
         ...(customBaseQueryNode ? [customBaseQueryNode] : []),
         generateCreateApiCall({

test/__snapshots__/cli.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CLI options testing should accept a valid url as the target swagger file and generate a client 1`] = `
-import { createApi, fetchBaseQuery } from "@rtk-incubator/rtk-query";
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query";
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/api/v3" }),
   tagTypes: [],
@@ -270,7 +270,7 @@ export type User = {
 `;
 
 exports[`CLI options testing should create a file when --file is specified 1`] = `
-import { createApi, fetchBaseQuery } from '@rtk-incubator/rtk-query';
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: '/api/v3' }),
   tagTypes: [],
@@ -497,8 +497,8 @@ export type User = {
 `;
 
 exports[`CLI options testing should generate react hooks as a part of the output 1`] = `
-import { createApi } from "@rtk-incubator/rtk-query/react";
-import { fetchBaseQuery } from "@rtk-incubator/rtk-query";
+import { createApi } from "@reduxjs/toolkit/query/react";
+import { fetchBaseQuery } from "@reduxjs/toolkit/query";
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/api/v3" }),
   tagTypes: [],
@@ -799,7 +799,7 @@ export const {
 `;
 
 exports[`CLI options testing should log output to the console when a filename is not specified 1`] = `
-import { createApi, fetchBaseQuery } from "@rtk-incubator/rtk-query";
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query";
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/api/v3" }),
   tagTypes: [],
@@ -1078,7 +1078,7 @@ export type User = {
 `;
 
 exports[`yaml parsing should be able to use read a yaml file and create a file with the output when --file is specified 1`] = `
-import { createApi, fetchBaseQuery } from '@rtk-incubator/rtk-query';
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: '/api/v3' }),
   tagTypes: [],
@@ -1298,7 +1298,7 @@ export type User = {
 `;
 
 exports[`yaml parsing should parse a yaml schema from a URL 1`] = `
-import { createApi, fetchBaseQuery } from "@rtk-incubator/rtk-query";
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query";
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/api/v3" }),
   tagTypes: [],

test/cli.test.ts

@@ -94,7 +94,7 @@ describe('CLI options testing', () => {
       '.'
     );
 
-    expect(result.stdout).toContain(`import { createApi } from \"@rtk-incubator/rtk-query/react\";`);
+    expect(result.stdout).toContain(`import { createApi } from \"@reduxjs/toolkit/query/react\";`);
     expect(result.stdout).toContain(`import { anotherNamedBaseQuery } from \"test/fixtures/customBaseQuery\";`);
   });
 

test/fixtures/generated.ts

@@ -1,4 +1,4 @@
-import { createApi, fetchBaseQuery } from '@rtk-incubator/rtk-query';
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
 export const api = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: '/api/v3' }),
   tagTypes: [],