[WIP] feature: merge part files into one dart file.

Author: yulingtianxia

lib/main.js

@@ -12,7 +12,7 @@ try {
     console.log('NodeJS version is too low. Running on slow mode.')
 }
 
-
+let dnPartExtension = 'dnpart'
 var outputDir
 var projectName
 var packageSet = new Set()
@@ -58,9 +58,40 @@ function recFindByExt(base, ext, files, result) {
 
 function writeOutputToFileByPath(result, srcPath) {
     var srcFile = srcPath.substr(srcPath.lastIndexOf('/') + 1)
-    var dartFile = srcFile.substring(0, srcFile.indexOf('.')).toLowerCase() + '.dart'
+    var components
+    if (srcFile.endsWith(dnPartExtension)) {
+        partExtension = srcFile.split('.').slice(-2).join('.')
+        components = srcFile.split('.').slice(0, -3)
+        components.push('dart')
+        components.push(partExtension)
+    } else {
+        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
+}
+
+function mergeFiles(filePaths) {
+    if (!filePaths || filePaths.length <= 1) {
+        return
+    }
+
+    let result = filePaths.sort().map(filePath => {
+        if (!filePath) {
+            return ''
+        }
+        return fs.readFileSync(filePath, { encoding: 'utf8' })
+    }).join('\n')
+    let mergedFilePath = filePaths[0].split('.').slice(0, -2).join('.')
+    fs.writeFileSync(mergedFilePath, result)
+    filePaths.forEach((filePath) => {
+        fs.unlinkSync(filePath)
+    })
 }
 
 function formatDartFile(dartPath) {
@@ -74,7 +105,7 @@ function createFlutterPackage(template, projectName) {
 }
 
 function writeDependencyToPubSpec(filePath) {
-    var doc = yaml.safeLoad(fs.readFileSync(filePath, 'utf8'));
+    var doc = yaml.safeLoad(fs.readFileSync(filePath, 'utf8'))
     packageSet.forEach(item => {
         if (typeof (item) == "undefined") {
             return
@@ -85,20 +116,20 @@ function writeDependencyToPubSpec(filePath) {
     fs.writeFileSync(filePath, yaml.safeDump(doc).replace(/null/g, ''))
 }
 
-function generateDartWithWorker(path, script) {
+function generateDartWithWorker(content, path, script) {
     return new Promise((resolve, reject) => {
         if (this.isMainThread) {
             const convert = require(script).convert
-            convert(path, (result, path, error) => {
-                resolve({ result: result, path: path, error: error })
+            convert(content, (result, error) => {
+                resolve({ result: result, error: error })
             })
         } else {
             const worker = new Worker(script, {
-                workerData: { path: path },
+                workerData: { content: content },
                 resourceLimits: { maxOldGenerationSizeMb: 8 * 1024 }
-            });
-            worker.on("message", resolve);
-            worker.on("error", reject);
+            })
+            worker.on("message", resolve)
+            worker.on("error", reject)
         }
     }).then((msg) => {
         if (msg.error) {
@@ -108,13 +139,15 @@ function generateDartWithWorker(path, script) {
         if (!result) {
             return
         }
-        writeOutputToFileByPath(result.dartCode, msg.path)
+
+        let dartFilePath = writeOutputToFileByPath(result.dartCode, path)
 
         if (projectName) {
             result.packages.forEach(item => packageSet.add(item))
         }
-    });
-};
+        return dartFilePath
+    })
+}
 
 function splitCodeFileIfNeed(separator, maxLength, path) {
     const content = rf.readFileSync(path, "utf-8")
@@ -131,16 +164,23 @@ function splitCodeFileIfNeed(separator, maxLength, path) {
 }
 
 async function runWorkItems(workItems) {
-    const promises = Array.from(workItems.keys()).map((path) => {
-        let script = workItems.get(path)
-        console.log('processing: ' + path)
+    const promises = Array.from(workItems.keys()).map((filePath) => {
+        let script = workItems.get(filePath)
+        console.log('processing: ' + filePath)
         // TODO: change separator
-        let contents = splitCodeFileIfNeed("@end\n", 5000, path)
-        let ps = contents.map((content) => {
-            return generateDartWithWorker(content, script)
+        let contents = splitCodeFileIfNeed("@end\n", 5000, filePath)
+        let ps = contents.map((content, index) => {
+            let p = filePath
+            if (contents.length > 1) {
+                p = `${filePath}.${index}.${dnPartExtension}`
+            }
+            return generateDartWithWorker(content, p, script)
         })
-        return ps
-    }).reduce((acc, val) => acc.concat(val), []);
+        return Promise.all(ps).then((results) => {
+            // merge files
+            mergeFiles(results)
+        })
+    })
     await Promise.all(promises)
 }
 

lib/objc/DNObjectiveCConverter.js

@@ -17,7 +17,7 @@ function convert(content, cb) {
     if (!content) {
         if (!workerData) {
             if (cb) {
-                cb(null, null, null)
+                cb(null, null)
             }
             return
         }
@@ -36,16 +36,16 @@ function convert(content, cb) {
         const parser = new ObjectiveCParser(tokens)
         parser.addErrorListener(errorListener)
         const tree = parser.translationUnit()
-        const listener = new DNObjectiveCParserListener(cb, content)
+        const listener = new DNObjectiveCParserListener(cb)
         antlr4.tree.ParseTreeWalker.DEFAULT.walk(listener, tree)
     } catch (e) {
-        cb(null, content, e)
+        cb(null, e)
     }
 }
 
-function callback(result, path, error) {
+function callback(result, error) {
     // Send a message to the main thread.
-    parentPort.postMessage({result: result, path: path, error: error});
+    parentPort.postMessage({result: result, error: error});
 }
 
 convert()

lib/objc/DNObjectiveCParserListener.js

@@ -20,17 +20,16 @@ let DNRootContext = c.DNRootContext,
 
 // This class defines a complete listener for a parse tree produced by ObjectiveCParser.
 class DNObjectiveCParserListener extends ObjectiveCParserListener {
-    constructor(cb, path) {
+    constructor(cb) {
         super()
         ObjectiveCParserListener.call(this)
         //success callack
         this.cb = cb
-        this.path = path
     }
 
     buildDart() {
         var dart = this.rootContext.parse()
-        this.cb(dart, this.path, null)
+        this.cb(dart, null)
     }
 
     // Enter a parse tree produced by ObjectiveCParser#translationUnit.