@jtff/miztemplate-lib 3.0.0-rc17 → 3.0.0-rc18

package/lib/jtff-lib-ci.js

@@ -249,7 +249,7 @@ class MizTemplateCI{
     }
 
     async InjectCiScriptsIntoWorkspace(workspacePath) {
-        fs.cpSync('node_modules/@jtff/miztemplate-lib/ci',workspacePath + '/src/nodejs',{recursive: true});
+        fs.cpSync('node_modules/@jtff/miztemplate-lib/ci',workspacePath + '/.workspace/src/nodejs',{recursive: true});
     }
 
     async deployCIScriptsFromZipObjectIntoWorkspace(workspacePath, mizObject, mizFilePath) {

package/lib/mizlib.js

@@ -12,10 +12,10 @@ class Mizlib {
         // no need for initialization
     }
 
-    async injectLuaScriptIntoZipObjectAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, zipObject, timing, colorString) {
+    async injectLuaScriptIntoZipObjectAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, zipObject, timing, colorString, fromLibrary=true) {
         let missionObject = await this.getMissionObjectFromZipObject(zipObject);
         let mapResourceObject = await this.getMapResourceObjectFromZipObject(zipObject);
-        let tuple = this.injectLuaScriptAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, missionObject, mapResourceObject, timing, colorString);
+        let tuple = this.injectLuaScriptAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, missionObject, mapResourceObject, timing, colorString, fromLibrary);
         for (let luaScript of luaScriptsArray) {
             this.injectFileIntoZipObject(zipObject, [
                     workspacePath,
@@ -29,7 +29,7 @@ class Mizlib {
         return {tuple, zipObject};
     }
 
-    injectLuaScriptAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, missionObject, mapResourceObject, timing, colorString) {
+    injectLuaScriptAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, missionObject, mapResourceObject, timing, colorString ,fromLibrary=true) {
         let tuple = this.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
@@ -40,7 +40,7 @@ class Mizlib {
             colorString
         );
         for (let luaScript of luaScriptsArray) {
-            fs.copyFileSync(
+            fs.cpSync(
                 [
                     'node_modules/@jtff/miztemplate-lib/lua/',
                     folderPath,
@@ -49,11 +49,12 @@ class Mizlib {
                 ].join(""),
                 [
                     workspacePath,
-                    "/",
+                    fromLibrary ? "/.workspace/" : "/",
                     folderPath,
                     "/",
                     path.basename(luaScript)
-                ].join("")
+                ].join(""),
+                {force: true}
             );
         }
         return tuple;
@@ -131,7 +132,7 @@ class Mizlib {
         }
         this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'src');
         this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'lib');
-        await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
+        zipObject = await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
         this.injectSettingsLuaFilesFromFolderIntoZipObject(zipObject, singleMission ? '' : strTheatreSettings);
         await this.injectSoundFoldersIntoZipObject(zipObject);
         const inputZip = await zipObject.generateAsync({
@@ -145,9 +146,8 @@ class Mizlib {
         fs.writeFileSync(copyPath ? copyPath : mizPath, inputZip);
     }
 
-    async mizInjectMissionDataFile(mizPath, missionObject) {
-        const zip = await this.getZipObjectFromMizPath(mizPath);
-        this.mizUpdateMissionDataFile(zip, missionObject);
+    async injectMissionObjectIntoMizFile(mizPath, missionObject) {
+        const zip = this.injectMissionObjectIntoZipObject(await this.getZipObjectFromMizPath(mizPath), missionObject);
         const inputZip = await zip.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
@@ -183,9 +183,8 @@ class Mizlib {
     }
 
 
-    async mizInjectMapResourceFile(mizPath, mapResourceObject) {
-        const zip = await this.getZipObjectFromMizPath(mizPath);
-        this.mizUpdateMapResourceFile(zip, mapResourceObject);
+    async injectMapResourceObjectIntoMizFile(mizPath, mapResourceObject) {
+        const zip = this.injectMapResourceObjectIntoZipObject(await this.getZipObjectFromMizPath(mizPath), mapResourceObject);
         const inputZip = await zip.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
@@ -203,7 +202,7 @@ class Mizlib {
         zip.file("l10n/DEFAULT/" + path.basename(filePath), stream);
     }
 
-    mizUpdateMissionDataFile(zip, missionObject) {
+    injectMissionObjectIntoZipObject(zip, missionObject) {
         zip.remove("mission");
         let missionLuaT = format(missionObject, {singleQuote: false})
         missionLuaT = missionLuaT
@@ -213,9 +212,10 @@ class Mizlib {
             .slice(0, -1)
             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
         zip.file("mission", missionLuaT);
+        return zip;
     }
 
-    mizUpdateMapResourceFile(zip, mapResourceObject) {
+    injectMapResourceObjectIntoZipObject(zip, mapResourceObject) {
         zip.remove("l10n/DEFAULT/mapResource");
         let mapResourceLuaT = format(mapResourceObject, {singleQuote: false})
         mapResourceLuaT = mapResourceLuaT
@@ -225,6 +225,7 @@ class Mizlib {
             .slice(0, -1)
             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
         zip.file("l10n/DEFAULT/mapResource", mapResourceLuaT);
+        return zip;
     }
 
     getMissionLuaStringFromZipObject(zipStream) {
@@ -304,7 +305,7 @@ class Mizlib {
                 }
             }
         };
-        this.mizUpdateMissionDataFile(zip, {mission: mission_object});
+        return this.injectMissionObjectIntoZipObject(zip, {mission: mission_object});
     }
 
     injectSettingsLuaFilesFromFolderIntoZipObject(zip, strTheatre) {
@@ -328,41 +329,48 @@ class Mizlib {
             fs.existsSync(
                 [
                     workspacePath,
-                    "/resources/sounds/",
+                    "/.workspace/resources/sounds/",
                     folderString
                 ].join("")
             ) &&
             fs.lstatSync([
                 workspacePath,
-                "/resources/sounds/",
+                "/.workspace/resources/sounds/",
                 folderString
             ].join("")).isDirectory()
         ) {
             fs.rmSync([
                 workspacePath,
-                "/resources/sounds/",
+                "/.workspace/resources/sounds/",
                 folderString
             ].join(""), {recursive: true});
         }
-        if (fs.existsSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString) && fs.lstatSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString).isDirectory()) {
+        if (
+            fs.existsSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString) &&
+            fs.lstatSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString).isDirectory()) {
             fs.mkdirSync([
                 workspacePath,
-                "/resources/sounds/",
+                "/.workspace/resources/sounds/",
                 folderString
             ].join(""), {recursive: true});
             fs.cpSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString,[
                 workspacePath,
-                "/resources/sounds/",
+                "/.workspace/resources/sounds/",
                 folderString
             ].join(""), {recursive: true});
         }
     }
 
-    async injectSingleSoundFolderIntoZipObject(zip, workspacePath, folder) {
-        if (fs.existsSync(workspacePath + '/resources/sounds/' + folder) && fs.lstatSync(workspacePath + '/resources/sounds/' + folder).isDirectory()) {
-            console.log('adding sound files from '+workspacePath+'/resources/sounds/' + folder + ' folder...');
+    async injectSingleSoundFolderIntoZipObject(zip, workspacePath, folder, fromLibrary = true) {
+        if (
+            fs.existsSync([workspacePath,fromLibrary? '/.workspace/resources/sounds/' : '/resources/sounds/',folder].join('')) &&
+            fs.lstatSync([workspacePath,fromLibrary? '/.workspace/resources/sounds/' : '/resources/sounds/',folder].join('')).isDirectory()) {
+            console.log(['adding sound files from ',workspacePath,fromLibrary? '/.workspace/resources/sounds/' : '/resources/sounds/',folder,' folder...'].join(''));
             zip = zip.remove(folder).folder(folder);
-            await this.addFilesToZip(zip, workspacePath + '/resources/sounds/' + folder, fs.readdirSync(workspacePath + '/resources/sounds/' + folder));
+            await this.addFilesToZip(
+                zip,
+                [workspacePath,fromLibrary? '/.workspace/resources/sounds/' : '/resources/sounds/',folder].join(''),
+                fs.readdirSync([workspacePath,fromLibrary? '/.workspace/resources/sounds/' : '/resources/sounds/',folder].join('')));
         }
     }
 
@@ -409,7 +417,13 @@ class Mizlib {
 
     async getMapResourceObjectFromZipObject(zip) {
         let luaTable = 'return { \n' + await this.getMapResourceLuaStringFromZipObject(zip) + ' }';
-        return parse(luaTable).mapResource;
+        let mrObject = parse(luaTable).mapResource;
+        if (Array.isArray(mrObject)) {
+            if (mrObject.length === 0) {
+                mrObject = {};
+            }
+        }
+        return mrObject;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc17",
+  "version": "3.0.0-rc18",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [
@@ -34,6 +34,7 @@
     "ftp": "^0.3.10",
     "googleapis": "^92.0.0",
     "jszip": "^3.10.1",
+    "loadash": "^1.0.0",
     "lua-json": "^1.0.1",
     "path": "^0.12.7",
     "prompt": "^1.3.0",

package/scripts/inject-scripts.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require("path");
 const prompt = require('prompt');
+var _ = require('lodash');
 
 function injectScripts(jtffci, env_mission) {
     const workspacePath = [
@@ -29,21 +30,33 @@ function injectScripts(jtffci, env_mission) {
     // create a src folder
     fs.mkdirSync([
             workspacePath,
-            "/src"
+            "/.workspace/src"
         ].join(""),
         { recursive: true }
     );
     // create a lib folder
     fs.mkdirSync([
             workspacePath,
-            "/lib"
+            "/.workspace/lib"
         ].join(""),
         { recursive: true }
     );
     // create a resources folder
     fs.mkdirSync([
             workspacePath,
-            "/resources"
+            "/.workspace/resources/sounds"
+        ].join(""),
+        { recursive: true }
+    );
+    fs.mkdirSync([
+            workspacePath,
+            "/resources/radios"
+        ].join(""),
+        { recursive: true }
+    );
+    fs.mkdirSync([
+            workspacePath,
+            "/resources/sounds"
         ].join(""),
         { recursive: true }
     );
@@ -138,11 +151,6 @@ function injectScripts(jtffci, env_mission) {
         let settingsArray = [];
         let scriptsArray = [];
         let libsArray = [];
-        if (Array.isArray(mapResourceObject)) {
-            if (mapResourceObject.length === 0) {
-                mapResourceObject = {};
-            }
-        }
         // insertion des librairies externes dans la file d'attente
         libsArray.push({
             folder: 'lib',
@@ -181,10 +189,10 @@ function injectScripts(jtffci, env_mission) {
         });
         // injection des fichiers son Généraux si repertoire resources/sounds/General present
         await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'General');
-        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'General');
+        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'General', true);
         // injection des fichiers son Misc si repertoire resources/sounds/Misc present
         await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'Misc');
-        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'Misc');
+        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'Misc', true);
         // insertion des Librairies JTFF dans la file d'attente
         settingsArray.push(
             {
@@ -209,20 +217,21 @@ function injectScripts(jtffci, env_mission) {
             color: '0xffff00ff'
         });
         // traitement de la file d'attente des librairies (injection des triggers et des fichiers lua)
-        for ( script of libsArray) {
-            console.log(['adding library',script.scripts.join(' and '),'from',workspacePath + '/' + script.folder, 'folder...'].join(' '));
+        for ( libscript of libsArray) {
+            console.log(['adding library',libscript.scripts.join(' and '),'from',workspacePath + '/.workspace/' + libscript.folder, 'folder...'].join(' '));
             let {tuple, zipObject} = await jtffci.mizlib.injectLuaScriptIntoZipObjectAndUpdateWorkspace(
                 workspacePath,
-                script.folder,
-                script.scripts,
-                script.scriptTitle + ' Load',
+                libscript.folder,
+                libscript.scripts,
+                libscript.scriptTitle + ' Load',
                 mizObject,
-                script.timing,
-                script.color
+                libscript.timing,
+                libscript.color,
+                true
             );
             missionObject['trig'] = tuple.tObject;
             missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            mapResourceObject = _.merge(mapResourceObject,tuple.mrObject);
             mizObject = zipObject;
         }
         // injection de la gestion des Set_Clients dans la file d'attente
@@ -231,7 +240,8 @@ function injectScripts(jtffci, env_mission) {
             scriptTitle: 'Set clients',
             scripts: ['110-set_clients.lua'],
             timing: 21,
-            color: '0xff0000ff'
+            color: '0xff0000ff',
+            fromLibrary: true
         });
         // injection des Tankers et OndemandTankers dans la file d'attente
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_tankers)) {
@@ -250,14 +260,15 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Tankers',
                 scripts: ['120-tankers.lua'],
                 timing: 22,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des Airboss et Pedros dans la file d'attente
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_airboss)) {
             // injection des fichiers son Airboss
             await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'AIRBOSS');
-            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'AIRBOSS');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'AIRBOSS', true);
             settingsArray.push(
                 {
                     file: "settings-airboss.lua",
@@ -273,7 +284,8 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Airboss',
                 scripts: ['130-airboss.lua', '135-pedro.lua'],
                 timing: 23,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des Beacons dans la file d'attente
@@ -289,7 +301,8 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Beacons',
                 scripts: ['140-beacons.lua'],
                 timing: 24,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des AWACS et OnDemandAwacs dans la file d'attente
@@ -309,14 +322,15 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Awacs',
                 scripts: ['150-awacs.lua'],
                 timing: 25,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des ATIS dans la file d'attente
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_atis)) {
             // injection des fichiers son ATIS
             await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'ATIS');
-            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'ATIS');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'ATIS', true);
             settingsArray.push(
                 {
                     file: "settings-atis.lua",
@@ -328,7 +342,8 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'ATIS',
                 scripts: ['160-atis.lua'],
                 timing: 26,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des scripts A2A dans la file d'attente
@@ -360,14 +375,15 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Air To Air',
                 scripts: ['170-cap_zone_training.lua', '172-cap_zone_war.lua', '173-fox_zone_training.lua', '176-random_air_traffic.lua', '178-training-intercept.lua'],
                 timing: 27,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des CTLD dans la file d'attente
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_Logistics)) {
             // injection des fichiers son CTLD
             await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'CTLD');
-            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'CTLD');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'CTLD', true);
             settingsArray.push(
                 {
                     file: "settings-logistics.lua",
@@ -379,14 +395,15 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Logistics',
                 scripts: ['180-logistics.lua'],
                 timing: 28,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection des scripts A2G dans la file d'attente
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_A2G)) {
             // injection des fichiers son Range
             await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder(workspacePath, 'RANGE');
-            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'RANGE');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject,workspacePath, 'RANGE', true);
             settingsArray.push(
                 {
                     file: "settings-ranges.lua",
@@ -418,7 +435,8 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Air To Ground',
                 scripts: ['190-ranges.lua', '191-sams.lua', '193-training_ranges.lua', '195-reaper-ondemand.lua', '196-fac_ranges.lua', '199-skynet.lua'],
                 timing: 29,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: true
             });
         }
         // injection du script spécifique de mission dans la file d'attente
@@ -428,7 +446,8 @@ function injectScripts(jtffci, env_mission) {
                 scriptTitle: 'Mission specific',
                 scripts: ['200-mission.lua'],
                 timing: 30,
-                color: '0xff0000ff'
+                color: '0xff0000ff',
+                fromLibrary: false
             });
         }
         // traitement de la file d'attente des scripts (injection des triggers et des fichiers lua)
@@ -441,11 +460,12 @@ function injectScripts(jtffci, env_mission) {
                 script.scriptTitle,
                 mizObject,
                 script.timing,
-                script.color
+                script.color,
+                script.fromLibrary
             );
             missionObject['trig'] = tuple.tObject;
             missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            mapResourceObject = _.merge(mapResourceObject,tuple.mrObject);
             mizObject = zipObject;
         }
         // injection des preset radio dans les avions humains
@@ -454,7 +474,7 @@ function injectScripts(jtffci, env_mission) {
             fs.mkdirSync(workspacePath + '/resources/radios/' + missionObject.theatre,{recursive: true});
             fs.cpSync('node_modules/@jtff/miztemplate-lib/resources/radios/' + missionObject.theatre,workspacePath + '/resources/radios/' + missionObject.theatre,{recursive: true})
             console.log(destinationMizFilePath + ": injecting radio presets declared in resources/radios/" + missionObject.theatre);
-            await jtffci.mizlib.injectRadioPresetsFromFolderIntoZipObject(mizObject, workspacePath + '/resources/radios/' + missionObject.theatre);
+            mizObject = await jtffci.mizlib.injectRadioPresetsFromFolderIntoZipObject(mizObject, workspacePath + '/resources/radios/' + missionObject.theatre);
         }
         // traitement de la file d'attente des settings (injection des triggers et des fichiers lua)
         if (settingsArray.length > 0) {
@@ -466,36 +486,35 @@ function injectScripts(jtffci, env_mission) {
                 'Mission Settings',
                 mizObject,
                 15,
-                '0xffff00ff'
+                '0xffff00ff',
+                false
             );
             missionObject['trig'] = tuple.tObject;
             missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            mapResourceObject = _.merge(mapResourceObject,tuple.mrObject);
             mizObject = zipObject;
         }
-        // creation du cichier miz dans l'espace de travail
-        await fs.closeSync(fs.openSync(destinationMizFilePath, 'a'));
-        // On fait une sauvegarde dans le folder de destination
-        fs.writeFileSync(
-            destinationMizFilePath,
-            await mizObject.generateAsync({
-                type: 'nodebuffer',
-                streamFiles: true,
-                compression: "DEFLATE",
-                compressionOptions: {
-                    level: 9
-                }
-            })
-        );
-        // Sauvegarde de la mission avec scripts injectés
-        await jtffci.mizlib.mizInjectMissionDataFile(
-            destinationMizFilePath,
+        // réintégration du fichier mission dans l'archive
+        mizObject = await jtffci.mizlib.injectMissionObjectIntoZipObject(
+            mizObject,
             { mission: missionObject }
         );
-        await jtffci.mizlib.mizInjectMapResourceFile(
-            destinationMizFilePath,
+        mizObject = await jtffci.mizlib.injectMapResourceObjectIntoZipObject(
+            mizObject,
             { mapResource: mapResourceObject }
         );
+        // creation du fichier miz dans l'espace de travail
+        await fs.closeSync(fs.openSync(destinationMizFilePath, 'a'));
+        // On fait une sauvegarde dans le folder de destination
+        const inputZip = await mizObject.generateAsync({
+            type: 'nodebuffer',
+            streamFiles: true,
+            compression: "DEFLATE",
+            compressionOptions: {
+                level: 9
+            }
+        });
+        fs.writeFileSync(destinationMizFilePath, inputZip);
         // generation des outils CI JTFF
         await jtffci.deployCIScriptsFromZipObjectIntoWorkspace(workspacePath, mizObject, env_mission);
         console.log('...Done...');