refractor: changed some method names

Author: Autokaka

example/lib/home.dart

@@ -28,7 +28,7 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-    jsonObject = JsonObject().fromString(jsonStr);
+    jsonObject = JsonObject.fromString(jsonStr);
   }
 
   @override

lib/json_object.dart

@@ -10,50 +10,36 @@ part 'src/exception.dart';
 part 'src/util.dart';
 
 class JsonObject {
-  Invocation _invocation;
+  JsonObject._();
 
-  Map _map;
-  bool get isMap => _map != null;
-  List _list;
-  bool get isList => _list != null;
-  Object _normalValue;
-  bool get isNormalValue => _normalValue != null;
-  String get _innerDataType {
-    if (isMap) return _map.runtimeType.toString();
-    if (isList) return _list.runtimeType.toString();
-    return _normalValue.runtimeType.toString();
+  /// Creates a dynamic(actually a JsonObject) from json string.
+  static dynamic fromString(String jsonStr) {
+    final decodeResult = json.decode(jsonStr);
+    final jsonObject = JsonObject._();
+
+    if (decodeResult is Map) return jsonObject.._map = decodeResult;
+    if (decodeResult is List) return jsonObject.._list = decodeResult;
+    return jsonObject.._other = decodeResult;
   }
 
-  void Function(Object newValue) _listen;
+  /// Creates a dynamic(actually a JsonObject) that contains
+  /// all the values of the [otherJsonObject].
+  static dynamic from(dynamic otherJsonObject) =>
+      fromString(otherJsonObject.encode());
 
-  static bool isEmpty(JsonObject jsonObject) {
-    return jsonObject == null ||
-        jsonObject._map == null &&
-            jsonObject._list == null &&
-            jsonObject._normalValue == null;
-  }
+  Map _map;
+  List _list;
+  dynamic _other;
+  String get _valueType => getValue().runtimeType.toString();
 
-  static bool isNotEmpty(JsonObject jsonObject) => !isEmpty(jsonObject);
+  void Function(dynamic newValue) _listen;
+  void _notify(dynamic newValue) => _listen(newValue);
 
-  /// Creates a dynamic(actually a JsonObject) from json string.
-  dynamic fromString(String jsonStr) {
-    var decodeResult = json.decode(jsonStr);
-
-    if (decodeResult is Map) {
-      _map = decodeResult;
-      return this;
-    }
-    if (decodeResult is List) {
-      _list = decodeResult;
-      return this;
-    }
-    _normalValue = decodeResult;
-    return this;
-  }
+  static bool isEmpty(JsonObject jsonObject) =>
+      jsonObject == null || jsonObject.getValue() == null;
+  static bool isNotEmpty(JsonObject jsonObject) => !isEmpty(jsonObject);
 
-  /// Creates a dynamic(actually a JsonObject) that contains
-  /// all the values of the [otherObject].
-  dynamic from(JsonObject otherObject) => fromString(otherObject.encode());
+  Invocation _invocation;
 
   /// This is the core magic of json_object.
   /// It uses [invocation] in [noSuchMethod]
@@ -62,11 +48,11 @@ class JsonObject {
   dynamic noSuchMethod(Invocation invocation) {
     _invocation = invocation;
 
-    if (_isGetMapValue) return _mapValue;
-    if (_isSetMapValue) return _setMapValue();
+    if (isGettingMapValue) return getMapValue();
+    if (isSettingMapValue) return setMapValue();
 
-    if (_isGetListValue) return _listValue;
-    if (_isSetListValue) return _setListValue();
+    if (isGettingListValue) return getListValue();
+    if (isSettingListValue) return setListValue();
 
     throw _JsonObjectException.uncaughtException();
   }
@@ -124,47 +110,47 @@ class JsonObject {
   /// [jsonObject.name]. Also note that you only need to call [getValue()]
   /// at the end of the value, which means you can't use
   /// [jsonObject.getValue().name.getValue()] to get the value.
-  Object getValue() => _JsonObjectUtil(this).getValue();
+  dynamic getValue() => _JsonObjectUtil(this).getValue();
 
-  /// Return index list of [_list] if JsonObject inner value [isList].
+  /// Return index list of [_list] if JsonObject inner value [getValue() is List].
   /// For example, if inner value is `["a", "b", "c"]`, then this method
   /// returns `[0, 1, 2]`.
   ///
-  /// Return [_map.keys] if JsonObject inner value [isMap].
+  /// Return [_map.keys] if JsonObject inner value [getValue() is Map].
   /// For example, if inner value is `{"a": 1, "b": 2, "c": 3}`, then
   /// this method returns `["a", "b", "c"]`.
   ///
-  /// Return [_normalValue.toString().split("")] if
-  /// JsonObject inner value [isNormalValue].
+  /// Return [_other.toString().split("")] if
+  /// JsonObject inner value [_other != null].
   /// For example, if inner value is `"love you"`, then this
   /// method returns `["l", "o", "v", "e", " ", "y", "o", "u"]`
   Iterable get keys => _JsonObjectUtil(this).keys;
 
-  /// Return [_list.length] if JsonObject inner value [isList].
+  /// Return [_list.length] if JsonObject inner value [getValue() is List].
   /// For example, if inner value is `["a", "b", "c"]`, then this method
   /// returns 3.
   ///
-  /// Return [_map.keys.length] if JsonObject inner value [isMap].
+  /// Return [_map.keys.length] if JsonObject inner value [getValue() is Map].
   /// For example, if inner value is `{"a": 1, "b": 2, "c": 3}`, then
   /// this method returns 3, which is the length of [_map.keys],
   /// known as `["a", "b", "c"]`.
   ///
-  /// Return [_normalValue.toString().length] if
-  /// JsonObject inner value [isNormalValue].
+  /// Return [_other.toString().length] if
+  /// JsonObject inner value [_other != null].
   /// For example, if inner value is `"love you"`, then this
   /// method returns 8, which is the length of String `"love you"`.
   int get length => _JsonObjectUtil(this).length;
 
   /// Add a (key, value) pair in [JsonObject].
   ///
-  /// If the inner value [isMap], it adds
+  /// If the inner value [getValue() is Map], it adds
   /// a (key, value) pair in [JsonObject].
   ///
-  /// If the inner value [isList], it adds
+  /// If the inner value [getValue() is List], it adds
   /// the value to `[_list[key]]`, this [key]
   /// here represents [index].
   ///
-  /// If the inner value [isNormalValue], it
+  /// If the inner value [_other != null], it
   /// throws an Exception.
-  void add(Object key, Object value) => _JsonObjectUtil(this).add(key, value);
+  void add(dynamic key, dynamic value) => _JsonObjectUtil(this).add(key, value);
 }

lib/src/list_extension.dart

@@ -1,10 +1,10 @@
 part of json_object;
 
 extension _ListExtension on JsonObject {
-  bool get _isGetListValue =>
+  bool get isGettingListValue =>
       _invocation.isMethod && !_invocation.memberName.toString().contains(r'=');
-  dynamic get _listValue {
-    if (isMap) {
+  dynamic getListValue() {
+    if (getValue() is Map) {
       throw _JsonObjectException.getValueException(
         innerDataType: "Map",
         expectedType: "List",
@@ -20,17 +20,14 @@ extension _ListExtension on JsonObject {
     }
 
     var valueStr = json.encode(_list[index]);
-    var child = JsonObject()
-      .._listen = (newValue) {
-        _list[index] = newValue;
-      };
-    return child.fromString(valueStr);
+    return JsonObject.fromString(valueStr)
+      .._listen = (newValue) => _list[index] = newValue;
   }
 
-  bool get _isSetListValue =>
+  bool get isSettingListValue =>
       _invocation.isMethod && _invocation.memberName.toString().contains(r'=');
-  void _setListValue() {
-    if (isMap) {
+  void setListValue() {
+    if (getValue() is Map) {
       throw _JsonObjectException.setValueException(
         innerDataType: "Map",
         expectedType: "List",
@@ -47,20 +44,19 @@ extension _ListExtension on JsonObject {
     }
 
     _list[index] = value;
-    _listen?.call(_list);
+    _notify(_list);
   }
 
-  void _listAdd(Object key, Object value) {
+  void _listAdd(dynamic key, dynamic value) {
     if (key is! int) {
       throw _JsonObjectException.methodInvokeException(
         methodName: "add",
-        innerDataType: _innerDataType,
+        innerDataType: _valueType,
         expectedType: "Map",
       );
     }
 
     _list.add(value);
-    _listen?.call(_list);
-    return;
+    _notify(_list);
   }
 }

lib/src/map_extension.dart

@@ -1,9 +1,9 @@
 part of json_object;
 
 extension _MapExtension on JsonObject {
-  bool get _isGetMapValue => _invocation.isAccessor && _invocation.isGetter;
-  dynamic get _mapValue {
-    if (isList) {
+  bool get isGettingMapValue => _invocation.isAccessor && _invocation.isGetter;
+  dynamic getMapValue() {
+    if (getValue() is List) {
       throw _JsonObjectException.getValueException(
         innerDataType: "List",
         expectedType: "Map",
@@ -16,16 +16,13 @@ extension _MapExtension on JsonObject {
     }
 
     var valueStr = json.encode(_map[key]);
-    var child = JsonObject()
-      .._listen = (newValue) {
-        _map[key] = newValue;
-      };
-    return child.fromString(valueStr);
+    return JsonObject.fromString(valueStr)
+      .._listen = (newValue) => _map[key] = newValue;
   }
 
-  bool get _isSetMapValue => _invocation.isAccessor && _invocation.isSetter;
-  void _setMapValue() {
-    if (isList) {
+  bool get isSettingMapValue => _invocation.isAccessor && _invocation.isSetter;
+  void setMapValue() {
+    if (getValue() is List) {
       throw _JsonObjectException.setValueException(
         innerDataType: "List",
         expectedType: "Map",
@@ -35,14 +32,14 @@ extension _MapExtension on JsonObject {
     var key = _memberNameStr;
     var value = _invocation.positionalArguments.first;
     _map[key] = value;
-    _listen?.call(_map);
+    _notify(_map);
   }
 
-  void _mapAdd(Object key, Object value) {
+  void _mapAdd(dynamic key, dynamic value) {
     if (key is int) {
       throw _JsonObjectException.methodInvokeException(
         methodName: "add",
-        innerDataType: _innerDataType,
+        innerDataType: _valueType,
         expectedType: "List",
       );
     }
@@ -59,6 +56,6 @@ extension _MapExtension on JsonObject {
     }
 
     _map[key] = value;
-    _listen?.call(_map);
+    _notify(_map);
   }
 }

lib/src/util.dart

@@ -4,46 +4,41 @@ extension _JsonObjectUtil on JsonObject {
   String encodePretty({int indent = 2}) {
     var spaces = ' ' * indent;
     var encoder = JsonEncoder.withIndent(spaces);
-    if (isMap) return encoder.convert(_map);
-    if (isList) return encoder.convert(_list);
-    return encoder.convert(_normalValue);
+    if (getValue() is Map) return encoder.convert(_map);
+    if (getValue() is List) return encoder.convert(_list);
+    return encoder.convert(_other);
   }
 
   String encode() {
-    if (isMap) return json.encode(_map);
-    if (isList) return json.encode(_list);
-    return json.encode(_normalValue);
+    if (getValue() is Map) return json.encode(_map);
+    if (getValue() is List) return json.encode(_list);
+    return json.encode(_other);
   }
 
-  Object getValue() {
-    if (isMap) return _map;
-    if (isList) return _list;
-    return _normalValue;
-  }
+  dynamic getValue() => _map ?? _list ?? _other;
 
   Iterable get keys {
-    if (isMap) return _map.keys;
-    if (isList) return List.generate(_list.length, (index) => index);
-    if (isNormalValue) return _normalValue.toString().split("");
-    throw _JsonObjectException.uncaughtException();
+    if (getValue() is Map) return _map.keys;
+    if (getValue() is List)
+      return List.generate(_list.length, (index) => index);
+    return _other.toString().split("");
   }
 
   int get length {
-    if (isList) return _list.length;
-    if (isMap) return _map.keys.length;
-    if (isNormalValue) return _normalValue.toString().length;
-    throw _JsonObjectException.uncaughtException();
+    if (getValue() is List) return _list.length;
+    if (getValue() is Map) return _map.keys.length;
+    return _other.toString().length;
   }
 
-  void add(Object key, Object value) {
-    if (isNormalValue) {
+  void add(dynamic key, dynamic value) {
+    if (_other != null) {
       throw _JsonObjectException.methodInvokeException(
         methodName: "add",
-        innerDataType: _innerDataType,
+        innerDataType: _valueType,
         expectedType: "Map or List",
       );
     }
-    if (isMap) return _mapAdd(key, value);
-    if (isList) return _listAdd(key, value);
+    if (getValue() is Map) return _mapAdd(key, value);
+    if (getValue() is List) return _listAdd(key, value);
   }
 }