New component Child Structure #10

Add Line Number For Serialization Errors #11
daryllabar · Dec 13, 2019 · bc265f9 · bc265f9
1 parent a8b263a
commit bc265f9
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/CanvasAppPackager/CanvasAppPackager.csproj b/CanvasAppPackager/CanvasAppPackager.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-	<AssemblyVersion>1.0.0.8</AssemblyVersion>
-    <FileVersion>1.0.0.6</FileVersion>
+	<AssemblyVersion>1.0.0.9</AssemblyVersion>
+    <FileVersion>1.0.0.9</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/CanvasAppPackager/Poco/App.cs b/CanvasAppPackager/Poco/App.cs
@@ -19,12 +19,16 @@ public class Template
     {
         public string Id { get; set; }
         public string Version { get; set; }
+        public string LastModifiedTimestamp { get; set; }
         public string Name { get; set; }
         public bool? FirstParty { get; set; }
         public bool IsCustomGroupControlTemplate { get; set; }
         public string CustomGroupControlTemplateName { get; set; }
         public string CustomControlDefinitionJson { get; set; }
         public string DynamicControlDefinitionJson { get; set; }
+        public bool IsComponentDefinition { get; set; }
+        public List<CustomProperty> CustomProperties { get; set; }
+        public Component ComponentDefinitionInfo { get; set; }
         public OverridableProperties OverridableProperties { get; set; }
     }
 
@@ -92,6 +96,7 @@ public class Child : IControl
     {
         public string Type { get; set; }
         public string Name { get; set; }
+        public string LastModifiedTimestamp { get; set; }
         public Template Template { get; set; }
         public double Index { get; set; }
         public int? PublishOrderIndex { get; set; }
@@ -111,6 +116,7 @@ public class Child : IControl
         public bool IsLocked { get; set; }
         public string ControlUniqueId { get; set; }
         public ControlThisItemType ControlThisItemType { get; set; }
+        public Metadata Metadata { get; set; }
         public List<Child> Children { get; set; }
         public List<ChildOrder> ChildrenOrder { get; set; }
 
@@ -128,6 +134,37 @@ public class ChildOrder
         public string Name { get; set; }
     }
 
+    public class Component
+    {
+        public string Name { get; set; }
+        public string LastModifiedTimestamp { get; set; }
+        public List<Rule> Rules { get; set; }
+        public List<ControlPropertyState> ControlPropertyState { get; set; }
+        public List<Child> Children { get; set; }
+
+        public Component()
+        {
+            Children = new List<Child>();
+        }
+    }
+
+    public class CustomProperty
+    {
+        public string Name { get; set; }
+        public int Category { get; set; }
+        public string Type { get; set; }
+        public string PropertyDataTypeKey { get; set; }
+        public bool Hidden { get; set; }
+        public bool? IsResettable { get; set; }
+        public string DisplayName { get; set; }
+        public string Tooltip { get; set; }
+    }
+
+    public class Metadata
+    {
+        public string Description { get; set; }
+    }
+
     public class TopParent : IControl
     {
         public string Type { get; set; }

diff --git a/CanvasAppPackager/UnpackLogic.cs b/CanvasAppPackager/UnpackLogic.cs
@@ -166,10 +166,23 @@ private static void VerifySerialization(CanvasAppScreen screen, string json, str
                 var shortest = json.Length > newJson.Length
                     ? newJson
                     : json;
+                var errorScope = Environment.NewLine + Environment.NewLine;
+                var lineNumber = 0;
+                var linePosition = 0;
 
                 var firstDifferentChar = shortest.Length;
                 for (var i = 0; i < shortest.Length; i++)
                 {
+                    if(json[i] == '\n')
+                    {
+                        lineNumber++;
+                        linePosition = 0;
+                    }
+                    else
+                    {
+                        linePosition++;
+                    }
+
                     if (json[i] == newJson[i])
                     {
                         continue;
@@ -180,7 +193,9 @@ private static void VerifySerialization(CanvasAppScreen screen, string json, str
                 }
 
                 throw new
-                    Exception($"Unable to re-serialize json to match source!  Character at position {firstDifferentChar} is not correct.  To prevent potential app defects, extracting file {file} has stopped.{Environment.NewLine}See '{jsonFile}' for extracted version vs output version '{newJsonFile}'.");
+                    Exception($"Unable to re-serialize json to match source!  Character at position: {firstDifferentChar} on line: {lineNumber} at {linePosition} is not correct.  To prevent potential app defects, extracting file {file} has stopped.{Environment.NewLine}See '{jsonFile}' for extracted version vs output version '{newJsonFile}'.{(string.IsNullOrWhiteSpace(errorScope) ? string.Empty : errorScope)}");
+
+
             }
         }