Fix license on npm package. Fix bug in response headers.

ejball · ejball · commit 62f2272f79c7 · 2020-06-11T09:33:17.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/VersionHistory.md b/VersionHistory.md
@@ -1,5 +1,10 @@
 # Version History
 
+### 2.1.1
+
+* Fix bug with response headers.
+* Fix license on npm package.
+
 ### 2.1.0
 
 * Update `Facility.Definition`. (Supports shorthand for required attribute, e.g. `string!`.)
diff --git a/example/ExampleApi.fsd b/example/ExampleApi.fsd
@@ -75,6 +75,9 @@ service ExampleApi
 		[http(from: header)]
 		eTag: string;
 
+		[http(from: header, name: "Cache-Control")]
+		cacheControl: string;
+
 		[http(from: body, code: 304)]
 		notModified: boolean;
 	}
diff --git a/example/js/exampleApi.js b/example/js/exampleApi.js
@@ -119,6 +119,10 @@ class ExampleApiHttpClient {
         if (headerValue != null) {
           value.eTag = headerValue;
         }
+        headerValue = result.response.headers.get('Cache-Control');
+        if (headerValue != null) {
+          value.cacheControl = headerValue;
+        }
         return { value: value };
       });
   }
diff --git a/example/js/exampleApiServer.js b/example/js/exampleApiServer.js
@@ -122,6 +122,9 @@ export function createApp(service) {
           if (result.value.eTag != null) {
             res.setHeader('eTag', result.value.eTag);
           }
+          if (result.value.cacheControl != null) {
+            res.setHeader('Cache-Control', result.value.cacheControl);
+          }
           if (result.value.widget) {
             res.status(200).send(result.value.widget);
             return;
diff --git a/example/ts/src/exampleApi.ts b/example/ts/src/exampleApi.ts
@@ -122,6 +122,10 @@ class ExampleApiHttpClient implements IExampleApi {
 				if (headerValue != null) {
 					value.eTag = headerValue;
 				}
+				headerValue = result.response.headers.get('Cache-Control');
+				if (headerValue != null) {
+					value.cacheControl = headerValue;
+				}
 				return { value: value };
 			});
 	}
diff --git a/example/ts/src/exampleApiServer.ts b/example/ts/src/exampleApiServer.ts
@@ -124,6 +124,9 @@ export function createApp(service: IExampleApi): express.Application {
 					if (result.value.eTag != null) {
 						res.setHeader('eTag', result.value.eTag);
 					}
+					if (result.value.cacheControl != null) {
+						res.setHeader('Cache-Control', result.value.cacheControl);
+					}
 					if (result.value.widget) {
 						res.status(200).send(result.value.widget);
 						return;
diff --git a/example/ts/src/exampleApiTypes.ts b/example/ts/src/exampleApiTypes.ts
@@ -113,6 +113,8 @@ export interface IGetWidgetResponse {
 
 	eTag?: string;
 
+	cacheControl?: string;
+
 	notModified?: boolean;
 }
 
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -297,7 +297,7 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)
 									{
 										code.WriteLine($"headerValue = result.response.headers.get('{httpHeaderField.Name}');");
 										using (code.Block("if (headerValue != null) {", "}"))
-											code.WriteLine($"value.{httpHeaderField.Name} = headerValue;");
+											code.WriteLine($"value.{httpHeaderField.ServiceField.Name} = headerValue;");
 									}
 								}
 
diff --git a/ts/package.json b/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "facility-core",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Common code for the Facility API Framework.",
   "scripts": {
     "build": "tsc && tslint --exclude **/*.d.ts src/*.ts",
@@ -11,7 +11,7 @@
     "url": "https://github.com/FacilityApi/FacilityJavaScript.git"
   },
   "author": "Ed Ball",
-  "license": "UNLICENSED",
+  "license": "MIT",
   "files": [
     "src"
   ],

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ service ExampleApi`
`75`	`75`	`[http(from: header)]`
`76`	`76`	`eTag: string;`
`77`	`77`
	`78`	`+ [http(from: header, name: "Cache-Control")]`
	`79`	`+ cacheControl: string;`
	`80`	`+`
`78`	`81`	`[http(from: body, code: 304)]`
`79`	`82`	`notModified: boolean;`
`80`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,10 @@ class ExampleApiHttpClient {`
`119`	`119`	`if (headerValue != null) {`
`120`	`120`	`value.eTag = headerValue;`
`121`	`121`	`}`
	`122`	`+ headerValue = result.response.headers.get('Cache-Control');`
	`123`	`+ if (headerValue != null) {`
	`124`	`+ value.cacheControl = headerValue;`
	`125`	`+ }`
`122`	`126`	`return { value: value };`
`123`	`127`	`});`
`124`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,10 @@ class ExampleApiHttpClient implements IExampleApi {`
`122`	`122`	`if (headerValue != null) {`
`123`	`123`	`value.eTag = headerValue;`
`124`	`124`	`}`
	`125`	`+ headerValue = result.response.headers.get('Cache-Control');`
	`126`	`+ if (headerValue != null) {`
	`127`	`+ value.cacheControl = headerValue;`
	`128`	`+ }`
`125`	`129`	`return { value: value };`
`126`	`130`	`});`
`127`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,8 @@ export interface IGetWidgetResponse {`
`113`	`113`
`114`	`114`	`eTag?: string;`
`115`	`115`
	`116`	`+ cacheControl?: string;`
	`117`	`+`
`116`	`118`	`notModified?: boolean;`
`117`	`119`	`}`
`118`	`120`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)`
`297`	`297`	`{`
`298`	`298`	`code.WriteLine($"headerValue = result.response.headers.get('{httpHeaderField.Name}');");`
`299`	`299`	`using (code.Block("if (headerValue != null) {", "}"))`
`300`		`- code.WriteLine($"value.{httpHeaderField.Name} = headerValue;");`
	`300`	`+ code.WriteLine($"value.{httpHeaderField.ServiceField.Name} = headerValue;");`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`