fix: java run result

Author: yulingtianxia

README.md

@@ -26,6 +26,12 @@ It's still under development. Here's how it works:
 $ npm install -g @dartnative/codegen
 ```
 
+## Requirement
+
+``` json
+"node": ">=12.16"
+```
+
 ## Usage
 
 ```

bin/codegen.js

@@ -2,7 +2,7 @@
 const { program } = require('commander')
 const main = require('../lib/main').main
 
-program.version('1.1.1')
+program.version('1.1.5')
 
 program
     .arguments('<input>', 'Iutput directory')

index.js

@@ -1,10 +1,12 @@
 const main = require('./lib/main').main
 
-let dataPath = "test/objc/RuntimeStub.h"
+let path = 'test/objc/RuntimeStub.h'
+// let path = 'test/java/helloworld.java'
+
 let option = {
     output: 'test/dart',
-    template: 'plugin',
-    projectName: 'testPlugin'
+    // template: 'plugin',
+    // projectName: 'testPlugin'
 }
 
-main(dataPath, option, true)
+main(path, option, true)

lib/java/DNJavaConverter.js

@@ -1,5 +1,4 @@
 var antlr4 = require('antlr4')
-var rf = require("fs")
 var JavaLexer = require('../../parser/java/Java9Lexer').Java9Lexer
 var JavaParser = require('../../parser/java/Java9Parser').Java9Parser
 var DNJavaParserListener = require('./DNJavaParserListener').DNJavaParserListener
@@ -13,39 +12,41 @@ try {
     console.log('NodeJS version is too low. Running on slow mode.')
 }
 
-function convert(path, cb) {
-    if (!path) {
+function convert(content, cb) {
+    if (!content) {
         if (!workerData) {
-            console.log('return: ')
+            if (cb) {
+                cb(null, null)
+            }
             return
         }
-        path = workerData.path
+        content = workerData.content
     }
     if (!cb) {
         cb = callback
     }
-    
+
     try {
-        var content = rf.readFileSync(path, "utf-8")
         var chars = new antlr4.InputStream(content)
         var lexer = new JavaLexer(chars)
         lexer.addErrorListener(new ConsoleErrorListener())
 
         var tokens = new antlr4.CommonTokenStream(lexer)
         var parser = new JavaParser(tokens)
         parser.addErrorListener(new ConsoleErrorListener())
-        
-        var listener = new DNJavaParserListener(cb, path)
+
+        let isPartOfFile = workerData ? workerData.isPartOfFile : false
+        var listener = new DNJavaParserListener(cb, isPartOfFile)
         var tree = parser.compilationUnit()
         antlr4.tree.ParseTreeWalker.DEFAULT.walk(listener, tree)
     } catch (e) {
-        cb(null, path, e)
+        cb(null, e)
     }
 }
 
 function callback(result, path, error) {
     // Send a message to the main thread.
-    parentPort.postMessage({result: result, path: path, error: error});
+    parentPort.postMessage({ result: result, error: error });
 }
 
 convert()

lib/java/DNJavaParserListener.js

@@ -9,17 +9,16 @@ var DNRootContext = c.DNRootContext,
     DNArgumentContext = c.DNArgumentContext
 
 class DNJavaParserListener extends JavaListener {
-    constructor(cb, path) {
+    constructor(cb, isPartOfFile) {
         super()
-        JavaListener.call(this)
         //success callack
         this.cb = cb
-        this.path = path
+        this.isPartOfFile = isPartOfFile
     }
 
     buildDart() {
         var dart = this.rootContext.parse()
-        this.cb(dart,this.path,null)
+        this.cb(dart, null)
     }
 
     // Enter a parse tree produced by Java9Parser#literal.

lib/main.js

@@ -1,6 +1,5 @@
 const { execSync } = require('child_process')
 const fs = require("fs")
-let rf = require("fs")
 const path = require("path")
 const yaml = require('js-yaml')
 let Worker
@@ -29,7 +28,8 @@ const scriptForExtension = {
 const fileSplitConfig = new Map()
 fileSplitConfig.set(scriptForExtension.h, {
     separator: '@end\n',
-    maxLength: 5000}
+    maxLength: 5000
+}
 )
 
 function mkdirs(dirname) {
@@ -80,9 +80,9 @@ function writeOutputToFileByPath(result, srcPath) {
         components = srcFile.split('.').slice(0, -1)
         components.push('dart')
     }
-    
+
     let dartFile = components.join('.').toLowerCase()
-    
+
     var outputFile = outputDir ? path.join(outputDir, dartFile) : dartFile
     fs.writeFileSync(outputFile, result)
     return outputFile
@@ -114,7 +114,7 @@ function formatDartFile(dartPath) {
 function createFlutterPackage(template, projectName) {
     var command = 'flutter create'
     if (template == 'plugin') {
-        command += '--platforms=android,ios --template=' + template
+        command += ' --platforms=android,ios --template=' + template
     }
     command += ' --project-name ' + projectName + ' ' + outputDir
     execSync(command, { stdio: 'inherit' })
@@ -140,7 +140,7 @@ function generateDartWithWorker(content, path, script) {
                 resolve({ result: result, error: error })
             })
         } else {
-            isPartOfFile = path.endsWith(dnPartExtension) && !path.endsWith(`0.${dnPartExtension}`)
+            const isPartOfFile = path.endsWith(dnPartExtension) && !path.endsWith(`0.${dnPartExtension}`)
             const worker = new Worker(script, {
                 workerData: { content: content, isPartOfFile: isPartOfFile },
                 resourceLimits: { maxOldGenerationSizeMb: 8 * 1024 }
@@ -166,15 +166,18 @@ function generateDartWithWorker(content, path, script) {
     })
 }
 
-function splitCodeFileIfNeed(separator, maxLength, path) {
-    const content = rf.readFileSync(path, "utf-8")
-    if (!this.isMainThread && isSupportWorkerThreads && content.length > maxLength) {
-        let components = content.split(separator)
+function splitCodeFileIfNeed(config, path) {
+    const content = fs.readFileSync(path, "utf-8")
+    if (!config || !config.separator || !config.maxLength) {
+        return [content]
+    }
+    if (!this.isMainThread && isSupportWorkerThreads && content.length > config.maxLength) {
+        let components = content.split(config.separator)
         return components.map((c, i) => {
             if (i == components.length - 1) {
                 return c
             }
-            return c + separator
+            return c + config.separator
         })
     }
     return [content]
@@ -185,7 +188,7 @@ async function runWorkItems(workItems) {
         let script = workItems.get(filePath)
         let config = fileSplitConfig.get(script)
         console.log('processing: ' + filePath)
-        let contents = splitCodeFileIfNeed(config.separator, config.maxLength, filePath)
+        let contents = splitCodeFileIfNeed(config, filePath)
         let ps = contents.map((content, index) => {
             let p = filePath
             if (contents.length > 1) {
@@ -208,7 +211,7 @@ function checkTemplateValid(template) {
 async function main(input, options, onMainThread = !isSupportWorkerThreads) {
     this.isMainThread = onMainThread
 
-    language = options.language
+    var language = options.language
     if (!language) {
         language = 'auto'
     }
@@ -228,7 +231,7 @@ async function main(input, options, onMainThread = !isSupportWorkerThreads) {
     mkdirs(outputDir)
 
     projectName = options.projectName
-    template = options.template
+    const template = options.template
     if (projectName && checkTemplateValid(template)) {
         outputDir = path.join(outputDir, projectName)
         createFlutterPackage(template, projectName)

lib/objc/DNObjectiveCParserListener.js

@@ -22,7 +22,6 @@ let DNRootContext = c.DNRootContext,
 class DNObjectiveCParserListener extends ObjectiveCParserListener {
     constructor(cb, isPartOfFile) {
         super()
-        ObjectiveCParserListener.call(this)
         //success callack
         this.cb = cb
         this.isPartOfFile = isPartOfFile