From 2f7fbe8d3df542ae0bca8e43a3abcac9cfba7d24 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 12 Jan 2021 11:25:52 +0100
Subject: [PATCH] Apply suggestions from code review

---
 .../Field/Devtools/Project/Instructions.js     |  2 +-
 .../Devtools/Project/AbstractPackageList.ts    |  4 ++--
 .../Field/Devtools/Project/Instructions.ts     | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.js
index 0540afe1ba..85cafa5453 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.js
@@ -69,7 +69,7 @@ define(["require", "exports", "tslib", "../../../../../../Core", "../../../../..
             event.preventDefault();
             event.stopPropagation();
             const instructionsId = event.currentTarget.closest("li.section").dataset
-                .instrictionsId;
+                .instructionsId;
             // note: data will be validated/filtered by the server
             const pipField = document.getElementById(`${this.formFieldId}_instructions${instructionsId}_pip`);
             // ignore pressing button if no PIP has been selected
diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts
index 955a36a22f..d068933962 100644
--- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts
+++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts
@@ -23,10 +23,10 @@ abstract class AbstractPackageList<TPackageData extends PackageData = PackageDat
   protected readonly packageIdentifier: HTMLInputElement;
 
   // see `wcf\data\package\Package::isValidPackageName()`
-  protected static packageIdentifierRegExp = new RegExp(/^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/);
+  protected static readonly packageIdentifierRegExp = new RegExp(/^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/);
 
   // see `wcf\data\package\Package::isValidVersion()`
-  protected static versionRegExp = new RegExp(
+  protected static readonly versionRegExp = new RegExp(
     /^([0-9]+).([0-9]+)\.([0-9]+)( (a|alpha|b|beta|d|dev|rc|pl) ([0-9]+))?$/i,
   );
 
diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts
index 1c782b862f..eafe905349 100644
--- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts
+++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts
@@ -30,10 +30,12 @@ interface InstructionsData {
   errors?: string[];
   fromVersion?: string;
   instructions?: Instruction[];
-  type: "install" | "update";
+  type: InstructionsType;
 }
 
+type InstructionsType = "install" | "update";
 type InstructionsId = number | string;
+type PipFilenameMap = { [k: string]: string };
 
 class Instructions {
   protected readonly addButton: HTMLAnchorElement;
@@ -47,15 +49,15 @@ class Instructions {
   protected readonly instructionsType: HTMLSelectElement;
   protected readonly instructionsTemplate: Template;
   protected readonly instructionEditDialogTemplate: Template;
-  protected readonly pipDefaultFilenames: { [k: string]: string };
+  protected readonly pipDefaultFilenames: PipFilenameMap;
 
-  protected static applicationPips = ["acpTemplate", "file", "script", "template"];
+  protected static readonly applicationPips = ["acpTemplate", "file", "script", "template"];
 
   // see `wcf\data\package\Package::isValidPackageName()`
-  protected static packageIdentifierRegExp = new RegExp(/^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/);
+  protected static readonly packageIdentifierRegExp = new RegExp(/^[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/);
 
   // see `wcf\data\package\Package::isValidVersion()`
-  protected static versionRegExp = new RegExp(
+  protected static readonly versionRegExp = new RegExp(
     /^([0-9]+).([0-9]+)\.([0-9]+)( (a|alpha|b|beta|d|dev|rc|pl) ([0-9]+))?$/i,
   );
 
@@ -64,7 +66,7 @@ class Instructions {
     instructionsTemplate: Template,
     instructionsEditDialogTemplate: Template,
     instructionEditDialogTemplate: Template,
-    pipDefaultFilenames: { [k: string]: string },
+    pipDefaultFilenames: PipFilenameMap,
     existingInstructions: InstructionsData[],
   ) {
     this.formFieldId = formFieldId;
@@ -126,7 +128,7 @@ class Instructions {
     event.stopPropagation();
 
     const instructionsId = ((event.currentTarget as HTMLElement).closest("li.section") as HTMLElement).dataset
-      .instrictionsId!;
+      .instructionsId!;
 
     // note: data will be validated/filtered by the server
 
@@ -244,7 +246,7 @@ class Instructions {
 
     this.addInstructionsByData({
       fromVersion: this.instructionsType.value === "update" ? this.fromVersion.value : "",
-      type: this.instructionsType.value as "install" | "update",
+      type: this.instructionsType.value as InstructionsType,
     });
 
     // empty fields
-- 
2.20.1