minor fixes (#212)

* fix getFields with nullable objects * fix importsNotUsedAsValues error on generated schema * allow set core "resolved" defaults
samdenty · May 19, 2021 · 422eb9a · 422eb9a · vercel · May 19, 2021
1 parent 3e755d4
commit 422eb9a
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 54 deletions.
diff --git a/.changeset/dull-mayflies-impress.md b/.changeset/dull-mayflies-impress.md
@@ -0,0 +1,5 @@
+---
+'gqless': patch
+---
+
+allow set core "resolved" defaults
diff --git a/.changeset/happy-pets-rescue.md b/.changeset/happy-pets-rescue.md
@@ -0,0 +1,5 @@
+---
+'@gqless/cli': patch
+---
+
+fix importsNotUsedAsValues error on generated schema
diff --git a/.changeset/old-humans-tease.md b/.changeset/old-humans-tease.md
@@ -0,0 +1,5 @@
+---
+'gqless': patch
+---
+
+hotfix nullable getFields
diff --git a/packages/cli/src/generate.ts b/packages/cli/src/generate.ts
@@ -866,15 +866,13 @@ export const generatedSchema = {${Object.entries(generatedSchema).reduceRight(
  */
   ${preImport}
 
-  import { ScalarsEnumsHash${
-    hasUnions ? ', SchemaUnionsKey' : ''
-  } } from "gqless";
+  ${hasUnions ? 'import { SchemaUnionsKey } from "gqless";' : ''}
 
   ${await codegenResultPromise}
 
   export${
     isJavascriptOutput ? ' declare' : ''
-  } const scalarsEnumsHash: ScalarsEnumsHash${
+  } const scalarsEnumsHash: import("gqless").ScalarsEnumsHash${
       isJavascriptOutput ? ';' : ` = ${JSON.stringify(scalarsEnumsHash)};`
     }
   export${isJavascriptOutput ? ' declare' : ''} const generatedSchema ${

diff --git a/packages/cli/test/generate.test.ts b/packages/cli/test/generate.test.ts
@@ -47,8 +47,6 @@ test('basic functionality works', async () => {
 
     // This should be included
 
-    import { ScalarsEnumsHash } from 'gqless';
-
     export type Maybe<T> = T | null;
     export type Exact<T extends { [key: string]: unknown }> = {
       [K in keyof T]: T[K];
@@ -66,7 +64,7 @@ test('basic functionality works', async () => {
       Float: number;
     }
 
-    export const scalarsEnumsHash: ScalarsEnumsHash = {
+    export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
       String: true,
       Int: true,
       Boolean: true,
@@ -382,8 +380,6 @@ test('custom scalars works', async () => {
      * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
      */
 
-    import { ScalarsEnumsHash } from 'gqless';
-
     export type Maybe<T> = T | null;
     export type Exact<T extends { [key: string]: unknown }> = {
       [K in keyof T]: T[K];
@@ -402,7 +398,7 @@ test('custom scalars works', async () => {
       Custom: 'hello world';
     }
 
-    export const scalarsEnumsHash: ScalarsEnumsHash = {
+    export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
       Custom: true,
       Boolean: true,
       String: true,
@@ -577,7 +573,7 @@ describe('feature complete app', () => {
        * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
        */
 
-      import { ScalarsEnumsHash, SchemaUnionsKey } from 'gqless';
+      import { SchemaUnionsKey } from 'gqless';
 
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
@@ -620,7 +616,7 @@ describe('feature complete app', () => {
         scal?: Maybe<Scalars['ExampleScalar']>;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         ExampleScalar: true,
         GreetingsEnum: true,
         OtherEnum: true,
@@ -927,8 +923,6 @@ describe('mutation', () => {
        * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
        */
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -946,7 +940,7 @@ describe('mutation', () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };
@@ -1059,8 +1053,6 @@ describe('subscription', () => {
        * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
        */
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -1078,7 +1070,7 @@ describe('subscription', () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };
@@ -1363,7 +1355,7 @@ test('javascript output works', async () => {
      * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
      */
 
-    import { ScalarsEnumsHash, SchemaUnionsKey } from 'gqless';
+    import { SchemaUnionsKey } from 'gqless';
 
     export type Maybe<T> = T | null;
     export type Exact<T extends { [key: string]: unknown }> = {
@@ -1382,7 +1374,7 @@ test('javascript output works', async () => {
       Float: number;
     }
 
-    export declare const scalarsEnumsHash: ScalarsEnumsHash;
+    export declare const scalarsEnumsHash: import('gqless').ScalarsEnumsHash;
     export declare const generatedSchema: {
       query: { __typename: { __type: 'String!' }; hello: { __type: 'String!' } };
       mutation: {};
@@ -1622,8 +1614,6 @@ test('ignoreArgs transform', async () => {
      * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
      */
 
-    import { ScalarsEnumsHash } from 'gqless';
-
     export type Maybe<T> = T | null;
     export type Exact<T extends { [key: string]: unknown }> = {
       [K in keyof T]: T[K];
@@ -1641,7 +1631,7 @@ test('ignoreArgs transform', async () => {
       Float: number;
     }
 
-    export const scalarsEnumsHash: ScalarsEnumsHash = {
+    export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
       String: true,
       Int: true,
       Boolean: true,

diff --git a/packages/cli/test/inspectWriteGenerate.test.ts b/packages/cli/test/inspectWriteGenerate.test.ts
@@ -137,8 +137,6 @@ test('basic inspectWriteGenerate functionality', async () => {
        * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
        */
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -156,7 +154,7 @@ test('basic inspectWriteGenerate functionality', async () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };
@@ -322,8 +320,6 @@ describe('from file', () => {
          * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
          */
 
-        import { ScalarsEnumsHash } from 'gqless';
-
         export type Maybe<T> = T | null;
         export type Exact<T extends { [key: string]: unknown }> = {
           [K in keyof T]: T[K];
@@ -341,7 +337,7 @@ describe('from file', () => {
           Float: number;
         }
 
-        export const scalarsEnumsHash: ScalarsEnumsHash = {
+        export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
           Int: true,
           Boolean: true,
           String: true,
@@ -509,8 +505,6 @@ describe('from file', () => {
          * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
          */
 
-        import { ScalarsEnumsHash } from 'gqless';
-
         export type Maybe<T> = T | null;
         export type Exact<T extends { [key: string]: unknown }> = {
           [K in keyof T]: T[K];
@@ -528,7 +522,7 @@ describe('from file', () => {
           Float: number;
         }
 
-        export const scalarsEnumsHash: ScalarsEnumsHash = {
+        export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
           String: true,
           Boolean: true,
         };
@@ -695,8 +689,6 @@ describe('from file', () => {
          * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
          */
 
-        import { ScalarsEnumsHash } from 'gqless';
-
         export type Maybe<T> = T | null;
         export type Exact<T extends { [key: string]: unknown }> = {
           [K in keyof T]: T[K];
@@ -714,7 +706,7 @@ describe('from file', () => {
           Float: number;
         }
 
-        export const scalarsEnumsHash: ScalarsEnumsHash = {
+        export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
           String: true,
           Boolean: true,
         };
@@ -920,8 +912,6 @@ test('specify generateOptions to inspectWriteGenerate', async () => {
 
       // This should be included
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -939,7 +929,7 @@ test('specify generateOptions to inspectWriteGenerate', async () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };
@@ -1058,8 +1048,6 @@ describe('inspect headers', () => {
          */
         // This should be included
 
-        import { ScalarsEnumsHash } from 'gqless';
-
         export type Maybe<T> = T | null;
         export type Exact<T extends { [key: string]: unknown }> = {
           [K in keyof T]: T[K];
@@ -1077,7 +1065,7 @@ describe('inspect headers', () => {
           Float: number;
         }
 
-        export const scalarsEnumsHash: ScalarsEnumsHash = {
+        export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
           String: true,
           Boolean: true,
         };
@@ -1273,8 +1261,6 @@ describe('CLI behavior', () => {
          * GQLESS AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY
          */
 
-        import { ScalarsEnumsHash } from 'gqless';
-
         export type Maybe<T> = T | null;
         export type Exact<T extends { [key: string]: unknown }> = {
           [K in keyof T]: T[K];
@@ -1292,7 +1278,7 @@ describe('CLI behavior', () => {
           Float: number;
         }
 
-        export const scalarsEnumsHash: ScalarsEnumsHash = {
+        export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
           String: true,
           Boolean: true,
         };

diff --git a/packages/cli/test/writeGenerate.test.ts b/packages/cli/test/writeGenerate.test.ts
@@ -69,8 +69,6 @@ test('generates code and writes existing file', async () => {
        */
       // This should be included
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -88,7 +86,7 @@ test('generates code and writes existing file', async () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };
@@ -176,8 +174,6 @@ test('creates dir, generates code and writes new file', async () => {
        */
       // This should be included
 
-      import { ScalarsEnumsHash } from 'gqless';
-
       export type Maybe<T> = T | null;
       export type Exact<T extends { [key: string]: unknown }> = {
         [K in keyof T]: T[K];
@@ -195,7 +191,7 @@ test('creates dir, generates code and writes new file', async () => {
         Float: number;
       }
 
-      export const scalarsEnumsHash: ScalarsEnumsHash = {
+      export const scalarsEnumsHash: import('gqless').ScalarsEnumsHash = {
         String: true,
         Boolean: true,
       };

diff --git a/packages/gqless/src/Client/client.ts b/packages/gqless/src/Client/client.ts
@@ -61,6 +61,7 @@ export interface InnerClientState {
   readonly queryFetcher: QueryFetcher;
   readonly schemaUnions: SchemaUnions;
   readonly normalizationHandler: NormalizationHandler | undefined;
+  defaults: CoreClientDefaults;
 }
 
 export interface SubscribeEvents {
@@ -103,6 +104,32 @@ export interface SubscriptionsClient {
   ): void;
 }
 
+export interface CoreClientDefaults {
+  /**
+   * `resolved` defaults
+   */
+  resolved?: {
+    /**
+     * Set the default `noCache` option
+     *
+     * @default false
+     */
+    noCache?: boolean;
+    /**
+     * Set the default `noCache` option
+     *
+     * @default false
+     */
+    refetch?: boolean;
+    /**
+     * Set the default `retry` strategy
+     *
+     * @default false
+     */
+    retry?: RetryOptions;
+  };
+}
+
 export interface ClientOptions<
   ObjectTypesNames extends string = never,
   SchemaObjectTypes extends {
@@ -120,6 +147,7 @@ export interface ClientOptions<
     | NormalizationOptions<ObjectTypesNames, SchemaObjectTypes>
     | boolean;
   subscriptionsClient?: SubscriptionsClient;
+  defaults?: CoreClientDefaults;
 }
 
 export interface MutateHelpers<
@@ -218,6 +246,7 @@ export function createClient<
   retry,
   normalization = true,
   subscriptionsClient,
+  defaults = {},
 }: ClientOptions<
   ObjectTypesNames,
   ObjectTypes
@@ -261,6 +290,7 @@ export function createClient<
     queryFetcher,
     schemaUnions: createSchemaUnions(schema),
     normalizationHandler,
+    defaults,
   };
 
   const {