Merge branch 'Development'

Author: Jens Borrisholt

Demo Data/NullProperty.json

@@ -0,0 +1,7 @@
+[
+    {
+        "createdAt": null,
+        "updatedAt": "2013-05-28T15:47:57.962Z",
+        "username": "jacquelyn88"
+    }
+]

Generator GUI/JsonToDelphiClass.delphilsp.json

@@ -26,10 +26,14 @@ class function TJsonValueHelper.GetJsonType(aJsonValue: TJsonValue): TJsonType;
   b: Boolean;
   d: Double;
   E: Extended;
+  DT: TdateTime;
 begin
   if aJsonValue = nil then
     exit(jtObject);
 
+  if aJsonValue is TJSONNull then
+    exit(jtUnknown);
+
   if aJsonValue is TJSONObject then
     exit(jtObject);
 
@@ -56,12 +60,8 @@ class function TJsonValueHelper.GetJsonType(aJsonValue: TJsonValue): TJsonType;
   begin
     Value := aJsonValue.AsType<string>;
 
-    try
-      ISO8601ToDate(Value);
+    if TryISO8601ToDate(Value, DT) then
       exit(jtDateTime);
-    except
-
-    end;
 
     if TryStrToFloat(Value, E) then
       Result := jtString

Lib/Pkg.Json.JsonValueHelper.pas

@@ -66,28 +66,13 @@ procedure TPkgJsonMapper.ProcessJsonObject(aJsonValue: TJsonValue; aParentClass:
   if aJsonValue = nil then
     exit;
 
-  if not(aJsonValue is TJSONObject) then
-  begin
-    JsonType := GetJsonType(aJsonValue);
-
-    var Name := (aJsonValue as TJsonString).Value;
-
-    if Name = '' then
-      Name := 'Element';
-
-    TStubField.Create(aParentClass, Name, JsonType);
-    exit;
-  end;
-
   JSONObject := aJsonValue as TJSONObject;
   for JsonPair in JSONObject do
   begin
     JSONValue := JsonPair.JSONValue;
     JsonType := GetJsonType(JSONValue);
 
     case JsonType of
-      jtUnknown:
-        { do nothing };
       jtObject:
         begin
           StubClass := TStubClass.Construct(aParentClass, JsonPair.JsonString.Value, Self.FStubClasses);

Lib/Pkg.Json.Mapper.pas

@@ -22,7 +22,7 @@   TStubField = class(TJsonName)
     FName: string;
   strict protected
     procedure SetName(const Value: string); override;
-    class function GetTypeAsString(AType: TJsonType): string; overload;
+    class function GetTypeAsString(aJsonType: TJsonType): string; overload;
     function GetTypeAsString: string; overload; virtual;
   public
     function IsArrayField: Boolean;
@@ -378,9 +378,6 @@     Lines.Add(Name + ' = class' + IfThen(BaseClass = '', '', '(' + BaseClass + '
 
     for StubField in FItems do
     begin
-      if (StubField.FieldType = jtUnknown) or ((StubField is TStubContainerField) and ((StubField as TStubContainerField).ContainedType = jtUnknown)) then
-        raise EJsonMapper.CreateFmt('The property [%s] has unknown type!', [StubField.PropertyName]);
-
       if StubField.IsArrayField then
       begin
         StubArrayField := StubField as TStubArrayField;
@@ -443,11 +440,11 @@ constructor TStubField.Create(aParentClass: TStubClass; aItemName: string; aFiel
     FParentClass.Items.Add(Self);
 end;
 
-class function TStubField.GetTypeAsString(AType: TJsonType): string;
+class function TStubField.GetTypeAsString(aJsonType: TJsonType): string;
 begin
-  case AType of
+  case aJsonType of
     jtUnknown:
-      Result := 'Unknown';
+      Result := 'string';
     jtString:
       Result := 'string';
     jtTrue, jtFalse:

Lib/Pkg.Json.StubField.pas

@@ -1,6 +1,37 @@
 Delphi-JsonToDelphiClass
 ========================
 
+## Fixes & Features: 16th June 2024 ##
+### Features ###
+* JSON null property are now mapped to a string.
+
+Eg this JSON
+```json
+{
+    {
+        "createdAt": null,
+        "updatedAt": "2013-05-28T15:47:57.962Z",
+        "username": "jacquelyn88"
+    }
+}
+```
+
+Generates the following DTO:
+```pascal
+  TItems = class
+  private
+    FCreatedAt: string;
+    [SuppressZero]
+    FUpdatedAt: TDateTime;
+    FUsername: string;
+  published
+    property CreatedAt: string read FCreatedAt write FCreatedAt;
+    property UpdatedAt: TDateTime read FUpdatedAt write FUpdatedAt;
+    property Username: string read FUsername write FUsername;
+  end;
+```
+
+
 ## Fixes & Features: 04th February 2024 ##
 ### Features ###
 * Added a Demo, using and authenticated endpoint
@@ -26,7 +57,7 @@ Thanks to [DummyJSON](https://dummyjson.com/) for providing this service.
 * Added Clone function on TJsonDTO class
 
 ### Bugs: ###
-* Unittest TestDateTime didnt pass under Delphi 12
+* Unittest TestDateTime didn't pass under Delphi 12
 * Added missing Reserved words
 
 ## Fixes & Features: 13th January 2024 ##
@@ -163,7 +194,7 @@ E.g this JSON generated faulty code:
 * Allways use JsonName property annotation  (Setting)
 * Support for objects with diffrents properties in an Array
 
-Eg this JSON 
+Eg this JSON
 ```json
 {
    "ArrayTest":[
@@ -172,7 +203,7 @@ Eg this JSON
       },
       {
            "S2":"True"
-      }      
+      }
    ]
 }
 ```