@j2inn/resolvable-ui-elements 0.0.3 → 1.0.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { type FunctionResult } from './resolvableElements/elements/function/FunctionElement';
+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 * from './resolvableElements/react/SectionChecker';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;AAMH,+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,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,4EAAyD;AACzD,gFAA6D;AAC7D,+EAA4D;AAC5D,0EAA0E;AAC1E,QAAQ;AACR,0EAA0E;AAC1E,mDAAgC"}

package/dist/resolvableElements/elements/function/FunctionElement.d.ts

@@ -7,6 +7,6 @@ export declare class FunctionElement<T extends UiElementData> extends UiElement<
     #private;
     constructor(data: UiElementConstructorData<T>);
 }
-export declare type FunctionResult = (parameters: Parameters) => Promise<HGrid>;
-export declare type Parameters = Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined;
+export type FunctionResult = (parameters: Parameters) => Promise<HGrid>;
+export type Parameters = Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined;
 export declare const makeParametersDict: (parameters: Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined) => HDict;

package/dist/resolvableElements/elements/function/FunctionElement.js

@@ -21,7 +21,12 @@ class FunctionElement extends UiElement_1.UiElement {
         const { expr } = this._meta;
         return async (parameters) => {
             const resolvedExpression = (0, resolveTemplatedExpression_1.resolveTemplateExpression)(expr, (0, exports.makeParametersDict)(parameters));
-            return await this.resolver.eval(resolvedExpression);
+            const result = await this.resolver.eval(resolvedExpression);
+            // Update watch records
+            if (!result.isError()) {
+                this.resolver.client.ops.watch.update(result.filter('id and mod'));
+            }
+            return result;
         };
     };
 }

package/dist/resolvableElements/elements/function/FunctionElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/function/FunctionElement.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iDAAgF;AAChF,iFAA4E;AAE5E,4CAIqB;AAGrB;;GAEG;AACH,MAAa,eAAyC,SAAQ,qBAAY;IACzE,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACrC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;SAClC;IACF,CAAC;IAED,cAAc,GAAG,GAAmB,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAA4B,CAAA;QAElD,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE;YAC3B,MAAM,kBAAkB,GAAG,IAAA,sDAAyB,EACnD,IAAI,EACJ,IAAA,0BAAkB,EAAC,UAAU,CAAC,CAC9B,CAAA;YAED,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QACpD,CAAC,CAAA;IACF,CAAC,CAAA;CACD;AApBD,0CAoBC;AAUM,MAAM,kBAAkB,GAAG,CACjC,UAIY,EACJ,EAAE;IACV,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,qBAAK,CAAC,IAAI,EAAE,CAAA;KACnB;IACD,IAAI,UAAU,YAAY,qBAAK,EAAE;QAChC,OAAO,UAAU,CAAA;KACjB;IAED,OAAO,qBAAK,CAAC,IAAI,CAChB,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CACvD,CACD,CAAA;AACF,CAAC,CAAA;AAnBY,QAAA,kBAAkB,sBAmB9B"}
+{"version":3,"file":"FunctionElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/function/FunctionElement.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,iDAAgF;AAChF,iFAA4E;AAE5E,4CAIqB;AAGrB;;GAEG;AACH,MAAa,eAAyC,SAAQ,qBAAY;IACzE,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACrC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;SAClC;IACF,CAAC;IAED,cAAc,GAAG,GAAmB,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAA4B,CAAA;QAElD,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE;YAC3B,MAAM,kBAAkB,GAAG,IAAA,sDAAyB,EACnD,IAAI,EACJ,IAAA,0BAAkB,EAAC,UAAU,CAAC,CAC9B,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAE3D,uBAAuB;YACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CACpC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,CAAA;aACD;YAED,OAAO,MAAM,CAAA;QACd,CAAC,CAAA;IACF,CAAC,CAAA;CACD;AA7BD,0CA6BC;AAUM,MAAM,kBAAkB,GAAG,CACjC,UAIY,EACJ,EAAE;IACV,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,qBAAK,CAAC,IAAI,EAAE,CAAA;KACnB;IACD,IAAI,UAAU,YAAY,qBAAK,EAAE;QAChC,OAAO,UAAU,CAAA;KACjB;IAED,OAAO,qBAAK,CAAC,IAAI,CAChB,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CACvD,CACD,CAAA;AACF,CAAC,CAAA;AAnBY,QAAA,kBAAkB,sBAmB9B"}

package/dist/resolvableElements/elements/section/ResolvableSectionElement.d.ts

@@ -18,7 +18,7 @@ export declare class ResolvableSectionElement<T extends UiElementData<UiElementS
     getParameterList: () => string[];
 }
 export declare const isChildUnresolvedSection: (value: unknown) => value is ChildUnresolvedSection;
-export declare type ChildUnresolvedSection = [
+export type ChildUnresolvedSection = [
     string | undefined,
     UiElementData<UiElementSectionMeta>
 ];

package/dist/resolvableElements/elements/section/SectionElementMeta.d.ts

@@ -3,13 +3,13 @@ import { UiElementData, UiElementMeta } from '../UiElement';
 export interface UiElementSectionMeta extends UiElementMeta {
     resolutionType?: never;
 }
-export declare type ResolvedSection<T extends UiElementData<UiElementSectionMeta>> = T extends {
+export type ResolvedSection<T extends UiElementData<UiElementSectionMeta>> = T extends {
     _resolved?: Record<string, unknown>;
 } ? Required<T>['_resolved'] : Record<string, unknown>;
-export declare type ParametersOfSection<T extends UiElementData> = T extends {
+export type ParametersOfSection<T extends UiElementData> = T extends {
     _parameters?: Record<string, HVal>;
 } ? PartialExplicitUndefined<T['_parameters']> : undefined;
-export declare type PartialExplicitUndefined<T> = {
+export type PartialExplicitUndefined<T> = {
     [P in keyof T]: T[P] | null | undefined;
 };
 export declare const isSectionData: (element: UiElementData) => element is UiElementData<UiElementSectionMeta>;

package/dist/resolvableElements/react/SectionChecker.d.ts

@@ -3,7 +3,7 @@ import { UiElementData } from 'resolvableElements/elements/UiElement';
 /**
  * An utility type that allows a component to accept props with or without a 'section' property.
  */
-export declare type OptionalSection<P> = P | (Omit<P, 'section'> & {
+export type OptionalSection<P> = P | (Omit<P, 'section'> & {
     section?: undefined;
 });
 /**

package/dist/resolvableElements/react/useResolveSection.d.ts

@@ -9,7 +9,7 @@ import { UiElementData } from '../elements/UiElement';
  * @returns the resolved result of the section that will be updated and force rendering when a subvalue changes.
  */
 export declare function useResolveSection<T extends UiElementData>(sectionData: T, parameters?: ParametersOfSection<T>): UseResolveSectionResult<T>;
-export declare type UseResolveSectionResult<T extends UiElementData> = [
+export type UseResolveSectionResult<T extends UiElementData> = [
     ResolvedSection<T>,
     UseResolveSectionExtra<T>
 ];

package/dist_es/index.d.ts

@@ -1,4 +1,5 @@
 export { type FunctionResult } from './resolvableElements/elements/function/FunctionElement';
+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 * from './resolvableElements/react/SectionChecker';

package/dist_es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,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,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/function/FunctionElement.d.ts

@@ -7,6 +7,6 @@ export declare class FunctionElement<T extends UiElementData> extends UiElement<
     #private;
     constructor(data: UiElementConstructorData<T>);
 }
-export declare type FunctionResult = (parameters: Parameters) => Promise<HGrid>;
-export declare type Parameters = Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined;
+export type FunctionResult = (parameters: Parameters) => Promise<HGrid>;
+export type Parameters = Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined;
 export declare const makeParametersDict: (parameters: Record<string, OptionalHVal | HaysonVal | undefined> | OptionalHVal | DictStore | undefined) => HDict;

package/dist_es/resolvableElements/elements/function/FunctionElement.js

@@ -18,7 +18,12 @@ export class FunctionElement extends UiElement {
         const { expr } = this._meta;
         return async (parameters) => {
             const resolvedExpression = resolveTemplateExpression(expr, makeParametersDict(parameters));
-            return await this.resolver.eval(resolvedExpression);
+            const result = await this.resolver.eval(resolvedExpression);
+            // Update watch records
+            if (!result.isError()) {
+                this.resolver.client.ops.watch.update(result.filter('id and mod'));
+            }
+            return result;
         };
     };
 }

package/dist_es/resolvableElements/elements/function/FunctionElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/function/FunctionElement.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAwB,KAAK,EAAuB,MAAM,eAAe,CAAA;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAA;AAE5E,OAAO,EACN,SAAS,GAGT,MAAM,cAAc,CAAA;AAGrB;;GAEG;AACH,MAAM,OAAO,eAAyC,SAAQ,SAAY;IACzE,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACrC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;SAClC;IACF,CAAC;IAED,cAAc,GAAG,GAAmB,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAA4B,CAAA;QAElD,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE;YAC3B,MAAM,kBAAkB,GAAG,yBAAyB,CACnD,IAAI,EACJ,kBAAkB,CAAC,UAAU,CAAC,CAC9B,CAAA;YAED,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QACpD,CAAC,CAAA;IACF,CAAC,CAAA;CACD;AAUD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CACjC,UAIY,EACJ,EAAE;IACV,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAA;KACnB;IACD,IAAI,UAAU,YAAY,KAAK,EAAE;QAChC,OAAO,UAAU,CAAA;KACjB;IAED,OAAO,KAAK,CAAC,IAAI,CAChB,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CACvD,CACD,CAAA;AACF,CAAC,CAAA"}
+{"version":3,"file":"FunctionElement.js","sourceRoot":"","sources":["../../../../src/resolvableElements/elements/function/FunctionElement.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAwB,KAAK,EAAuB,MAAM,eAAe,CAAA;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAA;AAE5E,OAAO,EACN,SAAS,GAGT,MAAM,cAAc,CAAA;AAGrB;;GAEG;AACH,MAAM,OAAO,eAAyC,SAAQ,SAAY;IACzE,YAAY,IAAiC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACrC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;SAClC;IACF,CAAC;IAED,cAAc,GAAG,GAAmB,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAA4B,CAAA;QAElD,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE;YAC3B,MAAM,kBAAkB,GAAG,yBAAyB,CACnD,IAAI,EACJ,kBAAkB,CAAC,UAAU,CAAC,CAC9B,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAE3D,uBAAuB;YACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CACpC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,CAAA;aACD;YAED,OAAO,MAAM,CAAA;QACd,CAAC,CAAA;IACF,CAAC,CAAA;CACD;AAUD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CACjC,UAIY,EACJ,EAAE;IACV,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAA;KACnB;IACD,IAAI,UAAU,YAAY,KAAK,EAAE;QAChC,OAAO,UAAU,CAAA;KACjB;IAED,OAAO,KAAK,CAAC,IAAI,CAChB,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CACvD,CACD,CAAA;AACF,CAAC,CAAA"}

package/dist_es/resolvableElements/elements/section/ResolvableSectionElement.d.ts

@@ -18,7 +18,7 @@ export declare class ResolvableSectionElement<T extends UiElementData<UiElementS
     getParameterList: () => string[];
 }
 export declare const isChildUnresolvedSection: (value: unknown) => value is ChildUnresolvedSection;
-export declare type ChildUnresolvedSection = [
+export type ChildUnresolvedSection = [
     string | undefined,
     UiElementData<UiElementSectionMeta>
 ];

package/dist_es/resolvableElements/elements/section/SectionElementMeta.d.ts

@@ -3,13 +3,13 @@ import { UiElementData, UiElementMeta } from '../UiElement';
 export interface UiElementSectionMeta extends UiElementMeta {
     resolutionType?: never;
 }
-export declare type ResolvedSection<T extends UiElementData<UiElementSectionMeta>> = T extends {
+export type ResolvedSection<T extends UiElementData<UiElementSectionMeta>> = T extends {
     _resolved?: Record<string, unknown>;
 } ? Required<T>['_resolved'] : Record<string, unknown>;
-export declare type ParametersOfSection<T extends UiElementData> = T extends {
+export type ParametersOfSection<T extends UiElementData> = T extends {
     _parameters?: Record<string, HVal>;
 } ? PartialExplicitUndefined<T['_parameters']> : undefined;
-export declare type PartialExplicitUndefined<T> = {
+export type PartialExplicitUndefined<T> = {
     [P in keyof T]: T[P] | null | undefined;
 };
 export declare const isSectionData: (element: UiElementData) => element is UiElementData<UiElementSectionMeta>;

package/dist_es/resolvableElements/react/SectionChecker.d.ts

@@ -3,7 +3,7 @@ import { UiElementData } from 'resolvableElements/elements/UiElement';
 /**
  * An utility type that allows a component to accept props with or without a 'section' property.
  */
-export declare type OptionalSection<P> = P | (Omit<P, 'section'> & {
+export type OptionalSection<P> = P | (Omit<P, 'section'> & {
     section?: undefined;
 });
 /**

package/dist_es/resolvableElements/react/useResolveSection.d.ts

@@ -9,7 +9,7 @@ import { UiElementData } from '../elements/UiElement';
  * @returns the resolved result of the section that will be updated and force rendering when a subvalue changes.
  */
 export declare function useResolveSection<T extends UiElementData>(sectionData: T, parameters?: ParametersOfSection<T>): UseResolveSectionResult<T>;
-export declare type UseResolveSectionResult<T extends UiElementData> = [
+export type UseResolveSectionResult<T extends UiElementData> = [
     ResolvedSection<T>,
     UseResolveSectionExtra<T>
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@j2inn/resolvable-ui-elements",
-	"version": "0.0.3",
+	"version": "1.0.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,10 +23,10 @@
 		"dist_es/**/*"
 	],
 	"peerDependencies": {
-		"haystack-core": "^2.0.38",
-		"haystack-nclient": "^3.0.28",
-		"haystack-react": "^3.0.11",
-		"haystack-units": "^1.0.20",
+		"haystack-core": "^2.0.45",
+		"haystack-nclient": "^3.0.32",
+		"haystack-react": "^3.0.17",
+		"haystack-units": "^1.0.22",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -49,4 +49,4 @@
 		"ts-jest": "^28.0.8",
 		"typescript": "^4.8.2"
 	}
-}
+}