Merge branch 'master' into feature/recursive-generics

martinjlowm · web-flow · commit 079c3f0c0074 · 2020-06-28T16:08:39.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Semantic Versioning Changelog
 
+# [2.3.0](https://github.com/Typescript-TDD/ts-auto-mock/compare/2.2.8...2.3.0) (2020-06-27)
+
+
+### Features
+
+* **transformer:** error when running tests with no transformer installation ([16506e5](https://github.com/Typescript-TDD/ts-auto-mock/commit/16506e5ae72d70dcf5c09c8881fe5b1bd71ce2e9))
+* **transformer:** extract repeated error in a constant, fixed error wording ([dd73b57](https://github.com/Typescript-TDD/ts-auto-mock/commit/dd73b57454a2c41e93e39a15b0057c9e0344edeb))
+
 ## [2.2.8](https://github.com/Typescript-TDD/ts-auto-mock/compare/2.2.7...2.2.8) (2020-06-14)
 
 
diff --git a/config/karma/base/karma.config.base.js b/config/karma/base/karma.config.base.js
@@ -1,7 +1,6 @@
-const webpackConfig = require('../test/webpack.js');
 process.env.CHROME_BIN = require('puppeteer').executablePath();
 
-module.exports = function(config, url) {
+module.exports = function(config, url, webpackConfig) {
     return {
         basePath: '',
         frameworks: ['jasmine'],
diff --git a/config/karma/base/karma.config.noTransformer.base.js b/config/karma/base/karma.config.noTransformer.base.js
@@ -0,0 +1,6 @@
+const webpackConfig = require('../../test/noTransformer/webpack.js');
+const karmaBase = require('./karma.config.base');
+
+module.exports = function(config, url) {
+    return karmaBase(config, url, webpackConfig);
+};
diff --git a/config/karma/base/karma.config.transformer.base.js b/config/karma/base/karma.config.transformer.base.js
@@ -0,0 +1,6 @@
+const webpackConfig = require('../../test/transformer/webpack.js');
+const karmaBase = require('./karma.config.base');
+
+module.exports = function(config, url) {
+    return karmaBase(config, url, webpackConfig);
+};
diff --git a/config/karma/karma.config.features.js b/config/karma/karma.config.features.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/features/context.ts');
diff --git a/config/karma/karma.config.framework.context.js b/config/karma/karma.config.framework.context.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, "../../test/frameworkContext/context.ts");
diff --git a/config/karma/karma.config.framework.deprecated.js b/config/karma/karma.config.framework.deprecated.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, "../../test/frameworkContext/contextDeprecated.ts");
diff --git a/config/karma/karma.config.framework.js b/config/karma/karma.config.framework.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, "../../test/framework/**/*.test.ts");
diff --git a/config/karma/karma.config.noTransformer.js b/config/karma/karma.config.noTransformer.js
@@ -0,0 +1,7 @@
+const karmaBaseConfig = require('./base/karma.config.noTransformer.base');
+
+module.exports = function(config) {
+    const karmaConfig = karmaBaseConfig(config, "../../test/noTransformer/**/*.test.ts");
+
+    config.set(karmaConfig);
+};
diff --git a/config/karma/karma.config.registerMock.js b/config/karma/karma.config.registerMock.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/registerMock/context.ts');
diff --git a/config/karma/karma.config.transformer.js b/config/karma/karma.config.transformer.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/transformer/context.ts');
diff --git a/config/karma/karma.config.transformer.playground.build.js b/config/karma/karma.config.transformer.playground.build.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/playground/**/*.test.js');
diff --git a/config/karma/karma.config.transformer.playground.js b/config/karma/karma.config.transformer.playground.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/playground/**/*.test.ts');
diff --git a/config/karma/karma.config.unit.js b/config/karma/karma.config.unit.js
@@ -1,4 +1,4 @@
-const karmaBaseConfig = require('./karma.config.base');
+const karmaBaseConfig = require('./base/karma.config.transformer.base');
 
 module.exports = function(config) {
     const karmaConfig = karmaBaseConfig(config, '../../test/unit/**/*.test.ts');
diff --git a/config/test/noTransformer/webpack.js b/config/test/noTransformer/webpack.js
@@ -0,0 +1 @@
+module.exports = require('../webpack.base.js');
diff --git a/config/test/transformer/webpack.js b/config/test/transformer/webpack.js
@@ -1,26 +1,13 @@
-const transformer = require('../../dist/transformer');
-const path = require('path');
-const DetermineCacheBetweenTestsFromDebugEnvironment = require('./../utils/cache');
-const DetermineFeaturesFromEnvironment = require('./../utils/features');
+const transformer = require('../../../dist/transformer');
+const merge = require('webpack-merge');
+const base = require('../webpack.base.js');
+const DetermineCacheBetweenTestsFromDebugEnvironment = require('./../../utils/cache');
+const DetermineFeaturesFromEnvironment = require('./../../utils/features');
 
 module.exports = function () {
-    return {
-        mode: "development",
-        resolve: {
-            extensions: ['.ts', '.js'],
-            alias: {
-                ['ts-auto-mock']: path.join(__dirname, '../../dist'),
-                ['ts-auto-mock/repository']: path.join(__dirname, '../../dist/repository'),
-                ['ts-auto-mock/extension']: path.join(__dirname, '../../dist/extension'),
-            }
-        },
+    return merge.smart(base(), {
         module: {
             rules: [
-                {
-                    test: /\.ts$/,
-                    enforce: 'pre',
-                    loader: 'eslint-loader'
-                },
                 {
                     test: /\.ts$/,
                     loader: 'awesome-typescript-loader',
@@ -36,5 +23,5 @@ module.exports = function () {
                 }
             ]
         }
-    }
+    });
 };
diff --git a/config/test/webpack.base.js b/config/test/webpack.base.js
@@ -0,0 +1,28 @@
+const path = require('path');
+
+module.exports = function () {
+    return {
+        mode: "development",
+        resolve: {
+            extensions: ['.ts', '.js'],
+            alias: {
+                ['ts-auto-mock']: path.join(__dirname, '../../dist'),
+                ['ts-auto-mock/repository']: path.join(__dirname, '../../dist/repository'),
+                ['ts-auto-mock/extension']: path.join(__dirname, '../../dist/extension'),
+            }
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.ts$/,
+                    enforce: 'pre',
+                    loader: 'eslint-loader'
+                },
+                {
+                    test: /\.ts$/,
+                    loader: 'awesome-typescript-loader'
+                }
+            ]
+        }
+    }
+};
diff --git a/data/definitelyTyped/a4b17491-a90a-4eb8-97e7-f58c8ddbc538.json b/data/definitelyTyped/a4b17491-a90a-4eb8-97e7-f58c8ddbc538.json
diff --git a/data/definitelyTyped/list.json b/data/definitelyTyped/list.json
@@ -1 +1 @@
-[{"id":"756c5f8d-be26-43fc-8831-0a12df4c972e.json","initialDate":"2020-01-11T17:17:58.333Z","lastUpdatedDate":"2020-01-16T00:31:39.270Z","typesProcessed":9999},{"id":"9749238a-cba9-4abd-9fac-f9d0d4ef90e3.json","initialDate":"2020-01-17T20:34:24.904Z","lastUpdatedDate":"2020-02-01T00:40:31.064Z","typesProcessed":9999},{"id":"45e2213b-fa9c-40d1-b066-89413f063ee3.json","initialDate":"2020-02-01T17:11:06.944Z","lastUpdatedDate":"2020-03-07T00:20:59.201Z","typesProcessed":6549},{"id":"532444dd-7414-42ad-8d30-3da2d2e6c9af.json","initialDate":"2020-03-08T08:08:21.638Z","lastUpdatedDate":"2020-03-17T00:55:23.522Z","typesProcessed":9999},{"id":"59fcd50b-ad93-43d9-8777-45cf4cb83abe.json","initialDate":"2020-03-29T00:47:04.041Z","lastUpdatedDate":"2020-05-10T00:20:06.743Z","typesProcessed":6744},{"id":"6dafe6a4-fd96-4cee-a280-2ef999b957ac.json","initialDate":"2020-05-11T00:52:07.109Z","lastUpdatedDate":"2020-06-17T00:33:39.118Z","typesProcessed":6850},{"id":"a4b17491-a90a-4eb8-97e7-f58c8ddbc538.json","initialDate":"2020-06-18T00:57:32.208Z","lastUpdatedDate":"2020-06-27T00:58:46.839Z","typesProcessed":5000}]
+[{"id":"756c5f8d-be26-43fc-8831-0a12df4c972e.json","initialDate":"2020-01-11T17:17:58.333Z","lastUpdatedDate":"2020-01-16T00:31:39.270Z","typesProcessed":9999},{"id":"9749238a-cba9-4abd-9fac-f9d0d4ef90e3.json","initialDate":"2020-01-17T20:34:24.904Z","lastUpdatedDate":"2020-02-01T00:40:31.064Z","typesProcessed":9999},{"id":"45e2213b-fa9c-40d1-b066-89413f063ee3.json","initialDate":"2020-02-01T17:11:06.944Z","lastUpdatedDate":"2020-03-07T00:20:59.201Z","typesProcessed":6549},{"id":"532444dd-7414-42ad-8d30-3da2d2e6c9af.json","initialDate":"2020-03-08T08:08:21.638Z","lastUpdatedDate":"2020-03-17T00:55:23.522Z","typesProcessed":9999},{"id":"59fcd50b-ad93-43d9-8777-45cf4cb83abe.json","initialDate":"2020-03-29T00:47:04.041Z","lastUpdatedDate":"2020-05-10T00:20:06.743Z","typesProcessed":6744},{"id":"6dafe6a4-fd96-4cee-a280-2ef999b957ac.json","initialDate":"2020-05-11T00:52:07.109Z","lastUpdatedDate":"2020-06-17T00:33:39.118Z","typesProcessed":6850},{"id":"a4b17491-a90a-4eb8-97e7-f58c8ddbc538.json","initialDate":"2020-06-18T00:57:32.208Z","lastUpdatedDate":"2020-06-28T01:05:27.475Z","typesProcessed":5500}]
diff --git a/data/performance.json b/data/performance.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-auto-mock",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "description": "Typescript transformer to unlock automatic mock creation for interfaces and classes",
   "scripts": {
     "build": "npm run build:modules && npm run build:transformer",
@@ -11,9 +11,10 @@
     "build:modules:debug": "cross-env DEBUG=true webpack --config config/modules/webpack.js",
     "build:transformer:definitelyTyped": "webpack --config config/modules/definitelyTypedTransformer/webpack.functions.js && webpack --config config/modules/definitelyTypedTransformer/webpack.js",
     "build:playground": "ttsc --project tsconfig.playground.json",
-    "test": "npm run test:transformer && npm run test:framework:context && npm run test:framework && npm run test:frameworkDeprecated && npm run test:registerMock && npm run test:features && npm run test:unit",
+    "test": "npm run test:transformer && npm run test:noTransformer && npm run test:framework:context && npm run test:framework && npm run test:frameworkDeprecated && npm run test:registerMock && npm run test:features && npm run test:unit",
     "test:unit": "karma start config/karma/karma.config.unit.js",
     "test:transformer": "cross-env CACHE=true karma start config/karma/karma.config.transformer.js",
+    "test:noTransformer": "cross-env CACHE=true karma start config/karma/karma.config.noTransformer.js",
     "test:registerMock": "cross-env CACHE=true karma start config/karma/karma.config.registerMock.js",
     "test:framework:context": "cross-env CACHE=true karma start config/karma/karma.config.framework.context.js",
     "test:frameworkDeprecated": "cross-env CACHE=true karma start config/karma/karma.config.framework.deprecated.js",
diff --git a/src/create-mock-list.ts b/src/create-mock-list.ts
@@ -1,2 +1,7 @@
+import { NoTransformerError } from './errors/no-transformer.error';
 import { DeepPartial } from './partial/deepPartial';
-export declare function createMockList<T extends object>(quantity: number, iterator?: (index: number) => DeepPartial<T>): T[];
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function createMockList<T extends object>(quantity: number, iterator?: (index: number) => DeepPartial<T>): T[] {
+  throw new Error(NoTransformerError);
+}
diff --git a/src/create-mock.ts b/src/create-mock.ts
@@ -1,3 +1,7 @@
+import { NoTransformerError } from './errors/no-transformer.error';
 import { DeepPartial } from './partial/deepPartial';
 
-export declare function createMock<T extends object>(values?: DeepPartial<T>): T;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function createMock<T extends object>(values?: DeepPartial<T>): T {
+  throw new Error(NoTransformerError);
+}
diff --git a/src/errors/no-transformer.error.ts b/src/errors/no-transformer.error.ts
@@ -0,0 +1,4 @@
+export const NoTransformerError: string = `
+  hey, it looks like ts-auto-mock is not configured correctly! You can find the instructions here https://typescript-tdd.github.io/ts-auto-mock/installation.
+  If you need further assistance feel free to drop a message on slack. (link at the bottom of https://typescript-tdd.github.io/ts-auto-mock)
+`;
diff --git a/src/register-mock.ts b/src/register-mock.ts
@@ -1 +1,6 @@
-export declare function registerMock<T extends object>(factory: () => T): void;
+import { NoTransformerError } from './errors/no-transformer.error';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function registerMock<T extends object>(factory: () => T): void {
+  throw new Error(NoTransformerError);
+}
diff --git a/test/noTransformer/noTransformer.test.ts b/test/noTransformer/noTransformer.test.ts
@@ -0,0 +1,14 @@
+import { createMock, createMockList, registerMock } from 'ts-auto-mock';
+
+interface MyInterface {
+  a: string;
+  b: number;
+}
+
+describe('when using placeholder functions without installing the transformer', () => {
+  it('should throw an error linking the installation guide', () => {
+    expect(() => createMock<MyInterface>()).toThrowError(/https:\/\/typescript-tdd.github.io\/ts-auto-mock\/installation/);
+    expect(() => createMockList<MyInterface>(2)).toThrowError(/https:\/\/typescript-tdd.github.io\/ts-auto-mock\/installation/);
+    expect(() => registerMock<MyInterface>(() => ({ a: '', b: 4 }))).toThrowError(/https:\/\/typescript-tdd.github.io\/ts-auto-mock\/installation/);
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const karmaBaseConfig = require('./karma.config.base');`
	`1`	`+const karmaBaseConfig = require('./base/karma.config.transformer.base');`
`2`	`2`
`3`	`3`	`module.exports = function(config) {`
`4`	`4`	`const karmaConfig = karmaBaseConfig(config, '../../test/features/context.ts');`