@jtff/miztemplate-lib 3.0.0-rc19 → 3.0.0-rc20

package/lib/mizlib.js

@@ -19,7 +19,7 @@ class Mizlib {
         for (let luaScript of luaScriptsArray) {
             this.injectFileIntoZipObject(zipObject, [
                     workspacePath,
-                    "/",
+                    fromLibrary ? "/.workspace/" : "/",
                     folderPath,
                     "/",
                     path.basename(luaScript)
@@ -184,7 +184,8 @@ class Mizlib {
 
 
     async injectMapResourceObjectIntoMizFile(mizPath, mapResourceObject) {
-        const zip = this.injectMapResourceObjectIntoZipObject(await this.getZipObjectFromMizPath(mizPath), mapResourceObject);
+        const zip = await this.getZipObjectFromMizPath(mizPath);
+        this.injectMapResourceObjectIntoZipObject(zip, mapResourceObject);
         const inputZip = await zip.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
@@ -212,7 +213,6 @@ class Mizlib {
             .slice(0, -1)
             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
         zip.file("mission", missionLuaT);
-        return zip;
     }
 
     injectMapResourceObjectIntoZipObject(zip, mapResourceObject) {
@@ -225,7 +225,6 @@ class Mizlib {
             .slice(0, -1)
             .replace(/\[\"(\d+)\"\] = /g, "[$1] = ");
         zip.file("l10n/DEFAULT/mapResource", mapResourceLuaT);
-        return zip;
     }
 
     getMissionLuaStringFromZipObject(zipStream) {
@@ -305,7 +304,7 @@ class Mizlib {
                 }
             }
         };
-        return this.injectMissionObjectIntoZipObject(zip, {mission: mission_object});
+        this.injectMissionObjectIntoZipObject(zip, {mission: mission_object});
     }
 
     injectSettingsLuaFilesFromFolderIntoZipObject(zip, strTheatre) {

package/package.json

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

package/scripts/inject-scripts.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require("path");
 const prompt = require('prompt');
-var _ = require('lodash');
+let _ = require('lodash');
 
 function injectScripts(jtffci, env_mission) {
     const workspacePath = [
@@ -474,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);
-            mizObject = await jtffci.mizlib.injectRadioPresetsFromFolderIntoZipObject(mizObject, workspacePath + '/resources/radios/' + missionObject.theatre);
+            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) {
@@ -495,30 +495,38 @@ function injectScripts(jtffci, env_mission) {
             mizObject = zipObject;
         }
         // réintégration du fichier mission dans l'archive
-        mizObject = await jtffci.mizlib.injectMissionObjectIntoZipObject(
+        await jtffci.mizlib.injectMissionObjectIntoZipObject(
             mizObject,
             { mission: missionObject }
         );
-        mizObject = await jtffci.mizlib.injectMapResourceObjectIntoZipObject(
+        await jtffci.mizlib.injectMapResourceObjectIntoZipObject(
             mizObject,
             { mapResource: mapResourceObject }
         );
         // creation du fichier miz dans l'espace de travail
-        await fs.closeSync(fs.openSync(destinationMizFilePath, 'a'));
+        // await fs.closeSync(fs.openSync(destinationMizFilePath, 'a'));
         // On fait une sauvegarde dans le folder de destination
-        const inputZip = await mizObject.generateAsync({
+        fs.writeFileSync(destinationMizFilePath, 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...');
         return 0;
+        // fs.writeFileSync(destinationMizFilePath, inputZip);
+        // await fs.createWriteStream(destinationMizFilePath, await mizObject.generateNodeStream({
+        //     type: 'nodebuffer',
+        //     streamFiles: true,
+        //     compression: "DEFLATE",
+        //     compressionOptions: {
+        //         level: 9
+        //     }
+        // }));
+        // generation des outils CI JTFF
     });
 }