fix(exports): Add exported members to usage (buehler#52)

 When elements are directly re-exported, they should appear in the usages. Relates to buehler/typescript-hero#380.

Author: buehler

.appveyor.yml

@@ -2,17 +2,21 @@ version: "{build} - {branch}"
 skip_tags: true
 skip_branch_with_pr: true
 
+matrix:
+ fast_finish: true
+
 environment:
  matrix:
+ - nodejs_version: "9"
  - nodejs_version: "8"
- - nodejs_version: "7"
- - nodejs_version: "6"
 
 install:
  - ps: Install-Product node $env:nodejs_version
  - npm install
 
 test_script:
  - npm test
+ - npm install -g codecov
+ - codecov
 
 build: off

.travis.yml

@@ -1,29 +1,38 @@
-sudo: false
 language: node_js
 
-cache:
- directories:
- - node_modules
+stages:
+ - name: test
+ if: tag IS blank
+ - name: deploy
+ if: branch = master AND type != pull_request
+
+matrix:
+ fast_finish: true
 
 notifications:
  email: false
 
-node_js:
- - '8'
- - '7'
- - '6'
-
-before_script:
- - npm prune
-
-after_success:
- - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
-
-after_script:
- - npm install
- - npm run build
- - npm run semantic-release
-
-branches:
- except:
- - /^v\d+\.\d+\.\d+$/
+jobs:
+ include:
+ - stage: test
+ node_js: '9'
+ after_success:
+ - npm i -g codecov
+ - codecov
+ - stage: test
+ node_js: '8'
+ after_success:
+ - npm i -g codecov
+ - codecov
+ - stage: deploy
+ node_js: '9'
+ script: npm run typedoc
+ deploy:
+ provider: pages
+ skip_cleanup: true
+ github_token: $GH_TOKEN
+ local_dir: ./docs
+ - stage: deploy
+ node_js: '9'
+ before_script: npm run build
+ script: npm run semantic-release

README.md

@@ -6,7 +6,7 @@ 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)
+[![codecov](https://codecov.io/gh/buehler/node-typescript-parser/branch/master/graph/badge.svg)](https://codecov.io/gh/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)
 [![Greenkeeper badge](https://badges.greenkeeper.io/buehler/node-typescript-parser.svg)](https://greenkeeper.io/)
 [![Gitter](https://img.shields.io/gitter/room/node-typescript-parser/Lobby.svg)](https://gitter.im/node-typescript-parser/Lobby)
@@ -38,10 +38,10 @@ After the parsing is done, you'll get an index with resolved
 exports and declarations.
 
 Keep in mind, that the index'll only contain exported declarations.
- 
+
 ## Changelog
 
-The changelog is generated by [semantic release](https://github.com/semantic-release/semantic-release) and is located under the 
+The changelog is generated by [semantic release](https://github.com/semantic-release/semantic-release) and is located under the
 [release section](https://github.com/buehler/node-typescript-parser/releases).
 
 ## Licence

jest.json

@@ -1,6 +1,5 @@
 {
  "collectCoverage": true,
- "mapCoverage": true,
  "transform": {
  "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
  },

package.json

@@ -31,24 +31,24 @@
  },
  "homepage": "https://github.com/TypeScript-Heroes/node-typescript-parser#readme",
  "devDependencies": {
+ "@smartive/tslint-config": "^2.0.0",
+ "@types/jest": "^22.1.4",
  "@types/lodash-es": "^4.17.0",
- "@types/jest": "^21.1.8",
  "@types/mock-fs": "^3.6.30",
- "@types/node": "^8.0.57",
+ "@types/node": "^9.4.6",
  "del-cli": "^1.1.0",
- "jest": "^21.2.1",
+ "jest": "^22.4.2",
  "mock-fs": "^4.4.2",
- "semantic-release": "^9.0.0",
- "ts-jest": "^21.2.4",
- "tslint": "^5.8.0",
- "tslint-config-airbnb": "^5.4.2",
- "tsutils": "^2.13.0",
- "typedoc": "^0.9.0"
+ "semantic-release": "^15.0.0",
+ "ts-jest": "^22.4.0",
+ "tslint": "^5.9.1",
+ "tsutils": "^2.22.0",
+ "typedoc": "^0.10.0"
  },
  "dependencies": {
  "lodash": "^4.17.5",
  "lodash-es": "^4.17.5",
- "tslib": "^1.8.1",
- "typescript": "^2.6.2"
+ "tslib": "^1.9.0",
+ "typescript": "^2.7.2"
  }
 }

src/code-generators/typescript-generators/namedImport.ts

@@ -1,7 +1,7 @@
 import { NamedImport } from '../../imports/NamedImport';
 import { SymbolSpecifier } from '../../SymbolSpecifier';
 import { stringTemplate } from '../../utilities/StringTemplate';
-import { TypescriptGenerationOptions, MultiLineImportRule } from '../TypescriptGenerationOptions';
+import { MultiLineImportRule, TypescriptGenerationOptions } from '../TypescriptGenerationOptions';
 import { generateSymbolSpecifier } from './symbolSpecifier';
 
 const oneLinerImportTemplate = stringTemplate`import ${0} from ${1}`;

src/node-parser/class-parser.ts

@@ -20,11 +20,11 @@ import { Resource } from '../resources/Resource';
 import {
  isArrayBindingPattern,
  isConstructorDeclaration,
+ isGetAccessorDeclaration,
  isIdentifier,
  isMethodDeclaration,
  isObjectBindingPattern,
  isPropertyDeclaration,
- isGetAccessorDeclaration,
  isSetAccessorDeclaration,
 } from '../type-guards/TypescriptGuards';
 import { parseFunctionParts, parseMethodParams } from './function-parser';

src/node-parser/export-parser.ts

@@ -11,15 +11,15 @@ import { getDefaultResourceIdentifier } from './parse-utilities';
 
 /**
  * Parses an export node into the declaration.
- * 
+ *
  * @export
  * @param {Resource} resource
  * @param {(ExportDeclaration | ExportAssignment)} node
  */
 export function parseExport(resource: Resource, node: ExportDeclaration | ExportAssignment): void {
  if (isExportDeclaration(node)) {
  const tsExport = node as ExportDeclaration;
- if (!isStringLiteral(tsExport.moduleSpecifier)) {
+ if (!isStringLiteral(tsExport.moduleSpecifier) && !tsExport.exportClause) {
  return;
  }
  if (tsExport.getText().indexOf('*') > -1) {
@@ -30,22 +30,38 @@ export function parseExport(resource: Resource, node: ExportDeclaration | Export
  );
  } else if (tsExport.exportClause && isNamedExports(tsExport.exportClause)) {
  const lib = tsExport.moduleSpecifier as StringLiteral;
- const ex = new NamedExport(node.getStart(), node.getEnd(), lib.text);
+ const ex = new NamedExport(
+ node.getStart(),
+ node.getEnd(),
+ lib ? lib.text : getDefaultResourceIdentifier(resource),
+ );
 
  ex.specifiers = tsExport.exportClause.elements.map(
  o => o.propertyName && o.name ?
  new SymbolSpecifier(o.propertyName.text, o.name.text) :
  new SymbolSpecifier(o.name.text),
  );
 
+ for (const spec of ex.specifiers) {
+ if (resource.usages.indexOf(spec.alias || spec.specifier) === -1) {
+ resource.usages.push(spec.alias || spec.specifier);
+ }
+ }
+
  resource.exports.push(ex);
  }
  } else {
  const literal = node.expression as Identifier;
  if (node.isExportEquals) {
  resource.exports.push(new AssignedExport(node.getStart(), node.getEnd(), literal.text, resource));
+ if (resource.usages.indexOf(literal.text) === -1) {
+ resource.usages.push(literal.text);
+ }
  } else {
  const name = (literal && literal.text) ? literal.text : getDefaultResourceIdentifier(resource);
+ if (resource.usages.indexOf(name) === -1) {
+ resource.usages.push(name);
+ }
  resource.declarations.push(new DefaultDeclaration(name, resource));
  }
  }

src/resources/File.ts

@@ -11,7 +11,7 @@ import { Resource } from './Resource';
 
 /**
  * TypeScript resource. Basically a file that is located somewhere.
- * 
+ *
  * @export
  * @class File
  * @implements {Resource}
@@ -32,15 +32,16 @@ export class File implements Resource, Node {
  return this.usages
  .filter(usage =>
  !this.declarations.some(o => o.name === usage) &&
- !this.resources.some(o => (o instanceof Module || o instanceof Namespace) && o.name === usage))
+ !this.resources.some(o => (o instanceof Module || o instanceof Namespace) && o.name === usage),
+ )
  .concat(
- this.resources.reduce((all, cur) => all.concat(cur.nonLocalUsages), [] as string[]),
+  this.resources.reduce((all, cur) => all.concat(cur.nonLocalUsages), [] as string[]),
  );
  }
 
  /**
  * Returns the parsed path of a resource.
- * 
+ *
  * @readonly
  * @type {ParsedPath}
  * @memberof File
@@ -51,7 +52,7 @@ export class File implements Resource, Node {
 
  /**
  * Determines if a file is a workspace file or an external resource.
- * 
+ *
  * @readonly
  * @type {boolean}
  * @memberof File

test/SpecificUsageCases.spec.ts

@@ -20,4 +20,22 @@ describe('Specific usage cases', () => {
 
  });
 
+ describe('get usage for directly reexported elements', () => {
+
+ it('should contain imported elements in usages', async () => {
+ const file = getWorkspaceFile('specific-usage-cases/reexport/reexport-import.ts');
+ const parsed = await parser.parseFile(file, rootPath);
+ expect(parsed.exports).toMatchSnapshot();
+ expect(parsed.usages).toMatchSnapshot();
+ });
+
+ it('should contain imported default elements in usages', async () => {
+ const file = getWorkspaceFile('specific-usage-cases/reexport/reexport-default.ts');
+ const parsed = await parser.parseFile(file, rootPath);
+ expect(parsed.exports).toMatchSnapshot();
+ expect(parsed.usages).toMatchSnapshot();
+ });
+
+ });
+
 });