Merge pull request #582 from marle3003/develop

fix patching array list

Author: marle3003

js/mokapi/patch.go

@@ -16,7 +16,13 @@ func patch(target, patch any) any {
 	if isTargetMap && isPatchMap {
 		return patchMap(mapTarget, mapPatch)
 	} else {
-		return patch
+		arrTarget, isTargetArray := target.([]any)
+		arrPatch, isPatchArray := patch.([]any)
+		if isTargetArray && isPatchArray {
+			return patchArray(arrTarget, arrPatch)
+		} else {
+			return patch
+		}
 	}
 }
 
@@ -42,3 +48,26 @@ func patchMap(t, p map[string]any) map[string]any {
 	}
 	return result
 }
+
+func patchArray(t, p []any) []any {
+	result := make([]any, 0, len(p))
+
+	// copy original value
+	for _, v := range t {
+		result = append(result, v)
+	}
+
+	for i, v := range p {
+		if v == Delete {
+			result = append(result[:i], result[i+1:]...)
+			continue
+		}
+		if i < len(result) {
+			result[i] = patch(result[i], v)
+		} else {
+			result = append(result, v)
+		}
+	}
+
+	return result
+}

js/mokapi/patch_test.go

@@ -139,6 +139,50 @@ func TestModule_Patch(t *testing.T) {
 				r.Equal(t, map[string]any{}, v.Export())
 			},
 		},
+		{
+			name: "patch array",
+			test: func(t *testing.T, vm *goja.Runtime, host *enginetest.Host) {
+				v, err := vm.RunString(`
+					const m = require('mokapi')
+					m.patch([1,2,3,4], [1,3,4])
+				`)
+				r.NoError(t, err)
+				r.Equal(t, []interface{}{int64(1), int64(3), int64(4), int64(4)}, v.Export())
+			},
+		},
+		{
+			name: "patch array has more items",
+			test: func(t *testing.T, vm *goja.Runtime, host *enginetest.Host) {
+				v, err := vm.RunString(`
+					const m = require('mokapi')
+					m.patch([1,2], [1,2,3,4])
+				`)
+				r.NoError(t, err)
+				r.Equal(t, []interface{}{int64(1), int64(2), int64(3), int64(4)}, v.Export())
+			},
+		},
+		{
+			name: "array with delete",
+			test: func(t *testing.T, vm *goja.Runtime, host *enginetest.Host) {
+				v, err := vm.RunString(`
+					const m = require('mokapi')
+					m.patch([1,2], [1,m.Delete])
+				`)
+				r.NoError(t, err)
+				r.Equal(t, []interface{}{int64(1)}, v.Export())
+			},
+		},
+		{
+			name: "array with undefined",
+			test: func(t *testing.T, vm *goja.Runtime, host *enginetest.Host) {
+				v, err := vm.RunString(`
+					const m = require('mokapi')
+					m.patch([1,2], [undefined])
+				`)
+				r.NoError(t, err)
+				r.Equal(t, []interface{}{int64(1), int64(2)}, v.Export())
+			},
+		},
 	}
 
 	t.Parallel()