Fix issues with data processors applying to invalid object types

Author: ReplicaObscura

Lib/Launchpad/Entity/LauncherEntity.ahk

@@ -311,7 +311,6 @@ class LauncherEntity extends EntityBase {
     }
 
     InitializeDefaults() {
-
         defaults := super.InitializeDefaults()
         defaults.Delete("DataSourceItemKey")
         defaults["DestinationDir"] := this.GetDefaultDestinationDir()

Lib/Shared/AppLib/Entity/EntityBase.ahk

@@ -95,13 +95,12 @@ class EntityBase {
         InvalidParameterException.CheckEmpty("EntityBase", "key", key)
 
         sanitizer := StringSanitizer()
-
         this.app := app
         this.keyVal := sanitizer.Process(key)
         this.configObj := configObj
         this.parentEntity := parentEntity
-
-        this.entityData := LayeredEntityData(configObj.Clone(), this.InitializeDefaults())
+        defaults := this.InitializeDefaults()
+        this.entityData := LayeredEntityData(configObj.Clone(), defaults)
         this.entityData.SetDataSourceDefaults(this.AggregateDataSourceDefaults())
         this.entityData.SetAutoDetectedDefaults(this.AutoDetectValues())
         this.entityData.StoreOriginal()
@@ -136,13 +135,13 @@ class EntityBase {
 
     ; NOTICE: Object not yet fully loaded. Might not be safe to call this.entityData
     InitializeDefaults() {
-        defaults := Map()
-        defaults["DataSourceKeys"] := ["api"]
-        defaults["DataSourceItemKey"] := ""
-        defaults["DisplayName"] := this.keyVal
-        defaults["AssetsDir"] := this.app.Config.AssetsDir . "\" . this.keyVal
-        defaults["DependenciesDir"] := this.app.appDir . "\Vendor"
-        return defaults
+        return Map(
+            "DataSourceKeys", ["api"],
+            "DataSourceItemKey", "",
+            "DisplayName", this.keyVal,
+            "AssetsDir", this.app.Config.AssetsDir . "\" . this.keyVal,
+            "DependenciesDir", this.app.appDir . "\Vendor"
+        )
     }
 
     AggregateDataSourceDefaults(includeParentData := true, includeChildData := true) {
@@ -187,7 +186,7 @@ class EntityBase {
         itemKey := this.GetDataSourceItemKey()
 
         if (itemKey) {
-            dsData := dataSource.ReadJson(this.GetDataSourceItemKey(), this.GetDataSourceItemPath())
+            dsData := dataSource.ReadJson(itemKey, this.GetDataSourceItemPath())
 
             if (dsData) {
                 this.existsInDataSource := true

Lib/Shared/DataLib/DataProcessor/DataProcessorBase.ahk

@@ -1,5 +1,24 @@
 class DataProcessorBase {
     Process(value) {
+        if (this.AppliesTo(value)) {
+            if (Type(value) == "String") {
+                value := this.ProcessSingleValue(value)
+            } else if (Type(value) == "Array" || Type(value) == "Map") {
+                for key, arrayVal in value {
+                    value[key] := this.Process(arrayVal)
+                }
+            }
+        }
+
+        return value
+    }
+
+    ProcessSingleValue(value) {
         throw MethodNotImplementedException("DataProcessorBase", "Process")
     }
+
+    AppliesTo(value) {
+        objType := Type(value)
+        return (objType == "String" || objType == "Map" || objType == "Array")
+    }
 }

Lib/Shared/DataLib/DataProcessor/PlaceholderExpander.ahk

@@ -5,7 +5,7 @@ class PlaceholderExpander extends DataProcessorBase {
         this.layeredData := layeredData
     }
 
-    Process(value) {
+    ProcessSingleValue(value) {
         mergedData := this.layeredData.GetMergedData(false)
 
         for key, varVal in mergedData {

Lib/Shared/DataLib/DataProcessor/StringSanitizer.ahk

@@ -7,7 +7,7 @@ class StringSanitizer extends DataProcessorBase {
         }
     }
 
-    Process(value) {
+    ProcessSingleValue(value) {
         return RegExReplace(value, "[^\000-\377]")
     }
 }