npm - @jtff/miztemplate-lib - Versions diffs - 3.0.0-rc1 → 3.0.0-rc10 - Mend

@jtff/miztemplate-lib 3.0.0-rc1 → 3.0.0-rc10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/index.js +2 -2
package/lib/jtff-lib-ci.js +3 -1
package/lib/mizlib.js +270 -285
package/package.json +1 -1
package/scripts/build.js +1 -2
package/scripts/inject-scripts.js +33 -34
package/scripts/template-update.js +1 -1

package/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 const MizTemplateCI = require("./lib/jtff-lib-ci.js");
-const mizlib = require("./lib/mizlib.js");
+const Mizlib = require("./lib/mizlib.js");
 const build = require("./scripts/build.js");
 const clean = require("./scripts/clean.js");
 const ftpupload = require("./scripts/ftpupload.js");
@@ -13,6 +13,7 @@ const templateUpdate = require("./scripts/template-update.js");
 module.exports = {
     MizTemplateCI: MizTemplateCI,
+    Mizlib: Mizlib,
     build:build,
     clean:clean,
     ftpupload:ftpupload,
@@ -24,5 +25,4 @@ module.exports = {
     nextversionPrepare:nextversionPrepare,
     release:release,
     templateUpdate:templateUpdate,
-    mizlib: mizlib,
 };

package/lib/jtff-lib-ci.js CHANGED Viewed

@@ -4,10 +4,12 @@ const fs = require("fs");
 const path = require("path");
 const { google } = require("googleapis");
 const ftpClient = require('ftp');
+const Mizlib = require("./mizlib");
 class MizTemplateCI{
     constructor(config) {
-        this.config = config
+        this.config = config;
+        this.mizlib = new Mizlib();
     }
     getVersion() {

package/lib/mizlib.js CHANGED Viewed

@@ -1,336 +1,321 @@
 "use strict";
 const jszip = require("jszip");
-const lstat = promisify(fs.lstat);
 const path = require("path");
 const {format, parse} = require("lua-json");
 const {promisify} = require("util");
+const fs = require("fs");
+const lstat = promisify(fs.lstat);
-function injectLuaScriptsInMissionObject(tObject, trObject, mrObject, strTitle, scriptFilesArray, timingInSeconds, hexColor) {
-    let nextIndex = Object.keys(trObject).length + 1;
-    if (nextIndex === 1) {
-        tObject['actions'] = {};
-        tObject['func'] = {};
-        tObject['conditions'] = {};
-        tObject['flag'] = {};
-        trObject = {};
+class Mizlib {
+    constructor() {
+      // no need for initialization
     }
-    let actionSentence = "";
-    let actionsObject = {};
-    for (const [index, scriptFile] of scriptFilesArray.entries()) {
-        actionSentence += "a_do_script_file(getValueResourceByKey(\"" + scriptFile + "\")); "
-        actionsObject[index + 1] = {
-            file: scriptFile,
-            predicate: 'a_do_script_file',
+    injectLuaScriptsInMissionObject(tObject, trObject, mrObject, strTitle, scriptFilesArray, timingInSeconds, hexColor) {
+        let nextIndex = Object.keys(trObject).length + 1;
+        if (nextIndex === 1) {
+            tObject['actions'] = {};
+            tObject['func'] = {};
+            tObject['conditions'] = {};
+            tObject['flag'] = {};
+            trObject = {};
+        }
+        let actionSentence = "";
+        let actionsObject = {};
+        for (const [index, scriptFile] of scriptFilesArray.entries()) {
+            actionSentence += "a_do_script_file(getValueResourceByKey(\"" + scriptFile + "\")); "
+            actionsObject[index + 1] = {
+                file: scriptFile,
+                predicate: 'a_do_script_file',
+            };
+            mrObject[scriptFile] = scriptFile;
+        }
+        actionSentence += "mission.trig.func[" + nextIndex + "]=nil;"
+        tObject['actions'][nextIndex] = actionSentence;
+        tObject['func'][nextIndex] = "if mission.trig.conditions[" + nextIndex + "]() then mission.trig.actions[" + nextIndex + "]() end";
+        tObject['conditions'][nextIndex] = "return(c_time_after(" + timingInSeconds + ") )";
+        tObject['flag'][nextIndex] = true;
+        trObject[nextIndex] = {
+            rules: {
+                1: {
+                    coalitionlist: 'red',
+                    seconds: timingInSeconds,
+                    predicate: 'c_time_after',
+                    zone: ''
+                }
+            },
+            eventlist: '',
+            comment: strTitle,
+            actions: actionsObject,
+            predicate: 'triggerOnce',
+            colorItem: hexColor
         };
-        mrObject[scriptFile] = scriptFile;
+        return {tObject: tObject, trObject: trObject, mrObject: mrObject};
     }
-    actionSentence += "mission.trig.func[" + nextIndex + "]=nil;"
-    tObject['actions'][nextIndex] = actionSentence;
-    tObject['func'][nextIndex] = "if mission.trig.conditions[" + nextIndex + "]() then mission.trig.actions[" + nextIndex + "]() end";
-    tObject['conditions'][nextIndex] = "return(c_time_after(" + timingInSeconds + ") )";
-    tObject['flag'][nextIndex] = true;
-    trObject[nextIndex] = {
-        rules: {
-            1: {
-                coalitionlist: 'red',
-                seconds: timingInSeconds,
-                predicate: 'c_time_after',
-                zone: ''
-            }
-        },
-        eventlist: '',
-        comment: strTitle,
-        actions: actionsObject,
-        predicate: 'triggerOnce',
-        colorItem: hexColor
-    };
-    return { tObject: tObject, trObject: trObject, mrObject: mrObject };
-}
-async function getZipObjectFromMizPath(mizPath) {
-    var MizFile = new jszip();
-    const mizData = fs.readFileSync(mizPath);
-    return MizFile.loadAsync(mizData);
-}
-async function mizUpdate(mizPath, copyPath, strTheatreSettings) {
-    const zip = await getZipObjectFromMizPath(mizPath);
-    injectLuaFilesFromFolderIntoZipObject(zip,'src');
-    injectLuaFilesFromFolderIntoZipObject(zip,'lib');
-    if (strTheatreSettings === null) {
-        // TODO: Inject fake data
-        console.log("NO THEATRE SPECIFIED. RADIO PRESETS WILL NOT BE AVAILABLE !");
-    } else {
-        await mizUpdateRadioPresets(zip, 'resources/radios/' + strTheatreSettings);
+    async getZipObjectFromMizPath(mizPath) {
+        var MizFile = new jszip();
+        const mizData = fs.readFileSync(mizPath);
+        return MizFile.loadAsync(mizData);
     }
-    mizUpdateSettingsLuaFiles(zip, strTheatreSettings);
-    await mizUpdateSoundFolders(zip);
-    const inputZip = await zip.generateAsync({
-        type: 'nodebuffer',
-        streamFiles: true,
-        compression: "DEFLATE",
-        compressionOptions: {
-            level: 9
-        }
-    });
-    fs.writeFileSync(copyPath ? copyPath : mizPath, inputZip);
-}
-async function mizInjectMissionDataFile(mizPath, missionObject) {
-    const zip = await getZipObjectFromMizPath(mizPath);
-    mizUpdateMissionDataFile(zip, missionObject);
-    const inputZip = await zip.generateAsync({
-        type: 'nodebuffer',
-        streamFiles: true,
-        compression: "DEFLATE",
-        compressionOptions: {
-            level: 9
-        }
-    });
-    fs.writeFileSync(mizPath, inputZip);
-}
-async function injectLuaSettingsFromFolderPathToMizPath(mizPath, settingsFolder) {
-    const zip = await getZipObjectFromMizPath(mizPath);
-    await injectLuaSettingsFromFolderPathToZipObject(zip,settingsFolder);
-    const outputZip = await zip.generateAsync({
-        type: 'nodebuffer',
-        streamFiles: true,
-        compression: "DEFLATE",
-        compressionOptions: {
-            level: 9
+    async mizUpdate(mizPath, copyPath, strTheatreSettings) {
+        const zip = await this.getZipObjectFromMizPath(mizPath);
+        this.injectLuaFilesFromFolderIntoZipObject(zip, 'src');
+        this.injectLuaFilesFromFolderIntoZipObject(zip, 'lib');
+        if (strTheatreSettings === null) {
+            // TODO: Inject fake data
+            console.log("NO THEATRE SPECIFIED. RADIO PRESETS WILL NOT BE AVAILABLE !");
+        } else {
+            await this.mizUpdateRadioPresets(zip, 'resources/radios/' + strTheatreSettings);
         }
-    });
-    fs.writeFileSync(mizPath, outputZip);
-}
+        this.mizUpdateSettingsLuaFiles(zip, strTheatreSettings);
+        await this.mizUpdateSoundFolders(zip);
+        const inputZip = await zip.generateAsync({
+            type: 'nodebuffer',
+            streamFiles: true,
+            compression: "DEFLATE",
+            compressionOptions: {
+                level: 9
+            }
+        });
+        fs.writeFileSync(copyPath ? copyPath : mizPath, inputZip);
+    }
-async function injectLuaSettingsFromFolderPathToZipObject(zip, settingsFolder) {
-    for (let file of fs.readdirSync(settingsFolder).filter(file => file.endsWith(".lua"))) {
-        injectFileIntoZipObject(zip, [
-            settingsFolder,
-            "/",
-            file].join(""));
+    async mizInjectMissionDataFile(mizPath, missionObject) {
+        const zip = await this.getZipObjectFromMizPath(mizPath);
+        this.mizUpdateMissionDataFile(zip, missionObject);
+        const inputZip = await zip.generateAsync({
+            type: 'nodebuffer',
+            streamFiles: true,
+            compression: "DEFLATE",
+            compressionOptions: {
+                level: 9
+            }
+        });
+        fs.writeFileSync(mizPath, inputZip);
     }
-}
+    async injectLuaSettingsFromFolderPathToMizPath(mizPath, settingsFolder) {
+        const zip = await this.getZipObjectFromMizPath(mizPath);
+        await this.injectLuaSettingsFromFolderPathToZipObject(zip, settingsFolder);
+        const outputZip = await zip.generateAsync({
+            type: 'nodebuffer',
+            streamFiles: true,
+            compression: "DEFLATE",
+            compressionOptions: {
+                level: 9
+            }
+        });
+        fs.writeFileSync(mizPath, outputZip);
+    }
-async function mizInjectMapResourceFile(mizPath, mapResourceObject) {
-    const zip = await getZipObjectFromMizPath(mizPath);
-    mizUpdateMapResourceFile(zip, mapResourceObject);
-    const inputZip = await zip.generateAsync({
-        type: 'nodebuffer',
-        streamFiles: true,
-        compression: "DEFLATE",
-        compressionOptions: {
-            level: 9
+    async injectLuaSettingsFromFolderPathToZipObject(zip, settingsFolder) {
+        for (let file of fs.readdirSync(settingsFolder).filter(file => file.endsWith(".lua"))) {
+            this.injectFileIntoZipObject(zip, [
+                settingsFolder,
+                "/",
+                file].join(""));
         }
-    });
-    fs.writeFileSync(mizPath, inputZip);
-}
+    }
-function injectFileIntoZipObject(zip, filePath) {
-    zip.remove("l10n/DEFAULT/" + path.basename(filePath));
-    var stream = fs.createReadStream(filePath);
-    zip.file("l10n/DEFAULT/" + path.basename(filePath), stream);
-}
-function mizUpdateMissionDataFile(zip, missionObject) {
-    zip.remove("mission");
-    let missionLuaT = format(missionObject, { singleQuote: false })
-    missionLuaT = missionLuaT
-        .split('\n')
-        .slice(1, -1)
-        .join('\n')
-        .slice(0, -1)
-        .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
-    zip.file("mission", missionLuaT);
-}
+    async mizInjectMapResourceFile(mizPath, mapResourceObject) {
+        const zip = await this.getZipObjectFromMizPath(mizPath);
+        this.mizUpdateMapResourceFile(zip, mapResourceObject);
+        const inputZip = await zip.generateAsync({
+            type: 'nodebuffer',
+            streamFiles: true,
+            compression: "DEFLATE",
+            compressionOptions: {
+                level: 9
+            }
+        });
+        fs.writeFileSync(mizPath, inputZip);
+    }
-function mizUpdateMapResourceFile(zip, mapResourceObject) {
-    zip.remove("l10n/DEFAULT/mapResource");
-    let mapResourceLuaT = format(mapResourceObject, { singleQuote: false })
-    mapResourceLuaT = mapResourceLuaT
-        .split('\n')
-        .slice(1, -1)
-        .join('\n')
-        .slice(0, -1)
-        .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
-    zip.file("l10n/DEFAULT/mapResource", mapResourceLuaT);
-}
+    injectFileIntoZipObject(zip, filePath) {
+        zip.remove("l10n/DEFAULT/" + path.basename(filePath));
+        var stream = fs.createReadStream(filePath);
+        zip.file("l10n/DEFAULT/" + path.basename(filePath), stream);
+    }
-function getMissionLuaStringFromZipObject(zipStream) {
-    return zipStream.file("mission").async("string");
-}
+    mizUpdateMissionDataFile(zip, missionObject) {
+        zip.remove("mission");
+        let missionLuaT = format(missionObject, {singleQuote: false})
+        missionLuaT = missionLuaT
+            .split('\n')
+            .slice(1, -1)
+            .join('\n')
+            .slice(0, -1)
+            .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
+        zip.file("mission", missionLuaT);
+    }
-function getMapResourceLuaStringFromZipObject(zipStream) {
-    return zipStream.file("l10n/DEFAULT/mapResource").async("string");
-}
+    mizUpdateMapResourceFile(zip, mapResourceObject) {
+        zip.remove("l10n/DEFAULT/mapResource");
+        let mapResourceLuaT = format(mapResourceObject, {singleQuote: false})
+        mapResourceLuaT = mapResourceLuaT
+            .split('\n')
+            .slice(1, -1)
+            .join('\n')
+            .slice(0, -1)
+            .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
+        zip.file("l10n/DEFAULT/mapResource", mapResourceLuaT);
+    }
-function injectLuaFilesFromFolderIntoZipObject(zip, folderPath) {
-    for (let file of fs.readdirSync(folderPath).filter(file => file.endsWith(".lua"))) {
-        console.log('injecting up2date ' + folderPath + '/' + file + ' file in archive');
-        injectFileIntoZipObject(zip, folderPath + "/" + file);
-    };
-}
+    getMissionLuaStringFromZipObject(zipStream) {
+        return zipStream.file("mission").async("string");
+    }
+    getMapResourceLuaStringFromZipObject(zipStream) {
+        return zipStream.file("l10n/DEFAULT/mapResource").async("string");
+    }
+    injectLuaFilesFromFolderIntoZipObject(zip, folderPath) {
+        for (let file of fs.readdirSync(folderPath).filter(file => file.endsWith(".lua"))) {
+            console.log('injecting up2date ' + folderPath + '/' + file + ' file in archive');
+            this.injectFileIntoZipObject(zip, folderPath + "/" + file);
+        }
+        ;
+    }
-async function mizUpdateRadioPresets(zip, preset_folder) {
-    // Create folder Avionics to make sure it exists then delete it to remove any old preset in the template
-    // Allows adding presets for A-10C
-    zip.folder("Avionics");
-    zip.remove("Avionics");
+    async mizUpdateRadioPresets(zip, preset_folder) {
+        // Create folder Avionics to make sure it exists then delete it to remove any old preset in the template
+        // Allows adding presets for A-10C
+        zip.folder("Avionics");
+        zip.remove("Avionics");
-    const mission_object = await getMissionObjectFromZipObject(zip);
-    for (let file of fs.readdirSync(preset_folder).filter(file => file.endsWith(".lua"))) {
-        const file_data = fs.readFileSync(preset_folder + '/' + file).toString();
-        const lua_string = file_data.substring(0, file_data.indexOf("radio_descriptor_table =") - 1);
-        const radio_descriptor_table = parse("return {" + lua_string + "}").descriptor;
+        const mission_object = await this.getMissionObjectFromZipObject(zip);
+        for (let file of fs.readdirSync(preset_folder).filter(file => file.endsWith(".lua"))) {
+            const file_data = fs.readFileSync(preset_folder + '/' + file).toString();
+            const lua_string = file_data.substring(0, file_data.indexOf("radio_descriptor_table =") - 1);
+            const radio_descriptor_table = parse("return {" + lua_string + "}").descriptor;
-        console.log('updating radio presets (aircraft: ' + radio_descriptor_table["aircraft"] + ', group_name: ' + radio_descriptor_table["group_name"] + ') with preset in ' + preset_folder + ' folder');
-        const dcs_radio_presets = file_data.substring(file_data.indexOf("radio_descriptor_table =") + 24);
+            console.log('updating radio presets (aircraft: ' + radio_descriptor_table["aircraft"] + ', group_name: ' + radio_descriptor_table["group_name"] + ') with preset in ' + preset_folder + ' folder');
+            const dcs_radio_presets = file_data.substring(file_data.indexOf("radio_descriptor_table =") + 24);
-        for (const coalition_key in mission_object.coalition) {
-            const coalition = mission_object.coalition[coalition_key];
-            for (const country_list_key in coalition) {
-                if (country_list_key != "country") continue;
-                const country_list = coalition[country_list_key];
-                for (const country_key in country_list) {
-                    const country = country_list[country_key];
-                    for (const plane_key in country["plane"]) {
-                        const plane = country["plane"][plane_key];
-                        for (const group_key in plane) {
-                            const group = plane[group_key];
-                            if (group["name"].match(radio_descriptor_table["group_name"]) == null) continue;
-                            for (const unit_key in group) {
-                                if (unit_key != "units") continue;
-                                const unit = group[unit_key];
-                                for (const sub_unit_key in unit) {
-                                    const sub_unit = unit[sub_unit_key];
-                                    if (sub_unit["skill"] != "Client") continue;
-                                    // Aircraft is an A10CII, use A10C mode by creating files in the root with the unit id
-                                    // if (radio_descriptor_table["aircraft"] == 'A-10C_2') {
-                                    //     const unit_id = sub_unit["unitId"];
-                                    //     ["UHF_RADIO", "VHF_AM_RADIO", "VHF_FM_RADIO"].forEach(folder => {
-                                    //         var zip_folder = zip.folder("Avionics/A-10C_2/" + unit_id + "/" + folder);
-                                    //         var file = parse("return " + dcs_radio_presets)[folder];
-                                    //         file = format(file, { singleQuote: false });
-                                    //         file = file
-                                    //             .split('\n')
-                                    //             .slice(1, -1)
-                                    //             .join('\n')
-                                    //             .slice(0, -1)
-                                    //             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
-                                    //         zip_folder.file("SETTINGS.lua", file);
-                                    //     });
-                                    //     continue;
-                                    // }
-                                    if (sub_unit["type"] != radio_descriptor_table["aircraft"]) continue;
-                                    // GROUP FOUND, SET RADIOS
-                                    sub_unit["Radio"] = parse("return " + dcs_radio_presets)
+            for (const coalition_key in mission_object.coalition) {
+                const coalition = mission_object.coalition[coalition_key];
+                for (const country_list_key in coalition) {
+                    if (country_list_key != "country") continue;
+                    const country_list = coalition[country_list_key];
+                    for (const country_key in country_list) {
+                        const country = country_list[country_key];
+                        for (const plane_key in country["plane"]) {
+                            const plane = country["plane"][plane_key];
+                            for (const group_key in plane) {
+                                const group = plane[group_key];
+                                if (group["name"].match(radio_descriptor_table["group_name"]) == null) continue;
+                                for (const unit_key in group) {
+                                    if (unit_key != "units") continue;
+                                    const unit = group[unit_key];
+                                    for (const sub_unit_key in unit) {
+                                        const sub_unit = unit[sub_unit_key];
+                                        if (sub_unit["skill"] != "Client") continue;
+                                        // Aircraft is an A10CII, use A10C mode by creating files in the root with the unit id
+                                        // if (radio_descriptor_table["aircraft"] == 'A-10C_2') {
+                                        //     const unit_id = sub_unit["unitId"];
+                                        //     ["UHF_RADIO", "VHF_AM_RADIO", "VHF_FM_RADIO"].forEach(folder => {
+                                        //         var zip_folder = zip.folder("Avionics/A-10C_2/" + unit_id + "/" + folder);
+                                        //         var file = parse("return " + dcs_radio_presets)[folder];
+                                        //         file = format(file, { singleQuote: false });
+                                        //         file = file
+                                        //             .split('\n')
+                                        //             .slice(1, -1)
+                                        //             .join('\n')
+                                        //             .slice(0, -1)
+                                        //             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
+                                        //         zip_folder.file("SETTINGS.lua", file);
+                                        //     });
+                                        //     continue;
+                                        // }
+                                        if (sub_unit["type"] != radio_descriptor_table["aircraft"]) continue;
+                                        // GROUP FOUND, SET RADIOS
+                                        sub_unit["Radio"] = parse("return " + dcs_radio_presets)
+                                    }
                                 }
                             }
                         }
                     }
                 }
             }
-        }
-    };
-    mizUpdateMissionDataFile(zip, {mission: mission_object});
-}
+        };
+        this.mizUpdateMissionDataFile(zip, {mission: mission_object});
+    }
-function mizUpdateSettingsLuaFiles(zip, strTheatre) {
-    for (let file of fs.readdirSync('settings/' + strTheatre).filter(file => file.endsWith(".lua"))) {
-        console.log('updating settings/' + strTheatre + '/' + file + ' file in miz file');
-        injectFileIntoZipObject(zip, 'settings/' + strTheatre + '/' + file);
-    };
-}
+    mizUpdateSettingsLuaFiles(zip, strTheatre) {
+        for (let file of fs.readdirSync('settings/' + strTheatre).filter(file => file.endsWith(".lua"))) {
+            console.log('updating settings/' + strTheatre + '/' + file + ' file in miz file');
+            this.injectFileIntoZipObject(zip, 'settings/' + strTheatre + '/' + file);
+        }
+        ;
+    }
-async function mizUpdateSoundFolders(zip) {
-    if (fs.existsSync('resources/sounds') && fs.lstatSync('resources/sounds').isDirectory()) {
-        const folderArray = fs.readdirSync('resources/sounds');
-        for (const folder of folderArray) {
-            await mizUpdateSingleSoundFolder(zip, folder);
+    async mizUpdateSoundFolders(zip) {
+        if (fs.existsSync('resources/sounds') && fs.lstatSync('resources/sounds').isDirectory()) {
+            const folderArray = fs.readdirSync('resources/sounds');
+            for (const folder of folderArray) {
+                await this.mizUpdateSingleSoundFolder(zip, folder);
+            }
         }
     }
-}
-async function mizUpdateSingleSoundFolder(zip, folder) {
-    if (fs.existsSync('resources/sounds/' + folder) && fs.lstatSync('resources/sounds/' + folder).isDirectory()) {
-        console.log('adding sound files from resources/sounds/' + folder + ' folder...');
-        zip = zip.remove(folder).folder(folder);
-        await addFilesToZip(zip, 'resources/sounds/' + folder, fs.readdirSync('resources/sounds/' + folder));
+    async mizUpdateSingleSoundFolder(zip, folder) {
+        if (fs.existsSync('resources/sounds/' + folder) && fs.lstatSync('resources/sounds/' + folder).isDirectory()) {
+            console.log('adding sound files from resources/sounds/' + folder + ' folder...');
+            zip = zip.remove(folder).folder(folder);
+            await this.addFilesToZip(zip, 'resources/sounds/' + folder, fs.readdirSync('resources/sounds/' + folder));
+        }
     }
-}
-async function addFilesToZip(zip, directoryPath, filesToInclude) {
-    const promiseArr = await filesToInclude.map(async file => {
-        const filePath = path.join(directoryPath, file)
-        try {
-            const fileStats = await lstat(filePath)
-            const isDirectory = fileStats.isDirectory()
-            if (isDirectory) {
-                const directory = zip.remove(file).folder(file)
-                const subFiles = fs.readdirSync(filePath)
-                return addFilesToZip(directory, filePath, subFiles)
-            } else {
-                // console.log('added file : '+file);
-                return zip.file(file, fs.createReadStream(filePath))
+    async addFilesToZip(zip, directoryPath, filesToInclude) {
+        const promiseArr = await filesToInclude.map(async file => {
+            const filePath = path.join(directoryPath, file)
+            try {
+                const fileStats = await lstat(filePath)
+                const isDirectory = fileStats.isDirectory()
+                if (isDirectory) {
+                    const directory = zip.remove(file).folder(file)
+                    const subFiles = fs.readdirSync(filePath)
+                    return this.addFilesToZip(directory, filePath, subFiles)
+                } else {
+                    // console.log('added file : '+file);
+                    return zip.file(file, fs.createReadStream(filePath))
+                }
+            } catch (err) {
+                console.log(err)
+                return Promise.resolve()
             }
-        } catch (err) {
-            console.log(err)
-            return Promise.resolve()
-        }
-    })
-    return Promise.all(promiseArr)
-}
+        })
+        return Promise.all(promiseArr)
+    }
-async function copyMiz(srcMizPath, dstMizPath) {
-    await fs.createReadStream(srcMizPath).pipe(fs.createWriteStream(dstMizPath));
-}
+    async copyMiz(srcMizPath, dstMizPath) {
+        await fs.createReadStream(srcMizPath).pipe(fs.createWriteStream(dstMizPath));
+    }
-async function getMissionObjectFromMizPath(MizPath) {
-    let luaTable = 'return { \n' + await getMissionLuaStringFromZipObject(await getZipObjectFromMizPath(MizPath)) + ' }';
-    return parse(luaTable).mission;
-}
+    async getMissionObjectFromMizPath(MizPath) {
+        let luaTable = 'return { \n' + await this.getMissionLuaStringFromZipObject(await this.getZipObjectFromMizPath(MizPath)) + ' }';
+        return parse(luaTable).mission;
+    }
-async function getMissionObjectFromZipObject(zip) {
-    let luaTable = 'return { \n' + await getMissionLuaStringFromZipObject(zip) + ' }';
-    return parse(luaTable).mission;
-}
+    async getMissionObjectFromZipObject(zip) {
+        let luaTable = 'return { \n' + await this.getMissionLuaStringFromZipObject(zip) + ' }';
+        return parse(luaTable).mission;
+    }
-async function getMapResourceObjectFromMizPath(MizPath) {
-    let luaTable = 'return { \n' + await getMapResourceLuaStringFromZipObject(await getZipObjectFromMizPath(MizPath)) + ' }';
-    return parse(luaTable).mapResource;
-}
+    async getMapResourceObjectFromMizPath(MizPath) {
+        let luaTable = 'return { \n' + await this.getMapResourceLuaStringFromZipObject(await this.getZipObjectFromMizPath(MizPath)) + ' }';
+        return parse(luaTable).mapResource;
+    }
-async function getMapResourceObjectFromZipObject(zip) {
-    let luaTable = 'return { \n' + await getMapResourceLuaStringFromZipObject(zip) + ' }';
-    return parse(luaTable).mapResource;
+    async getMapResourceObjectFromZipObject(zip) {
+        let luaTable = 'return { \n' + await this.getMapResourceLuaStringFromZipObject(zip) + ' }';
+        return parse(luaTable).mapResource;
+    }
 }
-module.exports = {
-    injectLuaScriptsInMissionObject: injectLuaScriptsInMissionObject,
-    getZipObjectFromMizPath: getZipObjectFromMizPath,
-    mizUpdate: mizUpdate,
-    mizInjectMissionDataFile: mizInjectMissionDataFile,
-    injectLuaSettingsFromFolderPathToMizPath: injectLuaSettingsFromFolderPathToMizPath,
-    injectLuaSettingsFromFolderPathToZipObject: injectLuaSettingsFromFolderPathToZipObject,
-    mizInjectMapResourceFile: mizInjectMapResourceFile,
-    injectFileIntoZipObject: injectFileIntoZipObject,
-    mizUpdateMissionDataFile: mizUpdateMissionDataFile,
-    mizUpdateMapResourceFile: mizUpdateMapResourceFile,
-    getMissionLuaStringFromZipObject: getMissionLuaStringFromZipObject,
-    getMapResourceLuaStringFromZipObject: getMapResourceLuaStringFromZipObject,
-    mizUpdateRadioPresets: mizUpdateRadioPresets,
-    mizUpdateSettingsLuaFiles: mizUpdateSettingsLuaFiles,
-    mizUpdateSoundFolders: mizUpdateSoundFolders,
-    mizUpdateSingleSoundFolder: mizUpdateSingleSoundFolder,
-    addFilesToZip: addFilesToZip,
-    copyMiz: copyMiz,
-    getMissionObjectFromMizPath: getMissionObjectFromMizPath,
-    getMissionObjectFromZipObject: getMissionObjectFromZipObject,
-    getMapResourceObjectFromMizPath: getMapResourceObjectFromMizPath,
-    getMapResourceObjectFromZipObject: getMapResourceObjectFromZipObject,
-    injectLuaFilesFromFolderIntoZipObject: injectLuaFilesFromFolderIntoZipObject
-};
+module.exports = Mizlib

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc1",
+  "version": "3.0.0-rc10",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [

package/scripts/build.js CHANGED Viewed

@@ -1,10 +1,9 @@
 const fs = require("fs");
-const mizlib = require("./lib/mizlib.js");
 function build(jtffci) {
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     jtffci.config.missionTemplates.forEach(async missionTemplate => {
-        await mizlib.mizUpdate([
+        await this.mizlib.mizUpdate([
             missionTemplate.prefix,
             '_',
             missionTemplate.theatre,

package/scripts/inject-scripts.js CHANGED Viewed

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require("path");
 const prompt = require('prompt');
-const mizlib = require("./lib/mizlib.js");
 function injectScripts(jtffci, env_mission) {
     // create mission folder in dist (general) folder
@@ -121,13 +120,13 @@ function injectScripts(jtffci, env_mission) {
         console.log('  inject_radio_presets scripts: ' + (/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_radio_presets));
         // open the miz input file for reading
-        const mizObject = await mizlib.getZipObjectFromMizPath(env_mission);
+        const mizObject = await jtffci.mizlib.getZipObjectFromMizPath(env_mission);
         // inject all the lua files in the src folder into the source zip object
-        mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "src");
+        jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "src");
         // inject all the lua files in the lib folder into the source zip object
-        mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "lib");
+        jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "lib");
         // injection des fichiers son Généraux si repertoire resources/sounds/General present
-        await mizlib.mizUpdateSingleSoundFolder(mizObject, 'General');
+        await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'General');
         // On fait une sauvegarde dans le folder de destination
         // fs.writeFileSync([
         //         jtffci.config.general.missionFolder,
@@ -146,7 +145,7 @@ function injectScripts(jtffci, env_mission) {
         //     })
         // );
         // injection des fichiers son Misc si repertoire resources/sounds/Misc present
-        await mizlib.mizUpdateSingleSoundFolder(mizObject, 'Misc');
+        await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'Misc');
         // On fait une sauvegarde dans le folder de destination
         // fs.writeFileSync([
         //         jtffci.config.general.missionFolder,
@@ -164,8 +163,8 @@ function injectScripts(jtffci, env_mission) {
         //         }
         //     })
         // );
-        const missionObject = await mizlib.getMissionObjectFromZipObject(mizObject);
-        let mapResourceObject = await mizlib.getMapResourceObjectFromZipObject(mizObject);
+        const missionObject = await jtffci.mizlib.getMissionObjectFromZipObject(mizObject);
+        let mapResourceObject = await jtffci.mizlib.getMapResourceObjectFromZipObject(mizObject);
         let settingsArray = [];
         if (Array.isArray(mapResourceObject)) {
             if (mapResourceObject.length === 0) {
@@ -173,7 +172,7 @@ function injectScripts(jtffci, env_mission) {
             }
         }
         // injection SplashDamage
-        let tuple = mizlib.injectLuaScriptsInMissionObject(
+        let tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -186,7 +185,7 @@ function injectScripts(jtffci, env_mission) {
         missionObject['trigrules'] = tuple.trObject;
         mapResourceObject = tuple.mrObject;
         // injection Moose
-        tuple = mizlib.injectLuaScriptsInMissionObject(
+        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -199,7 +198,7 @@ function injectScripts(jtffci, env_mission) {
         missionObject['trigrules'] = tuple.trObject;
         mapResourceObject = tuple.mrObject;
         // injection Mist
-        tuple = mizlib.injectLuaScriptsInMissionObject(
+        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -212,7 +211,7 @@ function injectScripts(jtffci, env_mission) {
         missionObject['trigrules'] = tuple.trObject;
         mapResourceObject = tuple.mrObject;
         // injection Skynet
-        tuple = mizlib.injectLuaScriptsInMissionObject(
+        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -233,7 +232,7 @@ function injectScripts(jtffci, env_mission) {
                 file: "settings-global.lua",
             },
         );
-        tuple = mizlib.injectLuaScriptsInMissionObject(
+        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -247,7 +246,7 @@ function injectScripts(jtffci, env_mission) {
         mapResourceObject = tuple.mrObject;
         // injection de la gestion des Set_Clients
-        tuple = mizlib.injectLuaScriptsInMissionObject(
+        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
             missionObject['trig'],
             missionObject['trigrules'],
             mapResourceObject,
@@ -271,7 +270,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "OnDemandTankersConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -286,7 +285,7 @@ function injectScripts(jtffci, env_mission) {
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_airboss)) {
             // injection des fichiers son Airboss
-            // await mizlib.mizUpdateSingleSoundFolder(mizObject, 'AIRBOSS');
+            // await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'AIRBOSS');
             settingsArray.push(
                 {
                     file: "settings-airboss.lua",
@@ -297,7 +296,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "PedrosConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -317,7 +316,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "BeaconsConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -341,7 +340,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "AwacsOnDemandConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -356,14 +355,14 @@ function injectScripts(jtffci, env_mission) {
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_atis)) {
             // injection des fichiers son ATIS
-            // await mizlib.mizUpdateSingleSoundFolder(mizObject, 'ATIS');
+            // await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'ATIS');
             settingsArray.push(
                 {
                     file: "settings-atis.lua",
                     objectName: "AtisConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -399,7 +398,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "InterceptConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -414,14 +413,14 @@ function injectScripts(jtffci, env_mission) {
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_Logistics)) {
             // injection des fichiers son CTLD
-            await mizlib.mizUpdateSingleSoundFolder(mizObject, 'CTLD');
+            await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'CTLD');
             settingsArray.push(
                 {
                     file: "settings-logistics.lua",
                     objectName: "CTLDConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -436,7 +435,7 @@ function injectScripts(jtffci, env_mission) {
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_A2G)) {
             // injection des fichiers son Range
-            // await mizlib.mizUpdateSingleSoundFolder(mizObject, 'RANGE');
+            // await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'RANGE');
             settingsArray.push(
                 {
                     file: "settings-ranges.lua",
@@ -463,7 +462,7 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "SkynetConfig"
                 },
             );
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -485,7 +484,7 @@ function injectScripts(jtffci, env_mission) {
             //         "/src/200-mission.lua"
             //     ].join("")
             // );
-            // const zip = await mizlib.getZipObjectFromMizPath([
+            // const zip = await jtffci.mizlib.getZipObjectFromMizPath([
             //     jtffci.config.general.missionFolder,
             //     "/",
             //     path.parse(env_mission).name,
@@ -493,7 +492,7 @@ function injectScripts(jtffci, env_mission) {
             //     path.basename(env_mission)
             // ].join(""));
             //
-            // mizlib.injectFileIntoZipObject(zip, [
+            // jtffci.mizlib.injectFileIntoZipObject(zip, [
             //         jtffci.config.general.missionFolder,
             //         "/",
             //         path.parse(env_mission).name,
@@ -516,7 +515,7 @@ function injectScripts(jtffci, env_mission) {
             //         path.basename(env_mission)
             //     ].join(""),
             //     inputZip);
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -538,7 +537,7 @@ function injectScripts(jtffci, env_mission) {
                 "/",
                 path.basename(env_mission)
             ].join("") + ": injecting radio presets declared in resources/radios/" + path.parse(env_mission).name);
-            await mizlib.mizUpdateRadioPresets(mizObject, 'resources/radios/' + path.parse(env_mission).name);
+            await jtffci.mizlib.mizUpdateRadioPresets(mizObject, 'resources/radios/' + path.parse(env_mission).name);
         }
         //injection du trigger des settings
         for (let settingsObject of settingsArray) {
@@ -556,7 +555,7 @@ function injectScripts(jtffci, env_mission) {
                 ].join("")
             );
         }
-        await mizlib.injectLuaSettingsFromFolderPathToZipObject(mizObject,
+        await jtffci.mizlib.injectLuaSettingsFromFolderPathToZipObject(mizObject,
             [
                 jtffci.config.general.missionFolder,
                 "/",
@@ -565,7 +564,7 @@ function injectScripts(jtffci, env_mission) {
             ].join("")
         );
         if (settingsArray.length > 0) {
-            tuple = mizlib.injectLuaScriptsInMissionObject(
+            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,
@@ -579,7 +578,7 @@ function injectScripts(jtffci, env_mission) {
             mapResourceObject = tuple.mrObject;
         }
         // Sauvegarde de la mission avec scripts injectés
-        await mizlib.mizInjectMissionDataFile(
+        await jtffci.mizlib.mizInjectMissionDataFile(
             [
                 jtffci.config.general.missionFolder,
                 "/",
@@ -589,7 +588,7 @@ function injectScripts(jtffci, env_mission) {
             ].join(""),
             { mission: missionObject }
         );
-        await mizlib.mizInjectMapResourceFile(
+        await jtffci.mizlib.mizInjectMapResourceFile(
             [
                 jtffci.config.general.missionFolder,
                 "/",

package/scripts/template-update.js CHANGED Viewed

@@ -3,7 +3,7 @@ const fs = require("fs");
 function templateUpdate(jtffci) {
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     jtffci.config.missionTemplates.map(async missionTemplate => {
-        await mizlib.mizUpdate([
+        await this.mizlib.mizUpdate([
             missionTemplate.prefix,
             '_',
             missionTemplate.theatre,