@iapps/d2-web-sdk 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iapps/d2-web-sdk",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "dependencies": {
     "axios": "^1.8.1",
     "date-fns": "^4.1.0",

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

@@ -1,8 +1,36 @@
+import { Option } from '../../option-set';
+export interface IMetadataRuleAction {
+    field: string;
+    actionType: string;
+    assignedData?: string;
+    displayedContent?: string;
+    options?: Partial<Option>[];
+    programRule?: {
+        id: string;
+    };
+    evaluationTime?: 'ALWAYS' | 'ON_COMPLETE' | 'ON_CREATE' | string;
+}
+type Rule = {
+    condition?: string;
+    actions?: IMetadataRuleAction[];
+};
+type ExecuteOptions = {
+    /** return only triggered actions */
+    triggeredOnly?: boolean;
+    /** resolve duplicates by field (last wins) */
+    dedupeByField?: boolean;
+    /** include debug metadata */
+    debug?: boolean;
+};
 export declare class ProgramRuleEngine {
-    rules: any[];
-    dataValues: Record<string, unknown>;
-    setRules(rules: any[]): this;
+    private rules;
+    private dataValues;
+    setRules(rules: Rule[]): this;
     setDataValues(dataValues: Record<string, unknown>): this;
-    getAssignedData(assignedDataExpression: string): string | undefined;
-    execute(): any[];
+    execute(options?: ExecuteOptions): IMetadataRuleAction[];
+    /** Replace {var} with safe JS literals + resolve d2: functions */
+    private prepareExpression;
+    private safeEvalBoolean;
+    private safeEvalAny;
 }
+export {};

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

@@ -1,15 +1,92 @@
 "use strict";
-// Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
-// Use of this source code is governed by a BSD-style
+// /* eslint-disable no-constant-condition */
+// // 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");
+// import { flatten } from 'lodash';
+// import { dhisD2Functions } from './utils';
+// import { format } from 'date-fns';
+// // license that can be found in the LICENSE file.
+// export class ProgramRuleEngine {
+//   rules!: any[];
+//   dataValues!: Record<string, unknown>;
+//   setRules(rules: any[]) {
+//     this.rules = rules;
+//     return this;
+//   }
+//   setDataValues(dataValues: Record<string, unknown>) {
+//     const currentDate = format(new Date(), 'yyyy-MM-dd');
+//     this.dataValues = { ...(dataValues || {}), current_date: currentDate };
+//     return this;
+//   }
+//   getAssignedData(assignedDataExpression: string): string | undefined {
+//     let assignedData = assignedDataExpression || '';
+//     try {
+//       Object.keys(this.dataValues).forEach((key) => {
+//         assignedData = assignedData.replace(
+//           new RegExp(`{${key}}`, 'g'),
+//           `'${this.dataValues[key]}'`
+//         );
+//       });
+//       if (assignedData.includes('d2:')) {
+//         assignedData = dhisD2Functions(assignedData, {});
+//       }
+//     } catch (err: any) {
+//       console.warn('Problem processing assigned value', err);
+//       return undefined;
+//     }
+//     return assignedData !== 'NaN' ? assignedData : undefined;
+//   }
+//   execute(): any[] {
+//     return 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 = dhisD2Functions(ruleCondition, {});
+//         }
+//         let evaluationResult: boolean;
+//         try {
+//           evaluationResult = eval(ruleCondition);
+//         } catch (e) {
+//           //
+//         }
+//         return (rule.actions || []).map((action: Record<string, unknown>) => {
+//           const actionType = evaluationResult ? action['actionType'] : '';
+//           let assignedData;
+//           if (actionType === 'ASSIGN') {
+//             assignedData = this.getAssignedData(
+//               action['assignedData'] as string
+//             );
+//           }
+//           return {
+//             ...action,
+//             assignedData,
+//             actionType,
+//           };
+//         });
+//       })
+//     );
+//   }
+// }
 const date_fns_1 = require("date-fns");
-// license that can be found in the LICENSE file.
+const run_d2_expression_util_1 = require("./utils/run-d2-expression.util");
 class ProgramRuleEngine {
+    constructor() {
+        this.rules = [];
+        this.dataValues = {};
+    }
     setRules(rules) {
-        this.rules = rules;
+        this.rules = Array.isArray(rules) ? rules : [];
         return this;
     }
     setDataValues(dataValues) {
@@ -17,52 +94,111 @@ class ProgramRuleEngine {
         this.dataValues = Object.assign(Object.assign({}, (dataValues || {})), { current_date: currentDate });
         return this;
     }
-    getAssignedData(assignedDataExpression) {
-        let assignedData = assignedDataExpression || '';
-        try {
-            Object.keys(this.dataValues).forEach((key) => {
-                assignedData = assignedData.replace(new RegExp(`{${key}}`, 'g'), `'${this.dataValues[key]}'`);
-            });
-            if (assignedData.includes('d2:')) {
-                assignedData = (0, utils_1.dhisD2Functions)(assignedData, {});
+    execute(options = {}) {
+        var _a, _b, _c, _d;
+        const triggeredOnly = options.triggeredOnly !== false;
+        const dedupeByField = options.dedupeByField !== false;
+        const debug = !!options.debug;
+        const out = [];
+        const byField = new Map();
+        for (const rule of this.rules) {
+            if (!rule)
+                continue;
+            const rawCond = ((_a = rule.condition) !== null && _a !== void 0 ? _a : '').trim();
+            const preparedCond = this.prepareExpression(rawCond);
+            const evalRes = this.safeEvalBoolean(preparedCond);
+            for (const action of (_b = rule.actions) !== null && _b !== void 0 ? _b : []) {
+                if (!action)
+                    continue;
+                const triggered = evalRes.ok ? evalRes.value : false;
+                if (triggeredOnly && !triggered)
+                    continue;
+                const actionType = triggered ? (_c = action.actionType) !== null && _c !== void 0 ? _c : '' : '';
+                let assignedData = undefined;
+                if (triggered && actionType === 'ASSIGN') {
+                    const expr = this.prepareExpression(String((_d = action.assignedData) !== null && _d !== void 0 ? _d : ''));
+                    // If you want the computed VALUE, evaluate it:
+                    const valRes = this.safeEvalAny(expr);
+                    assignedData = valRes.ok ? valRes.value : undefined;
+                }
+                const result = Object.assign(Object.assign(Object.assign(Object.assign({}, action), { actionType }), (actionType === 'ASSIGN' ? { assignedData } : {})), (debug
+                    ? {
+                        __debug: {
+                            rawCondition: rawCond,
+                            preparedCondition: preparedCond,
+                            evalOk: evalRes.ok,
+                            evalError: evalRes.ok ? undefined : evalRes.error,
+                            triggered,
+                        },
+                    }
+                    : {}));
+                // dedupe by field if field exists
+                const field = action.field;
+                if (dedupeByField && field) {
+                    byField.set(field, result);
+                }
+                else {
+                    out.push(result);
+                }
             }
         }
-        catch (err) {
-            console.warn('Problem processing assigned value', err);
-            return undefined;
+        return dedupeByField ? [...byField.values()] : out;
+        // const resolvedActions = dedupeByField ? [...byField.values()] : out;
+        // return resolvedActions.filter((action) => {
+        //   const normalizedActionType = String(action.actionType ?? '').trim();
+        //   return normalizedActionType.length > 0;
+        // });
+    }
+    /** Replace {var} with safe JS literals + resolve d2: functions */
+    prepareExpression(expression) {
+        let exp = expression !== null && expression !== void 0 ? expression : '';
+        // Replace {key} placeholders
+        exp = exp.replace(/\{([^}]+)\}/g, (_m, keyRaw) => {
+            const key = String(keyRaw).trim();
+            const val = this.dataValues[key];
+            // Decide how to treat missing values:
+            // In DHIS2 rules, missing often behaves like empty string
+            if (val === undefined)
+                return "''";
+            return toJsLiteral(val);
+        });
+        // Resolve d2: functions (after placeholders are resolved)
+        if (exp.includes('d2:')) {
+            exp = (0, run_d2_expression_util_1.dhisD2Functions)(exp, {}); // your util (fix its bugs below)
         }
-        return assignedData !== 'NaN' ? assignedData : undefined;
+        return exp;
     }
-    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) => {
-                const actionType = evaluationResult ? action['actionType'] : '';
-                let assignedData;
-                if (actionType === 'ASSIGN') {
-                    assignedData = this.getAssignedData(action['assignedData']);
-                }
-                return Object.assign(Object.assign({}, action), { assignedData,
-                    actionType });
-            });
-        }));
+    safeEvalBoolean(expression) {
+        const res = this.safeEvalAny(expression);
+        return res.ok
+            ? { ok: true, value: !!res.value }
+            : { ok: false, error: res.error };
+    }
+    safeEvalAny(expression) {
+        var _a;
+        try {
+            // NOTE: still evaluates JS, but does not capture outer scope.
+            // Upgrade later to AST evaluation for full safety.
+            const fn = new Function(`"use strict"; return (${expression});`);
+            return { ok: true, value: fn() };
+        }
+        catch (e) {
+            return { ok: false, error: (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : String(e) };
+        }
     }
 }
 exports.ProgramRuleEngine = ProgramRuleEngine;
+function toJsLiteral(v) {
+    if (v === null)
+        return 'null';
+    if (v === undefined)
+        return "''";
+    if (typeof v === 'number' || typeof v === 'boolean')
+        return String(v);
+    // Date strings and normal strings → quoted & escaped
+    const s = String(v);
+    // escape backslash and single quotes
+    const escaped = s.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+    return `'${escaped}'`;
+}
 //# sourceMappingURL=program-rule.engine.js.map

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

@@ -1 +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":"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"}
+{"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,6CAA6C;AAC7C,yDAAyD;AACzD,wDAAwD;;;AAExD,oCAAoC;AACpC,6CAA6C;AAC7C,qCAAqC;AAErC,oDAAoD;AACpD,mCAAmC;AACnC,mBAAmB;AACnB,0CAA0C;AAE1C,6BAA6B;AAC7B,0BAA0B;AAC1B,mBAAmB;AACnB,MAAM;AAEN,yDAAyD;AACzD,4DAA4D;AAE5D,8EAA8E;AAC9E,mBAAmB;AACnB,MAAM;AAEN,0EAA0E;AAC1E,uDAAuD;AACvD,YAAY;AACZ,wDAAwD;AACxD,+CAA+C;AAC/C,yCAAyC;AACzC,wCAAwC;AACxC,aAAa;AACb,YAAY;AAEZ,4CAA4C;AAC5C,4DAA4D;AAC5D,UAAU;AACV,2BAA2B;AAC3B,gEAAgE;AAChE,0BAA0B;AAC1B,QAAQ;AAER,gEAAgE;AAChE,MAAM;AAEN,uBAAuB;AACvB,sBAAsB;AACtB,2CAA2C;AAC3C,uBAAuB;AACvB,uBAAuB;AACvB,YAAY;AACZ,oDAAoD;AAEpD,0DAA0D;AAC1D,mDAAmD;AACnD,2CAA2C;AAC3C,0CAA0C;AAC1C,eAAe;AACf,cAAc;AAEd,+CAA+C;AAC/C,gEAAgE;AAChE,YAAY;AAEZ,yCAAyC;AACzC,gBAAgB;AAChB,oDAAoD;AACpD,wBAAwB;AACxB,eAAe;AACf,YAAY;AAEZ,iFAAiF;AACjF,6EAA6E;AAE7E,8BAA8B;AAC9B,2CAA2C;AAC3C,mDAAmD;AACnD,iDAAiD;AACjD,iBAAiB;AACjB,cAAc;AACd,qBAAqB;AACrB,yBAAyB;AACzB,4BAA4B;AAC5B,0BAA0B;AAC1B,eAAe;AACf,cAAc;AACd,WAAW;AACX,SAAS;AACT,MAAM;AACN,IAAI;AAEJ,uCAAkC;AAClC,2EAAiE;AAwBjE,MAAa,iBAAiB;IAA9B;QACU,UAAK,GAAW,EAAE,CAAC;QACnB,eAAU,GAA4B,EAAE,CAAC;IAkInD,CAAC;IAhIC,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,UAAmC;QAC/C,MAAM,WAAW,GAAG,IAAA,iBAAM,EAAC,IAAI,IAAI,EAAE,EAAE,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,mCAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,KAAE,YAAY,EAAE,WAAW,GAAE,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,UAA0B,EAAE;;QAClC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC;QACtD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC;QACtD,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAE9B,MAAM,GAAG,GAA0B,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAC;QAEvD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI;gBAAE,SAAS;YAEpB,MAAM,OAAO,GAAG,CAAC,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAErD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YAEnD,KAAK,MAAM,MAAM,IAAI,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM;oBAAE,SAAS;gBAEtB,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBAErD,IAAI,aAAa,IAAI,CAAC,SAAS;oBAAE,SAAS;gBAE1C,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAE5D,IAAI,YAAY,GAAQ,SAAS,CAAC;gBAClC,IAAI,SAAS,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;oBACzC,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CACjC,MAAM,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,EAAE,CAAC,CAClC,CAAC;oBACF,+CAA+C;oBAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACtC,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtD,CAAC;gBAED,MAAM,MAAM,+DACP,MAAM,KACT,UAAU,KACP,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACjD,CAAC,KAAK;oBACP,CAAC,CAAC;wBACE,OAAO,EAAE;4BACP,YAAY,EAAE,OAAO;4BACrB,iBAAiB,EAAE,YAAY;4BAC/B,MAAM,EAAE,OAAO,CAAC,EAAE;4BAClB,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;4BACjD,SAAS;yBACV;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC,CACR,CAAC;gBAEF,kCAAkC;gBAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC3B,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;oBAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC7B,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAEnD,uEAAuE;QAEvE,8CAA8C;QAC9C,yEAAyE;QACzE,4CAA4C;QAC5C,MAAM;IACR,CAAC;IAED,kEAAkE;IAC1D,iBAAiB,CAAC,UAAkB;QAC1C,IAAI,GAAG,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;QAE3B,6BAA6B;QAC7B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;YAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,GAAG,GAAI,IAAI,CAAC,UAAkB,CAAC,GAAG,CAAC,CAAC;YAE1C,sCAAsC;YACtC,0DAA0D;YAC1D,IAAI,GAAG,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YAEnC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,0DAA0D;QAC1D,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,GAAG,GAAG,IAAA,wCAAe,EAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,iCAAiC;QACnE,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,eAAe,CACrB,UAAkB;QAElB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC,EAAE;YACX,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE;YAClC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC;IACtC,CAAC;IAEO,WAAW,CACjB,UAAkB;;QAElB,IAAI,CAAC;YACH,8DAA8D;YAC9D,mDAAmD;YACnD,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,yBAAyB,UAAU,IAAI,CAAC,CAAC;YACjE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,mCAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,CAAC;IACH,CAAC;CACF;AApID,8CAoIC;AAED,SAAS,WAAW,CAAC,CAAU;IAC7B,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAC9B,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IAEtE,qDAAqD;IACrD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpB,qCAAqC;IACrC,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC9D,OAAO,IAAI,OAAO,GAAG,CAAC;AACxB,CAAC"}

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

@@ -2,6 +2,10 @@ export declare const d2FuctionsVariables: Array<{
     name: string;
     parameters?: number;
 }>;
-export declare const d2FunctionsEval: {
-    [x: string]: Function;
+type D2EvalResult = {
+    expression: string;
+    expressionUpdated: boolean;
 };
+type D2EvalFn = (expression: string, parameters: string[], variableHash: Record<string, any>, regexFunct: string) => D2EvalResult;
+export declare const d2FunctionsEval: Record<string, D2EvalFn>;
+export {};