More cleanup

Author: Vadim-Vorotilin

src/cs/vim/Vim.Format.Core/AssetInfo.cs

@@ -18,7 +18,7 @@ public enum AssetType
     /// </summary>
     public class AssetInfo
     {
-        public const char Separator = '/';
+        private const char Separator = '/';
 
         public readonly string Name;
 
@@ -27,7 +27,7 @@ public class AssetInfo
         public AssetInfo(string name, AssetType assetType)
             => (Name, AssetType) = (name, assetType);
 
-        public static string[] SplitAssetBufferName(string assetBufferName)
+        private static string[] SplitAssetBufferName(string assetBufferName)
             => assetBufferName?.Split(Separator);
 
         public static AssetInfo Parse(string assetBufferName)
@@ -63,10 +63,10 @@ public static bool TryParse(string assetBufferName, out AssetInfo assetInfo)
             }
         }
 
-        public static string AssetTypeToString(AssetType assetType)
+        private static string AssetTypeToString(AssetType assetType)
             => assetType.ToString("G").ToLowerInvariant();
 
-        public string AssetTypeString
+        private string AssetTypeString
             => AssetTypeToString(AssetType);
 
         public override string ToString()
@@ -81,19 +81,13 @@ public string GetDefaultAssetFilePathInDirectory(DirectoryInfo directoryInfo)
 
     public static class AssetInfoExtensions
     {
-        public static bool IsTexture(this INamedBuffer buffer)
-            => AssetInfo.TryParse(buffer.Name, out var assetInfo) && assetInfo.AssetType == AssetType.Texture;
-
-        public static INamedBuffer GetAssetBuffer(this Document doc, string assetBufferName)
+        private static INamedBuffer GetAssetBuffer(this Document doc, string assetBufferName)
             => doc.Assets.GetOrDefault(assetBufferName);
 
-        public static IEnumerable<INamedBuffer> GetTextures(this Document d)
-            => d.Assets.Values.Where(IsTexture);
-
         /// <summary>
         /// Extracts the asset buffer to the file designated by the given FileInfo.
         /// </summary>
-        public static FileInfo ExtractAsset(this INamedBuffer assetBuffer, FileInfo fileInfo)
+        private static FileInfo ExtractAsset(this INamedBuffer assetBuffer, FileInfo fileInfo)
         {
             Util.IO.CreateFileDirectory(fileInfo.FullName);
             using (var stream = fileInfo.Create())
@@ -105,7 +99,7 @@ public static FileInfo ExtractAsset(this INamedBuffer assetBuffer, FileInfo file
         /// Extracts the asset and returns a FileInfo representing the extracted asset on disk.<br/>
         /// Returns null if the asset could not be extracted.
         /// </summary>
-        public static FileInfo ExtractAsset(this INamedBuffer assetBuffer, DirectoryInfo directoryInfo)
+        private static FileInfo ExtractAsset(this INamedBuffer assetBuffer, DirectoryInfo directoryInfo)
             => !AssetInfo.TryParse(assetBuffer.Name, out var assetInfo)
                 ? null
                 : assetBuffer.ExtractAsset(new FileInfo(assetInfo.GetDefaultAssetFilePathInDirectory(directoryInfo)));
@@ -135,7 +129,7 @@ public static FileInfo ExtractAsset(this Document doc, string assetBufferName, F
         /// <summary>
         /// Gets the byte array which defines the given asset. Returns false if the asset was not found or if the byte array is empty or null.
         /// </summary>
-        public static bool TryGetAssetBytes(this Document doc, string assetBufferName, out byte[] bytes)
+        private static bool TryGetAssetBytes(this Document doc, string assetBufferName, out byte[] bytes)
         {
             bytes = null;
 
@@ -151,7 +145,7 @@ public static bool TryGetAssetBytes(this Document doc, string assetBufferName, o
         /// <summary>
         /// Gets the byte array which defines the given asset. Returns false if the asset was not found or if the byte array is empty or null.
         /// </summary>
-        public static bool TryGetAssetBytes(this Document doc, AssetType assetType, string assetName, out byte[] bytes)
+        private static bool TryGetAssetBytes(this Document doc, AssetType assetType, string assetName, out byte[] bytes)
             => doc.TryGetAssetBytes(new AssetInfo(assetName, assetType).ToString(), out bytes);
 
         /// <summary>

src/cs/vim/Vim.Format.Core/ColumnExtensions.Buffer.cs

@@ -30,31 +30,15 @@ public static SerializableEntityTable ValidateColumnRowsAreAligned(this Serializ
             return et;
         }
 
-        public static string ValidateCanConcatBuffers(this INamedBuffer thisBuffer, INamedBuffer otherBuffer)
-        {
-            var thisPrefix = SerializableEntityTable.GetTypeFromName(thisBuffer.Name);
-            if (string.IsNullOrEmpty(thisPrefix))
-                throw new Exception("NamedBuffer prefix not found");
-
-            var otherPrefix = SerializableEntityTable.GetTypeFromName(otherBuffer.Name);
-            if (string.IsNullOrEmpty(otherPrefix))
-                throw new Exception("NamedBuffer prefix not found");
-
-            if (thisPrefix != otherPrefix)
-                throw new Exception("NamedBuffer prefixes are not equal");
-
-            return thisPrefix;
-        }
-
         public static T[] RemapData<T>(this T[] self, List<int> remapping = null)
             => remapping?.Select(x => self[x])?.ToArray() ?? self;
 
         public static IBuffer ToBuffer<T>(this T[] array) where T : unmanaged
             => new Buffer<T>(array);
 
-        public const string UnknownNamedBufferPrefix = "Unknown NamedBuffer prefix";
+        private const string UnknownNamedBufferPrefix = "Unknown NamedBuffer prefix";
 
-        public static object GetDataColumnValue(this IBuffer dataColumn, string typePrefix, int rowIndex)
+        private static object GetDataColumnValue(this IBuffer dataColumn, string typePrefix, int rowIndex)
         {
             switch (typePrefix)
             {
@@ -123,7 +107,7 @@ public static INamedBuffer CopyDataColumn(this INamedBuffer dataColumn, List<int
             return new NamedBuffer(dataColumn.CopyDataColumn(typePrefix, remapping), dataColumn.Name);
         }
 
-        public static IBuffer Concat<T>(this IBuffer thisBuffer, IBuffer otherBuffer) where T : unmanaged
+        private static IBuffer Concat<T>(this IBuffer thisBuffer, IBuffer otherBuffer) where T : unmanaged
             => thisBuffer.AsArray<T>().Concat(otherBuffer.AsArray<T>()).ToArray().ToBuffer();
 
         public static IBuffer ConcatDataColumnBuffers(this IBuffer thisBuffer, IBuffer otherBuffer, string typePrefix)
@@ -145,60 +129,6 @@ public static IBuffer ConcatDataColumnBuffers(this IBuffer thisBuffer, IBuffer o
             }
         }
 
-        public static INamedBuffer ConcatDataColumns(this INamedBuffer thisColumn, INamedBuffer otherColumn)
-        {
-            var typePrefix = thisColumn.ValidateCanConcatBuffers(otherColumn);
-            var combinedBuffer = thisColumn.ConcatDataColumnBuffers(otherColumn, typePrefix);
-            return new NamedBuffer(combinedBuffer, thisColumn.Name);
-        }
-
-        public static List<T> ConcatColumns<T>(
-            this IReadOnlyList<T> thisColumnList,
-            IReadOnlyList<T> otherColumnList,
-            Func<T, T, T> concatFunc) where T : INamedBuffer
-        {
-            var mergedColumns = new List<T>();
-
-            foreach (var thisColumn in thisColumnList)
-            {
-                var otherColumn = otherColumnList.FirstOrDefault(c => c.Name == thisColumn.Name);
-                if (otherColumn == null)
-                    continue;
-
-                var newNamedBuffer = concatFunc(thisColumn, otherColumn);
-
-                mergedColumns.Add(newNamedBuffer);
-            }
-
-            return mergedColumns;
-        }
-
-        public static List<INamedBuffer> ConcatDataColumns(this IReadOnlyList<INamedBuffer> thisColumnList, IReadOnlyList<INamedBuffer> otherColumnList)
-            => thisColumnList.ConcatColumns(otherColumnList,
-                (a, b) => a.ConcatDataColumns(b));
-
-        public static List<NamedBuffer<int>> ConcatIntColumns(this IReadOnlyList<NamedBuffer<int>> thisColumnList, IReadOnlyList<NamedBuffer<int>> otherColumnList)
-            => thisColumnList.ConcatColumns(otherColumnList, 
-                (a, b) => new NamedBuffer<int>(a.GetTypedData().Concat(b.GetTypedData()).ToArray(), a.Name));
-
-        /// <summary>
-        /// Returns a concatenated SerializableEntityTable based on the column names of thisTable.
-        /// </summary>
-        public static SerializableEntityTable Concat(
-            this SerializableEntityTable thisTable,
-            SerializableEntityTable otherTable)
-        {
-            var concatenated = new SerializableEntityTable
-            {
-                Name = thisTable.Name,
-                IndexColumns = thisTable.IndexColumns.ConcatIntColumns(otherTable.IndexColumns),
-                StringColumns = thisTable.StringColumns.ConcatIntColumns(otherTable.StringColumns),
-                DataColumns = thisTable.DataColumns.ConcatDataColumns(otherTable.DataColumns),
-            };
-            concatenated.ValidateColumnRowsAreAligned();
-            return concatenated;
-        }
-
         public static T[] GetColumnValues<T>(this INamedBuffer nb) where T : unmanaged
             => nb.AsArray<T>();
 

src/cs/vim/Vim.Format.Core/ColumnExtensions.Reflection.cs

@@ -16,10 +16,10 @@ public static string GetDataColumnNameTypePrefix(this Type type)
             throw new Exception($"{nameof(GetDataColumnNameTypePrefix)} error: no matching data column name prefix for {type}");
         }
 
-        public static bool CanSerializeAsStringColumn(this Type type)
+        private static bool CanSerializeAsStringColumn(this Type type)
             => type == typeof(string);
 
-        public static bool CanSerializeAsDataColumn(this Type type)
+        private static bool CanSerializeAsDataColumn(this Type type)
             => DataColumnTypes.Contains(type);
 
         public static ValueSerializationStrategy GetValueSerializationStrategy(this Type type)
@@ -60,7 +60,7 @@ public static string GetSerializedValueColumnName(this FieldInfo fieldInfo)
             return $"{typePrefix}{fieldInfo.GetSerializedValueName()}";
         }
 
-        public static bool IsRelationType(this Type t)
+        private static bool IsRelationType(this Type t)
             => t.Name == "Relation`1";
 
         public static Type RelationTypeParameter(this Type t)

src/cs/vim/Vim.Format.Core/ColumnExtensions.cs

@@ -7,7 +7,7 @@ namespace Vim.Format
 {
     public static partial class ColumnExtensions
     {
-        public static readonly IReadOnlyCollection<ColumnInfo> AllColumnInfos
+        private static readonly IReadOnlyCollection<ColumnInfo> AllColumnInfos
             = new[]
             {
                 new ColumnInfo(ColumnType.IndexColumn, VimConstants.IndexColumnNameTypePrefix, typeof(int)),
@@ -19,7 +19,7 @@ public static readonly IReadOnlyCollection<ColumnInfo> AllColumnInfos
                 new ColumnInfo(ColumnType.DataColumn, VimConstants.FloatColumnNameTypePrefix, typeof(float)),
             };
 
-        public static readonly IReadOnlyDictionary<Type, string> DataColumnTypeToPrefixMap
+        private static readonly IReadOnlyDictionary<Type, string> DataColumnTypeToPrefixMap
             = AllColumnInfos
                 .Where(t => t.ColumnType == ColumnType.DataColumn)
                 .SelectMany(t => t.RelatedTypes.Select(type => (Type: type, t.TypePrefix)))
@@ -28,27 +28,25 @@ public static readonly IReadOnlyDictionary<Type, string> DataColumnTypeToPrefixM
         public static readonly ISet<Type> DataColumnTypes
             = new HashSet<Type>(AllColumnInfos.Where(t => t.ColumnType == ColumnType.DataColumn).SelectMany(t => t.RelatedTypes));
 
-        public static readonly ISet<string> DataColumnNameTypePrefixes
+        private static readonly ISet<string> DataColumnNameTypePrefixes
             = new HashSet<string>(AllColumnInfos.Where(t => t.ColumnType == ColumnType.DataColumn).Select(t => t.TypePrefix));
 
-        public static readonly Regex DataColumnTypePrefixRegex
+        private static readonly Regex DataColumnTypePrefixRegex
             = new Regex($@"^(?:{string.Join("|", DataColumnNameTypePrefixes)})");
 
-        public static bool TryGetDataColumnNameTypePrefix(string columnName, out string typePrefix)
+        private static bool TryGetDataColumnNameTypePrefix(string columnName)
         {
-            typePrefix = null;
             if (string.IsNullOrEmpty(columnName))
                 return false;
 
             var match = DataColumnTypePrefixRegex.Match(columnName);
-            typePrefix = match.Value;
             return match.Success;
         }
 
         public static bool IsDataColumnName(string columnName)
-            => TryGetDataColumnNameTypePrefix(columnName, out _);
+            => TryGetDataColumnNameTypePrefix(columnName);
 
-        public const string RelatedTableNameFieldNameSeparator = ":";
+        private const string RelatedTableNameFieldNameSeparator = ":";
 
         public static string GetIndexColumnName(string relatedTableName, string localFieldName)
             => VimConstants.IndexColumnNameTypePrefix + relatedTableName + RelatedTableNameFieldNameSeparator + localFieldName;

src/cs/vim/Vim.Format.Core/Document.cs

@@ -30,12 +30,10 @@ public Document(SerializableDocument document)
             var tables = document.EntityTables.ToDictionary(
                et => et.Name,
                et => new EntityTable(this, et));
-            _bim = new Bim(tables, _Document.StringTable);
+            _bim = new Bim(tables);
         }
 
-        Bim _bim;
-
-        public int TableCount => _bim.TableCount;
+        private readonly Bim _bim;
 
         public EntityTable GetTable(string name)
             => _bim.GetTable(name);
@@ -44,8 +42,7 @@ public EntityTable GetTable(string name)
         public IEnumerable<EntityTable> Tables => _bim.Tables;
         public VimSchema GetSchema() => VimSchema.Create(_Document);
 
-        public string FileName => _Document.FileName;
-        public SerializableDocument _Document { get; }
+        private SerializableDocument _Document { get; }
         public SerializableHeader Header { get; }
         public Dictionary<string, EntityTable> EntityTables { get; }
         public Dictionary<string, INamedBuffer> Assets { get; }
@@ -57,17 +54,13 @@ public EntityTable GetTable(string name)
 
 public class Bim
 {
-    private string[] _strings;
-    private Dictionary<string, EntityTable> _tables { get; }
+    private readonly Dictionary<string, EntityTable> _tables;
 
-    public Bim(Dictionary<string, EntityTable> tables, string[] strings)
+    public Bim(Dictionary<string, EntityTable> tables)
     {
         _tables = tables;
-        _strings = strings;
     }
 
-    public int TableCount => Tables.Count();
-
     public EntityTable GetTable(string name)
         => _tables.GetOrDefault(name);
 

src/cs/vim/Vim.Format.Core/DocumentBuilder.cs

@@ -17,7 +17,6 @@ public partial class DocumentBuilder
         public readonly Dictionary<string, byte[]> Assets = new Dictionary<string, byte[]>();
         public readonly G3dBuilder Geometry = new G3dBuilder();
 
-        public bool UseColors { get; set; }
 
         public DocumentBuilder(
             string generator,
@@ -128,13 +127,13 @@ public StringLookupInfo(IEnumerable<string> allStrings, int indexOffset = 0)
             }
         }
 
-        public static StringLookupInfo GetStringLookupInfo(IEnumerable<EntityTableBuilder> tableBuilders, int indexOffset = 0)
+        private static StringLookupInfo GetStringLookupInfo(IEnumerable<EntityTableBuilder> tableBuilders, int indexOffset = 0)
             => new StringLookupInfo(tableBuilders.SelectMany(tb => tb.GetAllStrings()), indexOffset);
 
-        public StringLookupInfo GetStringLookupInfo()
+        private StringLookupInfo GetStringLookupInfo()
             => GetStringLookupInfo(Tables.Values);
 
-        public List<SerializableEntityTable> ComputeEntityTables(IReadOnlyDictionary<string, int> stringLookup)
+        private List<SerializableEntityTable> ComputeEntityTables(IReadOnlyDictionary<string, int> stringLookup)
         {
             // Create the new Entity tables
             var tableList = new List<SerializableEntityTable>();

src/cs/vim/Vim.Format.Core/DocumentBuilderExtensions.cs

@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
-using Vim.BFastLib;
 
 namespace Vim.Format
 {
     public static class DocumentBuilderExtensions
     {
-        public static EntityTableBuilder CreateTableCopy(this DocumentBuilder db, EntityTable table, List<int> nodeIndexRemapping = null)
+        private static EntityTableBuilder CreateTableCopy(this DocumentBuilder db, EntityTable table, List<int> nodeIndexRemapping = null)
         {
             var name = table.Name;
             var tb = db.CreateTableBuilder(name);