refactoring: Fix generate:layeroverview

UI/InputElement/Validator.ts

@@ -0,0 +1,56 @@
+import BaseUIElement from "../BaseUIElement"
+import { Translation } from "../i18n/Translation"
+import Translations from "../i18n/Translations"
+
+/**
+ * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback.
+ * They also double as an index of supported types for textfields in MapComplete
+ */
+export abstract class Validator {
+    public readonly name: string
+    /*
+     * An explanation for the theme builder.
+     * This can indicate which special input element is used, ...
+     * */
+    public readonly explanation: string
+    /**
+     * What HTML-inputmode to use
+     */
+    public readonly inputmode?: string
+
+    constructor(name: string, explanation: string | BaseUIElement, inputmode?: string) {
+        this.name = name
+        this.inputmode = inputmode
+        if (this.name.endsWith("textfield")) {
+            this.name = this.name.substr(0, this.name.length - "TextField".length)
+        }
+        if (this.name.endsWith("textfielddef")) {
+            this.name = this.name.substr(0, this.name.length - "TextFieldDef".length)
+        }
+        if (typeof explanation === "string") {
+            this.explanation = explanation
+        } else {
+            this.explanation = explanation.AsMarkdown()
+        }
+    }
+
+    /**
+     * Gets a piece of feedback. By default, validation.<type> will be used, resulting in a generic 'not a valid <type>'.
+     * However, inheritors might overwrite this to give more specific feedback
+     * @param s
+     */
+    public getFeedback(s: string): Translation {
+        const tr = Translations.t.validation[this.name]
+        if (tr !== undefined) {
+            return tr["feedback"]
+        }
+    }
+
+    public isValid(string: string, requestCountry: () => string): boolean {
+        return true
+    }
+
+    public reformat(s: string, country?: () => string): string {
+        return s
+    }
+}

UI/InputElement/Validators.ts

@@ -1,77 +1,23 @@
-import BaseUIElement from "../BaseUIElement"
-import Combine from "../Base/Combine"
-import Title from "../Base/Title"
-import Translations from "../i18n/Translations"
-import { Translation } from "../i18n/Translation"
-import WikidataValidator from "./Validators/WikidataValidator"
+import { Validator } from "./Validator"
 import StringValidator from "./Validators/StringValidator"
 import TextValidator from "./Validators/TextValidator"
 import DateValidator from "./Validators/DateValidator"
-import LengthValidator from "./Validators/LengthValidator"
-import IntValidator from "./Validators/IntValidator"
-import EmailValidator from "./Validators/EmailValidator"
-import DirectionValidator from "./Validators/DirectionValidator"
 import NatValidator from "./Validators/NatValidator"
-import OpeningHoursValidator from "./Validators/OpeningHoursValidator"
-import PFloatValidator from "./Validators/PFloatValidator"
-import ColorValidator from "./Validators/ColorValidator"
-import PhoneValidator from "./Validators/PhoneValidator"
-import UrlValidator from "./Validators/UrlValidator"
-import FloatValidator from "./Validators/FloatValidator"
+import IntValidator from "./Validators/IntValidator"
+import LengthValidator from "./Validators/LengthValidator"
+import DirectionValidator from "./Validators/DirectionValidator"
+import WikidataValidator from "./Validators/WikidataValidator"
 import PNatValidator from "./Validators/PNatValidator"
-
-/**
- * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback.
- * They also double as an index of supported types for textfields in MapComplete
- */
-export abstract class Validator {
-    public readonly name: string
-    /*
-     * An explanation for the theme builder.
-     * This can indicate which special input element is used, ...
-     * */
-    public readonly explanation: string
-    /**
-     * What HTML-inputmode to use
-     */
-    public readonly inputmode?: string
-
-    constructor(name: string, explanation: string | BaseUIElement, inputmode?: string) {
-        this.name = name
-        this.inputmode = inputmode
-        if (this.name.endsWith("textfield")) {
-            this.name = this.name.substr(0, this.name.length - "TextField".length)
-        }
-        if (this.name.endsWith("textfielddef")) {
-            this.name = this.name.substr(0, this.name.length - "TextFieldDef".length)
-        }
-        if (typeof explanation === "string") {
-            this.explanation = explanation
-        } else {
-            this.explanation = explanation.AsMarkdown()
-        }
-    }
-
-    /**
-     * Gets a piece of feedback. By default, validation.<type> will be used, resulting in a generic 'not a valid <type>'.
-     * However, inheritors might overwrite this to give more specific feedback
-     * @param s
-     */
-    public getFeedback(s: string): Translation {
-        const tr = Translations.t.validation[this.name]
-        if (tr !== undefined) {
-            return tr["feedback"]
-        }
-    }
-
-    public isValid(string: string, requestCountry: () => string): boolean {
-        return true
-    }
-
-    public reformat(s: string, country?: () => string): string {
-        return s
-    }
-}
+import FloatValidator from "./Validators/FloatValidator"
+import PFloatValidator from "./Validators/PFloatValidator"
+import EmailValidator from "./Validators/EmailValidator"
+import UrlValidator from "./Validators/UrlValidator"
+import PhoneValidator from "./Validators/PhoneValidator"
+import OpeningHoursValidator from "./Validators/OpeningHoursValidator"
+import ColorValidator from "./Validators/ColorValidator"
+import BaseUIElement from "../BaseUIElement"
+import Combine from "../Base/Combine"
+import Title from "../Base/Title"
 
 export default class Validators {
     private static readonly AllValidators: ReadonlyArray<Validator> = [

UI/InputElement/Validators/ColorValidator.ts

@@ -1,4 +1,4 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class ColorValidator extends Validator {
     constructor() {

UI/InputElement/Validators/DateValidator.ts

@@ -1,4 +1,4 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class DateValidator extends Validator {
     constructor() {

UI/InputElement/Validators/DirectionValidator.ts

@@ -1,5 +1,5 @@
-import { Validator } from "../ValidatedTextField"
-import IntValidator from "./IntValidator";
+import IntValidator from "./IntValidator"
+import { Validator } from "../Validator"
 
 export default class DirectionValidator extends IntValidator {
     constructor() {
@@ -13,5 +13,4 @@ export default class DirectionValidator extends IntValidator {
         const n = Number(str) % 360
         return "" + n
     }
-
 }

UI/InputElement/Validators/EmailValidator.ts

@@ -1,7 +1,7 @@
-import { Validator } from "../ValidatedTextField.js"
 import { Translation } from "../../i18n/Translation.js"
 import Translations from "../../i18n/Translations.js"
 import * as emailValidatorLibrary from "email-validator"
+import { Validator } from "../Validator"
 export default class EmailValidator extends Validator {
     constructor() {
         super("email", "An email adress", "email")

UI/InputElement/Validators/FloatValidator.ts

@@ -1,6 +1,6 @@
 import { Translation } from "../../i18n/Translation"
 import Translations from "../../i18n/Translations"
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class FloatValidator extends Validator {
     inputmode = "decimal"

UI/InputElement/Validators/IntValidator.ts

@@ -1,6 +1,6 @@
 import { Translation } from "../../i18n/Translation"
 import Translations from "../../i18n/Translations"
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class IntValidator extends Validator {
     constructor(name?: string, explanation?: string) {

UI/InputElement/Validators/LengthValidator.ts

@@ -1,4 +1,4 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class LengthValidator extends Validator {
     constructor() {

UI/InputElement/Validators/OpeningHoursValidator.ts

@@ -1,7 +1,7 @@
-import { Validator } from "../ValidatedTextField"
 import Combine from "../../Base/Combine"
 import Title from "../../Base/Title"
 import Table from "../../Base/Table"
+import { Validator } from "../Validator"
 
 export default class OpeningHoursValidator extends Validator {
     constructor() {

UI/InputElement/Validators/PFloatValidator.ts

@@ -1,6 +1,6 @@
 import { Translation } from "../../i18n/Translation"
 import Translations from "../../i18n/Translations"
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class PFloatValidator extends Validator {
     constructor() {

UI/InputElement/Validators/PhoneValidator.ts

@@ -1,5 +1,5 @@
-import { Validator } from "../ValidatedTextField"
 import { parsePhoneNumberFromString } from "libphonenumber-js"
+import { Validator } from "../Validator"
 
 export default class PhoneValidator extends Validator {
     constructor() {

UI/InputElement/Validators/StringValidator.ts

@@ -1,8 +1,7 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class StringValidator extends Validator {
     constructor() {
         super("string", "A simple piece of text")
     }
-
 }

UI/InputElement/Validators/TextValidator.ts

@@ -1,4 +1,4 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class TextValidator extends Validator {
     constructor() {

UI/InputElement/Validators/UrlValidator.ts

@@ -1,4 +1,4 @@
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class UrlValidator extends Validator {
     constructor() {

UI/InputElement/Validators/WikidataValidator.ts

@@ -6,7 +6,7 @@ import { UIEventSource } from "../../../Logic/UIEventSource"
 import Locale from "../../i18n/Locale"
 import { Utils } from "../../../Utils"
 import WikidataSearchBox from "../../Wikipedia/WikidataSearchBox"
-import { Validator } from "../ValidatedTextField"
+import { Validator } from "../Validator"
 
 export default class WikidataValidator extends Validator {
     constructor() {