Fixed issue where createFrom would misidentify strings as arrays (#3435)

* Update check for Array-like variables * Updated binding tests to reflect changes * Update documentation to reflect changes * Fixed PR number in changelog --------- Co-authored-by: Lea Anthony <[email protected]>
wailsapp · Apr 27, 2024 · c10dfbc · c10dfbc
1 parent 66562bf
commit c10dfbc
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/v2/internal/binding/binding_test/binding_anonymous_sub_struct_multi_level_test.go b/v2/internal/binding/binding_test/binding_anonymous_sub_struct_multi_level_test.go
@@ -45,7 +45,7 @@ export namespace binding_test {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_anonymous_sub_struct_test.go b/v2/internal/binding/binding_test/binding_anonymous_sub_struct_test.go
@@ -39,7 +39,7 @@ export namespace binding_test {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_emptystruct_test.go b/v2/internal/binding/binding_test/binding_emptystruct_test.go
@@ -34,7 +34,7 @@ export namespace binding_test {
 				return a;
 			}
 
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_importedmap_test.go b/v2/internal/binding/binding_test/binding_importedmap_test.go
@@ -32,7 +32,7 @@ export namespace binding_test {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {
@@ -62,7 +62,7 @@ export namespace binding_test_import {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_importedslice_test.go b/v2/internal/binding/binding_test/binding_importedslice_test.go
@@ -32,7 +32,7 @@ export namespace binding_test {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {
@@ -62,7 +62,7 @@ export namespace binding_test_import {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_importedstruct_test.go b/v2/internal/binding/binding_test/binding_importedstruct_test.go
@@ -33,7 +33,7 @@ export namespace binding_test {
 				return a;
 			}
 
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {
@@ -63,7 +63,7 @@ export namespace binding_test_import {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_nestedfield_test.go b/v2/internal/binding/binding_test/binding_nestedfield_test.go
@@ -44,7 +44,7 @@ export namespace binding_test {
 			if (!a) {
 				return a;
 			}
-			if (a.slice) {
+			if (a.slice && a.map) {
 				return (a as any[]).map(elem => this.convertValues(elem, classs));
 			} else if ("object" === typeof a) {
 				if (asMap) {

diff --git a/v2/internal/binding/binding_test/binding_tsgeneration_test.go b/v2/internal/binding/binding_test/binding_tsgeneration_test.go
@@ -107,7 +107,7 @@ export namespace binding_test {
 						if (!a) {
 							return a;
 						}
-						if (a.slice) {
+						if (a.slice && a.map) {
 							return (a as any[]).map(elem => this.convertValues(elem, classs));
 						} else if ("object" === typeof a) {
 							if (asMap) {
@@ -172,7 +172,7 @@ export namespace binding_test {
             		    if (!a) {
             		        return a;
             		    }
-            		    if (a.slice) {
+            		    if (a.slice && a.map) {
             		        return (a as any[]).map(elem => this.convertValues(elem, classs));
             		    } else if ("object" === typeof a) {
             		        if (asMap) {
@@ -204,7 +204,7 @@ export namespace binding_test {
             		    if (!a) {
             		        return a;
             		    }
-            		    if (a.slice) {
+            		    if (a.slice && a.map) {
             		        return (a as any[]).map(elem => this.convertValues(elem, classs));
             		    } else if ("object" === typeof a) {
             		        if (asMap) {
@@ -239,7 +239,7 @@ export namespace binding_test {
             		    if (!a) {
             		        return a;
             		    }
-            		    if (a.slice) {
+            		    if (a.slice && a.map) {
             		        return (a as any[]).map(elem => this.convertValues(elem, classs));
             		    } else if ("object" === typeof a) {
             		        if (asMap) {

diff --git a/v2/internal/typescriptify/typescriptify.go b/v2/internal/typescriptify/typescriptify.go
@@ -24,7 +24,7 @@ const (
 	if (!a) {
 		return a;
 	}
-	if (a.slice) {
+	if (a.slice && a.map) {
 		return (a as any[]).map(elem => this.convertValues(elem, classs));
 	} else if ("object" === typeof a) {
 		if (asMap) {

diff --git a/website/docs/howdoesitwork.mdx b/website/docs/howdoesitwork.mdx
@@ -418,7 +418,7 @@ export namespace main {
       if (!a) {
         return a;
       }
-      if (a.slice) {
+      if (a.slice && a.map) {
         return (a as any[]).map((elem) => this.convertValues(elem, classs));
       } else if ("object" === typeof a) {
         if (asMap) {

diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed an issue where certain calls to createFrom in TypeScript would fail. Changed by [@twonull](https://github.com/twonull) in [PR](https://github.com/wailsapp/wails/pull/3435)
 - Fixed some typos in comments. Changed by [@reallylowest](https://github.com/reallylowest) in [PR](https://github.com/wailsapp/wails/pull/3357)
 - Fixed an issue where the destination file was not properly closed after copying. Changed by [@testwill](https://github.com/testwill) in [PR](https://github.com/wailsapp/wails/pull/3384)
 - Fixed an issue where `xattr` calls were not working. Fixed by [@leaanthony](https://github.com/wailsapp/wails/pull/3328)