Merge pull request #90 from mizdra/refactoring-e2e-tests

Refactoring E2E tests

Author: mizdra

e2e/esm/1-basic-schema.graphql e2e/01-esm/1-basic-schema.graphql

@@ -1,15 +1,5 @@
 import { CodegenConfig } from '@graphql-codegen/cli';
-
-const defaultTypeScriptPluginConfig = {
-  nonOptionalTypename: true,
-  enumsAsTypes: true,
-  avoidOptionals: true,
-  skipTypename: true,
-};
-const defaultFabbricaPluginConfig = {
-  typesFile: './types.js',
-  skipTypename: true,
-};
+import { defaultFabbricaPluginConfig, defaultTypeScriptPluginConfig } from '../util/config.cjs';
 
 const config: CodegenConfig = {
   generates: {
@@ -18,6 +8,7 @@ const config: CodegenConfig = {
       plugins: ['typescript'],
       config: {
         ...defaultTypeScriptPluginConfig,
+        skipTypename: true,
         scalars: {
           CustomScalarTest_CustomScalar1: 'Date',
           CustomScalarTest_CustomScalar2: '{ field: string }',
@@ -32,6 +23,7 @@ const config: CodegenConfig = {
       plugins: ['@mizdra/graphql-codegen-typescript-fabbrica'],
       config: {
         ...defaultFabbricaPluginConfig,
+        skipTypename: true,
         namingConvention: {
           typeNames: './my-naming-fn.cjs',
         },

e2e/esm/2-typesPrefix-schema.graphql e2e/01-esm/2-typesPrefix-schema.graphql

@@ -1,15 +1,5 @@
 import { CodegenConfig } from '@graphql-codegen/cli';
-
-const defaultTypeScriptPluginConfig = {
-  nonOptionalTypename: true,
-  enumsAsTypes: true,
-  avoidOptionals: true,
-  skipTypename: true,
-};
-const defaultFabbricaPluginConfig = {
-  typesFile: './types.js',
-  skipTypename: true,
-};
+import { defaultFabbricaPluginConfig, defaultTypeScriptPluginConfig } from '../util/config.cjs';
 
 const config: CodegenConfig = {
   generates: {
@@ -18,13 +8,15 @@ const config: CodegenConfig = {
       plugins: ['typescript'],
       config: {
         ...defaultTypeScriptPluginConfig,
+        skipTypename: true,
       },
     },
     './__generated__/1-basic/fabbrica.ts': {
       schema: './1-basic-schema.graphql',
       plugins: ['@mizdra/graphql-codegen-typescript-fabbrica'],
       config: {
         ...defaultFabbricaPluginConfig,
+        skipTypename: true,
       },
     },
   },

e2e/esm/3-typesSuffix-schema.graphql e2e/01-esm/3-typesSuffix-schema.graphql

@@ -1,15 +1,5 @@
 import { CodegenConfig } from '@graphql-codegen/cli';
-
-const defaultTypeScriptPluginConfig = {
-  nonOptionalTypename: true,
-  enumsAsTypes: true,
-  avoidOptionals: true,
-  skipTypename: true,
-};
-const defaultFabbricaPluginConfig = {
-  typesFile: './types.js',
-  skipTypename: true,
-};
+import { defaultFabbricaPluginConfig, defaultTypeScriptPluginConfig } from '../util/config.cjs';
 
 const config: CodegenConfig = {
   generates: {
@@ -18,13 +8,15 @@ const config: CodegenConfig = {
       plugins: ['typescript'],
       config: {
         ...defaultTypeScriptPluginConfig,
+        skipTypename: true,
       },
     },
     './__generated__/1-basic/fabbrica.ts': {
       schema: './1-basic-schema.graphql',
       plugins: ['@mizdra/graphql-codegen-typescript-fabbrica'],
       config: {
         ...defaultFabbricaPluginConfig,
+        skipTypename: true,
       },
     },
   },

e2e/esm/4-non-optional-fields-schema.graphql e2e/01-esm/4-non-optional-fields-schema.graphql

@@ -1,4 +1,5 @@
 import type { CodegenConfig } from '@graphql-codegen/cli';
+import { defaultFabbricaPluginConfig, defaultTypeScriptPluginConfig } from '../util/config.cjs';
 
 const config: CodegenConfig = {
   schema: './schema.graphql',
@@ -7,16 +8,11 @@ const config: CodegenConfig = {
     // Therefore, fabbrica artifacts are also output under `src/`.
     'src/__generated__/types.ts': {
       plugins: ['typescript'],
-      config: {
-        enumsAsTypes: true, // required
-        avoidOptionals: true, // required
-      },
+      config: defaultTypeScriptPluginConfig,
     },
     'src/__generated__/fabbrica.ts': {
       plugins: ['@mizdra/graphql-codegen-typescript-fabbrica'],
-      config: {
-        typesFile: './types.js', // required
-      },
+      config: defaultFabbricaPluginConfig,
     },
   },
 };

e2e/esm/codegen.ts e2e/01-esm/codegen.ts

@@ -0,0 +1,7 @@
+export const defaultTypeScriptPluginConfig = {
+  enumsAsTypes: true, // required
+  avoidOptionals: true, // required
+};
+export const defaultFabbricaPluginConfig = {
+  typesFile: './types.js', // required
+};

e2e/esm/index.e2e.ts e2e/01-esm/index.e2e.ts

@@ -31,9 +31,9 @@
     }
   },
   "workspaces": [
-    "e2e/esm",
-    "e2e/cjs",
-    "e2e/browser"
+    "e2e/01-esm",
+    "e2e/02-cjs",
+    "e2e/03-browser"
   ],
   "scripts": {
     "build": "run-s -c build:*",
@@ -46,10 +46,10 @@
     "test": "vitest",
     "pree2e": "npm run build",
     "e2e": "run-s -c e2e:*",
-    "e2e:esm": "npm -w e2e/esm run start",
-    "e2e:cjs": "npm -w e2e/cjs run start",
-    "e2e:browser": "npm -w e2e/browser run start",
-    "e2e:composite": "npm --prefix e2e/composite run start"
+    "e2e:esm": "npm -w e2e/01-esm run start",
+    "e2e:cjs": "npm -w e2e/02-cjs run start",
+    "e2e:browser": "npm -w e2e/03-browser run start",
+    "e2e:composite": "npm --prefix e2e/04-composite run start"
   },
   "prettier": "@mizdra/prettier-config-mizdra",
   "devDependencies": {