@j2inn/resolvable-ui-elements 1.0.2-alpha.0 → 1.0.2-beta.0

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export { type FunctionResult } from './resolvableElements/elements/function/Func
 export { type ResolvableValueElementMeta } from './resolvableElements/elements/ResolvableValueElement';
 export { isSectionData, type ParametersOfSection, type ResolvedSection, } from './resolvableElements/elements/section/SectionElementMeta';
 export { type UiElementData } from './resolvableElements/elements/UiElement';
+export { resolveTemplateExpression } from './resolvableElements/resolveTemplatedExpression';
 export * from './resolvableElements/react/SectionChecker';
 export * from './resolvableElements/react/useResolverContext';
 export * from './resolvableElements/react/useResolveSection';

package/dist/index.js

@@ -17,9 +17,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSectionData = void 0;
+exports.resolveTemplateExpression = exports.isSectionData = void 0;
 var SectionElementMeta_1 = require("./resolvableElements/elements/section/SectionElementMeta");
 Object.defineProperty(exports, "isSectionData", { enumerable: true, get: function () { return SectionElementMeta_1.isSectionData; } });
+var resolveTemplatedExpression_1 = require("./resolvableElements/resolveTemplatedExpression");
+Object.defineProperty(exports, "resolveTemplateExpression", { enumerable: true, get: function () { return resolveTemplatedExpression_1.resolveTemplateExpression; } });
 //////////////////////////////////////////////////////////////////////////
 // React
 //////////////////////////////////////////////////////////////////////////

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;AAOH,+FAIiE;AAHhE,mHAAA,aAAa,OAAA;AAKd,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,4EAAyD;AACzD,gFAA6D;AAC7D,+EAA4D;AAC5D,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,mDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;AAOH,+FAIiE;AAHhE,mHAAA,aAAa,OAAA;AAKd,8FAA2F;AAAlF,uIAAA,yBAAyB,OAAA;AAClC,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,4EAAyD;AACzD,gFAA6D;AAC7D,+EAA4D;AAC5D,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,mDAAgC"}

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

@@ -1,5 +1,4 @@
 import { HDict } from 'haystack-core';
-import { Watch } from 'haystack-nclient';
 import { ResolvableValueElement } from '../ResolvableValueElement';
 import { UiElementConstructorData, UiElementData } from '../UiElement';
 /**
@@ -10,8 +9,6 @@ export declare class ResolvableExprElement<T extends UiElementData> extends Reso
     static collectionTypes: Set<string>;
     constructor(data: UiElementConstructorData<T>);
     refreshes: number;
-    watch?: Watch;
-    resolvedExpression?: string;
     protected doInitialize: (parameters: HDict) => Promise<void>;
     /**
      * Checks whether the declared resolvedType of this element is a collection.

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

@@ -7,7 +7,6 @@ exports.ResolvableExprElement = void 0;
 const haystack_core_1 = require("haystack-core");
 const haystack_units_1 = require("haystack-units");
 const resolveTemplatedExpression_1 = require("../../resolveTemplatedExpression");
-const haystack_nclient_1 = require("haystack-nclient");
 const ResolvableValueElement_1 = require("../ResolvableValueElement");
 /**
  * Resolves to the result of an expression.
@@ -19,41 +18,17 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
     }
     refreshes = 0;
     #timeout;
-    watch;
-    resolvedExpression;
     doInitialize = async (parameters) => {
         await this.#updateValue(parameters);
-        // Setup watch if we're expecting a grid or dict result containing a record id.
-        if (this.isExpectedResultACollection()) {
-            let grid;
-            if ((0, haystack_core_1.valueIsKind)(this.value, haystack_core_1.Kind.Grid)) {
-                grid = this.value;
-            }
-            else if ((0, haystack_core_1.valueIsKind)(this.value, haystack_core_1.Kind.Dict)) {
-                grid = haystack_core_1.HGrid.make(this.value);
-            }
-            if (grid && grid.hasColumn('id')) {
-                await this.#setupWatch(grid);
-            }
-        }
     };
     #updateValue = async (parameters) => {
         const { expr, refreshAfter } = this._meta;
-        this.resolvedExpression = (0, resolveTemplatedExpression_1.resolveTemplateExpression)(expr, parameters);
-        const grid = await this.resolver.eval(this.resolvedExpression);
+        const resolvedExpression = (0, resolveTemplatedExpression_1.resolveTemplateExpression)(expr, parameters);
+        const grid = await this.resolver.eval(resolvedExpression);
         if (grid.isError()) {
-            console.error('Empty grid result for expression: \n', this.resolvedExpression, grid.getError());
+            console.error('Empty grid result for expression: \n', resolvedExpression, grid.getError());
             return;
         }
-        this.#setValue(grid);
-        if (refreshAfter) {
-            this.#timeout = setTimeout(() => {
-                this.refreshes++;
-                this.#updateValue(parameters);
-            }, haystack_core_1.HNum.make(refreshAfter, haystack_units_1.second).convertTo(haystack_units_1.millisecond).value);
-        }
-    };
-    #setValue(grid) {
         const val = grid[0]?.get('val');
         // 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.
@@ -64,7 +39,13 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
         else {
             this.value = grid;
         }
-    }
+        if (refreshAfter) {
+            this.#timeout = setTimeout(() => {
+                this.refreshes++;
+                this.#updateValue(parameters);
+            }, haystack_core_1.HNum.make(refreshAfter, haystack_units_1.second).convertTo(haystack_units_1.millisecond).value);
+        }
+    };
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
@@ -78,7 +59,6 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
         if (this.#timeout) {
             clearTimeout(this.#timeout);
         }
-        return this.watch?.close();
     };
     getParameterList = () => {
         const { expr } = this._meta;
@@ -91,30 +71,6 @@ class ResolvableExprElement extends ResolvableValueElement_1.ResolvableValueElem
         }
         return parameters;
     };
-    #setupWatch = async (grid) => {
-        const { subscribePollRate, subscribe } = this
-            ._meta;
-        if (subscribe) {
-            this.watch = await this.resolver.makeWatch(this.#getWatchDisplayName(), grid);
-            const updateValue = () => {
-                if (this.watch?.grid) {
-                    this.#setValue(this.watch?.grid);
-                }
-            };
-            // Update with the value received when opening the watch
-            updateValue();
-            // Configure polling options
-            this.watch.pollRate = subscribePollRate ?? haystack_nclient_1.DEFAULT_POLL_RATE_SECS;
-            this.watch.changed({
-                callback: updateValue,
-            });
-        }
-    };
-    #getWatchDisplayName = () => {
-        return `ResolvableElement Watch for ${this.name ??
-            this.resolvedExpression ??
-            this._meta.expr}`;
-    };
 }
 exports.ResolvableExprElement = ResolvableExprElement;
 //# sourceMappingURL=ResolvableExprElement.js.map

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":"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"}
+{"version":3,"file":"ResolvableExprElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElement.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iDAA2C;AAC3C,mDAAoD;AACpD,iFAGyC;AAEzC,sEAAkE;AAIlE;;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,GAAG,IAAI,CAAC,KAAkC,CAAA;QAEtE,MAAM,kBAAkB,GAAG,IAAA,sDAAyB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAEtE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAEzD,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YACnB,OAAO,CAAC,KAAK,CACZ,sCAAsC,EACtC,kBAAkB,EAClB,IAAI,CAAC,QAAQ,EAAE,CACf,CAAA;YACD,OAAM;SACN;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAE/B,iEAAiE;QACjE,8FAA8F;QAC9F,MAAM,kBAAkB,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,IAAI,GAAG,CAAA;QACrE,IAAI,kBAAkB,EAAE;YACvB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAA;SAChB;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;;AAnFF,sDAoFC"}

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

@@ -4,8 +4,6 @@ export interface ResolvableExprElementMeta extends ResolvableValueElementMeta {
     resolutionType: 'expr';
     expr: string;
     refreshAfter: number;
-    subscribe?: boolean;
-    subscribePollRate?: number;
 }
 export declare const isResolvableExprElementData: (element: UiElementData) => element is UiElementData<ResolvableExprElementMeta>;
 export declare const isResolvableExprElementMeta: (meta: UiElementMeta) => meta is ResolvableExprElementMeta;

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

@@ -1 +1 @@
-{"version":3,"file":"ResolvableExprElementMeta.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElementMeta.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAaI,MAAM,2BAA2B,GAAG,CAC1C,OAAsB,EACgC,EAAE;IACxD,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,IAAA,mCAA2B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAJY,QAAA,2BAA2B,+BAIvC;AAEM,MAAM,2BAA2B,GAAG,CAC1C,IAAmB,EACiB,EAAE;IACtC,OAAQ,IAAkC,CAAC,cAAc,KAAK,MAAM,CAAA;AACrE,CAAC,CAAA;AAJY,QAAA,2BAA2B,+BAIvC"}
+{"version":3,"file":"ResolvableExprElementMeta.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElementMeta.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAWI,MAAM,2BAA2B,GAAG,CAC1C,OAAsB,EACgC,EAAE;IACxD,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,IAAA,mCAA2B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAJY,QAAA,2BAA2B,+BAIvC;AAEM,MAAM,2BAA2B,GAAG,CAC1C,IAAmB,EACiB,EAAE;IACtC,OAAQ,IAAkC,CAAC,cAAc,KAAK,MAAM,CAAA;AACrE,CAAC,CAAA;AAJY,QAAA,2BAA2B,+BAIvC"}

package/dist_es/index.d.ts

@@ -2,6 +2,7 @@ export { type FunctionResult } from './resolvableElements/elements/function/Func
 export { type ResolvableValueElementMeta } from './resolvableElements/elements/ResolvableValueElement';
 export { isSectionData, type ParametersOfSection, type ResolvedSection, } from './resolvableElements/elements/section/SectionElementMeta';
 export { type UiElementData } from './resolvableElements/elements/UiElement';
+export { resolveTemplateExpression } from './resolvableElements/resolveTemplatedExpression';
 export * from './resolvableElements/react/SectionChecker';
 export * from './resolvableElements/react/useResolverContext';
 export * from './resolvableElements/react/useResolveSection';

package/dist_es/index.js

@@ -2,6 +2,7 @@
  * Copyright (c) 2022, J2 Innovations. All Rights Reserved
  */
 export { isSectionData, } from './resolvableElements/elements/section/SectionElementMeta';
+export { resolveTemplateExpression } from './resolvableElements/resolveTemplatedExpression';
 //////////////////////////////////////////////////////////////////////////
 // React
 //////////////////////////////////////////////////////////////////////////

package/dist_es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACN,aAAa,GAGb,MAAM,0DAA0D,CAAA;AAEjE,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,cAAc,2CAA2C,CAAA;AACzD,cAAc,+CAA+C,CAAA;AAC7D,cAAc,8CAA8C,CAAA;AAC5D,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACN,aAAa,GAGb,MAAM,0DAA0D,CAAA;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAA;AAC3F,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,cAAc,2CAA2C,CAAA;AACzD,cAAc,+CAA+C,CAAA;AAC7D,cAAc,8CAA8C,CAAA;AAC5D,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,cAAc,kBAAkB,CAAA"}

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

@@ -1,5 +1,4 @@
 import { HDict } from 'haystack-core';
-import { Watch } from 'haystack-nclient';
 import { ResolvableValueElement } from '../ResolvableValueElement';
 import { UiElementConstructorData, UiElementData } from '../UiElement';
 /**
@@ -10,8 +9,6 @@ export declare class ResolvableExprElement<T extends UiElementData> extends Reso
     static collectionTypes: Set<string>;
     constructor(data: UiElementConstructorData<T>);
     refreshes: number;
-    watch?: Watch;
-    resolvedExpression?: string;
     protected doInitialize: (parameters: HDict) => Promise<void>;
     /**
      * Checks whether the declared resolvedType of this element is a collection.

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

@@ -1,10 +1,9 @@
 /*
  * Copyright (c) 2022, J2 Innovations. All Rights Reserved
  */
-import { HGrid, HNum, Kind, valueIsKind } from 'haystack-core';
+import { HNum } from 'haystack-core';
 import { millisecond, second } from 'haystack-units';
 import { replaceTemplateVariables, resolveTemplateExpression, } from '../../resolveTemplatedExpression';
-import { DEFAULT_POLL_RATE_SECS } from 'haystack-nclient';
 import { ResolvableValueElement } from '../ResolvableValueElement';
 /**
  * Resolves to the result of an expression.
@@ -16,41 +15,17 @@ export class ResolvableExprElement extends ResolvableValueElement {
     }
     refreshes = 0;
     #timeout;
-    watch;
-    resolvedExpression;
     doInitialize = async (parameters) => {
         await this.#updateValue(parameters);
-        // Setup watch if we're expecting a grid or dict result containing a record id.
-        if (this.isExpectedResultACollection()) {
-            let grid;
-            if (valueIsKind(this.value, Kind.Grid)) {
-                grid = this.value;
-            }
-            else if (valueIsKind(this.value, Kind.Dict)) {
-                grid = HGrid.make(this.value);
-            }
-            if (grid && grid.hasColumn('id')) {
-                await this.#setupWatch(grid);
-            }
-        }
     };
     #updateValue = async (parameters) => {
         const { expr, refreshAfter } = this._meta;
-        this.resolvedExpression = resolveTemplateExpression(expr, parameters);
-        const grid = await this.resolver.eval(this.resolvedExpression);
+        const resolvedExpression = resolveTemplateExpression(expr, parameters);
+        const grid = await this.resolver.eval(resolvedExpression);
         if (grid.isError()) {
-            console.error('Empty grid result for expression: \n', this.resolvedExpression, grid.getError());
+            console.error('Empty grid result for expression: \n', resolvedExpression, grid.getError());
             return;
         }
-        this.#setValue(grid);
-        if (refreshAfter) {
-            this.#timeout = setTimeout(() => {
-                this.refreshes++;
-                this.#updateValue(parameters);
-            }, HNum.make(refreshAfter, second).convertTo(millisecond).value);
-        }
-    };
-    #setValue(grid) {
         const val = grid[0]?.get('val');
         // 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.
@@ -61,7 +36,13 @@ export class ResolvableExprElement extends ResolvableValueElement {
         else {
             this.value = grid;
         }
-    }
+        if (refreshAfter) {
+            this.#timeout = setTimeout(() => {
+                this.refreshes++;
+                this.#updateValue(parameters);
+            }, HNum.make(refreshAfter, second).convertTo(millisecond).value);
+        }
+    };
     /**
      * Checks whether the declared resolvedType of this element is a collection.
      * @returns true if the resolvedType is a collection.
@@ -75,7 +56,6 @@ export class ResolvableExprElement extends ResolvableValueElement {
         if (this.#timeout) {
             clearTimeout(this.#timeout);
         }
-        return this.watch?.close();
     };
     getParameterList = () => {
         const { expr } = this._meta;
@@ -88,29 +68,5 @@ export class ResolvableExprElement extends ResolvableValueElement {
         }
         return parameters;
     };
-    #setupWatch = async (grid) => {
-        const { subscribePollRate, subscribe } = this
-            ._meta;
-        if (subscribe) {
-            this.watch = await this.resolver.makeWatch(this.#getWatchDisplayName(), grid);
-            const updateValue = () => {
-                if (this.watch?.grid) {
-                    this.#setValue(this.watch?.grid);
-                }
-            };
-            // Update with the value received when opening the watch
-            updateValue();
-            // Configure polling options
-            this.watch.pollRate = subscribePollRate ?? DEFAULT_POLL_RATE_SECS;
-            this.watch.changed({
-                callback: updateValue,
-            });
-        }
-    };
-    #getWatchDisplayName = () => {
-        return `ResolvableElement Watch for ${this.name ??
-            this.resolvedExpression ??
-            this._meta.expr}`;
-    };
 }
 //# sourceMappingURL=ResolvableExprElement.js.map

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":"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"}
+{"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/ResolvableExprElementMeta.d.ts

@@ -4,8 +4,6 @@ export interface ResolvableExprElementMeta extends ResolvableValueElementMeta {
     resolutionType: 'expr';
     expr: string;
     refreshAfter: number;
-    subscribe?: boolean;
-    subscribePollRate?: number;
 }
 export declare const isResolvableExprElementData: (element: UiElementData) => element is UiElementData<ResolvableExprElementMeta>;
 export declare const isResolvableExprElementMeta: (meta: UiElementMeta) => meta is ResolvableExprElementMeta;

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

@@ -1 +1 @@
-{"version":3,"file":"ResolvableExprElementMeta.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElementMeta.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,OAAsB,EACgC,EAAE;IACxD,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,IAAmB,EACiB,EAAE;IACtC,OAAQ,IAAkC,CAAC,cAAc,KAAK,MAAM,CAAA;AACrE,CAAC,CAAA"}
+{"version":3,"file":"ResolvableExprElementMeta.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/expr/ResolvableExprElementMeta.ts"],"names":[],"mappings":"AAAA;;GAEG;AAWH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,OAAsB,EACgC,EAAE;IACxD,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,IAAmB,EACiB,EAAE;IACtC,OAAQ,IAAkC,CAAC,cAAc,KAAK,MAAM,CAAA;AACrE,CAAC,CAAA"}

package/package.json

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