Skip to content

Commit

Permalink
feat: allow prototyped targets and fix targetting ids
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstallenberg
dstallenberg committed May 1, 2023
1 parent eecdd61 commit 4b1ad15
Show file tree
Hide file tree
Showing 16 changed files with 362 additions and 93 deletions.
4 changes: 2 additions & 2 deletions libraries/analysis-javascript/lib/cfg/ControlFlowGraphFactory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { traverse } from "@babel/core";
import * as t from "@babel/types";
import { ControlFlowGraphFactory as CoreControlFlowGraphFactory } from "@syntest/analysis";
import { ControlFlowProgram } from "@syntest/cfg";
import { ControlFlowProgram, contractControlFlowProgram } from "@syntest/cfg";

import { ControlFlowGraphVisitor } from "./ControlFlowGraphVisitor";

Expand All @@ -29,6 +29,6 @@ export class ControlFlowGraphFactory
const visitor = new ControlFlowGraphVisitor(filePath);
traverse(AST, visitor);

return visitor.cfg; //contractControlFlowProgram(visitor.cfg);
return contractControlFlowProgram(visitor.cfg);
}
}
123 changes: 95 additions & 28 deletions libraries/analysis-javascript/lib/cfg/ControlFlowGraphVisitor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,19 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path.isConditional() ||
path.isLoop() ||
path.isBlock() ||
// terminating statements
path.isBreakStatement() ||
path.isContinueStatement() ||
path.isReturnStatement() ||
path.isThrowStatement()
path.isThrowStatement() ||
// exports
path.isExportAllDeclaration() ||
path.isExportDeclaration() ||
path.isExportDefaultDeclaration() ||
path.isExportDefaultSpecifier() ||
path.isExportNamedDeclaration() ||
path.isExportNamespaceSpecifier() ||
path.isExportSpecifier()
);
}

Expand All @@ -278,7 +287,14 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
edgeType: EdgeType,
label = ""
): Edge {
return new Edge("", edgeType, label, source.id, target.id, "description");
return new Edge(
`${source.id}->${target.id}`,
edgeType,
label,
source.id,
target.id,
"description"
);
}

/**
Expand All @@ -299,15 +315,21 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {

public Block: (path: NodePath<t.Block>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering block\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering block at ${this._getNodeId(path)}`
);

// we need to repeat this from the baseclass because we cannot use super.Program
if (path.isProgram() && this._scopeIdOffset === undefined) {
this._scopeIdOffset = this._getUidFromScope(path.scope);
this._thisScopeStack.push(this._getUidFromScope(path.scope));
this._thisScopeStackNames.push("global");
}

const node = this._createNode(path);

this._connectToParents(node);
this._currentParents = [node.id];

for (const statement of path.get("body")) {
statement.visit();
}
Expand All @@ -317,6 +339,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {

// functions
public Function: (path: NodePath<t.Function>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering function at ${this._getNodeId(path)}`
);
const subVisitor = new ControlFlowGraphVisitor(this.filePath);
path.traverse(subVisitor);

Expand Down Expand Up @@ -374,13 +399,32 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering statement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
);
this._generalNode(path);
const node = this._createNode(path);

this._connectToParents(node);
this._currentParents = [node.id];

let expression;
if (
path.isExpressionStatement() &&
((expression = path.get("expression")),
expression.isAssignmentExpression())
) {
if (this._isSpecial(expression.get("right"))) {
expression.get("right").visit();
}
} else if (this._isSpecial(path)) {
path.traverse(this);
}

path.skip();
};

public Declaration: (path: NodePath<t.Declaration>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering declaration: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering Declaration at ${this._getNodeId(path)}`
);

const node = this._createNode(path);

this._connectToParents(node);
Expand All @@ -406,21 +450,25 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
}
}
}
} else if (this._isSpecial(path)) {
path.traverse(this);
}
path.skip();
};

public Expression: (path: NodePath<t.Expression>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering expression: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering Expression at ${this._getNodeId(path)}`
);

this._generalNode(path);
};

public IfStatement: (path: NodePath<t.IfStatement>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering conditional: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering IfStatement at ${this._getNodeId(path)}`
);

const branchNode = this._createNode(path); // or path.get("test") ??
// TODO test

Expand Down Expand Up @@ -454,8 +502,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering DoWhileStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering DoWhileStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());
this._continueNodesStack.push(new Set());

Expand Down Expand Up @@ -529,8 +578,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering WhileStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering WhileStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());
this._continueNodesStack.push(new Set());

Expand Down Expand Up @@ -583,23 +633,23 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {

public ForStatement: (path: NodePath<t.ForStatement>) => void = (path) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering ForStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ForStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());
this._continueNodesStack.push(new Set());

// init
if (!path.has("init")) {
// unsupported
throw new Error("ForStatement init not implemented");
if (path.has("init")) {
path.get("init").visit();
}

path.get("init").visit();

// test
if (!path.has("test")) {
// unsupported
throw new Error("ForStatement test not implemented");
throw new Error(
`ForStatement test not implemented at ${this._getNodeId(path)}`
);
}

// TODO test
Expand All @@ -625,7 +675,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
// update
if (!path.has("update")) {
// unsupported
throw new Error("ForStatement update not implemented");
throw new Error(
`ForStatement update not implemented at ${this._getNodeId(path)}`
);
}

path.get("update").visit();
Expand Down Expand Up @@ -660,18 +712,23 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering ForInStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ForInStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());
this._continueNodesStack.push(new Set());

if (!path.has("left")) {
// unsupported
throw new Error("ForStatement left not implemented");
throw new Error(
`ForInStatement left not implemented at ${this._getNodeId(path)}`
);
}
if (!path.has("right")) {
// unsupported
throw new Error("ForStatement right not implemented");
throw new Error(
`ForInStatement right not implemented at ${this._getNodeId(path)}`
);
}

// left
Expand Down Expand Up @@ -727,18 +784,23 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering ForInStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ForOfStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());
this._continueNodesStack.push(new Set());

if (!path.has("left")) {
// unsupported
throw new Error("ForStatement left not implemented");
throw new Error(
`ForOfStatement left not implemented at ${this._getNodeId(path)}`
);
}
if (!path.has("right")) {
// unsupported
throw new Error("ForStatement right not implemented");
throw new Error(
`ForOfStatement right not implemented at ${this._getNodeId(path)}`
);
}

// left
Expand Down Expand Up @@ -794,8 +856,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering SwitchStatement: ${path.type}\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering SwitchStatement at ${this._getNodeId(path)}`
);

this._breakNodesStack.push(new Set());

// TODO test
Expand Down Expand Up @@ -852,8 +915,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering break statement\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering BreakStatement at ${this._getNodeId(path)}`
);

const node = this._createNode(path);
this._connectToParents(node);

Expand All @@ -866,8 +930,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering continue statement\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ContinueStatement at ${this._getNodeId(path)}`
);

const node = this._createNode(path);
this._connectToParents(node);

Expand All @@ -880,8 +945,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering return statement\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ReturnStatement at ${this._getNodeId(path)}`
);

const node = this._createNode(path);
this._connectToParents(node);
this._currentParents = [node.id];
Expand All @@ -902,8 +968,9 @@ export class ControlFlowGraphVisitor extends AbstractSyntaxTreeVisitor {
path
) => {
ControlFlowGraphVisitor.LOGGER.debug(
`Entering throw statement\tline: ${path.node.loc.start.line}\tcolumn: ${path.node.loc.start.column}`
`Entering ThrowStatement at ${this._getNodeId(path)}`
);

const node = this._createNode(path);
this._connectToParents(node);

Expand Down
3 changes: 1 addition & 2 deletions libraries/analysis-javascript/lib/dependency/DependencyVisitor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
import { NodePath } from "@babel/core";
import * as t from "@babel/types";
import { AbstractSyntaxTreeVisitor } from "@syntest/ast-visitor-javascript";
import { getLogger } from "@syntest/logging";
import { Logger } from "winston";
import { getLogger, Logger } from "@syntest/logging";

export class DependencyVisitor extends AbstractSyntaxTreeVisitor {
protected static override LOGGER: Logger;
Expand Down
2 changes: 1 addition & 1 deletion libraries/analysis-javascript/lib/target/TargetFactory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

import path = require("path");
import * as path from "node:path";

import { traverse } from "@babel/core";
import * as t from "@babel/types";
Expand Down
Loading

0 comments on commit 4b1ad15

Please sign in to comment.