Source map

openapi-diff/src/core/OpenApiDiff.Core/JsonDocument.cs

@@ -0,0 +1,58 @@
+using Newtonsoft.Json.Linq;
+
+namespace OpenApiDiff.Core
+{
+    /// <summary>
+    /// An interface for untyped parsed JSON.
+    /// </summary>
+    public interface IJsonDocument
+    {
+        JToken Token { get; }
+
+        string FileName { get; }
+    }
+
+    /// <summary>
+    /// A representation of parsed JSON document.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public sealed class JsonDocument<T>: IJsonDocument
+    {
+        /// <summary>
+        /// Untyped raw parsed JSON. The Token also includes information about 
+        /// file location of each item.
+        /// </summary>
+        public JToken Token { get; }
+
+        /// <summary>
+        /// Representation of JSON as `T` type.
+        /// </summary>
+        public T Typed { get; }
+
+        /// <summary>
+        /// A JSON source file name.
+        /// </summary>
+        public string FileName { get; }
+
+        public JsonDocument(JToken token, T typed, string fileName)
+        {
+            Token = token;
+            Typed = typed;
+            FileName = fileName;
+        }
+    }
+
+    public static class JsonDocument
+    {
+        /// <summary>
+        /// Creates a `JsonDocument` object. It's a syntax sugar for `new JsonDocument`.
+        /// </summary>
+        /// <typeparam name="T">Deserialization type.</typeparam>
+        /// <param name="token">Raw JSON object. The object includes information about JSON token locations</param>
+        /// <param name="typed">Representation of the JSON as `T` type.</param>
+        /// <param name="fileName">A JSON source file name.</param>
+        /// <returns></returns>
+        public static JsonDocument<T> ToJsonDocument<T>(this JToken token, T typed, string fileName)
+            => new JsonDocument<T>(token, typed, fileName);
+    }
+}

openapi-diff/src/core/OpenApiDiff.Core/Logging/ObjectPath.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using YamlDotNet.RepresentationModel;
 
 namespace OpenApiDiff.Core.Logging
 {
@@ -13,37 +13,65 @@ namespace OpenApiDiff.Core.Logging
     /// </summary>
     public class ObjectPath
     {
-        public static ObjectPath Empty => new ObjectPath(Enumerable.Empty<ObjectPathPart>());
+        public static ObjectPath Empty => new ObjectPath(Enumerable.Empty<Func<JToken, string>>());
 
-        private ObjectPath(IEnumerable<ObjectPathPart> path)
+        private ObjectPath(IEnumerable<Func<JToken, string>> path)
         {
             Path = path;
         }
 
-        private ObjectPath Append(ObjectPathPart part) => new ObjectPath(Path.Concat(new[] { part }));
+        private ObjectPath Append(Func<JToken, string> f) => new ObjectPath(Path.Concat(new[] { f }));
 
-        public ObjectPath AppendIndex(int index) => Append(new ObjectPathPartIndex(index));
+        public ObjectPath AppendProperty(string property) => Append((_) => property);
 
-        public ObjectPath AppendProperty(string property) => Append(new ObjectPathPartProperty(property));
-
-        public IEnumerable<ObjectPathPart> Path { get; }
-
-        // https://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-04
-        public string JsonPointer => string.Concat(Path.Select(p => p.JsonPointer));
+        public ObjectPath AppendItemByName(string value) => Append(t =>
+        {
+            var list = t
+                ?.Select((v, i) => (v, i))
+                ?.Where(vi => vi.v?["name"]?.Value<string>() == value)
+                ?.ToList();
+            return list == null || list.Count == 0 ? null : list[0].i.ToString();
+        });
 
-        // http://goessner.net/articles/JsonPath/, https://github.com/jayway/JsonPath
-        public string JsonPath => "$" + string.Concat(Path.Select(p => p.JsonPath));
+        public IEnumerable<Func<JToken, string>> Path { get; }
 
-        public string ReadablePath => string.Concat(Path.Select(p => p.ReadablePath));
+        private static ObjectPath ParseRef(string s)
+            => new ObjectPath(s
+                .Split('/')
+                .Where(v => v != "#")
+                .Select<string, Func<JToken, string>>(v => _ => v.Replace("~1", "/").Replace("~0", "~"))
+            );
 
-        public YamlNode SelectNode(YamlNode node)
+        private static JToken FromObject(JObject o, string name)
         {
-            YamlNode result = node;
-            foreach (var part in Path)
-            {
-                result = part.SelectNode(ref node) ?? result;
-            }
-            return result;
+            var @ref = o["$ref"];
+            var unrefed = @ref != null ? ParseRef(@ref.Value<string>()).CompletePath(o.Root).Last().token : o;
+            return unrefed[name];
         }
+
+        private static IEnumerable<(JToken token, string name)> CompletePath(IEnumerable<Func<JToken, string>> p, JToken t)
+            => p.Select(v => {
+                var name = v(t);
+                t =
+                    t is JArray a ? int.TryParse(name, out var i) ? a[i] : null :
+                    t is JObject o ? FromObject(o, name) :
+                    null;
+                return (t, name);
+            });
+
+        public IEnumerable<(JToken token, string name)> CompletePath(JToken t)
+            => CompletePath(Path, t);
+
+        public static string FileNameNorm(string fileName) 
+            => fileName.Replace("\\", "/");
+
+        // https://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-04
+        public string JsonPointer(IJsonDocument t) => CompletePath(t.Token)
+            .Select(v => v.name?.Replace("~", "~0")?.Replace("/", "~1"))
+            .Aggregate(FileNameNorm(t.FileName) + "#", (a, b) => a == null || b == null ? null : a + "/" + b);
+
+
+        public ObjectPath AppendExpression(Func<JToken, string> func)
+            => Append(func);
     }
 }

openapi-diff/src/core/OpenApiDiff.Core/OpenApiDiff.Core.csproj

@@ -7,6 +7,7 @@
   <PropertyGroup>
     <AssemblyName>OpenApiDiff.Core</AssemblyName>
     <PackageTags>Microsoft AutoRest</PackageTags>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

openapi-diff/src/core/OpenApiDiff/OpenApiDiff.csproj

@@ -16,6 +16,7 @@
     <PackageProjectUrl>https://github.com/Azure/openapi-diff</PackageProjectUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

openapi-diff/src/core/OpenApiDiff/Program.cs

@@ -35,7 +35,13 @@ private static int Main(string[] args)
             string swaggerPrev = File.ReadAllText(settings.OldSpec);
             string swaggerNew = File.ReadAllText(settings.NewSpec);
 
-            var messages = modeler.Compare(swaggerPrev, swaggerNew, settings);
+            var messages = modeler.Compare(
+                settings.OldSpec,
+                swaggerPrev, 
+                settings.NewSpec, 
+                swaggerNew,
+                settings
+            );
             foreach (var msg in messages)
             {
                 Console.WriteLine(settings.JsonValidationMessages ? msg.GetValidationMessagesAsJson() : msg.ToString());

openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj

@@ -5,6 +5,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>