Improvements, bugfixes and restructuring.

Author: fabiandev

src/compiler/Compiler.ts

@@ -1,14 +1,10 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript/built/local/typescript';
-import { TsRuntimeOptions } from '../options';
-import { CompilerResult } from './CompilerResult';
-import { CompilerConfig } from './CompilerConfig';
-import { FileResult } from './FileResult';
-import { Transformer } from './transformers';
-import { Visitor } from './visitors/Visitor';
-import * as TRANSFORMERS from './transformers/default_transformers';
-import * as VISITORS from './visitors/default_visitors';
+import CompilerResult from './CompilerResult';
+import CompilerConfig from './CompilerConfig';
+import FileResult from './FileResult';
+import { Transformer, DEFAULT_TRANSFORMERS } from './transformers';
 
 export class Compiler {
 
@@ -19,8 +15,8 @@ export class Compiler {
   public process(): Promise<CompilerResult> {
     const toTransform: Array<Promise<FileResult>> = [];
 
-    const transformers: ts.Transformer[] = Object.keys(TRANSFORMERS).map((key: string) => {
-      const transformer = new (TRANSFORMERS as any)[key]();
+    const transformers: ts.Transformer[] = Object.keys(DEFAULT_TRANSFORMERS).map((key: string) => {
+      const transformer = new (DEFAULT_TRANSFORMERS as any)[key]();
 
       const transform: ts.Transformer = (context) => (f) => {
         for (const substitution of transformer.getSubstitutions()) {
@@ -48,33 +44,6 @@ export class Compiler {
       });
   }
 
-  // public processVisitors(): Promise<CompilerResult> {
-  //   const toVisit: Array<Promise<FileResult>> = [];
-  //
-  //   const visitors: Visitor[] = Object.keys(VISITORS).map((key: string) => {
-  //     return new (VISITORS as any)[key]();
-  //   });
-  //
-  //   for (const file of this.config.files) {
-  //     toVisit.push(this.visitFile(file, visitors));
-  //   }
-  //
-  //   return Promise.all(toVisit)
-  //     .then(results => {
-  //       return {
-  //         config: this.config,
-  //         fileResults: results,
-  //       };
-  //     })
-  //     .catch(err => {
-  //       console.error(err);
-  //     });
-  // }
-  //
-  // private visitFile(filePath: string, visitors: Visitor[]): Promise<FileResult> {
-  //
-  // }
-
   private transformFile(filePath: string, transformers: ts.Transformer[]): Promise<FileResult> {
     return new Promise((resolve, reject) => {
       fs.readFile(filePath, this.config.options.encoding, (err, source) => {
@@ -87,7 +56,7 @@ export class Compiler {
         const f = ts.createSourceFile(
           fileName,
           source,
-          ts.ScriptTarget.Latest,
+          this.config.options.compilerOptions.target || ts.ScriptTarget.Latest,
           true,
           ts.ScriptKind.TS,
         );
@@ -104,3 +73,5 @@ export class Compiler {
   }
 
 }
+
+export default Compiler;

src/compiler/CompilerConfig.ts

@@ -1,7 +1,9 @@
-import { TsRuntimeOptions } from '../options/TsRuntimeOptions';
-import { FileResult } from './FileResult';
+import Options from '../options/Options';
+import FileResult from './FileResult';
 
 export interface CompilerConfig {
   files: string[];
-  options: TsRuntimeOptions;
+  options: Options;
 }
+
+export default CompilerConfig;

src/compiler/CompilerResult.ts

@@ -1,7 +1,9 @@
-import { FileResult } from './FileResult';
-import { CompilerConfig } from './CompilerConfig';
+import FileResult from './FileResult';
+import CompilerConfig from './CompilerConfig';
 
 export interface CompilerResult {
   config: CompilerConfig;
   fileResults: FileResult[];
 }
+
+export default CompilerResult;

src/compiler/FileResult.ts

@@ -3,3 +3,5 @@ export interface FileResult {
   filePath: string;
   fileName: string
 }
+
+export default FileResult;

src/compiler/generators.ts renamed to src/compiler/_archive/generators.ts

@@ -1 +1,4 @@
-export * from './transformers/Transformer';
+export { Transformer } from './transformers/Transformer';
+export { VariableDeclarationTransformer } from './transformers/VariableDeclarationTransformer';
+import * as DEFAULT_TRANSFORMERS from './transformers/default_transformers';
+export { DEFAULT_TRANSFORMERS };

src/compiler/transformers/utils.ts renamed to src/compiler/_archive/utils.ts

@@ -12,17 +12,21 @@ export abstract class Transformer {
     return !Array.isArray(this.substitution) ? [this.substitution] : this.substitution;
   }
 
-  public process(context: ts.EmitContext, node: ts.Node): ts.Node {
-    // if (this.visited.indexOf(node.parent) !== -1) {
-    //   return node;
-    // }
-
-    // this.visited.push(node.parent);
+  public getVisited() {
+    return this.visited;
+  }
 
-    if (this.getSubstitutions().indexOf(node.kind) === -1) {
+  public process(context: ts.EmitContext, node: ts.Node): ts.Node {
+    if (this.visited.indexOf(node) !== -1) {
       return node;
     }
 
+    this.visited.push(node);
+
+    // if (this.getSubstitutions().indexOf(node.kind) === -1) {
+    //   return node;
+    // }
+
     return this.onSubstituteNode(context, node);
   }
 

src/compiler/visitors/VariableDeclarationVisitor.ts renamed to src/compiler/_archive/visitors_new/VariableDeclarationVisitor.ts

@@ -1,13 +1,11 @@
 import * as ts from 'typescript/built/local/typescript';
 import { Transformer } from './Transformer';
-import * as generator from '../generator';
+import { generator } from '../utils';
 
 export class VariableDeclarationTransformer extends Transformer {
 
   protected substitution = ts.SyntaxKind.VariableDeclarationList;
 
-  protected visited: ts.Node[] = [];
-
   public onSubstituteNode(context: ts.EmitContext, node: ts.VariableDeclarationList): ts.Node {
     const declarations: ts.VariableDeclaration[] = [];
 
@@ -46,12 +44,10 @@ export class VariableDeclarationTransformer extends Transformer {
 
   private processConstDeclaration(node: ts.VariableDeclaration): ts.VariableDeclaration[] {
     const nodeName = node.name.getText();
-    const typeDefinition = generator.createTypeDefinition(node.type, nodeName);
+    const typeCalls = generator.createTypeCalls(node.type);
 
     const initializer = ts.factory.createCall(
-      ts.factory.createPropertyAccess(ts.factory.createCall(
-        ts.factory.createPropertyAccess(ts.factory.createIdentifier('t'), 'number'), [], [],
-      ), 'assert'), [], [node.initializer],
+      ts.factory.createPropertyAccess(typeCalls, 'assert'), [], [node.initializer],
     );
 
     const assignment = ts.factory.updateVariableDeclaration(node, node.name, node.type, initializer);

src/compiler/visitors/Visitor.ts renamed to src/compiler/_archive/visitors_new/Visitor.ts

@@ -0,0 +1,2 @@
+import * as generator from './utils/generator';
+export { generator };

src/compiler/visitors/default_visitors.ts renamed to src/compiler/_archive/visitors_new/default_visitors.ts

@@ -30,9 +30,8 @@ export function createTypeCalls(type: ts.TypeNode): ts.CallExpression {
       {
         const typeRef = type as ts.TypeReferenceNode;
         const typeName = typeRef.typeName.getText();
-        let callExpression: ts.CallExpression;
-
         const args: ts.CallExpression[] = [];
+        let callExpression: ts.CallExpression;
 
         if (typeRef.typeArguments) {
           for (const arg of typeRef.typeArguments) {

src/compiler/transformers.ts

@@ -1,2 +1,2 @@
-export { TsRuntimeOptions } from './options/TsRuntimeOptions';
+export { Options } from './options/Options';
 export { DEFAULT_OPTIONS } from './options/default_options';

src/compiler/transformers/Transformer.ts

@@ -1,10 +1,10 @@
 import * as ts from 'typescript';
 
-export interface TsRuntimeOptions {
+export interface Options {
   compilerOptions?: ts.CompilerOptions;
   encoding?: string;
   basePath?: boolean|string;
   writePath?: boolean|string;
 }
 
-export default TsRuntimeOptions;
+export default Options;

src/compiler/transformers/VariableDeclarationTransformer.ts

@@ -1,7 +1,7 @@
 import * as ts from 'typescript';
-import { TsRuntimeOptions } from './TsRuntimeOptions';
+import Options from './Options';
 
-export const DEFAULT_OPTIONS: TsRuntimeOptions = {
+export const DEFAULT_OPTIONS: Options = {
   basePath: false,
   compilerOptions: {
     allowJs: true,
@@ -15,3 +15,5 @@ export const DEFAULT_OPTIONS: TsRuntimeOptions = {
   encoding: 'utf8',
   writePath: false,
 };
+
+export default DEFAULT_OPTIONS;

src/compiler/utils.ts

@@ -1,16 +1,15 @@
 import * as path from 'path';
-import { transform } from '../transform';
-import { Writer } from '../writer';
+import * as tsr from '../index';
+import { Writer, WriterConfig } from '../writer';
 
 const file = path.join(__dirname, 'test.ts');
 
-const writerConfig = {
+const writerConfig: WriterConfig = {
   basePath: __dirname,
   writePath: __dirname,
 };
 
-transform(file)
-.then(transformerResult => {
+tsr.transform(file).then(transformerResult => {
   const writer = new Writer(transformerResult);
   writer.writeAll(writerConfig);
 });

src/compiler/generator.ts renamed to src/compiler/utils/generator.ts

@@ -1,10 +1,12 @@
 const f = () => {
-    let _xType = t.ref(Function), x = _xType.assert(() => {
-        const a = t.number().assert(true);
+    let _xType = t.ref(ComplexType), x = _xType.assert(() => {
+        const a = t.boolean().assert(true);
         return a;
     });
     const b = t.number().assert(10);
     let _cType = t.string(), c;
     let _dType = t.array(t.boolean()), d = _dType.assert([true, false]);
+    const e = t.array(t.array(t.array(t.number()))).assert([false]);
     c = 'hi';
+    let _fType = t.tuple(t.ref(one), t.ref(two)), f;
 };

src/lib.ts

@@ -1,6 +1,6 @@
 const f = () => {
 
-  let x: Function = () => {
+  let x: ComplexType = () => {
     const a: boolean = true;
     return a;
   };
@@ -9,5 +9,9 @@ const f = () => {
   let c: string;
   let d: boolean[] = [true, false]
 
+  const e: Array<Array<Array<number>>> = [false];
+
   c = 'hi';
+
+  let f: [one, two];
 };

src/options.ts

@@ -1,8 +1,8 @@
 import * as ts from 'typescript';
 import { Compiler, CompilerResult } from './compiler';
-import { TsRuntimeOptions, DEFAULT_OPTIONS } from './options';
+import { Options, DEFAULT_OPTIONS } from './options';
 
-export function transform(files: string | string[], options: TsRuntimeOptions = {}): Promise<CompilerResult> {
+export function transform(files: string | string[], options: Options = {}): Promise<CompilerResult> {
   console.log('--> Starting');
 
   options = getOptions(options);
@@ -16,7 +16,7 @@ export function transform(files: string | string[], options: TsRuntimeOptions =
     });
 }
 
-function getOptions(options: TsRuntimeOptions = {}): TsRuntimeOptions {
+function getOptions(options: Options = {}): Options {
   return Object.assign({}, DEFAULT_OPTIONS, options);
 }
 

src/options/TsRuntimeOptions.ts renamed to src/options/Options.ts

@@ -1,2 +1,4 @@
-export * from './writer/Writer';
-export * from './writer/WriterResult';
+export { Writer } from './writer/Writer';
+export { WriterConfig } from './writer/WriterConfig';
+export { WriterResult } from './writer/WriterResult';
+export { DEFAULT_CONFIG } from './writer/default_config';

src/options/default_options.ts

@@ -1,9 +1,10 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import { CompilerResult, FileResult } from '../compiler';
-import { TsRuntimeOptions } from '../options/TsRuntimeOptions';
-import { WriterConfig } from './WriterConfig';
-import { WriterResult } from './WriterResult';
+import Options from '../options/Options';
+import WriterConfig from './WriterConfig';
+import WriterResult from './WriterResult';
+import DEFAULT_CONFIG from './default_config';
 
 export class Writer {
 
@@ -23,7 +24,7 @@ export class Writer {
 
   public writeFile(fileResult: FileResult, config?: WriterConfig): Promise<WriterResult> {
     return new Promise((resolve, reject) => {
-      const options: WriterConfig | TsRuntimeOptions = config || this.transformerResult.config.options;
+      const options: WriterConfig = config ? Object.assign({}, DEFAULT_CONFIG, config) : DEFAULT_CONFIG;
       const file = fileResult.filePath.replace(new RegExp(`^${options.basePath}`), '');
       let location = path.join(options.writePath as string, file);
 
@@ -53,3 +54,5 @@ export class Writer {
   }
 
 }
+
+export default Writer;

src/playground/index.ts

@@ -1,4 +1,7 @@
 export interface WriterConfig {
   basePath: string;
   writePath: string;
+  encoding?: string;
 }
+
+export default WriterConfig;

src/playground/test.js

@@ -5,3 +5,5 @@ export interface WriterResult {
   originalPath: string;
   writePath: string;
 }
+
+export default WriterResult;

src/playground/test.ts

@@ -1,7 +1,9 @@
-import * as path from 'path';
-import { WriterConfig } from './WriterConfig';
+import WriterConfig from './WriterConfig';
 
-export const config: WriterConfig = {
-  basePath: path.join(__dirname, 'src'),
-  writePath: path.join(__dirname, 'dist'),
+export const DEFAULT_CONFIG: WriterConfig = {
+  basePath: __dirname,
+  writePath: __dirname,
+  encoding: 'utf8',
 };
+
+export default DEFAULT_CONFIG;