Merge pull request #9 from TypeScript-Heroes/develop

Author: buehler

package.json

@@ -31,17 +31,17 @@
   },
   "homepage": "https://github.com/TypeScript-Heroes/node-typescript-parser#readme",
   "devDependencies": {
-    "@types/jest": "^20.0.1",
+    "@types/jest": "^20.0.2",
     "@types/mock-fs": "^3.6.30",
-    "@types/node": "^8.0.1",
-    "del-cli": "^1.0.0",
+    "@types/node": "^8.0.13",
+    "del-cli": "^1.1.0",
     "jest": "^20.0.4",
     "mock-fs": "^4.4.1",
     "semantic-release": "^6.3.6",
-    "ts-jest": "^20.0.6",
-    "tslint": "^5.4.3",
-    "tslint-config-airbnb": "^5.2.0",
-    "tsutils": "^2.4.0",
+    "ts-jest": "^20.0.7",
+    "tslint": "^5.5.0",
+    "tslint-config-airbnb": "^5.2.1",
+    "tsutils": "^2.7.1",
     "typedoc": "^0.7.1"
   },
   "dependencies": {

src/imports/DefaultImport.ts

@@ -10,7 +10,7 @@ import { AliasedImport } from './Import';
  */
 export class DefaultImport implements AliasedImport {
     public get isNew(): boolean {
-        return this.start !== undefined && this.end !== undefined;
+        return this.start === undefined || this.end === undefined;
     }
 
     constructor(public libraryName: string, public alias: string, public start?: number, public end?: number) { }

src/imports/ExternalModuleImport.ts

@@ -10,7 +10,7 @@ import { AliasedImport } from './Import';
  */
 export class ExternalModuleImport implements AliasedImport {
     public get isNew(): boolean {
-        return this.start !== undefined && this.end !== undefined;
+        return this.start === undefined || this.end === undefined;
     }
 
     constructor(public libraryName: string, public alias: string, public start?: number, public end?: number) { }

src/imports/NamedImport.ts

@@ -14,7 +14,7 @@ export class NamedImport implements Import {
     public specifiers: SymbolSpecifier[] = [];
 
     public get isNew(): boolean {
-        return this.start !== undefined && this.end !== undefined;
+        return this.start === undefined || this.end === undefined;
     }
 
     constructor(public libraryName: string, public start?: number, public end?: number) { }

src/imports/NamespaceImport.ts

@@ -9,7 +9,7 @@ import { AliasedImport } from './Import';
  */
 export class NamespaceImport implements AliasedImport {
     public get isNew(): boolean {
-        return this.start !== undefined && this.end !== undefined;
+        return this.start === undefined || this.end === undefined;
     }
 
     constructor(public libraryName: string, public alias: string, public start?: number, public end?: number) { }

src/imports/StringImport.ts

@@ -9,7 +9,7 @@ import { Import } from './Import';
  */
 export class StringImport implements Import {
     public get isNew(): boolean {
-        return this.start !== undefined && this.end !== undefined;
+        return this.start === undefined || this.end === undefined;
     }
 
     constructor(public libraryName: string, public start?: number, public end?: number) { }

test/TypescriptParser.spec.ts

@@ -32,7 +32,7 @@ describe('TypescriptParser', () => {
 
         it('should parse a source code string correctly', async () => {
             const parsed = await parser.parseSource(`import {foo} from 'bar'; class Foobar {}; const bar = new Foobar();`);
-            
+
             expect(parsed).toMatchSnapshot();
         });
 
@@ -544,4 +544,22 @@ describe('TypescriptParser', () => {
 
     });
 
+    describe('TSX Usage parsing', () => {
+        const file = getWorkspaceFile('typescript-parser/usagesOnly.tsx');
+        let parsed: Resource;
+
+        beforeEach(async () => {
+            parsed = await parser.parseFile(file, rootPath);
+        });
+
+        it('should parse a tsx element usage', () => {
+            const usages = parsed.usages;
+
+            expect(usages).toContain('myComponent');
+            expect(usages).toContain('div');
+            expect(usages).toContain('complexComp');
+            expect(usages).toContain('SingleComp');
+        });
+    });
+
 });

test/_workspace/declaration-index/reactFile.tsx

@@ -0,0 +1,7 @@
+import { myComponent } from './myReactTemplate';
+
+export default function foobar() {
+    return (
+        <myComponent></myComponent>
+    );
+}

test/_workspace/typescript-parser/usagesOnly.tsx

@@ -0,0 +1,11 @@
+export default function foobar() {
+    return (
+        <myComponent>
+            <div>
+                <complexComp>
+                    <SingleComp />
+                </complexComp>
+            </div>
+        </myComponent>
+    );
+}

test/imports/Imports.spec.ts

@@ -0,0 +1,100 @@
+import { DefaultImport, ExternalModuleImport, NamedImport, NamespaceImport, StringImport } from '../../src/imports';
+
+describe('Imports', () => {
+
+    describe('DefaultImport', () => { 
+
+        it('should set isNew() when start is undefined', () => {
+            const imp = new DefaultImport('lib', 'alias', undefined, 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should set isNew() when end is undefined', () => {
+            const imp = new DefaultImport('lib', 'alias', 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should not set isNew() when start and end are defined', () => {
+            const imp = new DefaultImport('lib', 'alias', 12, 1337);
+            expect(imp.isNew).toBeFalsy();
+        });
+
+    });
+
+    describe('ExternalModuleImport', () => { 
+
+        it('should set isNew() when start is undefined', () => {
+            const imp = new ExternalModuleImport('lib', 'alias', undefined, 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should set isNew() when end is undefined', () => {
+            const imp = new ExternalModuleImport('lib', 'alias', 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should not set isNew() when start and end are defined', () => {
+            const imp = new ExternalModuleImport('lib', 'alias', 12, 1337);
+            expect(imp.isNew).toBeFalsy();
+        });
+
+    });
+
+    describe('NamedImport', () => { 
+
+        it('should set isNew() when start is undefined', () => {
+            const imp = new NamedImport('lib', undefined, 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should set isNew() when end is undefined', () => {
+            const imp = new NamedImport('lib', 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should not set isNew() when start and end are defined', () => {
+            const imp = new NamedImport('lib', 12, 1337);
+            expect(imp.isNew).toBeFalsy();
+        });
+
+    });
+
+    describe('NamespaceImport', () => { 
+
+        it('should set isNew() when start is undefined', () => {
+            const imp = new NamespaceImport('lib', 'alias', undefined, 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should set isNew() when end is undefined', () => {
+            const imp = new NamespaceImport('lib', 'alias', 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should not set isNew() when start and end are defined', () => {
+            const imp = new NamespaceImport('lib', 'alias', 12, 1337);
+            expect(imp.isNew).toBeFalsy();
+        });
+
+    });
+
+    describe('StringImport', () => { 
+
+        it('should set isNew() when start is undefined', () => {
+            const imp = new StringImport('lib', undefined, 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should set isNew() when end is undefined', () => {
+            const imp = new StringImport('lib', 1337);
+            expect(imp.isNew).toBeTruthy();
+        });
+        
+        it('should not set isNew() when start and end are defined', () => {
+            const imp = new StringImport('lib', 12, 1337);
+            expect(imp.isNew).toBeFalsy();
+        });
+
+    });
+
+});