Skip to content

Commit

Permalink
refactor: use helper types instead of duplications
Browse files Browse the repository at this point in the history
  • Loading branch information
wessberg committed May 26, 2021
1 parent e47e45d commit ba8fef4
Show file tree
Hide file tree
Showing 20 changed files with 53 additions and 49 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
"@wessberg/rollup-plugin-ts": "^1.3.14",
"sandhog": "^1.0.38",
"sandhog": "^1.0.40",
"@wessberg/ts-config": "^1.1.0",
"ava": "^3.15.0",
"eslint": "^7.27.0",
Expand All @@ -82,6 +82,7 @@
"typescript": "^4.2.4",
"memfs": "^3.2.2",
"npm-check-updates": "^11.5.13",
"tslib": "^2.2.0",
"typescript-3-2-1": "npm:[email protected]",
"typescript-3-3-1": "npm:[email protected]",
"typescript-3-4-1": "npm:[email protected]",
Expand All @@ -101,7 +102,7 @@
"fast-glob": "^3.2.5",
"reserved-words": "^0.1.2",
"resolve": "^1.20.0",
"tslib": "^2.2.0"
"helpertypes": "^0.0.1"
},
"peerDependencies": {
"typescript": ">=3.2.x || >= 4.x"
Expand Down
53 changes: 31 additions & 22 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions prettier.config.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// eslint-disable-next-line @typescript-eslint/no-require-imports
module.exports = require("@wessberg/ts-config/prettier.config");
4 changes: 2 additions & 2 deletions script/generate-built-in-module-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Module from "module";
import {join} from "path";
import {existsSync, mkdirSync, writeFileSync} from "fs";
import {format} from "prettier";
// @ts-ignore

import prettierConfig from "../prettier.config.js";

const IGNORED_MODULE_NAMES = new Set([
Expand Down Expand Up @@ -54,7 +54,7 @@ function generateBuiltInModule(): string {
* @file This file is auto-generated. Do not change its contents.
*/
import {ElementOf} from "../util/element-of";
import {ElementOf} from "helpertypes";
import {ModuleExports} from "../module-exports/module-exports";
export const BUILT_IN_MODULE = new Set([
Expand Down
2 changes: 1 addition & 1 deletion src/api/transform.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {transformTask} from "../cli/task/transform/transform-task";
import {createTransformTaskOptions} from "../shared/task/create-transform-task-options";
import {TransformTaskOptions} from "../shared/task/transform-task-options";
import {PartialExcept} from "../type/type-util";
import {TransformResult} from "../shared/task/transform-result";
import {PartialExcept} from "helpertypes";

export async function transform(options: PartialExcept<TransformTaskOptions, "input" | "outDir">): Promise<TransformResult> {
return transformTask(createTransformTaskOptions(options));
Expand Down
2 changes: 1 addition & 1 deletion src/shared/task/create-transform-task-options.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {realFileSystem} from "../file-system/file-system";
import {TransformTaskOptions} from "./transform-task-options";
import {createTaskOptions} from "./create-task-options";
import {PartialExcept} from "../../type/type-util";
import {isAbsolute, join} from "../../transformer/util/path-util";
import {ensureArray} from "../util/util";
import {PartialExcept} from "helpertypes";

export function createTransformTaskOptions({
fileSystem = realFileSystem,
Expand Down
2 changes: 1 addition & 1 deletion src/shared/task/transform-task-options.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {TaskOptions} from "./task-options";
import {MaybeArray} from "../../type/type-util";
import {FileSystem} from "../file-system/file-system";
import {MaybeArray} from "helpertypes";

export interface TransformHooks {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/transformer/built-in/built-in-module-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @file This file is auto-generated. Do not change its contents.
*/

import {ElementOf} from "../util/element-of";
import {ElementOf} from "helpertypes";
import {ModuleExports} from "../module-exports/module-exports";

export const BUILT_IN_MODULE = new Set([
Expand Down
7 changes: 0 additions & 7 deletions src/transformer/util/element-of.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/transformer/util/path-util.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path, {ParsedPath} from "path";
import slash from "slash";
import {ElementOf} from "./element-of";
import {ElementOf} from "helpertypes";

export const KNOWN_EXTENSIONS = [".d.ts", ".d.dts.map", ".js.map", ".ts", ".tsx", ".js", ".jsx", ".mjs", ".mjsx", ".json", ".tsbuildinfo"] as const;

Expand Down
2 changes: 0 additions & 2 deletions src/type/type-util.ts

This file was deleted.

2 changes: 1 addition & 1 deletion test/setup/execute-api.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {TestFile} from "./test-file";
import {TestContext} from "./test-context";
import {MaybeArray} from "../../src/type/type-util";
import {createTestSetup} from "./test-setup";
import {transform} from "../../src/api/transform";
import {createTestResult, TestResult} from "./test-result";
import {MaybeArray} from "helpertypes";

/**
* Prepares a test via the transform function
Expand Down
2 changes: 1 addition & 1 deletion test/setup/execute-cli.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {TestFile} from "./test-file";
import {TestContext} from "./test-context";
import {MaybeArray} from "../../src/type/type-util";
import {createTestSetup} from "./test-setup";
import {configureCommands} from "../../src/cli/configure-commands";
import {shouldDebug} from "../../src/transformer/util/should-debug";
import {join, relative} from "../../src/transformer/util/path-util";
import {createTestResult, TestResult} from "./test-result";
import {MaybeArray} from "helpertypes";

export interface CliTestContext extends TestContext {
args: string[];
Expand Down
2 changes: 1 addition & 1 deletion test/setup/execute-rollup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import typescriptRollupPlugin from "@wessberg/rollup-plugin-ts";
import nodeResolve from "@rollup/plugin-node-resolve";
import {cjsToEsm} from "../../src/transformer/cjs-to-esm";
import {dirname, isAbsolute, join, nativeNormalize, normalize} from "../../src/transformer/util/path-util";
import {MaybeArray} from "../../src/type/type-util";
import {TestFile} from "./test-file";
import {TestContext} from "./test-context";
import {createTestSetup} from "./test-setup";
import {MaybeArray} from "helpertypes";

export interface RollupTestContext extends TestContext {
rollupOptions: Partial<RollupOptions>;
Expand Down
2 changes: 1 addition & 1 deletion test/setup/execute-transformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {normalize} from "../../src/transformer/util/path-util";
import {createTestResult, TestResult} from "./test-result";
import {TestFile} from "./test-file";
import {TestContext} from "./test-context";
import {MaybeArray} from "../../src/type/type-util";
import {createTestSetup} from "./test-setup";
import {MaybeArray} from "helpertypes";

/**
* Prepares a test
Expand Down
2 changes: 1 addition & 1 deletion test/setup/test-context.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {isInDebugMode} from "../util/is-in-debug-mode";
import * as TSModule from "typescript";
import {PartialExcept} from "../../src/type/type-util";
import {TransformTaskOptions} from "../../src/shared/task/transform-task-options";
import {PartialExcept} from "helpertypes";

export interface TestContext extends PartialExcept<TransformTaskOptions, "typescript" | "cwd"> {}

Expand Down
2 changes: 1 addition & 1 deletion test/setup/test-file.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {join} from "../../src/transformer/util/path-util";
import {TestContext} from "./test-context";
import {MaybeArray} from "../../src/type/type-util";
import {ensureArray, generateRandomPath} from "../../src/shared/util/util";
import {MaybeArray} from "helpertypes";

export interface TestFileRecord {
fileName: string;
Expand Down
2 changes: 1 addition & 1 deletion test/setup/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {createTestContext, TestContext} from "./test-context";
import {FileSystem} from "../../src/shared/file-system/file-system";
import {createTestFileStructure, TestFile, TestFileStructure} from "./test-file";
import {MaybeArray} from "../../src/type/type-util";
import {createVirtualFileSystem} from "./create-virtual-file-system";
import {TS} from "../../src/type/ts";
import {createCompilerHost} from "../../src/shared/compiler-host/create-compiler-host";
import {MaybeArray} from "helpertypes";

export interface TestSetup {
context: TestContext;
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"include": ["src/**/*.*"],
"compilerOptions": {
"declaration": true,
"declarationMap": true
"declarationMap": true,
"allowJs": false
}
}
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"module": "commonjs",
"target": "es2018",
"resolveJsonModule": true
"resolveJsonModule": true,
"allowJs": true
}
}

0 comments on commit ba8fef4

Please sign in to comment.