Updated odin serializer

IntoTheDev · Jul 18, 2022 · 7bc0b38 · 7bc0b38
1 parent ac3ed27
commit 7bc0b38
Show file tree

Hide file tree

Showing 219 changed files with 597 additions and 266 deletions.
diff --git a/OdinSerializer/Config/AssemblyBuildInfo.cs.meta b/OdinSerializer/Config/AssemblyBuildInfo.cs.meta
diff --git a/OdinSerializer/Config/GlobalSerializationConfig.cs.meta b/OdinSerializer/Config/GlobalSerializationConfig.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters.meta b/OdinSerializer/Core/DataReaderWriters.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/BaseDataReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/BaseDataReader.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/BaseDataReaderWriter.cs b/OdinSerializer/Core/DataReaderWriters/BaseDataReaderWriter.cs
@@ -37,6 +37,7 @@ public abstract class BaseDataReaderWriter
         /// The reader's or writer's serialization binder.
         /// </value>
         [Obsolete("Use the Binder member on the writer's SerializationContext/DeserializationContext instead.", error: false)]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         public TwoWaySerializationBinder Binder
         {
             get

diff --git a/OdinSerializer/Core/DataReaderWriters/BaseDataReaderWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/BaseDataReaderWriter.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/BaseDataWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/BaseDataWriter.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Binary.meta b/OdinSerializer/Core/DataReaderWriters/Binary.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataReader.cs b/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataReader.cs
@@ -437,9 +437,9 @@ public override bool EnterNode(out Type type)
             }
             else if (this.peekedBinaryEntryType == BinaryEntryType.NamedStartOfStructNode || this.peekedBinaryEntryType == BinaryEntryType.UnnamedStartOfStructNode)
             {
-                this.MarkEntryContentConsumed();
                 type = this.ReadTypeEntry();
                 this.PushNode(this.peekedEntryName, -1, type);
+                this.MarkEntryContentConsumed();
                 return true;
             }
             else

diff --git a/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataReader.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/Binary/BinaryDataWriter.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Binary/BinaryEntryType.cs.meta b/OdinSerializer/Core/DataReaderWriters/Binary/BinaryEntryType.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/IDataReader.cs b/OdinSerializer/Core/DataReaderWriters/IDataReader.cs
@@ -46,8 +46,9 @@ public interface IDataReader : IDisposable
         /// The base stream of the reader.
         /// </value>
         [Obsolete("Data readers and writers don't necessarily have streams any longer, so this API has been made obsolete. Using this property may result in NotSupportedExceptions being thrown.", false)]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         Stream Stream { get; set; }
-        
+
         /// <summary>
         /// Gets a value indicating whether the reader is in an array node.
         /// </summary>

diff --git a/OdinSerializer/Core/DataReaderWriters/IDataReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/IDataReader.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/IDataWriter.cs b/OdinSerializer/Core/DataReaderWriters/IDataWriter.cs
@@ -46,6 +46,7 @@ public interface IDataWriter : IDisposable
         /// The base stream of the writer.
         /// </value>
         [Obsolete("Data readers and writers don't necessarily have streams any longer, so this API has been made obsolete. Using this property may result in NotSupportedExceptions being thrown.", false)]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         Stream Stream { get; set; }
 
         /// <summary>

diff --git a/OdinSerializer/Core/DataReaderWriters/IDataWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/IDataWriter.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Json.meta b/OdinSerializer/Core/DataReaderWriters/Json.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonConfig.cs b/OdinSerializer/Core/DataReaderWriters/Json/JsonConfig.cs
@@ -69,8 +69,13 @@ public static class JsonConfig
         public const string EXTERNAL_GUID_REF_SIG = "$guidref";
 
         /// <summary>
-        /// The beginning of the content of an external reference by string entry.
+        /// The beginning of the content of an external reference by string entry. This is an old entry using an invalid data format where the ref string is dumped inline without escaping.
         /// </summary>
-        public const string EXTERNAL_STRING_REF_SIG = "$strref";
+        public const string EXTERNAL_STRING_REF_SIG_OLD = "$strref";
+
+        /// <summary>
+        /// The beginning of the content of an external reference by string entry. This is a new entry using the valid format where the ref string is written as an escaped string.
+        /// </summary>
+        public const string EXTERNAL_STRING_REF_SIG_FIXED = "$fstrref";
     }
 }
diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonConfig.cs.meta b/OdinSerializer/Core/DataReaderWriters/Json/JsonConfig.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonDataReader.cs b/OdinSerializer/Core/DataReaderWriters/Json/JsonDataReader.cs
@@ -589,9 +589,13 @@ public override bool ReadExternalReference(out string id)
             {
                 id = this.peekedEntryContent;
 
-                if (id.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG))
+                if (id.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG_OLD))
                 {
-                    id = id.Substring(JsonConfig.EXTERNAL_STRING_REF_SIG.Length + 1);
+                    id = id.Substring(JsonConfig.EXTERNAL_STRING_REF_SIG_OLD.Length + 1);
+                }
+                else if (id.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED))
+                {
+                    id = id.Substring(JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED.Length + 2, id.Length - (JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED.Length + 3));
                 }
 
                 this.MarkEntryConsumed();

diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonDataReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/Json/JsonDataReader.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonDataWriter.cs b/OdinSerializer/Core/DataReaderWriters/Json/JsonDataWriter.cs
@@ -448,7 +448,12 @@ public override void WriteExternalReference(string name, string id)
                 throw new ArgumentNullException("id");
             }
 
-            this.WriteEntry(name, JsonConfig.EXTERNAL_STRING_REF_SIG + ":" + id);
+            this.WriteEntry(name, JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED);
+            this.EnsureBufferSpace(id.Length + 3);
+            this.buffer[this.bufferIndex++] = (byte)':';
+            this.buffer[this.bufferIndex++] = (byte)'"';
+            this.Buffer_WriteString_WithEscape(id);
+            this.buffer[this.bufferIndex++] = (byte)'"';
         }
 
         /// <summary>

diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonDataWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/Json/JsonDataWriter.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonTextReader.cs b/OdinSerializer/Core/DataReaderWriters/Json/JsonTextReader.cs
@@ -451,16 +451,26 @@ private void ParseEntryFromBuffer(out string name, out string valueContent, out
                         return;
                     }
 
-                    if (string.Equals(name, JsonConfig.EXTERNAL_STRING_REF_SIG, StringComparison.InvariantCulture))
+                    if (string.Equals(name, JsonConfig.EXTERNAL_STRING_REF_SIG_OLD, StringComparison.InvariantCulture))
                     {
-                        // It's an external guid reference without a name
+                        // It's an external guid reference without a name, of the old broken kind
                         // The content is the whole buffer
                         name = null;
                         valueContent = new string(this.buffer, 0, this.bufferIndex + 1);
                         entry = EntryType.ExternalReferenceByString;
                         return;
                     }
 
+                    if (string.Equals(name, JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED, StringComparison.InvariantCulture))
+                    {
+                        // It's an external guid reference without a name, of the new non-broken kind
+                        // The content is the buffer, unquoted and unescaped
+                        name = null;
+                        valueContent = new string(this.buffer, 0, this.bufferIndex + 1);
+                        entry = EntryType.ExternalReferenceByString;
+                        return;
+                    }
+
                     if (this.bufferIndex >= valueSeparatorIndex)
                     {
                         valueContent = new string(this.buffer, valueSeparatorIndex + 1, this.bufferIndex - valueSeparatorIndex);
@@ -531,7 +541,12 @@ private void ParseEntryFromBuffer(out string name, out string valueContent, out
                             entry = EntryType.ExternalReferenceByGuid;
                             return;
                         }
-                        else if (valueContent.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG, StringComparison.InvariantCulture))
+                        else if (valueContent.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG_OLD, StringComparison.InvariantCulture))
+                        {
+                            entry = EntryType.ExternalReferenceByString;
+                            return;
+                        }
+                        else if (valueContent.StartsWith(JsonConfig.EXTERNAL_STRING_REF_SIG_FIXED, StringComparison.InvariantCulture))
                         {
                             entry = EntryType.ExternalReferenceByString;
                             return;

diff --git a/OdinSerializer/Core/DataReaderWriters/Json/JsonTextReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/Json/JsonTextReader.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/SerializationNodes.meta b/OdinSerializer/Core/DataReaderWriters/SerializationNodes.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNode.cs.meta b/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNode.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNodeDataReader.cs.meta b/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNodeDataReader.cs.meta
diff --git a/...Core/DataReaderWriters/SerializationNodes/SerializationNodeDataReaderWriterConfig.cs.meta b/...Core/DataReaderWriters/SerializationNodes/SerializationNodeDataReaderWriterConfig.cs.meta
diff --git a/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNodeDataWriter.cs.meta b/OdinSerializer/Core/DataReaderWriters/SerializationNodes/SerializationNodeDataWriter.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators.meta b/OdinSerializer/Core/FormatterLocators.meta
diff --git a/OdinSerializer/Core/FormatterLocators/ArrayFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/ArrayFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/DelegateFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/DelegateFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/FormatterLocator.cs b/OdinSerializer/Core/FormatterLocators/FormatterLocator.cs
@@ -84,7 +84,7 @@ static FormatterLocator()
                         // Filter out various core .NET libraries and Unity engine assemblies
                         continue;
                     }
-                    else if (ass.GetName().Name == FormatterEmitter.PRE_EMITTED_ASSEMBLY_NAME || ass.IsDefined(typeof(EmittedAssemblyAttribute), true))
+                    else if (ass.GetName().Name == FormatterEmitter.PRE_EMITTED_ASSEMBLY_NAME || ass.SafeIsDefined(typeof(EmittedAssemblyAttribute), true))
                     {
                         // Only include pre-emitted formatters if we are on an AOT platform.
                         // Pre-emitted formatters will not work in newer .NET runtimes due to
@@ -205,6 +205,7 @@ static FormatterLocator()
         /// This can be used to hook into and extend the serialization system's formatter resolution logic.
         /// </summary>
         [Obsolete("Use the new IFormatterLocator interface instead, and register your custom locator with the RegisterFormatterLocator assembly attribute.", true)]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         public static event Func<Type, IFormatter> FormatterResolve
         {
             add { throw new NotSupportedException(); }

diff --git a/OdinSerializer/Core/FormatterLocators/FormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/FormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/GenericCollectionFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/GenericCollectionFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/IFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/IFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/ISerializableFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/ISerializableFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/SelfFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/SelfFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/FormatterLocators/TypeFormatterLocator.cs.meta b/OdinSerializer/Core/FormatterLocators/TypeFormatterLocator.cs.meta
diff --git a/OdinSerializer/Core/Formatters.meta b/OdinSerializer/Core/Formatters.meta
diff --git a/OdinSerializer/Core/Formatters/ArrayFormatter.cs.meta b/OdinSerializer/Core/Formatters/ArrayFormatter.cs.meta
diff --git a/OdinSerializer/Core/Formatters/ArrayListFormatter.cs.meta b/OdinSerializer/Core/Formatters/ArrayListFormatter.cs.meta
diff --git a/OdinSerializer/Core/Formatters/BaseFormatter.cs.meta b/OdinSerializer/Core/Formatters/BaseFormatter.cs.meta
diff --git a/OdinSerializer/Core/Formatters/DateTimeFormatter.cs.meta b/OdinSerializer/Core/Formatters/DateTimeFormatter.cs.meta