refactor: Remove getRelativePathToSourceFile and getRelativePathToSou…

…rceFileAsModuleSpecifier. BREAKING CHANGE: SourceFile.getRelativePathToSourceFile and getRelativePathToSourceFileAsModuleSpecifier is now getRelativePathTo and getRelativePathAsModuleSpecifierTo respectively.
dsherret · Apr 22, 2018 · 734b7a0 · 734b7a0
1 parent 0b098a5
commit 734b7a0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "run-sequence": "^2.2.1",
     "ts-nameof": "^0.10.3",
     "ts-node": "^6.0.0",
-    "ts-simple-ast": "10.3.1",
+    "ts-simple-ast": "10.5.0",
     "tslint": "^5.8.0"
   },
   "dependencies": {

diff --git a/scripts/createCompilerApiLayer.ts b/scripts/createCompilerApiLayer.ts
@@ -36,7 +36,7 @@ export function createCompilerApiLayer(factory: InspectorFactory) {
             moduleSpecifier: "typescript"
         }, {
             namedImports: ["ObjectUtils"],
-            moduleSpecifier: sourceFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/utils/ObjectUtils.ts"))
+            moduleSpecifier: sourceFile.getRelativePathAsModuleSpecifier(project.getSourceFileOrThrow("src/utils/ObjectUtils.ts"))
         }]);
 
         addSeparatedDeclarations();

diff --git a/scripts/createKindToNodeMappings.ts b/scripts/createKindToNodeMappings.ts
@@ -21,11 +21,11 @@ export function createKindToNodeMappings(inspector: TsSimpleAstInspector, tsInsp
     // add imports
     kindToNodeMappingsFile.addImportDeclaration({
         namespaceImport: "compiler",
-        moduleSpecifier: kindToNodeMappingsFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/compiler/index.ts"))
+        moduleSpecifier: kindToNodeMappingsFile.getRelativePathAsModuleSpecifierTo(project.getSourceFileOrThrow("src/compiler/index.ts"))
     });
     kindToNodeMappingsFile.addImportDeclaration({
         namedImports: ["SyntaxKind"],
-        moduleSpecifier: kindToNodeMappingsFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/typescript/index.ts"))
+        moduleSpecifier: kindToNodeMappingsFile.getRelativePathAsModuleSpecifierTo(project.getSourceFileOrThrow("src/typescript/index.ts"))
     });
 
     addTypeForSubSet("KindToNodeMappings", project.getSourceFileOrThrow("Node.ts").getClassOrThrow("Node"));

diff --git a/scripts/createStructurePrinterFactory.ts b/scripts/createStructurePrinterFactory.ts
@@ -15,15 +15,15 @@ export function createStructurePrinterFactory(inspector: TsSimpleAstInspector) {
     // add imports
     sourceFile.addImportDeclaration({
         namespaceImport: "structurePrinters",
-        moduleSpecifier: sourceFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/structurePrinters/index.ts"))
+        moduleSpecifier: sourceFile.getRelativePathAsModuleSpecifierTo(project.getSourceFileOrThrow("src/structurePrinters/index.ts"))
     });
     sourceFile.addImportDeclaration({
         namedImports: ["SupportedFormatCodeSettings"],
-        moduleSpecifier: sourceFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/options/index.ts"))
+        moduleSpecifier: sourceFile.getRelativePathAsModuleSpecifierTo(project.getSourceFileOrThrow("src/options/index.ts"))
     });
     sourceFile.addImportDeclaration({
         namedImports: ["Memoize"],
-        moduleSpecifier: sourceFile.getRelativePathToSourceFileAsModuleSpecifier(project.getSourceFileOrThrow("src/utils/index.ts"))
+        moduleSpecifier: sourceFile.getRelativePathAsModuleSpecifierTo(project.getSourceFileOrThrow("src/utils/index.ts"))
     });
 
     sourceFile.addClass({

diff --git a/scripts/flattenDeclarationFiles.ts b/scripts/flattenDeclarationFiles.ts
@@ -26,10 +26,10 @@ export function flattenDeclarationFiles(project: Project, mainFile: SourceFile)
     mainFile.addImportDeclaration({
         namedImports: ["ts", "SyntaxKind", "CompilerOptions", "EmitHint", "ScriptKind", "NewLineKind", "LanguageVariant", "ScriptTarget",
             "TypeFlags", "ObjectFlags", "SymbolFlags", "TypeFormatFlags", "DiagnosticCategory", "EditorSettings", "ModuleResolutionKind"],
-        moduleSpecifier: mainFile.getRelativePathToSourceFileAsModuleSpecifier(compilerApiFile)
+        moduleSpecifier: mainFile.getRelativePathAsModuleSpecifierTo(compilerApiFile)
     });
 
-    mainFile.addExportDeclaration({ moduleSpecifier: mainFile.getRelativePathToSourceFileAsModuleSpecifier(compilerApiFile) });
+    mainFile.addExportDeclaration({ moduleSpecifier: mainFile.getRelativePathAsModuleSpecifierTo(compilerApiFile) });
 
     // update the main.d.ts file
     mainFile.getClassOrThrow("Project").setIsDefaultExport(true);

diff --git a/src/compiler/file/SourceFile.ts b/src/compiler/file/SourceFile.ts
@@ -915,15 +915,6 @@ export class SourceFile extends SourceFileBase<ts.SourceFile> {
         return this._refreshFromFileSystemInternal(fileReadResult);
     }
 
-    /**
-     * Gets the relative path to another source file.
-     * @param sourceFile - Source file.
-     * @deprecated Use `getRelativePathTo`.
-     */
-    getRelativePathToSourceFile(sourceFile: SourceFile) {
-        return this.getRelativePathTo(sourceFile);
-    }
-
     /**
      * Gets the relative path to another source file.
      * @param sourceFile - Source file.
@@ -938,15 +929,6 @@ export class SourceFile extends SourceFileBase<ts.SourceFile> {
         return this.getDirectory().getRelativePathTo(sourceFileOrDir);
     }
 
-    /**
-     * Gets the relative path to the specified source file as a module specifier.
-     * @param sourceFile - Source file.
-     * @deprecated Use `getRelativePathAsModuleSpecifierTo`.
-     */
-    getRelativePathToSourceFileAsModuleSpecifier(sourceFile: SourceFile) {
-        return this.getRelativePathAsModuleSpecifierTo(sourceFile);
-    }
-
     /**
      * Gets the relative path to the specified source file as a module specifier.
      * @param sourceFile - Source file.

diff --git a/src/next-major-deprecations.md b/src/next-major-deprecations.md
@@ -2,5 +2,4 @@
 
 Remove:
 
-* `getRelativePathToSourceFile` and `getRelativePathToSourceFileAsModuleSpecifier`
 * `Directory.remove`
diff --git a/yarn.lock b/yarn.lock
@@ -2709,9 +2709,9 @@ ts-node@^6.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
-ts-simple-ast@10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-10.3.1.tgz#6cfb84a607086a3bd6c1f4d486fdf17d311ab953"
+ts-simple-ast@10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-10.5.0.tgz#4729db16b911adb6536394d6e63c8a7f978fadee"
   dependencies:
     "@dsherret/to-absolute-glob" "^2.0.2"
     code-block-writer "6.13.0"
@@ -2720,6 +2720,7 @@ ts-simple-ast@10.3.1:
     is-negated-glob "^1.0.0"
     multimatch "^2.1.0"
     object-assign "^4.1.1"
+    tslib "^1.9.0"
     typescript "2.8.1"
 
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: