FacilityApi · ejball · Nov 4, 2022 · Nov 4, 2022 · Nov 4, 2022
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,8 @@
 <Project>

  <PropertyGroup>
-    <VersionPrefix>2.4.2</VersionPrefix>
+    <VersionPrefix>2.5.0</VersionPrefix>
+    <VersionSuffix>beta.1</VersionSuffix>
    <LangVersion>10.0</LangVersion>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,10 @@

 These are the NuGet package releases. See also [npm Release Notes](ReleaseNotesNpm.md).

+## 2.5.0-beta.1
+
+* Support nullable fields.
+
 ## 2.4.2

 * Add .NET 6 target.

diff --git a/conformance/ConformanceApi.fsd b/conformance/ConformanceApi.fsd
@@ -269,6 +269,7 @@ service ConformanceApi
 		array: AnyArray;
 		map: AnyMap;
 		result: AnyResult;
+		nullable: AnyNullable;
 	}

 	data AnyArray
@@ -287,6 +288,7 @@ service ConformanceApi
 		array: int32[][];
 		map: map<int32>[];
 		result: result<int32>[];
+		nullable: nullable<int32>[];
 	}

 	data AnyMap
@@ -305,6 +307,7 @@ service ConformanceApi
 		array: map<int32[]>;
 		map: map<map<int32>>;
 		result: map<result<int32>>;
+		nullable: map<nullable<int32>>;
 	}

 	data AnyResult
@@ -323,6 +326,25 @@ service ConformanceApi
 		array: result<int32[]>;
 		map: result<map<int32>>;
 		result: result<result<int32>>;
+		nullable: result<nullable<int32>>;
+	}
+
+	data AnyNullable
+	{
+		string: nullable<string>;
+		boolean: nullable<boolean>;
+		double: nullable<double>;
+		int32: nullable<int32>;
+		int64: nullable<int64>;
+		decimal: nullable<decimal>;
+		bytes: nullable<bytes>;
+		object: nullable<object>;
+		error: nullable<error>;
+		data: nullable<Any>;
+		enum: nullable<Answer>;
+		array: nullable<int32[]>;
+		map: nullable<map<int32>>;
+		result: nullable<result<int32>>;
 	}

 	data HasWidget

diff --git a/conformance/ConformanceTests.json b/conformance/ConformanceTests.json
@@ -212,7 +212,8 @@
            "enum": ["yes", "no"],
            "array": [[42, 24], [24, 42]],
            "map": [{ "": 42 }, { " ": 24 }],
-            "result": [{ "value": 42 }, { "error": { "code": "code" } }]
+            "result": [{ "value": 42 }, { "error": { "code": "code" } }],
+            "nullable": [42, null, 24]
          }
        },
        "matrix": [[[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]]]
@@ -233,7 +234,8 @@
            "enum": ["yes", "no"],
            "array": [[42, 24], [24, 42]],
            "map": [{ "": 42 }, { " ": 24 }],
-            "result": [{ "value": 42 }, { "error": { "code": "code" } }]
+            "result": [{ "value": 42 }, { "error": { "code": "code" } }],
+            "nullable": [42, null, 24]
          }
        },
        "matrix": [[[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]]]
@@ -320,7 +322,8 @@
            "enum": { "": "yes", " ": "no" },
            "array": { "": [42, 24], " ": [24, 42] },
            "map": { "": { "": 42 }, " ": { " ": 24 } },
-            "result": { "": { "value": 42 }, " ": { "error": { "code": "24" } } }
+            "result": { "": { "value": 42 }, " ": { "error": { "code": "24" } } },
+            "nullable": { "": 42, " ": null }
          }
        }
      },
@@ -340,7 +343,112 @@
            "enum": { "": "yes", " ": "no" },
            "array": { "": [42, 24], " ": [24, 42] },
            "map": { "": { "": 42 }, " ": { " ": 24 } },
-            "result": { "": { "value": 42 }, " ": { "error": { "code": "24" } } }
+            "result": { "": { "value": 42 }, " ": { "error": { "code": "24" } } },
+            "nullable": { "": 42, " ": null }
+          }
+        }
+      }
+    },
+    {
+      "test": "mirrorNullableValueFields",
+      "method": "mirrorFields",
+      "request": {
+        "field": {
+          "nullable": {
+            "string": "string",
+            "boolean": true,
+            "double": 0.375,
+            "int32": 42,
+            "int64": 12345678910,
+            "decimal": 1.5,
+            "bytes": "aGk=",
+            "object": { "": null, " ": [null] },
+            "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
+            "data": { "data": { "data": {} } },
+            "enum": "yes",
+            "array": [42],
+            "map": { "": 42 },
+            "result": { "value": 42 }
+          }
+        }
+      },
+      "response": {
+        "field": {
+          "nullable": {
+            "string": "string",
+            "boolean": true,
+            "double": 0.375,
+            "int32": 42,
+            "int64": 12345678910,
+            "decimal": 1.5,
+            "bytes": "aGk=",
+            "object": { "": null, " ": [null] },
+            "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
+            "data": { "data": { "data": {} } },
+            "enum": "yes",
+            "array": [42],
+            "map": { "": 42 },
+            "result": { "value": 42 }
+          }
+        }
+      }
+    },
+    {
+      "test": "mirrorNullableMissingFields",
+      "method": "mirrorFields",
+      "request": {
+        "field": {
+          "nullable": {
+          }
+        }
+      },
+      "response": {
+        "field": {
+          "nullable": {
+          }
+        }
+      }
+    },
+    {
+      "test": "mirrorNullableNullFields",
+      "method": "mirrorFields",
+      "request": {
+        "field": {
+          "nullable": {
+            "string": null,
+            "boolean": null,
+            "double": null,
+            "int32": null,
+            "int64": null,
+            "decimal": null,
+            "bytes": null,
+            "object": null,
+            "error": null,
+            "data": null,
+            "enum": null,
+            "array": null,
+            "map": null,
+            "result": null
+          }
+        }
+      },
+      "response": {
+        "field": {
+          "nullable": {
+            "string": null,
+            "boolean": null,
+            "double": null,
+            "int32": null,
+            "int64": null,
+            "decimal": null,
+            "bytes": null,
+            "object": null,
+            "error": null,
+            "data": null,
+            "enum": null,
+            "array": null,
+            "map": null,
+            "result": null
          }
        }
      }
@@ -408,7 +516,8 @@
            "enum": { "value": "yes" },
            "array": { "value": [42] },
            "map": { "value": { "": 42 } },
-            "result": { "value": { "value": 42 } }
+            "result": { "value": { "value": 42 } },
+            "nullable": { "value": null }
          }
        }
      },
@@ -428,7 +537,8 @@
            "enum": { "value": "yes" },
            "array": { "value": [42] },
            "map": { "value": { "": 42 } },
-            "result": { "value": { "value": 42 } }
+            "result": { "value": { "value": 42 } },
+            "nullable": { "value": null }
          }
        }
      }

diff --git a/conformance/ts/src/conformanceApi.ts b/conformance/ts/src/conformanceApi.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */

 import { HttpClientUtility, IServiceResult, IHttpClientOptions } from 'facility-core';
-import { IConformanceApi, IGetApiInfoRequest, IGetApiInfoResponse, IGetWidgetsRequest, IGetWidgetsResponse, ICreateWidgetRequest, ICreateWidgetResponse, IGetWidgetRequest, IGetWidgetResponse, IDeleteWidgetRequest, IDeleteWidgetResponse, IGetWidgetBatchRequest, IGetWidgetBatchResponse, IMirrorFieldsRequest, IMirrorFieldsResponse, ICheckQueryRequest, ICheckQueryResponse, ICheckPathRequest, ICheckPathResponse, IMirrorHeadersRequest, IMirrorHeadersResponse, IMixedRequest, IMixedResponse, IRequiredRequest, IRequiredResponse, IMirrorBytesRequest, IMirrorBytesResponse, IMirrorTextRequest, IMirrorTextResponse, IBodyTypesRequest, IBodyTypesResponse, IWidget, IAny, IAnyArray, IAnyMap, IAnyResult, IHasWidget, Answer } from './conformanceApiTypes';
+import { IConformanceApi, IGetApiInfoRequest, IGetApiInfoResponse, IGetWidgetsRequest, IGetWidgetsResponse, ICreateWidgetRequest, ICreateWidgetResponse, IGetWidgetRequest, IGetWidgetResponse, IDeleteWidgetRequest, IDeleteWidgetResponse, IGetWidgetBatchRequest, IGetWidgetBatchResponse, IMirrorFieldsRequest, IMirrorFieldsResponse, ICheckQueryRequest, ICheckQueryResponse, ICheckPathRequest, ICheckPathResponse, IMirrorHeadersRequest, IMirrorHeadersResponse, IMixedRequest, IMixedResponse, IRequiredRequest, IRequiredResponse, IMirrorBytesRequest, IMirrorBytesResponse, IMirrorTextRequest, IMirrorTextResponse, IBodyTypesRequest, IBodyTypesResponse, IWidget, IAny, IAnyArray, IAnyMap, IAnyResult, IAnyNullable, IHasWidget, Answer } from './conformanceApiTypes';
 export * from './conformanceApiTypes';

 /** Provides access to ConformanceApi over HTTP via fetch. */

diff --git a/conformance/ts/src/conformanceApiTypes.ts b/conformance/ts/src/conformanceApiTypes.ts
@@ -351,6 +351,8 @@ export interface IAny {
  map?: IAnyMap;

  result?: IAnyResult;
+
+  nullable?: IAnyNullable;
 }

 export interface IAnyArray {
@@ -381,6 +383,8 @@ export interface IAnyArray {
  map?: { [name: string]: number }[];

  result?: IServiceResult<number>[];
+
+  nullable?: (number | null)[];
 }

 export interface IAnyMap {
@@ -411,6 +415,8 @@ export interface IAnyMap {
  map?: { [name: string]: { [name: string]: number } };

  result?: { [name: string]: IServiceResult<number> };
+
+  nullable?: { [name: string]: (number | null) };
 }

 export interface IAnyResult {
@@ -441,6 +447,38 @@ export interface IAnyResult {
  map?: IServiceResult<{ [name: string]: number }>;

  result?: IServiceResult<IServiceResult<number>>;
+
+  nullable?: IServiceResult<(number | null)>;
+}
+
+export interface IAnyNullable {
+  string?: (string | null);
+
+  boolean?: (boolean | null);
+
+  double?: (number | null);
+
+  int32?: (number | null);
+
+  int64?: (number | null);
+
+  decimal?: (number | null);
+
+  bytes?: (string | null);
+
+  object?: ({ [name: string]: any } | null);
+
+  error?: (IServiceError | null);
+
+  data?: (IAny | null);
+
+  enum?: (Answer | null);
+
+  array?: (number[] | null);
+
+  map?: ({ [name: string]: number } | null);
+
+  result?: (IServiceResult<number> | null);
 }

 export interface IHasWidget {

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -15,7 +15,7 @@
      ]
    },
    "facilityconformance": {
-      "version": "2.15.2",
+      "version": "2.17.0-beta.1",
      "commands": [
        "FacilityConformance"
      ]

diff --git a/src/Facility.CodeGen.JavaScript/Facility.CodeGen.JavaScript.csproj b/src/Facility.CodeGen.JavaScript/Facility.CodeGen.JavaScript.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Facility.Definition" Version="2.7.2" />
+    <PackageReference Include="Facility.Definition" Version="2.8.0-beta.1" />
  </ItemGroup>

 </Project>
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -620,6 +620,8 @@ private static string RenderFieldType(ServiceTypeInfo fieldType)
 					return $"{RenderFieldType(fieldType.ValueType!)}[]";
 				case ServiceTypeKind.Map:
 					return $"{{ [name: string]: {RenderFieldType(fieldType.ValueType!)} }}";
+				case ServiceTypeKind.Nullable:
+					return $"({RenderFieldType(fieldType.ValueType!)} | null)";
 				default:
 					throw new NotSupportedException("Unknown field type " + fieldType.Kind);
 			}

diff --git a/src/fsdgenjs/fsdgenjs.csproj b/src/fsdgenjs/fsdgenjs.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Facility.CodeGen.Console" Version="2.7.2" />
+    <PackageReference Include="Facility.CodeGen.Console" Version="2.8.0-beta.1" />
  </ItemGroup>

  <ItemGroup>