wip

Author: mohsen1

.vscode/launch.json

@@ -7,10 +7,10 @@
             "env": {
                 "NODE_ENV": "test"
             },
-            "externalConsole": false,
+            "console": "internalConsole",
             "name": "Run Tests",
-            "outDir": "${workspaceRoot}/dist",
-            "preLaunchTask": "compile",
+            "outFiles": ["${workspaceRoot}/dist"],
+            // "preLaunchTask": "compile",
             "program": "${workspaceRoot}/node_modules/.bin/jest",
             "request": "launch",
             "runtimeArgs": [],

package.json

@@ -22,7 +22,7 @@
         "transform": {
             ".ts": "<rootDir>/node_modules/ts-jest/preprocessor.js"
         },
-        "testRegex": "test/runner.ts",
+        "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
         "moduleFileExtensions": ["ts", "js"]
     },
     "lint-staged": {
@@ -50,6 +50,7 @@
         "@types/node": "^8.0.2",
         "@types/prettier": "^1.10.0",
         "@types/react": "^15.0.31",
+        "dedent": "^0.7.0",
         "husky": "^0.14.3",
         "jest": "^20.0.4",
         "lint-staged": "^6.0.1",

src/compiler.ts

@@ -15,7 +15,7 @@ import { TransformFactoryFactory } from '.';
 export function compile(
     filePath: string,
     factoryFactories: TransformFactoryFactory[],
-    prettierOptions: prettier.Options = {},
+    incomingPrettierOptions: prettier.Options = {},
 ) {
     const compilerOptions: ts.CompilerOptions = {
         target: ts.ScriptTarget.ES2017,
@@ -53,21 +53,32 @@ export function compile(
     // TODO: fix the index 0 access... What if program have multiple source files?
     const printed = printer.printNode(ts.EmitHint.SourceFile, result.transformed[0], sourceFiles[0]);
 
-    // Default to original source code style if prettier options are not set
     const inputSource = fs.readFileSync(filePath, 'utf-8');
-    const { amount: indentAmount, type: indentType } = detectIndent(inputSource);
-    const sourceWidth = getCodeWidth(inputSource, 80);
-    const semi = getUseOfSemi(inputSource);
-    const quotations = getQuotation(inputSource);
-    _.defaults(prettierOptions, {
+    const prettierOptions = getPrettierOptions(inputSource, incomingPrettierOptions);
+
+    return prettier.format(printed, incomingPrettierOptions);
+}
+
+/**
+ * Get Prettier options based on style of a JavaScript
+ * @param source Body of a JavaScript
+ * @param options Existing prettier option
+ */
+export function getPrettierOptions(source: string, options: prettier.Options): prettier.Options {
+    const { amount: indentAmount, type: indentType } = detectIndent(source);
+    const sourceWidth = getCodeWidth(source, 80);
+    const semi = getUseOfSemi(source);
+    const quotations = getQuotation(source);
+
+    _.defaults(options, {
         tabWidth: indentAmount,
-        useTabs: indentType === 'tab',
+        useTabs: indentType && indentType === 'tab',
         printWidth: sourceWidth,
         semi,
         singleQuote: quotations === 'single',
     });
 
-    return prettier.format(printed, prettierOptions);
+    return options;
 }
 
 /**

src/untyped-modules.d.ts

@@ -0,0 +1 @@
+declare module 'dedent';

test/compiler.test.ts

@@ -0,0 +1,31 @@
+import * as prettier from 'prettier';
+import * as dedent from "dedent";
+import { getPrettierOptions } from "../src/compiler";
+
+describe('compiler', () => {
+    describe('getPrettierOptions', () => {
+        it('defaults to incoming options', () => {
+            const incomingOptions: prettier.Options = {
+                semi: true,
+                printWidth: 120,
+                singleQuote: true,
+                arrowParens: 'avoid',
+                useTabs: false,
+                tabWidth: 4,
+            };
+            const options = getPrettierOptions('', incomingOptions);
+            expect(options).toEqual(incomingOptions);
+        });
+
+        it('detecs the tab option', () => {
+            const source = dedent`
+            const foo = {
+            \tone: 1,
+            \ttwo: 2,
+            }
+            `;
+            const options = getPrettierOptions(source, {});
+            expect(options).toEqual({useTabs: true});
+        });
+    });
+});