fix(jest): fix type collisions between jasmine/jest

projects/spectator/jest/src/matchers-types.d.ts

@@ -0,0 +1,51 @@
+declare namespace jest {
+ interface Matchers<R> {
+ toExist(): boolean;
+
+ toHaveLength(expected: number): boolean;
+
+ toHaveId(id: string | number): boolean;
+
+ toHaveClass(className: string): boolean;
+ /**
+ * @deprecated
+ */
+ toHaveAttr({ attr, val }: { attr: string; val: string }): boolean;
+ toHaveAttribute(attr: string, val: string): boolean;
+ /**
+ * @deprecated
+ */
+ toHaveProp({ prop, val }: { prop: string; val: string }): boolean;
+ toHaveProperty(prop: string, val: string | boolean): boolean;
+
+ toHaveProperty(prop: string, val: string | boolean): boolean;
+
+ toHaveText(text: string | Function): boolean;
+
+ toHaveValue(value: string): boolean;
+
+ toHaveStyle(style: { [styleKey: string]: any }): boolean;
+
+ toHaveData({ data, val }: { data: string; val: string }): boolean;
+
+ toBeChecked(): boolean;
+
+ toBeDisabled(): boolean;
+
+ toBeEmpty(): boolean;
+
+ toBeHidden(): boolean;
+
+ toBeSelected(): boolean;
+
+ toBeVisible(): boolean;
+
+ toBeFocused(): boolean;
+
+ toBeMatchedBy(selector: string | Element): boolean;
+
+ toHaveDescendant(selector: string | Element): boolean;
+
+ toHaveDescendantWithText({ selector, text }: { selector: string; text: string }): boolean;
+ }
+}

projects/spectator/jest/src/public_api.ts

@@ -1,3 +1,4 @@
+/// <reference path="./matchers-types.d.ts" />
 export * from './config';
 export * from './host';
 export * from './http';

projects/spectator/src/lib/matchers-types.d.ts

@@ -49,55 +49,3 @@ declare namespace jasmine {
  toHaveDescendantWithText({ selector, text }: { selector: string; text: string }): boolean;
  }
 }
-
-declare namespace jest {
- interface Matchers<R> {
- toExist(): boolean;
-
- toHaveLength(expected: number): boolean;
-
- toHaveId(id: string | number): boolean;
-
- toHaveClass(className: string): boolean;
- /**
- * @deprecated
- */
- toHaveAttr({ attr, val }: { attr: string; val: string }): boolean;
- toHaveAttribute(attr: string, val: string): boolean;
- /**
- * @deprecated
- */
- toHaveProp({ prop, val }: { prop: string; val: string }): boolean;
- toHaveProperty(prop: string, val: string | boolean): boolean;
-
- toHaveProperty(prop: string, val: string | boolean): boolean;
-
- toHaveText(text: string | Function): boolean;
-
- toHaveValue(value: string): boolean;
-
- toHaveStyle(style: { [styleKey: string]: any }): boolean;
-
- toHaveData({ data, val }: { data: string; val: string }): boolean;
-
- toBeChecked(): boolean;
-
- toBeDisabled(): boolean;
-
- toBeEmpty(): boolean;
-
- toBeHidden(): boolean;
-
- toBeSelected(): boolean;
-
- toBeVisible(): boolean;
-
- toBeFocused(): boolean;
-
- toBeMatchedBy(selector: string | Element): boolean;
-
- toHaveDescendant(selector: string | Element): boolean;
-
- toHaveDescendantWithText({ selector, text }: { selector: string; text: string }): boolean;
- }
-}

projects/spectator/tsconfig.lib.json

@@ -11,9 +11,8 @@
  "emitDecoratorMetadata": true,
  "experimentalDecorators": true,
  "importHelpers": true,
- "types": [
- "@types/jest"
- ],
+ "typeRoots" : ["./typings"],
+ "types": ["jasmine", "jest"],
  "lib": [
  "dom",
  "es2018"

projects/spectator/typings/jest/index.d.ts

@@ -0,0 +1,23 @@
+/**
+ * This file was creating to avoid conflicts during building between jasmine and jest.
+ *
+ * Projects using @netbasal/spectator should just use either @types/jasmine or @types/jest.
+ */
+
+declare namespace jest {
+ interface Mock<T = {}> extends Function, MockInstance<T> {
+ new (...args: any[]): T;
+
+ (...args: any[]): any;
+ }
+
+ function fn<T>(implementation?: (...args: any[]) => any): Mock<T>;
+
+ interface MockInstance<T> {
+ mockImplementation(fn?: (...args: any[]) => any): Mock<T>;
+
+ mockReturnValue(value: any): Mock<T>;
+
+ mockReset(): void;
+ }
+}