Skip to content

Commit

Permalink
fix(deps): support class with custom decorator
Browse files Browse the repository at this point in the history 
fix #245
  • Loading branch information
@vogloblinsky
vogloblinsky committed Aug 11, 2017
1 parent d468ee8 commit 059b3c9
Show file tree
Hide file tree
Showing 6 changed files with 429 additions and 432 deletions.
143 changes: 67 additions & 76 deletions dist/index-cli.js
View file

Large diffs are not rendered by default.

143 changes: 67 additions & 76 deletions dist/index.js
View file

Large diffs are not rendered by default.

142 changes: 67 additions & 75 deletions src/app/compiler/dependencies.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,44 @@ export class Dependencies {
return deps;
}

private processClass(node, file, srcFile, deps, outputSymbols) {
let name = this.getSymboleName(node);
let IO = this.getClassIO(file, srcFile, node);
deps = {
name,
id: 'class-' + name + '-' + Date.now(),
file: file,
type: 'class',
sourceCode: srcFile.getText()
};
if(IO.constructor) {
deps.constructorObj = IO.constructor;
}
if(IO.properties) {
deps.properties = IO.properties;
}
if(IO.description) {
deps.description = IO.description;
}
if(IO.methods) {
deps.methods = IO.methods;
}
if(IO.indexSignatures) {
deps.indexSignatures = IO.indexSignatures;
}
if (IO.extends) {
deps.extends = IO.extends;
}
if (IO.jsdoctags && IO.jsdoctags.length > 0) {
deps.jsdoctags = IO.jsdoctags[0].tags
}
if (IO.implements && IO.implements.length > 0) {
deps.implements = IO.implements;
}
this.debug(deps);
outputSymbols['classes'].push(deps);
}

private getSourceFileDecorators(srcFile: ts.SourceFile, outputSymbols: Object): void {

let cleaner = (process.cwd() + path.sep).replace(/\\/g, '/'),
Expand All @@ -253,6 +291,7 @@ export class Dependencies {
if (this.hasJSDocInternalTag(file, srcFile, node) && this.configuration.mainData.disablePrivateOrInternalSupport) { return; }

if (node.decorators) {
let classWithCustomDecorator = false;
let visitNode = (visitedNode, index) => {

let metadata = node.decorators;
Expand Down Expand Up @@ -395,16 +434,25 @@ export class Dependencies {
deps.constructorObj = IO.constructor;
}
outputSymbols['directives'].push(deps);
} else {
//Just a class
if (!classWithCustomDecorator) {
classWithCustomDecorator = true;
this.processClass(node, file, srcFile, deps, outputSymbols);
}
}

this.debug(deps);

this.__cache[name] = deps;
}

let filterByDecorators = (node) => {
if (node.expression && node.expression.expression) {
return /(NgModule|Component|Injectable|Pipe|Directive)/.test(node.expression.expression.text)
let filterByDecorators = (filteredNode) => {
if (filteredNode.expression && filteredNode.expression.expression) {
return /(NgModule|Component|Injectable|Pipe|Directive)/.test(filteredNode.expression.expression.text)
}
if (node.kind === ts.SyntaxKind.ClassDeclaration) {
return true;
}
return false;
};
Expand All @@ -415,41 +463,7 @@ export class Dependencies {
}
else if (node.symbol) {
if(node.symbol.flags === ts.SymbolFlags.Class) {
let name = this.getSymboleName(node);
let IO = this.getClassIO(file, srcFile, node);
deps = {
name,
id: 'class-' + name + '-' + Date.now(),
file: file,
type: 'class',
sourceCode: srcFile.getText()
};
if(IO.constructor) {
deps.constructorObj = IO.constructor;
}
if(IO.properties) {
deps.properties = IO.properties;
}
if(IO.description) {
deps.description = IO.description;
}
if(IO.methods) {
deps.methods = IO.methods;
}
if(IO.indexSignatures) {
deps.indexSignatures = IO.indexSignatures;
}
if (IO.extends) {
deps.extends = IO.extends;
}
if (IO.jsdoctags && IO.jsdoctags.length > 0) {
deps.jsdoctags = IO.jsdoctags[0].tags
}
if (IO.implements && IO.implements.length > 0) {
deps.implements = IO.implements;
}
this.debug(deps);
outputSymbols['classes'].push(deps);
this.processClass(node, file, srcFile, deps, outputSymbols);
} else if(node.symbol.flags === ts.SymbolFlags.Interface) {
let name = this.getSymboleName(node);
let IO = this.getInterfaceIO(file, srcFile, node);
Expand Down Expand Up @@ -541,41 +555,7 @@ export class Dependencies {
outputSymbols['routes'] = [...outputSymbols['routes'], ...newRoutes];
}
if (node.kind === ts.SyntaxKind.ClassDeclaration) {
let name = this.getSymboleName(node);
let IO = this.getClassIO(file, srcFile, node);
deps = {
name,
id: 'class-' + name + '-' + Date.now(),
file: file,
type: 'class',
sourceCode: srcFile.getText()
};
if(IO.constructor) {
deps.constructorObj = IO.constructor;
}
if(IO.properties) {
deps.properties = IO.properties;
}
if(IO.indexSignatures) {
deps.indexSignatures = IO.indexSignatures;
}
if(IO.description) {
deps.description = IO.description;
}
if(IO.methods) {
deps.methods = IO.methods;
}
if (IO.extends) {
deps.extends = IO.extends;
}
if (IO.implements && IO.implements.length > 0) {
deps.implements = IO.implements;
}
if (IO.jsdoctags && IO.jsdoctags.length > 0) {
deps.jsdoctags = IO.jsdoctags[0].tags
}
this.debug(deps);
outputSymbols['classes'].push(deps);
this.processClass(node, file, srcFile, deps, outputSymbols);
}
if (node.kind === ts.SyntaxKind.ExpressionStatement) {
let bootstrapModuleReference = 'bootstrapModule';
Expand Down Expand Up @@ -858,7 +838,7 @@ export class Dependencies {
}

private findProps(visitedNode) {
if(visitedNode.expression.arguments.length > 0) {
if(visitedNode.expression.arguments && visitedNode.expression.arguments.length > 0) {
return visitedNode.expression.arguments.pop().properties;
} else {
return '';
Expand Down Expand Up @@ -1570,7 +1550,19 @@ export class Dependencies {
jsdoctags: jsdoctags
}];
} else {
//console.log('custom decorator');
members = this.visitMembers(classDeclaration.members, sourceFile);

return [{
description,
methods: members.methods,
indexSignatures: members.indexSignatures,
properties: members.properties,
kind: members.kind,
constructor: members.constructor,
jsdoctags: jsdoctags,
extends: extendsElement,
implements: implementsElements
}];
}
}
} else if (description) {
Expand Down
Loading

0 comments on commit 059b3c9

Please sign in to comment.