Skip to content

Commit 72a44e4

Browse files
vtrifonovvmutafov
authored andcommitted
removing lazy dependency to fix buffer warning (#1393)
1 parent a98e652 commit 72a44e4

5 files changed

Lines changed: 75 additions & 60 deletions

File tree

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,17 @@ task generateDtsgJar(type: Exec) {
127127
}
128128
}
129129

130+
task jsParserNPMInstall(type: Exec) {
131+
doFirst {
132+
workingDir "$TEST_APP_PATH/build-tools/jsparser"
133+
if (isWinOs) {
134+
commandLine "cmd", "/c", "npm", "install"
135+
} else {
136+
commandLine "npm", "install"
137+
}
138+
}
139+
}
140+
130141
task generateSbgJar(type: Exec) {
131142
doFirst {
132143
workingDir "$TEST_APP_PATH"
@@ -328,6 +339,7 @@ task createNpmPackage(type: Exec) {
328339
}
329340

330341
generateSbgJar.dependsOn(generateDtsgJar)
342+
generateSbgJar.dependsOn(jsParserNPMInstall)
331343
generateMdgJar.dependsOn(generateSbgJar)
332344
createDistDir.dependsOn(generateMdgJar)
333345

test-app/build-tools/jsparser/js_parser.js

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ loggingSettings = {
2222
var fs = require("fs"),
2323
babelParser = require("babylon"),
2424
traverse = require("babel-traverse"),
25+
split = require('split'),
2526
logger = require('./helpers/logger')(loggingSettings),
2627
path = require("path"),
2728
es5_visitors = require("./visitors/es5-visitors"),
28-
lazy = require("lazy"),
2929
eol = require('os').EOL,
3030

3131
BUILD_TOOLS_DIR = `${__dirname}/../`,
@@ -99,17 +99,20 @@ readLinesFromFile(inputFilesPath, inputFiles, tsHelpersFilePath)
9999
*/
100100
function readLinesFromFile(filePath, outArr, resolveParameter) {
101101
return new Promise(function (resolve, reject) {
102-
new lazy(fs.createReadStream(filePath))
103-
.lines
104-
.forEach(function (line) {
102+
fs.createReadStream(filePath)
103+
.pipe(split())
104+
.on('data', function (line) {
105+
// skip empty lines
106+
if(/\S/.test(line)) {
105107
outArr.push(line.toString().trim());
106-
}).on('pipe', function (err) {
107-
if (err) {
108-
return reject(err);
109-
}
110-
111-
return resolve(resolveParameter)
112-
});
108+
}
109+
})
110+
.on('error', function(err) {
111+
return reject(err);
112+
})
113+
.on('close', function(e) {
114+
return resolve(resolveParameter)
115+
});
113116
});
114117
}
115118

@@ -144,19 +147,21 @@ function getFileAst(tsHelpersFilePath) {
144147
*/
145148
function readInterfaceNames(data, err) {
146149
return new Promise(function (resolve, reject) {
147-
new lazy(fs.createReadStream(interfacesNamesFilePath))
148-
.lines
149-
.forEach(function (line) {
150-
interfaceNames.push(line.toString());
151-
}).on('pipe', function (err) {
152-
if (err) {
153-
return reject(false);
154-
}
155-
156-
inputDir = path.normalize(inputDir);
157-
158-
return resolve(inputDir);
159-
});
150+
fs.createReadStream(interfacesNamesFilePath)
151+
.pipe(split())
152+
.on('data', function (line) {
153+
// skip empty lines
154+
if(/\S/.test(line)) {
155+
interfaceNames.push(line.toString().trim());
156+
}
157+
})
158+
.on('error', function(e) {
159+
return reject(false);
160+
})
161+
.on('close', function(e) {
162+
inputDir = path.normalize(inputDir);
163+
return resolve(inputDir);
164+
});
160165
})
161166
}
162167

test-app/build-tools/jsparser/package-lock.json

Lines changed: 31 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/build-tools/jsparser/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "ast-parser",
2+
"name": "js-parser",
33
"version": "1.0.0",
44
"description": "javascript static analysis tool",
55
"main": "js_parser.js",
@@ -13,7 +13,7 @@
1313
"babel-traverse": "6.26.0",
1414
"babel-types": "6.26.0",
1515
"babylon": "6.18.0",
16-
"lazy": "1.0.11"
16+
"split": "1.0.1"
1717
},
1818
"repository": "https://github.com/NativeScript/android-runtime",
1919
"devDependencies": {

test-app/settings.gradle

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,4 @@ include ':app',
77

88
project(':static-binding-generator').projectDir = new File('build-tools/static-binding-generator')
99
project(':android-metadata-generator').projectDir = new File('build-tools/android-metadata-generator')
10-
project(':dts-generator').projectDir = new File('build-tools/android-dts-generator/dts-generator')
11-
12-
def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
13-
exec {
14-
workingDir "$rootDir/build-tools/jsparser"
15-
if (isWinOs) {
16-
commandLine "cmd", "/c", "npm", "install"
17-
} else {
18-
commandLine "npm", "install"
19-
}
20-
}
10+
project(':dts-generator').projectDir = new File('build-tools/android-dts-generator/dts-generator')

0 commit comments

Comments
 (0)