parallel build WS

ccxt · Dec 16, 2022 · 499a87f · 499a87f
1 parent a72e1af
commit 499a87f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/build/transpile.js b/build/transpile.js
@@ -1447,8 +1447,8 @@ class Transpiler {
 
     // ========================================================================
 
-    async getTSClassDeclarationsAllFiles (folder, extension = '.js' ) {
-        const files = fs.readdirSync (folder).filter (file => exchangeIds.includes (basename (file, extension)))
+    async getTSClassDeclarationsAllFiles (ids, folder, extension = '.js')  {
+        const files = fs.readdirSync (folder).filter (file => ids.includes (basename (file, extension)))
         const promiseReadFile = promisify (fs.readFile);
         const fileArray = await Promise.all (files.map (file => promiseReadFile (folder + file, 'utf8')));
         const classComponents = await Promise.all (fileArray.map (file => this.getClassDeclarationMatches (file)));
@@ -1488,7 +1488,7 @@ class Transpiler {
 
     async exportTypeScriptDeclarations (file, jsFolder) {
 
-        const classes = await this.getTSClassDeclarationsAllFiles (jsFolder);
+        const classes = await this.getTSClassDeclarationsAllFiles (exchangeIds, jsFolder);
 
         this.exportTypeScriptClassNames (file, classes)
         this.exportTypeScriptExchangeIds (file, classes)

diff --git a/build/transpileWS.js b/build/transpileWS.js
@@ -18,6 +18,8 @@ const fs = require ('fs')
     , Exchange = require ('../js/pro/base/Exchange.js')
     , tsFilename = './ccxt.d.ts'
 
+    const wsExchangeIds = require ('../exchanges.json').ws
+
 // ============================================================================
 
 class CCXTProTranspiler extends Transpiler {
@@ -242,28 +244,30 @@ class CCXTProTranspiler extends Transpiler {
 
     // -----------------------------------------------------------------------
 
-    exportTypeScriptDeclarations (file, classes) {
+    async exportTypeScriptDeclarations (file, jsFolder) {
 
+        const classes = await this.getTSClassDeclarationsAllFiles (wsExchangeIds, jsFolder);
         this.exportTypeScriptClassNames (file, classes)
     }
 
     // -----------------------------------------------------------------------
 
-    transpileEverything (force = false, child = false) {
+    async transpileEverything (force = false, child = false) {
 
         // default pattern is '.js'
         // const [ /* node */, /* script */, pattern ] = process.argv.filter (x => !x.startsWith ('--'))
         const exchanges = process.argv.slice (2).filter (x => !x.startsWith ('--'))
             // , python2Folder = './python/ccxtpro/', // CCXT Pro does not support Python 2
             , python3Folder = './python/ccxt/pro/'
             , phpAsyncFolder     = './php/pro/'
+            , jsFolder = './js/pro/'
             , options = { /* python2Folder, */ python3Folder, phpAsyncFolder, exchanges }
 
         // createFolderRecursively (python2Folder)
         createFolderRecursively (python3Folder)
         createFolderRecursively (phpAsyncFolder)
 
-        const classes = this.transpileDerivedExchangeFiles ('./js/pro/', options, '.js', force, child || exchanges.length)
+        const classes = this.transpileDerivedExchangeFiles (jsFolder, options, '.js', force, child || exchanges.length)
 
         if (child) {
             return
@@ -280,7 +284,7 @@ class CCXTProTranspiler extends Transpiler {
 
         // HINT: if we're going to support specific class definitions
         // this process won't work anymore as it will override the definitions
-        this.exportTypeScriptDeclarations (tsFilename, classes)
+        await this.exportTypeScriptDeclarations (tsFilename, jsFolder)
 
         //*/
 
@@ -309,10 +313,11 @@ if (require.main === module) {
         log.bright.green ({ force })
     }
     if (multiprocess) {
-        const exchanges = require ('../exchanges.json').ws
-        parallelizeTranspiling (exchanges)
+        parallelizeTranspiling (wsExchangeIds)
     } else {
-        transpiler.transpileEverything (force)
+        (async () => {
+            await transpiler.transpileEverything (force, child)
+        })()
     }
 
 } else {