@ng-doc/builder 15.10.0-beta.2 → 15.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/engine/template-filters.d.ts +1 -1
- package/engine/template-filters.js +2 -2
- package/engine/template-filters.js.map +1 -1
- package/helpers/extract-selectors.js.map +1 -1
- package/helpers/generate-api-entities.js.map +1 -1
- package/helpers/get-demo-class-declarations.js +2 -1
- package/helpers/get-demo-class-declarations.js.map +1 -1
- package/helpers/get-playground-by-id.js.map +1 -1
- package/helpers/get-playground-properties.js +2 -3
- package/helpers/get-playground-properties.js.map +1 -1
- package/helpers/presentation.js +7 -7
- package/helpers/presentation.js.map +1 -1
- package/helpers/typescript/display-type.d.ts +4 -3
- package/helpers/typescript/display-type.js +14 -6
- package/helpers/typescript/display-type.js.map +1 -1
- package/package.json +3 -3
- package/schematics/category/index.js +5 -5
- package/schematics/category/index.js.map +1 -1
- package/schematics/dependencies/index.js +4 -4
- package/schematics/dependencies/index.js.map +1 -1
- package/schematics/page/index.js +5 -5
- package/schematics/page/index.js.map +1 -1
- package/templates/api/class.html.nunj +2 -2
- package/templates/api/interface.html.nunj +1 -1
- package/templates/helpers/accessor.html.nunj +1 -1
- package/templates/helpers/method.html.nunj +1 -1
- package/templates/helpers/parameters.html.nunj +1 -1
- package/templates/helpers/properties.html.nunj +1 -1
- package/templates/helpers/type.html.nunj +4 -4
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { accessorPresentation, constructorPresentation,
|
|
1
|
+
export { accessorPresentation, constructorPresentation, displayReturnType, displayType, extractDocs, extractParameterDocs, extractSeeDocs, extractSelectors, filterByScope, filterByStatic, filterUselessMembers, firstNodeWithComment, functionPresentation, getAccessorChain, getClassAccessors, getClassMethods, getClassProperties, getContentForPlayground, getDeclarationType, getImplementedMember, getInheritedParent, getInterfaceAccessors, getInterfaceMethods, getInterfaceProperties, getMemberParent, getMethodChain, getOverriddenMember, getPlaygroundClassProperties, getPropertyChain, getTargetForPlayground, getTemplateForPlayground, groupAccessors, marked, methodPresentation, noEmpty, noLineBreaks, notEmptyAssets, sortByNodesName, sortNavigationEntities, typeAliasPresentation, variablePresentation, } from '../helpers';
|
|
2
2
|
export { buildPlaygroundDemoTemplate, objectKeys } from '@ng-doc/core';
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* Just export filters from this file, they will be included to the template renderer automatically */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.objectKeys = exports.buildPlaygroundDemoTemplate = exports.variablePresentation = exports.typeAliasPresentation = exports.sortNavigationEntities = exports.sortByNodesName = exports.notEmptyAssets = exports.noLineBreaks = exports.noEmpty = exports.methodPresentation = exports.marked = exports.groupAccessors = exports.getTemplateForPlayground = exports.getTargetForPlayground = exports.getPropertyChain = exports.getPlaygroundClassProperties = exports.getOverriddenMember = exports.getMethodChain = exports.getMemberParent = exports.getInterfaceProperties = exports.getInterfaceMethods = exports.getInterfaceAccessors = exports.getInheritedParent = exports.getImplementedMember = exports.getDeclarationType = exports.getContentForPlayground = exports.getClassProperties = exports.getClassMethods = exports.getClassAccessors = exports.getAccessorChain = exports.functionPresentation = exports.firstNodeWithComment = exports.filterUselessMembers = exports.filterByStatic = exports.filterByScope = exports.extractSelectors = exports.extractSeeDocs = exports.extractParameterDocs = exports.extractDocs = exports.
|
|
4
|
+
exports.objectKeys = exports.buildPlaygroundDemoTemplate = exports.variablePresentation = exports.typeAliasPresentation = exports.sortNavigationEntities = exports.sortByNodesName = exports.notEmptyAssets = exports.noLineBreaks = exports.noEmpty = exports.methodPresentation = exports.marked = exports.groupAccessors = exports.getTemplateForPlayground = exports.getTargetForPlayground = exports.getPropertyChain = exports.getPlaygroundClassProperties = exports.getOverriddenMember = exports.getMethodChain = exports.getMemberParent = exports.getInterfaceProperties = exports.getInterfaceMethods = exports.getInterfaceAccessors = exports.getInheritedParent = exports.getImplementedMember = exports.getDeclarationType = exports.getContentForPlayground = exports.getClassProperties = exports.getClassMethods = exports.getClassAccessors = exports.getAccessorChain = exports.functionPresentation = exports.firstNodeWithComment = exports.filterUselessMembers = exports.filterByStatic = exports.filterByScope = exports.extractSelectors = exports.extractSeeDocs = exports.extractParameterDocs = exports.extractDocs = exports.displayType = exports.displayReturnType = exports.constructorPresentation = exports.accessorPresentation = void 0;
|
|
5
5
|
var helpers_1 = require("../helpers");
|
|
6
6
|
Object.defineProperty(exports, "accessorPresentation", { enumerable: true, get: function () { return helpers_1.accessorPresentation; } });
|
|
7
7
|
Object.defineProperty(exports, "constructorPresentation", { enumerable: true, get: function () { return helpers_1.constructorPresentation; } });
|
|
8
|
+
Object.defineProperty(exports, "displayReturnType", { enumerable: true, get: function () { return helpers_1.displayReturnType; } });
|
|
8
9
|
Object.defineProperty(exports, "displayType", { enumerable: true, get: function () { return helpers_1.displayType; } });
|
|
9
|
-
Object.defineProperty(exports, "displayTypeNode", { enumerable: true, get: function () { return helpers_1.displayTypeNode; } });
|
|
10
10
|
Object.defineProperty(exports, "extractDocs", { enumerable: true, get: function () { return helpers_1.extractDocs; } });
|
|
11
11
|
Object.defineProperty(exports, "extractParameterDocs", { enumerable: true, get: function () { return helpers_1.extractParameterDocs; } });
|
|
12
12
|
Object.defineProperty(exports, "extractSeeDocs", { enumerable: true, get: function () { return helpers_1.extractSeeDocs; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-filters.js","sourceRoot":"","sources":["../../../../libs/builder/engine/template-filters.ts"],"names":[],"mappings":";AAAA,sGAAsG;;;AAEtG,sCA0CoB;AAzCnB,+GAAA,oBAAoB,OAAA;AACpB,kHAAA,uBAAuB,OAAA;AACvB,
|
|
1
|
+
{"version":3,"file":"template-filters.js","sourceRoot":"","sources":["../../../../libs/builder/engine/template-filters.ts"],"names":[],"mappings":";AAAA,sGAAsG;;;AAEtG,sCA0CoB;AAzCnB,+GAAA,oBAAoB,OAAA;AACpB,kHAAA,uBAAuB,OAAA;AACvB,4GAAA,iBAAiB,OAAA;AACjB,sGAAA,WAAW,OAAA;AACX,sGAAA,WAAW,OAAA;AACX,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AACd,2GAAA,gBAAgB,OAAA;AAChB,wGAAA,aAAa,OAAA;AACb,yGAAA,cAAc,OAAA;AACd,+GAAA,oBAAoB,OAAA;AACpB,+GAAA,oBAAoB,OAAA;AACpB,+GAAA,oBAAoB,OAAA;AACpB,2GAAA,gBAAgB,OAAA;AAChB,4GAAA,iBAAiB,OAAA;AACjB,0GAAA,eAAe,OAAA;AACf,6GAAA,kBAAkB,OAAA;AAClB,kHAAA,uBAAuB,OAAA;AACvB,6GAAA,kBAAkB,OAAA;AAClB,+GAAA,oBAAoB,OAAA;AACpB,6GAAA,kBAAkB,OAAA;AAClB,gHAAA,qBAAqB,OAAA;AACrB,8GAAA,mBAAmB,OAAA;AACnB,iHAAA,sBAAsB,OAAA;AACtB,0GAAA,eAAe,OAAA;AACf,yGAAA,cAAc,OAAA;AACd,8GAAA,mBAAmB,OAAA;AACnB,uHAAA,4BAA4B,OAAA;AAC5B,2GAAA,gBAAgB,OAAA;AAChB,iHAAA,sBAAsB,OAAA;AACtB,mHAAA,wBAAwB,OAAA;AACxB,yGAAA,cAAc,OAAA;AACd,iGAAA,MAAM,OAAA;AACN,6GAAA,kBAAkB,OAAA;AAClB,kGAAA,OAAO,OAAA;AACP,uGAAA,YAAY,OAAA;AACZ,yGAAA,cAAc,OAAA;AACd,0GAAA,eAAe,OAAA;AACf,iHAAA,sBAAsB,OAAA;AACtB,gHAAA,qBAAqB,OAAA;AACrB,+GAAA,oBAAoB,OAAA;AAErB,qCAAqE;AAA7D,mHAAA,2BAA2B,OAAA;AAAE,kGAAA,UAAU,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-selectors.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/extract-selectors.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AAEzC,4FAAqF;AAGrF;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,WAAuC;;IACvE,IAAI,eAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACzC,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"extract-selectors.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/extract-selectors.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AAEzC,4FAAqF;AAGrF;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,WAAuC;;IACvE,IAAI,eAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACzC,MAAM,SAAS,GAA0B,MAAA,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,mCAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAExH,IAAI,SAAS,EAAE;YACd,MAAM,UAAU,GAAqB,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;YAEjE,IAAI,eAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAAE;gBAC/C,MAAM,QAAQ,GAAW,MAAA,IAAA,yDAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,mCAAI,EAAE,CAAC;gBAE/E,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;aACxD;SACD;KACD;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAhBD,4CAgBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-api-entities.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/generate-api-entities.ts"],"names":[],"mappings":";;;;AAAA,uCAAoD;AACpD,mDAA6B;AAG7B,sCAAkF;AAElF,iEAAyD;AACzD,yEAAkE;AAElE;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,aAA6B;;IAChE,MAAM,MAAM,GAAoD,EAAE,CAAC;IAEnE,MAAA,aAAa,CAAC,MAAM,0CAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAoB,EAAE,EAAE;QAC7D,MAAM,WAAW,GAAwB,IAAI,4BAAmB,CAC/D,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,UAAU,EACxB,aAAa,CAAC,OAAO,EACrB,aAAa,EACb,KAAK,CACL,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzB,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE,CAClD,IAAA,cAAO,EACN,IAAI,GAAG,CACN,aAAa,CAAC,OAAO,CAAC,OAAO;aAC3B,qBAAqB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,wCAAiB,EAAC,CAAC,EAAE,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CACtF;aACA,GAAG,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;aACvF,IAAI,CAAC,CAAC,CAAC,CACT,CACD;aACC,MAAM,CAAC,iDAAsB,CAAC;aAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"generate-api-entities.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/generate-api-entities.ts"],"names":[],"mappings":";;;;AAAA,uCAAoD;AACpD,mDAA6B;AAG7B,sCAAkF;AAElF,iEAAyD;AACzD,yEAAkE;AAElE;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,aAA6B;;IAChE,MAAM,MAAM,GAAoD,EAAE,CAAC;IAEnE,MAAA,aAAa,CAAC,MAAM,0CAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAoB,EAAE,EAAE;QAC7D,MAAM,WAAW,GAAwB,IAAI,4BAAmB,CAC/D,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,UAAU,EACxB,aAAa,CAAC,OAAO,EACrB,aAAa,EACb,KAAK,CACL,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzB,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE,CAClD,IAAA,cAAO,EACN,IAAI,GAAG,CACN,aAAa,CAAC,OAAO,CAAC,OAAO;aAC3B,qBAAqB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,wCAAiB,EAAC,CAAC,EAAE,IAAA,cAAO,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CACtF;aACA,GAAG,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;aACvF,IAAI,CAAC,CAAC,CAAC,CACT,CACD;aACC,MAAM,CAAC,iDAAsB,CAAC;aAC9B,OAAO,CACP,CACC,WAAuC,EACvC,EAAU,EACV,YAA0C,EACzC,EAAE;YACH,MAAM,IAAI,GAAuB,WAAW,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,UAAU,GAAiC,YAAY,CAAC,MAAM,CACnE,CAAC,CAA6B,EAAE,EAAE,CACjC,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,WAAW,EAAE,CACtE,CAAC;YAEF,IAAI,IAAI,EAAE;gBACT,MAAM,CAAC,IAAI,CACV,IAAI,2BAAkB,CACrB,aAAa,CAAC,OAAO,EACrB,WAAW,CAAC,aAAa,EAAE,EAC3B,aAAa,CAAC,OAAO,EACrB,WAAW,EACX,IAAI,EACJ,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAC/B,CACD,CAAC;aACF;QACF,CAAC,CACD,CACF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAxDD,kDAwDC"}
|
|
@@ -9,7 +9,8 @@ const ts_morph_1 = require("ts-morph");
|
|
|
9
9
|
*/
|
|
10
10
|
function getDemoClassDeclarations(objectExpression) {
|
|
11
11
|
const demoProperty = objectExpression.getProperty('demo');
|
|
12
|
-
if (demoProperty &&
|
|
12
|
+
if (demoProperty &&
|
|
13
|
+
(ts_morph_1.Node.isPropertyAssignment(demoProperty) || ts_morph_1.Node.isShorthandPropertyAssignment(demoProperty))) {
|
|
13
14
|
const initializer = demoProperty.getInitializer();
|
|
14
15
|
if (initializer && initializer instanceof ts_morph_1.ObjectLiteralExpression) {
|
|
15
16
|
return initializer
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-demo-class-declarations.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-demo-class-declarations.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAA+G;AAE/G;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,gBAAyC;IACjF,MAAM,YAAY,GAAyC,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEhG,
|
|
1
|
+
{"version":3,"file":"get-demo-class-declarations.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-demo-class-declarations.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAA+G;AAE/G;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,gBAAyC;IACjF,MAAM,YAAY,GAAyC,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEhG,IACC,YAAY;QACZ,CAAC,eAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,IAAI,eAAI,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC,EAC5F;QACD,MAAM,WAAW,GAA2B,YAAY,CAAC,cAAc,EAAE,CAAC;QAE1E,IAAI,WAAW,IAAI,WAAW,YAAY,kCAAuB,EAAE;YAClE,OAAO,WAAW;iBAChB,aAAa,EAAE;iBACf,GAAG,CAAC,CAAC,QAAkC,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,0CAAE,mBAAmB,EAAE,CAAA,EAAA,CAAC;iBAClG,MAAM,CAAC,gBAAS,CAAC;iBACjB,MAAM,CAAC,eAAI,CAAC,kBAAkB,CAAC,CAAC;SAClC;KACD;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAnBD,4DAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-playground-by-id.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-playground-by-id.ts"],"names":[],"mappings":";;;AAAA,uCAA6F;AAE7F;;;;GAIG;AACH,SAAgB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"get-playground-by-id.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-playground-by-id.ts"],"names":[],"mappings":";;;AAAA,uCAA6F;AAE7F;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,UAAmC,EAAE,YAAoB;IAC1F,MAAM,oBAAoB,GAAyC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAExG,IAAI,eAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,EAAE;QACpD,MAAM,qBAAqB,GAA2B,oBAAoB,CAAC,cAAc,EAAE,CAAC;QAE5F,IAAI,eAAI,CAAC,yBAAyB,CAAC,qBAAqB,CAAC,EAAE;YAC1D,OAAO,qBAAqB,CAAC;SAC7B;KACD;IAED,OAAO,SAAS,CAAA;AACjB,CAAC;AAZD,8CAYC"}
|
|
@@ -95,10 +95,9 @@ function getPlaygroundClassProperties(declaration) {
|
|
|
95
95
|
var _a, _b, _c, _d;
|
|
96
96
|
const inputName = (_c = (_b = (_a = property
|
|
97
97
|
.getDecorator('Input')) === null || _a === void 0 ? void 0 : _a.getArguments()[0]) === null || _b === void 0 ? void 0 : _b.getText().replace(/^["']|['"]$/g, '')) !== null && _c !== void 0 ? _c : property.getName();
|
|
98
|
-
const typeNode = property.getTypeNode();
|
|
99
98
|
properties[property.getName()] = {
|
|
100
99
|
name: inputName,
|
|
101
|
-
type:
|
|
100
|
+
type: (0, typescript_1.displayType)(property),
|
|
102
101
|
default: (_d = property.getInitializer()) === null || _d === void 0 ? void 0 : _d.getText(),
|
|
103
102
|
description: property
|
|
104
103
|
.getJsDocs()
|
|
@@ -106,7 +105,7 @@ function getPlaygroundClassProperties(declaration) {
|
|
|
106
105
|
options: property
|
|
107
106
|
.getType()
|
|
108
107
|
.getUnionTypes()
|
|
109
|
-
.map((type) => (
|
|
108
|
+
.map((type) => type.getText(undefined, ts_morph_1.TypeFormatFlags.NoTruncation)),
|
|
110
109
|
};
|
|
111
110
|
return properties;
|
|
112
111
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-playground-properties.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-playground-properties.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"get-playground-properties.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/get-playground-properties.ts"],"names":[],"mappings":"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"}
|
package/helpers/presentation.js
CHANGED
|
@@ -14,7 +14,7 @@ function constructorPresentation(constructor) {
|
|
|
14
14
|
const presentation = [
|
|
15
15
|
scopePresentation(constructor),
|
|
16
16
|
`constructor(\n ${parameters}\n):`,
|
|
17
|
-
(0, typescript_1.
|
|
17
|
+
(0, typescript_1.displayReturnType)(constructor),
|
|
18
18
|
]
|
|
19
19
|
.filter(core_1.isPresent)
|
|
20
20
|
.join(' ');
|
|
@@ -31,7 +31,7 @@ function accessorPresentation(accessor) {
|
|
|
31
31
|
const header = ts_morph_1.Node.isGetAccessorDeclaration(accessor)
|
|
32
32
|
? `${accessor.getName()}():`
|
|
33
33
|
: `${accessor.getName()}(${parameters})`;
|
|
34
|
-
const returnType = ts_morph_1.Node.isGetAccessorDeclaration(accessor) ? (0, typescript_1.
|
|
34
|
+
const returnType = ts_morph_1.Node.isGetAccessorDeclaration(accessor) ? (0, typescript_1.displayReturnType)(accessor) : '';
|
|
35
35
|
const presentation = [prefix, scopePresentation(accessor), header, returnType].filter(core_1.isPresent).join(' ') + ';';
|
|
36
36
|
return (0, format_code_1.formatCode)(presentation, 'TypeScript');
|
|
37
37
|
}
|
|
@@ -42,7 +42,7 @@ exports.accessorPresentation = accessorPresentation;
|
|
|
42
42
|
*/
|
|
43
43
|
function methodPresentation(method) {
|
|
44
44
|
const parameters = method.getParameters().map(parameterPresentation).join(', ');
|
|
45
|
-
const presentation = [scopePresentation(method), `${method.getName()}(${parameters}):`, `${(0, typescript_1.
|
|
45
|
+
const presentation = [scopePresentation(method), `${method.getName()}(${parameters}):`, `${(0, typescript_1.displayReturnType)(method)};`]
|
|
46
46
|
.filter(core_1.isPresent)
|
|
47
47
|
.join(' ');
|
|
48
48
|
return (0, format_code_1.formatCode)(presentation, 'TypeScript');
|
|
@@ -54,7 +54,7 @@ exports.methodPresentation = methodPresentation;
|
|
|
54
54
|
*/
|
|
55
55
|
function functionPresentation(fnc) {
|
|
56
56
|
const parameters = fnc.getParameters().map(parameterPresentation).join(', ');
|
|
57
|
-
const presentation = ['function', `${fnc.getName()}(${parameters}):`, `${(0, typescript_1.
|
|
57
|
+
const presentation = ['function', `${fnc.getName()}(${parameters}):`, `${(0, typescript_1.displayReturnType)(fnc)};`]
|
|
58
58
|
.filter(core_1.isPresent)
|
|
59
59
|
.join(' ');
|
|
60
60
|
return (0, format_code_1.formatCode)(presentation, 'TypeScript');
|
|
@@ -65,7 +65,7 @@ exports.functionPresentation = functionPresentation;
|
|
|
65
65
|
* @param typeAlias
|
|
66
66
|
*/
|
|
67
67
|
function typeAliasPresentation(typeAlias) {
|
|
68
|
-
const presentation = `type ${typeAlias.getName()} = ${(
|
|
68
|
+
const presentation = `type ${typeAlias.getName()} = ${typeAlias.getType().getText(undefined, ts_morph_1.TypeFormatFlags.NoTruncation)};`;
|
|
69
69
|
return (0, format_code_1.formatCode)(presentation, "TypeScript");
|
|
70
70
|
}
|
|
71
71
|
exports.typeAliasPresentation = typeAliasPresentation;
|
|
@@ -78,7 +78,7 @@ function variablePresentation(variable) {
|
|
|
78
78
|
const presentation = [
|
|
79
79
|
(_b = (_a = variable.getVariableStatement()) === null || _a === void 0 ? void 0 : _a.getDeclarationKind()) !== null && _b !== void 0 ? _b : 'const',
|
|
80
80
|
`${variable.getName()}:`,
|
|
81
|
-
`${(0, typescript_1.displayType)(variable
|
|
81
|
+
`${(0, typescript_1.displayType)(variable)};`,
|
|
82
82
|
]
|
|
83
83
|
.filter(core_1.isPresent)
|
|
84
84
|
.join(' ');
|
|
@@ -95,7 +95,7 @@ function parameterPresentation(parameter) {
|
|
|
95
95
|
scopePresentation(parameter),
|
|
96
96
|
modPresentation(parameter),
|
|
97
97
|
parameter.getName() + (parameter.hasQuestionToken() ? '?' : '') + ':',
|
|
98
|
-
(0, typescript_1.displayType)(parameter
|
|
98
|
+
(0, typescript_1.displayType)(parameter),
|
|
99
99
|
parameter.getInitializer() ? `= ${parameter.getInitializer()}` : '',
|
|
100
100
|
]
|
|
101
101
|
.filter(core_1.isPresent)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/presentation.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/presentation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Node } from 'ts-morph';
|
|
2
2
|
/**
|
|
3
3
|
*
|
|
4
4
|
* @param type
|
|
5
|
+
* @param node
|
|
5
6
|
*/
|
|
6
|
-
export declare function displayType(
|
|
7
|
+
export declare function displayType(node: Node): string;
|
|
7
8
|
/**
|
|
8
9
|
*
|
|
9
10
|
* @param node
|
|
10
11
|
*/
|
|
11
|
-
export declare function
|
|
12
|
+
export declare function displayReturnType(node: Node): string;
|
|
@@ -1,21 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.displayReturnType = exports.displayType = void 0;
|
|
4
4
|
const ts_morph_1 = require("ts-morph");
|
|
5
5
|
/**
|
|
6
6
|
*
|
|
7
7
|
* @param type
|
|
8
|
+
* @param node
|
|
8
9
|
*/
|
|
9
|
-
function displayType(
|
|
10
|
-
|
|
10
|
+
function displayType(node) {
|
|
11
|
+
var _a;
|
|
12
|
+
return ((ts_morph_1.Node.isTyped(node) && ((_a = node.getTypeNode()) === null || _a === void 0 ? void 0 : _a.getText())) ||
|
|
13
|
+
(ts_morph_1.Node.isTypeNode(node) && node.getType().getText(undefined, ts_morph_1.TypeFormatFlags.NoTruncation)) ||
|
|
14
|
+
'');
|
|
11
15
|
}
|
|
12
16
|
exports.displayType = displayType;
|
|
13
17
|
/**
|
|
14
18
|
*
|
|
15
19
|
* @param node
|
|
16
20
|
*/
|
|
17
|
-
function
|
|
18
|
-
|
|
21
|
+
function displayReturnType(node) {
|
|
22
|
+
var _a;
|
|
23
|
+
if (ts_morph_1.Node.isReturnTyped(node)) {
|
|
24
|
+
return ((_a = node.getReturnTypeNode()) === null || _a === void 0 ? void 0 : _a.getText()) || node.getReturnType().getText(undefined, ts_morph_1.TypeFormatFlags.NoTruncation);
|
|
25
|
+
}
|
|
26
|
+
return '';
|
|
19
27
|
}
|
|
20
|
-
exports.
|
|
28
|
+
exports.displayReturnType = displayReturnType;
|
|
21
29
|
//# sourceMappingURL=display-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-type.js","sourceRoot":"","sources":["../../../../../libs/builder/helpers/typescript/display-type.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"display-type.js","sourceRoot":"","sources":["../../../../../libs/builder/helpers/typescript/display-type.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAE/C;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;;IACrC,OAAO,CACN,CAAC,eAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAI,MAAA,IAAI,CAAC,WAAW,EAAE,0CAAE,OAAO,EAAE,CAAA,CAAC;QACrD,CAAC,eAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,0BAAe,CAAC,YAAY,CAAC,CAAC;QAC1F,EAAE,CACF,CAAC;AACH,CAAC;AAND,kCAMC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,IAAU;;IAC3C,IAAI,eAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QAC7B,OAAO,CAAA,MAAA,IAAI,CAAC,iBAAiB,EAAE,0CAAE,OAAO,EAAE,KAAI,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,0BAAe,CAAC,YAAY,CAAC,CAAC;KACpH;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AALD,8CAKC"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-doc/builder",
|
|
3
|
-
"version": "15.10.
|
|
3
|
+
"version": "15.10.1",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"builders": "./builders.json",
|
|
6
6
|
"schematics": "./schematics/collection.json",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@ng-doc/core": "15.10.
|
|
9
|
-
"@ng-doc/utils": "15.10.
|
|
8
|
+
"@ng-doc/core": "15.10.1",
|
|
9
|
+
"@ng-doc/utils": "15.10.1",
|
|
10
10
|
"@angular-devkit/architect": ">=0.1500.0",
|
|
11
11
|
"chokidar": "^3.5.3",
|
|
12
12
|
"minimatch": "^5.1.0",
|
|
@@ -4,9 +4,9 @@ exports.build = void 0;
|
|
|
4
4
|
const strings_1 = require("@angular-devkit/core/src/utils/strings");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const variables_1 = require("../../engine/variables");
|
|
8
|
+
const find_closest_file_1 = require("../../helpers/find-closest-file");
|
|
9
|
+
const extract_default_export_name_1 = require("../utils/extract-default-export-name");
|
|
10
10
|
/**
|
|
11
11
|
* Generates a NgDocCategory
|
|
12
12
|
*
|
|
@@ -17,9 +17,9 @@ function build(options) {
|
|
|
17
17
|
return (host) => {
|
|
18
18
|
const path = (0, path_1.join)(options.path, `/${(0, strings_1.dasherize)(options.title)}`);
|
|
19
19
|
const closestCategoryFile = options.category
|
|
20
|
-
? (0,
|
|
20
|
+
? (0, find_closest_file_1.findClosestFile)(options.path, variables_1.CATEGORY_NAME)
|
|
21
21
|
: null;
|
|
22
|
-
const categoryConstantName = options.category && closestCategoryFile ? (0,
|
|
22
|
+
const categoryConstantName = options.category && closestCategoryFile ? (0, extract_default_export_name_1.extractDefaultExportName)(closestCategoryFile) : null;
|
|
23
23
|
const categoryImportPath = closestCategoryFile
|
|
24
24
|
? (0, path_1.relative)(path, closestCategoryFile).replace(/.ts$/, '')
|
|
25
25
|
: null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/category/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAYoC;AACpC,+BAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/category/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAYoC;AACpC,+BAAoC;AAEpC,sDAAqD;AACrD,uEAAgE;AAChE,sFAA8E;AAG9E;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAiC;IACtD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,mCAAe,EAAC,OAAO,CAAC,IAAI,EAAE,yBAAa,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,sDAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,CAAC,YAAY,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;QAE5D,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB,EAAC,CAAC;gBAChG,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA9BD,sBA8BC"}
|
|
@@ -4,8 +4,8 @@ exports.build = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const path_1 = tslib_1.__importStar(require("path"));
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const variables_1 = require("../../engine/variables");
|
|
8
|
+
const extract_default_export_name_1 = require("../utils/extract-default-export-name");
|
|
9
9
|
const demoTemplates = ['ng-doc.module.ts.template'];
|
|
10
10
|
/**
|
|
11
11
|
* Generates a NgDocDependencies
|
|
@@ -16,8 +16,8 @@ const demoTemplates = ['ng-doc.module.ts.template'];
|
|
|
16
16
|
function build(options) {
|
|
17
17
|
return (host) => {
|
|
18
18
|
var _a;
|
|
19
|
-
const pagePath = path_1.default.join(options.path,
|
|
20
|
-
const pageName = (_a = (0,
|
|
19
|
+
const pagePath = path_1.default.join(options.path, variables_1.PAGE_NAME);
|
|
20
|
+
const pageName = (_a = (0, extract_default_export_name_1.extractDefaultExportName)(pagePath)) !== null && _a !== void 0 ? _a : 'Page';
|
|
21
21
|
return (0, schematics_1.chain)([
|
|
22
22
|
(0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
|
|
23
23
|
(0, schematics_1.filter)((path) => (demoTemplates.includes((0, path_1.basename)(path)) && options.module) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/dependencies/index.ts"],"names":[],"mappings":";;;;AAAA,2DAaoC;AACpC,qDAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/dependencies/index.ts"],"names":[],"mappings":";;;;AAAA,2DAaoC;AACpC,qDAAoC;AAEpC,sDAAiD;AACjD,sFAA8E;AAG9E,MAAM,aAAa,GAAa,CAAC,2BAA2B,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAqC;IAC1D,OAAO,CAAC,IAAU,EAAE,EAAE;;QACrB,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAS,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAW,MAAA,IAAA,sDAAwB,EAAC,QAAQ,CAAC,mCAAI,MAAM,CAAC;QAEtE,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;oBAC1D,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,QAAQ,EAAC,CAAC;gBACtC,IAAA,iBAAI,EAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA1BD,sBA0BC"}
|
package/schematics/page/index.js
CHANGED
|
@@ -4,9 +4,9 @@ exports.build = void 0;
|
|
|
4
4
|
const strings_1 = require("@angular-devkit/core/src/utils/strings");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
const variables_1 = require("../../engine/variables");
|
|
8
|
+
const find_closest_file_1 = require("../../helpers/find-closest-file");
|
|
9
|
+
const extract_default_export_name_1 = require("../utils/extract-default-export-name");
|
|
10
10
|
const demoTemplates = ['ng-doc.module.ts.template', 'ng-doc.dependencies.ts.template'];
|
|
11
11
|
/**
|
|
12
12
|
* Generates a NgDocPage
|
|
@@ -18,10 +18,10 @@ function build(options) {
|
|
|
18
18
|
return (host) => {
|
|
19
19
|
const path = (0, path_1.join)(options.path, `/${(0, strings_1.dasherize)(options.title)}`);
|
|
20
20
|
const closestCategoryFile = options.category
|
|
21
|
-
? (0,
|
|
21
|
+
? (0, find_closest_file_1.findClosestFile)(options.path, variables_1.CATEGORY_NAME)
|
|
22
22
|
: null;
|
|
23
23
|
const pageName = (0, strings_1.classify)(options.title + 'Page');
|
|
24
|
-
const categoryConstantName = options.category && closestCategoryFile ? (0,
|
|
24
|
+
const categoryConstantName = options.category && closestCategoryFile ? (0, extract_default_export_name_1.extractDefaultExportName)(closestCategoryFile) : null;
|
|
25
25
|
const categoryImportPath = closestCategoryFile
|
|
26
26
|
? (0, path_1.relative)(path, closestCategoryFile).replace(/.ts$/, '')
|
|
27
27
|
: null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/page/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAaoC;AACpC,+BAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/page/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAaoC;AACpC,+BAA8C;AAE9C,sDAAqD;AACrD,uEAAgE;AAChE,sFAA8E;AAG9E,MAAM,aAAa,GAAa,CAAC,2BAA2B,EAAE,iCAAiC,CAAC,CAAC;AAEjG;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAA6B;IAClD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,mCAAe,EAAC,OAAO,CAAC,IAAI,EAAE,yBAAa,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,QAAQ,GAAW,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC;QAC1D,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,sDAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;oBACxD,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC;oBACd,GAAG,OAAO;oBACV,YAAY,EAAE,oBAAoB;oBAClC,UAAU,EAAE,kBAAkB;oBAC9B,QAAQ;oBACR,OAAO,EAAE,OAAO,CAAC,OAAO;iBACxB,CAAC;gBACF,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAxCD,sBAwCC"}
|
|
@@ -19,12 +19,12 @@
|
|
|
19
19
|
<div class="ng-doc-header-details" indexable="false">
|
|
20
20
|
{% if extends %}
|
|
21
21
|
<span class="ng-doc-header-details-label">Extends</span>
|
|
22
|
-
{{ typeMacro.
|
|
22
|
+
{{ typeMacro.type(extends) }}
|
|
23
23
|
{%- endif %}
|
|
24
24
|
{% if implements.length %}
|
|
25
25
|
<span class="ng-doc-header-details-label">Implements</span>
|
|
26
26
|
{%- for i in implements -%}
|
|
27
|
-
{{ typeMacro.
|
|
27
|
+
{{ typeMacro.type(i) }}
|
|
28
28
|
{%- endfor %}
|
|
29
29
|
{%- endif %}
|
|
30
30
|
</div>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
{% macro
|
|
2
|
-
<code indexable="false">{{
|
|
1
|
+
{% macro type(node) -%}
|
|
2
|
+
<code indexable="false">{{ node | displayType | escape }}</code>
|
|
3
3
|
{%- endmacro %}
|
|
4
4
|
|
|
5
|
-
{%- macro
|
|
6
|
-
<code indexable="false">{{
|
|
5
|
+
{%- macro returnType(node) -%}
|
|
6
|
+
<code indexable="false">{{ node | displayReturnType | escape }}</code>
|
|
7
7
|
{%- endmacro %}
|