@dhis2/app-service-data 3.14.5 → 3.14.6

package/build/cjs/engine/DataEngine.js

@@ -19,6 +19,11 @@ class DataEngine {
     _defineProperty(this, "link", void 0);
     this.link = link;
   }
+
+  // Overload 1: When no generic is provided, accept any Query and return inferred type
+
+  // Overload 2: When generic is provided, enforce that query keys match the generic keys
+
   query(query) {
     let {
       variables = {},

package/build/es/engine/DataEngine.js

@@ -13,6 +13,11 @@ export class DataEngine {
     _defineProperty(this, "link", void 0);
     this.link = link;
   }
+
+  // Overload 1: When no generic is provided, accept any Query and return inferred type
+
+  // Overload 2: When generic is provided, enforce that query keys match the generic keys
+
   query(query) {
     let {
       variables = {},

package/build/types/engine/DataEngine.d.ts

@@ -1,12 +1,13 @@
 import { DataEngineLink } from './types/DataEngineLink';
 import { QueryExecuteOptions } from './types/ExecuteOptions';
-import { JsonMap, JsonValue } from './types/JsonValue';
+import { JsonValue } from './types/JsonValue';
 import { Mutation } from './types/Mutation';
-import { Query } from './types/Query';
+import type { Query, ResourceQuery } from './types/Query';
 export declare class DataEngine {
     private link;
     constructor(link: DataEngineLink);
-    query(query: Query, { variables, signal, onComplete, onError, }?: QueryExecuteOptions): Promise<JsonMap>;
+    query(query: Query, options?: QueryExecuteOptions): Promise<Record<keyof typeof query, unknown>>;
+    query<T extends Record<string, unknown>>(query: Record<keyof T, ResourceQuery>, options?: QueryExecuteOptions): Promise<T>;
     mutate(mutation: Mutation, { variables, signal, onComplete, onError, }?: QueryExecuteOptions): Promise<JsonValue>;
 }
 export default DataEngine;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-data",
-    "version": "3.14.5",
+    "version": "3.14.6",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -37,7 +37,7 @@
         "prop-types": "^15.7.2"
     },
     "peerDependencies": {
-        "@dhis2/app-service-config": "3.14.5",
+        "@dhis2/app-service-config": "3.14.6",
         "react": "^16.8.6 || ^18",
         "react-dom": "^16.8.6 || ^18"
     }