fix: Fix gen --pr command (#71)

* fix: Improve bundling to fix --pr option

Apollo need to be part of the bundle to rely on the same version of react.

* Add a warning if no operation

Closed #70

* Optimize the bundle

Author: fabien0102

cli/package-lock.json

@@ -24,9 +24,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "npm run build:tsc && npm run build:rollup",
-    "build:tsc": "tsc -p tsconfig.package.json",
-    "build:rollup": "rollup -c",
+    "build": "rollup -c",
     "prepublishOnly": "npm run build",
     "gen": "graphql-codegen --config codegen.yml -r dotenv/config"
   },
@@ -49,7 +47,6 @@
     "js-yaml": "^4.1.0",
     "openapi3-ts": "^2.0.1",
     "prettier": "^2.6.2",
-    "react": "^17.0.2",
     "rxjs": "^7.5.4",
     "slash": "^4.0.0",
     "swagger2openapi": "^7.0.8",
@@ -74,6 +71,7 @@
     "@types/react": "^17.0.39",
     "@types/slash": "^3.0.0",
     "nock": "^13.2.1",
+    "react": "^17.0.2",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-internal": "^1.0.4",
     "rollup-plugin-preserve-shebang": "^1.0.1"

cli/package.json

@@ -6,28 +6,41 @@ import autoExternal from "rollup-plugin-auto-external";
 import internal from "rollup-plugin-internal";
 import typescript from "@rollup/plugin-typescript";
 
-export default {
-  input: "src/cli.ts",
-  output: {
-    file: "lib/cli.js",
-    format: "es",
-    banner: "#!/usr/bin/env node",
+const typescriptPlugin = typescript({
+  tsconfig: "./tsconfig.package.json",
+  compilerOptions: {
+    outDir: ".",
+    sourceMap: false,
   },
-  cache: false,
-  plugins: [
-    shebang(),
-    resolve(),
-    typescript({
-      tsconfig: "./tsconfig.package.json",
-      compilerOptions: {
-        outDir: ".",
-        sourceMap: false,
-      },
-    }),
-    commonjs(),
-    json(),
-    autoExternal(),
-    internal(["react", "ink"]),
-  ],
-  external: ["yoga-layout-prebuilt"],
-};
+});
+
+export default [
+  {
+    input: "src/index.ts",
+    output: {
+      file: "lib/index.js",
+      format: "es",
+    },
+    cache: false,
+    plugins: [typescriptPlugin],
+  },
+  {
+    input: "src/cli.ts",
+    output: {
+      file: "lib/cli.js",
+      format: "es",
+      banner: "#!/usr/bin/env node",
+    },
+    cache: false,
+    plugins: [
+      shebang(),
+      resolve(),
+      typescriptPlugin,
+      commonjs(),
+      json(),
+      autoExternal(),
+      internal(["react", "ink", "@apollo/client"]),
+    ],
+    external: ["yoga-layout-prebuilt"],
+  },
+];

cli/rollup.config.js

@@ -10,6 +10,7 @@ import slash from "slash";
 import { Config, FromOptions, Namespace } from "../types";
 import { getOpenAPISourceFile } from "../core/getOpenAPISourceFile.js";
 import { parseOpenAPISourceFile } from "../core/parseOpenAPISourceFile.js";
+import { Prompt } from "../prompts/Prompt.js";
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -210,7 +211,6 @@ export class GenerateCommand extends Command {
     const config = configs[this.namespace];
     const options = this.getFromOptions(config);
     if (options.source === "github" && this.pullRequest) {
-      const { Prompt } = await import("../prompts/Prompt.js");
       const prompt = new Prompt();
       const token = await prompt.githubToken();
       const pullRequest = await prompt.githubPullRequest({

cli/src/commands/GenerateCommand.ts

@@ -1,4 +1,4 @@
-import Apollo from "@apollo/client";
+import { ApolloClient, HttpLink, InMemoryCache } from "@apollo/client";
 
 import { Box, Text } from "ink";
 import fetch from "got-fetch";
@@ -14,8 +14,6 @@ import {
 import { Select } from "./Select.js";
 import { TextInput } from "./TextInput.js";
 
-const { ApolloClient, HttpLink, InMemoryCache } = Apollo;
-
 type Step1 = Pick<Partial<GithubOptions>, "owner">;
 type Step2 = Required<Step1> & Pick<Partial<GithubOptions>, "repository">;
 type Step3 = Required<Step2> & Pick<Partial<GithubOptions>, "source">;

cli/src/prompts/Github.tsx

@@ -1,4 +1,4 @@
-import Apollo from "@apollo/client";
+import { ApolloClient, HttpLink, InMemoryCache } from "@apollo/client";
 
 import React, { useEffect, useState } from "react";
 import { Box, Text } from "ink";
@@ -11,8 +11,6 @@ import { TextInput } from "./TextInput.js";
 import { Confirm } from "./Confirm.js";
 import { Spinner } from "./Spinner.js";
 
-const { ApolloClient, HttpLink, InMemoryCache } = Apollo;
-
 export type PullRequest = {
   ref: string;
   owner: string;

cli/src/prompts/GithubPullRequest.tsx

@@ -1,5 +1,5 @@
-import Apollo from "@apollo/client";
-const { gql } = Apollo;
+import type Apollo from "@apollo/client";
+import { gql, useQuery, useLazyQuery } from "@apollo/client";
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = {
@@ -23669,7 +23669,7 @@ export function useSearchFileQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<SearchFileQuery, SearchFileQueryVariables>(
+  return useQuery<SearchFileQuery, SearchFileQueryVariables>(
     SearchFileDocument,
     options
   );
@@ -23681,7 +23681,7 @@ export function useSearchFileLazyQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<SearchFileQuery, SearchFileQueryVariables>(
+  return useLazyQuery<SearchFileQuery, SearchFileQueryVariables>(
     SearchFileDocument,
     options
   );
@@ -23741,10 +23741,10 @@ export function useSearchPullRequestQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    SearchPullRequestQuery,
-    SearchPullRequestQueryVariables
-  >(SearchPullRequestDocument, options);
+  return useQuery<SearchPullRequestQuery, SearchPullRequestQueryVariables>(
+    SearchPullRequestDocument,
+    options
+  );
 }
 export function useSearchPullRequestLazyQuery(
   baseOptions?: Apollo.LazyQueryHookOptions<
@@ -23753,10 +23753,10 @@ export function useSearchPullRequestLazyQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    SearchPullRequestQuery,
-    SearchPullRequestQueryVariables
-  >(SearchPullRequestDocument, options);
+  return useLazyQuery<SearchPullRequestQuery, SearchPullRequestQueryVariables>(
+    SearchPullRequestDocument,
+    options
+  );
 }
 export type SearchPullRequestQueryHookResult = ReturnType<
   typeof useSearchPullRequestQuery
@@ -23803,7 +23803,7 @@ export function useSearchRepositoryQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<SearchRepositoryQuery, SearchRepositoryQueryVariables>(
+  return useQuery<SearchRepositoryQuery, SearchRepositoryQueryVariables>(
     SearchRepositoryDocument,
     options
   );
@@ -23815,10 +23815,10 @@ export function useSearchRepositoryLazyQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    SearchRepositoryQuery,
-    SearchRepositoryQueryVariables
-  >(SearchRepositoryDocument, options);
+  return useLazyQuery<SearchRepositoryQuery, SearchRepositoryQueryVariables>(
+    SearchRepositoryDocument,
+    options
+  );
 }
 export type SearchRepositoryQueryHookResult = ReturnType<
   typeof useSearchRepositoryQuery
@@ -23865,7 +23865,7 @@ export function useSearchUserQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<SearchUserQuery, SearchUserQueryVariables>(
+  return useQuery<SearchUserQuery, SearchUserQueryVariables>(
     SearchUserDocument,
     options
   );
@@ -23877,7 +23877,7 @@ export function useSearchUserLazyQuery(
   >
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<SearchUserQuery, SearchUserQueryVariables>(
+  return useLazyQuery<SearchUserQuery, SearchUserQueryVariables>(
     SearchUserDocument,
     options
   );

cli/src/prompts/queries/github.tsx

@@ -178,6 +178,10 @@ export const generateFetchers = async (context: Context, config: Config) => {
     }
   );
 
+  if (operationIds.length === 0) {
+    console.log(`⚠️ You don't have any operation with "operationId" defined!`);
+  }
+
   if (Object.keys(operationByTags).length > 0) {
     nodes.push(
       f.createVariableStatement(

package-lock.json

@@ -219,6 +219,9 @@ export const generateReactQueryComponents = async (
     }
   );
 
+  if (operationIds.length === 0) {
+    console.log(`⚠️ You don't have any operation with "operationId" defined!`);
+  }
   const queryKeyManager = f.createTypeAliasDeclaration(
     undefined,
     [f.createModifier(ts.SyntaxKind.ExportKeyword)],