refactor: remove ts-nameof and ttypescript dev dependencies (#1217)

dsherret · Nov 13, 2021 · 3ba4f63 · 3ba4f63
1 parent 720380e
commit 3ba4f63
Show file tree

Hide file tree

Showing 336 changed files with 2,319 additions and 2,326 deletions.
diff --git a/deno/common/ts_morph_common.d.ts b/deno/common/ts_morph_common.d.ts
@@ -1036,6 +1036,10 @@ export declare class IterableUtils {
     static find<T>(items: IterableIterator<T>, condition: (item: T) => boolean): T | undefined;
 }
 
+export declare function nameof<TObject>(obj: TObject, key: keyof TObject): string;
+
+export declare function nameof<TObject>(key: keyof TObject): string;
+
 export declare class ObjectUtils {
     private constructor();
     static clone<T>(obj: T): T;

diff --git a/deno/common/ts_morph_common.js b/deno/common/ts_morph_common.js
@@ -272,6 +272,10 @@ class IterableUtils {
     }
 }
 
+function nameof(key1, key2) {
+    return key2 !== null && key2 !== void 0 ? key2 : key1;
+}
+
 class ObjectUtils {
     constructor() {
     }
@@ -975,7 +979,7 @@ function createHosts(options) {
     function getLibFolderPath() {
         if (options.libFolderPath != null) {
             if (options.skipLoadingLibFiles === true) {
-                throw new errors.InvalidOperationError(`Cannot set ${"skipLoadingLibFiles"} to true when ${"libFolderPath"} is provided.`);
+                throw new errors.InvalidOperationError(`Cannot set ${nameof(options, "skipLoadingLibFiles")} to true when ${nameof(options, "libFolderPath")} is provided.`);
             }
             return options.libFolderPath;
         }
@@ -2561,4 +2565,4 @@ function getCompilerOptionsFromTsConfig(filePath, options = {}) {
     };
 }
 
-export { ArrayUtils, ComparerToStoredComparer, CompilerOptionsContainer, DocumentRegistry, EventContainer, FileUtils, InMemoryFileSystemHost, IterableUtils, KeyValueCache, LocaleStringComparer, Memoize, ObjectUtils, PropertyComparer, PropertyStoredComparer, RealFileSystemHost, ResolutionHosts, SettingsContainer, SortedKeyValueArray, StringUtils, TransactionalFileSystem, TsConfigResolver, WeakCache, createDocumentCache, createHosts, createModuleResolutionHost, deepClone, errors, getCompilerOptionsFromTsConfig, getEmitModuleResolutionKind, getFileMatcherPatterns, getLibFiles, getSyntaxKindName, libFolderInMemoryPath, matchFiles, matchGlobs, runtime };
+export { ArrayUtils, ComparerToStoredComparer, CompilerOptionsContainer, DocumentRegistry, EventContainer, FileUtils, InMemoryFileSystemHost, IterableUtils, KeyValueCache, LocaleStringComparer, Memoize, ObjectUtils, PropertyComparer, PropertyStoredComparer, RealFileSystemHost, ResolutionHosts, SettingsContainer, SortedKeyValueArray, StringUtils, TransactionalFileSystem, TsConfigResolver, WeakCache, createDocumentCache, createHosts, createModuleResolutionHost, deepClone, errors, getCompilerOptionsFromTsConfig, getEmitModuleResolutionKind, getFileMatcherPatterns, getLibFiles, getSyntaxKindName, libFolderInMemoryPath, matchFiles, matchGlobs, nameof, runtime };
diff --git a/deno/ts_morph.d.ts b/deno/ts_morph.d.ts
@@ -4606,6 +4606,7 @@ export declare class Decorator extends DecoratorBase<ts.Decorator> {
     removeArgument(index: number): this;
     /** Removes this decorator. */
     remove(): void;
+    _getInnerExpression(): Expression<ts.Expression>;
     /**
      * Sets the node from a structure.
      * @param structure - Structure to set the node with.

diff --git a/deno/ts_morph.js b/deno/ts_morph.js
diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -12,8 +12,8 @@
     "build": "npm run build:declarations && npm run build:node && npm run build:deno",
     "build:node": "rimraf dist && npm run rollup",
     "build:deno": "rimraf dist-deno && npm run rollup -- --environment BUILD:deno && ts-node scripts/buildDeno.ts",
-    "build:declarations": "ts-node --compiler ttypescript --project scripts/tsconfig.json --transpile-only scripts/buildDeclarations.ts",
-    "test": "cross-env TS_NODE_COMPILER=\"ttypescript\" TS_NODE_TRANSPILE_ONLY=\"true\" mocha",
+    "build:declarations": "ts-node --project scripts/tsconfig.json --transpile-only scripts/buildDeclarations.ts",
+    "test": "cross-env TS_NODE_TRANSPILE_ONLY=\"true\" mocha",
     "test:ci": "npm run test",
     "test:debug": "npm run test --inspect-brk",
     "test:ts-versions": "ts-node --transpile-only scripts/test/testTypeScriptVersions",
@@ -25,17 +25,14 @@
   "devDependencies": {
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
-    "@types/ts-nameof": "^4.2.1",
     "@ts-morph/scripts": "~0.2.0",
     "chai": "^4.3.4",
     "cross-env": "^7.0.3",
     "mocha": "^9.1.3",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.3",
     "rollup-plugin-typescript2": "^0.30.0",
-    "ts-nameof": "^5.0.0",
     "ts-node": "^10.4.0",
-    "ttypescript": "^1.5.12",
     "typescript": "~4.4.4"
   },
   "publishConfig": {

diff --git a/packages/bootstrap/rollup.config.js b/packages/bootstrap/rollup.config.js
@@ -12,7 +12,6 @@ export default {
     },
     plugins: [
         typescript({
-            typescript: require("ttypescript"),
             tsconfig: "tsconfig.rollup.json",
         }),
     ],

diff --git a/packages/bootstrap/scripts/tsconfig.json b/packages/bootstrap/scripts/tsconfig.json
@@ -4,8 +4,7 @@
     "outDir": "../dist-scripts",
     "rootDir": "../",
     "noEmit": true,
-    "module": "commonjs",
-    "plugins": [{ "transform": "ts-nameof", "type": "raw" }]
+    "module": "commonjs"
   },
   "include": [
     "../**/*.ts"

diff --git a/packages/bootstrap/src/tests/projectTests.ts b/packages/bootstrap/src/tests/projectTests.ts
@@ -1,9 +1,9 @@
-import { getLibFiles, InMemoryFileSystemHost, ts } from "@ts-morph/common";
+import { getLibFiles, InMemoryFileSystemHost, nameof, ts } from "@ts-morph/common";
 import { expect } from "chai";
 import { EOL } from "os";
 import { createProject, createProjectSync, Project, ProjectOptions } from "../Project";
 
-describe(nameof(Project), () => {
+describe("Project", () => {
     describe("constructor", () => {
         describe("async ctor", () => doTestsForProject(opts => createProject(opts)));
         describe("sync ctor", () => doTestsForProject(opts => Promise.resolve(createProjectSync(opts))));
@@ -222,7 +222,7 @@ describe(nameof(Project), () => {
                 });
             });
 
-            describe(nameof<ProjectOptions>(o => o.skipLoadingLibFiles), () => {
+            describe(nameof<ProjectOptions>("skipLoadingLibFiles"), () => {
                 it("should not skip loading lib files when empty", async () => {
                     const project = await create({ useInMemoryFileSystem: true });
                     const sourceFile = project.createSourceFile("test.ts", "const t: String = '';");
@@ -258,7 +258,7 @@ describe(nameof(Project), () => {
                 });
             });
 
-            describe(nameof<ProjectOptions>(o => o.libFolderPath), () => {
+            describe(nameof<ProjectOptions>("libFolderPath"), () => {
                 it("should support specifying a different folder for the lib files", async () => {
                     const fileSystem = new InMemoryFileSystemHost();
                     for (const file of getLibFiles())
@@ -278,7 +278,7 @@ describe(nameof(Project), () => {
         }
     });
 
-    describe(nameof<Project>(p => p.createSourceFile), () => {
+    describe(nameof<Project>("createSourceFile"), () => {
         it("should create the specified source files", () => {
             const project = createProjectSync({ useInMemoryFileSystem: true, skipLoadingLibFiles: true });
             const sourceFiles = [
@@ -290,7 +290,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.removeSourceFile), () => {
+    describe(nameof<Project>("removeSourceFile"), () => {
         it("should remove the specified source files by source file object", () => {
             const { project } = setup();
             const sourceFiles = [
@@ -313,7 +313,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.updateSourceFile), () => {
+    describe(nameof<Project>("updateSourceFile"), () => {
         it("should update a source file", () => {
             const { project } = setup();
             project.createSourceFile("/test.ts", "class Test {}");
@@ -350,7 +350,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.addSourceFileAtPath), () => {
+    describe(nameof<Project>("addSourceFileAtPath"), () => {
         describe("async", () => doTestsForMethod((project, filePath, options) => project.addSourceFileAtPath(filePath, options)));
         describe("sync", () => doTestsForMethod((project, filePath, options) => Promise.resolve(project.addSourceFileAtPath(filePath, options))));
 
@@ -379,7 +379,7 @@ describe(nameof(Project), () => {
         }
     });
 
-    describe(nameof<Project>(p => p.addSourceFileAtPathIfExists), () => {
+    describe(nameof<Project>("addSourceFileAtPathIfExists"), () => {
         describe("async", () => doTestsForMethod((project, filePath, options) => project.addSourceFileAtPathIfExists(filePath, options)));
         describe("sync", () => doTestsForMethod((project, filePath, options) => Promise.resolve(project.addSourceFileAtPathIfExists(filePath, options))));
 
@@ -405,7 +405,7 @@ describe(nameof(Project), () => {
         }
     });
 
-    describe(nameof<Project>(project => project.addSourceFilesFromTsConfig), () => {
+    describe(nameof<Project>("addSourceFilesFromTsConfig"), () => {
         describe("async", () => doTestsForMethod((project, filePath) => project.addSourceFilesFromTsConfig(filePath)));
         describe("sync", () => doTestsForMethod((project, filePath) => Promise.resolve(project.addSourceFilesFromTsConfigSync(filePath))));
 
@@ -441,7 +441,7 @@ describe(nameof(Project), () => {
         }
     });
 
-    describe(nameof<Project>(p => p.addSourceFilesByPaths), () => {
+    describe(nameof<Project>("addSourceFilesByPaths"), () => {
         describe("async", () => doTestsForMethod((project, globs) => project.addSourceFilesByPaths(globs)));
         describe("sync", () => doTestsForMethod((project, globs) => Promise.resolve(project.addSourceFilesByPathsSync(globs))));
 
@@ -462,7 +462,7 @@ describe(nameof(Project), () => {
         }
     });
 
-    describe(nameof<Project>(p => p.resolveSourceFileDependencies), () => {
+    describe(nameof<Project>("resolveSourceFileDependencies"), () => {
         it("should resolve file dependencies once specified and include those in the node_modules folder", async () => {
             const { project, initialFiles, resolvedFiles, nodeModuleFiles } = await fileDependencyResolutionSetup({ skipFileDependencyResolution: true },
                 createProject);
@@ -485,8 +485,8 @@ describe(nameof(Project), () => {
             `{ "name": "library2", "version": "0.0.1", "main": "index.js", "typings": "index.d.ts", "typescript": { "definition": "index.d.ts" } }`);
         fileSystem.writeFileSync("/node_modules/library2/index.js", "export class Library2 {}");
         fileSystem.writeFileSync("/node_modules/library2/index.d.ts", "export class Library2 {}");
-        fileSystem.writeFileSync("/src/main.ts", "/// <reference path='../other/referenced-file.d.ts' />\n\nimport { Test } from 'library'; nameof();");
-        fileSystem.writeFileSync("/other/referenced-file.d.ts", "declare function nameof(): void;");
+        fileSystem.writeFileSync("/src/main.ts", "/// <reference path='../other/referenced-file.d.ts' />\n\nimport { Test } from 'library'; something();");
+        fileSystem.writeFileSync("/other/referenced-file.d.ts", "declare function something(): void;");
         fileSystem.writeFileSync("/tsconfig.json", `{ "files": ["src/main.ts"] }`);
 
         const project = await create({ tsConfigFilePath: "tsconfig.json", fileSystem, ...options, skipLoadingLibFiles: true });
@@ -501,7 +501,7 @@ describe(nameof(Project), () => {
         };
     }
 
-    describe(nameof<Project>(p => p.formatDiagnosticsWithColorAndContext), () => {
+    describe(nameof<Project>("formatDiagnosticsWithColorAndContext"), () => {
         function setup() {
             const project = createProjectSync({ useInMemoryFileSystem: true });
             project.createSourceFile("test.ts", "const t; const u;");
@@ -538,7 +538,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.getModuleResolutionHost), () => {
+    describe(nameof<Project>("getModuleResolutionHost"), () => {
         function setup() {
             const project = createProjectSync({ useInMemoryFileSystem: true });
             const moduleResolutionHost = project.getModuleResolutionHost();
@@ -637,7 +637,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.createProgram), () => {
+    describe(nameof<Project>("createProgram"), () => {
         it("should create a program and get a type checker", () => {
             const { project } = setup();
             const sourceFile = project.createSourceFile("./test.ts", "export const t = 5;");
@@ -649,7 +649,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(p => p.getLanguageService), () => {
+    describe(nameof<Project>("getLanguageService"), () => {
         it("should create a language service", () => {
             const { project } = setup();
             const languageSerivce = project.getLanguageService(); // define it first
@@ -667,7 +667,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(project => project.getSourceFile), () => {
+    describe(nameof<Project>("getSourceFile"), () => {
         it("should get the first match based on the directory structure", () => {
             const project = createProjectSync({ useInMemoryFileSystem: true });
             project.createSourceFile("dir/file.ts");
@@ -711,7 +711,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<Project>(project => project.getSourceFileOrThrow), () => {
+    describe(nameof<Project>("getSourceFileOrThrow"), () => {
         it("should throw when it can't find the source file based on a provided file name", () => {
             const project = createProjectSync({ useInMemoryFileSystem: true });
             expect(() => project.getSourceFileOrThrow("fileName.ts")).to.throw(
@@ -748,7 +748,7 @@ describe(nameof(Project), () => {
         });
     });
 
-    describe(nameof<ts.Program>(p => p.getConfigFileParsingDiagnostics), () => {
+    describe(nameof<ts.Program>("getConfigFileParsingDiagnostics"), () => {
         it("should get the diagnostics found when parsing the tsconfig.json", () => {
             const fileSystem = new InMemoryFileSystemHost();
             fileSystem.writeFileSync("/tsconfig.json", `{ "fies": [] }`);

diff --git a/packages/bootstrap/tsconfig.json b/packages/bootstrap/tsconfig.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "declaration": false,
     "rootDir": "./src",
-    "outDir": "./dist",
-    "plugins": [{ "transform": "ts-nameof", "type": "raw" }]
+    "outDir": "./dist"
   },
   "include": [
     "./src"

diff --git a/packages/bootstrap/tsconfig.rollup.json b/packages/bootstrap/tsconfig.rollup.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "module": "es2015",
     "moduleResolution": "node",
-    "removeComments": true,
-    "plugins": [{ "transform": "ts-nameof", "type": "raw" }]
+    "removeComments": true
   },
   "exclude": [
     "lib",

diff --git a/packages/common/lib/ts-morph-common.d.ts b/packages/common/lib/ts-morph-common.d.ts
@@ -1035,6 +1035,10 @@ export declare class IterableUtils {
     static find<T>(items: IterableIterator<T>, condition: (item: T) => boolean): T | undefined;
 }
 
+export declare function nameof<TObject>(obj: TObject, key: keyof TObject): string;
+
+export declare function nameof<TObject>(key: keyof TObject): string;
+
 export declare class ObjectUtils {
     private constructor();
     static clone<T>(obj: T): T;

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -11,9 +11,9 @@
     "build": "npm run build:declarations && npm run build:node && npm run build:deno",
     "build:node": "rimraf dist && npm run createLibFile && npm run rollup && ts-node scripts/bundleLocalTs.ts",
     "build:deno": "rimraf ../../deno/common && rimraf dist-deno && npm run rollup -- --environment BUILD:deno && npm run build:declarations && ts-node scripts/buildDeno.ts",
-    "build:declarations": "ts-node --compiler ttypescript --project scripts/tsconfig.json --transpile-only scripts/buildDeclarations.ts",
+    "build:declarations": "ts-node --project scripts/tsconfig.json --transpile-only scripts/buildDeclarations.ts",
     "createLibFile": "ts-node scripts/createLibFile.ts",
-    "test": "cross-env TS_NODE_COMPILER=\"ttypescript\" TS_NODE_TRANSPILE_ONLY=\"true\" mocha",
+    "test": "cross-env TS_NODE_TRANSPILE_ONLY=\"true\" mocha",
     "test:ci": "npm run test",
     "test:debug": "npm run test --inspect-brk",
     "rollup": "rollup --config"
@@ -31,17 +31,14 @@
     "@types/mocha": "^9.0.0",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^16.11.6",
-    "@types/ts-nameof": "^4.2.1",
     "chai": "^4.3.4",
     "cross-env": "^7.0.3",
     "dts-minify": "^0.2.3",
     "mocha": "^9.1.3",
     "rimraf": "^3.0.2",
     "rollup": "^2.58.3",
     "rollup-plugin-typescript2": "^0.30.0",
-    "ts-nameof": "^5.0.0",
     "ts-node": "^10.4.0",
-    "ttypescript": "^1.5.12",
     "typescript": "4.4.4"
   },
   "publishConfig": {

diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
@@ -12,7 +12,6 @@ export default [{
     },
     plugins: [
         typescript({
-            typescript: require("ttypescript"),
             tsconfig: "tsconfig.rollup.json",
         }),
     ],
@@ -24,7 +23,6 @@ export default [{
     },
     plugins: [
         typescript({
-            typescript: require("ttypescript"),
             tsconfig: "tsconfig.rollup.json",
         }),
     ],

diff --git a/packages/common/scripts/tsconfig.json b/packages/common/scripts/tsconfig.json
@@ -4,7 +4,6 @@
     "outDir": "../dist-scripts",
     "rootDir": "../",
     "noEmit": true,
-    "module": "commonjs",
-    "plugins": [{ "transform": "ts-nameof", "type": "raw" }]
+    "module": "commonjs"
   }
 }
diff --git a/packages/common/src/compiler/createHosts.ts b/packages/common/src/compiler/createHosts.ts
@@ -4,6 +4,7 @@ import { getLibFiles, libFolderInMemoryPath } from "../getLibFiles";
 import { CompilerOptionsContainer } from "../options";
 import { runtime } from "../runtimes";
 import { ScriptTarget, ts } from "../typescript";
+import { nameof } from "../utils";
 import { ResolutionHost } from "./ResolutionHost";
 import { TsSourceFileContainer } from "./TsSourceFileContainer";
 
@@ -161,7 +162,7 @@ export function createHosts(options: CreateHostsOptions) {
         if (options.libFolderPath != null) {
             if (options.skipLoadingLibFiles === true) {
                 throw new errors.InvalidOperationError(
-                    `Cannot set ${nameof(options.skipLoadingLibFiles)} to true when ${nameof(options.libFolderPath)} is provided.`,
+                    `Cannot set ${nameof(options, "skipLoadingLibFiles")} to true when ${nameof(options, "libFolderPath")} is provided.`,
                 );
             }
             return options.libFolderPath;

diff --git a/packages/common/src/tests/collections/keyValueCacheTests.ts b/packages/common/src/tests/collections/keyValueCacheTests.ts
@@ -1,10 +1,11 @@
 import { expect } from "chai";
 import { KeyValueCache } from "../../collections";
+import { nameof } from "../../utils";
 
 // todo: more tests
 
-describe(nameof(KeyValueCache), () => {
-    describe(nameof<KeyValueCache<number, number>>(c => c.replaceKey), () => {
+describe("KeyValueCache", () => {
+    describe(nameof<KeyValueCache<number, number>>("replaceKey"), () => {
         it("should throw when replacing a key that doesn't exist", () => {
             const cache = new KeyValueCache<{}, {}>();
             expect(() => cache.replaceKey({}, {})).to.throw(Error, "Key not found.");