@fboes/aerofly-custom-missions 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fboes/aerofly-custom-missions",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Builder for Aerofly FS4 Custom Missions Files",
   "main": "dist/index.js",
   "scripts": {

package/src/index.test.ts

@@ -1,4 +1,5 @@
 import {
+    AeroflyConfigFileSet,
     AeroflyMissionsList,
     AeroflyMission,
     AeroflyMissionConditions,
@@ -9,7 +10,7 @@ import {
 } from "./index.js";
 import { strict as assert } from "node:assert";
 
-const validityCheck = (aeroflyString: string): void => {
+const assertValidAeroflyStructure = (aeroflyString: string): void => {
     const openingBrackets = aeroflyString.match(/</g);
     const closingBrackets = aeroflyString.match(/>/g);
     const openingBrackets2 = aeroflyString.match(/\[/g);
@@ -19,9 +20,51 @@ const validityCheck = (aeroflyString: string): void => {
     assert.strictEqual(openingBrackets2?.length, closingBrackets2?.length, "Number of [] matches");
 };
 
+const assertIncludes = (string: string, includes: string): void => {
+    assert.ok(string.includes(includes), `Includes "${includes}"`);
+};
+
+{
+    const file = new AeroflyConfigFileSet(0, "file", "");
+    file.pushRaw(
+        new AeroflyConfigFileSet(1, "tmmissions_list", "")
+            .pushRaw(
+                new AeroflyConfigFileSet(2, "list_tmmission_definition", "missions")
+                    .pushRaw(
+                        new AeroflyConfigFileSet(3, "tmmission_definition", "mission")
+                            .push("string8", "title", "KCCR #1: Concord / Buchanan Field")
+                            .push("float64", "origin_alt", 1066.799965862401, "3500 ft MSL")
+                            .toString(),
+                    )
+                    .pushRaw(new AeroflyConfigFileSet(3, "tmmission_definition", "mission").toString())
+                    .toString(),
+            )
+            .toString(),
+    );
+    assertValidAeroflyStructure(file.toString());
+    console.log("✅ AeroflyMission test successful");
+}
+
 {
-    const mission = new AeroflyMission("Title");
+    const mission = new AeroflyMission("Title", {
+        origin: {
+            icao: "XXXX",
+            longitude: 0,
+            latitude: 0,
+            dir: 0,
+            alt: 0,
+        },
+        destination: {
+            icao: "XXXX",
+            longitude: 0,
+            latitude: 0,
+            dir: 0,
+            alt: 0,
+        },
+    });
     assert.deepStrictEqual(mission.title, "Title");
+    assertValidAeroflyStructure(mission.toString());
+    //console.log(mission.toString());
     console.log("✅ AeroflyMission test successful");
 }
 
@@ -33,7 +76,7 @@ const validityCheck = (aeroflyString: string): void => {
     conditions.visibility_sm = 10;
     assert.notDeepStrictEqual(conditions.visibility, 10);
     assert.deepStrictEqual(Math.round(conditions.visibility_sm), 10);
-    validityCheck(conditions.toString());
+    assertValidAeroflyStructure(conditions.toString());
     console.log("✅ AeroflyMissionConditions test successful");
 }
 
@@ -42,7 +85,7 @@ const validityCheck = (aeroflyString: string): void => {
         visibility: 15_000,
     });
     assert.deepStrictEqual(conditions.visibility, 15_000);
-    validityCheck(conditions.toString());
+    assertValidAeroflyStructure(conditions.toString());
     console.log("✅ AeroflyMissionConditions test successful");
 }
 
@@ -52,7 +95,7 @@ const validityCheck = (aeroflyString: string): void => {
     });
     assert.notDeepStrictEqual(conditions.visibility, 10);
     assert.deepStrictEqual(Math.round(conditions.visibility_sm), 10);
-    validityCheck(conditions.toString());
+    assertValidAeroflyStructure(conditions.toString());
     console.log("✅ AeroflyMissionConditions test successful");
 }
 
@@ -60,7 +103,12 @@ const validityCheck = (aeroflyString: string): void => {
     const cloud = new AeroflyMissionConditionsCloud(0, 0);
     assert.deepStrictEqual(cloud.cover, 0);
     assert.deepStrictEqual(cloud.base, 0);
-    validityCheck(cloud.toString());
+    assertValidAeroflyStructure(cloud.toString());
+    assertValidAeroflyStructure(cloud.toString(0));
+    assertValidAeroflyStructure(cloud.toString(1));
+    assertValidAeroflyStructure(cloud.toString(2));
+    assertValidAeroflyStructure(cloud.toString(3));
+
     console.log("✅ AeroflyMissionConditionsCloud test successful");
 }
 
@@ -72,7 +120,7 @@ const validityCheck = (aeroflyString: string): void => {
     cloud.base_feet = 1000;
     assert.notDeepStrictEqual(cloud.base, 1000);
     assert.deepStrictEqual(Math.round(cloud.base_feet), 1000);
-    validityCheck(cloud.toString());
+    assertValidAeroflyStructure(cloud.toString());
     console.log("✅ AeroflyMissionConditionsCloud test successful");
 }
 
@@ -81,7 +129,7 @@ const validityCheck = (aeroflyString: string): void => {
     assert.deepStrictEqual(localizedText.language, "de");
     assert.deepStrictEqual(localizedText.title, "Test");
     assert.deepStrictEqual(localizedText.description, "Test2");
-    validityCheck(localizedText.toString());
+    assertValidAeroflyStructure(localizedText.toString());
     console.log("✅ AeroflyLocalizedText test successful");
 }
 
@@ -91,10 +139,32 @@ const validityCheck = (aeroflyString: string): void => {
     assert.deepStrictEqual(targetPlane.latitude, 1);
     assert.deepStrictEqual(targetPlane.dir, 2);
     assert.deepStrictEqual(targetPlane.name, "Test2");
-    validityCheck(targetPlane.toString());
+    assertValidAeroflyStructure(targetPlane.toString());
     console.log("✅ AeroflyMissionTargetPlane test successful");
 }
 
+{
+    const checkpoint = new AeroflyMissionCheckpoint("TEST", "waypoint", 15, 20);
+    let checkpointString = checkpoint.toString();
+
+    assertIncludes(checkpointString, "[type]");
+    assertIncludes(checkpointString, "[name]");
+    assertIncludes(checkpointString, "[lon_lat]");
+    assertIncludes(checkpointString, "15 20");
+    assertIncludes(checkpointString, "[altitude]");
+    assert.ok(!checkpointString.includes("[fly_over]"));
+    assert.ok(!checkpointString.includes("[alt_cst]"));
+
+    checkpoint.altitudeConstraint = false;
+    checkpoint.flyOver = false;
+    checkpointString = checkpoint.toString();
+
+    assertIncludes(checkpointString, "[fly_over]");
+    assertIncludes(checkpointString, "[alt_cst]");
+
+    console.log("✅ AeroflyMissionCheckpoint test successful");
+}
+
 {
     const conditions = new AeroflyMissionConditions({
         time: new Date(Date.UTC(2024, 5, 14, 13, 15, 38)),
@@ -175,25 +245,26 @@ const validityCheck = (aeroflyString: string): void => {
 
     let missionListString = missionList.toString();
 
-    assert.ok(missionListString.includes("[origin]"));
-    assert.ok(missionListString.includes("[tmmission_definition]"));
-    assert.ok(missionListString.includes("[list_tmmission_checkpoint]"));
-    assert.ok(missionListString.includes("[tmmission_checkpoint]"));
-    assert.ok(missionListString.includes("[departure_runway]"));
-    assert.ok(missionListString.includes("[cloud_cover]"));
-    assert.ok(missionListString.includes("[cirrus_cover]"));
-    assert.ok(missionListString.includes("[tmmission_checkpoint][element][0]"));
-    assert.ok(missionListString.includes("[tmmission_checkpoint][element][1]"));
-    assert.ok(missionListString.includes("[tmmission_checkpoint][element][2]"));
-    assert.ok(missionListString.includes("[tmmission_checkpoint][element][3]"));
-    assert.ok(missionListString.includes("<[float64][length][844.2959729825288]>"));
+    assertIncludes(missionListString, "[origin]");
+    assertIncludes(missionListString, "[tmmission_definition]");
+    assertIncludes(missionListString, "[list_tmmission_checkpoint]");
+    assertIncludes(missionListString, "[tmmission_checkpoint]");
+    assertIncludes(missionListString, "[departure_runway]");
+    assertIncludes(missionListString, "[cloud_cover]");
+    assertIncludes(missionListString, "[cirrus_cover]");
+    assertIncludes(missionListString, "[tmmission_checkpoint][element][0]");
+    assertIncludes(missionListString, "[tmmission_checkpoint][element][1]");
+    assertIncludes(missionListString, "[tmmission_checkpoint][element][2]");
+    assertIncludes(missionListString, "[tmmission_checkpoint][element][3]");
+    assertIncludes(missionListString, "<[float64][length][844.2959729825288]>");
     assert.ok(!missionListString.includes("[tags]"));
     assert.ok(!missionListString.includes("[difficulty]"));
     assert.ok(!missionListString.includes("[is_featured]"));
-    assert.ok(!missionListString.includes("[tmmission_definition_localized]"), "has `tmmission_definition_localized`");
+    assert.ok(!missionListString.includes("[tmmission_definition_localized]"));
     assert.ok(!missionListString.includes("[distance]"));
     assert.ok(!missionListString.includes("[duration]"));
-    validityCheck(missionListString);
+    assert.ok(!missionListString.includes("[alt_cst]"));
+    assertValidAeroflyStructure(missionListString);
 
     //console.log(missionListString);
 
@@ -205,21 +276,25 @@ const validityCheck = (aeroflyString: string): void => {
     mission.tags.push("approach");
     mission.tags.push("pattern");
     mission.finish = new AeroflyMissionTargetPlane(0, 1, 2);
+    mission.tutorialName = "c172";
+    mission.isScheduled = true;
     missionListString = missionList.toString();
 
-    assert.ok(missionListString.includes("[tags]"));
-    assert.ok(missionListString.includes("[difficulty]"));
-    assert.ok(missionListString.includes("[is_featured]"));
-    assert.ok(missionListString.includes("true"));
-    assert.ok(missionListString.includes("[tmmission_definition_localized]"), "has `tmmission_definition_localized`");
-    assert.ok(missionListString.includes("Landeübung"));
-    assert.ok(missionListString.includes("[distance]"));
-    assert.ok(missionListString.includes("[duration]"));
-    assert.ok(missionListString.includes("[finish]"));
-    validityCheck(missionListString);
+    assertIncludes(missionListString, "[tags]");
+    assertIncludes(missionListString, "[difficulty]");
+    assertIncludes(missionListString, "[is_featured]");
+    assertIncludes(missionListString, "true");
+    assertIncludes(missionListString, "[tmmission_definition_localized]");
+    assertIncludes(missionListString, "Landeübung");
+    assertIncludes(missionListString, "[distance]");
+    assertIncludes(missionListString, "[duration]");
+    assertIncludes(missionListString, "[finish]");
+    assertIncludes(missionListString, "[tutorial_name]");
+    assertIncludes(missionListString, "[is_scheduled]");
+    assertValidAeroflyStructure(missionListString);
 
     //console.dir(missionList.missions[0], { depth: null });
-    console.log(missionListString);
+    //console.log(missionListString);
 
     console.log("✅ AeroflyMissionsList test successful");
 }