Improved literal string code style

fboes · Nov 2, 2024 · e706198 · e706198
1 parent 9a11bf4
commit e706198
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 29 deletions.
diff --git a/dist/Aerofly/Mission.js b/dist/Aerofly/Mission.js
@@ -791,8 +791,9 @@ export class Mission {
     }
     toString() {
         var _a, _b;
-        const finish = (_b = (_a = this.finish) === null || _a === void 0 ? void 0 : _a.toStringTargetPlane('finish')) !== null && _b !== void 0 ? _b : '';
-        let string = `            // Exported by Aerofly Missionsgerät
+        const finish = (_b = (_a = this.finish) === null || _a === void 0 ? void 0 : _a.toStringTargetPlane("finish")) !== null && _b !== void 0 ? _b : "";
+        let string = `\
+            // Exported by Aerofly Missionsgerät
             <[tmmission_definition][mission][]
                 <[string8][title][${Quote.tmc(this.title)}]>
                 <[string8][description][${Quote.tmc(this.description)}]>
@@ -809,12 +810,14 @@ export class Mission {
                 <[float64]   [destination_dir]    [${this.destination_dir}]>
                 //<[float64]   [cruise_altitude]    [${this.cruise_altitude}]>
                 //<[float64]   [cruise_speed]       [${this.cruise_speed}]>
-${this.conditions + finish}                <[list_tmmission_checkpoint][checkpoints][]
+${this.conditions + finish}\
+                <[list_tmmission_checkpoint][checkpoints][]
 `;
         this.checkpoints.forEach((c, i) => {
             string += c.toString(i);
         });
-        string += `                >
+        string += `\
+                >
             >
 // -----------------------------------------------------------------------------
 `;

diff --git a/dist/Aerofly/MissionCheckpoint.js b/dist/Aerofly/MissionCheckpoint.js
@@ -195,10 +195,12 @@ export class MissionCheckpoint {
     toString(index) {
         let flyOver = "";
         if (this.type === MissionCheckpoint.TYPE_WAYPOINT) {
-            flyOver = `                        <[bool][FlyOver][${this.flyOver ? "true" : "false"}]>
-      `;
+            flyOver = `\
+                        <[bool][FlyOver][${this.flyOver ? "true" : "false"}]>
+`;
         }
-        return `                    <[tmmission_checkpoint][element][${index}]
+        return `\
+                    <[tmmission_checkpoint][element][${index}]
                         <[string8u][type][${Quote.tmc(this.type)}]>
                         <[string8u][name][${Quote.tmc(this.name)}]>
                         <[vector2_float64][lon_lat][${this.lon_lat}]>
@@ -208,11 +210,13 @@ export class MissionCheckpoint {
                         <[float64][slope][${this.slope}]> // ${this.slope_deg.toFixed(1)} deg
                         <[float64][length][${this.length}]>
                         <[float64][frequency][${this.frequency.toFixed()}]>
-${flyOver}                    >
+${flyOver}\
+                    >
 `;
     }
     toStringTargetPlane(name = "finish") {
-        return `                <[tmmission_target_plane][${name}][]
+        return `\
+                <[tmmission_target_plane][${name}][]
                     <[vector2_float64][lon_lat][${this.lon_lat.lon} ${this.lon_lat.lat}]>
                     <[float64][direction][${this.direction}]>
                 >

diff --git a/dist/Aerofly/MissionConditions.js b/dist/Aerofly/MissionConditions.js
@@ -282,7 +282,8 @@ export class MissionConditions {
         this.turbulence_strength = Math.min(1, this.wind_speed / 80 + this.wind_gusts / 20);
     }
     toString() {
-        return `                <[tmmission_conditions][conditions][]
+        return `\
+                <[tmmission_conditions][conditions][]
                     <[tm_time_utc][time][]
                         <[int32][time_year][${this.time.time_year.toFixed()}]>
                         <[int32][time_month][${this.time.time_month.toFixed()}]>

diff --git a/dist/Aerofly/MissionsList.js b/dist/Aerofly/MissionsList.js
@@ -5,11 +5,13 @@ export class MissionsList {
         this.missions = [];
     }
     toString() {
-        return `<[file][][]
+        return `\
+<[file][][]
     <[tmmissions_list][][]
         <[list_tmmission_definition][missions][]
 // -----------------------------------------------------------------------------
-${this.missions.join("")}        >
+${this.missions.join("")}\
+        >
     >
 >
 `;

diff --git a/dist/Cli/Arguments.js b/dist/Cli/Arguments.js
@@ -147,7 +147,8 @@ export class Arguments {
         return asciify(filename).substring(0, 32);
     }
     helpText(c) {
-        return `${c.lightBlue}Usage: nodejs index.js [PARAMETERS...]${c.reset}
+        return `\
+${c.lightBlue}Usage: nodejs index.js [PARAMETERS...]${c.reset}
   Convert Aerofly FS 4 main.mcf file into a custom_missions_user.tmc file.
 
 Parameters:

diff --git a/dist/Export/Markdown.js b/dist/Export/Markdown.js
@@ -32,7 +32,8 @@ export class Markdown extends Outputtable {
         const zoomLevel = this.lonLatArea.getZoomLevel();
         const center = this.lonLatArea.center;
         const hasFrequencies = m.hasFrequencies;
-        let markdown = `# ${m.title}
+        let markdown = `\
+# ${m.title}
 
 ${m.description}
 

diff --git a/dist/Tests/MissionTest.js b/dist/Tests/MissionTest.js
@@ -43,6 +43,7 @@ export class MissionTest extends Test {
             this.assertEquals(mission.checkpoints.length, 5);
             this.assertEquals(mission.checkpoints[4].name, "KBLI");
             this.assertEquals(mission.checkpoints[1].lon_lat.altitude_m, 1676.3999463552018);
+            //console.log(mission.toString());
         }
     }
 }
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "prettier": "npx prettier --cache --write .",
     "prettier-check": "npx prettier --cache --check .",
     "serve": "npx http-server ./dist -o -c-1",
-    "build": "tsc --build"
+    "build": "npm run prettier && tsc --build"
   },
   "main": "index.js",
   "repository": {

diff --git a/src/Aerofly/Mission.ts b/src/Aerofly/Mission.ts
@@ -903,7 +903,8 @@ export class Mission {
 
   toString(): string {
     const finish = this.finish?.toStringTargetPlane("finish") ?? "";
-    let string = `            // Exported by Aerofly Missionsgerät
+    let string = `\
+            // Exported by Aerofly Missionsgerät
             <[tmmission_definition][mission][]
                 <[string8][title][${Quote.tmc(this.title)}]>
                 <[string8][description][${Quote.tmc(this.description)}]>
@@ -920,12 +921,14 @@ export class Mission {
                 <[float64]   [destination_dir]    [${this.destination_dir}]>
                 //<[float64]   [cruise_altitude]    [${this.cruise_altitude}]>
                 //<[float64]   [cruise_speed]       [${this.cruise_speed}]>
-${this.conditions + finish}                <[list_tmmission_checkpoint][checkpoints][]
+${this.conditions + finish}\
+                <[list_tmmission_checkpoint][checkpoints][]
 `;
     this.checkpoints.forEach((c, i) => {
       string += c.toString(i);
     });
-    string += `                >
+    string += `\
+                >
             >
 // -----------------------------------------------------------------------------
 `;

diff --git a/src/Aerofly/MissionCheckpoint.ts b/src/Aerofly/MissionCheckpoint.ts
@@ -240,10 +240,12 @@ export class MissionCheckpoint {
   toString(index: number): string {
     let flyOver = "";
     if (this.type === MissionCheckpoint.TYPE_WAYPOINT) {
-      flyOver = `                        <[bool][FlyOver][${this.flyOver ? "true" : "false"}]>
-      `;
+      flyOver = `\
+                        <[bool][FlyOver][${this.flyOver ? "true" : "false"}]>
+`;
     }
-    return `                    <[tmmission_checkpoint][element][${index}]
+    return `\
+                    <[tmmission_checkpoint][element][${index}]
                         <[string8u][type][${Quote.tmc(this.type)}]>
                         <[string8u][name][${Quote.tmc(this.name)}]>
                         <[vector2_float64][lon_lat][${this.lon_lat}]>
@@ -253,12 +255,14 @@ export class MissionCheckpoint {
                         <[float64][slope][${this.slope}]> // ${this.slope_deg.toFixed(1)} deg
                         <[float64][length][${this.length}]>
                         <[float64][frequency][${this.frequency.toFixed()}]>
-${flyOver}                    >
+${flyOver}\
+                    >
 `;
   }
 
   toStringTargetPlane(name: string = "finish"): string {
-    return `                <[tmmission_target_plane][${name}][]
+    return `\
+                <[tmmission_target_plane][${name}][]
                     <[vector2_float64][lon_lat][${this.lon_lat.lon} ${this.lon_lat.lat}]>
                     <[float64][direction][${this.direction}]>
                 >

diff --git a/src/Aerofly/MissionConditions.ts b/src/Aerofly/MissionConditions.ts
@@ -333,7 +333,8 @@ export class MissionConditions {
   }
 
   toString(): string {
-    return `                <[tmmission_conditions][conditions][]
+    return `\
+                <[tmmission_conditions][conditions][]
                     <[tm_time_utc][time][]
                         <[int32][time_year][${this.time.time_year.toFixed()}]>
                         <[int32][time_month][${this.time.time_month.toFixed()}]>

diff --git a/src/Aerofly/MissionsList.ts b/src/Aerofly/MissionsList.ts
@@ -7,11 +7,13 @@ export class MissionsList {
   constructor(public title: string) {}
 
   toString(): string {
-    return `<[file][][]
+    return `\
+<[file][][]
     <[tmmissions_list][][]
         <[list_tmmission_definition][missions][]
 // -----------------------------------------------------------------------------
-${this.missions.join("")}        >
+${this.missions.join("")}\
+        >
     >
 >
 `;

diff --git a/src/Cli/Arguments.ts b/src/Cli/Arguments.ts
@@ -166,7 +166,8 @@ export class Arguments {
   }
 
   helpText(c: BashColors): string {
-    return `${c.lightBlue}Usage: nodejs index.js [PARAMETERS...]${c.reset}
+    return `\
+${c.lightBlue}Usage: nodejs index.js [PARAMETERS...]${c.reset}
   Convert Aerofly FS 4 main.mcf file into a custom_missions_user.tmc file.
 
 Parameters:

diff --git a/src/Export/Markdown.ts b/src/Export/Markdown.ts
@@ -39,7 +39,8 @@ export class Markdown extends Outputtable {
     const zoomLevel = this.lonLatArea.getZoomLevel();
     const center = this.lonLatArea.center;
     const hasFrequencies = m.hasFrequencies;
-    let markdown = `# ${m.title}
+    let markdown = `\
+# ${m.title}
 
 ${m.description}
 

diff --git a/src/Export/Outputtable.ts b/src/Export/Outputtable.ts
@@ -1,5 +1,4 @@
 import { Mission } from "../Aerofly/Mission.js";
-import { MissionCheckpoint } from "../Aerofly/MissionCheckpoint.js";
 import { MissionConditions } from "../Aerofly/MissionConditions.js";
 import { LonLatDate, LonLateDateSunState } from "../World/LonLatDate.js";
 

diff --git a/src/Tests/MissionTest.ts b/src/Tests/MissionTest.ts
@@ -54,6 +54,8 @@ export class MissionTest extends Test {
       this.assertEquals(mission.checkpoints.length, 5);
       this.assertEquals(mission.checkpoints[4].name, "KBLI");
       this.assertEquals(mission.checkpoints[1].lon_lat.altitude_m, 1676.3999463552018);
+
+      //console.log(mission.toString());
     }
   }
 }