add three zfc options.

neuecc · Dec 5, 2016 · c8ea394 · c8ea394
1 parent 354fbe5
commit c8ea394
Show file tree

Hide file tree

Showing 29 changed files with 719 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -468,6 +468,9 @@ zfc arguments help:
   -t, --customtypes=VALUE       [optional, default=empty]comma separated allows custom types
   -c, --conditionalsymbol=VALUE [optional, default=empty]conditional compiler symbol
   -r, --resolvername=VALUE      [optional, default=DefaultResolver]Register CustomSerializer target
+  -d, --disallowinternaltype    [optional, default=false]Don't generate internal type", x => { DisallowInternalType = true; } },
+  -e, --propertyenumonly,       [optional, default=false]Generate only property enum type only", x => { PropertyEnumOnly = true; } },
+  -m, --disallowinmetadata,     [optional, default=false]Don't generate in metadata type", x => { DisallowInMetadata = true; } },
 ```
 
 ```

diff --git a/nuget/ZeroFormatter.Interfaces.nuspec b/nuget/ZeroFormatter.Interfaces.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Interfaces</id>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
         <title>ZeroFormatter.Interfaces</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>

diff --git a/nuget/ZeroFormatter.Unity.nuspec b/nuget/ZeroFormatter.Unity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Unity</id>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
         <title>ZeroFormatter.Unity</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,7 +17,7 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework="Unity Full v3.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.3" />
             </group>
         </dependencies>
     </metadata>

diff --git a/nuget/ZeroFormatter.nuspec b/nuget/ZeroFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter</id>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
         <title>ZeroFormatter</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,10 +17,10 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.3" />
             </group>
             <group targetFramework=".NETStandard1.6">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.3" />
                 <dependency id="System.Reflection.Emit" version="4.0.1" />
                 <dependency id="System.Runtime" version="4.1.0" />
                 <dependency id="System.Runtime.Extensions" version="4.1.0" />

diff --git a/nuget/push.bat b/nuget/push.bat
@@ -1,4 +1,4 @@
 REM nuget push ZeroFormatter.Analyzer.1.1.1.0.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.1.5.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Interfaces.1.5.2.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Unity.1.5.2.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Interfaces.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Unity.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.2-*",
+  "version": "1.5.3-*",
   "buildOptions": {
     "emitEntryPoint": true
   },
@@ -9,8 +9,8 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "ZeroFormatter.Interfaces.NETCore": "1.5.2",
-    "ZeroFormatter.NETCore": "1.5.2"
+    "ZeroFormatter.Interfaces.NETCore": "1.5.3",
+    "ZeroFormatter.NETCore": "1.5.3"
   },
 
   "frameworks": {

diff --git a/sandbox/Sandbox.NETCore/project.lock.json b/sandbox/Sandbox.NETCore/project.lock.json
@@ -1992,7 +1992,7 @@
           "lib/netstandard1.3/_._": {}
         }
       },
-      "ZeroFormatter.Interfaces.NETCore/1.5.2": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.3": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2006,7 +2006,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.2": {
+      "ZeroFormatter.NETCore/1.5.3": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
@@ -2024,7 +2024,7 @@
           "System.Text.Encoding": "4.0.11",
           "System.Text.Encoding.Extensions": "4.0.11",
           "System.Threading": "4.0.11",
-          "ZeroFormatter.Interfaces.NETCore": "1.5.2"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.3"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -6627,12 +6627,12 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.2": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.3": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.2": {
+    "ZeroFormatter.NETCore/1.5.3": {
       "type": "project",
       "path": "../../src/ZeroFormatter.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj"
@@ -6641,8 +6641,8 @@
   "projectFileDependencyGroups": {
     "": [
       "Microsoft.NETCore.App >= 1.0.0",
-      "ZeroFormatter.Interfaces.NETCore >= 1.5.2",
-      "ZeroFormatter.NETCore >= 1.5.2"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.3",
+      "ZeroFormatter.NETCore >= 1.5.3"
     ],
     ".NETCoreApp,Version=v1.0": []
   },

diff --git a/sandbox/Sandbox.Shared/InnerClass.cs b/sandbox/Sandbox.Shared/InnerClass.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZeroFormatter;
+
+namespace Sandbox.Shared
+{
+    public class InnerClassA
+    {
+        public enum InnerEnum
+        {
+            A, B, C
+        }
+
+        [ZeroFormattable]
+        public class InnerObject
+        {
+            [Index(0)]
+            public virtual int MyProperty { get; set; }
+        }
+    }
+
+    public class InnerClassB
+    {
+        public enum InnerEnum
+        {
+            A, B, C
+        }
+
+        private enum NgGenerateEnum
+        {
+            A, B, C
+        }
+
+        enum NgGenerateEnum2
+        {
+            Z
+        }
+
+        [ZeroFormattable]
+        public class InnerObject
+        {
+            [Index(0)]
+            public virtual int MyProperty { get; set; }
+
+
+            [Index(1)]
+            public virtual InsideEnum MyProperty2 { get; set; }
+
+
+            [Index(2)]
+            public virtual TypeCode MyProperty3 { get; set; }
+        }
+    }
+
+    [ZeroFormattable]
+    class InternalOkGenerateType
+    {
+        [Index(0)]
+        public virtual int MyProperty { get; set; }
+    }
+
+    public enum OutSideEnum
+    {
+        A, B, C
+    }
+
+    public enum InsideEnum
+    {
+        A, B, C
+    }
+}
diff --git a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
diff --git a/sandbox/Sandbox.Shared/Sandbox.Shared.csproj b/sandbox/Sandbox.Shared/Sandbox.Shared.csproj
@@ -51,6 +51,7 @@
     <Compile Include="Bar\MyClass.cs" />
     <Compile Include="Foo\MyClass.cs" />
     <Compile Include="GlobalNamespace.cs" />
+    <Compile Include="InnerClass.cs" />
     <Compile Include="Perf.cs" />
     <Compile Include="PseudoVector.cs" />
     <Compile Include="Inherit.cs" />

diff --git a/sandbox/Sandbox/Program.cs b/sandbox/Sandbox/Program.cs
@@ -245,11 +245,11 @@ class Program
     {
         static void Main(string[] args)
         {
-            var prop = new StaticProperty() { HugaHuga = 999, My2 = new[] { new DameClass { Ok = 9 } } };
+            var a = ZeroFormatterSerializer.Convert(new InnerClassA.InnerObject());
+            var b = ZeroFormatterSerializer.Convert(new InnerClassB.InnerObject());
 
-            var hoge = ZeroFormatterSerializer.Convert(prop);
-            Console.WriteLine(hoge.HugaHuga);
-            Console.WriteLine(hoge.My2[0].Ok);
+            Console.WriteLine(a.GetType().FullName);
+            Console.WriteLine(b.GetType().FullName);
         }
     }
 

diff --git a/sandbox/Sandbox/Properties/AssemblyInfo.cs b/sandbox/Sandbox/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
diff --git a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.2" Language="en-US" Publisher="neuecc"/>
+        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.3" Language="en-US" Publisher="neuecc"/>
         <DisplayName>ZeroFormatterAnalyzer</DisplayName>
         <Description xml:space="preserve">New Launcher of ZeroFormatter.Analyzer</Description>
     </Metadata>

diff --git a/src/ZeroFormatter.CodeGenerator/Program.cs b/src/ZeroFormatter.CodeGenerator/Program.cs
@@ -18,7 +18,11 @@ class CommandlineArguments
         public List<string> AllowCustomTypes { get; private set; }
         public List<string> ConditionalSymbols { get; private set; }
         public bool IsSeparate { get; private set; }
-        public string ResolverName { get; set; }
+        public string ResolverName { get; private set; }
+        public bool DisallowInternalType { get; private set; }
+        public bool PropertyEnumOnly { get; private set; }
+        public bool DisallowInMetadata { get; private set; }
+        // public string ZeroFormatterInitializerNamespace { get; set; }
 
         public bool IsParsed { get; set; }
 
@@ -37,6 +41,10 @@ public CommandlineArguments(string[] args)
                 { "t|customtypes=", "[optional, default=empty]comma separated allows custom types", x => { AllowCustomTypes.AddRange(x.Split(',')); } },
                 { "c|conditionalsymbol=", "[optional, default=empty]conditional compiler symbol", x => { ConditionalSymbols.AddRange(x.Split(',')); } },
                 { "r|resolvername=", "[optional, default=DefaultResolver]Register CustomSerializer target", x => { ResolverName = x; } },
+                { "d|disallowinternaltype", "[optional, default=false]Don't generate internal type", x => { DisallowInternalType = true; } },
+                { "e|propertyenumonly", "[optional, default=false]Generate only property enum type only", x => { PropertyEnumOnly = true; } },
+                { "m|disallowinmetadata", "[optional, default=false]Don't generate in metadata type", x => { DisallowInMetadata = true; } },
+                // { "n|initializernamespace=", "[optional, default=ZeroFormatter.Internal]ZeroFormatterInitializer namespace", _ => { ZeroFormatterInitializerNamespace = true; } },
             };
             if (args.Length == 0)
             {
@@ -87,7 +95,7 @@ static void Main(string[] args)
             var sw = Stopwatch.StartNew();
             Console.WriteLine("Project Compilation Start:" + csprojPath);
 
-            var tc = new TypeCollector(csprojPath, cmdArgs.ConditionalSymbols, cmdArgs.AllowCustomTypes);
+            var tc = new TypeCollector(csprojPath, cmdArgs.ConditionalSymbols, cmdArgs.AllowCustomTypes, cmdArgs.DisallowInternalType, cmdArgs.PropertyEnumOnly, cmdArgs.DisallowInMetadata);
 
             Console.WriteLine("Project Compilation Complete:" + sw.Elapsed.ToString());
             Console.WriteLine();
@@ -139,7 +147,7 @@ static void Main(string[] args)
                 sw.Restart();
 
                 var initializerPath = Path.Combine(outputpath, "ZeroFormatterInitializer.cs");
-                Output(initializerPath, new InitializerGenerator() { Objects = objectGen, Enums = enumGen, Structs = structGen, GenericTypes = genericTypes, UnuseUnityAttribute = unuse, Unions = unionGen, ResolverName= cmdArgs.ResolverName }.TransformText());
+                Output(initializerPath, new InitializerGenerator() { Objects = objectGen, Enums = enumGen, Structs = structGen, GenericTypes = genericTypes, UnuseUnityAttribute = unuse, Unions = unionGen, ResolverName = cmdArgs.ResolverName }.TransformText());
 
                 foreach (var item in objectGen.SelectMany(x => x.Types))
                 {

diff --git a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]