ezolenko
diff --git a/‎.github/workflows/nodejs.yml‎
Lines changed: 6 additions & 4 deletions b/‎.github/workflows/nodejs.yml‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎.gitignore‎
Lines changed: 4 additions & 0 deletions b/‎.gitignore‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎CONTRIBUTING.md‎
Lines changed: 18 additions & 4 deletions b/‎CONTRIBUTING.md‎
Lines changed: 18 additions & 4 deletions
diff --git a/‎__tests__/check-tsconfig.spec.ts‎
Lines changed: 28 additions & 0 deletions b/‎__tests__/check-tsconfig.spec.ts‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎__tests__/context.spec.ts‎
Lines changed: 49 additions & 0 deletions b/‎__tests__/context.spec.ts‎
Lines changed: 49 additions & 0 deletions
diff --git a/‎__tests__/diagnostics-format-host.spec.ts‎
Lines changed: 13 additions & 0 deletions b/‎__tests__/diagnostics-format-host.spec.ts‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎__tests__/fixtures/context.ts‎
Lines changed: 51 additions & 0 deletions b/‎__tests__/fixtures/context.ts‎
Lines changed: 51 additions & 0 deletions
diff --git a/‎__tests__/get-options-overrides.spec.ts‎
Lines changed: 151 additions & 0 deletions b/‎__tests__/get-options-overrides.spec.ts‎
Lines changed: 151 additions & 0 deletions
@@ -10,13 +10,14 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
+  build-and-test:
+    name: Build & Test on Node ${{ matrix.node-version }} and ${{ matrix.os }}
 
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [10.x, 12.x]
+        node-version: [12.x, 14.x, 16.x, 18.x]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
     - uses: actions/checkout@v2
@@ -30,3 +31,4 @@ jobs:
     - run: npm run build-self
       env:
         CI: true
+    - run: npm run test:coverage
@@ -6,3 +6,7 @@
 /build-self
 /build
 .rpt2_cache
+*.swp
+*.swo
+coverage
+__tests__/__temp/
@@ -16,9 +16,25 @@ Attach plugin output with `verbosity` option set to 3 (this will list all files
 
 ## Developing
 
-Use the [standard GitHub process](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models#fork-and-pull-model) of forking, making a branch, and creating a PR when ready. Fix all linting problems (`npm run lint`) and fix any failed checks on the PR. Use an editor that supports [`editorconfig`](https://editorconfig.org/), or match the settings from [`.editorconfig`](./.editorconfig) manually.
+Use the [standard GitHub process](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/getting-started/about-collaborative-development-models#fork-and-pull-model) of forking, making a branch, creating a PR when ready, and fixing any failing checks on the PR.
 
-Fastest way to test changes is to do a self build; the plugin is part of its own build system:
+### Linting and Style
+
+1. Use an editor that supports [`editorconfig`](https://editorconfig.org/), or match the settings from [`.editorconfig`](./.editorconfig) manually.
+1. Fix all linting problems with `npm run lint`.
+
+### Testing
+
+1. `npm test` to verify that all tests pass
+1. `npm run test:watch` to run tests in watch mode while developing
+1. `npm run test:coverage` to run tests and output a test coverage report
+
+While this repo now has an assortment of unit tests, it still badly needs integration tests with various scenarios and expected outcomes.
+Test coverage improvements for existing files and untested is needed as well.
+
+### Building and Self-Build
+
+One can test changes by doing a self-build; the plugin is part of its own build system.
 
 1. make changes
 1. run `npm run build` (uses last released version on npm)
@@ -28,5 +44,3 @@ Fastest way to test changes is to do a self build; the plugin is part of its own
 1. run `npm run build-self` _again_ to make sure plugin built by new version can still build itself
 
 If `build-self` breaks at some point, fix the problem and restart from the `build` step (a known good copy).
-
-This repo badly needs unit tests and integration tests with various scenarios and expected outcomes though.
 
@@ -0,0 +1,28 @@
+import { test, expect } from "@jest/globals";
+import * as ts from "typescript";
+
+import { setTypescriptModule } from "../src/tsproxy";
+import { checkTsConfig } from "../src/check-tsconfig";
+
+setTypescriptModule(ts);
+
+const defaultConfig = { fileNames: [], errors: [], options: {} };
+
+test("checkTsConfig", () => {
+	expect(() => checkTsConfig({
+		...defaultConfig,
+		options: { module: ts.ModuleKind.None },
+	})).toThrow(
+		`Incompatible tsconfig option. Module resolves to 'None'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`,
+	);
+
+	expect(checkTsConfig({
+		...defaultConfig,
+		options: { module: ts.ModuleKind.ES2015 },
+	})).toBeFalsy();
+
+	expect(checkTsConfig({
+		...defaultConfig,
+		options: { module: ts.ModuleKind.ESNext },
+	})).toBeFalsy();
+});
@@ -0,0 +1,49 @@
+import { jest, test, expect } from "@jest/globals";
+
+import { ConsoleContext } from "../src/context";
+
+(global as any).console = {log: jest.fn()};
+
+test("ConsoleContext", () => {
+	const proxy = new ConsoleContext(6, "=>");
+
+	proxy.warn("test");
+	expect(console.log).toHaveBeenLastCalledWith("=>test");
+
+	proxy.error("test2");
+	expect(console.log).toHaveBeenLastCalledWith("=>test2");
+
+	proxy.info("test3");
+	expect(console.log).toHaveBeenLastCalledWith("=>test3");
+
+	proxy.debug("test4");
+	expect(console.log).toHaveBeenLastCalledWith("=>test4");
+
+	proxy.warn(() => "ftest");
+	expect(console.log).toHaveBeenLastCalledWith("=>ftest");
+
+	proxy.error(() => "ftest2");
+	expect(console.log).toHaveBeenLastCalledWith("=>ftest2");
+
+	proxy.info(() => "ftest3");
+	expect(console.log).toHaveBeenLastCalledWith("=>ftest3");
+
+	proxy.debug(() => "ftest4");
+	expect(console.log).toHaveBeenLastCalledWith("=>ftest4");
+});
+
+test("ConsoleContext 0 verbosity", () => {
+	const proxy = new ConsoleContext(-100);
+
+	proxy.warn("no-test");
+	expect(console.log).not.toHaveBeenLastCalledWith("no-test");
+
+	proxy.info("no-test2");
+	expect(console.log).not.toHaveBeenLastCalledWith("no-test2");
+
+	proxy.debug("no-test3");
+	expect(console.log).not.toHaveBeenLastCalledWith("no-test3");
+
+	proxy.error("no-test4");
+	expect(console.log).not.toHaveBeenLastCalledWith("no-test4");
+});
@@ -0,0 +1,13 @@
+import { test, expect } from "@jest/globals";
+import * as ts from "typescript";
+
+import { setTypescriptModule } from "../src/tsproxy";
+import { formatHost } from "../src/diagnostics-format-host";
+
+setTypescriptModule(ts);
+
+test("formatHost", () => {
+	expect(formatHost.getCurrentDirectory()).toEqual(process.cwd());
+	expect(formatHost.getCanonicalFileName("package.json")).toEqual("package.json");
+	expect(formatHost.getNewLine()).toEqual(ts.sys.newLine);
+});
@@ -0,0 +1,51 @@
+import { PluginContext } from "rollup";
+
+import { IContext } from "../../src/context";
+
+const stub = (x: any) => x;
+
+const contextualLogger = (data: any): IContext => {
+	return {
+		warn: (x: any) => {
+			data.warn = x;
+		},
+		error: (x: any) => {
+			data.error = x;
+		},
+		info: (x: any) => {
+			data.info = x;
+		},
+		debug: (x: any) => {
+			data.debug = x;
+		},
+	};
+};
+
+export function makeStubbedContext (data: any): PluginContext & IContext {
+	const { warn, error, info, debug } = contextualLogger(data);
+	return {
+		addWatchFile: stub as any,
+		getWatchFiles: stub as any,
+		cache: stub as any,
+		load: stub as any,
+		resolve: stub as any,
+		resolveId: stub as any,
+		isExternal: stub as any,
+		meta: stub as any,
+		emitAsset: stub as any,
+		emitChunk: stub as any,
+		emitFile: stub as any,
+		setAssetSource: stub as any,
+		getAssetFileName: stub as any,
+		getChunkFileName: stub as any,
+		getFileName: stub as any,
+		parse: stub as any,
+		warn: warn as any,
+		error: error as any,
+		info: info as any,
+		debug: debug as any,
+		moduleIds: stub as any,
+		getModuleIds: stub as any,
+		getModuleInfo: stub as any
+	};
+};
@@ -0,0 +1,151 @@
+import { afterAll, test, expect } from "@jest/globals";
+import * as path from "path";
+import * as ts from "typescript";
+import { remove } from "fs-extra";
+
+import { makeStubbedContext } from "./fixtures/context";
+import { setTypescriptModule } from "../src/tsproxy";
+import { IOptions } from "../src/ioptions";
+import { getOptionsOverrides, createFilter } from "../src/get-options-overrides";
+
+setTypescriptModule(ts);
+
+const local = (x: string) => path.resolve(__dirname, x);
+const cacheDir = local("__temp/get-options-overrides");
+
+afterAll(() => remove(cacheDir));
+
+const defaultConfig: IOptions = {
+	include: ["*.ts+(|x)", "**/*.ts+(|x)"],
+	exclude: ["*.d.ts", "**/*.d.ts"],
+	check: false,
+	verbosity: 5,
+	clean: false,
+	cacheRoot: cacheDir,
+	cwd: local(""),
+	abortOnError: false,
+	rollupCommonJSResolveHack: false,
+	typescript: ts,
+	objectHashIgnoreUnknownHack: false,
+	tsconfigOverride: null,
+	useTsconfigDeclarationDir: false,
+	tsconfigDefaults: null,
+	sourceMapCallback: (id: string, map: string): void => {
+		console.log(id + map);
+	},
+	transformers: [(ls: ts.LanguageService) => {
+		console.log(ls);
+		return {};
+	}],
+};
+
+const forcedOptions: ts.CompilerOptions = {
+	allowNonTsExtensions: true,
+	importHelpers: true,
+	inlineSourceMap: false,
+	moduleResolution: ts.ModuleResolutionKind.NodeJs,
+	noEmit: false,
+	noEmitHelpers: false,
+	noResolve: false,
+	outDir: `${cacheDir}/placeholder`, // TODO: fix get-options-overrides.ts on Windows by normalizing the path: https://github.com/ezolenko/rollup-plugin-typescript2/pull/321#discussion_r869710856
+};
+
+const defaultPreParsedTsConfig: ts.ParsedCommandLine = {
+	options: {},
+	fileNames: [],
+	errors: [],
+};
+
+test("getOptionsOverrides", () => {
+	const config = { ...defaultConfig };
+
+	expect(getOptionsOverrides(config)).toStrictEqual(forcedOptions);
+});
+
+test("getOptionsOverrides - preParsedTsConfig", () => {
+	const config = { ...defaultConfig };
+	const preParsedTsConfig = { ...defaultPreParsedTsConfig };
+
+	expect(getOptionsOverrides(config, preParsedTsConfig)).toStrictEqual({
+		...forcedOptions,
+		declarationDir: undefined,
+		module: ts.ModuleKind.ES2015,
+		sourceRoot: undefined,
+	});
+});
+
+test("getOptionsOverrides - preParsedTsConfig with options.module", () => {
+	const config = { ...defaultConfig };
+	const preParsedTsConfig = {
+		...defaultPreParsedTsConfig,
+		options: {
+			module: ts.ModuleKind.AMD,
+		},
+	};
+
+	expect(getOptionsOverrides(config, preParsedTsConfig)).toStrictEqual({
+		...forcedOptions,
+		declarationDir: undefined,
+		sourceRoot: undefined,
+	});
+});
+
+test("getOptionsOverrides - with declaration", () => {
+	const config = { ...defaultConfig, useTsconfigDeclarationDir: true };
+	const preParsedTsConfig = { ...defaultPreParsedTsConfig };
+
+	expect(getOptionsOverrides(config, preParsedTsConfig)).toStrictEqual({
+		...forcedOptions,
+		module: ts.ModuleKind.ES2015,
+		sourceRoot: undefined,
+	});
+});
+
+test("getOptionsOverrides - with sourceMap", () => {
+	const config = { ...defaultConfig };
+	const preParsedTsConfig = {
+		...defaultPreParsedTsConfig,
+		options: {
+			sourceMap: true,
+		},
+	};
+
+	expect(getOptionsOverrides(config, preParsedTsConfig)).toStrictEqual({
+		...forcedOptions,
+		declarationDir: undefined,
+		module: ts.ModuleKind.ES2015,
+	});
+});
+
+test("createFilter", () => {
+	const config = { ...defaultConfig };
+	const preParsedTsConfig = { ...defaultPreParsedTsConfig };
+
+	const stubbedContext = makeStubbedContext({});
+	const filter = createFilter(stubbedContext, config, preParsedTsConfig);
+
+	expect(filter("src/test.ts")).toBe(true);
+	expect(filter("src/test.js")).toBe(false);
+	expect(filter("src/test.d.ts")).toBe(false);
+});
+
+// not totally sure why this is failing
+test.skip("createFilter -- rootDirs", () => {
+	const config = { ...defaultConfig };
+	const preParsedTsConfig = {
+		...defaultPreParsedTsConfig,
+		options: {
+			rootDirs: ["src", "lib"]
+		},
+	};
+
+	const stubbedContext = makeStubbedContext({});
+	const filter = createFilter(stubbedContext, config, preParsedTsConfig);
+
+	expect(filter("src/test.ts")).toBe(true);
+	expect(filter("src/test.js")).toBe(false);
+	expect(filter("src/test.d.ts")).toBe(false);
+	expect(filter("lib/test.ts")).toBe(true);
+	expect(filter("lib/test.js")).toBe(false);
+	expect(filter("lib/test.d.ts")).toBe(false);
+});