@@ -36,8 +36,8 @@ var fs = require("fs"),
3636 arguments = process . argv ,
3737 appDir = path . dirname ( require . main . filename ) ,
3838 extendDecoratorName = "JavaProxy" ,
39- outFile = "out/out_parsed_typescript.txt" , //default out file
40- inputDir = "input_parced_typescript" , //default input folder
39+ outFile = "out/out_parsed_typescript.txt" , // default out file
40+ inputDir = "input_parced_typescript" , // default input folder
4141 interfacesNamesFilePath = "../interfaces-names.txt" , //default interace_names file path
4242 interfaceNames = [ ] ;
4343
@@ -87,32 +87,35 @@ var traverseAndAnalyseFilesDir = function (filesDir) {
8787
8888function traverseDirectory ( dir ) {
8989 // list all files in directory
90+
9091 fs . readdir ( dir , function ( err , files ) {
9192 var pJsonFile ;
9293
93- for ( var i = 0 ; i < files . length ; i ++ ) {
94- if ( files [ i ] === "package.json" ) {
95- pJsonFile = true ;
96- break ;
94+ if ( dir !== inputDir ) {
95+ for ( var i = 0 ; i < files . length ; i ++ ) {
96+ if ( files [ i ] === "package.json" ) {
97+ pJsonFile = true ;
98+ break ;
99+ }
97100 }
98- }
99101
100- if ( pJsonFile ) {
101- var fullPJsonPath = path . join ( dir , "package.json" ) ;
102- var pjson = require ( fullPJsonPath ) ;
103- if ( ! pjson . nativescript ) {
104- // if (pjson.nativescript.sbgShouldNotVisit && pjson.nativescript.platforms) {
105- // return;
106- // }
107- return ;
102+ if ( pJsonFile ) {
103+ var fullPJsonPath = path . join ( dir , "package.json" ) ;
104+ var pjson = require ( fullPJsonPath ) ;
105+ if ( ! pjson . nativescript ) {
106+ // if (pjson.nativescript.sbgShouldNotVisit && pjson.nativescript.platforms) {
107+ // return;
108+ // }
109+ return ;
110+ }
108111 }
109112 }
110113
111114 for ( var i = 0 ; i < files . length ; i += 1 ) {
112115 var file = path . join ( dir , files [ i ] ) ;
113-
116+
114117 if ( file . substring ( file . length - 3 , file . length ) === '.js' ) {
115- console . log ( file ) ;
118+ logger . info ( "Visiting JavaScript file: " + file ) ;
116119
117120 readFile ( file )
118121 . then ( astFromFileContent )
@@ -147,6 +150,8 @@ function readInterfaceNames() {
147150 if ( err ) {
148151 reject ( false ) ;
149152 }
153+
154+ inputDir = path . normalize ( inputDir ) ;
150155 resolve ( inputDir ) ;
151156 } ) ;
152157 } )
@@ -163,7 +168,7 @@ var readFile = function (filePath, err) {
163168 fs . readFile ( filePath , function ( err , data ) {
164169
165170 if ( err ) {
166- logger . warn ( "+DIDN'T get content of file!" ) ;
171+ logger . warn ( "+DIDN'T get content of file: " + filePath ) ;
167172 return reject ( err ) ;
168173 }
169174
@@ -215,8 +220,6 @@ var visitAst = function (data, err) {
215220 return reject ( err ) ;
216221 }
217222
218- logger . info ( "+visiting ast with given visitor library!" ) ;
219-
220223 traverse . default ( data . ast , {
221224 enter ( path ) {
222225
0 commit comments