nullable checks

palantir · Jul 14, 2024 · b5ccec3 · b5ccec3
1 parent 9ecc601
commit b5ccec3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/...ples-extra/basic/sdk/src/generatedNoCheck/ontology/queries/queryTakesAllParameterTypes.ts b/...ples-extra/basic/sdk/src/generatedNoCheck/ontology/queries/queryTakesAllParameterTypes.ts
@@ -86,13 +86,15 @@ export const queryTakesAllParameterTypes = {
       type: 'struct',
     },
     twoDimensionalAggregation: {
+      nullable: false,
       twoDimensionalAggregation: {
         keyType: 'string',
         valueType: 'double',
       },
       type: 'twoDimensionalAggregation',
     },
     threeDimensionalAggregation: {
+      nullable: false,
       threeDimensionalAggregation: {
         keyType: 'range',
         keySubtype: 'date',

diff --git a/...es-extra/one_dot_one/src/generatedNoCheck/ontology/queries/queryTakesAllParameterTypes.ts b/...es-extra/one_dot_one/src/generatedNoCheck/ontology/queries/queryTakesAllParameterTypes.ts
@@ -47,6 +47,7 @@ export const queryTakesAllParameterTypes = {
     twoDimensionalAggregation: {
       type: 'twoDimensionalAggregation',
       twoDimensionalAggregation: { keyType: 'string', valueType: 'double' },
+      nullable: false,
     },
     threeDimensionalAggregation: {
       type: 'threeDimensionalAggregation',
@@ -55,6 +56,7 @@ export const queryTakesAllParameterTypes = {
         keySubtype: 'date',
         valueType: { keyType: 'range', keySubtype: 'timestamp', valueType: 'date' },
       },
+      nullable: false,
     },
   },
   output: { type: 'string', nullable: false },

diff --git a/packages/client/src/queries/queries.test.ts b/packages/client/src/queries/queries.test.ts
@@ -151,6 +151,17 @@ describe("queries", () => {
     }, { key: "Q-AFO", groups: [] }]);
   });
 
+  it("throws when response is null and response is non-nullable", async () => {
+    try {
+      const result = await client(addOne)({ n: 3 });
+      expect.fail("Should not reach here");
+    } catch (e) {
+      expect((e as Error).message).toMatch(
+        `Got null response when nullable was not allowed`,
+      );
+    }
+  });
+
   it("three dimensional aggs request/response works", async () => {
     const result = await client(acceptsThreeDimensionalAggregationFunction)({
       aggFunction: [

diff --git a/packages/generator/src/shared/wireQueryDataTypeToQueryDataTypeDefinition.ts b/packages/generator/src/shared/wireQueryDataTypeToQueryDataTypeDefinition.ts
@@ -117,12 +117,14 @@ export function wireQueryDataTypeToQueryDataTypeDefinition<
       return {
         type: "twoDimensionalAggregation",
         twoDimensionalAggregation: get2DQueryAggregationProps(input),
+        nullable: false,
       };
 
     case "threeDimensionalAggregation":
       return {
         type: "threeDimensionalAggregation",
         threeDimensionalAggregation: get3DQueryAggregationProps(input),
+        nullable: false,
       };
 
     case "null":

diff --git a/packages/shared.test/src/stubs/queries.ts b/packages/shared.test/src/stubs/queries.ts
@@ -39,6 +39,12 @@ export const addOneQueryRequest: ExecuteQueryRequest = {
   },
 };
 
+export const addOneQueryRequestWithNoResponse: ExecuteQueryRequest = {
+  parameters: {
+    n: 3,
+  },
+};
+
 export const addOneQueryResponse: ExecuteQueryResponse = {
   value: 3,
 };
@@ -228,6 +234,7 @@ export const queryRequestHandlers: {
 } = {
   [addOneQueryType.apiName]: {
     [JSON.stringify(addOneQueryRequest)]: addOneQueryResponse,
+    [JSON.stringify(addOneQueryRequestWithNoResponse)]: { value: undefined },
   },
   [queryTypeReturnsStruct.apiName]: {
     [JSON.stringify(queryTypeReturnsStructRequest)]: