Directly pass through custom page schema files, and handle any valida…

…tion in canvas (#439)

## Problem

Related to microsoft/Power-Fx#663, we're consolidating the type definition logic for this, and using yaml as the native format for it in the .msapp. As such, the .PALT tool does not need to do anything special to handle this file. 

## Solution
Removes special handling for schema.yaml

## Changes
Removes special handling for schema.yaml, associated POCOs, and passes the value through as text. 

## Validation
Testing integration with related changes is ongoing and this will not be checked in until all are ready.

src/PAModel/CanvasDocument.cs

@@ -56,10 +56,11 @@ public class CanvasDocument
         internal TemplatesJson _templates;
         internal ThemesJson _themes;
         internal ResourcesJson _resourcesJson;
-        internal ParameterSchema _parameterSchema;
 
-        // Dictionary with input schemas for custom pages used in the app through Navigate function, key is custom page logical name, value is parameter schema for that page
-        internal Dictionary<string, ParameterSchema> _customPageInputsMetadata;
+        // Yaml strings, handled by Canvas without interaction in PALT
+        internal string _parameterSchema;
+        internal string _customPageInputsMetadata;
+
         internal AppCheckerResultJson _appCheckerResultJson;
         internal Dictionary<string, PcfControl> _pcfControls = new Dictionary<string, PcfControl>(StringComparer.OrdinalIgnoreCase);
 
@@ -297,7 +298,7 @@ internal CanvasDocument(CanvasDocument other)
             _header = other._header.JsonClone();
             _properties = other._properties.JsonClone();
             _parameterSchema = other._parameterSchema.JsonClone();
-            _customPageInputsMetadata = other._customPageInputsMetadata.JsonClone();
+            _customPageInputsMetadata = other._customPageInputsMetadata;
             _publishInfo = other._publishInfo.JsonClone();
             _templates = other._templates.JsonClone();
             _themes = other._themes.JsonClone();

src/PAModel/Serializers/FileEntry.cs

@@ -59,7 +59,7 @@ enum FileKind
         AppTestParentControl,
 
         // Schema.yaml describing app's parameters at top level. 
-        Schema,
+        Defines,
 
         // Custom page inputs for outbound custom page navigate calls.
         CustomPageInputs,
@@ -121,7 +121,7 @@ public static FileEntry FromZip(ZipArchiveEntry z, string name = null)
             {"Entities.json", FileKind.OldEntityJSon },
             {"Properties.json", FileKind.Properties },
             {"Header.json", FileKind.Header},
-            {"Schema.yaml", FileKind.Schema },
+            {"Defines.fx.yaml", FileKind.Defines },
             {CustomPagesMetadataFileName, FileKind.CustomPageInputs },
             {ChecksumMaker.ChecksumName, FileKind.Checksum },
             {"AppCheckerResult.sarif", FileKind.AppCheckerResult },

src/PAModel/Serializers/MsAppSerializer.cs

@@ -38,6 +38,14 @@ private static T ToObject<T>(ZipArchiveEntry entry)
             }
         }
 
+
+        private static string AsString(ZipArchiveEntry entry)
+        {
+            using var stream = entry.Open();
+            using var textReader = new StreamReader(stream);
+            return textReader.ReadToEnd();
+        }
+
         public static CanvasDocument Load(Stream streamToMsapp, ErrorContainer errors)
         {
             if (streamToMsapp == null)
@@ -124,11 +132,15 @@ public static CanvasDocument Load(Stream streamToMsapp, ErrorContainer errors)
                             dcsources = ToObject<DataComponentSourcesJson>(entry);
                             break;
 
-                        case FileKind.Schema:
-                            app._parameterSchema = ToObject<ParameterSchema>(entry);
+                        case FileKind.Defines:
+                            // We do not interact with this .yaml file from the .msapp, it can be passed straight through as text
+                            // Validation is done in Canvas
+                            app._parameterSchema = AsString(entry);
                             break;
                         case FileKind.CustomPageInputs:
-                            app._customPageInputsMetadata = ToObject<Dictionary<string, ParameterSchema>>(entry);
+                            // We do not interact with this .yaml file from the .msapp, it can be passed straight through as text
+                            // Validation is done in Canvas
+                            app._customPageInputsMetadata = AsString(entry);
                             break;
 
                         case FileKind.Properties:
@@ -611,12 +623,20 @@ private static IEnumerable<FileEntry> GetMsAppFiles(this CanvasDocument app, Err
 
             if (app._parameterSchema != null)
             {
-                yield return ToFile(FileKind.Schema, app._parameterSchema);
+                yield return new FileEntry
+                {
+                    Name = FileEntry.GetFilenameForKind(FileKind.Defines),
+                    RawBytes = Encoding.UTF8.GetBytes(app._parameterSchema)
+                };
             }
 
             if (app._customPageInputsMetadata != null)
             {
-                yield return ToFile(FileKind.CustomPageInputs, app._customPageInputsMetadata);
+                yield return new FileEntry
+                {
+                    Name = FileEntry.GetFilenameForKind(FileKind.CustomPageInputs),
+                    RawBytes = Encoding.UTF8.GetBytes(app._customPageInputsMetadata)
+                };
             }
 
             var (publishInfo, logoFile) = app.TransformLogoOnSave();

src/PAModel/Serializers/SourceSerializer.cs

@@ -138,8 +138,10 @@ public static CanvasDocument LoadFromSource(string directory2, ErrorContainer er
             {
                 switch (file.Kind)
                 {
-                    case FileKind.Schema:
-                        app._parameterSchema = file.ToObject<ParameterSchema>();
+                    case FileKind.Defines:
+                        // We do not interact with this .yaml file from the .msapp, it can be passed straight through as text
+                        // Validation is done in Canvas
+                        app._parameterSchema = file.GetContents();
                         break;
                 }
             }
@@ -163,7 +165,7 @@ public static CanvasDocument LoadFromSource(string directory2, ErrorContainer er
             LoadPcfControlTemplateFiles(errors, app, Path.Combine(directory2, PackagesDir, PcfControlTemplatesDir));
 
             // Load used custom pages schema metadata
-            LoadCustomPagesSchemaMetadata(errors, app, Path.Combine(directory2, PackagesDir, FileEntry.CustomPagesMetadataFileName));
+            LoadCustomPagesSchemaMetadata(app, Path.Combine(directory2, PackagesDir, FileEntry.CustomPagesMetadataFileName));
 
             foreach (var file in dir.EnumerateFiles(EntropyDir))
             {
@@ -287,8 +289,6 @@ public static CanvasDocument Create(string appName, string packagesPath, IList<s
 
             app._properties = DocumentPropertiesJson.CreateDefault(appName);
             app._header = HeaderJson.CreateDefault();
-            app._parameterSchema = new ParameterSchema();
-            app._customPageInputsMetadata = new Dictionary<string, ParameterSchema>();
 
             LoadTemplateFiles(errors, app, packagesPath, out var loadedTemplates);
             app._entropy = new Entropy();
@@ -346,12 +346,12 @@ private static void LoadPcfControlTemplateFiles(ErrorContainer errors, CanvasDoc
             }
         }
 
-        private static void LoadCustomPagesSchemaMetadata(ErrorContainer errors, CanvasDocument app, string custompagesMetadataPath)
+        private static void LoadCustomPagesSchemaMetadata(CanvasDocument app, string custompagesMetadataPath)
         {
             if (File.Exists(custompagesMetadataPath))
             {
                 DirectoryReader.Entry file = new DirectoryReader.Entry(custompagesMetadataPath);
-                app._customPageInputsMetadata = file.ToObject<Dictionary<string, ParameterSchema>>();
+                app._customPageInputsMetadata = file.GetContents();
             }
         }
 
@@ -548,7 +548,7 @@ public static void SaveAsSource(CanvasDocument app, string directory2, ErrorCont
 
             if (app._customPageInputsMetadata != null)
             {
-                dir.WriteAllJson(PackagesDir, FileKind.CustomPageInputs, app._customPageInputsMetadata);
+                dir.WriteAllText(PackagesDir, FileEntry.GetFilenameForKind(FileKind.CustomPageInputs), app._customPageInputsMetadata);
             }
 
             // Also add Screen and App templates (not xml, constructed in code on the server)
@@ -644,7 +644,7 @@ public static void SaveAsSource(CanvasDocument app, string directory2, ErrorCont
 
             if (app._parameterSchema != null)
             {
-                dir.WriteAllJson("", FileKind.Schema, app._parameterSchema);
+                dir.WriteAllText("", FileEntry.GetFilenameForKind(FileKind.Defines), app._parameterSchema);
             }
 
             var manifest = new CanvasManifestJson

src/PAModelTests/PublicSurfaceTests.cs

@@ -28,9 +28,6 @@ public void Test()
                 $"Microsoft.PowerPlatform.YamlConverter",
                 $"Microsoft.PowerPlatform.YamlPocoSerializer",
                 $"Microsoft.PowerPlatform.Formulas.Tools.Yaml.YamlWriter",
-
-                // Public schemas
-                $"Microsoft.PowerPlatform.Formulas.Tools.Schemas.ParameterSchema"
             };
 
             StringBuilder sb = new StringBuilder();