@omnia/velcron 7.5.44-dev → 7.5.45-dev

package/models/VelcronDefinitions.d.ts

@@ -6,7 +6,7 @@ import { ColorSchema, useVelcronThemingStore } from "..";
 export interface ResolvedComponentRenderer {
     component: unknown;
     definition: VelcronDefinition;
-    customComponent: boolean;
+    customComponent?: boolean;
 }
 export interface BuiltInComponentRenderers {
     "View": unknown;
@@ -21,6 +21,7 @@ export interface BuiltInComponentRenderers {
     "Dialog": unknown;
     "Icon": unknown;
     "Chip": unknown;
+    "Slot": unknown;
 }
 export interface ColorSchemaReference {
     name: string;
@@ -251,6 +252,11 @@ export interface VelcronChipDefinition extends VelcronDefinition, VelcronCustomT
     disabled?: boolean;
     events?: VelcronOnPressEvent;
 }
+export interface VelcronSlotDefinition extends VelcronDefinition, VelcronCustomThemeSettings {
+    type: "Slot";
+    bind: string;
+    value: VelcroncomponentArrayType;
+}
 /*** Custom Components ***********************************************************************/
 export type VelcronCustomComponentDefinition = VelcronComponentDescriptor & VelcronComponentDefinition;
 export type VelcronRenderProps<TDefinition> = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/velcron",
   "license": "MIT",
-  "version": "7.5.44-dev",
+  "version": "7.5.45-dev",
   "description": "Provide Omnia Velcron Stuffs.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/parser/VelcronActions.js

@@ -331,7 +331,7 @@ class VelcronActions {
         return text;
     }
     static parseAndExecuteComputed(renderContext, template) {
-        VelcronData_1.VelcronData.getTokens(template).forEach(token => {
+        VelcronData_1.VelcronData.getTokens(template, false).forEach(token => {
             const paramValues = [];
             VelcronActions.parseFunction(renderContext.computed, token, renderContext, paramValues, (acName, params) => {
                 const funcContent = renderContext.computed[acName];

package/parser/VelcronConstants.d.ts

@@ -12,6 +12,7 @@ export declare const VelcronConstants: {
         dialog: string;
         icon: string;
         chip: string;
+        slot: string;
     };
     events: {
         idTokenStart: string;
@@ -24,5 +25,6 @@ export declare const VelcronConstants: {
     properties: {
         tokenStart: string;
         tokenEnd: string;
+        propsToken: string;
     };
 };

package/parser/VelcronConstants.js

@@ -14,7 +14,8 @@ exports.VelcronConstants = {
         webView: "WebView",
         dialog: "Dialog",
         icon: "Icon",
-        chip: "Chip"
+        chip: "Chip",
+        slot: "Slot"
     },
     events: {
         idTokenStart: "$ev{",
@@ -25,7 +26,8 @@ exports.VelcronConstants = {
         stateRootToken: "$state"
     },
     properties: {
-        tokenStart: "${",
-        tokenEnd: "}"
+        tokenStart: "{{",
+        tokenEnd: "}}",
+        propsToken: "$props"
     }
 };

package/parser/VelcronData.d.ts

@@ -26,7 +26,7 @@ export declare class VelcronData {
     static extendObject(obj: any): any;
     static getOrSetObjectByPath<T>(object: Object, path: string, value?: any): T | null;
     static getOrSetObjectByPathUsingRenderContext<T>(renderContext: VelcronRenderContext, path: string, value?: any): T;
-    static getTokens(template: any): string[];
+    static getTokens(template: any, removeBrackets: boolean): string[];
     static ensureEventId(event: string): string;
     static ensureKeys(ui: VelcronDefinition | VelcronAppDefinition, generateNewKeys?: boolean): void;
     static removeKeys(ui: VelcronDefinition | VelcronAppDefinition): void;

package/parser/VelcronData.js

@@ -10,10 +10,9 @@ class VelcronData {
         if (!VelcronData.isString(text)) {
             return text;
         }
-        const tokens = this.getTokens(text);
-        tokens.forEach((name) => {
-            let data = this.getOrSetObjectByPathUsingRenderContext(renderContext, name);
-            const token = VelcronConstants_1.VelcronConstants.properties.tokenStart + name + VelcronConstants_1.VelcronConstants.properties.tokenEnd;
+        const tokens = this.getTokens(text, false);
+        tokens.forEach((token) => {
+            let data = this.getOrSetObjectByPathUsingRenderContext(renderContext, token.replace(/\s*{{\s*|\s*}}\s*/g, ""));
             if (data instanceof TextValue_1.TextValue) {
                 data = data.value;
             }
@@ -508,53 +507,49 @@ class VelcronData {
             variables[renderContext.id].hasOwnProperty(path)) {
             result = variables[renderContext.id][path];
         }
+        else if (path.startsWith(VelcronConstants_1.VelcronConstants.properties.propsToken + ".")) {
+            //props in a custom component $props.
+            path = path.substring(VelcronConstants_1.VelcronConstants.properties.propsToken.length + 1);
+            const propObj = VelcronData.getOrSetObjectByPath(renderContext.properties, path);
+            if (VelcronData.isString(propObj)) {
+                const propString = propObj;
+                path = VelcronData.dataBind(renderContext, propString);
+                result = path;
+            }
+            result = propObj;
+        }
         else {
-            let pathIsPropertyValue = false;
-            if (renderContext.properties?.hasOwnProperty(path)) {
-                pathIsPropertyValue = true;
-                const propObj = renderContext.properties[path];
-                if (VelcronData.isString(propObj)) {
-                    const propString = propObj;
-                    path = VelcronData.dataBind(renderContext, propString);
-                    return path;
-                }
-                result = propObj;
+            const tokens = VelcronData.getTokens(path, true);
+            if (tokens.length > 0) {
+                path = tokens[0];
             }
-            if (!result || VelcronData.isString(result)) {
-                const tokens = VelcronData.getTokens(path);
-                if (tokens.length > 0) {
-                    path = tokens[0];
-                }
-                let object = null;
-                if (path.startsWith(`${VelcronConstants_1.VelcronConstants.state.stateRootToken}.`) || path === VelcronConstants_1.VelcronConstants.state.stateRootToken) {
-                    //Fetch from the data object
-                    object = renderContext.rootContext;
-                    path = path.substring(6);
-                }
-                else {
-                    //Fetch from current ctx
-                    object = renderContext.currentContext;
-                }
-                if (VelcronData.isObject(object)) {
-                    result = VelcronData.getOrSetObjectByPath(object, path, value);
-                }
-                else {
-                    //For example if you bind to Array of ["string"] the currentContext is only a string so we just return the object without mapping path
-                    result = object;
-                }
-                if (typeof result === "undefined" && pathIsPropertyValue) {
-                    result = path;
-                }
+            let object = null;
+            if (path.startsWith(`${VelcronConstants_1.VelcronConstants.state.stateRootToken}.`) || path === VelcronConstants_1.VelcronConstants.state.stateRootToken) {
+                //Fetch from the data object
+                object = renderContext.rootContext;
+                path = path.substring(6);
+            }
+            else {
+                //Fetch from current ctx
+                object = renderContext.currentContext;
+            }
+            if (VelcronData.isObject(object)) {
+                result = VelcronData.getOrSetObjectByPath(object, path, value);
+            }
+            else {
+                //For example if you bind to Array of ["string"] the currentContext is only a string so we just return the object without mapping path
+                result = object;
             }
         }
         return result;
     }
-    static getTokens(template) {
+    static getTokens(template, removeBrackets) {
         const tokens = [];
         if (template) {
-            template.replace(/(\${).+?(?=\})/g, (tokenWithVar, token) => {
-                tokens.push(tokenWithVar.substring(2));
-                return token;
+            template.replace(removeBrackets ? /{{\s*(.+?)\s*}}/g : /(\{{.+?\}})/g, (foundToken, token) => {
+                const tokenWithVar = removeBrackets ? token : foundToken;
+                tokens.push(tokenWithVar);
+                return tokenWithVar;
             });
         }
         return tokens;

package/parser/VelcronRenderers.js

@@ -95,7 +95,6 @@ class VelcronRenderers {
                 //Fetch the custom component definition
                 const customDef = rendererInfo.definition;
                 if (customDef.properties) {
-                    // customDef.properties.forEach((prop) => {
                     Object.keys(customDef.properties).forEach((propName) => {
                         const prop = customDef.properties ? customDef.properties[propName] : null;
                         if (!prop || (prop.required && !definition.hasOwnProperty(propName))) {