fix: faster variant from and to

Author: farfromrefug

src/utils/index.android.ts

@@ -14,65 +14,13 @@ export function nativeVectorToArray(nVector: com.carto.core.StringVector) {
 }
 
 export function nativeVariantToJS(variant: com.carto.core.Variant) {
-    switch (variant.getType()) {
-        case com.carto.core.VariantType.VARIANT_TYPE_ARRAY: {
-            const result = [];
-            for (let index = 0; index < variant.getArraySize(); index++) {
-                result[index] = nativeVariantToJS(variant.getArrayElement(index));
-            }
-            return result;
-        }
-        case com.carto.core.VariantType.VARIANT_TYPE_STRING:
-            return variant.getString();
-        case com.carto.core.VariantType.VARIANT_TYPE_BOOL:
-            return variant.getBool();
-        case com.carto.core.VariantType.VARIANT_TYPE_DOUBLE:
-            return variant.getDouble();
-        case com.carto.core.VariantType.VARIANT_TYPE_INTEGER:
-            return variant.getLong();
-        case com.carto.core.VariantType.VARIANT_TYPE_OBJECT:
-            const result = {};
-            const keys = variant.getObjectKeys();
-            let key;
-            for (let index = 0; index < keys.size(); index++) {
-                key = keys.get(index);
-                result[key] = nativeVariantToJS(variant.getObjectElement(key));
-            }
-            return result;
-    }
-    return undefined;
+    return JSON.parse(variant.toString());
 }
 export function JSVariantToNative(variant: any) {
     if (Array.isArray(variant)) {
-        const builder = new com.carto.core.VariantArrayBuilder();
-        for (let index = 0; index < variant.length; index++) {
-            const obj = variant[index];
-            if (typeof obj === 'boolean') {
-                builder.addBool(obj);
-            } else if (typeof obj === 'number') {
-                builder.addDouble(obj);
-            } else if (typeof obj === 'string') {
-                builder.addString(obj);
-            } else {
-                builder.addVariant(JSVariantToNative(obj));
-            }
-        }
-        return builder.buildVariant();
+        return com.carto.core.Variant.fromString(JSON.stringify(variant));
     } else if (typeof variant === 'object') {
-        const builder = new com.carto.core.VariantObjectBuilder();
-        Object.keys(variant).forEach((k) => {
-            const obj = variant[k];
-            if (typeof obj === 'boolean') {
-                builder.setBool(k, obj);
-            } else if (typeof obj === 'number') {
-                builder.setDouble(k, obj);
-            } else if (typeof obj === 'string') {
-                builder.setString(k, obj);
-            } else {
-                builder.setVariant(k, JSVariantToNative(obj));
-            }
-        });
-        return builder.buildVariant();
+        return com.carto.core.Variant.fromString(JSON.stringify(variant));
     } else if (variant) {
         return new com.carto.core.Variant(variant);
     }

src/utils/index.ios.ts

@@ -12,76 +12,22 @@ export function nativeVectorToArray(nVector: NTStringVector) {
 }
 
 export function nativeVariantToJS(variant: NTVariant) {
-    switch (variant.getType()) {
-        case NTVariantType.T_VARIANT_TYPE_ARRAY: {
-            const result = [];
-            for (let index = 0; index < variant.getArraySize(); index++) {
-                result[index] = nativeVariantToJS(variant.getArrayElement(index));
-            }
-            return result;
-        }
-        case NTVariantType.T_VARIANT_TYPE_BOOL:
-            return variant.getBool();
-        case NTVariantType.T_VARIANT_TYPE_DOUBLE:
-            return variant.getDouble();
-        case NTVariantType.T_VARIANT_TYPE_INTEGER:
-            return variant.getLong();
-        case NTVariantType.T_VARIANT_TYPE_NULL:
-            return null;
-        case NTVariantType.T_VARIANT_TYPE_STRING:
-            return variant.getString();
-        case NTVariantType.T_VARIANT_TYPE_OBJECT: {
-            const result = {} as any;
-            const keys = variant.getObjectKeys();
-            let key;
-            for (let index = 0; index < keys.size(); index++) {
-                key = keys.get(index);
-                result[key] = nativeVariantToJS(variant.getObjectElement(key));
-            }
-            return result;
-        }
-    }
+    return JSON.parse(variant.toString());
 }
 export function JSVariantToNative(variant: any) {
     if (Array.isArray(variant)) {
-        const builder = NTVariantArrayBuilder.alloc().init();
-        for (let index = 0; index < variant.length; index++) {
-            const obj = variant[index];
-            if (typeof obj === 'boolean') {
-                builder.addBool(obj);
-            } else if (typeof obj === 'number') {
-                builder.addDouble(obj);
-            } else if (typeof obj === 'string') {
-                builder.addString(obj);
-            } else {
-                builder.addVariant(JSVariantToNative(obj));
-            }
-        }
-        return builder.buildVariant();
+        return NTVariant.fromString(JSON.stringify(variant));
     } else if (typeof variant === 'object') {
-        const builder = NTVariantObjectBuilder.alloc().init();
-        Object.keys(variant).forEach((k) => {
-            const obj = variant[k];
-            if (typeof obj === 'boolean') {
-                builder.setBoolVal(k, obj);
-            } else if (typeof obj === 'number') {
-                builder.setDoubleVal(k, obj);
-            } else if (typeof obj === 'string') {
-                builder.setStringStr(k, obj);
-            } else {
-                builder.setVariantVar(k, JSVariantToNative(obj));
-            }
-        });
-        return builder.buildVariant();
+        return NTVariant.fromString(JSON.stringify(variant));
     } else if (variant) {
         if (typeof variant === 'boolean') {
             return NTVariant.alloc().initWithBoolVal(variant);
         } else if (typeof variant === 'number') {
             return NTVariant.alloc().initWithDoubleVal(variant);
         } else if (typeof variant === 'string') {
             return NTVariant.alloc().initWithString(variant);
-        } else {
-            return NTVariant.alloc().initWithObject(variant);
+            // } else {
+            // return NTVariant.alloc().initWithObject(variant);
         }
     }
     return null;