merge dataset.requestOptions.params into the generated params

Author: tomwayson

packages/cedar/src/query/query.ts

@@ -17,14 +17,15 @@ export function queryDatasets(datasets: IDataset[]) {
       datasets.forEach((dataset, i) => {
       // only query datasets that don't have inline data
       if (dataset.url) {
+        const { url, name, query, requestOptions } = dataset
         // TODO: make name required on datasets, or required if > 1 dataset?
-        names.push(dataset.name || `dataset${i}`)
+        names.push(name || `dataset${i}`)
 
-        const queryParams = createQueryParams(dataset.query)
+        const params = { ...(requestOptions && requestOptions.params), ...createQueryParams(query) }
         const options: IQueryFeaturesOptions = {
-          ...dataset.requestOptions,
-          url: dataset.url,
-          params: queryParams,
+          ...requestOptions,
+          url,
+          params,
         }
         if (config.fetch && typeof config.fetch === 'function') {
           // we are configured to use a custom fetch implementation

packages/cedar/test/query/query.spec.ts

@@ -93,11 +93,18 @@ describe('when querying datasets', () => {
       const datasets = definitions.bar.datasets
       it('should merge them into those passed to queryFeatures', () => {
         const httpMethod = 'POST'
-        const dataset: IDataset = datasets[0]
-        dataset.requestOptions = {
-          httpMethod
+        const dataset: IDataset = {
+          ...datasets[0],
+          requestOptions: {
+            // override default HTTP method
+            httpMethod,
+            params: {
+              // invalid param should NOT be used
+              f: 'html'
+            }
+          }
         }
-        return queryDatasets(datasets).then((datasetsData) => {
+        return queryDatasets([ dataset ]).then((datasetsData) => {
           // verify that it called queryFeatures once w/ the right parameters
           expect(mockQueryFeatures.mock.calls.length).toEqual(1)
           const requestOptions = mockQueryFeatures.mock.calls[0][0]