Merge pull request #38 from buehler/develop

Author: buehler

.appveyor.yml

@@ -0,0 +1,17 @@
+version: "{build} - {branch}"
+skip_tags: true
+
+environment:
+  matrix:
+    - nodejs_version: "8"
+    - nodejs_version: "7"
+    - nodejs_version: "6"
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+test_script:
+  - npm test
+
+build: off

README.md

@@ -4,6 +4,7 @@ This package is a TypeScript and ECMAScript parser. It uses the underlying types
 a more or less human readable AST out of .js or .ts files.
 
 [![Build Status](https://travis-ci.org/buehler/node-typescript-parser.svg)](https://travis-ci.org/buehler/node-typescript-parser)
+[![Build Status Windows](https://ci.appveyor.com/api/projects/status/j06bqjc4tkdt7sej?svg=true)](https://ci.appveyor.com/project/buehler/node-typescript-parser)
 [![npm](https://img.shields.io/npm/v/typescript-parser.svg?maxAge=3600)](https://www.npmjs.com/package/typescript-parser)
 [![Coverage status](https://img.shields.io/coveralls/buehler/node-typescript-parser.svg?maxAge=3600)](https://coveralls.io/github/buehler/node-typescript-parser)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)

package.json

@@ -47,6 +47,6 @@
   "dependencies": {
     "lodash": "^4.17.4",
     "tslib": "^1.7.1",
-    "typescript": "2.4.2"
+    "typescript": "^2.5.3"
   }
 }

src/DeclarationIndex.ts

@@ -12,7 +12,7 @@ import { Namespace } from './resources/Namespace';
 import { Resource } from './resources/Resource';
 import { isExportableDeclaration } from './type-guards/TypescriptHeroGuards';
 import { TypescriptParser } from './TypescriptParser';
-import { normalizeFilename, normalizePathUri } from './utilities/PathHelpers';
+import { normalizeFilename, normalizePathUri, toPosix } from './utilities/PathHelpers';
 
 /**
  * Returns the name of the node folder. Is used as the library name for indexing.
@@ -118,7 +118,7 @@ export class DeclarationIndex {
      */
     public get declarationInfos(): DeclarationInfo[] {
         return Object
-            .keys(this.index)
+            .keys(this.index!)
             .sort()
             .reduce((all, key) => all.concat(this.index![key]), <DeclarationInfo[]>[]);
     }
@@ -308,7 +308,7 @@ export class DeclarationIndex {
                 break;
             }
             if (ex instanceof AllExport || ex instanceof NamedExport) {
-                const exported = '/' + relative(this.rootPath, normalize(join(resource.parsedPath.dir, ex.from)));
+                const exported = '/' + toPosix(relative(this.rootPath, normalize(join(resource.parsedPath.dir, ex.from))));
                 exportsResource = exported === resourcePath;
             }
         }

src/utilities/PathHelpers.ts

@@ -25,5 +25,16 @@ export function normalizePathUri(uri: string): string {
  * @returns {string} 
  */
 export function normalizeFilename(filepath: string): string {
-    return filepath.replace(/([.]d)?[.](t|j)sx?$/g, '');
+    return toPosix(filepath.replace(/([.]d)?[.](t|j)sx?$/g, ''));
+}
+
+/**
+ * On Windows, replaces all backslash delimeters with forward slashes.
+ * On other OSes, returns the path unmodified.
+ */
+export function toPosix(path: string): string {
+    if (platform() === 'win32') {
+        return path.replace(/\\/g, '/');
+    }
+    return path;
 }

test/TypescriptParser.spec.ts

@@ -51,7 +51,7 @@ describe('TypescriptParser', () => {
         });
 
         it('should parse imports', () => {
-            expect(parsed.imports).toHaveLength(9);
+            expect(parsed.imports).toHaveLength(12);
             expect(parsed.imports).toMatchSnapshot();
         });
 

test/__snapshots__/TypescriptParser.spec.ts.snap

@@ -1012,6 +1012,36 @@ Array [
     ],
     "start": 400,
   },
+  NamedImport {
+    "defaultAlias": "__DefaultAlias",
+    "end": 540,
+    "libraryName": "namedImport",
+    "specifiers": Array [
+      SymbolSpecifier {
+        "alias": "__Specifier1",
+        "specifier": "Specifier1",
+      },
+    ],
+    "start": 456,
+  },
+  NamedImport {
+    "defaultAlias": "__DefaultAlias",
+    "end": 614,
+    "libraryName": "namedImport",
+    "specifiers": Array [
+      SymbolSpecifier {
+        "alias": "__Specifier1",
+        "specifier": "Specifier1",
+      },
+    ],
+    "start": 541,
+  },
+  NamespaceImport {
+    "alias": "__namespaceImport",
+    "end": 662,
+    "libraryName": "namespace",
+    "start": 615,
+  },
 ]
 `;
 

test/_workspace/typescript-parser/importsOnly.ts

@@ -10,3 +10,6 @@ import {
 import Foobar from 'aFile';
 import { default as DefaultAlias, Specifier1 } from 'namedImport';
 import DefaultAlias, { Specifier1 } from 'namedImport';
+import { default as __DefaultAlias, Specifier1 as __Specifier1 } from 'namedImport';
+import __DefaultAlias, { Specifier1 as __Specifier1 } from 'namedImport';
+import * as __namespaceImport from 'namespace';

test/declaration-index/DeclarationIndex.spec.ts

@@ -1,5 +1,5 @@
 import mockFs = require('mock-fs');
-import { join, resolve } from 'path';
+import { join, resolve } from '../testUtilities';
 
 import { DeclarationIndex } from '../../src/DeclarationIndex';
 import { ClassDeclaration } from '../../src/declarations';

test/declaration-index/specific-cases/body-parser/DeclarationIndex.body-parser.spec.ts

@@ -1,4 +1,4 @@
-import { join, resolve } from 'path';
+import { join, resolve } from '../../../testUtilities';
 
 import { DeclarationIndex } from '../../../../src/DeclarationIndex';
 import { TypescriptParser } from '../../../../src/TypescriptParser';

test/declaration-index/specific-cases/reindex-with-global-module/DeclarationIndex.reindex-with-global-module-export.spec.ts

@@ -1,5 +1,5 @@
 import { FileChanges } from '../../../../src';
-import { join, resolve } from 'path';
+import { join, resolve } from '../../../testUtilities';
 
 import { DeclarationIndex } from '../../../../src/DeclarationIndex';
 import { TypescriptParser } from '../../../../src/TypescriptParser';

test/testUtilities.ts

@@ -1,7 +1,18 @@
-import { resolve } from 'path';
+import * as Path from 'path';
+import { toPosix } from '../src/utilities/PathHelpers';
 
 export function getWorkspaceFile(pathFromWorkspace: string): string {
     return resolve(__dirname, '_workspace', pathFromWorkspace);
 }
 
+// Like path.resolve, but always replaces backslashes with forward slashes on Windows.
+export function resolve(...paths: string[]): string {
+    return toPosix(Path.resolve(...paths));
+}
+
+// Like path.join, but always replaces backslashes with forward slashes on Windows.
+export function join(...paths: string[]): string {
+    return toPosix(Path.join(...paths));
+}
+
 export const rootPath = resolve(__dirname, '_workspace');