@iapps/d2-web-sdk 1.0.0 → 1.0.2

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@iapps/d2-web-sdk",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "dependencies": {
+    "axios": "^1.8.1",
+    "date-fns": "^4.1.0",
+    "lodash": "^4.17.21",
     "tslib": "^2.3.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
+  "devDependencies": {
+    "@types/date-fns": "^2.5.3",
+    "@types/jest": "^29.5.14",
+    "@types/lodash": "^4.17.15",
+    "@types/moment": "^2.11.29",
+    "@types/node": "^22.13.5",
+    "moment": "^2.30.1"
+  },
   "types": "./src/index.d.ts"
 }

package/src/lib/d2-web-sdk.d.ts

@@ -1,16 +1,28 @@
 import { AxiosDefaults } from 'axios';
-import { DataElementModule, OptionSetModule, ProgramModule, OrganisationUnitModule } from './modules';
-import { D2WebConfig } from './shared';
+import { CurrentUser, D2EngineModule, DataElementModule, Manifest, OptionSetModule, ProgramModule, TrackerModule, UserModule } from './modules';
+import { D2HttpClient, D2WebConfig } from './shared';
+export interface D2Window extends Window {
+    d2Web: D2Web;
+}
 export declare class D2Web {
     #private;
     private static instance;
+    httpInstance: D2HttpClient;
+    appManifest: Manifest | null;
+    currentUser: CurrentUser | null;
     private constructor();
-    static getInstance(config: D2WebConfig): D2Web;
+    static initialize(config: D2WebConfig): Promise<D2Web>;
+    static getInstance(config: D2WebConfig): Promise<D2Web>;
     setConfig(config: D2WebConfig): void;
+    setAppManifest(): Promise<void>;
+    setCurrentUser(): Promise<void>;
     setHttpInstance(httpConfig: AxiosDefaults): void;
+    get rootUrl(): string;
     get config(): D2WebConfig;
+    get userModule(): UserModule;
     get programModule(): ProgramModule;
     get dataElementModule(): DataElementModule;
     get optionSetModule(): OptionSetModule;
-    get organisationUnitModule(): OrganisationUnitModule;
+    get engineModule(): D2EngineModule;
+    get trackerModule(): TrackerModule;
 }

package/src/lib/d2-web-sdk.js

@@ -2,7 +2,7 @@
 // Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-var _D2Web_config, _D2Web_httpInstance;
+var _D2Web_config;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.D2Web = void 0;
 const tslib_1 = require("tslib");
@@ -11,39 +11,112 @@ const shared_1 = require("./shared");
 class D2Web {
     constructor() {
         _D2Web_config.set(this, void 0);
-        _D2Web_httpInstance.set(this, void 0);
+    }
+    static initialize(config) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!D2Web.instance) {
+                const instance = new D2Web();
+                /**
+                 * Set configuration
+                 */
+                instance.setConfig(config);
+                /**
+                 * Initialize http instance to allow http request using axios
+                 */
+                instance.setHttpInstance(config.httpClientConfig);
+                /**
+                 * Fetch and set app manifest
+                 */
+                yield instance.setAppManifest();
+                /**
+                 * Update http instance to account for new information from manifest
+                 */
+                const newWebConfig = new shared_1.D2WebConfig({
+                    baseUrl: instance.rootUrl,
+                });
+                instance.setHttpInstance(newWebConfig.httpClientConfig);
+                /**
+                 * Fetch and set current user
+                 */
+                yield instance.setCurrentUser();
+                D2Web.instance = instance;
+                window.d2Web = instance;
+            }
+            return D2Web.instance;
+        });
     }
     static getInstance(config) {
-        if (!D2Web.instance) {
-            const instance = new D2Web();
-            instance.setConfig(config);
-            instance.setHttpInstance(config.httpClientConfig);
-            D2Web.instance = instance;
-        }
-        return D2Web.instance;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!D2Web.instance) {
+                return yield D2Web.initialize(config);
+            }
+            return D2Web.instance;
+        });
     }
     setConfig(config) {
         tslib_1.__classPrivateFieldSet(this, _D2Web_config, config, "f");
     }
+    setAppManifest() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const appManifestModule = new modules_1.AppManifestModule(this.httpInstance);
+            try {
+                const manifest = yield appManifestModule.get();
+                this.appManifest = manifest;
+            }
+            catch (e) {
+                this.appManifest = null;
+            }
+        });
+    }
+    setCurrentUser() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const currentUser = yield this.userModule.currentUser();
+                if (currentUser) {
+                    this.currentUser = currentUser;
+                }
+            }
+            catch (e) {
+                throw new Error('Current user information could not be found or determined');
+            }
+        });
+    }
     setHttpInstance(httpConfig) {
-        tslib_1.__classPrivateFieldSet(this, _D2Web_httpInstance, new shared_1.D2HttpClient(httpConfig), "f");
+        this.httpInstance = new shared_1.D2HttpClient(httpConfig);
+    }
+    get rootUrl() {
+        const defaultRootUrl = '../../..';
+        if (!this.appManifest) {
+            return defaultRootUrl;
+        }
+        return this.appManifest.activities &&
+            this.appManifest.activities.dhis &&
+            this.appManifest.activities.dhis.href
+            ? this.appManifest.activities.dhis.href
+            : defaultRootUrl;
     }
     get config() {
         return tslib_1.__classPrivateFieldGet(this, _D2Web_config, "f");
     }
+    get userModule() {
+        return new modules_1.UserModule(this.httpInstance);
+    }
     get programModule() {
-        return new modules_1.ProgramModule(tslib_1.__classPrivateFieldGet(this, _D2Web_httpInstance, "f"));
+        return new modules_1.ProgramModule(this.httpInstance);
     }
     get dataElementModule() {
-        return new modules_1.DataElementModule(tslib_1.__classPrivateFieldGet(this, _D2Web_httpInstance, "f"));
+        return new modules_1.DataElementModule(this.httpInstance);
     }
     get optionSetModule() {
-        return new modules_1.OptionSetModule(tslib_1.__classPrivateFieldGet(this, _D2Web_httpInstance, "f"));
+        return new modules_1.OptionSetModule(this.httpInstance);
+    }
+    get engineModule() {
+        return new modules_1.D2EngineModule();
     }
-    get organisationUnitModule() {
-        return new modules_1.OrganisationUnitModule(tslib_1.__classPrivateFieldGet(this, _D2Web_httpInstance, "f"));
+    get trackerModule() {
+        return new modules_1.TrackerModule(this.httpInstance);
     }
 }
 exports.D2Web = D2Web;
-_D2Web_config = new WeakMap(), _D2Web_httpInstance = new WeakMap();
+_D2Web_config = new WeakMap();
 //# sourceMappingURL=d2-web-sdk.js.map

package/src/lib/d2-web-sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"d2-web-sdk.js","sourceRoot":"","sources":["../../../../../packages/dhis2-web-sdk/src/lib/d2-web-sdk.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAGjD,uCAKmB;AACnB,qCAAqD;AAErD,MAAa,KAAK;IAIhB;QAFA,gCAAsB;QACtB,sCAA6B;IACN,CAAC;IAEjB,MAAM,CAAC,WAAW,CAAC,MAAmB;QAC3C,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;YAC7B,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3B,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAiC,CAAC,CAAC;YACnE,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC;IAED,SAAS,CAAC,MAAmB;QAC3B,+BAAA,IAAI,iBAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAED,eAAe,CAAC,UAAyB;QACvC,+BAAA,IAAI,uBAAiB,IAAI,qBAAY,CAAC,UAAU,CAAC,MAAA,CAAC;IACpD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,+BAAA,IAAI,qBAAQ,CAAC;IACtB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,uBAAa,CAAC,+BAAA,IAAI,2BAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,2BAAiB,CAAC,+BAAA,IAAI,2BAAc,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,yBAAe,CAAC,+BAAA,IAAI,2BAAc,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,sBAAsB;QACxB,OAAO,IAAI,gCAAsB,CAAC,+BAAA,IAAI,2BAAc,CAAC,CAAC;IACxD,CAAC;CACF;AA3CD,sBA2CC"}
+{"version":3,"file":"d2-web-sdk.js","sourceRoot":"","sources":["../../../../../packages/dhis2-web-sdk/src/lib/d2-web-sdk.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAGjD,uCAUmB;AACnB,qCAAqD;AAMrD,MAAa,KAAK;IAMhB;QAJA,gCAAsB;IAIC,CAAC;IAEjB,MAAM,CAAO,UAAU,CAAC,MAAmB;;YAChD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE7B;;mBAEG;gBACH,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAE3B;;mBAEG;gBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAiC,CAAC,CAAC;gBAEnE;;mBAEG;gBACH,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAEhC;;mBAEG;gBACH,MAAM,YAAY,GAAG,IAAI,oBAAW,CAAC;oBACnC,OAAO,EAAE,QAAQ,CAAC,OAAO;iBAC1B,CAAC,CAAC;gBACH,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAiC,CAAC,CAAC;gBAEzE;;mBAEG;gBACH,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAEhC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAEzB,MAA8B,CAAC,KAAK,GAAG,QAAQ,CAAC;YACnD,CAAC;YAED,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;KAAA;IAEM,MAAM,CAAO,WAAW,CAAC,MAAmB;;YACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;KAAA;IAED,SAAS,CAAC,MAAmB;QAC3B,+BAAA,IAAI,iBAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAEK,cAAc;;YAClB,MAAM,iBAAiB,GAAG,IAAI,2BAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEnE,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,CAAC;QACH,CAAC;KAAA;IAEK,cAAc;;YAClB,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;gBAExD,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;gBACjC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;IAED,eAAe,CAAC,UAAyB;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAY,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO;QACT,MAAM,cAAc,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU;YAChC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI;YAChC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI;YACrC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI;YACvC,CAAC,CAAC,cAAc,CAAC;IACrB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,+BAAA,IAAI,qBAAQ,CAAC;IACtB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,oBAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,yBAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,wBAAc,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;CACF;AAhID,sBAgIC"}

package/src/lib/index.js

@@ -0,0 +1,5 @@
+"use strict";
+// export * from './modules';
+// export * from './shared';
+// export * from './d2-web-sdk';
+//# sourceMappingURL=index.js.map

package/src/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/dhis2-web-sdk/src/lib/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,4BAA4B;AAC5B,gCAAgC"}

package/src/lib/modules/app-manifest/app-manifest.module.d.ts

@@ -0,0 +1,7 @@
+import { D2HttpClient } from '../../shared';
+import { Manifest } from './models';
+export declare class AppManifestModule {
+    private httpClient;
+    constructor(httpClient: D2HttpClient);
+    get(): Promise<Manifest | null>;
+}

package/src/lib/modules/app-manifest/app-manifest.module.js

@@ -0,0 +1,29 @@
+"use strict";
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppManifestModule = void 0;
+const tslib_1 = require("tslib");
+class AppManifestModule {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    get() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let manifest = null;
+            try {
+                const manifestResponse = yield this.httpClient.get('manifest.webapp', {
+                    useRootUrl: true,
+                });
+                manifest = manifestResponse.data || null;
+            }
+            catch (error) {
+                console.warn('Manifest file could not be loaded, default options have been used instead');
+            }
+            return manifest;
+        });
+    }
+}
+exports.AppManifestModule = AppManifestModule;
+//# sourceMappingURL=app-manifest.module.js.map

package/src/lib/modules/app-manifest/app-manifest.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-manifest.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/app-manifest/app-manifest.module.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAIjD,MAAa,iBAAiB;IAC5B,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAE1C,GAAG;;YACP,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,EAAE;oBACpE,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBAEH,QAAQ,GAAI,gBAAgB,CAAC,IAA4B,IAAI,IAAI,CAAC;YACpE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CACV,2EAA2E,CAC5E,CAAC;YACJ,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;CACF;AApBD,8CAoBC"}

package/src/lib/modules/app-manifest/index.d.ts

@@ -0,0 +1,2 @@
+export * from './models';
+export * from './app-manifest.module';

package/src/lib/modules/app-manifest/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+tslib_1.__exportStar(require("./models"), exports);
+tslib_1.__exportStar(require("./app-manifest.module"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/modules/app-manifest/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/app-manifest/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,gEAAsC"}

package/src/lib/modules/app-manifest/models/index.d.ts

@@ -0,0 +1 @@
+export * from './manifest.model';

package/src/lib/modules/app-manifest/models/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+tslib_1.__exportStar(require("./manifest.model"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/modules/app-manifest/models/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/app-manifest/models/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,2DAAiC"}

package/src/lib/modules/app-manifest/models/manifest.model.d.ts

@@ -0,0 +1,24 @@
+export interface Manifest {
+    name: string;
+    version: number | string;
+    description: string;
+    launch_path: string;
+    appType: string;
+    icons: {
+        16: string;
+        48: string;
+        128: string;
+    };
+    developer: {
+        name: string;
+        url: string;
+    };
+    default_locale: string;
+    activities: {
+        dhis: {
+            href: string;
+            namespace: string;
+        };
+    };
+    authorities: Array<string>;
+}

package/src/lib/modules/app-manifest/models/manifest.model.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=manifest.model.js.map

package/src/lib/modules/app-manifest/models/manifest.model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/app-manifest/models/manifest.model.ts"],"names":[],"mappings":""}

package/src/lib/modules/data-element/models/data-element.model.d.ts

@@ -1,10 +1,11 @@
 import { OptionSet } from '../../option-set';
 import { IdentifiableField, IdentifiableObject } from '../../../shared';
-export type DataElementField = IdentifiableField | 'formName' | 'valueType' | 'aggregationType' | 'domainType' | 'displayDescription' | 'displayFormName' | 'skipSynchronization' | 'zeroIsSignificant' | 'periodOffset' | 'optionSetValue' | 'optionSet';
+export type DataElementProperty = IdentifiableField | 'formName' | 'valueType' | 'aggregationType' | 'domainType' | 'displayDescription' | 'displayFormName' | 'skipSynchronization' | 'zeroIsSignificant' | 'periodOffset' | 'optionSetValue' | 'optionSet';
 export declare class DataElement extends IdentifiableObject<DataElement> {
+    static getProperties(): {};
     static resourceName: string;
     static singularResourceName: string;
-    static fields: DataElementField[];
+    static fields: DataElementProperty[];
     formName?: string;
     valueType: string;
     aggregationType: string;

package/src/lib/modules/data-element/models/data-element.model.js

@@ -4,10 +4,12 @@
 // license that can be found in the LICENSE file.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataElement = void 0;
-const tslib_1 = require("tslib");
 const option_set_1 = require("../../option-set");
 const shared_1 = require("../../../shared");
 class DataElement extends shared_1.IdentifiableObject {
+    static getProperties() {
+        throw new Error('Method not implemented.');
+    }
     constructor(dataElement) {
         super(dataElement);
         if (dataElement.optionSetValue) {
@@ -18,66 +20,18 @@ class DataElement extends shared_1.IdentifiableObject {
 exports.DataElement = DataElement;
 DataElement.resourceName = 'dataElements';
 DataElement.singularResourceName = 'dataElement';
-// static fields: DataElementField[] = [
-//   ...IDENTIFIABLE_FIELDS,
-//   'formName',
-//   'valueType',
-//   'aggregationType',
-//   'domainType',
-//   'displayDescription',
-//   'displayFormName',
-//   'skipSynchronization',
-//   'zeroIsSignificant',
-//   'periodOffset',
-//   'optionSetValue',
-//   'optionSet',
-// ];
 DataElement.fields = [
     ...shared_1.IDENTIFIABLE_FIELDS,
-    ...Object.keys(DataElement.getProperties() || {}),
+    'formName',
+    'valueType',
+    'aggregationType',
+    'domainType',
+    'displayDescription',
+    'displayFormName',
+    'skipSynchronization',
+    'zeroIsSignificant',
+    'periodOffset',
+    'optionSetValue',
+    'optionSet',
 ];
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "formName", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "valueType", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "aggregationType", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "domainType", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "displayDescription", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", String)
-], DataElement.prototype, "displayFormName", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", Boolean)
-], DataElement.prototype, "skipSynchronization", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", Boolean)
-], DataElement.prototype, "zeroIsSignificant", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", Number)
-], DataElement.prototype, "periodOffset", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", Boolean)
-], DataElement.prototype, "optionSetValue", void 0);
-tslib_1.__decorate([
-    shared_1.D2Property,
-    tslib_1.__metadata("design:type", option_set_1.OptionSet)
-], DataElement.prototype, "optionSet", void 0);
 //# sourceMappingURL=data-element.model.js.map

package/src/lib/modules/data-element/models/data-element.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAEjD,iDAA6C;AAC7C,4CAKyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;IA8C9D,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;AAnDH,kCAoDC;AAnDQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AAC5C,wCAAwC;AACxC,4BAA4B;AAC5B,gBAAgB;AAChB,iBAAiB;AACjB,uBAAuB;AACvB,kBAAkB;AAClB,0BAA0B;AAC1B,uBAAuB;AACvB,2BAA2B;AAC3B,yBAAyB;AACzB,oBAAoB;AACpB,sBAAsB;AACtB,iBAAiB;AACjB,KAAK;AAEE,kBAAM,GAAuB;IAClC,GAAG,4BAAmB;IACtB,GAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,CAAS;CAC3D,CAAC;AAGF;IADC,mBAAU;;6CACO;AAElB;IADC,mBAAU;;8CACQ;AAEnB;IADC,mBAAU;;oDACc;AAEzB;IADC,mBAAU;;+CACS;AAEpB;IADC,mBAAU;;uDACiB;AAE5B;IADC,mBAAU;;oDACc;AAEzB;IADC,mBAAU;;wDACmB;AAE9B;IADC,mBAAU;;sDACiB;AAE5B;IADC,mBAAU;;iDACW;AAEtB;IADC,mBAAU;;mDACc;AAEzB;IADC,mBAAU;sCACC,sBAAS;8CAAC"}
+{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;IAC9D,MAAM,CAAC,aAAa;QAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IA8BD,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;AAtCH,kCAuCC;AAnCQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,mBAAmB;IACnB,cAAc;IACd,gBAAgB;IAChB,WAAW;CACZ,CAAC"}

package/src/lib/modules/data-element/queries/data-element.query.d.ts

@@ -1,5 +1,5 @@
 import { BaseQuery, D2HttpClient } from '../../../shared';
-import { DataElement, DataElementField } from '../models';
-export declare class DataElementQuery extends BaseQuery<DataElement, DataElementField> {
+import { DataElement, DataElementProperty } from '../models';
+export declare class DataElementQuery extends BaseQuery<DataElement, DataElementProperty> {
     constructor(httpClient: D2HttpClient);
 }

package/src/lib/modules/data-element/queries/data-element.query.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-element.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/queries/data-element.query.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAA0D;AAC1D,sCAA0D;AAE1D,MAAa,gBAAiB,SAAQ,kBAAwC;IAC5E,YAAY,UAAwB;QAClC,KAAK,CAAC,oBAAW,EAAE,UAAU,CAAC,CAAC;IACjC,CAAC;CACF;AAJD,4CAIC"}
+{"version":3,"file":"data-element.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/queries/data-element.query.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,4CAA0D;AAC1D,sCAA6D;AAE7D,MAAa,gBAAiB,SAAQ,kBAGrC;IACC,YAAY,UAAwB;QAClC,KAAK,CAAC,oBAAW,EAAE,UAAU,CAAC,CAAC;IACjC,CAAC;CACF;AAPD,4CAOC"}

package/src/lib/modules/engine/engine.module.d.ts

@@ -0,0 +1,4 @@
+import { ProgramRuleEngine } from './program-rule';
+export declare class D2EngineModule {
+    get programRule(): ProgramRuleEngine;
+}

package/src/lib/modules/engine/engine.module.js

@@ -0,0 +1,14 @@
+"use strict";
+// Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.D2EngineModule = void 0;
+const program_rule_1 = require("./program-rule");
+class D2EngineModule {
+    get programRule() {
+        return new program_rule_1.ProgramRuleEngine();
+    }
+}
+exports.D2EngineModule = D2EngineModule;
+//# sourceMappingURL=engine.module.js.map

package/src/lib/modules/engine/engine.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/engine.module.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAAmD;AAEnD,MAAa,cAAc;IACzB,IAAI,WAAW;QACb,OAAO,IAAI,gCAAiB,EAAE,CAAC;IACjC,CAAC;CACF;AAJD,wCAIC"}

package/src/lib/modules/engine/index.d.ts

@@ -0,0 +1,2 @@
+export * from './program-rule';
+export * from './engine.module';

package/src/lib/modules/{organisation-unit → engine}/index.js

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 // Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-tslib_1.__exportStar(require("./models"), exports);
-tslib_1.__exportStar(require("./queries"), exports);
-tslib_1.__exportStar(require("./organisation-unit.module"), exports);
+tslib_1.__exportStar(require("./program-rule"), exports);
+tslib_1.__exportStar(require("./engine.module"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/engine/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,yDAA+B;AAC/B,0DAAgC"}

package/src/lib/modules/engine/program-rule/index.d.ts

@@ -0,0 +1 @@
+export * from './program-rule.engine';

package/src/lib/{shared/decorators → modules/engine/program-rule}/index.js

@@ -4,5 +4,5 @@ const tslib_1 = require("tslib");
 // Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-tslib_1.__exportStar(require("./d2-property.decorator"), exports);
+tslib_1.__exportStar(require("./program-rule.engine"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/modules/engine/program-rule/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/program-rule/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,gEAAsC"}

package/src/lib/modules/engine/program-rule/program-rule.engine.d.ts

@@ -0,0 +1,7 @@
+export declare class ProgramRuleEngine {
+    rules: any[];
+    dataValues: Record<string, unknown>;
+    setRules(rules: any[]): this;
+    setDataValues(dataValues: Record<string, unknown>): this;
+    execute(): any[];
+}

package/src/lib/modules/engine/program-rule/program-rule.engine.js

@@ -0,0 +1,42 @@
+"use strict";
+// Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProgramRuleEngine = void 0;
+const lodash_1 = require("lodash");
+const utils_1 = require("./utils");
+// license that can be found in the LICENSE file.
+class ProgramRuleEngine {
+    setRules(rules) {
+        this.rules = rules;
+        return this;
+    }
+    setDataValues(dataValues) {
+        this.dataValues = dataValues;
+        return this;
+    }
+    execute() {
+        return (0, lodash_1.flatten)((this.rules || []).map((rule) => {
+            if (!rule) {
+                return [];
+            }
+            let ruleCondition = rule.condition || '';
+            Object.keys(this.dataValues).forEach((key) => {
+                ruleCondition = ruleCondition.replace(new RegExp(`{${key}}`, 'g'), `'${this.dataValues[key]}'`);
+            });
+            if (ruleCondition.includes('d2:')) {
+                ruleCondition = (0, utils_1.dhisD2Functions)(ruleCondition, {});
+            }
+            let evaluationResult;
+            try {
+                evaluationResult = eval(ruleCondition);
+            }
+            catch (e) {
+                //
+            }
+            return (rule.actions || []).map((action) => (Object.assign(Object.assign({}, action), { actionType: evaluationResult ? action['actionType'] : '' })));
+        }));
+    }
+}
+exports.ProgramRuleEngine = ProgramRuleEngine;
+//# sourceMappingURL=program-rule.engine.js.map

package/src/lib/modules/engine/program-rule/program-rule.engine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"program-rule.engine.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/engine/program-rule/program-rule.engine.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;;;AAErD,mCAAiC;AACjC,mCAA0C;AAE1C,iDAAiD;AACjD,MAAa,iBAAiB;IAI5B,QAAQ,CAAC,KAAY;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,UAAmC;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,IAAA,gBAAO,EACZ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,IAAI,aAAa,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;YAEzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3C,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,CAAC,EAC3B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAC5B,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,aAAa,GAAG,IAAA,uBAAe,EAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,gBAAyB,CAAC;YAC9B,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,EAAE;YACJ,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAA+B,EAAE,EAAE,CAAC,iCAChE,MAAM,KACT,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,IACxD,CAAC,CAAC;QACN,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AA/CD,8CA+CC"}

package/src/lib/modules/engine/program-rule/utils/d2-functions.util.d.ts

@@ -0,0 +1,7 @@
+export declare const d2FuctionsVariables: Array<{
+    name: string;
+    parameters?: number;
+}>;
+export declare const d2FunctionsEval: {
+    [x: string]: Function;
+};