@j2inn/resolvable-ui-elements 1.0.5 → 1.1.0

package/dist/resolvableElements/elements/expr/ResolvableExprElement.d.ts

@@ -1,20 +1,26 @@
 import { HDict } from 'haystack-core';
 import { ResolvableValueElement } from '../ResolvableValueElement';
 import { UiElementConstructorData, UiElementData } from '../UiElement';
+import { ResolvableExprElementMeta } from './ResolvableExprElementMeta';
 /**
  * Resolves to the result of an expression.
  */
 export declare class ResolvableExprElement<T extends UiElementData> extends ResolvableValueElement<T> {
     #private;
-    static collectionTypes: Set<string>;
     constructor(data: UiElementConstructorData<T>);
     refreshes: number;
+    protected getMeta: () => ResolvableExprElementMeta;
     protected doInitialize: (parameters: HDict) => Promise<void>;
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
      */
     isExpectedResultACollection: () => boolean;
+    /**
+     * Checks whether the declared resolvedType of this element is a single value.
+     * @returns true if the resolvedType is a value.
+     */
+    isExpectedResultVal: () => boolean;
     protected doClose: () => Promise<void>;
     getParameterList: () => string[];
 }

package/dist/resolvableElements/elements/expr/ResolvableExprElement.js

@@ -13,29 +13,15 @@ const GRID_VAL_COLUMN_NAME = 'val';
  * Resolves to the result of an expression.
  */
 class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElement {
-    static collectionTypes = new Set(['HGrid', 'HList']);
     constructor(data) {
         super(data);
     }
     refreshes = 0;
     #timeout;
+    getMeta = () => this._meta;
     doInitialize = async (parameters) => {
+        const { refreshAfter } = this.getMeta();
         await this.#updateValue(parameters);
-    };
-    #updateValue = async (parameters) => {
-        const { expr, refreshAfter, path } = this
-            ._meta;
-        const grid = await this.resolver.evalExprElement(expr, parameters, path);
-        // Identify when it's necessary to unpack the result `val` or not
-        // since the eval wraps the result value in a grid's first dict `val` tag for non-collections.
-        const shouldUnpackResult = !this.isExpectedResultACollection() &&
-            grid.hasColumn(GRID_VAL_COLUMN_NAME);
-        if (shouldUnpackResult) {
-            this.value = grid[0]?.get(GRID_VAL_COLUMN_NAME);
-        }
-        else {
-            this.value = grid;
-        }
         if (refreshAfter) {
             this.#timeout = setTimeout(() => {
                 this.refreshes++;
@@ -43,14 +29,57 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
             }, haystack_core_1.HNum.make(refreshAfter, haystack_units_1.second).convertTo(haystack_units_1.millisecond).value);
         }
     };
+    #updateValue = async (parameters) => {
+        const { expr, path } = this.getMeta();
+        const grid = await this.resolver.evalExprElement(expr, parameters, path);
+        this.value = this.#unpackResult(grid);
+    };
+    /**
+     * Unpacks grid if expected `resolvedType` result requires it.
+     * @param grid result grid
+     * @returns unpacked value
+     */
+    #unpackResult = (grid) => {
+        // Identify when it's necessary to unpack the result from `val` column or not
+        if (this.isExpectedResultACollection()) {
+            if (!grid.hasColumn(GRID_VAL_COLUMN_NAME)) {
+                this.#logValColumnNotFound(grid);
+            }
+            // Unpack val column into array
+            return grid.map((row) => row.get(GRID_VAL_COLUMN_NAME));
+        }
+        else if (this.isExpectedResultVal()) {
+            if (!grid.hasColumn(GRID_VAL_COLUMN_NAME)) {
+                this.#logValColumnNotFound(grid);
+            }
+            // Unpack first dict val column into value
+            return grid[0]?.get(GRID_VAL_COLUMN_NAME);
+        }
+        else {
+            // Default to using the grid response as it is
+            return grid;
+        }
+    };
+    #logValColumnNotFound = (grid) => {
+        const { expr } = this.getMeta();
+        console.warn(`expected "${GRID_VAL_COLUMN_NAME}" column on expr result not found`, expr, grid);
+        grid.inspect();
+    };
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
      */
     isExpectedResultACollection = () => {
-        const { resolvedType } = this._meta;
-        return (ResolvableExprElement.collectionTypes.has(resolvedType) ||
-            resolvedType.endsWith('[]'));
+        const { resolvedType } = this.getMeta();
+        return resolvedType.endsWith('[]');
+    };
+    /**
+     * Checks whether the declared resolvedType of this element is a single value.
+     * @returns true if the resolvedType is a value.
+     */
+    isExpectedResultVal = () => {
+        const { resolvedType } = this.getMeta();
+        return resolvedType !== 'HGrid' && !this.isExpectedResultACollection();
     };
     doClose = async () => {
         if (this.#timeout) {
@@ -58,7 +87,7 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
         }
     };
     getParameterList = () => {
-        const { expr } = this._meta;
+        const { expr } = this.getMeta();
         const parameters = [];
         if (expr) {
             (0, resolveTemplatedExpression_1.replaceTemplateVariables)(expr, (_, match) => {

package/dist/resolvableElements/elements/expr/ResolvableExprElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResolvableExprElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElement.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iDAA2C;AAC3C,mDAAoD;AACpD,iFAA2E;AAE3E,sEAAkE;AAIlE,MAAM,oBAAoB,GAAG,KAAK,CAAA;AAElC;;GAEG;AACH,MAAa,qBAEX,SAAQ,+CAAyB;IAClC,MAAM,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAEpD,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;IACZ,CAAC;IAED,SAAS,GAAG,CAAC,CAAA;IACb,QAAQ,CAAS;IAEP,YAAY,GAAG,KAAK,EAAE,UAAiB,EAAiB,EAAE;QACnE,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,YAAY,GAAG,KAAK,EAAE,UAAiB,EAAiB,EAAE;QACzD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI;aACvC,KAAkC,CAAA;QAEpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QAExE,iEAAiE;QACjE,8FAA8F;QAC9F,MAAM,kBAAkB,GACvB,CAAC,IAAI,CAAC,2BAA2B,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QACrC,IAAI,kBAAkB,EAAE;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;SAC/C;aAAM;YACN,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;SACjB;QAED,IAAI,YAAY,EAAE;YACjB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,SAAS,EAAE,CAAA;gBAChB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,oBAAI,CAAC,IAAI,CAAC,YAAY,EAAE,uBAAM,CAAC,CAAC,SAAS,CAAC,4BAAW,CAAC,CAAC,KAAK,CAAsB,CAAA;SACrF;IACF,CAAC,CAAA;IAED;;;OAGG;IACH,2BAA2B,GAAG,GAAY,EAAE;QAC3C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAkC,CAAA;QAEhE,OAAO,CACN,qBAAqB,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC;YACvD,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC3B,CAAA;IACF,CAAC,CAAA;IAES,OAAO,GAAG,KAAK,IAAmB,EAAE;QAC7C,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAC3B;IACF,CAAC,CAAA;IAED,gBAAgB,GAAmB,GAAG,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAkC,CAAA;QAExD,MAAM,UAAU,GAAa,EAAE,CAAA;QAE/B,IAAI,IAAI,EAAE;YACT,IAAA,qDAAwB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC3C,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACtB,OAAO,EAAE,CAAA;YACV,CAAC,CAAC,CAAA;SACF;QAED,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA;;AAzEF,sDA0EC"}
+{"version":3,"file":"ResolvableExprElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElement.ts"],"names":[],"mappings":"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"}

package/dist_es/resolvableElements/elements/expr/ResolvableExprElement.d.ts

@@ -1,20 +1,26 @@
 import { HDict } from 'haystack-core';
 import { ResolvableValueElement } from '../ResolvableValueElement';
 import { UiElementConstructorData, UiElementData } from '../UiElement';
+import { ResolvableExprElementMeta } from './ResolvableExprElementMeta';
 /**
  * Resolves to the result of an expression.
  */
 export declare class ResolvableExprElement<T extends UiElementData> extends ResolvableValueElement<T> {
     #private;
-    static collectionTypes: Set<string>;
     constructor(data: UiElementConstructorData<T>);
     refreshes: number;
+    protected getMeta: () => ResolvableExprElementMeta;
     protected doInitialize: (parameters: HDict) => Promise<void>;
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
      */
     isExpectedResultACollection: () => boolean;
+    /**
+     * Checks whether the declared resolvedType of this element is a single value.
+     * @returns true if the resolvedType is a value.
+     */
+    isExpectedResultVal: () => boolean;
     protected doClose: () => Promise<void>;
     getParameterList: () => string[];
 }

package/dist_es/resolvableElements/elements/expr/ResolvableExprElement.js

@@ -10,29 +10,15 @@ const GRID_VAL_COLUMN_NAME = 'val';
  * Resolves to the result of an expression.
  */
 export class ResolvableExprElement extends ResolvableValueElement {
-    static collectionTypes = new Set(['HGrid', 'HList']);
     constructor(data) {
         super(data);
     }
     refreshes = 0;
     #timeout;
+    getMeta = () => this._meta;
     doInitialize = async (parameters) => {
+        const { refreshAfter } = this.getMeta();
         await this.#updateValue(parameters);
-    };
-    #updateValue = async (parameters) => {
-        const { expr, refreshAfter, path } = this
-            ._meta;
-        const grid = await this.resolver.evalExprElement(expr, parameters, path);
-        // Identify when it's necessary to unpack the result `val` or not
-        // since the eval wraps the result value in a grid's first dict `val` tag for non-collections.
-        const shouldUnpackResult = !this.isExpectedResultACollection() &&
-            grid.hasColumn(GRID_VAL_COLUMN_NAME);
-        if (shouldUnpackResult) {
-            this.value = grid[0]?.get(GRID_VAL_COLUMN_NAME);
-        }
-        else {
-            this.value = grid;
-        }
         if (refreshAfter) {
             this.#timeout = setTimeout(() => {
                 this.refreshes++;
@@ -40,14 +26,57 @@ export class ResolvableExprElement extends ResolvableValueElement {
             }, HNum.make(refreshAfter, second).convertTo(millisecond).value);
         }
     };
+    #updateValue = async (parameters) => {
+        const { expr, path } = this.getMeta();
+        const grid = await this.resolver.evalExprElement(expr, parameters, path);
+        this.value = this.#unpackResult(grid);
+    };
+    /**
+     * Unpacks grid if expected `resolvedType` result requires it.
+     * @param grid result grid
+     * @returns unpacked value
+     */
+    #unpackResult = (grid) => {
+        // Identify when it's necessary to unpack the result from `val` column or not
+        if (this.isExpectedResultACollection()) {
+            if (!grid.hasColumn(GRID_VAL_COLUMN_NAME)) {
+                this.#logValColumnNotFound(grid);
+            }
+            // Unpack val column into array
+            return grid.map((row) => row.get(GRID_VAL_COLUMN_NAME));
+        }
+        else if (this.isExpectedResultVal()) {
+            if (!grid.hasColumn(GRID_VAL_COLUMN_NAME)) {
+                this.#logValColumnNotFound(grid);
+            }
+            // Unpack first dict val column into value
+            return grid[0]?.get(GRID_VAL_COLUMN_NAME);
+        }
+        else {
+            // Default to using the grid response as it is
+            return grid;
+        }
+    };
+    #logValColumnNotFound = (grid) => {
+        const { expr } = this.getMeta();
+        console.warn(`expected "${GRID_VAL_COLUMN_NAME}" column on expr result not found`, expr, grid);
+        grid.inspect();
+    };
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
      */
     isExpectedResultACollection = () => {
-        const { resolvedType } = this._meta;
-        return (ResolvableExprElement.collectionTypes.has(resolvedType) ||
-            resolvedType.endsWith('[]'));
+        const { resolvedType } = this.getMeta();
+        return resolvedType.endsWith('[]');
+    };
+    /**
+     * Checks whether the declared resolvedType of this element is a single value.
+     * @returns true if the resolvedType is a value.
+     */
+    isExpectedResultVal = () => {
+        const { resolvedType } = this.getMeta();
+        return resolvedType !== 'HGrid' && !this.isExpectedResultACollection();
     };
     doClose = async () => {
         if (this.#timeout) {
@@ -55,7 +84,7 @@ export class ResolvableExprElement extends ResolvableValueElement {
         }
     };
     getParameterList = () => {
-        const { expr } = this._meta;
+        const { expr } = this.getMeta();
         const parameters = [];
         if (expr) {
             replaceTemplateVariables(expr, (_, match) => {

package/dist_es/resolvableElements/elements/expr/ResolvableExprElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResolvableExprElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElement.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAS,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAA;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAIlE,MAAM,oBAAoB,GAAG,KAAK,CAAA;AAElC;;GAEG;AACH,MAAM,OAAO,qBAEX,SAAQ,sBAAyB;IAClC,MAAM,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAEpD,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;IACZ,CAAC;IAED,SAAS,GAAG,CAAC,CAAA;IACb,QAAQ,CAAS;IAEP,YAAY,GAAG,KAAK,EAAE,UAAiB,EAAiB,EAAE;QACnE,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,YAAY,GAAG,KAAK,EAAE,UAAiB,EAAiB,EAAE;QACzD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI;aACvC,KAAkC,CAAA;QAEpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QAExE,iEAAiE;QACjE,8FAA8F;QAC9F,MAAM,kBAAkB,GACvB,CAAC,IAAI,CAAC,2BAA2B,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QACrC,IAAI,kBAAkB,EAAE;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;SAC/C;aAAM;YACN,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;SACjB;QAED,IAAI,YAAY,EAAE;YACjB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,SAAS,EAAE,CAAA;gBAChB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAC9B,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,KAAK,CAAsB,CAAA;SACrF;IACF,CAAC,CAAA;IAED;;;OAGG;IACH,2BAA2B,GAAG,GAAY,EAAE;QAC3C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAkC,CAAA;QAEhE,OAAO,CACN,qBAAqB,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC;YACvD,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC3B,CAAA;IACF,CAAC,CAAA;IAES,OAAO,GAAG,KAAK,IAAmB,EAAE;QAC7C,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAC3B;IACF,CAAC,CAAA;IAED,gBAAgB,GAAmB,GAAG,EAAE;QACvC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAkC,CAAA;QAExD,MAAM,UAAU,GAAa,EAAE,CAAA;QAE/B,IAAI,IAAI,EAAE;YACT,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC3C,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACtB,OAAO,EAAE,CAAA;YACV,CAAC,CAAC,CAAA;SACF;QAED,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA"}
+{"version":3,"file":"ResolvableExprElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElement.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@j2inn/resolvable-ui-elements",
-	"version": "1.0.5",
+	"version": "1.1.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",