graphql-data-generator 0.3.0-alpha.2 → 0.3.0-alpha.4

package/esm/init.js

@@ -104,7 +104,6 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                             : variables,
                     });
                     Error.captureStackTrace(mock, obj.variables);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             },
@@ -125,7 +124,6 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                             : data,
                     });
                     Error.captureStackTrace(mock, obj.data);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             },
@@ -146,7 +144,6 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                     const builder = build[operation];
                     const mock = builder(prevInput, patch);
                     Error.captureStackTrace(mock, obj[name]);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             }])));
@@ -165,7 +162,6 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
             });
             mock.request.query = parsedQuery;
             Error.captureStackTrace(mock, builder);
-            mock.stack = mock.stack?.slice(6);
             return addOperationTransforms(name, options?.finalizeOperation
                 ? options.finalizeOperation(mock)
                 : mock);

package/esm/jest.js

@@ -4,7 +4,7 @@ import { ApolloLink } from "@apollo/client";
 import { ErrorLink } from "@apollo/client/link/error/index.js";
 import { MockedProvider, MockLink, } from "@apollo/client/testing/index.js";
 import { waitFor } from "@testing-library/dom";
-import { print } from "graphql";
+import { Kind, print } from "graphql";
 import { diff as jestDiff } from "jest-diff";
 let currentSpecResult;
 jasmine.getEnv().addReporter({
@@ -12,18 +12,11 @@ jasmine.getEnv().addReporter({
 });
 const afterTest = [];
 afterEach(async () => {
-    for (const hook of afterTest)
+    const hooks = afterTest.splice(0);
+    for (const hook of hooks)
         await hook();
-    afterTest.splice(0);
 });
-const diff = (a, b) => jestDiff(a, b, {
-    omitAnnotationLines: true,
-    // aColor: green,
-    // bColor: red,
-    // changeColor: inverse,
-    // commonColor: dim,
-    // patchColor: yellow,
-})
+const diff = (a, b) => jestDiff(a, b, { omitAnnotationLines: true })
     ?.replace(/\w+ \{/g, "{") // Remove class names
     .replace(/\w+ \[/g, "["); // Remove array class names
 const getErrorMessage = (operation, mockLink) => {
@@ -38,7 +31,7 @@ const getErrorMessage = (operation, mockLink) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const alts = (mockLink
         .mockedResponsesByKey[key] ?? []);
-    let errorMessage = `Expected GraphQL ${operationType} ${operation.operationName} to have been mocked`;
+    let errorMessage = `Expected ${operationType} ${operation.operationName} to have been mocked`;
     if (alts.length || Object.keys(operation.variables).length > 0) {
         errorMessage += ` with variables ${dntShim.Deno.inspect(operation.variables, { depth: Infinity, colors: true })}`;
     }
@@ -61,7 +54,9 @@ const getErrorMessage = (operation, mockLink) => {
             : undefined,
     };
 };
-export const MockProvider = ({ mocks, stack, children }) => {
+let _interceptRefetchWarnings = false;
+export const interceptRefetchWarnings = (value = true) => _interceptRefetchWarnings = value;
+export const MockProvider = ({ mocks, stack: renderStack, children }) => {
     const observableMocks = useMemo(() => {
         const observableMocks = mocks.map((m) => ({
             ...m,
@@ -78,13 +73,14 @@ export const MockProvider = ({ mocks, stack, children }) => {
                     if (currentSpecResult.failedExpectations.length)
                         return;
                     if (mock.result.mock.calls.length === 0) {
-                        const err = new Error(`Expected to have used mock ${mock.request.variables
+                        const operation = mock.request.query.definitions.find((d) => d.kind === Kind.OPERATION_DEFINITION);
+                        const err = new Error(`Expected to have used ${operation?.operation} ${operation?.name?.value}${mock.request.variables
                             ? ` with variables ${dntShim.Deno.inspect(mock.request.variables, {
                                 depth: Infinity,
                                 colors: true,
                             })}`
                             : ""}`);
-                        err.stack = `${err.message}\n${mock.stack ?? stack ?? err.stack?.slice(6)}`;
+                        err.stack = mock.stack ?? renderStack ?? err.stack;
                         throw err;
                     }
                 }, { onTimeout: (e) => e });
@@ -101,12 +97,10 @@ export const MockProvider = ({ mocks, stack, children }) => {
             const { message, stack: altStack } = getErrorMessage(operation, mockLink);
             try {
                 networkError.message = message;
-                const finalStack = altStack ?? stack
-                    ? `${message}\n${altStack ?? stack}`
-                    : undefined;
-                if (finalStack)
-                    networkError.stack = finalStack;
-                fail({ name: "Error", message, stack: finalStack });
+                const stack = altStack ?? renderStack;
+                if (stack)
+                    networkError.stack = stack;
+                fail({ name: "Error", message, stack: networkError.stack });
             }
             catch {
                 // fail both throws and marks the test as failed in jest; we only need the latter
@@ -114,6 +108,28 @@ export const MockProvider = ({ mocks, stack, children }) => {
         });
         // @ts-ignore It's fine
         return ApolloLink.from([errorLoggingLink, mockLink]);
-    }, [observableMocks, stack]);
+    }, [observableMocks, renderStack]);
+    if (_interceptRefetchWarnings) {
+        const oldWarn = console.warn.bind(console.warn);
+        console.warn = (message, operation, ...etc) => {
+            if (message !==
+                'Unknown query named "%s" requested in refetchQueries in options.include array') {
+                return oldWarn(message, operation, ...etc);
+            }
+            try {
+                fail({
+                    name: "Error",
+                    message: `Expected query ${operation} requested in refetchQueries options.include array to have bene mocked`,
+                    stack: renderStack,
+                });
+            }
+            catch {
+                // eat
+            }
+        };
+        afterTest.push(() => {
+            console.warn = oldWarn;
+        });
+    }
     return React.createElement(MockedProvider, { link: link }, children);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.3.0-alpha.2",
+  "version": "0.3.0-alpha.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voces/graphql-data-generator.git"

package/script/init.js

@@ -107,7 +107,6 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                             : variables,
                     });
                     Error.captureStackTrace(mock, obj.variables);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             },
@@ -128,7 +127,6 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                             : data,
                     });
                     Error.captureStackTrace(mock, obj.data);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             },
@@ -149,7 +147,6 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                     const builder = build[operation];
                     const mock = builder(prevInput, patch);
                     Error.captureStackTrace(mock, obj[name]);
-                    mock.stack = mock.stack?.slice(6);
                     return mock;
                 },
             }])));
@@ -168,7 +165,6 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
             });
             mock.request.query = parsedQuery;
             Error.captureStackTrace(mock, builder);
-            mock.stack = mock.stack?.slice(6);
             return addOperationTransforms(name, options?.finalizeOperation
                 ? options.finalizeOperation(mock)
                 : mock);

package/script/jest.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockProvider = void 0;
+exports.MockProvider = exports.interceptRefetchWarnings = void 0;
 const dntShim = __importStar(require("./_dnt.shims.js"));
 const react_1 = __importStar(require("react"));
 const client_1 = require("@apollo/client");
@@ -38,18 +38,11 @@ jasmine.getEnv().addReporter({
 });
 const afterTest = [];
 afterEach(async () => {
-    for (const hook of afterTest)
+    const hooks = afterTest.splice(0);
+    for (const hook of hooks)
         await hook();
-    afterTest.splice(0);
 });
-const diff = (a, b) => (0, jest_diff_1.diff)(a, b, {
-    omitAnnotationLines: true,
-    // aColor: green,
-    // bColor: red,
-    // changeColor: inverse,
-    // commonColor: dim,
-    // patchColor: yellow,
-})
+const diff = (a, b) => (0, jest_diff_1.diff)(a, b, { omitAnnotationLines: true })
     ?.replace(/\w+ \{/g, "{") // Remove class names
     .replace(/\w+ \[/g, "["); // Remove array class names
 const getErrorMessage = (operation, mockLink) => {
@@ -64,7 +57,7 @@ const getErrorMessage = (operation, mockLink) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const alts = (mockLink
         .mockedResponsesByKey[key] ?? []);
-    let errorMessage = `Expected GraphQL ${operationType} ${operation.operationName} to have been mocked`;
+    let errorMessage = `Expected ${operationType} ${operation.operationName} to have been mocked`;
     if (alts.length || Object.keys(operation.variables).length > 0) {
         errorMessage += ` with variables ${dntShim.Deno.inspect(operation.variables, { depth: Infinity, colors: true })}`;
     }
@@ -87,7 +80,10 @@ const getErrorMessage = (operation, mockLink) => {
             : undefined,
     };
 };
-const MockProvider = ({ mocks, stack, children }) => {
+let _interceptRefetchWarnings = false;
+const interceptRefetchWarnings = (value = true) => _interceptRefetchWarnings = value;
+exports.interceptRefetchWarnings = interceptRefetchWarnings;
+const MockProvider = ({ mocks, stack: renderStack, children }) => {
     const observableMocks = (0, react_1.useMemo)(() => {
         const observableMocks = mocks.map((m) => ({
             ...m,
@@ -104,13 +100,14 @@ const MockProvider = ({ mocks, stack, children }) => {
                     if (currentSpecResult.failedExpectations.length)
                         return;
                     if (mock.result.mock.calls.length === 0) {
-                        const err = new Error(`Expected to have used mock ${mock.request.variables
+                        const operation = mock.request.query.definitions.find((d) => d.kind === graphql_1.Kind.OPERATION_DEFINITION);
+                        const err = new Error(`Expected to have used ${operation?.operation} ${operation?.name?.value}${mock.request.variables
                             ? ` with variables ${dntShim.Deno.inspect(mock.request.variables, {
                                 depth: Infinity,
                                 colors: true,
                             })}`
                             : ""}`);
-                        err.stack = `${err.message}\n${mock.stack ?? stack ?? err.stack?.slice(6)}`;
+                        err.stack = mock.stack ?? renderStack ?? err.stack;
                         throw err;
                     }
                 }, { onTimeout: (e) => e });
@@ -127,12 +124,10 @@ const MockProvider = ({ mocks, stack, children }) => {
             const { message, stack: altStack } = getErrorMessage(operation, mockLink);
             try {
                 networkError.message = message;
-                const finalStack = altStack ?? stack
-                    ? `${message}\n${altStack ?? stack}`
-                    : undefined;
-                if (finalStack)
-                    networkError.stack = finalStack;
-                fail({ name: "Error", message, stack: finalStack });
+                const stack = altStack ?? renderStack;
+                if (stack)
+                    networkError.stack = stack;
+                fail({ name: "Error", message, stack: networkError.stack });
             }
             catch {
                 // fail both throws and marks the test as failed in jest; we only need the latter
@@ -140,7 +135,29 @@ const MockProvider = ({ mocks, stack, children }) => {
         });
         // @ts-ignore It's fine
         return client_1.ApolloLink.from([errorLoggingLink, mockLink]);
-    }, [observableMocks, stack]);
+    }, [observableMocks, renderStack]);
+    if (_interceptRefetchWarnings) {
+        const oldWarn = console.warn.bind(console.warn);
+        console.warn = (message, operation, ...etc) => {
+            if (message !==
+                'Unknown query named "%s" requested in refetchQueries in options.include array') {
+                return oldWarn(message, operation, ...etc);
+            }
+            try {
+                fail({
+                    name: "Error",
+                    message: `Expected query ${operation} requested in refetchQueries options.include array to have bene mocked`,
+                    stack: renderStack,
+                });
+            }
+            catch {
+                // eat
+            }
+        };
+        afterTest.push(() => {
+            console.warn = oldWarn;
+        });
+    }
     return react_1.default.createElement(index_js_2.MockedProvider, { link: link }, children);
 };
 exports.MockProvider = MockProvider;

package/types/jest.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import type { OperationMock } from "./types.js";
-export declare const MockProvider: ({ mocks, stack, children }: {
+export declare const interceptRefetchWarnings: (value?: boolean) => boolean;
+export declare const MockProvider: ({ mocks, stack: renderStack, children }: {
     mocks: OperationMock[];
     stack?: string;
     children?: React.ReactNode;