@j2inn/resolvable-ui-elements 1.1.3-beta.0 → 2.0.0

package/dist_es/resolvableElements/react/useResolverContext.jsx

@@ -1,39 +1,39 @@
-/*
- * Copyright (c) 2022, J2 Innovations. All Rights Reserved
- */
-import { Client } from 'haystack-nclient';
-import { useClient } from 'haystack-react';
-import React, { useContext, useEffect, useState, } from 'react';
-import { useCurrentUser } from '../../useCurrentUser';
-import { Resolver } from '../Resolver';
-const ResolverContext = React.createContext(new Resolver({
-    client: new Client({
-        base: new URL(window.location.href),
-    }),
-}));
-ResolverContext.displayName = 'ResolverContext';
-export function useResolverContext() {
-    return useContext(ResolverContext);
-}
-export const ResolverProvider = ({ userRoleTagName, evalFuncName, children, }) => {
-    const client = useClient();
-    const user = useCurrentUser();
-    const [resolver, setResolver] = useState(() => new Resolver({
-        client,
-        user,
-        userRoleTagName,
-        evalFuncName,
-    }));
-    useEffect(() => {
-        setResolver(new Resolver({
-            client,
-            user,
-            userRoleTagName,
-            evalFuncName,
-        }));
-    }, [client, user, userRoleTagName, evalFuncName]);
+/*
+ * Copyright (c) 2022, J2 Innovations. All Rights Reserved
+ */
+import { Client } from 'haystack-nclient';
+import { useClient } from 'haystack-react';
+import React, { useContext, useEffect, useState, } from 'react';
+import { useCurrentUser } from '../../useCurrentUser';
+import { Resolver } from '../Resolver';
+const ResolverContext = React.createContext(new Resolver({
+    client: new Client({
+        base: new URL(window.location.href),
+    }),
+}));
+ResolverContext.displayName = 'ResolverContext';
+export function useResolverContext() {
+    return useContext(ResolverContext);
+}
+export const ResolverProvider = ({ userRoleTagName, evalFuncName, children, }) => {
+    const client = useClient();
+    const user = useCurrentUser();
+    const [resolver, setResolver] = useState(() => new Resolver({
+        client,
+        user,
+        userRoleTagName,
+        evalFuncName,
+    }));
+    useEffect(() => {
+        setResolver(new Resolver({
+            client,
+            user,
+            userRoleTagName,
+            evalFuncName,
+        }));
+    }, [client, user, userRoleTagName, evalFuncName]);
     return (<ResolverContext.Provider value={resolver}>
 			{children}
-		</ResolverContext.Provider>);
-};
+		</ResolverContext.Provider>);
+};
 //# sourceMappingURL=useResolverContext.jsx.map

package/dist_es/resolvableElements/resolveTemplatedExpression.d.ts

@@ -1,22 +1,22 @@
-import { HDict } from 'haystack-core';
-export declare const REG_EXPR_MATCHING_TEMPLATE: RegExp;
-/**
- * Replaces variables (defined as {{parameterName}}) in an expression with the values given in the parameters dict.
- * The HVal.toAxon function is used for conversion to a string. Optional parameters can be marked using a '?'
- * after the parameter name. They can safely be omitted in the parameters Dict.
- * @example
- * resolveTemplatedExpression("func({{num}})", HDict.make({num: HNum.make(22)})) => "func(22)"
- * @example
- * resolveTemplatedExpression("func({{num}}, {{unit?}})", HDict.make({num: HNum.make(22)})) => "func(22, null)"
- * @param expr the axon expression
- * @param params the parameters expressed as dict
- * @returns the axon expression resolved with the specified params
- */
-export declare const resolveTemplateExpression: (expr: string, parameters?: HDict) => string;
-/**
- * Replaces template variable found in the given string using a given replacer function
- * @param templateString
- * @param replacer
- * @returns a new string containing the compiled template string
- */
-export declare const replaceTemplateVariables: (templateString: string, replacer: (substring: string, match: string, optional: string) => string) => string;
+import { HDict } from 'haystack-core';
+export declare const REG_EXPR_MATCHING_TEMPLATE: RegExp;
+/**
+ * Replaces variables (defined as {{parameterName}}) in an expression with the values given in the parameters dict.
+ * The HVal.toAxon function is used for conversion to a string. Optional parameters can be marked using a '?'
+ * after the parameter name. They can safely be omitted in the parameters Dict.
+ * @example
+ * resolveTemplatedExpression("func({{num}})", HDict.make({num: HNum.make(22)})) => "func(22)"
+ * @example
+ * resolveTemplatedExpression("func({{num}}, {{unit?}})", HDict.make({num: HNum.make(22)})) => "func(22, null)"
+ * @param expr the axon expression
+ * @param params the parameters expressed as dict
+ * @returns the axon expression resolved with the specified params
+ */
+export declare const resolveTemplateExpression: (expr: string, parameters?: HDict) => string;
+/**
+ * Replaces template variable found in the given string using a given replacer function
+ * @param templateString
+ * @param replacer
+ * @returns a new string containing the compiled template string
+ */
+export declare const replaceTemplateVariables: (templateString: string, replacer: (substring: string, match: string, optional: string) => string) => string;

package/dist_es/resolvableElements/resolveTemplatedExpression.js

@@ -1,39 +1,39 @@
-/*
- * Copyright (c) 2022, J2 Innovations. All Rights Reserved
- */
-import { AXON_NULL } from 'haystack-core';
-export const REG_EXPR_MATCHING_TEMPLATE = new RegExp(/{{([^{}?]*)(\??)}}/, 'g');
-/**
- * Replaces variables (defined as {{parameterName}}) in an expression with the values given in the parameters dict.
- * The HVal.toAxon function is used for conversion to a string. Optional parameters can be marked using a '?'
- * after the parameter name. They can safely be omitted in the parameters Dict.
- * @example
- * resolveTemplatedExpression("func({{num}})", HDict.make({num: HNum.make(22)})) => "func(22)"
- * @example
- * resolveTemplatedExpression("func({{num}}, {{unit?}})", HDict.make({num: HNum.make(22)})) => "func(22, null)"
- * @param expr the axon expression
- * @param params the parameters expressed as dict
- * @returns the axon expression resolved with the specified params
- */
-export const resolveTemplateExpression = (expr, parameters) => {
-    const paramDict = parameters;
-    return replaceTemplateVariables(expr, (_substring, match, optional) => {
-        const isOptional = optional === '?';
-        const parameter = paramDict?.get(match)?.toAxon();
-        if (parameter != null) {
-            return parameter;
-        }
-        else if (isOptional) {
-            return AXON_NULL;
-        }
-        throw new Error(`ERROR: Missing parameter: ${match} in ${paramDict?.toAxon()}`);
-    });
-};
-/**
- * Replaces template variable found in the given string using a given replacer function
- * @param templateString
- * @param replacer
- * @returns a new string containing the compiled template string
- */
-export const replaceTemplateVariables = (templateString, replacer) => templateString.replace(REG_EXPR_MATCHING_TEMPLATE, replacer);
+/*
+ * Copyright (c) 2022, J2 Innovations. All Rights Reserved
+ */
+import { AXON_NULL } from 'haystack-core';
+export const REG_EXPR_MATCHING_TEMPLATE = new RegExp(/{{([^{}?]*)(\??)}}/, 'g');
+/**
+ * Replaces variables (defined as {{parameterName}}) in an expression with the values given in the parameters dict.
+ * The HVal.toAxon function is used for conversion to a string. Optional parameters can be marked using a '?'
+ * after the parameter name. They can safely be omitted in the parameters Dict.
+ * @example
+ * resolveTemplatedExpression("func({{num}})", HDict.make({num: HNum.make(22)})) => "func(22)"
+ * @example
+ * resolveTemplatedExpression("func({{num}}, {{unit?}})", HDict.make({num: HNum.make(22)})) => "func(22, null)"
+ * @param expr the axon expression
+ * @param params the parameters expressed as dict
+ * @returns the axon expression resolved with the specified params
+ */
+export const resolveTemplateExpression = (expr, parameters) => {
+    const paramDict = parameters;
+    return replaceTemplateVariables(expr, (_substring, match, optional) => {
+        const isOptional = optional === '?';
+        const parameter = paramDict?.get(match)?.toAxon();
+        if (parameter != null) {
+            return parameter;
+        }
+        else if (isOptional) {
+            return AXON_NULL;
+        }
+        throw new Error(`ERROR: Missing parameter: ${match} in ${paramDict?.toAxon()}`);
+    });
+};
+/**
+ * Replaces template variable found in the given string using a given replacer function
+ * @param templateString
+ * @param replacer
+ * @returns a new string containing the compiled template string
+ */
+export const replaceTemplateVariables = (templateString, replacer) => templateString.replace(REG_EXPR_MATCHING_TEMPLATE, replacer);
 //# sourceMappingURL=resolveTemplatedExpression.js.map

package/dist_es/useCurrentUser.d.ts

@@ -1,10 +1,10 @@
-import { HDict } from 'haystack-core';
-import React, { PropsWithChildren } from 'react';
-/**
- * User context retrieval hook.
- */
-export declare function useCurrentUser(): HDict | undefined;
-/**
- * User context provider for FIN 5.
- */
-export declare const UserContextProvider: React.FC<PropsWithChildren>;
+import { HDict } from 'haystack-core';
+import React, { PropsWithChildren } from 'react';
+/**
+ * User context retrieval hook.
+ */
+export declare function useCurrentUser(): HDict | undefined;
+/**
+ * User context provider for FIN 5.
+ */
+export declare const UserContextProvider: React.FC<PropsWithChildren>;

package/dist_es/useCurrentUser.jsx

@@ -1,23 +1,23 @@
-/*
- * Copyright (c) 2022, J2 Innovations. All Rights Reserved
- */
-import { useEval } from 'haystack-react';
-import React, { useContext } from 'react';
-const UserContext = React.createContext(undefined);
-UserContext.displayName = 'CurrentUser';
-/**
- * User context retrieval hook.
- */
-export function useCurrentUser() {
-    return useContext(UserContext);
-}
-/**
- * User context provider for FIN 5.
- */
-export const UserContextProvider = ({ children, }) => {
-    const { grid, isLoading } = useEval('finGetCurrentUser()');
+/*
+ * Copyright (c) 2022, J2 Innovations. All Rights Reserved
+ */
+import { useEval } from 'haystack-react';
+import React, { useContext } from 'react';
+const UserContext = React.createContext(undefined);
+UserContext.displayName = 'CurrentUser';
+/**
+ * User context retrieval hook.
+ */
+export function useCurrentUser() {
+    return useContext(UserContext);
+}
+/**
+ * User context provider for FIN 5.
+ */
+export const UserContextProvider = ({ children, }) => {
+    const { grid, isLoading } = useEval('finGetCurrentUser()');
     return (<UserContext.Provider value={isLoading ? undefined : grid[0]}>
 			{children}
-		</UserContext.Provider>);
-};
+		</UserContext.Provider>);
+};
 //# sourceMappingURL=useCurrentUser.jsx.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@j2inn/resolvable-ui-elements",
-	"version": "1.1.3-beta.0",
+	"version": "2.0.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,10 +23,10 @@
 		"dist_es/**/*"
 	],
 	"peerDependencies": {
-		"haystack-core": "^2.0.45",
-		"haystack-nclient": "^3.0.32",
-		"haystack-react": "^3.0.17",
-		"haystack-units": "^1.0.22",
+		"haystack-core": "^3.0.0",
+		"haystack-nclient": "^4.0.0",
+		"haystack-react": "^4.0.0",
+		"haystack-units": "^2.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},