Infrastructure updates

Smaller code overhead
Bumped API version
Fixed some linting

package.json

@@ -1,13 +1,11 @@
 {
   "name": "cartographer",
-  "version": "1.4.1",
-  "description": "",
-  "main": "app.js",
+  "version": "2.0.0",
+  "type": "module",
   "scripts": {
-    "start": "npm run watch",
-    "watch": "nodemon --watch ./src --ext js,ts",
-    "build": "npm run lint && rollup --config rollup.config.prod.js",
-    "build:dev": "rollup --config rollup.config.dev.js",
+    "start": "nodemon --watch ./src --ext js,ts --exec \"npm run build:dev\"",
+    "build": "rollup --config rollup.config.js --environment BUILD:production",
+    "build:dev": "rollup --config rollup.config.js",
     "lint": "eslint ./src --ext .js --ext .ts"
   },
   "repository": {
@@ -21,18 +19,12 @@
   },
   "homepage": "https://github.com/fidwell/OpenRct2-Cartographer#readme",
   "devDependencies": {
-    "@rollup/plugin-replace": "^3.1.0",
-    "@rollup/plugin-typescript": "^8.3.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.26.0",
-    "nodemon": "^2.0.19",
-    "rollup": "^2.77.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.4"
-  },
-  "dependencies": {}
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-typescript": "^11.0.0",
+    "nodemon": "^3.0.2",
+    "rollup": "^3.15.0",
+    "tslib": "^2.5.0",
+    "typescript": ">=4.3.0"
+  }
 }

rollup.config.js

@@ -0,0 +1,84 @@
+import resolve from "@rollup/plugin-node-resolve";
+import terser from "@rollup/plugin-terser";
+import typescript from "@rollup/plugin-typescript";
+import { exec } from "child_process";
+import { homedir } from "os";
+import { promisify } from "util";
+
+const options =
+{
+  filename: "OpenRct2-Cartographer.js",
+
+  /**
+   * Determines in what build mode the plugin should be build. The default here takes
+   * from the environment (ex. CLI arguments) with "development" as fallback.
+   */
+  build: process.env.BUILD || "development"
+};
+
+/**
+ * Tip: if you change the path here to your personal user folder,
+ * you can ignore this change in git with:
+ * ```
+ * > git update-index --skip-worktree rollup.config.js
+ * ```
+ * To accept changes on this file again, use:
+ * ```
+ * > git update-index --no-skip-worktree rollup.config.js
+ * ```
+ */
+async function getOutput() {
+  if (options.build !== "development") {
+    return `./dist/${options.filename}`;
+  }
+
+  const platform = process.platform;
+  const pluginPath = `OpenRCT2/plugin/${options.filename}`;
+
+  if (platform === "win32") // Windows
+  {
+    const { stdout } = await promisify(exec)("powershell -command \"[Environment]::GetFolderPath('MyDocuments')\"");
+    return `${stdout.trim()}/${pluginPath}`;
+  }
+  else if (platform === "darwin") // MacOS
+  {
+    return `${homedir()}/Library/Application Support/${pluginPath}`;
+  }
+  else // Linux
+  {
+    const configFolder = process.env.XDG_CONFIG_HOME || `${homedir()}/.config`;
+    return `${configFolder}/${pluginPath}`;
+  }
+}
+
+
+/**
+ * @type {import("rollup").RollupOptions}
+ */
+const config = {
+  input: "./src/plugin.ts",
+  output: {
+    file: await getOutput(),
+    format: "iife",
+    compact: true
+  },
+  treeshake: "smallest",
+  plugins: [
+    resolve(),
+    typescript(),
+    terser({
+      compress: {
+        passes: 5,
+        toplevel: true,
+        unsafe: true
+      },
+      format: {
+        comments: false,
+        quote_style: 1,
+        wrap_iife: true,
+        beautify: (options.build === "development"),
+      }
+    })
+  ]
+};
+export default config;

src/environment.ts

@@ -1,10 +1,5 @@
-/// <reference path="environment.d.ts" />
-
-export const pluginVersion = "1.4.1";
+export const pluginVersion = "2.0.0";
 export const pluginName = "Cartographer";
 export const pluginAuthors = ["fidwell"];
-export const buildConfiguration: BuildConfiguration = __BUILD_CONFIGURATION__;
-export const isProduction = (buildConfiguration === "production");
-export const isDevelopment = (buildConfiguration === "development");
 export const isUiAvailable = (typeof ui !== "undefined");
 export const namespace = "cartographer";

src/models/options.ts

@@ -1,17 +1,17 @@
 export default class Options {
-  showOpenRides: boolean;
+  showOpenRides: boolean = false;
 
-  showTestingRides: boolean;
+  showTestingRides: boolean = false;
 
-  showClosedRides: boolean;
+  showClosedRides: boolean = false;
 
-  showFootpath: boolean;
+  showFootpath: boolean = false;
 
-  showScenery: boolean;
+  showScenery: boolean = false;
 
-  showWater: boolean;
+  showWater: boolean = false;
 
-  showSurface: boolean;
+  showSurface: boolean = false;
 
-  showPeeps: boolean;
+  showPeeps: boolean = false;
 }

src/registerPlugin.ts → src/plugin.ts

@@ -1,14 +1,12 @@
-/// <reference path="../lib/openrct2.d.ts" />
-
-import * as Environment from "./environment";
 import main from "./main";
+import * as Environment from "./environment";
 
 registerPlugin({
   name: Environment.pluginName,
   version: Environment.pluginVersion,
   authors: Environment.pluginAuthors,
   type: "local",
   licence: "MIT",
-  targetApiVersion: 65,
+  targetApiVersion: 81,
   main
 });

src/ui/mapWindow.ts

@@ -24,7 +24,7 @@ export default class MapWindow {
   // Map information
   private mapColours: number[][] = [];
 
-  private mapSize: number;
+  private mapSize: number = 0;
 
   private peepFinder: PeepFinder = new PeepFinder();
 
@@ -368,12 +368,14 @@ export default class MapWindow {
       height: this.mapSize,
       width: this.mapSize,
       data: new Uint8Array(0)
-    });
+    }) ?? 0;
 
-    const mapWidget = <ButtonWidget> this.window.findWidget("mapWidget");
-    mapWidget.width = this.mapSize * this.tileSize;
-    mapWidget.height = this.mapSize * this.tileSize;
-    mapWidget.image = this.mapImageId;
+    if (this.window !== undefined) {
+      const mapWidget = <ButtonWidget> this.window.findWidget("mapWidget");
+      mapWidget.width = this.mapSize * this.tileSize;
+      mapWidget.height = this.mapSize * this.tileSize;
+      mapWidget.image = this.mapImageId ?? 0;
+    }
   }
 
   draw() {

src/utilities/colourdecider.ts

@@ -67,7 +67,7 @@ export default class ColourDecider {
       return ColourUtilities.colourToPalette(Colour.DarkGreen);
     }
 
-    if (element.colourScheme !== undefined) {
+    if (element.colourScheme !== undefined && element.colourScheme !== null) {
       const scheme = ride.colourSchemes[element.colourScheme];
       return ColourUtilities.colourToPalette(scheme ? scheme.main : ColourUtilities.colourToPalette(Colour.White));
     }
@@ -84,7 +84,11 @@ export default class ColourDecider {
   }
 
   static getColourFromFootpath(element: FootpathElement): number {
-    return this.getColourFromFootpathType(element.object);
+    if (element.surfaceObject !== null) {
+      return this.getColourFromFootpathType(element.surfaceObject);
+    }
+
+    return 0;
   }
 
   static getColourFromSurface(element: SurfaceElement, options: Options): number {

src/utilities/logger.ts

@@ -1,5 +1,3 @@
-import * as Environment from "../environment";
-
 /**
  * The available levels of logging.
  */
@@ -13,9 +11,7 @@ function print(level: LogLevel, color: number, message: string): void {
 }
 
 export function debug(message: string): void {
-  if (Environment.isDevelopment) {
-    print("debug", 94, message);
-  }
+  print("debug", 94, message);
 }
 
 export function warning(message: string): void {

tsconfig.json

@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+      "esModuleInterop": true,
+      "forceConsistentCasingInFileNames": true,
+      "module": "ES2020",
+      "moduleResolution": "node",
+      "noFallthroughCasesInSwitch": true,
+      "noImplicitAny": true,
+      "noImplicitOverride": true,
+      "noImplicitReturns": true,
+      "noImplicitThis": true,
+      "noUnusedLocals": true,
+      "noUnusedParameters": true,
+      "outDir": "out",
+      "strict": true,
+      "target": "es5",
+      "lib": [
+        "es5"
+      ]
+    },
+    "include": [
+      "./lib/**/*.ts",
+      "./src/**/*.ts",
+    ],
+    "noEmit": true
+  }
+