#96: Without outDir twc outputs to project root

src/builder.ts

@@ -10,12 +10,12 @@ import {
   ModuleBlock, ModuleDeclaration, NamespaceImport, Node, NoSubstitutionTemplateLiteral, PropertyAccessExpression, PropertyDeclaration,
   PropertySignature, SourceFile, Statement, StringLiteral, SyntaxKind, TemplateExpression, TypeLiteralNode, TypeNode
 } from "typescript";
-import { cache, paths, projectRoot } from "./config";
+import { cache, outPath, paths, projectRoot } from "./config";
 import * as decoratorsMap from "./decorators";
 import { DecoratorExtras } from "./decorators";
 import {
   DecoratorsMixin, getRoot, hasDecorator, hasModifier, inheritsFrom, InitializerWrapper, isExtendsDeclaration, isOneOf, isStatic,
-  JSDocMixin, Link, notPrivate, notStatic, outPath, ParsedDecorator, RefUpdaterMixin, stripQuotes
+  JSDocMixin, Link, notPrivate, notStatic, ParsedDecorator, RefUpdaterMixin, stripQuotes
 } from "./helpers";
 import * as buildTargets from "./targets";
 import { parseDeclaration, parseDeclarationType, ValidValue } from "./type-analyzer";

src/cli.ts

@@ -3,8 +3,7 @@ import { existsSync, mkdirSync, readFileSync, watchFile, writeFileSync } from "f
 import { dirname, join } from "path";
 import { createSourceFile, MapLike, SourceFile } from "typescript";
 import { Module } from "./builder";
-import { cache, cli, compilerOptions, compileTo, errors, files, twc } from "./config";
-import { outPath } from "./helpers";
+import { cache, cli, compilerOptions, compileTo, errors, files, outPath, twc } from "./config";
 
 /**
  * Make sure the path exists. If it doesn't, create it.

src/config.ts

@@ -45,6 +45,22 @@ export function findRootDir(files: Array<string>): string {
   return first.slice(0, i).join(sep);
 }
 
+/**
+ * Create an output path for the file.
+ *
+ * @param path File path to create output path for
+ * @param outDir Output path
+ * @param rootDir Sources root path (Longest Common Prefix)
+ *
+ * @returns Path relative to outDir
+ */
+export function outPath(path: string, { outDir, rootDir } = compilerOptions) {
+  if (outDir) {
+    return join(outDir, relative(rootDir, path));
+  }
+  return path;
+}
+
 /**
  * Read file synchronously and return as a string.
  *

src/helpers.ts

@@ -1,13 +1,12 @@
 import { readFileSync } from "fs";
-import { dirname, join, relative, resolve } from "path";
+import { dirname, resolve } from "path";
 import {
   BinaryExpression, CallExpression, ClassDeclaration, ClassElement, ExpressionStatement, forEachChild, FunctionExpression, HeritageClause,
   Identifier, InterfaceDeclaration, isFunctionLike, isGetAccessorDeclaration, isIdentifier, isPropertyDeclaration, isSetAccessorDeclaration,
   JSDoc, NamedDeclaration, Node, PrefixUnaryExpression, PropertyAccessExpression, SourceFile, SyntaxKind
 } from "typescript";
 import { Constructor } from "../types/index";
 import { ImportedNode, Method } from "./builder";
-import { compilerOptions } from "./config";
 
 /**
  * List of types that do not change the overall type.
@@ -618,16 +617,3 @@ export const updateImportedRefs = (src: Node, vars: Map<string, ImportedNode>):
     }, src.getFullText().split(""))
     .join("");
 };
-
-/**
- * Create an output path for the file.
- *
- * @param path File path to create output path for
- * @param outDir Output path
- * @param rootDir Sources root path (Longest Common Prefix)
- *
- * @returns Path relative to outDir
- */
-export const outPath = (path: string, { outDir = "", rootDir } = compilerOptions) => {
-  return join(outDir, relative(rootDir, path));
-};

tests/config.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import { createSourceFile, ScriptTarget } from "typescript";
-import { cache, findRootDir } from "../src/config";
+import { cache, findRootDir, outPath } from "../src/config";
 
 describe("config", () => {
   describe("findRootDir", () => {
@@ -64,4 +64,23 @@ describe("config", () => {
       expect(cache.modules.has("bower:some.html")).to.equal(false);
     });
   });
+  describe("outPath()", () => {
+    it("should calculate path with no rootDir and outDir", () => {
+      expect(outPath("file.ts", { rootDir: "" })).to.equal("file.ts");
+      expect(outPath("deep/file.ts", { rootDir: "" })).to.equal("deep/file.ts");
+    });
+    it("should calculate path with rootDir set", () => {
+      expect(outPath("src/file.ts", { rootDir: "src" })).to.equal("src/file.ts");
+      expect(outPath("src/deep/file.ts", { rootDir: "src" })).to.equal("src/deep/file.ts");
+    });
+    it("should calculate path with outDir set", () => {
+      expect(outPath("file.ts", { rootDir: "", outDir: "dist" })).to.equal("dist/file.ts");
+      expect(outPath("deep/file.ts", { rootDir: "", outDir: "dist" })).to.equal("dist/deep/file.ts");
+    });
+    it("should calculate path with both rootDir and outDir set", () => {
+      expect(outPath("src/file.ts", { rootDir: "src", outDir: "dist" })).to.equal("dist/file.ts");
+      expect(outPath("src/deep/file.ts", { rootDir: "src", outDir: "dist" })).to.equal("dist/deep/file.ts");
+      expect(outPath("src/deep/file.ts", { rootDir: "src/deep", outDir: "dist" })).to.equal("dist/file.ts");
+    });
+  });
 });

tests/tests.spec.ts

@@ -10,7 +10,7 @@ import * as decoratorsMap from "../src/decorators";
 import {
   flatExtends, flattenArray, getDecorators, getText, hasArguments, hasDecorator, hasModifier, hasOperator, hasOperatorToken,
   hasOriginalKeywordKind, inheritsFrom, InitializerWrapper, isAllOf, isExtendsDeclaration, isOneOf, isPrivate, isPublic, isStatic,
-  isTransparent, Link, notPrivate, notPublic, notStatic, notTransparent, outPath, Ref, toProperty, toString
+  isTransparent, Link, notPrivate, notPublic, notStatic, notTransparent, Ref, toProperty, toString
 } from "../src/helpers";
 import {
   getFinalType, getSimpleKind, parseDeclaration, parseDeclarationInitializer, parseDeclarationType, parseExpression,
@@ -301,24 +301,6 @@ describe("helpers", () => {
   // TODO: write getQuoteChar tests
   // TODO: write getRoot tests
   // TODO: write updateImportedRefs tests
-  describe("outPath()", () => {
-    it("should calculate path with no rootDir and outDir", () => {
-      expect(outPath("file.ts", { rootDir: "" })).to.equal("file.ts");
-      expect(outPath("deep/file.ts", { rootDir: "" })).to.equal("deep/file.ts");
-    });
-    it("should calculate path with outDir set", () => {
-      expect(outPath("file.ts", { rootDir: "", outDir: "dist" })).to.equal("dist/file.ts");
-      expect(outPath("deep/file.ts", { rootDir: "", outDir: "dist" })).to.equal("dist/deep/file.ts");
-    });
-    it("should calculate path with rootDir set", () => {
-      expect(outPath("src/file.ts", { rootDir: "src" })).to.equal("file.ts");
-      expect(outPath("src/deep/file.ts", { rootDir: "src" })).to.equal("deep/file.ts");
-    });
-    it("should calculate path with both rootDir and outDir set", () => {
-      expect(outPath("src/file.ts", { rootDir: "src", outDir: "dist" })).to.equal("dist/file.ts");
-      expect(outPath("src/deep/file.ts", { rootDir: "src", outDir: "dist" })).to.equal("dist/deep/file.ts");
-    });
-  });
 });
 describe("type analyzer", () => {
   describe("parseUnionOrIntersectionType()", () => {