json2puml 2.0.18.70

- Updated / fixed logic how to calculate characteristics

Author: jfudickar

source/json2puml.dproj

@@ -71,7 +71,7 @@   tJson2PumlBaseObject = class(tPersistent)
     function GetIdent: string; virtual; abstract;
     function GetIsFilled: boolean; virtual;
     function GetIsValid: boolean; virtual;
-    function JsonAttributeValue (iPropertyName, iValue: string): string;
+    function JsonAttributeValue(iPropertyName, iValue: string; iValueQuotes: Boolean = true): string;
     function JsonAttributeValueList (iPropertyName: string; iValueList: TStringList): string;
     function JsonPropertyName (iPropertyName: string): string;
     function MergeValue (iValue, iNewValue: string): string;
@@ -372,12 +372,12 @@ function tJson2PumlBaseObject.GetIsValid: boolean;
   Result := IsFilled;
 end;
 
-function tJson2PumlBaseObject.JsonAttributeValue (iPropertyName, iValue: string): string;
+function tJson2PumlBaseObject.JsonAttributeValue(iPropertyName, iValue: string; iValueQuotes: Boolean = true): string;
 begin
   Result := '';
   if iPropertyName.IsEmpty or iValue.IsEmpty then
     exit;
-  Result := Format ('%s, ', [JsonPropertyNameValue(iPropertyName, iValue)]);
+  Result := Format ('%s, ', [JsonPropertyNameValue(iPropertyName, iValue, iValueQuotes)]);
 end;
 
 function tJson2PumlBaseObject.JsonAttributeValueList (iPropertyName: string; iValueList: TStringList): string;

source/json2puml.res

@@ -76,7 +76,7 @@ interface
 
   cNewLinePuml = '\n';
 
-  cCurrentVersion = '2.0.17.69';
+  cCurrentVersion = '2.0.18.70';
 
   JSON2PUML_EVENTTYPENAMES: TEventTypeNames = ['', 'INFO    ', 'SUCCESS ', 'WARNING ', 'ERROR   ', 'CRITICAL',
     'EXCEPT  ', 'DEBUG   ', 'TRACE   ', 'DONE    ', 'CUSTOM1 ', 'CUSTOM2 '];

source/json2pumlapps.dsk

@@ -49,10 +49,13 @@   tJson2PumlRecursionRecord = record
     ParentIsRelationship: Boolean;
     StopRecursion: Boolean;
     Level: Integer;
+    ArrayIndex: Integer;
     ObjectLevel: Integer;
     CharacteristicParentPropertyName: string;
     CharacteristicObject: tPumlCharacteristicObject;
-    procedure Init(iLeadingObject: string);
+    CharacteristicValue: tPumlCharacteristicValue;
+    CharacteristicRecord: tPumlCharacteristicRecord;
+    procedure Init (iLeadingObject: string);
     function GetParentObjectType: string;
     function GetInCharacteristicMode: Boolean;
     function GetCurrentCharacteristicDefinition: tJson2PumlCharacteristicDefinition;
@@ -150,9 +153,11 @@ procedure TJson2PumlConverter.BuildObjectRelationships (iHierarchieParentObject,
   ArrowFormat: string;
   GroupFromCondition, GroupToCondition, ArrowCondition: string;
 begin
-  GroupObjectTo:= Definition.IsGroupProperty (iPumlObject.ObjectType, iHierarchieParentObject.ObjectType, '', GroupFromCondition);
-  //GroupObjectFrom := Definition.IsGroupProperty (iHierarchieParentObject.ObjectType, iPumlObject.ObjectType, '', GroupToCondition);
-  GroupObjectFrom := Definition.IsGroupProperty (iPumlObject.ObjectType, iHierarchieParentObject.ObjectType, '', GroupFromCondition);
+  GroupObjectTo := Definition.IsGroupProperty (iPumlObject.ObjectType, iHierarchieParentObject.ObjectType, '',
+    GroupFromCondition);
+  // GroupObjectFrom := Definition.IsGroupProperty (iHierarchieParentObject.ObjectType, iPumlObject.ObjectType, '', GroupToCondition);
+  GroupObjectFrom := Definition.IsGroupProperty (iPumlObject.ObjectType, iHierarchieParentObject.ObjectType, '',
+    GroupFromCondition);
   ArrowFormat := Definition.RelationshipTypeArrowFormats.GetFormat (iPumlObject.ObjectType, iRelationshipProperty,
     iRelationshipType, ArrowCondition);
   added := iHierarchieParentObject.addRelationship (iRelationshipProperty, iRelationshipType, iRelationshipTypeProperty,
@@ -213,17 +218,17 @@ procedure TJson2PumlConverter.ConvertArray (iJsonArray: TJSONArray; iInfo: tJson
 begin
   if not Assigned (iJsonArray) then
     Exit;
-  for i := 0 to iJsonArray.Count - 1 do
-  begin
-    SaveRecursionRecord := IncRecursionRecord (iInfo, trpArray);
-    try
-      if iInfo.CurrentCharacteristicType = jctList then
-        iInfo.CharacteristicParentPropertyName :=
-          Format ('%s[%s]', [iInfo.CharacteristicParentPropertyName, (i + 1).ToString.PadLeft((i mod 10) + 1)]);
+  SaveRecursionRecord := IncRecursionRecord (iInfo, trpArray);
+  try
+    for i := 0 to iJsonArray.Count - 1 do
+    begin
+      iInfo.ArrayIndex := i;
+      if iInfo.InCharacteristicMode then
+        iInfo.CharacteristicRecord := iInfo.CharacteristicValue.AddDetailRecord (i);
       ConvertValue (iJsonArray.Items[i], iInfo, trpArray);
-    finally
-      DecRecursionRecord (iInfo, SaveRecursionRecord, trpArray);
     end;
+  finally
+    DecRecursionRecord (iInfo, SaveRecursionRecord, trpArray);
   end;
 end;
 
@@ -435,11 +440,22 @@ procedure TJson2PumlConverter.ConvertObject (iJsonObject: TJsonObject; iInfo: tJ
       RelationshipType := '';
       RelationshipTypeProperty := '';
     end;
-    if IsCharacteristic and not IsObjectDetail then
-    begin
-      iInfo.CharacteristicParentPropertyName := '';
-      iInfo.CharacteristicObject := iInfo.ParentObject.AddCharacteristic (iInfo.PropertyName, CharacteristicDefinition);
-    end;
+    if not IsObjectDetail then
+      if IsCharacteristic then
+      begin
+        iInfo.CharacteristicParentPropertyName := '';
+        iInfo.CharacteristicObject := iInfo.ParentObject.AddCharacteristic (iInfo.PropertyName,
+          CharacteristicDefinition);
+        iInfo.CharacteristicValue := iInfo.CharacteristicObject;
+        iInfo.CharacteristicRecord := iInfo.CharacteristicValue.AddDetailRecord (iInfo.ArrayIndex);
+      end
+      else if iInfo.InCharacteristicMode then
+      begin
+        // iInfo.CharacteristicValue := iInfo.CharacteristicRecord.AddValue (iInfo.PropertyName, '');
+        // iInfo.CharacteristicRecord := iInfo.CharacteristicValue.AddDetailRecord (iInfo.ArrayIndex);
+        iInfo.CharacteristicParentPropertyName :=
+          string.join ('.', [iInfo.CharacteristicParentPropertyName, iInfo.PropertyName]).TrimLeft (['.']);
+      end;
     if Assigned (PumlObject) then
     begin
       if not ObjectIdent.IsEmpty then
@@ -461,15 +477,13 @@ procedure TJson2PumlConverter.ConvertObject (iJsonObject: TJsonObject; iInfo: tJ
     iInfo.ParentRelationshipType := RelationshipType;
     iInfo.ParentRelationShipTypeProperty := RelationshipTypeProperty;
     iInfo.ParentIsRelationship := IsRelationShip;
-    if iInfo.InCharacteristicMode and not IsCharacteristic then
-      iInfo.CharacteristicParentPropertyName :=
-        string.join ('.', [iInfo.CharacteristicParentPropertyName, iInfo.PropertyName]).TrimLeft (['.']);
     iInfo.ParentPropertyName := iInfo.PropertyName;
     if Definition.ContinueAfterUnhandledObjects or (iInfo.CurrentCharacteristicType = jctrecord) then
       iInfo.StopRecursion := false
     else
       iInfo.StopRecursion := (not (Assigned(PumlObject) or IsObjectDetail or IsRelationShip) and
         Assigned(iInfo.HierarchieParentObject)) or (iInfo.CurrentCharacteristicType = jctList);
+    iInfo.ArrayIndex := - 1;
     for i := 0 to iJsonObject.Count - 1 do
     begin
       cName := iJsonObject.Pairs[i].JsonString.Value;
@@ -483,8 +497,6 @@ procedure TJson2PumlConverter.ConvertObject (iJsonObject: TJsonObject; iInfo: tJ
         AddFileLog ('Stop property handling, property [%s.%s] is hidden %s',
           [iInfo.ParentPropertyName, cName, FoundCondition]);
     end;
-    if iInfo.CurrentCharacteristicType = jctList then
-      iInfo.CharacteristicObject.AddRecord;
   finally
     DecRecursionRecord (iInfo, SaveRecursionRecord, trpObject);
   end;
@@ -501,17 +513,62 @@ procedure TJson2PumlConverter.ConvertValue (iJsonValue: TJSONValue; iInfo: tJson
   IsRelationShip: Boolean;
   LogMessage: string;
   FoundCondition: string;
+  ValuePropertyName: string;
+
+  function IsCharacteristicPropertyAllowed (iPropertyName, iParentPropertyName: string;
+    var oFoundCondition: string): Boolean;
+  begin
+    Result := iInfo.CurrentCharacteristicDefinition.IsPropertyAllowed (iPropertyName, iParentPropertyName,
+      oFoundCondition);
+    if Result then
+      AddFileLog ('characteristic property [%s] found %s', [iPropertyName, oFoundCondition])
+    else
+      AddFileLog ('property [%s] not allowed and skipped %s', [iPropertyName, oFoundCondition]);
+  end;
+
 begin
   if not Assigned (iJsonValue) then
     Exit;
+  if iInfo.InCharacteristicMode then
+    if iRecursionParent = trpArray then
+      ValuePropertyName := Format ('[%d]', [iInfo.ArrayIndex])
+    else
+      ValuePropertyName := iInfo.PropertyName
+  else
+    ValuePropertyName := '';
   SaveRecursionRecord := IncRecursionRecord (iInfo, trpValue);
   try
     if iJsonValue is TJSONArray then
-      ConvertArray (iJsonValue as TJSONArray, iInfo)
+    begin
+      if iInfo.InCharacteristicMode then
+      begin
+        if IsCharacteristicPropertyAllowed (ValuePropertyName, iInfo.CharacteristicParentPropertyName, FoundCondition)
+        then
+        begin
+          iInfo.CharacteristicValue := iInfo.CharacteristicRecord.AddValue (ValuePropertyName, '');
+          ConvertArray (iJsonValue as TJSONArray, iInfo);
+        end;
+      end
+      else
+        ConvertArray (iJsonValue as TJSONArray, iInfo);
+    end
     else if iJsonValue is TJsonObject then
     begin
       if not iInfo.StopRecursion then
-        ConvertObject (iJsonValue as TJsonObject, iInfo)
+      begin
+        if iInfo.InCharacteristicMode then
+        begin
+          if IsCharacteristicPropertyAllowed (ValuePropertyName, iInfo.CharacteristicParentPropertyName, FoundCondition)
+          then
+          begin
+            iInfo.CharacteristicValue := iInfo.CharacteristicRecord.AddValue (ValuePropertyName, '');
+            iInfo.CharacteristicRecord := iInfo.CharacteristicValue.AddDetailRecord ( - 1);
+            ConvertObject (iJsonValue as TJsonObject, iInfo)
+          end;
+        end
+        else
+          ConvertObject (iJsonValue as TJsonObject, iInfo)
+      end;
     end
     else if IsJsonSimple (iJsonValue) then
     begin
@@ -546,16 +603,11 @@ procedure TJson2PumlConverter.ConvertValue (iJsonValue: TJSONValue; iInfo: tJson
         begin
           if iInfo.InCharacteristicMode then
           begin
-            if iInfo.CurrentCharacteristicDefinition.IsPropertyAllowed (iInfo.PropertyName,
-              iInfo.CharacteristicParentPropertyName, FoundCondition) then
+            if IsCharacteristicPropertyAllowed (ValuePropertyName, iInfo.CharacteristicParentPropertyName,
+              FoundCondition) then
             begin
-              iInfo.CharacteristicObject.AddRecordProperty (iInfo.PropertyName, Value,
-                iInfo.CharacteristicParentPropertyName);
-              AddFileLog ('characteristic property [%s] value [%s] found %s',
-                [iInfo.PropertyName, Value, FoundCondition]);
+              iInfo.CharacteristicValue := iInfo.CharacteristicRecord.AddValue (ValuePropertyName, Value);
             end
-            else
-              AddFileLog ('property [%s] not allowed and skipped %s', [iInfo.PropertyName, FoundCondition]);
           end
           else
           begin
@@ -831,7 +883,7 @@ function TJson2PumlConverter.Convert: Boolean;
       [InputHandlerRecord.InputFile.OutputFileName])
   else
   begin
-    InfoRec.Init(LeadingObject);
+    InfoRec.Init (LeadingObject);
     ConvertValue (jValue, InfoRec, trpStart);
     GeneratePuml;
     Result := true;
@@ -986,7 +1038,7 @@ function tJson2PumlRecursionParentHelper.OperationName: string;
   Result := cJson2PumlRecursionParentFunction[self];
 end;
 
-procedure tJson2PumlRecursionRecord.Init(iLeadingObject: string);
+procedure tJson2PumlRecursionRecord.Init (iLeadingObject: string);
 begin
   ParentObject := nil;
   HierarchieParentObject := nil;
@@ -1000,6 +1052,7 @@ procedure tJson2PumlRecursionRecord.Init(iLeadingObject: string);
   StopRecursion := false;
   Level := 0;
   ObjectLevel := 0;
+  ArrayIndex := - 1;
   CharacteristicParentPropertyName := '';
   CharacteristicObject := nil;
 end;

source/json2pumlbasedefinition.pas

@@ -170,7 +170,7 @@   tJson2PumlSingleFormatDefinition = class(tJson2PumlBaseObject)
     procedure SetShowCharacteristicsStr (const Value: string);
     procedure SetShowFromRelationsStr (const Value: string);
     procedure SetShowIfEmptyStr (const Value: string);
-    procedure SetShowNullValuesStr(const Value: string);
+    procedure SetShowNullValuesStr (const Value: string);
     procedure SetShowToRelationsStr (const Value: string);
     procedure SetSkinParams (const Value: tStringList);
   protected
@@ -291,6 +291,7 @@   tJson2PumlCharacteristicDefinition = class(tJson2PumlBaseObject)
       iWriteEmpty: boolean = false); override;
   published
     function IsPropertyAllowed (iPropertyName, iParentPropertyName: string; var oFoundCondition: string): boolean;
+    procedure SortUsedColumnsByPropertyList (iUsedColumns: tStringList);
     property CharacteristicType: tJson2PumlCharacteristicType read FCharacteristicType write FCharacteristicType
       default jctList;
     property IncludeIndex: boolean read GetIncludeIndex;
@@ -1028,7 +1029,8 @@ procedure tJson2PumlConverterDefinition.WriteToJson (oJsonOutPut: TStrings; iPro
 
   WriteToJsonValue (oJsonOutPut, 'continueAfterUnhandledObjects', ContinueAfterUnhandledObjectsStr, Level + 1,
     WriteEmpty, false);
-  WriteToJsonValue (oJsonOutPut, 'groupDetailObjectsTogether', GroupDetailObjectsTogetherStr, Level + 1, WriteEmpty, false);
+  WriteToJsonValue (oJsonOutPut, 'groupDetailObjectsTogether', GroupDetailObjectsTogetherStr, Level + 1,
+    WriteEmpty, false);
   WriteToJsonValue (oJsonOutPut, 'hideDuplicateRelations', HideDuplicateRelationsStr, Level + 1, WriteEmpty, false);
   WriteToJsonValue (oJsonOutPut, 'identifyObjectsByTypeAndIdent', IdentifyObjectsByTypeAndIdentStr, Level + 1,
     WriteEmpty, false);
@@ -1452,8 +1454,9 @@ function tJson2PumlSingleFormatDefinition.GetIsFilled: boolean;
   Result := not CaptionShowIdentStr.IsEmpty or not CaptionShowTitleStr.IsEmpty or not CaptionShowTypeStr.IsEmpty or
     not CaptionSplitCharacter.IsEmpty or not CaptionSplitLengthStr.IsEmpty or not IconColor.IsEmpty or
     not (ObjectFilter.Count > 0) or not ShowAttributesStr.IsEmpty or not ShowCharacteristicsStr.IsEmpty or
-    not ShowIfEmptyStr.IsEmpty or not ShowFromRelationsStr.IsEmpty or not ShowNullValuesStr.IsEmpty or not ShowToRelationsStr.IsEmpty or
-    not SortAttributesStr.IsEmpty or (SkinParams.Count > 0) or not ValueSplitLengthStr.IsEmpty;
+    not ShowIfEmptyStr.IsEmpty or not ShowFromRelationsStr.IsEmpty or not ShowNullValuesStr.IsEmpty or
+    not ShowToRelationsStr.IsEmpty or not SortAttributesStr.IsEmpty or (SkinParams.Count > 0) or
+    not ValueSplitLengthStr.IsEmpty;
 end;
 
 function tJson2PumlSingleFormatDefinition.GetShowNullValues: boolean;
@@ -1567,7 +1570,7 @@ procedure tJson2PumlSingleFormatDefinition.SetShowIfEmptyStr (const Value: strin
   FShowIfEmptyStr := ValidateBooleanInput (Value);
 end;
 
-procedure tJson2PumlSingleFormatDefinition.SetShowNullValuesStr(const Value: string);
+procedure tJson2PumlSingleFormatDefinition.SetShowNullValuesStr (const Value: string);
 begin
   FShowNullValuesStr := ValidateBooleanInput (Value);
 end;
@@ -2090,6 +2093,24 @@ procedure tJson2PumlCharacteristicDefinition.SetIncludeIndexStr (const Value: st
   FIncludeIndexStr := ValidateBooleanInput (Value);
 end;
 
+procedure tJson2PumlCharacteristicDefinition.SortUsedColumnsByPropertyList (iUsedColumns: tStringList);
+var
+  i: Integer;
+  col: string;
+  j : Integer;
+begin
+  i := 0;
+  for col in PropertyList do
+  begin
+    j := iUsedColumns.IndexOf(col);
+    if j >= 0 then
+    begin
+      iUsedColumns.Move(j, i);
+      inc (i);
+    end;
+  end;
+end;
+
 procedure tJson2PumlCharacteristicDefinition.WriteToJson (oJsonOutPut: TStrings; iPropertyName: string; iLevel: Integer;
   iWriteEmpty: boolean = false);
 var
@@ -2105,7 +2126,7 @@ procedure tJson2PumlCharacteristicDefinition.WriteToJson (oJsonOutPut: TStrings;
   else
     Value := JsonAttributeValue ('parentProperty', ParentProperty) + JsonAttributeValue ('type',
       CharacteristicType.ToString) + JsonAttributeValueList ('propertyList', PropertyList) +
-      JsonAttributeValue ('includeIndex', IncludeIndexStr);
+      JsonAttributeValue ('includeIndex', IncludeIndexStr, false);
   if IsRecord then
     Value := Format ('{%s}', [Value.trimRight([',', ' '])])
   else