diff --git a/examples/basic/src/export-declaration.ts b/examples/basic/src/export-declaration.ts new file mode 100644 index 0000000000..058bc33c5e --- /dev/null +++ b/examples/basic/src/export-declaration.ts @@ -0,0 +1,26 @@ +// This file contains some export declarations that appear before the +// symbols they export. This is done on purpose to ensure that typedoc +// does not choke on such order, which is legal as far as TS is +// concerned. +export { funcFromMod, someVarFromMod as someVarFromModRenamed, SomeClassFromMod, + SomeInterfaceFromMod as SomeInterfaceFromModRenamed } from "./mod"; +export * from "./mod2"; + +export { exportedLocalFunction, exportedLocalFunction2 } + +function exportedLocalFunction(): boolean { return true; } + +function exportedLocalFunction2(): boolean { return true; } + +export { exportedLocalFunction3 as renamedExportedLocalFunction3, + exportedLocalFunction4 as renamedExportedLocalFunction4 } + +function exportedLocalFunction3(a: string, b: number): void {} +function exportedLocalFunction4(c: number, d: string): void {} + +const notExportedVar = 1; +export const exportedVar1 = notExportedVar; + +export const exportedVar2 = 1; + +export default function defaultSymbol() {} diff --git a/examples/basic/src/mod.ts b/examples/basic/src/mod.ts new file mode 100644 index 0000000000..50b06033ae --- /dev/null +++ b/examples/basic/src/mod.ts @@ -0,0 +1,13 @@ +export function funcFromMod(a: number): void { + a++; +} + +export const someVarFromMod: string = "some value"; + +export class SomeClassFromMod { + property: number = 1; +} + +export interface SomeInterfaceFromMod { + foo: number; +} diff --git a/examples/basic/src/mod2.ts b/examples/basic/src/mod2.ts new file mode 100644 index 0000000000..b30b294eb4 --- /dev/null +++ b/examples/basic/src/mod2.ts @@ -0,0 +1,15 @@ +export function funcFromMod2(a: number): void { + a++; +} + +export const someVarFromMod2: string = "some value"; + +export class SomeClassFromMod2 { + property: number = 1; +} + +export interface SomeInterfaceFromMod2 { + foo: number; +} + +export { funcFromMod as funcFromModRenamedInMod2 } from "./mod"; diff --git a/gruntfile.js b/gruntfile.js index f282220bbe..51f1348363 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -90,7 +90,7 @@ module.exports = function(grunt) src: 'dist/test', options: { mask: '*.js', - timeout: 10000 + timeout: 15000 } } } diff --git a/package-lock.json b/package-lock.json index 0875d896e4..10b5a07b9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.1.tgz", "integrity": "sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw==", "requires": { - "@types/node": "9.4.7" + "@types/node": "*" } }, "@types/glob": { @@ -22,9 +22,9 @@ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz", "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==", "requires": { - "@types/events": "1.2.0", - "@types/minimatch": "3.0.3", - "@types/node": "9.4.7" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/handlebars": { @@ -74,8 +74,8 @@ "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.7.8.tgz", "integrity": "sha512-M2giRw93PxKS7YjU6GZjtdV9HASdB7TWqizBXe4Ju7AqbKlWvTr0gNO92XH56D/gMxqD/jNHLNfC5hA34yGqrQ==", "requires": { - "@types/glob": "5.0.35", - "@types/node": "9.4.7" + "@types/glob": "*", + "@types/node": "*" } }, "abbrev": { @@ -89,9 +89,9 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -117,8 +117,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "argparse": { @@ -127,7 +127,7 @@ "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { @@ -136,7 +136,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -180,9 +180,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "balanced-match": { @@ -203,15 +203,15 @@ "dev": true, "requires": { "bytes": "2.2.0", - "content-type": "1.0.4", - "debug": "2.2.0", - "depd": "1.1.1", - "http-errors": "1.3.1", + "content-type": "~1.0.1", + "debug": "~2.2.0", + "depd": "~1.1.0", + "http-errors": "~1.3.1", "iconv-lite": "0.4.13", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "5.2.0", - "raw-body": "2.1.7", - "type-is": "1.6.15" + "raw-body": "~2.1.5", + "type-is": "~1.6.10" }, "dependencies": { "iconv-lite": { @@ -233,7 +233,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -243,9 +243,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "browser-stdout": { @@ -278,8 +278,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" }, "dependencies": { "camelcase": { @@ -296,8 +296,8 @@ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -306,11 +306,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chokidar": { @@ -319,15 +319,15 @@ "integrity": "sha1-ChwLzh4kmTr8EFpbgeom3aAeI68=", "dev": true, "requires": { - "anymatch": "1.3.2", - "arrify": "1.0.1", - "async-each": "0.1.6", - "fsevents": "0.3.8", - "glob-parent": "1.3.0", - "is-binary-path": "1.0.1", - "is-glob": "1.1.3", - "path-is-absolute": "1.0.1", - "readdirp": "1.4.0" + "anymatch": "^1.1.0", + "arrify": "^1.0.0", + "async-each": "^0.1.5", + "fsevents": "^0.3.8", + "glob-parent": "^1.0.0", + "is-binary-path": "^1.0.0", + "is-glob": "^1.1.3", + "path-is-absolute": "^1.0.0", + "readdirp": "^1.3.0" } }, "cliui": { @@ -336,8 +336,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -361,7 +361,7 @@ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "^1.1.1" } }, "color-name": { @@ -405,10 +405,10 @@ "integrity": "sha1-drEJRoMlbponCf1cY+7ya/R6FEI=", "dev": true, "requires": { - "es6-promise": "2.3.0", - "lodash": "3.10.1", - "semver": "5.4.1", - "xml2js": "0.4.19" + "es6-promise": "^2.0.1", + "lodash": "^3.3.1", + "semver": "^5.0.1", + "xml2js": "^0.4.5" }, "dependencies": { "es6-promise": { @@ -431,7 +431,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "dateformat": { @@ -440,8 +440,8 @@ "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", "dev": true, "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" + "get-stdin": "^4.0.1", + "meow": "^3.3.0" } }, "debug": { @@ -488,7 +488,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es6-promise": { @@ -509,11 +509,11 @@ "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "dev": true, "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" }, "dependencies": { "source-map": { @@ -523,7 +523,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -564,7 +564,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -573,7 +573,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "extglob": { @@ -582,7 +582,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "fast-levenshtein": { @@ -597,7 +597,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, "file-sync-cmp": { @@ -618,11 +618,11 @@ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "find-up": { @@ -631,8 +631,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "findup-sync": { @@ -641,7 +641,7 @@ "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=", "dev": true, "requires": { - "glob": "5.0.15" + "glob": "~5.0.0" }, "dependencies": { "glob": { @@ -650,11 +650,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -671,7 +671,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "fs-extra": { @@ -679,9 +679,9 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -696,7 +696,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.7.0" + "nan": "^2.0.2" } }, "gaze": { @@ -705,7 +705,7 @@ "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", "dev": true, "requires": { - "globule": "1.2.0" + "globule": "^1.0.0" } }, "get-stdin": { @@ -725,12 +725,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -739,8 +739,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -749,7 +749,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-glob": { @@ -758,7 +758,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -769,7 +769,7 @@ "integrity": "sha1-lx7dgW7V21hwW1gHlkemTQrveWg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" }, "dependencies": { "is-glob": { @@ -778,7 +778,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -789,9 +789,9 @@ "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", "dev": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.5", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.4", + "minimatch": "~3.0.2" } }, "graceful-fs": { @@ -811,22 +811,22 @@ "integrity": "sha1-TmpeaVtwRy/VME9fqeNCNoNqc7w=", "dev": true, "requires": { - "coffeescript": "1.10.0", - "dateformat": "1.0.12", - "eventemitter2": "0.4.14", - "exit": "0.1.2", - "findup-sync": "0.3.0", - "glob": "7.0.6", - "grunt-cli": "1.2.0", - "grunt-known-options": "1.1.0", - "grunt-legacy-log": "1.0.1", - "grunt-legacy-util": "1.0.0", - "iconv-lite": "0.4.19", - "js-yaml": "3.5.5", - "minimatch": "3.0.4", - "nopt": "3.0.6", - "path-is-absolute": "1.0.1", - "rimraf": "2.2.8" + "coffeescript": "~1.10.0", + "dateformat": "~1.0.12", + "eventemitter2": "~0.4.13", + "exit": "~0.1.1", + "findup-sync": "~0.3.0", + "glob": "~7.0.0", + "grunt-cli": "~1.2.0", + "grunt-known-options": "~1.1.0", + "grunt-legacy-log": "~1.0.0", + "grunt-legacy-util": "~1.0.0", + "iconv-lite": "~0.4.13", + "js-yaml": "~3.5.2", + "minimatch": "~3.0.2", + "nopt": "~3.0.6", + "path-is-absolute": "~1.0.0", + "rimraf": "~2.2.8" }, "dependencies": { "glob": { @@ -835,12 +835,12 @@ "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -851,10 +851,10 @@ "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=", "dev": true, "requires": { - "findup-sync": "0.3.0", - "grunt-known-options": "1.1.0", - "nopt": "3.0.6", - "resolve": "1.1.7" + "findup-sync": "~0.3.0", + "grunt-known-options": "~1.1.0", + "nopt": "~3.0.6", + "resolve": "~1.1.0" }, "dependencies": { "resolve": { @@ -871,8 +871,8 @@ "integrity": "sha1-Vkq/LQN4qYOhW54/MO51tzjEBjg=", "dev": true, "requires": { - "async": "1.5.2", - "rimraf": "2.6.2" + "async": "^1.5.2", + "rimraf": "^2.5.1" }, "dependencies": { "rimraf": { @@ -881,7 +881,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } } } @@ -892,8 +892,8 @@ "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=", "dev": true, "requires": { - "chalk": "1.1.3", - "file-sync-cmp": "0.1.1" + "chalk": "^1.1.1", + "file-sync-cmp": "^0.1.0" } }, "grunt-contrib-watch": { @@ -902,10 +902,10 @@ "integrity": "sha1-hKGnodar0m7VaEE0lscxM+mQAY8=", "dev": true, "requires": { - "async": "1.5.2", - "gaze": "1.1.2", - "lodash": "3.10.1", - "tiny-lr": "0.2.1" + "async": "^1.5.0", + "gaze": "^1.0.0", + "lodash": "^3.10.1", + "tiny-lr": "^0.2.1" }, "dependencies": { "lodash": { @@ -928,11 +928,11 @@ "integrity": "sha512-rwuyqNKlI0IPz0DvxzJjcEiQEBaBNVeb1LFoZKxSmHLETFUwhwUrqOsPIxURTKSwNZHZ4ht1YLBYmVU0YZAzHQ==", "dev": true, "requires": { - "colors": "1.1.2", - "grunt-legacy-log-utils": "1.0.0", - "hooker": "0.2.3", - "lodash": "4.17.5", - "underscore.string": "3.3.4" + "colors": "~1.1.2", + "grunt-legacy-log-utils": "~1.0.0", + "hooker": "~0.2.3", + "lodash": "~4.17.5", + "underscore.string": "~3.3.4" } }, "grunt-legacy-log-utils": { @@ -941,8 +941,8 @@ "integrity": "sha1-p7ji0Ps1taUPSvmG/BEnSevJbz0=", "dev": true, "requires": { - "chalk": "1.1.3", - "lodash": "4.3.0" + "chalk": "~1.1.1", + "lodash": "~4.3.0" }, "dependencies": { "lodash": { @@ -959,13 +959,13 @@ "integrity": "sha1-OGqnjcbtUJhsKxiVcmWxtIq7m4Y=", "dev": true, "requires": { - "async": "1.5.2", - "exit": "0.1.2", - "getobject": "0.1.0", - "hooker": "0.2.3", - "lodash": "4.3.0", - "underscore.string": "3.2.3", - "which": "1.2.14" + "async": "~1.5.2", + "exit": "~0.1.1", + "getobject": "~0.1.0", + "hooker": "~0.2.3", + "lodash": "~4.3.0", + "underscore.string": "~3.2.3", + "which": "~1.2.1" }, "dependencies": { "lodash": { @@ -994,8 +994,8 @@ "integrity": "sha1-YzoDvHhIKg4OH5339kWBH8H7sWI=", "dev": true, "requires": { - "async": "2.5.0", - "chalk": "1.1.3" + "async": "^2.0.0", + "chalk": "^1.0.0" }, "dependencies": { "async": { @@ -1004,7 +1004,7 @@ "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", "dev": true, "requires": { - "lodash": "4.17.5" + "lodash": "^4.14.0" } } } @@ -1015,14 +1015,14 @@ "integrity": "sha1-lXIBxrQhx3cilATwcILY5pnRIZk=", "dev": true, "requires": { - "chokidar": "1.0.6", + "chokidar": "~1.0.0", "csproj2ts": "0.0.7", - "es6-promise": "0.1.2", + "es6-promise": "~0.1.1", "lodash": "2.4.1", "ncp": "0.5.1", "rimraf": "2.2.6", - "semver": "5.4.1", - "strip-bom": "2.0.0", + "semver": "^5.1.0", + "strip-bom": "^2.0.0", "typescript": "1.8.9", "underscore": "1.5.1", "underscore.string": "2.3.3" @@ -1065,10 +1065,10 @@ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" } }, "has-ansi": { @@ -1077,7 +1077,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -1115,8 +1115,8 @@ "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", "dev": true, "requires": { - "inherits": "2.0.3", - "statuses": "1.4.0" + "inherits": "~2.0.1", + "statuses": "1" } }, "http-parser-js": { @@ -1137,7 +1137,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "inflight": { @@ -1145,8 +1145,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -1171,7 +1171,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -1185,7 +1185,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-dotfile": { @@ -1200,7 +1200,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -1221,7 +1221,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -1236,7 +1236,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-posix-bracket": { @@ -1284,20 +1284,20 @@ "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", "dev": true, "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.5.5", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.2.14", - "wordwrap": "1.0.0" + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" }, "dependencies": { "abbrev": { @@ -1312,11 +1312,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "resolve": { @@ -1331,7 +1331,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } }, "wordwrap": { @@ -1354,8 +1354,8 @@ "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "2.7.3" + "argparse": "^1.0.2", + "esprima": "^2.6.0" } }, "jsonfile": { @@ -1363,7 +1363,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "kind-of": { @@ -1371,7 +1371,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -1386,8 +1386,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "livereload-js": { @@ -1402,11 +1402,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "lodash": { @@ -1425,8 +1425,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lru-cache": { @@ -1458,16 +1458,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "minimist": { @@ -1484,19 +1484,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" }, "dependencies": { "is-glob": { @@ -1505,7 +1505,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -1522,7 +1522,7 @@ "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "dev": true, "requires": { - "mime-db": "1.30.0" + "mime-db": "~1.30.0" } }, "minimatch": { @@ -1530,7 +1530,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1606,7 +1606,7 @@ "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } @@ -1642,7 +1642,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { @@ -1651,10 +1651,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -1663,7 +1663,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "number-is-nan": { @@ -1684,8 +1684,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "on-finished": { @@ -1702,7 +1702,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -1710,8 +1710,8 @@ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "optionator": { @@ -1720,12 +1720,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -1742,10 +1742,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-glob": { @@ -1754,7 +1754,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -1765,7 +1765,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "parseurl": { @@ -1780,7 +1780,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -1799,9 +1799,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -1822,7 +1822,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "prelude-ls": { @@ -1854,8 +1854,8 @@ "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -1864,7 +1864,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1873,7 +1873,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1884,7 +1884,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1920,9 +1920,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -1931,8 +1931,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "readable-stream": { @@ -1941,10 +1941,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" }, "dependencies": { "isarray": { @@ -1961,9 +1961,9 @@ "integrity": "sha1-xd5vyz3sgFI8HHARPxoZDYr4LIk=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "0.2.14", - "readable-stream": "1.0.34" + "graceful-fs": "~4.1.2", + "minimatch": "~0.2.12", + "readable-stream": "~1.0.26-2" }, "dependencies": { "minimatch": { @@ -1972,8 +1972,8 @@ "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", "dev": true, "requires": { - "lru-cache": "2.7.3", - "sigmund": "1.0.1" + "lru-cache": "2", + "sigmund": "~1.0.0" } } } @@ -1983,7 +1983,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "requires": { - "resolve": "1.5.0" + "resolve": "^1.1.6" } }, "redent": { @@ -1992,8 +1992,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "regex-cache": { @@ -2002,7 +2002,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { @@ -2028,7 +2028,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "resolve": { @@ -2036,7 +2036,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } }, "right-align": { @@ -2045,7 +2045,7 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -2071,9 +2071,9 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz", "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==", "requires": { - "glob": "7.1.2", - "interpret": "1.1.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "sigmund": { @@ -2093,7 +2093,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "spdx-correct": { @@ -2102,8 +2102,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -2118,8 +2118,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -2152,7 +2152,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -2161,7 +2161,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-indent": { @@ -2170,7 +2170,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "supports-color": { @@ -2185,12 +2185,12 @@ "integrity": "sha1-s/26gC5dVqM8L28QeUsy5Hescp0=", "dev": true, "requires": { - "body-parser": "1.14.2", - "debug": "2.2.0", - "faye-websocket": "0.10.0", - "livereload-js": "2.2.2", - "parseurl": "1.3.2", - "qs": "5.1.0" + "body-parser": "~1.14.0", + "debug": "~2.2.0", + "faye-websocket": "~0.10.0", + "livereload-js": "^2.2.0", + "parseurl": "~1.3.0", + "qs": "~5.1.0" } }, "trim-newlines": { @@ -2211,18 +2211,18 @@ "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "builtin-modules": "1.1.1", - "chalk": "2.3.0", - "commander": "2.13.0", - "diff": "3.3.1", - "glob": "7.1.2", - "js-yaml": "3.10.0", - "minimatch": "3.0.4", - "resolve": "1.5.0", - "semver": "5.4.1", - "tslib": "1.9.0", - "tsutils": "2.19.1" + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.12.1" }, "dependencies": { "ansi-styles": { @@ -2231,7 +2231,7 @@ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -2240,9 +2240,9 @@ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "ansi-styles": "^3.1.0", + "escape-string-regexp": "^1.0.5", + "supports-color": "^4.0.0" } }, "commander": { @@ -2269,8 +2269,8 @@ "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "supports-color": { @@ -2279,7 +2279,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } @@ -2290,7 +2290,7 @@ "integrity": "sha512-1B3z4H4HddgzWptqLzwrJloDEsyBt8DvZhnFO14k7A4RsQL/UhEfQjD4hpcY5NpF3veBkjJhQJ8Bl7Xp96cN+A==", "dev": true, "requires": { - "tslib": "1.9.0" + "tslib": "^1.8.1" } }, "type-check": { @@ -2299,7 +2299,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-is": { @@ -2309,13 +2309,1689 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.17" + "mime-types": "~2.1.15" } }, "typedoc-default-themes": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz", - "integrity": "sha1-bcJDPnjti+qOiHo6zeLzF4W9Yic=" + "version": "file:../typedoc-default-themes", + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "align-text": { + "version": "0.1.4", + "bundled": true, + "requires": { + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true + }, + "anymatch": { + "version": "1.3.2", + "bundled": true, + "requires": { + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" + } + }, + "argparse": { + "version": "1.0.10", + "bundled": true, + "requires": { + "sprintf-js": "~1.0.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "bundled": true + } + } + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "requires": { + "arr-flatten": "^1.0.1" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true + }, + "array-find-index": { + "version": "1.0.2", + "bundled": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true + }, + "async": { + "version": "1.5.2", + "bundled": true + }, + "async-each": { + "version": "0.1.6", + "bundled": true + }, + "autoprefixer-core": { + "version": "5.2.1", + "bundled": true, + "requires": { + "browserslist": "~0.4.0", + "caniuse-db": "^1.0.30000214", + "num2fraction": "^1.1.0", + "postcss": "~4.1.12" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "binary-extensions": { + "version": "1.11.0", + "bundled": true + }, + "body-parser": { + "version": "1.14.2", + "bundled": true, + "requires": { + "bytes": "2.2.0", + "content-type": "~1.0.1", + "debug": "~2.2.0", + "depd": "~1.1.0", + "http-errors": "~1.3.1", + "iconv-lite": "0.4.13", + "on-finished": "~2.3.0", + "qs": "5.2.0", + "raw-body": "~2.1.5", + "type-is": "~1.6.10" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.13", + "bundled": true + }, + "qs": { + "version": "5.2.0", + "bundled": true + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "requires": { + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" + } + }, + "browserify-zlib": { + "version": "0.1.4", + "bundled": true, + "requires": { + "pako": "~0.2.0" + } + }, + "browserslist": { + "version": "0.4.0", + "bundled": true, + "requires": { + "caniuse-db": "^1.0.30000153" + } + }, + "buffer-from": { + "version": "1.0.0", + "bundled": true + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true + }, + "bytes": { + "version": "2.2.0", + "bundled": true + }, + "camelcase": { + "version": "2.1.1", + "bundled": true + }, + "camelcase-keys": { + "version": "2.1.0", + "bundled": true, + "requires": { + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" + } + }, + "caniuse-db": { + "version": "1.0.30000819", + "bundled": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, + "requires": { + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" + } + }, + "chalk": { + "version": "1.1.3", + "bundled": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "chokidar": { + "version": "1.0.6", + "bundled": true, + "requires": { + "anymatch": "^1.1.0", + "arrify": "^1.0.0", + "async-each": "^0.1.5", + "glob-parent": "^1.0.0", + "is-binary-path": "^1.0.0", + "is-glob": "^1.1.3", + "path-is-absolute": "^1.0.0", + "readdirp": "^1.3.0" + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "requires": { + "center-align": "^0.1.1", + "right-align": "^0.1.1", + "wordwrap": "0.0.2" + } + }, + "coffeescript": { + "version": "1.10.0", + "bundled": true + }, + "colors": { + "version": "1.1.2", + "bundled": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "concat-stream": { + "version": "1.6.2", + "bundled": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "content-type": { + "version": "1.0.4", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "csproj2ts": { + "version": "0.0.7", + "bundled": true, + "requires": { + "es6-promise": "^2.0.1", + "lodash": "^3.3.1", + "semver": "^5.0.1", + "xml2js": "^0.4.5" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "bundled": true + } + } + }, + "currently-unhandled": { + "version": "0.4.1", + "bundled": true, + "requires": { + "array-find-index": "^1.0.1" + } + }, + "dargs": { + "version": "4.1.0", + "bundled": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "dateformat": { + "version": "1.0.12", + "bundled": true, + "requires": { + "get-stdin": "^4.0.1", + "meow": "^3.3.0" + } + }, + "debug": { + "version": "2.2.0", + "bundled": true, + "requires": { + "ms": "0.7.1" + } + }, + "decamelize": { + "version": "1.2.0", + "bundled": true + }, + "define-properties": { + "version": "1.1.2", + "bundled": true, + "requires": { + "foreach": "^2.0.5", + "object-keys": "^1.0.8" + } + }, + "depd": { + "version": "1.1.2", + "bundled": true + }, + "diff": { + "version": "1.3.2", + "bundled": true + }, + "ee-first": { + "version": "1.1.1", + "bundled": true + }, + "error-ex": { + "version": "1.3.1", + "bundled": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es6-promise": { + "version": "2.3.0", + "bundled": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true + }, + "esprima": { + "version": "2.7.3", + "bundled": true + }, + "eventemitter2": { + "version": "0.4.14", + "bundled": true + }, + "exit": { + "version": "0.1.2", + "bundled": true + }, + "expand-brackets": { + "version": "0.1.5", + "bundled": true, + "requires": { + "is-posix-bracket": "^0.1.0" + } + }, + "expand-range": { + "version": "1.8.2", + "bundled": true, + "requires": { + "fill-range": "^2.1.0" + } + }, + "extglob": { + "version": "0.3.2", + "bundled": true, + "requires": { + "is-extglob": "^1.0.0" + } + }, + "faye-websocket": { + "version": "0.10.0", + "bundled": true, + "requires": { + "websocket-driver": ">=0.5.1" + } + }, + "figures": { + "version": "1.7.0", + "bundled": true, + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + }, + "file-sync-cmp": { + "version": "0.1.1", + "bundled": true + }, + "filename-regex": { + "version": "2.0.1", + "bundled": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, + "requires": { + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" + } + }, + "find-up": { + "version": "1.1.2", + "bundled": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "findup-sync": { + "version": "0.3.0", + "bundled": true, + "requires": { + "glob": "~5.0.0" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "bundled": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "requires": { + "for-in": "^1.0.1" + } + }, + "foreach": { + "version": "2.0.5", + "bundled": true + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "function-bind": { + "version": "1.1.1", + "bundled": true + }, + "gaze": { + "version": "1.1.2", + "bundled": true, + "requires": { + "globule": "^1.0.0" + } + }, + "get-stdin": { + "version": "4.0.1", + "bundled": true + }, + "getobject": { + "version": "0.1.0", + "bundled": true + }, + "glob": { + "version": "7.0.6", + "bundled": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-base": { + "version": "0.3.0", + "bundled": true, + "requires": { + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "requires": { + "is-glob": "^2.0.0" + } + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "glob-parent": { + "version": "1.3.0", + "bundled": true, + "requires": { + "is-glob": "^2.0.0" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "bundled": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "globule": { + "version": "1.2.0", + "bundled": true, + "requires": { + "glob": "~7.1.1", + "lodash": "~4.17.4", + "minimatch": "~3.0.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "grunt": { + "version": "1.0.2", + "bundled": true, + "requires": { + "coffeescript": "~1.10.0", + "dateformat": "~1.0.12", + "eventemitter2": "~0.4.13", + "exit": "~0.1.1", + "findup-sync": "~0.3.0", + "glob": "~7.0.0", + "grunt-cli": "~1.2.0", + "grunt-known-options": "~1.1.0", + "grunt-legacy-log": "~1.0.0", + "grunt-legacy-util": "~1.0.0", + "iconv-lite": "~0.4.13", + "js-yaml": "~3.5.2", + "minimatch": "~3.0.2", + "nopt": "~3.0.6", + "path-is-absolute": "~1.0.0", + "rimraf": "~2.2.8" + }, + "dependencies": { + "rimraf": { + "version": "2.2.8", + "bundled": true + } + } + }, + "grunt-autoprefixer": { + "version": "3.0.4", + "bundled": true, + "requires": { + "autoprefixer-core": "^5.1.7", + "chalk": "~1.0.0", + "diff": "~1.3.0", + "postcss": "^4.1.11" + }, + "dependencies": { + "ansi-regex": { + "version": "1.1.1", + "bundled": true + }, + "chalk": { + "version": "1.0.0", + "bundled": true, + "requires": { + "ansi-styles": "^2.0.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^1.0.3", + "strip-ansi": "^2.0.1", + "supports-color": "^1.3.0" + } + }, + "has-ansi": { + "version": "1.0.3", + "bundled": true, + "requires": { + "ansi-regex": "^1.1.0", + "get-stdin": "^4.0.1" + } + }, + "strip-ansi": { + "version": "2.0.1", + "bundled": true, + "requires": { + "ansi-regex": "^1.0.0" + } + }, + "supports-color": { + "version": "1.3.1", + "bundled": true + } + } + }, + "grunt-cli": { + "version": "1.2.0", + "bundled": true, + "requires": { + "findup-sync": "~0.3.0", + "grunt-known-options": "~1.1.0", + "nopt": "~3.0.6", + "resolve": "~1.1.0" + } + }, + "grunt-contrib-copy": { + "version": "1.0.0", + "bundled": true, + "requires": { + "chalk": "^1.1.1", + "file-sync-cmp": "^0.1.0" + } + }, + "grunt-contrib-sass": { + "version": "1.0.0", + "bundled": true, + "requires": { + "async": "^0.9.0", + "chalk": "^1.0.0", + "cross-spawn": "^0.2.3", + "dargs": "^4.0.0", + "which": "^1.0.5" + }, + "dependencies": { + "async": { + "version": "0.9.2", + "bundled": true + }, + "cross-spawn": { + "version": "0.2.9", + "bundled": true, + "requires": { + "lru-cache": "^2.5.0" + } + } + } + }, + "grunt-contrib-uglify": { + "version": "2.3.0", + "bundled": true, + "requires": { + "chalk": "^1.0.0", + "maxmin": "^1.1.0", + "object.assign": "^4.0.4", + "uglify-js": "~2.8.21", + "uri-path": "^1.0.0" + } + }, + "grunt-contrib-watch": { + "version": "1.0.0", + "bundled": true, + "requires": { + "async": "^1.5.0", + "gaze": "^1.0.0", + "lodash": "^3.10.1", + "tiny-lr": "^0.2.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "bundled": true + } + } + }, + "grunt-known-options": { + "version": "1.1.0", + "bundled": true + }, + "grunt-legacy-log": { + "version": "1.0.1", + "bundled": true, + "requires": { + "colors": "~1.1.2", + "grunt-legacy-log-utils": "~1.0.0", + "hooker": "~0.2.3", + "lodash": "~4.17.5", + "underscore.string": "~3.3.4" + } + }, + "grunt-legacy-log-utils": { + "version": "1.0.0", + "bundled": true, + "requires": { + "chalk": "~1.1.1", + "lodash": "~4.3.0" + }, + "dependencies": { + "lodash": { + "version": "4.3.0", + "bundled": true + } + } + }, + "grunt-legacy-util": { + "version": "1.0.0", + "bundled": true, + "requires": { + "async": "~1.5.2", + "exit": "~0.1.1", + "getobject": "~0.1.0", + "hooker": "~0.2.3", + "lodash": "~4.3.0", + "underscore.string": "~3.2.3", + "which": "~1.2.1" + }, + "dependencies": { + "lodash": { + "version": "4.3.0", + "bundled": true + }, + "underscore.string": { + "version": "3.2.3", + "bundled": true + } + } + }, + "grunt-string-replace": { + "version": "1.3.1", + "bundled": true, + "requires": { + "async": "^2.0.0", + "chalk": "^1.0.0" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "bundled": true, + "requires": { + "lodash": "^4.14.0" + } + } + } + }, + "grunt-ts": { + "version": "5.5.1", + "bundled": true, + "requires": { + "chokidar": "~1.0.0", + "csproj2ts": "0.0.7", + "es6-promise": "~0.1.1", + "lodash": "2.4.1", + "ncp": "0.5.1", + "rimraf": "2.2.6", + "semver": "^5.1.0", + "strip-bom": "^2.0.0", + "typescript": "1.8.9", + "underscore": "1.5.1", + "underscore.string": "2.3.3" + }, + "dependencies": { + "es6-promise": { + "version": "0.1.2", + "bundled": true + }, + "lodash": { + "version": "2.4.1", + "bundled": true + }, + "rimraf": { + "version": "2.2.6", + "bundled": true + }, + "typescript": { + "version": "1.8.9", + "bundled": true + }, + "underscore.string": { + "version": "2.3.3", + "bundled": true + } + } + }, + "gzip-size": { + "version": "1.0.0", + "bundled": true, + "requires": { + "browserify-zlib": "^0.1.4", + "concat-stream": "^1.4.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "bundled": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "has-symbols": { + "version": "1.0.0", + "bundled": true + }, + "hooker": { + "version": "0.2.3", + "bundled": true + }, + "hosted-git-info": { + "version": "2.6.0", + "bundled": true + }, + "http-errors": { + "version": "1.3.1", + "bundled": true, + "requires": { + "inherits": "~2.0.1", + "statuses": "1" + } + }, + "http-parser-js": { + "version": "0.4.11", + "bundled": true + }, + "iconv-lite": { + "version": "0.4.19", + "bundled": true + }, + "indent-string": { + "version": "2.1.0", + "bundled": true, + "requires": { + "repeating": "^2.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "is-arrayish": { + "version": "0.2.1", + "bundled": true + }, + "is-binary-path": { + "version": "1.0.1", + "bundled": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-buffer": { + "version": "1.1.6", + "bundled": true + }, + "is-builtin-module": { + "version": "1.0.0", + "bundled": true, + "requires": { + "builtin-modules": "^1.0.0" + } + }, + "is-dotfile": { + "version": "1.0.3", + "bundled": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, + "requires": { + "is-primitive": "^2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "bundled": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true + }, + "is-finite": { + "version": "1.0.2", + "bundled": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-glob": { + "version": "1.1.3", + "bundled": true + }, + "is-number": { + "version": "2.1.0", + "bundled": true, + "requires": { + "kind-of": "^3.0.2" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true + }, + "is-primitive": { + "version": "2.0.0", + "bundled": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, + "requires": { + "isarray": "1.0.0" + } + }, + "js-base64": { + "version": "2.1.9", + "bundled": true + }, + "js-yaml": { + "version": "3.5.5", + "bundled": true, + "requires": { + "argparse": "^1.0.2", + "esprima": "^2.6.0" + } + }, + "kind-of": { + "version": "3.2.2", + "bundled": true, + "requires": { + "is-buffer": "^1.1.5" + } + }, + "lazy-cache": { + "version": "1.0.4", + "bundled": true + }, + "livereload-js": { + "version": "2.3.0", + "bundled": true + }, + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + } + }, + "lodash": { + "version": "4.17.5", + "bundled": true + }, + "longest": { + "version": "1.0.1", + "bundled": true + }, + "loud-rejection": { + "version": "1.6.0", + "bundled": true, + "requires": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + } + }, + "lru-cache": { + "version": "2.7.3", + "bundled": true + }, + "map-obj": { + "version": "1.0.1", + "bundled": true + }, + "maxmin": { + "version": "1.1.0", + "bundled": true, + "requires": { + "chalk": "^1.0.0", + "figures": "^1.0.1", + "gzip-size": "^1.0.0", + "pretty-bytes": "^1.0.0" + } + }, + "media-typer": { + "version": "0.3.0", + "bundled": true + }, + "meow": { + "version": "3.7.0", + "bundled": true, + "requires": { + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" + } + }, + "micromatch": { + "version": "2.3.11", + "bundled": true, + "requires": { + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "bundled": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "mime-db": { + "version": "1.33.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.18", + "bundled": true, + "requires": { + "mime-db": "~1.33.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.0", + "bundled": true + }, + "ms": { + "version": "0.7.1", + "bundled": true + }, + "nan": { + "version": "2.10.0", + "bundled": true + }, + "ncp": { + "version": "0.5.1", + "bundled": true + }, + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "bundled": true, + "requires": { + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "bundled": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "num2fraction": { + "version": "1.2.2", + "bundled": true + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "object-keys": { + "version": "1.0.11", + "bundled": true + }, + "object.assign": { + "version": "4.1.0", + "bundled": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "requires": { + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" + } + }, + "on-finished": { + "version": "2.3.0", + "bundled": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1" + } + }, + "pako": { + "version": "0.2.9", + "bundled": true + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, + "requires": { + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "bundled": true, + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "parse-json": { + "version": "2.2.0", + "bundled": true, + "requires": { + "error-ex": "^1.2.0" + } + }, + "parseurl": { + "version": "1.3.2", + "bundled": true + }, + "path-exists": { + "version": "2.1.0", + "bundled": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "path-type": { + "version": "1.1.0", + "bundled": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "bundled": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true + }, + "pinkie-promise": { + "version": "2.0.1", + "bundled": true, + "requires": { + "pinkie": "^2.0.0" + } + }, + "postcss": { + "version": "4.1.16", + "bundled": true, + "requires": { + "es6-promise": "~2.3.0", + "js-base64": "~2.1.8", + "source-map": "~0.4.2" + } + }, + "preserve": { + "version": "0.2.0", + "bundled": true + }, + "pretty-bytes": { + "version": "1.0.4", + "bundled": true, + "requires": { + "get-stdin": "^4.0.1", + "meow": "^3.1.0" + } + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "qs": { + "version": "5.1.0", + "bundled": true + }, + "randomatic": { + "version": "1.1.7", + "bundled": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "raw-body": { + "version": "2.1.7", + "bundled": true, + "requires": { + "bytes": "2.4.0", + "iconv-lite": "0.4.13", + "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "2.4.0", + "bundled": true + }, + "iconv-lite": { + "version": "0.4.13", + "bundled": true + } + } + }, + "read-pkg": { + "version": "1.1.0", + "bundled": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "bundled": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + } + }, + "readable-stream": { + "version": "2.3.5", + "bundled": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" + } + }, + "readdirp": { + "version": "1.4.0", + "bundled": true, + "requires": { + "graceful-fs": "~4.1.2", + "minimatch": "~0.2.12", + "readable-stream": "~1.0.26-2" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "bundled": true + }, + "minimatch": { + "version": "0.2.14", + "bundled": true, + "requires": { + "lru-cache": "2", + "sigmund": "~1.0.0" + } + }, + "readable-stream": { + "version": "1.0.34", + "bundled": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "bundled": true + } + } + }, + "redent": { + "version": "1.0.0", + "bundled": true, + "requires": { + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" + } + }, + "regex-cache": { + "version": "0.4.4", + "bundled": true, + "requires": { + "is-equal-shallow": "^0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true + }, + "repeat-element": { + "version": "1.1.2", + "bundled": true + }, + "repeat-string": { + "version": "1.6.1", + "bundled": true + }, + "repeating": { + "version": "2.0.1", + "bundled": true, + "requires": { + "is-finite": "^1.0.0" + } + }, + "resolve": { + "version": "1.1.7", + "bundled": true + }, + "right-align": { + "version": "0.1.3", + "bundled": true, + "requires": { + "align-text": "^0.1.1" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "requires": { + "glob": "^7.0.5" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "sax": { + "version": "1.2.4", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "sigmund": { + "version": "1.0.1", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "source-map": { + "version": "0.4.4", + "bundled": true, + "requires": { + "amdefine": ">=0.0.4" + } + }, + "spdx-correct": { + "version": "3.0.0", + "bundled": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.1.0", + "bundled": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", + "bundled": true + }, + "sprintf-js": { + "version": "1.1.1", + "bundled": true + }, + "statuses": { + "version": "1.4.0", + "bundled": true + }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "bundled": true, + "requires": { + "is-utf8": "^0.2.0" + } + }, + "strip-indent": { + "version": "1.0.1", + "bundled": true, + "requires": { + "get-stdin": "^4.0.1" + } + }, + "supports-color": { + "version": "2.0.0", + "bundled": true + }, + "tiny-lr": { + "version": "0.2.1", + "bundled": true, + "requires": { + "body-parser": "~1.14.0", + "debug": "~2.2.0", + "faye-websocket": "~0.10.0", + "livereload-js": "^2.2.0", + "parseurl": "~1.3.0", + "qs": "~5.1.0" + } + }, + "trim-newlines": { + "version": "1.0.0", + "bundled": true + }, + "type-is": { + "version": "1.6.16", + "bundled": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.18" + } + }, + "typedarray": { + "version": "0.0.6", + "bundled": true + }, + "typescript": { + "version": "2.3.2", + "bundled": true + }, + "uglify-js": { + "version": "2.8.29", + "bundled": true, + "requires": { + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "bundled": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "underscore": { + "version": "1.5.1", + "bundled": true + }, + "underscore.string": { + "version": "3.3.4", + "bundled": true, + "requires": { + "sprintf-js": "^1.0.3", + "util-deprecate": "^1.0.2" + } + }, + "unpipe": { + "version": "1.0.0", + "bundled": true + }, + "uri-path": { + "version": "1.0.0", + "bundled": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "validate-npm-package-license": { + "version": "3.0.3", + "bundled": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "websocket-driver": { + "version": "0.7.0", + "bundled": true, + "requires": { + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" + } + }, + "websocket-extensions": { + "version": "0.1.3", + "bundled": true + }, + "which": { + "version": "1.2.14", + "bundled": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "window-size": { + "version": "0.1.0", + "bundled": true + }, + "wordwrap": { + "version": "0.0.2", + "bundled": true + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "xml2js": { + "version": "0.4.19", + "bundled": true, + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + } + }, + "xmlbuilder": { + "version": "9.0.7", + "bundled": true + }, + "yargs": { + "version": "3.10.0", + "bundled": true, + "requires": { + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", + "window-size": "0.1.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "bundled": true + } + } + } + } }, "typescript": { "version": "2.7.2", @@ -2328,9 +4004,9 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "source-map": { @@ -2359,8 +4035,8 @@ "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=", "dev": true, "requires": { - "sprintf-js": "1.0.3", - "util-deprecate": "1.0.2" + "sprintf-js": "^1.0.3", + "util-deprecate": "^1.0.2" } }, "universalify": { @@ -2386,8 +4062,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "websocket-driver": { @@ -2396,8 +4072,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.9", - "websocket-extensions": "0.1.2" + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -2412,7 +4088,7 @@ "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "window-size": { @@ -2437,8 +4113,8 @@ "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "dev": true, "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.4" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { @@ -2453,9 +4129,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } diff --git a/package.json b/package.json index efd732e787..7284639aa5 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "minimatch": "^3.0.0", "progress": "^2.0.0", "shelljs": "^0.8.1", - "typedoc-default-themes": "^0.5.0", + "typedoc-default-themes": "file:../typedoc-default-themes", "typescript": "2.7.2" }, "devDependencies": { diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 6678c17763..dcf0313881 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -196,6 +196,23 @@ export class Context { } } + /** + * Get the reflection for a given symbol. + * + * @param symbol The symbol for which to get a reflection. + * + * @returns The reflection if it exists. + */ + getReflectionForSymbol(symbol: ts.Symbol): Reflection | undefined { + const { project } = this; + const id = project.symbolMapping[this.getSymbolID(symbol)]; + if (!id) { + return undefined; + } + + return project.reflections[id]; + } + /** * Trigger a node reflection event. * diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts index 6eb4ec296d..e9bbd5df8d 100644 --- a/src/lib/converter/converter.ts +++ b/src/lib/converter/converter.ts @@ -1,27 +1,16 @@ -import * as ts from 'typescript'; import * as _ts from '../ts-internal'; import * as _ from 'lodash'; +import * as ts from 'typescript'; import { Application } from '../application'; +import { ProjectReflection, Reflection, Type } from '../models/index'; +import { ChildableComponent, Component, ComponentClass, Option } from '../utils/component'; +import { normalizePath } from '../utils/fs'; import { ParameterType } from '../utils/options/declaration'; -import { Reflection, Type, ProjectReflection, DeclarationReflection, ContainerReflection } from '../models/index'; +import { ConverterComponent, ConverterNodeComponent, ConverterTypeComponent, TypeNodeConverter, TypeTypeConverter } from './components'; import { Context } from './context'; -import { ConverterComponent, ConverterNodeComponent, ConverterTypeComponent, TypeTypeConverter, TypeNodeConverter } from './components'; +import { convertExportDeclarationReflections } from './factories/index'; import { CompilerHost } from './utils/compiler-host'; -import { Component, Option, ChildableComponent, ComponentClass } from '../utils/component'; -import { normalizePath } from '../utils/fs'; - -function pruneNotExported(child) { - if ((child instanceof DeclarationReflection) && - !child.flags.isExported) { - const siblings = ( child.parent).children; - const index = siblings.indexOf(child); - siblings.splice(index, 1); - return; - } - - child.traverse(pruneNotExported); -} /** * Result structure of the [[Converter.convert]] method. @@ -290,8 +279,19 @@ export class Converter extends ChildableComponent context.scope; - if (!(container instanceof ContainerReflection)) { - throw new Error('Expected container reflection.'); - } - + const scope = context.scope; // Ensure we have a name for the reflection if (!name) { if (node.localSymbol) { @@ -45,10 +42,10 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect // Test whether the node is exported let isExported: boolean; - if (container.kindOf([ReflectionKind.Module, ReflectionKind.ExternalModule])) { + if (scope.kindOf([ReflectionKind.Module, ReflectionKind.ExternalModule])) { isExported = false; // Don't inherit exported state in modules and namespaces } else { - isExported = container.flags.isExported; + isExported = scope.flags.isExported; } let hasExport = false; @@ -75,7 +72,7 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect let isStatic = false; if (nonStaticKinds.indexOf(kind) === -1) { isStatic = !!(modifiers & ts.ModifierFlags.Static); - if (container.kind === ReflectionKind.Class) { + if (scope.kind === ReflectionKind.Class) { if (node.parent && node.parent.kind === ts.SyntaxKind.Constructor) { isConstructorProperty = true; } else if (!node.parent || node.parent.kind !== ts.SyntaxKind.ClassDeclaration) { @@ -86,16 +83,19 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect // Check if we already have a child with the same name and static flag let child: DeclarationReflection; - const children = container.children = container.children || []; - children.forEach((n: DeclarationReflection) => { - if (n.name === name && n.flags.isStatic === isStatic) { - child = n; - } - }); + let children: DeclarationReflection[]; + if (scope instanceof ContainerReflection) { + children = scope.children = scope.children || []; + children.forEach((n: DeclarationReflection) => { + if (n.name === name && n.flags.isStatic === isStatic) { + child = n; + } + }); + } if (!child) { // Child does not exist, create a new reflection - child = new DeclarationReflection(container, name, kind); + child = new DeclarationReflection(scope, name, kind); child.setFlag(ReflectionFlag.Static, isStatic); child.setFlag(ReflectionFlag.Private, isPrivate); child.setFlag(ReflectionFlag.ConstructorProperty, isConstructorProperty); @@ -103,10 +103,10 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect child.setFlag(ReflectionFlag.Export, hasExport); child = setupDeclaration(context, child, node); - if (child) { + if (children) { children.push(child); - context.registerReflection(child, node); } + context.registerReflection(child, node); } else { // Merge the existent reflection with the given node child = mergeDeclarations(context, child, node, kind); @@ -128,7 +128,7 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect * @param node The TypeScript node whose properties should be applies to the given reflection. * @returns The reflection populated with the values of the given node. */ -function setupDeclaration(context: Context, reflection: DeclarationReflection, node: ts.Node) { +function setupDeclaration(context: Context, reflection: DeclarationReflection, node: ts.Node): DeclarationReflection { const modifiers = ts.getCombinedModifierFlags(node); reflection.setFlag(ReflectionFlag.External, context.isExternal); @@ -186,3 +186,208 @@ function mergeDeclarations(context: Context, reflection: DeclarationReflection, return reflection; } + +/** + * Create a `DeclarationReflection` for a symbol that renames another symbol. + * + * @param contex The context for the new declaration. + * + * @param node The node for the new declaration. + * + * @param original The declartion for the symbol being rename. + * + * @param name The new name. + */ +function createRename(context: Context, node: ts.Node, original: Reflection, name: string): DeclarationReflection { + const { kind, id } = original; + const rename = createDeclaration(context, node, kind, name); + rename.renames = id; + rename.setFlag(ReflectionFlag.Export, true); + markAsExported(rename); + + return rename; +} + +/** + * @param node The node whose position we want. + * + * @returns A human-readable representation of the node's position. + */ +function nicePosition(node: ts.Node): string { + return `${node.getSourceFile().fileName}:${node.pos}`; +} + +class ExportDeclarationConverter { + /** + * This keeps track of modules we've already converted. Because of dependencies among modules, we may + * *try* to convert the same module more than once. + */ + private readonly converted: Set = new Set(); + + /** + * The `ExportDeclarationConverter` class implements the conversion of `ExportDeclarationReflection` objects to + * plain old `DeclarationReflection` objects. The conversion needs to traverse reflections in a particular way, + * which this class encapsulates. + * + * @param context The current conversion context. + */ + constructor(private readonly context: Context) {} + + /** + * Convert an `ExportDeclarationReflection` to one or more `DeclarationReflection`. + * + * @param reflection The reflection to convert. + */ + convertExportDeclarationReflection(reflection: ExportDeclarationReflection): void { + const { context } = this; + const node = reflection.exportDeclaration; + const { exportClause, moduleSpecifier } = node; + context.withScope(reflection.parent, () => { + if (moduleSpecifier) { + // Export declarations with "from ...". + // + // Example case: + // export ... from "some/module"; + + // We first need to convert the declarations for the module we depend on. This is necessary in cases where we have module A + // that exports a symbol which is reexported from B, and the symbol from B is reexported from C. The ExportDeclarationReflection + // in B must be processed befoe the one in C. + this.findAndConvertModule(moduleSpecifier); + + if (exportClause) { + // export { ... } from "some/module"; + for (const exportSpecifier of exportClause.elements) { + const symbol = context.checker.getAliasedSymbol(exportSpecifier.symbol); + for (const declaration of symbol.declarations) { + const reflection = context.getReflectionForSymbol(declaration.symbol); + if (!reflection) { + throw new Error(`cannot get reflection for symbol ${declaration.symbol.name} at ${nicePosition(declaration)}`); + } + + // We always create a rename. + createRename(context, exportSpecifier, reflection, exportSpecifier.name.text); + } + } + } else { + // export * from "some/module"; + const symbol = context.checker.getSymbolAtLocation(moduleSpecifier); + for (const xp of context.checker.getExportsOfModule(symbol)) { + for (const declaration of xp.declarations) { + let { symbol } = declaration; + let { name } = symbol; + + // If the symbol exported from "some/module" is a rename, then it is an alias and we need to follow the alias to the original symbol. + if ((symbol.flags & ts.SymbolFlags.Alias) === ts.SymbolFlags.Alias) { + symbol = context.checker.getAliasedSymbol(symbol); + } + + const reflection = context.getReflectionForSymbol(symbol); + if (!reflection) { + throw new Error(`cannot get reflection for symbol ${declaration.symbol.name} at ${nicePosition(declaration)}`); + } + + // We always create a rename. + createRename(context, node, reflection, name); + } + } + } + } else { + // Export declarations without "from ..." + for (const exportSpecifier of exportClause.elements) { + const symbol = context.getTypeAtLocation(exportSpecifier).symbol; + for (const declaration of symbol.declarations) { + const reflection = context.getReflectionForSymbol(declaration.symbol); + if (!reflection) { + throw new Error(`cannot get reflection for symbol ${declaration.symbol.name} at ${nicePosition(declaration)}`); + } + + if (exportSpecifier.propertyName) { + // If propertyName is present then the symbol is being renamed as it is exported. + // Example case: + // + // function foo {} + // export { foo as bar } + // + // We need to create a new declaration referring back to the original declaration. + // + createRename(context, exportSpecifier, reflection, exportSpecifier.name.text); + } else { + // + // Export without rename. + // + // Example case: + // function foo {} + // export { foo } + reflection.setFlag(ReflectionFlag.Export, true); + markAsExported(reflection); + } + } + } + } + }); + } + + /** + * Convert the `ExportDeclarationReflection` of a specific module, if we have not done it already. + * + * @param reflection The reflection for the module to convert. + */ + private convertModule(reflection: ContainerReflection): void { + // Don't waste time scanning the children of a module we've already converted. + if (this.converted.has(reflection)) { + return; + } + + const children = reflection.children; + for (let ix = 0; ix < children.length; ++ix) { + const child = children[ix]; + if (child instanceof ExportDeclarationReflection) { + // The converted children are automatically added to child.parent. + this.convertExportDeclarationReflection(child); + children.splice(ix, 1); + // We need to adjust the index to take into account the splicing. + ix--; + } + } + + this.converted.add(reflection); + } + + /** + * @param moduleSpecifier The string expression in the `from` clause an export declaration. + */ + private findAndConvertModule(moduleSpecifier: ts.Expression): void { + const symbol = this.context.checker.getSymbolAtLocation(moduleSpecifier); + const reflection = this.context.getReflectionForSymbol(symbol); + + if (!reflection) { + throw new Error(`could not find module with name ${symbol.name}`); + } + + // This reflection is necessarily a ContainerReflection. + this.convertModule(reflection as ContainerReflection); + } + + /** + * Convert a whole project. This is the starting point of conversion. + */ + convertProject(): void { + // We need to convert the ExportDeclaration declarations to their final form. To do this, we extract all reflections which *can* + // have export declarations among their children. These happen to be Module and ExternalModule reflections. We then scan their + // children for ExportDeclarationReflection and convert them. + const exportingReflections = this.context.project.getReflectionsByKind([ReflectionKind.Module, ReflectionKind.ExternalModule]) as ContainerReflection[]; + for (const reflection of exportingReflections) { + this.convertModule(reflection); + } + } +} + +/** + * Convert all `ExportDeclarationReflection` of a project to one or more `DeclarationReflection`. This function + * must be called after the tree of reflections for the whole project has been generated. + * + * @param contex The conversion context. + */ +export function convertExportDeclarationReflections(context: Context): void { + new ExportDeclarationConverter(context).convertProject(); +} diff --git a/src/lib/converter/factories/index.ts b/src/lib/converter/factories/index.ts index 8f5d9fe2c8..1096fdb535 100644 --- a/src/lib/converter/factories/index.ts +++ b/src/lib/converter/factories/index.ts @@ -1,5 +1,5 @@ export { createComment } from './comment'; -export { createDeclaration } from './declaration'; +export { createDeclaration, convertExportDeclarationReflections } from './declaration'; export { createParameter } from './parameter'; export { createReferenceType } from './reference'; export { createSignature } from './signature'; diff --git a/src/lib/converter/nodes/export.ts b/src/lib/converter/nodes/export.ts index a1a5cb9ac9..7f1b70a2ca 100644 --- a/src/lib/converter/nodes/export.ts +++ b/src/lib/converter/nodes/export.ts @@ -1,8 +1,8 @@ import * as ts from 'typescript'; -import { Reflection, ReflectionFlag, DeclarationReflection } from '../../models/index'; -import { Context } from '../context'; +import { DeclarationReflection, ExportDeclarationReflection, markAsExported, Reflection, ReflectionFlag } from '../../models/index'; import { Component, ConverterNodeComponent } from '../components'; +import { Context } from '../context'; @Component({name: 'node:export'}) export class ExportConverter extends ConverterNodeComponent { @@ -10,10 +10,19 @@ export class ExportConverter extends ConverterNodeComponent * List of supported TypeScript syntax kinds. */ supports: ts.SyntaxKind[] = [ - ts.SyntaxKind.ExportAssignment + ts.SyntaxKind.ExportAssignment, + ts.SyntaxKind.ExportDeclaration ]; - convert(context: Context, node: ts.ExportAssignment): Reflection { + convert(context: Context, node: ts.ExportAssignment | ts.ExportDeclaration): Reflection { + if (ts.isExportDeclaration(node)) { + return this.convertExportDeclaration(context, node); + } + + return this.convertExportAssignment(context, node); + } + + convertExportAssignment(context: Context, node: ts.ExportAssignment): Reflection { let symbol: ts.Symbol = undefined; // default export @@ -43,14 +52,16 @@ export class ExportConverter extends ConverterNodeComponent }); } - function markAsExported(reflection: Reflection) { - if (reflection instanceof DeclarationReflection) { - ( reflection).setFlag(ReflectionFlag.Exported, true); - } + return context.scope; + } - reflection.traverse(markAsExported); + convertExportDeclaration(context: Context, node: ts.ExportDeclaration): Reflection { + const scope = context.scope; + if (!(scope instanceof DeclarationReflection)) { + throw new Error('we expect to have for scope a module declaration'); } - return context.scope; + // We just create a reflection which will be finalized later. + return new ExportDeclarationReflection(scope, node); } } diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts index 2121ccce4f..8a7c58d257 100644 --- a/src/lib/models/reflections/abstract.ts +++ b/src/lib/models/reflections/abstract.ts @@ -57,6 +57,7 @@ export enum ReflectionKind { ObjectLiteral = 2097152, TypeAlias = 4194304, Event = 8388608, + ExportDeclaration = 16777216, ClassOrInterface = Class | Interface, VariableOrProperty = Variable | Property, @@ -312,20 +313,13 @@ export abstract class Reflection { this.kind = kind; } - /** - * @param kind The kind to test for. - */ - kindOf(kind: ReflectionKind): boolean; - - /** - * @param kind An array of kinds to test for. - */ - kindOf(kind: ReflectionKind[]): boolean; - /** * Test whether this reflection is of the given kind. + * + * @param kind A single kind or an array of kinds. When an array is used the function returns + * true if the reflection matches *any* of the kinds in the array. */ - kindOf(kind: any): boolean { + kindOf(kind: ReflectionKind | ReflectionKind[]): boolean { if (Array.isArray(kind)) { for (let i = 0, c = kind.length; i < c; i++) { if ((this.kind & kind[i]) !== 0) { diff --git a/src/lib/models/reflections/declaration.ts b/src/lib/models/reflections/declaration.ts index 41ae40c30f..0aa9c0c53c 100644 --- a/src/lib/models/reflections/declaration.ts +++ b/src/lib/models/reflections/declaration.ts @@ -1,5 +1,6 @@ -import { DefaultValueContainer, TypeContainer, TypeParameterContainer, TraverseCallback, TraverseProperty } from './abstract'; -import { Type, ReflectionType } from '../types/index'; +import { ReflectionType, Type } from '../types/index'; +import { DefaultValueContainer, Reflection, ReflectionFlag, TraverseCallback, TraverseProperty, TypeContainer, + TypeParameterContainer } from './abstract'; import { ContainerReflection } from './container'; import { SignatureReflection } from './signature'; import { TypeParameterReflection } from './type-parameter'; @@ -120,6 +121,12 @@ export class DeclarationReflection extends ContainerReflection implements Defaul */ typeHierarchy: DeclarationHierarchy; + /** + * The id of another declaration renamed by this one. This is used for export declarations. Eg: + * export { foo as bar } + */ + renames: number; + hasGetterOrSetter(): boolean { return !!this.getSignature || !!this.setSignature; } @@ -222,6 +229,10 @@ export class DeclarationReflection extends ContainerReflection implements Defaul result.implementationOf = this.implementationOf.toObject(); } + if (this.renames) { + result.renames = this.renames; + } + return result; } @@ -246,3 +257,11 @@ export class DeclarationReflection extends ContainerReflection implements Defaul return result; } } + +export function markAsExported(reflection: Reflection) { + if (reflection instanceof DeclarationReflection) { + ( reflection).setFlag(ReflectionFlag.Exported, true); + } + + reflection.traverse(markAsExported); +} diff --git a/src/lib/models/reflections/export-declaration.ts b/src/lib/models/reflections/export-declaration.ts new file mode 100644 index 0000000000..8ff3b0dfa0 --- /dev/null +++ b/src/lib/models/reflections/export-declaration.ts @@ -0,0 +1,37 @@ +import * as ts from 'typescript'; + +import { Reflection, ReflectionKind } from './abstract'; +import { ContainerReflection } from './container'; +import { DeclarationReflection } from './declaration'; + +/** + * A reflection that represents an export declaration. These are meant to be temporary during conversion and never sent out + * for rendering. + * + * **DO NOT DEFINE A SERIALIZER FOR THIS CLASS.** + */ +export class ExportDeclarationReflection extends DeclarationReflection { + /** The TS Node that holds the export declaration. */ + exportDeclaration: ts.ExportDeclaration; + + constructor(parent: Reflection, node: ts.ExportDeclaration) { + super(parent, undefined, ReflectionKind.ExportDeclaration); + this.exportDeclaration = node; + + const container = parent; + const children = container.children = container.children || []; + children.push(this); + } + + /** + * Throws an error. `ExportDeclarationReflection` objects are meant to be resolved into plain + * declarations during conversion. So trying to serialize an `ExportDeclarationReflection` indicates an + * object was misssed and an error. + * + * @deprecated Use serializers instead + */ + toObject(): any { + throw new Error('ExportDeclarationReflection are temporary objects that should not be used in rendering'); + } + +} diff --git a/src/lib/models/reflections/index.ts b/src/lib/models/reflections/index.ts index 856577dd29..27c876d0c8 100644 --- a/src/lib/models/reflections/index.ts +++ b/src/lib/models/reflections/index.ts @@ -1,6 +1,7 @@ export { Reflection, ReflectionKind, ReflectionFlag, TypeParameterContainer, Decorator, TraverseProperty } from './abstract'; export { ContainerReflection } from './container'; -export { DeclarationReflection, DeclarationHierarchy } from './declaration'; +export { DeclarationReflection, DeclarationHierarchy, markAsExported } from './declaration'; +export { ExportDeclarationReflection } from './export-declaration'; export { ParameterReflection } from './parameter'; export { ProjectReflection } from './project'; export { SignatureReflection } from './signature'; diff --git a/src/lib/models/reflections/project.ts b/src/lib/models/reflections/project.ts index 6d78815873..ef6dbf5204 100644 --- a/src/lib/models/reflections/project.ts +++ b/src/lib/models/reflections/project.ts @@ -1,6 +1,7 @@ import { SourceFile, SourceDirectory } from '../sources/index'; import { Reflection, ReflectionKind } from './abstract'; import { ContainerReflection } from './container'; +import { DeclarationReflection } from './declaration'; import { ReflectionCategory } from '../ReflectionCategory'; /** @@ -71,7 +72,7 @@ export class ProjectReflection extends ContainerReflection { * @param kind The desired kind of reflection. * @returns An array containing all reflections with the desired kind. */ - getReflectionsByKind(kind: ReflectionKind): Reflection[] { + getReflectionsByKind(kind: ReflectionKind | ReflectionKind[]): Reflection[] { const values: Reflection[] = []; for (let id in this.reflections) { const reflection = this.reflections[id]; @@ -83,6 +84,53 @@ export class ProjectReflection extends ContainerReflection { return values; } + /** + * Prune from the descendants of this project the `DeclarationReflection` objects that do not have the `Exported` flag set. + * This modifies the tree in-place. + */ + pruneNotExported(): void { + const project = this; + + function _pruneNotExported(child) { + if (!(child instanceof DeclarationReflection)) { + return; + } + + if (!child.flags.isExported) { + delete project.reflections[child.id]; + + const siblings = ( child.parent).children; + const index = siblings.indexOf(child); + siblings.splice(index, 1); + return; + } + + child.traverse(_pruneNotExported); + } + + this.traverse(_pruneNotExported); + } + + /** + * @returns The list of rename declarations that point to a symbol for which we don't have a reflection. + */ + getDanglingRenames(): string[] { + const dangling = new Set(); + const project = this; + function _getDanglingRenames(child) { + if (child instanceof DeclarationReflection && child.renames && !project.reflections[child.renames]) { + dangling.add(child.name); + delete child.renames; + } + + child.traverse(_getDanglingRenames); + } + + this.traverse(_getDanglingRenames); + + return Array.from(dangling); + } + /** * @param name The name to look for. Might contain a hierarchy. */ diff --git a/src/lib/serialization/serializers/reflections/declaration.ts b/src/lib/serialization/serializers/reflections/declaration.ts index 993f1c7d0d..87d5f5501c 100644 --- a/src/lib/serialization/serializers/reflections/declaration.ts +++ b/src/lib/serialization/serializers/reflections/declaration.ts @@ -53,6 +53,10 @@ export class DeclarationReflectionSerializer extends ReflectionSerializerCompone obj.implementationOf = this.owner.toObject(declaration.implementationOf); } + if (declaration.renames) { + obj.renames = declaration.renames; + } + return obj; } diff --git a/src/test/converter/class/specs-without-exported.json b/src/test/converter/class/specs-without-exported.json index 10d6c01b98..1915d2a84c 100644 --- a/src/test/converter/class/specs-without-exported.json +++ b/src/test/converter/class/specs-without-exported.json @@ -21,6 +21,7 @@ "kindString": "Class", "flags": { "isExported": true, + "hasExport": true, "isAbstract": true }, "children": [ @@ -114,7 +115,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "children": [ { @@ -220,7 +222,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "comment": { "shortText": "TestClass comment short text.", @@ -527,7 +530,8 @@ "kind": 128, "kindString": "Class", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "children": [ { @@ -973,4 +977,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/converter/export-declaration/export-declaration.ts b/src/test/converter/export-declaration/export-declaration.ts new file mode 100644 index 0000000000..058bc33c5e --- /dev/null +++ b/src/test/converter/export-declaration/export-declaration.ts @@ -0,0 +1,26 @@ +// This file contains some export declarations that appear before the +// symbols they export. This is done on purpose to ensure that typedoc +// does not choke on such order, which is legal as far as TS is +// concerned. +export { funcFromMod, someVarFromMod as someVarFromModRenamed, SomeClassFromMod, + SomeInterfaceFromMod as SomeInterfaceFromModRenamed } from "./mod"; +export * from "./mod2"; + +export { exportedLocalFunction, exportedLocalFunction2 } + +function exportedLocalFunction(): boolean { return true; } + +function exportedLocalFunction2(): boolean { return true; } + +export { exportedLocalFunction3 as renamedExportedLocalFunction3, + exportedLocalFunction4 as renamedExportedLocalFunction4 } + +function exportedLocalFunction3(a: string, b: number): void {} +function exportedLocalFunction4(c: number, d: string): void {} + +const notExportedVar = 1; +export const exportedVar1 = notExportedVar; + +export const exportedVar2 = 1; + +export default function defaultSymbol() {} diff --git a/src/test/converter/export-declaration/mod.ts b/src/test/converter/export-declaration/mod.ts new file mode 100644 index 0000000000..50b06033ae --- /dev/null +++ b/src/test/converter/export-declaration/mod.ts @@ -0,0 +1,13 @@ +export function funcFromMod(a: number): void { + a++; +} + +export const someVarFromMod: string = "some value"; + +export class SomeClassFromMod { + property: number = 1; +} + +export interface SomeInterfaceFromMod { + foo: number; +} diff --git a/src/test/converter/export-declaration/mod2.ts b/src/test/converter/export-declaration/mod2.ts new file mode 100644 index 0000000000..b30b294eb4 --- /dev/null +++ b/src/test/converter/export-declaration/mod2.ts @@ -0,0 +1,15 @@ +export function funcFromMod2(a: number): void { + a++; +} + +export const someVarFromMod2: string = "some value"; + +export class SomeClassFromMod2 { + property: number = 1; +} + +export interface SomeInterfaceFromMod2 { + foo: number; +} + +export { funcFromMod as funcFromModRenamedInMod2 } from "./mod"; diff --git a/src/test/converter/export-declaration/specs.json b/src/test/converter/export-declaration/specs.json new file mode 100644 index 0000000000..05fcc5f37a --- /dev/null +++ b/src/test/converter/export-declaration/specs.json @@ -0,0 +1,983 @@ +{ + "id": 0, + "name": "typedoc", + "kind": 0, + "flags": {}, + "children": [ + { + "id": 20, + "name": "\"export-declaration\"", + "kind": 1, + "kindString": "External module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/export-declaration/export-declaration.ts", + "children": [ + { + "id": 45, + "name": "SomeClassFromMod", + "kind": 128, + "kindString": "Class", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 5, + "character": 79 + } + ], + "renames": 2 + }, + { + "id": 49, + "name": "SomeClassFromMod2", + "kind": 128, + "kindString": "Class", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 76 + } + ], + "renames": 11 + }, + { + "id": 50, + "name": "SomeInterfaceFromMod2", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 76 + } + ], + "renames": 13 + }, + { + "id": 46, + "name": "SomeInterfaceFromModRenamed", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 60 + } + ], + "renames": 4 + }, + { + "id": 38, + "name": "exportedVar1", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true, + "isConst": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 22, + "character": 25 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": " notExportedVar" + }, + { + "id": 39, + "name": "exportedVar2", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true, + "isConst": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 24, + "character": 25 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 37, + "name": "notExportedVar", + "kind": 32, + "kindString": "Variable", + "flags": { + "isConst": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 21, + "character": 20 + } + ], + "type": { + "type": "unknown", + "name": "1" + }, + "defaultValue": "1" + }, + { + "id": 48, + "name": "someVarFromMod2", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 76 + } + ], + "renames": 18 + }, + { + "id": 44, + "name": "someVarFromModRenamed", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 5, + "character": 61 + } + ], + "renames": 9 + }, + { + "id": 40, + "name": "defaultSymbol", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "signatures": [ + { + "id": 41, + "name": "defaultSymbol", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 26, + "character": 37 + } + ] + }, + { + "id": 24, + "name": "exportedLocalFunction", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "signatures": [ + { + "id": 25, + "name": "exportedLocalFunction", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "boolean" + } + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 11, + "character": 30 + } + ] + }, + { + "id": 26, + "name": "exportedLocalFunction2", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "signatures": [ + { + "id": 27, + "name": "exportedLocalFunction2", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "boolean" + } + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 13, + "character": 31 + } + ] + }, + { + "id": 29, + "name": "exportedLocalFunction3", + "kind": 64, + "kindString": "Function", + "flags": {}, + "signatures": [ + { + "id": 30, + "name": "exportedLocalFunction3", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 31, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "string" + } + }, + { + "id": 32, + "name": "b", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 18, + "character": 31 + } + ] + }, + { + "id": 33, + "name": "exportedLocalFunction4", + "kind": 64, + "kindString": "Function", + "flags": {}, + "signatures": [ + { + "id": 34, + "name": "exportedLocalFunction4", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 35, + "name": "c", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } + }, + { + "id": 36, + "name": "d", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "string" + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 19, + "character": 31 + } + ] + }, + { + "id": 43, + "name": "funcFromMod", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 5, + "character": 20 + } + ], + "renames": 6 + }, + { + "id": 47, + "name": "funcFromMod2", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 76 + } + ], + "renames": 15 + }, + { + "id": 51, + "name": "funcFromModRenamedInMod2", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 6, + "character": 76 + } + ], + "renames": 6 + }, + { + "id": 52, + "name": "renamedExportedLocalFunction3", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 15, + "character": 64 + } + ], + "renames": 29 + }, + { + "id": 53, + "name": "renamedExportedLocalFunction4", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 16, + "character": 64 + } + ], + "renames": 33 + } + ], + "groups": [ + { + "title": "Classes", + "kind": 128, + "children": [ + 45, + 49 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 50, + 46 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 38, + 39, + 37, + 48, + 44 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 40, + 24, + 26, + 29, + 33, + 43, + 47, + 51, + 52, + 53 + ] + } + ], + "sources": [ + { + "fileName": "export-declaration.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 1, + "name": "\"mod\"", + "kind": 1, + "kindString": "External module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/export-declaration/mod.ts", + "children": [ + { + "id": 2, + "name": "SomeClassFromMod", + "kind": 128, + "kindString": "Class", + "flags": { + "isExported": true, + "hasExport": true + }, + "children": [ + { + "id": 3, + "name": "property", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mod.ts", + "line": 8, + "character": 12 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 3 + ] + } + ], + "sources": [ + { + "fileName": "mod.ts", + "line": 7, + "character": 29 + } + ] + }, + { + "id": 4, + "name": "SomeInterfaceFromMod", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true, + "hasExport": true + }, + "children": [ + { + "id": 5, + "name": "foo", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mod.ts", + "line": 12, + "character": 7 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 5 + ] + } + ], + "sources": [ + { + "fileName": "mod.ts", + "line": 11, + "character": 37 + } + ] + }, + { + "id": 9, + "name": "someVarFromMod", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true, + "isConst": true + }, + "sources": [ + { + "fileName": "mod.ts", + "line": 5, + "character": 27 + } + ], + "type": { + "type": "intrinsic", + "name": "string" + }, + "defaultValue": "\"some value\"" + }, + { + "id": 6, + "name": "funcFromMod", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "signatures": [ + { + "id": 7, + "name": "funcFromMod", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 8, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "mod.ts", + "line": 1, + "character": 27 + } + ] + } + ], + "groups": [ + { + "title": "Classes", + "kind": 128, + "children": [ + 2 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 4 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 9 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 6 + ] + } + ], + "sources": [ + { + "fileName": "mod.ts", + "line": 1, + "character": 0 + } + ] + }, + { + "id": 10, + "name": "\"mod2\"", + "kind": 1, + "kindString": "External module", + "flags": { + "isExported": true + }, + "originalName": "%BASE%/export-declaration/mod2.ts", + "children": [ + { + "id": 11, + "name": "SomeClassFromMod2", + "kind": 128, + "kindString": "Class", + "flags": { + "isExported": true, + "hasExport": true + }, + "children": [ + { + "id": 12, + "name": "property", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mod2.ts", + "line": 8, + "character": 12 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + }, + "defaultValue": "1" + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 12 + ] + } + ], + "sources": [ + { + "fileName": "mod2.ts", + "line": 7, + "character": 30 + } + ] + }, + { + "id": 13, + "name": "SomeInterfaceFromMod2", + "kind": 256, + "kindString": "Interface", + "flags": { + "isExported": true, + "hasExport": true + }, + "children": [ + { + "id": 14, + "name": "foo", + "kind": 1024, + "kindString": "Property", + "flags": { + "isExported": true + }, + "sources": [ + { + "fileName": "mod2.ts", + "line": 12, + "character": 7 + } + ], + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "groups": [ + { + "title": "Properties", + "kind": 1024, + "children": [ + 14 + ] + } + ], + "sources": [ + { + "fileName": "mod2.ts", + "line": 11, + "character": 38 + } + ] + }, + { + "id": 18, + "name": "someVarFromMod2", + "kind": 32, + "kindString": "Variable", + "flags": { + "isExported": true, + "hasExport": true, + "isConst": true + }, + "sources": [ + { + "fileName": "mod2.ts", + "line": 5, + "character": 28 + } + ], + "type": { + "type": "intrinsic", + "name": "string" + }, + "defaultValue": "\"some value\"" + }, + { + "id": 15, + "name": "funcFromMod2", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "signatures": [ + { + "id": 16, + "name": "funcFromMod2", + "kind": 4096, + "kindString": "Call signature", + "flags": {}, + "parameters": [ + { + "id": 17, + "name": "a", + "kind": 32768, + "kindString": "Parameter", + "flags": {}, + "type": { + "type": "intrinsic", + "name": "number" + } + } + ], + "type": { + "type": "intrinsic", + "name": "void" + } + } + ], + "sources": [ + { + "fileName": "mod2.ts", + "line": 1, + "character": 28 + } + ] + }, + { + "id": 42, + "name": "funcFromModRenamedInMod2", + "kind": 64, + "kindString": "Function", + "flags": { + "isExported": true, + "hasExport": true + }, + "sources": [ + { + "fileName": "mod2.ts", + "line": 15, + "character": 48 + } + ], + "renames": 6 + } + ], + "groups": [ + { + "title": "Classes", + "kind": 128, + "children": [ + 11 + ] + }, + { + "title": "Interfaces", + "kind": 256, + "children": [ + 13 + ] + }, + { + "title": "Variables", + "kind": 32, + "children": [ + 18 + ] + }, + { + "title": "Functions", + "kind": 64, + "children": [ + 15, + 42 + ] + } + ], + "sources": [ + { + "fileName": "mod2.ts", + "line": 1, + "character": 0 + } + ] + } + ], + "groups": [ + { + "title": "External modules", + "kind": 1, + "children": [ + 20, + 1, + 10 + ] + } + ] +} \ No newline at end of file diff --git a/src/test/converter/export-with-local/specs-without-exported.json b/src/test/converter/export-with-local/specs-without-exported.json index a6aa204fb4..6e597ca83d 100644 --- a/src/test/converter/export-with-local/specs-without-exported.json +++ b/src/test/converter/export-with-local/specs-without-exported.json @@ -21,6 +21,7 @@ "kindString": "Variable", "flags": { "isExported": true, + "hasExport": true, "isConst": true }, "sources": [ @@ -42,7 +43,8 @@ "kind": 64, "kindString": "Function", "flags": { - "isExported": true + "isExported": true, + "hasExport": true }, "signatures": [ { @@ -124,4 +126,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/test/renderer/specs/classes/_access_.privateclass.html b/src/test/renderer/specs/classes/_access_.privateclass.html index ff5ddbe6ff..e04abd6878 100644 --- a/src/test/renderer/specs/classes/_access_.privateclass.html +++ b/src/test/renderer/specs/classes/_access_.privateclass.html @@ -62,7 +62,7 @@ PrivateClass -

x Class PrivateClass

+

Export Class PrivateClass

@@ -209,6 +209,9 @@

Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -218,6 +221,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.baseclass.html b/src/test/renderer/specs/classes/_classes_.baseclass.html index 3a549f2326..bf303933da 100644 --- a/src/test/renderer/specs/classes/_classes_.baseclass.html +++ b/src/test/renderer/specs/classes/_classes_.baseclass.html @@ -62,7 +62,7 @@ BaseClass -

    x Class BaseClass

    +

    Export Class BaseClass

    @@ -499,6 +499,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -508,6 +511,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.genericclass.html b/src/test/renderer/specs/classes/_classes_.genericclass.html index 4f2091bd0a..45f8ec097f 100644 --- a/src/test/renderer/specs/classes/_classes_.genericclass.html +++ b/src/test/renderer/specs/classes/_classes_.genericclass.html @@ -62,7 +62,7 @@ GenericClass -

    x Class GenericClass<T>

    +

    Export Class GenericClass<T>

    @@ -340,6 +340,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -349,6 +352,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.internalclass.html b/src/test/renderer/specs/classes/_classes_.internalclass.html index f3f4e2ef1a..c9e6e69d8f 100644 --- a/src/test/renderer/specs/classes/_classes_.internalclass.html +++ b/src/test/renderer/specs/classes/_classes_.internalclass.html @@ -155,6 +155,9 @@

    Returns "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -164,6 +167,12 @@

    Returns "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.nongenericclass.html b/src/test/renderer/specs/classes/_classes_.nongenericclass.html index 6d4e3bdbba..bc69fa053a 100644 --- a/src/test/renderer/specs/classes/_classes_.nongenericclass.html +++ b/src/test/renderer/specs/classes/_classes_.nongenericclass.html @@ -62,7 +62,7 @@ NonGenericClass -

    x Class NonGenericClass

    +

    Export Class NonGenericClass

    @@ -318,6 +318,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -327,6 +330,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.subclassa.html b/src/test/renderer/specs/classes/_classes_.subclassa.html index fc5abf4c23..ddfa300837 100644 --- a/src/test/renderer/specs/classes/_classes_.subclassa.html +++ b/src/test/renderer/specs/classes/_classes_.subclassa.html @@ -62,7 +62,7 @@ SubClassA -

    x Class SubClassA

    +

    Export Class SubClassA

    @@ -638,6 +638,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -647,6 +650,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_classes_.subclassb.html b/src/test/renderer/specs/classes/_classes_.subclassb.html index 1f84fd9ec4..806a376b0f 100644 --- a/src/test/renderer/specs/classes/_classes_.subclassb.html +++ b/src/test/renderer/specs/classes/_classes_.subclassb.html @@ -62,7 +62,7 @@ SubClassB -

    x Class SubClassB

    +

    Export Class SubClassB

    @@ -473,6 +473,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -482,6 +485,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html b/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html index 78801c7ea5..abee8e1946 100644 --- a/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html +++ b/src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html @@ -62,7 +62,7 @@ DefaultExportedClass -

    x Class DefaultExportedClass

    +

    Export Class DefaultExportedClass

    @@ -198,6 +198,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -207,6 +210,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • @@ -247,6 +256,9 @@

    Returns string
      +
    • + ExportedClassName +
    • NotExportedClassName
      • diff --git a/src/test/renderer/specs/classes/_default_export_.exportedclassname.html b/src/test/renderer/specs/classes/_default_export_.exportedclassname.html new file mode 100644 index 0000000000..fa6418be63 --- /dev/null +++ b/src/test/renderer/specs/classes/_default_export_.exportedclassname.html @@ -0,0 +1,217 @@ + + + + + + ExportedClassName | typedoc + + + + + +
      +
      +
      +
      + +
      +
      + Options +
      +
      + All +
        +
      • Public
        • +
      • Public/Protected
        • +
      • All
        • +
      +
      + + + + + + +
      +
      + Menu +
      +
      +
      +
      +
      +
      + +

      Export Class ExportedClassName

      +
      +
      +
      +
      +
      +
      + Renames NotExportedClassName +
      +
      + + +
      +
      +
      +
      +
      +

      Legend

      +
      +
        +
      • Module
        • +
      • Object literal
        • +
      • Variable
        • +
      • Function
        • +
      • Function with type parameter
        • +
      • Index signature
        • +
      • Type alias
        • +
      • Type alias with type parameter
        • +
      +
        +
      • Enumeration
        • +
      • Enumeration member
        • +
      • Property
        • +
      • Method
        • +
      +
        +
      • Interface
        • +
      • Interface with type parameter
        • +
      • Constructor
        • +
      • Property
        • +
      • Method
        • +
      • Index signature
        • +
      +
        +
      • Class
        • +
      • Class with type parameter
        • +
      • Constructor
        • +
      • Property
        • +
      • Method
        • +
      • Accessor
        • +
      • Index signature
        • +
      +
        +
      • Inherited constructor
        • +
      • Inherited property
        • +
      • Inherited method
        • +
      • Inherited accessor
        • +
      +
        +
      • Protected property
        • +
      • Protected method
        • +
      • Protected accessor
        • +
      +
        +
      • Private property
        • +
      • Private method
        • +
      • Private accessor
        • +
      +
        +
      • Static property
        • +
      • Static method
        • +
      +
      +
      +
      +
      +

      Generated using TypeDoc

      +
      +
      + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html b/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html index 41981bac11..f855e9ee6a 100644 --- a/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html +++ b/src/test/renderer/specs/classes/_default_export_.notexportedclassname.html @@ -199,6 +199,9 @@

      Returns string "enumerations" +
    • + "export-declaration" +
    • "flattened"
      • @@ -208,6 +211,12 @@

      Returns string "generics" +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"
      • @@ -233,6 +242,9 @@

      Returns string DefaultExportedClass +
    • + ExportedClassName +

    -

    x Class SingleExportedClass

    +

    Export Class SingleExportedClass

    @@ -198,6 +198,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -207,6 +210,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_typescript_1_3_.classwithprotectedmembers.html b/src/test/renderer/specs/classes/_typescript_1_3_.classwithprotectedmembers.html index 6082d19404..2a3e267974 100644 --- a/src/test/renderer/specs/classes/_typescript_1_3_.classwithprotectedmembers.html +++ b/src/test/renderer/specs/classes/_typescript_1_3_.classwithprotectedmembers.html @@ -248,6 +248,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -257,6 +260,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_typescript_1_3_.subclasswithprotectedmembers.html b/src/test/renderer/specs/classes/_typescript_1_3_.subclasswithprotectedmembers.html index 4c37a05942..f9dd31a7a9 100644 --- a/src/test/renderer/specs/classes/_typescript_1_3_.subclasswithprotectedmembers.html +++ b/src/test/renderer/specs/classes/_typescript_1_3_.subclasswithprotectedmembers.html @@ -213,6 +213,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -222,6 +225,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/classes/_typescript_1_4_.simpleclass.html b/src/test/renderer/specs/classes/_typescript_1_4_.simpleclass.html index 5ff7c45ec7..c652adb7b8 100644 --- a/src/test/renderer/specs/classes/_typescript_1_4_.simpleclass.html +++ b/src/test/renderer/specs/classes/_typescript_1_4_.simpleclass.html @@ -167,6 +167,9 @@

    Returns any "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -176,6 +179,12 @@

    Returns any "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/enums/_enumerations_.directions.html b/src/test/renderer/specs/enums/_enumerations_.directions.html index 1456edada2..2db2608d03 100644 --- a/src/test/renderer/specs/enums/_enumerations_.directions.html +++ b/src/test/renderer/specs/enums/_enumerations_.directions.html @@ -62,7 +62,7 @@ Directions -

    x Enumeration Directions

    +

    Export Enumeration Directions

    @@ -206,6 +206,9 @@

    TopRight

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -215,6 +218,12 @@

    TopRight

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/enums/_enumerations_.size.html b/src/test/renderer/specs/enums/_enumerations_.size.html index 1556864944..70ceff0a3a 100644 --- a/src/test/renderer/specs/enums/_enumerations_.size.html +++ b/src/test/renderer/specs/enums/_enumerations_.size.html @@ -62,7 +62,7 @@ Size -

    x Enumeration Size

    +

    Export Enumeration Size

    @@ -225,6 +225,9 @@

    Returns boolean "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -234,6 +237,12 @@

    Returns boolean "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/globals.html b/src/test/renderer/specs/globals.html index 2d0aadb085..f510d7d8f9 100644 --- a/src/test/renderer/specs/globals.html +++ b/src/test/renderer/specs/globals.html @@ -74,9 +74,12 @@

    External modules

  • "classes"
  • "default-export"
  • "enumerations"
    • +
  • "export-declaration"
  • "flattened"
  • "functions"
  • "generics"
    • +
  • "mod"
    • +
  • "mod2"
  • "modules"
  • "single-export"
  • "typescript-1.3"
    • @@ -107,6 +110,9 @@

    External modules

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -116,6 +122,12 @@

    External modules

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/index.html b/src/test/renderer/specs/index.html index ffe4c9e625..07e3d9275c 100644 --- a/src/test/renderer/specs/index.html +++ b/src/test/renderer/specs/index.html @@ -215,6 +215,9 @@

    License

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -224,6 +227,12 @@

    License

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.inameinterface.html b/src/test/renderer/specs/interfaces/_classes_.inameinterface.html index de82efc5f9..7120f591f2 100644 --- a/src/test/renderer/specs/interfaces/_classes_.inameinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.inameinterface.html @@ -62,7 +62,7 @@ INameInterface -

    x Interface INameInterface

    +

    Export Interface INameInterface

    @@ -180,6 +180,9 @@

    Returns string "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -189,6 +192,12 @@

    Returns string "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html b/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html index 873a142a8b..54430861c0 100644 --- a/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.iprintinterface.html @@ -62,7 +62,7 @@ IPrintInterface -

    x Interface IPrintInterface

    +

    Export Interface IPrintInterface

    @@ -153,6 +153,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -162,6 +165,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html b/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html index a1369b16d1..3ad268f8f7 100644 --- a/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html +++ b/src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html @@ -62,7 +62,7 @@ IPrintNameInterface -

    x Interface IPrintNameInterface

    +

    Export Interface IPrintNameInterface

    @@ -237,6 +237,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -246,6 +249,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommod2.html b/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommod2.html new file mode 100644 index 0000000000..f10d5aa493 --- /dev/null +++ b/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommod2.html @@ -0,0 +1,265 @@ + + + + + + SomeInterfaceFromMod2 | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    Export Interface SomeInterfaceFromMod2

    +
    +
    +
    +
    +
    +
    + Renames SomeInterfaceFromMod2 +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommodrenamed.html b/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommodrenamed.html new file mode 100644 index 0000000000..b731826ba2 --- /dev/null +++ b/src/test/renderer/specs/interfaces/_export_declaration_.someinterfacefrommodrenamed.html @@ -0,0 +1,265 @@ + + + + + + SomeInterfaceFromModRenamed | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    Export Interface SomeInterfaceFromModRenamed

    +
    +
    +
    +
    +
    +
    + Renames SomeInterfaceFromMod +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/interfaces/_generics_.a.html b/src/test/renderer/specs/interfaces/_generics_.a.html index 65c5650a6d..07ba94875d 100644 --- a/src/test/renderer/specs/interfaces/_generics_.a.html +++ b/src/test/renderer/specs/interfaces/_generics_.a.html @@ -160,6 +160,9 @@

    Returns T<
  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -169,6 +172,12 @@

    Returns T<
  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_generics_.ab.html b/src/test/renderer/specs/interfaces/_generics_.ab.html index 336756883d..86557553e4 100644 --- a/src/test/renderer/specs/interfaces/_generics_.ab.html +++ b/src/test/renderer/specs/interfaces/_generics_.ab.html @@ -231,6 +231,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -240,6 +243,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_generics_.abnumber.html b/src/test/renderer/specs/interfaces/_generics_.abnumber.html index 5d84be9082..17b5459579 100644 --- a/src/test/renderer/specs/interfaces/_generics_.abnumber.html +++ b/src/test/renderer/specs/interfaces/_generics_.abnumber.html @@ -206,6 +206,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -215,6 +218,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_generics_.abstring.html b/src/test/renderer/specs/interfaces/_generics_.abstring.html index 1875102864..48384d1274 100644 --- a/src/test/renderer/specs/interfaces/_generics_.abstring.html +++ b/src/test/renderer/specs/interfaces/_generics_.abstring.html @@ -206,6 +206,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -215,6 +218,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_generics_.b.html b/src/test/renderer/specs/interfaces/_generics_.b.html index fdc507e523..a4ad109780 100644 --- a/src/test/renderer/specs/interfaces/_generics_.b.html +++ b/src/test/renderer/specs/interfaces/_generics_.b.html @@ -200,6 +200,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -209,6 +212,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/interfaces/_mod2_.someinterfacefrommod2.html b/src/test/renderer/specs/interfaces/_mod2_.someinterfacefrommod2.html new file mode 100644 index 0000000000..85b2486383 --- /dev/null +++ b/src/test/renderer/specs/interfaces/_mod2_.someinterfacefrommod2.html @@ -0,0 +1,261 @@ + + + + + + SomeInterfaceFromMod2 | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    Export Interface SomeInterfaceFromMod2

    +
    +
    +
    +
    +
    +
    +
    +

    Hierarchy

    +
      +
    • + SomeInterfaceFromMod2 +
      • +
    +
    +
    +

    Index

    +
    +
    +
    +

    Properties

    + +
    +
    +
    +
    +
    +

    Properties

    +
    + +

    foo

    +
    foo: number
    + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/interfaces/_mod_.someinterfacefrommod.html b/src/test/renderer/specs/interfaces/_mod_.someinterfacefrommod.html new file mode 100644 index 0000000000..4d1e50cd95 --- /dev/null +++ b/src/test/renderer/specs/interfaces/_mod_.someinterfacefrommod.html @@ -0,0 +1,258 @@ + + + + + + SomeInterfaceFromMod | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    Export Interface SomeInterfaceFromMod

    +
    +
    +
    +
    +
    +
    +
    +

    Hierarchy

    +
      +
    • + SomeInterfaceFromMod +
      • +
    +
    +
    +

    Index

    +
    +
    +
    +

    Properties

    + +
    +
    +
    +
    +
    +

    Properties

    +
    + +

    foo

    +
    foo: number
    + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/interfaces/_typescript_1_4_.runoptions.html b/src/test/renderer/specs/interfaces/_typescript_1_4_.runoptions.html index 2bed61877b..72ba41e61d 100644 --- a/src/test/renderer/specs/interfaces/_typescript_1_4_.runoptions.html +++ b/src/test/renderer/specs/interfaces/_typescript_1_4_.runoptions.html @@ -140,6 +140,9 @@

    program

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -149,6 +152,12 @@

    program

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_access_.html b/src/test/renderer/specs/modules/_access_.html index e37eae2804..185b9e8525 100644 --- a/src/test/renderer/specs/modules/_access_.html +++ b/src/test/renderer/specs/modules/_access_.html @@ -209,6 +209,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -218,6 +221,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_access_.privatemodule.html b/src/test/renderer/specs/modules/_access_.privatemodule.html index 7b8fcbefad..5fbc706df5 100644 --- a/src/test/renderer/specs/modules/_access_.privatemodule.html +++ b/src/test/renderer/specs/modules/_access_.privatemodule.html @@ -62,7 +62,7 @@ PrivateModule -

    x Module PrivateModule

    +

    Export Module PrivateModule

    @@ -134,6 +134,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -143,6 +146,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_classes_.html b/src/test/renderer/specs/modules/_classes_.html index 20039d26d0..9381f57022 100644 --- a/src/test/renderer/specs/modules/_classes_.html +++ b/src/test/renderer/specs/modules/_classes_.html @@ -119,6 +119,9 @@

    Interfaces

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -128,6 +131,12 @@

    Interfaces

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_default_export_.html b/src/test/renderer/specs/modules/_default_export_.html index ba972444f4..b6b47e3a6e 100644 --- a/src/test/renderer/specs/modules/_default_export_.html +++ b/src/test/renderer/specs/modules/_default_export_.html @@ -75,6 +75,8 @@

    Classes

    @@ -100,6 +102,9 @@

    Classes

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -109,6 +114,12 @@

    Classes

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • @@ -134,6 +145,9 @@

    Classes

  • DefaultExportedClass
    • +
  • + ExportedClassName +
  • NotExportedClassName
    • diff --git a/src/test/renderer/specs/modules/_enumerations_.html b/src/test/renderer/specs/modules/_enumerations_.html index e8ec3e971a..eb811b8957 100644 --- a/src/test/renderer/specs/modules/_enumerations_.html +++ b/src/test/renderer/specs/modules/_enumerations_.html @@ -101,6 +101,9 @@

    Enumerations

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -110,6 +113,12 @@

    Enumerations

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_export_declaration_.html b/src/test/renderer/specs/modules/_export_declaration_.html new file mode 100644 index 0000000000..811a6e913e --- /dev/null +++ b/src/test/renderer/specs/modules/_export_declaration_.html @@ -0,0 +1,493 @@ + + + + + + "export-declaration" | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    External module "export-declaration"

    +
    +
    +
    +
    +
    +
    +
    +

    Index

    +
    +
    +
    +

    Classes

    + +
    +
    +

    Interfaces

    + +
    +
    +

    Variables

    + +
    +
    +

    Functions

    + +
    +
    +
    +
    +
    +

    Variables

    +
    + +

    Export Const exportedVar1

    +
    exportedVar1: 1 = notExportedVar
    + +
    +
    + +

    Export Const exportedVar2

    +
    exportedVar2: 1 = 1
    + +
    +
    + +

    Const notExportedVar

    +
    notExportedVar: 1 = 1
    + +
    +
    + +

    Export someVarFromMod2

    + Renames someVarFromMod2 +
    +
    + +

    Export someVarFromModRenamed

    + Renames someVarFromMod +
    +
    +
    +

    Functions

    +
    + +

    Export defaultSymbol

    +
      +
    • defaultSymbol(): void
      • +
    +
      +
    • + +

      Returns void

      +
      • +
    +
    +
    + +

    Export exportedLocalFunction

    +
      +
    • exportedLocalFunction(): boolean
      • +
    +
      +
    • + +

      Returns boolean

      +
      • +
    +
    +
    + +

    Export exportedLocalFunction2

    +
      +
    • exportedLocalFunction2(): boolean
      • +
    +
      +
    • + +

      Returns boolean

      +
      • +
    +
    +
    + +

    exportedLocalFunction3

    +
      +
    • exportedLocalFunction3(a: string, b: number): void
      • +
    +
      +
    • + +

      Parameters

      +
        +
      • +
        a: string
        +
        • +
      • +
        b: number
        +
        • +
      +

      Returns void

      +
      • +
    +
    +
    + +

    exportedLocalFunction4

    +
      +
    • exportedLocalFunction4(c: number, d: string): void
      • +
    +
      +
    • + +

      Parameters

      +
        +
      • +
        c: number
        +
        • +
      • +
        d: string
        +
        • +
      +

      Returns void

      +
      • +
    +
    +
    + +

    Export funcFromMod

    + Renames funcFromMod +
    +
    + +

    Export funcFromMod2

    + Renames funcFromMod2 +
    +
    + +

    Export funcFromModRenamedInMod2

    + Renames funcFromMod +
    +
    + +

    Export renamedExportedLocalFunction3

    + Renames exportedLocalFunction3 +
    +
    + +

    Export renamedExportedLocalFunction4

    + Renames exportedLocalFunction4 +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/modules/_flattened_.html b/src/test/renderer/specs/modules/_flattened_.html index 9c303fff92..714318bba2 100644 --- a/src/test/renderer/specs/modules/_flattened_.html +++ b/src/test/renderer/specs/modules/_flattened_.html @@ -279,6 +279,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -288,6 +291,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_functions_.html b/src/test/renderer/specs/modules/_functions_.html index c53ef8ca35..49d93d6c2c 100644 --- a/src/test/renderer/specs/modules/_functions_.html +++ b/src/test/renderer/specs/modules/_functions_.html @@ -572,6 +572,9 @@

    Returns number "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -586,6 +589,12 @@

    Returns number "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_functions_.modulefunction.html b/src/test/renderer/specs/modules/_functions_.modulefunction.html index ffdfa02113..f04c502adf 100644 --- a/src/test/renderer/specs/modules/_functions_.modulefunction.html +++ b/src/test/renderer/specs/modules/_functions_.modulefunction.html @@ -62,7 +62,7 @@ moduleFunction -

    x Module moduleFunction

    +

    Export Module moduleFunction

    @@ -210,6 +210,9 @@

    Returns void "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -224,6 +227,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_generics_.html b/src/test/renderer/specs/modules/_generics_.html index 43a042aae3..2cba7c6394 100644 --- a/src/test/renderer/specs/modules/_generics_.html +++ b/src/test/renderer/specs/modules/_generics_.html @@ -176,6 +176,9 @@

    Returns T<
  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -185,6 +188,12 @@

    Returns T<
  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
    • diff --git a/src/test/renderer/specs/modules/_mod2_.html b/src/test/renderer/specs/modules/_mod2_.html new file mode 100644 index 0000000000..e38d1a558e --- /dev/null +++ b/src/test/renderer/specs/modules/_mod2_.html @@ -0,0 +1,296 @@ + + + + + + "mod2" | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    External module "mod2"

    +
    +
    +
    +
    +
    +
    +
    +

    Index

    +
    +
    +
    +

    Classes

    + +
    +
    +

    Interfaces

    + +
    +
    +

    Variables

    + +
    +
    +

    Functions

    + +
    +
    +
    +
    +
    +

    Variables

    +
    + +

    Export Const someVarFromMod2

    +
    someVarFromMod2: string = "some value"
    + +
    +
    +
    +

    Functions

    +
    + +

    Export funcFromMod2

    +
      +
    • funcFromMod2(a: number): void
      • +
    +
      +
    • + +

      Parameters

      +
        +
      • +
        a: number
        +
        • +
      +

      Returns void

      +
      • +
    +
    +
    + +

    Export funcFromModRenamedInMod2

    + Renames funcFromMod +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/modules/_mod_.html b/src/test/renderer/specs/modules/_mod_.html new file mode 100644 index 0000000000..a373821d66 --- /dev/null +++ b/src/test/renderer/specs/modules/_mod_.html @@ -0,0 +1,286 @@ + + + + + + "mod" | typedoc + + + + + +
    +
    +
    +
    + +
    +
    + Options +
    +
    + All +
      +
    • Public
      • +
    • Public/Protected
      • +
    • All
      • +
    +
    + + + + + + +
    +
    + Menu +
    +
    +
    +
    +
    +
    + +

    External module "mod"

    +
    +
    +
    +
    +
    +
    +
    +

    Index

    +
    +
    +
    +

    Classes

    + +
    +
    +

    Interfaces

    + +
    +
    +

    Variables

    + +
    +
    +

    Functions

    + +
    +
    +
    +
    +
    +

    Variables

    +
    + +

    Export Const someVarFromMod

    +
    someVarFromMod: string = "some value"
    + +
    +
    +
    +

    Functions

    +
    + +

    Export funcFromMod

    +
      +
    • funcFromMod(a: number): void
      • +
    +
      +
    • + +

      Parameters

      +
        +
      • +
        a: number
        +
        • +
      +

      Returns void

      +
      • +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    Legend

    +
    +
      +
    • Module
      • +
    • Object literal
      • +
    • Variable
      • +
    • Function
      • +
    • Function with type parameter
      • +
    • Index signature
      • +
    • Type alias
      • +
    • Type alias with type parameter
      • +
    +
      +
    • Enumeration
      • +
    • Enumeration member
      • +
    • Property
      • +
    • Method
      • +
    +
      +
    • Interface
      • +
    • Interface with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Index signature
      • +
    +
      +
    • Class
      • +
    • Class with type parameter
      • +
    • Constructor
      • +
    • Property
      • +
    • Method
      • +
    • Accessor
      • +
    • Index signature
      • +
    +
      +
    • Inherited constructor
      • +
    • Inherited property
      • +
    • Inherited method
      • +
    • Inherited accessor
      • +
    +
      +
    • Protected property
      • +
    • Protected method
      • +
    • Protected accessor
      • +
    +
      +
    • Private property
      • +
    • Private method
      • +
    • Private accessor
      • +
    +
      +
    • Static property
      • +
    • Static method
      • +
    +
    +
    +
    +
    +

    Generated using TypeDoc

    +
    +
    + + + + \ No newline at end of file diff --git a/src/test/renderer/specs/modules/_modules_.html b/src/test/renderer/specs/modules/_modules_.html index b1346e1f50..de76783448 100644 --- a/src/test/renderer/specs/modules/_modules_.html +++ b/src/test/renderer/specs/modules/_modules_.html @@ -369,6 +369,9 @@

    b: "enumerations" +
  • + "export-declaration" +
  • "flattened"
    • @@ -378,6 +381,12 @@
    b: "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
      diff --git a/src/test/renderer/specs/modules/_modules_.mymodule.html b/src/test/renderer/specs/modules/_modules_.mymodule.html index 0416dddbd9..d28c98feb5 100644 --- a/src/test/renderer/specs/modules/_modules_.mymodule.html +++ b/src/test/renderer/specs/modules/_modules_.mymodule.html @@ -62,7 +62,7 @@ MyModule
    -

    x Module MyModule

    +

    Export Module MyModule

    @@ -219,6 +219,9 @@

    Returns void "enumerations"

    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -228,6 +231,12 @@

    Returns void "generics" +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
      diff --git a/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html b/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html index 6a75976d30..6a6e7aac61 100644 --- a/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html +++ b/src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html @@ -65,7 +65,7 @@ MySubmodule
    -

    x Module MySubmodule

    +

    Export Module MySubmodule

    @@ -135,6 +135,9 @@

    b

  • "enumerations"
    • +
  • + "export-declaration" +
  • "flattened"
    • @@ -144,6 +147,12 @@

    b

  • "generics"
    • +
  • + "mod" +
    • +
  • + "mod2" +
  • "modules"
      diff --git a/src/test/renderer/specs/modules/_single_export_.html b/src/test/renderer/specs/modules/_single_export_.html index f7f42b1dd7..901fcf9d3f 100644 --- a/src/test/renderer/specs/modules/_single_export_.html +++ b/src/test/renderer/specs/modules/_single_export_.html @@ -100,6 +100,9 @@

      Classes

    • "enumerations"
      • +
    • + "export-declaration" +
    • "flattened"
      • @@ -109,6 +112,12 @@

      Classes

    • "generics"
      • +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"
      • diff --git a/src/test/renderer/specs/modules/_typescript_1_3_.html b/src/test/renderer/specs/modules/_typescript_1_3_.html index 732a7e81df..aaf3f3d3c4 100644 --- a/src/test/renderer/specs/modules/_typescript_1_3_.html +++ b/src/test/renderer/specs/modules/_typescript_1_3_.html @@ -123,6 +123,9 @@

      tupleType

    • "enumerations"
      • +
    • + "export-declaration" +
    • "flattened"
      • @@ -132,6 +135,12 @@

      tupleType

    • "generics"
      • +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"
      • diff --git a/src/test/renderer/specs/modules/_typescript_1_4_.html b/src/test/renderer/specs/modules/_typescript_1_4_.html index e99a690874..99e166265f 100644 --- a/src/test/renderer/specs/modules/_typescript_1_4_.html +++ b/src/test/renderer/specs/modules/_typescript_1_4_.html @@ -407,6 +407,9 @@

      Returns any "enumerations" +
    • + "export-declaration" +
    • "flattened"
      • @@ -416,6 +419,12 @@

      Returns any "generics" +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"
      • diff --git a/src/test/renderer/specs/modules/_typescript_1_5_.html b/src/test/renderer/specs/modules/_typescript_1_5_.html index d2cfdaf471..143ed78a40 100644 --- a/src/test/renderer/specs/modules/_typescript_1_5_.html +++ b/src/test/renderer/specs/modules/_typescript_1_5_.html @@ -278,6 +278,9 @@

      Returns void "enumerations" +
    • + "export-declaration" +
    • "flattened"
      • @@ -287,6 +290,12 @@

      Returns void "generics" +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"
      • diff --git a/src/test/renderer/specs/modules/_variables_.html b/src/test/renderer/specs/modules/_variables_.html index 2debee0ad1..3583da79ab 100644 --- a/src/test/renderer/specs/modules/_variables_.html +++ b/src/test/renderer/specs/modules/_variables_.html @@ -151,6 +151,9 @@

      Export varVariable

    • "enumerations"
      • +
    • + "export-declaration" +
    • "flattened"
      • @@ -160,6 +163,12 @@

      Export varVariable

    • "generics"
      • +
    • + "mod" +
      • +
    • + "mod2" +
    • "modules"