Skip to content

Commit 03441a4

Browse files
committed
chore: fix merge conflict
2 parents af6df35 + a1ee7fe commit 03441a4

File tree

6 files changed

+1689
-3055
lines changed

6 files changed

+1689
-3055
lines changed

libraries/analysis-javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syntest/analysis-javascript",
3-
"version": "0.1.0-beta.21",
3+
"version": "0.1.0-beta.22",
44
"description": "SynTest CFG JavaScript is a library for generating control flow graphs for the JavaScript language",
55
"keywords": [
66
"syntest",

libraries/instrumentation-javascript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syntest/instrumentation-javascript",
3-
"version": "0.1.0-beta.20",
3+
"version": "0.1.0-beta.21",
44
"description": "SynTest Instrumentation JavaScript is a library for instrumenting JavaScript code",
55
"keywords": [
66
"syntest",
@@ -46,10 +46,10 @@
4646
"test:watch": "mocha --config ../../.mocharc.json --watch"
4747
},
4848
"dependencies": {
49-
"@syntest/analysis-javascript": "^0.1.0-beta.21",
5049
"@babel/core": "7.20.12",
5150
"@babel/traverse": "7.20.12",
5251
"@istanbuljs/schema": "^0.1.3",
52+
"@syntest/analysis-javascript": "^0.1.0-beta.22",
5353
"@syntest/ast-visitor-javascript": "*",
5454
"@syntest/storage": "*",
5555
"istanbul-lib-coverage": "^3.2.0"

libraries/search-javascript/lib/testbuilding/ContextBuilder.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type RenamedImport = {
4545

4646
type Require = {
4747
left: string;
48-
leftVars: string;
4948
right: string;
5049
};
5150

@@ -238,12 +237,11 @@ export class ContextBuilder {
238237

239238
const require: Require = {
240239
left: "",
241-
leftVars: "",
242240
right: `require("${_path}")`,
243241
};
244242

245243
if (import_.renamed) {
246-
require.leftVars = require.left = import_.default
244+
require.left = import_.default
247245
? import_.renamedTo
248246
: `{${import_.name}: ${import_.renamedTo}}`;
249247
} else {

libraries/search-javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syntest/search-javascript",
3-
"version": "0.1.0-beta.15",
3+
"version": "0.1.0-beta.16",
44
"description": "SynTest JavaScript is a tool for automatically generating test cases for the JavaScript language",
55
"keywords": [
66
"syntest",

0 commit comments

Comments
 (0)