@compodoc/compodoc - npm Package Compare versions

Comparing version 1.0.0-beta.8 to 1.0.0-beta.9

CHANGELOG.md

@@ -0,1 +1,19 @@
+<a name="1.0.0-beta.9"></a>
+# [1.0.0-beta.9](https://github.com/compodoc/compodoc/compare/1.0.0-beta.8...1.0.0-beta.9) (2017-05-11)
+
+### Bug Fixes
+
+* **markdown** Fix escaping of html entities in code blocks ([e816cbe](https://github.com/compodoc/compodoc/commit/e816cbe)), thanks Thomas Mair
+* **config** Allow for comments in tsconfig.json ([2796de5](https://github.com/compodoc/compodoc/commit/2796de5)), closes [#177](https://github.com/compodoc/compodoc/issues/177)
+* **chore** Problem with resources file when providing absolute output path ([b52a40e7](https://github.com/compodoc/compodoc/commit/b52a40e7)), closes [#176](https://github.com/compodoc/compodoc/issues/176)
+* **watch** Watch for additional doc too ([52801f4b](https://github.com/compodoc/compodoc/commit/52801f4b)), closes [#163](https://github.com/compodoc/compodoc/issues/163)
+* **dependencies** decorators support ([65bbabc7](https://github.com/compodoc/compodoc/commit/65bbabc7)), closes [#171](https://github.com/compodoc/compodoc/issues/171)
+* **markdown** Set marked break option to false ([0e6ac342](https://github.com/compodoc/compodoc/commit/0e6ac342)), closes [#181](https://github.com/compodoc/compodoc/issues/181)
+* **dependencies** UTF8 Bom support ([a3d5bec7](https://github.com/compodoc/compodoc/commit/a3d5bec7)), closes [#170](https://github.com/compodoc/compodoc/issues/170)
+
+### Features
+
+* **app** exclude with glob patterns ([6310735](https://github.com/compodoc/compodoc/commit/6310735)), closes [#174](https://github.com/compodoc/compodoc/issues/174)
+* **cli** display Node.js and OS infos after banner ([c0f60561](https://github.com/compodoc/compodoc/commit/c0f60561))
+
 <a name="1.0.0-beta.8"></a>
@@ -2,0 +20,0 @@ # [1.0.0-beta.8](https://github.com/compodoc/compodoc/compare/1.0.0-beta.7...1.0.0-beta.8) (2017-04-26)

package.json

 {
   "name": "@compodoc/compodoc",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "The missing documentation tool for your Angular application",
@@ -60,10 +60,10 @@ "main": "dist/index.js",
     "cheerio": "^0.22.0",
-    "chokidar": "^1.6.1",
+    "chokidar": "^1.7.0",
     "colors": "^1.1.2",
     "commander": "^2.9.0",
-    "fs-extra": "^2.1.2",
+    "fs-extra": "^3.0.1",
     "glob": "^7.1.1",
     "gulp-util": "^3.0.8",
-    "handlebars": "^4.0.6",
-    "html-entities": "^1.2.0",
+    "handlebars": "^4.0.8",
+    "html-entities": "^1.2.1",
     "live-server": "^1.2.0",
@@ -73,13 +73,14 @@ "lodash": "^4.17.3",
     "marked": "^0.3.6",
+    "os-name": "^2.0.1",
     "shelljs": "^0.7.7",
-    "typescript": "2.2.2"
+    "typescript": "2.3.2"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.35",
+    "@types/chai": "^3.5.2",
     "@types/es6-promise": "0.0.32",
-    "@types/fs-extra": "2.0.0",
+    "@types/fs-extra": "3.0.0",
     "@types/handlebars": "^4.0.32",
     "@types/marked": "0.0.28",
-    "@types/mocha": "^2.2.40",
-    "@types/node": "7.0.12",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "7.0.18",
     "chai": "^3.5.0",
@@ -89,6 +90,7 @@ "codecov": "^2.1.0",
     "cross-env": "^4.0.0",
-    "mocha": "^3.2.0",
+    "glob": "^7.1.1",
+    "mocha": "^3.3.0",
     "nodemon": "^1.11.0",
-    "npm-watch": "^0.1.8",
-    "nyc": "^10.1.2",
+    "npm-watch": "^0.1.9",
+    "nyc": "^10.3.2",
     "request": "^2.81.0",
@@ -99,5 +101,5 @@ "rimraf": "^2.6.1",
     "rollup-watch": "^3.2.2",
-    "selenium-webdriver": "^3.3.0",
-    "ts-node": "^3.0.2",
-    "tslint": "^5.0.0",
+    "selenium-webdriver": "^3.4.0",
+    "ts-node": "^3.0.4",
+    "tslint": "^5.2.0",
     "webshot": "^0.18.0"
@@ -104,0 +106,0 @@ },

README.md

@@ -52,2 +52,15 @@ <p align="center">
 
+## Contributing
+
+Want to file a bug, contribute some code, or improve documentation? Excellent !
+
+Read up on our guidelines for [contributing](https://github.com/compodoc/compodoc/blob/master/.github/CONTRIBUTING.md).
+
+## Contributors
+
+[<img alt="vogloblinsky" src="https://avatars3.githubusercontent.com/u/2841805?v=3&s=117" width="117">](https://github.com/vogloblinsky) |[<img alt="daniele-zurico" src="https://avatars3.githubusercontent.com/u/3193095?v=3&s=117" width="117">](https://github.com/daniele-zurico) |[<img alt="mattlewis92" src="https://avatars3.githubusercontent.com/u/6425649?v=3&s=117" width="117">](https://github.com/mattlewis92) |
+:---: |:---: |:---: |
+[vogloblinsky](https://github.com/vogloblinsky) |[daniele-zurico](https://github.com/daniele-zurico) |[mattlewis92](https://github.com/mattlewis92) |
+
+
 ## License
@@ -54,0 +67,0 @@

src/app/application.ts

@@ -7,7 +7,3 @@ import * as ts from 'typescript';
 import * as Shelljs from 'shelljs';
-import marked from 'marked';
 
-const glob: any = require('glob'),
-      chokidar = require('chokidar');
-
 import { logger } from '../logger';
@@ -17,3 +13,4 @@ import { HtmlEngine } from './engines/html.engine';
 import { FileEngine } from './engines/file.engine';
-import { Configuration, IConfiguration } from './configuration';
+import { Configuration } from './configuration';
+import { ConfigurationInterface } from './interfaces/configuration.interface';
 import { $dependenciesEngine } from './engines/dependencies.engine';
@@ -31,2 +28,6 @@ import { NgdEngine } from './engines/ngd.engine';
 
+const glob: any = require('glob'),
+      marked = require('marked'),
+      chokidar = require('chokidar');
+
 let pkg = require('../package.json'),
@@ -53,3 +54,3 @@ cwd = process.cwd(),
      */
-    configuration:IConfiguration;
+    configuration:ConfigurationInterface;
     /**
@@ -108,2 +109,25 @@ * Boolean for watching status
 
+    /**
+     * Return a boolean indicating presence of one TypeScript file in updatedFiles list
+     * @return {boolean} Result of scan
+     */
+    hasWatchedFilesTSFiles(): boolean {
+        let result = false;
+
+        _.forEach(this.updatedFiles, (file) => {
+            if (path.extname(file) === '.ts') {
+                result = true;
+            }
+        });
+
+        return false;
+    }
+
+    /**
+     * Clear files for watch processing
+     */
+    clearUpdatedFiles() {
+        this.updatedFiles = [];
+    }
+
     processPackageJson() {
@@ -174,2 +198,26 @@ logger.info('Searching package.json file');
 
+    /**
+     * Rebuild external documentation during watch process
+     */
+    rebuildExternalDocumentation() {
+        logger.info('Rebuild external documentation');
+
+        let actions = [];
+
+        this.configuration.resetAdditionalPages();
+
+        if (this.configuration.mainData.includes !== '') {
+            actions.push(() => { return this.prepareExternalIncludes(); });
+        }
+
+        promiseSequential(actions)
+            .then(res => {
+                this.processPages();
+                this.clearUpdatedFiles();
+            })
+            .catch(errorMessage => {
+                logger.error(errorMessage);
+            });
+    }
+
     getDependenciesData() {
@@ -235,3 +283,5 @@ logger.info('Get dependencies data');
 
-        actions.push(() => { return this.prepareCoverage(); });
+        if (!this.configuration.mainData.disableCoverage) {
+            actions.push(() => { return this.prepareCoverage(); });
+        }
 
@@ -241,2 +291,3 @@ promiseSequential(actions)
                 this.processGraphs();
+                this.clearUpdatedFiles();
             })
@@ -1078,3 +1129,5 @@ .catch(errorMessage => {
 
-        fs.copy(path.resolve(__dirname + '/../src/resources/'), path.resolve(process.cwd() + path.sep + this.configuration.mainData.output), (err) => {
+        let finalOutput = this.configuration.mainData.output.replace(process.cwd(), '');
+
+        fs.copy(path.resolve(__dirname + '/../src/resources/'), path.resolve(process.cwd() + path.sep + finalOutput), (err) => {
             if(err) {
@@ -1085,3 +1138,3 @@ logger.error('Error during resources copy ', err);
                 if (this.configuration.mainData.extTheme) {
-                    fs.copy(path.resolve(process.cwd() + path.sep + this.configuration.mainData.extTheme), path.resolve(process.cwd() + path.sep + this.configuration.mainData.output + '/styles/'), function (err) {
+                    fs.copy(path.resolve(process.cwd() + path.sep + this.configuration.mainData.extTheme), path.resolve(process.cwd() + path.sep + finalOutput + '/styles/'), function (err) {
                         if (err) {
@@ -1183,2 +1236,3 @@ logger.error('Error during external styling theme copy ', err);
         logger.info(`Watching sources in ${srcFolder} folder`);
+
         let watcher = chokidar.watch(srcFolder, {
@@ -1203,4 +1257,13 @@ awaitWriteFinish: true,
                 this.setUpdatedFiles(watchChangedFiles);
-                this.getMicroDependenciesData();
+                if (this.hasWatchedFilesTSFiles()) {
+                    this.getMicroDependenciesData();
+                } else {
+                    this.rebuildExternalDocumentation();
+                }
             };
+
+        if (this.configuration.mainData.includes !== '') {
+            watcher.add(this.configuration.mainData.includes);
+        }
+
         watcher
@@ -1225,2 +1288,6 @@ .on('ready', () => {
                         }
+                        if (path.extname(file) === '.md' || path.extname(file) === '.json') {
+                            watchChangedFiles.push(path.join(process.cwd() + path.sep + file));
+                            waiterChange();
+                        }
                     })
@@ -1227,0 +1294,0 @@ .on('unlink', (file) => {

src/app/configuration.ts

 import { COMPODOC_DEFAULTS } from '../utils/defaults';
 
-interface Page {
-    name: string;
-    filename?: string;
-    context: string;
-    path?: string;
-    module?: any;
-    pipe?: any;
-    class?: any;
-    interface?: any;
-    directive?: any;
-    injectable?: any;
-    additionalPage?: any;
-    files?: any;
-    data?: any;
-    depth?: number;
-    pageType?: string;
-    component?: any;
-}
+import { PageInterface } from './interfaces/page.interface';
 
-interface IMainData {
-    output: string;
-    theme: string;
-    extTheme: string;
-    serve: boolean;
-    port: number;
-    open: boolean;
-    assetsFolder: string;
-    documentationMainName: string;
-    documentationMainDescription: string;
-    base: string;
-    hideGenerator: boolean;
-    modules: any;
-    readme: string;
-    additionalPages: any;
-    pipes: any;
-    classes: any;
-    interfaces: any;
-    components: any;
-    directives: any;
-    injectables: any;
-    miscellaneous: any;
-    routes: any;
-    tsconfig: string;
-    toggleMenuItems: string[];
-    includes: string;
-    includesName: string;
-    includesFolder: string;
-    disableSourceCode: boolean;
-    disableGraph: boolean;
-    disableCoverage: boolean;
-    disablePrivateOrInternalSupport: boolean;
-    watch: boolean;
-    mainGraph: string;
-    coverageTest: boolean;
-    coverageTestThreshold: number;
-}
+import { MainDataInterface } from './interfaces/main-data.interface';
 
-export interface IConfiguration {
-    mainData: IMainData;
-    pages:Page[];
-    addPage(page: Page): void;
-    addAdditionalPage(page: Page): void;
-}
+import { ConfigurationInterface } from './interfaces/configuration.interface';
 
-export class Configuration implements IConfiguration {
+export class Configuration implements ConfigurationInterface {
     private static _instance:Configuration = new Configuration();
 
-    private _pages:Page[] = [];
-    private _mainData: IMainData = {
+    private _pages:PageInterface[] = [];
+    private _mainData: MainDataInterface = {
         output: COMPODOC_DEFAULTS.folder,
@@ -92,4 +34,4 @@ theme: COMPODOC_DEFAULTS.theme,
         injectables: [],
+        miscellaneous: [],
         routes: [],
-        miscellaneous: [],
         tsconfig: '',
@@ -105,4 +47,6 @@ toggleMenuItems: [],
         watch: false,
+        mainGraph: '',
         coverageTest: false,
-        coverageTestThreshold: COMPODOC_DEFAULTS.defaultCoverageThreshold
+        coverageTestThreshold: COMPODOC_DEFAULTS.defaultCoverageThreshold,
+        routesLength: 0
     };
@@ -122,7 +66,7 @@
 
-    addPage(page: Page) {
+    addPage(page: PageInterface) {
         this._pages.push(page);
     }
 
-    addAdditionalPage(page: Page) {
+    addAdditionalPage(page: PageInterface) {
         this._mainData.additionalPages.push(page);
@@ -135,15 +79,19 @@ }
 
-    get pages():Page[] {
+    resetAdditionalPages() {
+        this._mainData.additionalPages = [];
+    }
+
+    get pages():PageInterface[] {
         return this._pages;
     }
-    set pages(pages:Page[]) {
+    set pages(pages:PageInterface[]) {
         this._pages = [];
     }
 
-    get mainData():IMainData {
+    get mainData():MainDataInterface {
         return this._mainData;
     }
-    set mainData(data:IMainData) {
-        Object.assign(this._mainData, data);
+    set mainData(data:MainDataInterface) {
+        (<any>Object).assign(this._mainData, data);
     }
 };

src/app/engines/components-tree.engine.ts

@@ -73,3 +73,5 @@ import * as _ from 'lodash';
                     selector: component.selector,
-                    children: []
+                    children: [],
+                    template: '',
+                    templateUrl: ''
                 }
@@ -76,0 +78,0 @@ if (typeof component.template !== 'undefined') {

src/app/engines/dependencies.engine.ts

@@ -5,7 +5,12 @@ import * as _ from 'lodash';
 
+import { ParsedData } from '../interfaces/parsed-data.interface';
+import { MiscellaneousData } from '../interfaces/miscellaneous-data.interface';
+
 class DependenciesEngine {
     private static _instance:DependenciesEngine = new DependenciesEngine();
-    rawData: Object;
+
+    rawData: ParsedData;
     modules: Object[];
     rawModules: Object[];
+    rawModulesForOverview: Object[];
     components: Object[];
@@ -18,3 +23,4 @@ directives: Object[];
     classes: Object[];
-    miscellaneous: Object[];
+    miscellaneous: MiscellaneousData;
+
     constructor() {
@@ -50,3 +56,3 @@ if(DependenciesEngine._instance){
     }
-    init(data: Object) {
+    init(data: ParsedData) {
         this.rawData = data;
@@ -60,3 +66,2 @@ this.modules = _.sortBy(this.rawData.modules, ['name']);
         this.interfaces = _.sortBy(this.rawData.interfaces, ['name']);
-        //this.routes = _.sortBy(_.uniqWith(this.rawData.routes, _.isEqual), ['name']);
         this.pipes = _.sortBy(this.rawData.pipes, ['name']);
@@ -63,0 +68,0 @@ this.classes = _.sortBy(this.rawData.classes, ['name']);

src/app/engines/html.engine.helpers.ts

@@ -7,2 +7,4 @@ import * as Handlebars from 'handlebars';
 
+import { jsdocTagInterface } from '../interfaces/jsdoc-tag.interface';
+
 export let HtmlEngineHelpers = (function() {
@@ -216,2 +218,4 @@ let init = function() {
 
+            description = description.replace(/\n/g, '<br/>');
+
             do {
@@ -291,3 +295,3 @@ matches = tagRegExp.exec(description);
         });
-        Handlebars.registerHelper('jsdoc-component-example', function(jsdocTags, options) {
+        Handlebars.registerHelper('jsdoc-component-example', function(jsdocTags:jsdocTagInterface[], options) {
             let i = 0,
@@ -320,3 +324,3 @@ len = jsdocTags.length,
                     if (jsdocTags[i].tagName.text === 'example') {
-                        var tag = {};
+                        var tag = {} as jsdocTagInterface;
                         if (jsdocTags[i].comment) {
@@ -334,3 +338,3 @@ tag.comment = `<pre class="line-numbers"><code class="language-${type}">` + htmlEntities(cleanTag(jsdocTags[i].comment)) + `</code></pre>`;
         });
-        Handlebars.registerHelper('jsdoc-example', function(jsdocTags, options) {
+        Handlebars.registerHelper('jsdoc-example', function(jsdocTags:jsdocTagInterface[], options) {
             let i = 0,
@@ -343,3 +347,3 @@ len = jsdocTags.length,
                     if (jsdocTags[i].tagName.text === 'example') {
-                        var tag = {};
+                        var tag = {} as jsdocTagInterface;
                         if (jsdocTags[i].comment) {
@@ -357,3 +361,3 @@ tag.comment = jsdocTags[i].comment.replace(/<caption>/g, '<b><i>').replace(/\/caption>/g, '/b></i>');
         });
-        Handlebars.registerHelper('jsdoc-params', function(jsdocTags, options) {
+        Handlebars.registerHelper('jsdoc-params', function(jsdocTags:jsdocTagInterface[], options) {
             var i = 0,
@@ -365,3 +369,3 @@ len = jsdocTags.length,
                     if (jsdocTags[i].tagName.text === 'param') {
-                        var tag = {};
+                        var tag = {} as jsdocTagInterface;
                         if (jsdocTags[i].typeExpression && jsdocTags[i].typeExpression.type.name) {
@@ -368,0 +372,0 @@ tag.type = jsdocTags[i].typeExpression.type.name.text

src/app/engines/html.engine.ts

@@ -68,3 +68,3 @@ import * as fs from 'fs-extra';
             that = this;
-        Object.assign(o, page);
+        (<any>Object).assign(o, page);
         return new Promise(function(resolve, reject) {
@@ -104,8 +104,10 @@ if(that.cache['page']) {
                        });
+                   outputFolder = outputFolder.replace(process.cwd(), '');
                    fs.outputFile(path.resolve(process.cwd() + path.sep + outputFolder + path.sep + '/images/coverage-badge.svg'), result, function (err) {
                        if(err) {
-                           logger.error('Error during search index file generation ', err);
+                           logger.error('Error during coverage badge file generation ', err);
                            reject(err);
+                       } else {
+                           resolve();
                        }
-                       resolve();
                    });
@@ -112,0 +114,0 @@ }

src/app/engines/markdown.engine.ts

 import * as fs from 'fs-extra';
 import * as path from 'path';
-import marked, { Renderer } from 'marked';
 
+const marked = require('marked');
+
 export class MarkdownEngine {
     constructor() {
-        const renderer = new Renderer();
+        const renderer = new marked.Renderer();
         renderer.code = (code, language) => {
@@ -13,2 +14,4 @@ let highlighted = code;
             }
+
+            highlighted = this.escape(code);
             return `<pre class="line-numbers"><code class="language-${language}">${highlighted}</code></pre>`;
@@ -28,9 +31,9 @@ };
 
-        renderer.image = function(href, title, text) {
-          var out = '<img src="' + href + '" alt="' + text + '" class="img-responsive"';
-          if (title) {
-            out += ' title="' + title + '"';
-          }
-          out += this.options.xhtml ? '/>' : '>';
-          return out;
+        renderer.image = function (href, title, text) {
+            var out = '<img src="' + href + '" alt="' + text + '" class="img-responsive"';
+            if (title) {
+                out += ' title="' + title + '"';
+            }
+            out += this.options.xhtml ? '/>' : '>';
+            return out;
         };
@@ -40,18 +43,18 @@
             renderer: renderer,
-            breaks: true
+            breaks: false
         });
     }
-    get(filepath:string) {
-        return new Promise(function(resolve, reject) {
-           fs.readFile(path.resolve(process.cwd() + path.sep + filepath), 'utf8', (err, data) => {
-               if (err) {
-                   reject('Error during ' + filepath + ' read');
-               } else {
-                   resolve(marked(data));
-               }
-           });
+    get(filepath: string) {
+        return new Promise(function (resolve, reject) {
+            fs.readFile(path.resolve(process.cwd() + path.sep + filepath), 'utf8', (err, data) => {
+                if (err) {
+                    reject('Error during ' + filepath + ' read');
+                } else {
+                    resolve(marked(data));
+                }
+            });
         });
     }
     getReadmeFile() {
-        return new Promise(function(resolve, reject) {
+        return new Promise(function (resolve, reject) {
             fs.readFile(path.resolve(process.cwd() + '/README.md'), 'utf8', (err, data) => {
@@ -84,2 +87,12 @@ if (err) {
     }
+
+    private escape(html) {
+        return html
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;')
+            .replace(/@/g, '&#40;');
+    }
 };

src/app/engines/search.engine.ts

@@ -59,2 +59,3 @@ import * as path from 'path';
                        });
+                   outputFolder = outputFolder.replace(process.cwd(), '');
                    fs.outputFile(path.resolve(process.cwd() + path.sep + outputFolder + path.sep + '/js/search/search_index.js'), result, function (err) {
@@ -64,4 +65,5 @@ if(err) {
                            reject(err);
+                       } else {
+                           resolve();
                        }
-                       resolve();
                    });
@@ -68,0 +70,0 @@ }

src/index-cli.ts

@@ -9,5 +9,9 @@ import * as fs from 'fs-extra';
 import { logger } from './logger';
+import { readConfig, handlePath } from './utils/utils';
 
 let pkg = require('../package.json'),
     program = require('commander'),
+    glob = require('glob'),
+    os = require('os'),
+    osName = require('os-name'),
     files = [],
@@ -148,2 +152,6 @@ cwd = process.cwd();
             console.log('');
+            console.log(`Node.js version : ${process.version}`);
+            console.log('');
+            console.log(`Operating system : ${osName(os.platform(), os.release())}`);
+            console.log('');
         }
@@ -180,3 +188,22 @@
                         var excludeTest = _.find(exclude, function(o) {
-                            return path.basename(o) === file;
+                            let globFiles = glob.sync(o, {
+                                cwd: cwd
+                            });
+                            if (globFiles.length > 0) {
+                                let fileNameForGlobSearch = path.join(dir, file).replace(cwd + path.sep, ''),
+                                    resultGlobSearch = globFiles.findIndex((element) => {
+                                        return element === fileNameForGlobSearch;
+                                    }),
+                                    test = resultGlobSearch !== -1;
+                                if (test) {
+                                    logger.warn('Excluding', path.join(dir, file));
+                                }
+                                return test;
+                            } else {
+                                let test = path.basename(o) === file;
+                                if (test) {
+                                    logger.warn('Excluding', path.join(dir, file));
+                                }
+                                return test;
+                            }
                         });
@@ -190,3 +217,3 @@ if (typeof excludeTest === 'undefined' && dir.indexOf('node_modules') < 0) {
                             else if (/(spec|\.d)\.ts/.test(file)) {
-                                logger.debug('Ignoring', file);
+                                logger.warn('Ignoring', file);
                             }
@@ -205,19 +232,21 @@ else if (path.extname(file) === '.ts') {
                 if (!fs.existsSync(program.tsconfig)) {
-                    logger.error('"tsconfig.json" file was not found in the current directory');
+                    logger.error(`"${program.tsconfig}" file was not found in the current directory`);
                     process.exit(1);
                 } else {
                     let _file = path.join(
-                      path.join(process.cwd(), path.dirname(this.configuration.mainData.tsconfig)),
-                      path.basename(this.configuration.mainData.tsconfig)
+                        path.join(process.cwd(), path.dirname(this.configuration.mainData.tsconfig)),
+                        path.basename(this.configuration.mainData.tsconfig)
                     );
+                    // use the current directory of tsconfig.json as a working directory
+                    cwd = _file.split(path.sep).slice(0, -1).join(path.sep);
                     logger.info('Using tsconfig', _file);
 
-                    files = require(_file).files;
+                    let tsConfigFile = readConfig(_file);
+                    files = tsConfigFile.files;
+                    if (files) {
+                        files = handlePath(files, cwd);
+                    }
 
-                    // use the current directory of tsconfig.json as a working directory
-                    cwd = _file.split(path.sep).slice(0, -1).join(path.sep);
-
                     if (!files) {
-                        let exclude = require(_file).exclude || [];
-
+                        let exclude = tsConfigFile.exclude || [];
                         files = walk(cwd || '.', exclude);
@@ -233,3 +262,3 @@ }
                 if (!fs.existsSync(program.tsconfig)) {
-                    logger.error('"tsconfig.json" file was not found in the current directory');
+                    logger.error(`"${program.tsconfig}" file was not found in the current directory`);
                     process.exit(1);
@@ -241,11 +270,14 @@ } else {
                     );
+                    // use the current directory of tsconfig.json as a working directory
+                    cwd = _file.split(path.sep).slice(0, -1).join(path.sep);
                     logger.info('Using tsconfig', _file);
 
-                    files = require(_file).files;
+                    let tsConfigFile = readConfig(_file);
+                    files = tsConfigFile.files;
+                    if (files) {
+                        files = handlePath(files, cwd);
+                    }
 
-                    // use the current directory of tsconfig.json as a working directory
-                    cwd = _file.split(path.sep).slice(0, -1).join(path.sep);
-
                     if (!files) {
-                        let exclude = require(_file).exclude || [];
+                        let exclude = tsConfigFile.exclude || [];
 
@@ -252,0 +284,0 @@ files = walk(cwd || '.', exclude);

src/logger.ts

@@ -8,3 +8,4 @@ let gutil = require('gulp-util')
 	DEBUG,
-    ERROR
+    ERROR,
+    WARN
 }
@@ -40,2 +41,9 @@
 
+    warn(...args) {
+		if(!this.silent) return;
+		this.logger(
+			this.format(LEVEL.WARN, ...args)
+		);
+	}
+
 	debug(...args) {
@@ -69,2 +77,6 @@ if(!this.silent) return;
 
+            case LEVEL.WARN:
+				msg = c.yellow(msg);
+				break;
+
 			case LEVEL.ERROR:
@@ -71,0 +83,0 @@ msg = c.red(msg);

src/utilities.ts

@@ -37,3 +37,3 @@ import * as ts from 'typescript';
 
-        if (n < 0 || !Number.isFinite(n)) {
+        if (n < 0) {
             throw new TypeError(`Expected \`count\` to be a positive finite number, got \`${n}\``);
@@ -40,0 +40,0 @@ }

src/utils/router.parser.ts

@@ -358,2 +358,3 @@ import * as _ from 'lodash';
                            });
+                       outputFolder = outputFolder.replace(process.cwd(), '');
                        fs.outputFile(path.resolve(process.cwd() + path.sep + outputFolder + path.sep + '/js/routes/routes_index.js'), result, function (err) {
@@ -363,4 +364,5 @@ if(err) {
                                reject(err);
+                           } else {
+                               resolve();
                            }
-                           resolve();
                        });
@@ -367,0 +369,0 @@ }

tools/tests-angularexpo.js

@@ -14,5 +14,5 @@ const process = require('process'),
     }, {
-        name: 'angular2-image-gallery', maintainer: 'BenjaminBrandmeier', tsconfig_path: './src/'
+        name: 'angular2-image-gallery', maintainer: 'BenjaminBrandmeier', tsconfig_path: './src/', tsconfig_file: 'tsconfig.app.json'
     }, {
-        name: 'pinterest', maintainer: 'aviabird', tsconfig_path: './src/'
+        name: 'pinterest', maintainer: 'aviabird', tsconfig_path: './src/', tsconfig_file: 'tsconfig.app.json'
     }, {
@@ -130,3 +130,5 @@ name: 'Movies-Finder', maintainer: 'Lazhari', tsconfig_path: './src/'
         return new Promise(function(resolve, reject) {
-            exec('compodoc -p ' + repo.tsconfig_path + 'tsconfig.json', {
+            var tsconfig = '';
+            if (repo.tsconfig_file) { tsconfig = repo.tsconfig_file; }
+            exec('compodoc -p ' + repo.tsconfig_path + tsconfig, {
                 cwd: TEST_FOLDER + '/' + repo.name
@@ -133,0 +135,0 @@ }, (error, stdout, stderr) => {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

7730405

increased by1.03%

Number of package files

225

increased by3.69%

Lines of code

40266

increased by2.18%

Number of lines in readme file

70

increased by22.81%

Number of low supply chain risk alerts

13

decreased by-38.1%

Worsened metrics

Dependency count

18

increased by5.88%

Dev dependency count

25

increased by4.17%

Dependency changes

• + Addedos-name@^2.0.1

• + Addedfs-extra@3.0.1(transitive)

• + Addedjsonfile@3.0.1(transitive)

• + Addedmacos-release@1.1.0(transitive)

• + Addedos-name@2.0.1(transitive)

• + Addedsemver@5.7.2(transitive)

• + Addedtypescript@2.3.2(transitive)

• + Addeduniversalify@0.1.2(transitive)

• + Addedwin-release@1.1.1(transitive)

• - Removedfs-extra@2.1.2(transitive)

• - Removedjsonfile@2.4.0(transitive)

• - Removedtypescript@2.2.2(transitive)

• Updatedchokidar@^1.7.0

• Updatedfs-extra@^3.0.1

• Updatedhandlebars@^4.0.8

• Updatedhtml-entities@^1.2.1

• Updatedtypescript@2.3.2