xmlui 0.7.21 → 0.7.23

package/dist/scripts/src/components-core/utils/extractParam.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractParam = extractParam;
 exports.withStableObjectReference = withStableObjectReference;
 exports.shouldKeep = shouldKeep;
+exports.resolveAndCleanProps = resolveAndCleanProps;
 const react_1 = __importDefault(require("react"));
 const lodash_es_1 = require("lodash-es");
-const ParameterParser_1 = require("@components-core/script-runner/ParameterParser");
-const eval_tree_sync_1 = require("@components-core/script-runner/eval-tree-sync");
-const LruCache_1 = require("@components-core/utils/LruCache");
+const ParameterParser_1 = require("../script-runner/ParameterParser");
+const eval_tree_sync_1 = require("../script-runner/eval-tree-sync");
+const LruCache_1 = require("../utils/LruCache");
 /**
  * Extract the value of the specified parameter from the given view container state
  * @param state The state of the view container
@@ -146,3 +147,46 @@ function shouldKeep(when, componentState, appContext) {
     }
     return extractParam(componentState, when, appContext, true);
 }
+/**
+ * Resolves props that can either be regular properties or URL resources.
+ * It also removes layoutCss props from regular properties.
+ * @param props Component (rest) props
+ * @param extractValue Value extractor function
+ * @param layoutCss Component styles
+ * @param resourceExtraction URL resource extractor function and array that specifies which props are URL resources
+ * @returns properties that are resolved and cleaned of CSS styles
+ */
+function resolveAndCleanProps(props, extractValue, layoutCss = {}, resourceExtraction) {
+    const { extractResourceUrl, resourceProps } = resourceExtraction !== null && resourceExtraction !== void 0 ? resourceExtraction : {};
+    const cleanedProps = cleanStyles(props, layoutCss);
+    const resultProps = {};
+    const result = Object.keys(cleanedProps).reduce((acc, propName) => {
+        if (resourceProps && extractResourceUrl && resourceProps.includes(propName)) {
+            acc[propName] = extractResourceUrl(cleanedProps[propName]);
+        }
+        else {
+            acc[propName] = extractValue(cleanedProps[propName]);
+        }
+        return acc;
+    }, resultProps);
+    return result;
+}
+/**
+ * Removes unnecessary style related properties so only layoutCss contains them.
+ * @param nodeProps properties to clean
+ * @param layoutCss which style properties to remove
+ * @returns only component-specific properties
+ */
+function cleanStyles(nodeProps, layoutCss = {}) {
+    if (nodeProps.hasOwnProperty("style")) {
+        delete nodeProps["style"];
+    }
+    if (nodeProps.hasOwnProperty("class")) {
+        delete nodeProps["class"];
+    }
+    return removeEntries(nodeProps, layoutCss);
+    function removeEntries(sourceObj, filterObj) {
+        const filterKeys = Object.keys(filterObj);
+        return Object.fromEntries(Object.entries(sourceObj).filter(([key]) => !filterKeys.includes(key)));
+    }
+}

package/dist/scripts/src/components-core/utils/hooks.js

@@ -49,9 +49,9 @@ exports.useColors = useColors;
 exports.useReferenceTrackedApi = useReferenceTrackedApi;
 const react_1 = __importStar(require("react"));
 const lodash_es_1 = require("lodash-es");
-const misc_1 = require("@components-core/utils/misc");
-const ThemeContext_1 = require("@components-core/theming/ThemeContext");
-const constants_1 = require("@components-core/constants");
+const misc_1 = require("../utils/misc");
+const ThemeContext_1 = require("../theming/ThemeContext");
+const constants_1 = require("../constants");
 const color_1 = __importDefault(require("color"));
 /**
  * This hook invokes a callback when the size of the specified DOM element changes.

package/dist/scripts/src/parsers/scripting/modules.js

@@ -4,10 +4,10 @@ exports.isModuleErrors = isModuleErrors;
 exports.parseScriptModule = parseScriptModule;
 exports.obtainClosures = obtainClosures;
 exports.visitLetConstDeclarations = visitLetConstDeclarations;
-const Parser_1 = require("./Parser");
 const Token_1 = require("../../abstractions/scripting/Token");
 const tree_visitor_1 = require("./tree-visitor");
 const ParserError_1 = require("./ParserError");
+const Parser_1 = require("./Parser");
 /**
  * Checks if the result is a module error
  * @param result Result to check

package/dist/scripts/src/parsers/style-parser/style-compiler.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileLayout = compileLayout;
 const lodash_es_1 = require("lodash-es");
-const constants_1 = require("@components-core/constants");
+const constants_1 = require("../../components-core/constants");
 const StyleParser_1 = require("./StyleParser");
 const defaultCompResult = {
     cssProps: {},
@@ -10,7 +10,7 @@ const defaultCompResult = {
 };
 // Compile style properties into an object that can be directly used as the "style" attribute of elements
 function compileLayout(layoutProps = constants_1.EMPTY_OBJECT, themeVars, layoutContext) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const result = {
         cssProps: {},
         nonCssProps: {},
@@ -224,6 +224,10 @@ function compileLayout(layoutProps = constants_1.EMPTY_OBJECT, themeVars, layout
     const textWrap = (_e = layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.textWrap) === null || _e === void 0 ? void 0 : _e.toString();
     if (textWrap)
         css.textWrap = textWrap;
+    const whiteSpace = (_f = layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.whiteSpace) === null || _f === void 0 ? void 0 : _f.toString();
+    if (whiteSpace) {
+        css.whiteSpace = whiteSpace;
+    }
     // --- Compile content rendering
     const wrapContent = compileWrapContent("wrapContent", layoutProps);
     if (wrapContent)

package/dist/scripts/src/parsers/xmlui-parser/transform.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPrefixRegex = exports.UCRegex = exports.COMPOUND_COMP_ID = void 0;
 exports.nodeToComponentDef = nodeToComponentDef;
+const code_behind_collect_1 = require("../scripting/code-behind-collect");
 const syntax_kind_1 = require("./syntax-kind");
 const ParserError_1 = require("./ParserError");
 const Parser_1 = require("../scripting/Parser");
-const code_behind_collect_1 = require("../scripting/code-behind-collect");
 const CharacterCodes_1 = require("./CharacterCodes");
 exports.COMPOUND_COMP_ID = "Component";
 exports.UCRegex = /^[A-Z]/;
@@ -18,17 +18,16 @@ const APP_NS_KEY = "app-ns";
 const APP_NS_VALUE = "#app-ns";
 const CORE_NS_KEY = "core-ns";
 const CORE_NS_VALUE = "#xmlui-core-ns";
-var HelperNode;
-(function (HelperNode) {
-    HelperNode[HelperNode["property"] = 0] = "property";
-    HelperNode[HelperNode["event"] = 1] = "event";
-    HelperNode[HelperNode["var"] = 2] = "var";
-    HelperNode[HelperNode["loaders"] = 3] = "loaders";
-    HelperNode[HelperNode["uses"] = 4] = "uses";
-    HelperNode[HelperNode["method"] = 5] = "method";
-    HelperNode[HelperNode["item"] = 6] = "item";
-    HelperNode[HelperNode["field"] = 7] = "field";
-})(HelperNode || (HelperNode = {}));
+const HelperNode = {
+    property: 'property',
+    event: 'event',
+    variable: 'variable',
+    loaders: 'loaders',
+    uses: 'uses',
+    method: 'method',
+    item: 'item',
+    field: 'field'
+};
 function nodeToComponentDef(node, originalGetText, fileId, moduleResolver = () => "") {
     const getText = (node) => {
         var _a;
@@ -96,7 +95,7 @@ function nodeToComponentDef(node, originalGetText, fileId, moduleResolver = () =
                 api[attr.name] = attr.value;
             });
         }
-        // --- Get "var" attributes
+        // --- Get var attributes
         let vars;
         const varsAttrs = attrs.filter((attr) => attr.startSegment === "var");
         if (varsAttrs.length > 0) {
@@ -116,7 +115,7 @@ function nodeToComponentDef(node, originalGetText, fileId, moduleResolver = () =
         for (let child of children) {
             if (child.kind === syntax_kind_1.SyntaxKind.ElementNode) {
                 const childName = getComponentName(child, getText);
-                if (childName === "var") {
+                if (childName === HelperNode.variable) {
                     nestedVars.push(child);
                 }
                 else if (childName in HelperNode) {
@@ -257,7 +256,7 @@ function nodeToComponentDef(node, originalGetText, fileId, moduleResolver = () =
                         }
                     });
                     return;
-                case "var":
+                case HelperNode.variable:
                     collectElementHelper(usesStack, comp, child, (name) => { var _a; return (isComponent(comp) ? (_a = comp.vars) === null || _a === void 0 ? void 0 : _a[name] : undefined); }, (name, value) => {
                         var _a;
                         if (!isComponent(comp))

package/dist/scripts/src/syntax/grammar.tmLanguage.json

@@ -231,7 +231,7 @@
             ]
         },
         "propOrVarTag": {
-            "begin": "(</?)([a-zA-Z_][\\w\\.\\-]*?:)?((?:var)|(?:property)|(?:prop))",
+            "begin": "(</?)([a-zA-Z_][\\w\\.\\-]*?:)?((?:variable)|(?:property)|(?:prop))",
             "beginCaptures": {
                 "1": { "name": "punctuation.definition.tag.xmlui" },
                 "2": { "name": "keyword.operator.namespace.xmlui" },

package/dist/scripts/src/syntax/textMate/xmlui.json

@@ -144,105 +144,79 @@
     },
     "tokenColors": [
         {
-            "scope": [
-                "support.class.tag.component"
-            ],
+            "scope": ["support.class.tag.component"],
             "settings": {
                 "foreground": "#000001"
             }
         },
         {
-            "scope": [
-                "punctuation.definition.tag"
-            ],
+            "scope": ["punctuation.definition.tag"],
             "settings": {
                 "foreground": "#000002"
             }
         },
         {
-            "scope": [
-                "entity.other.attribute-name.localname"
-            ],
+            "scope": ["entity.other.attribute-name.localname"],
             "settings": {
                 "foreground": "#000003"
             }
         },
         {
-            "scope": [
-                "keyword.operator"
-            ],
+            "scope": ["keyword.operator"],
             "settings": {
                 "foreground": "#000004"
             }
         },
         {
-            "scope": [
-                "string.xmlui"
-            ],
+            "scope": ["string.xmlui"],
             "settings": {
                 "foreground": "#000005"
             }
         },
         {
-            "scope": [
-                "entity.name.function"
-            ],
+            "scope": ["entity.name.function"],
             "settings": {
                 "foreground": "#000006"
             }
         },
         {
-            "scope": [
-                "entity.name.tag.localname"
-            ],
+            "scope": ["entity.name.tag.localname"],
             "settings": {
                 "foreground": "#000007"
             }
         },
         {
-            "scope": [
-                "punctuation.definition.comment.xmlui"
-            ],
+            "scope": ["punctuation.definition.comment.xmlui"],
             "settings": {
                 "foreground": "#000008"
             }
         },
         {
-            "scope": [
-                "comment.block.xmlui"
-            ],
+            "scope": ["comment.block.xmlui"],
             "settings": {
                 "foreground": "#000008"
             }
         },
         {
-            "scope": [
-                "constant.character.escape.xmlui"
-            ],
+            "scope": ["constant.character.escape.xmlui"],
             "settings": {
                 "foreground": "#000009"
             }
         },
         {
-            "scope": [
-                "punctuation.definition.constant.xmlui"
-            ],
+            "scope": ["punctuation.definition.constant.xmlui"],
             "settings": {
                 "foreground": "#000010"
             }
         },
         {
-            "scope": [
-                "storage.xmlui"
-            ],
+            "scope": ["storage.xmlui"],
             "settings": {
                 "foreground": "#000011"
             }
         },
         {
-            "scope": [
-                "punctuation.definition.block.xmlui"
-            ],
+            "scope": ["punctuation.definition.block.xmlui"],
             "settings": {
                 "foreground": "#000012"
             }
@@ -253,28 +227,19 @@
             }
         },
         {
-            "scope": [
-                "string.quoted.single",
-                "string.quoted.double"
-            ],
+            "scope": ["string.quoted.single", "string.quoted.double"],
             "settings": {
                 "foreground": "#000014"
             }
         },
         {
-            "scope": [
-                "meta.paragraph.markdown",
-                "string.other.link.description.title.markdown"
-            ],
+            "scope": ["meta.paragraph.markdown", "string.other.link.description.title.markdown"],
             "settings": {
                 "foreground": "#110000"
             }
         },
         {
-            "scope": [
-                "entity.name.section.markdown",
-                "punctuation.definition.heading.markdown"
-            ],
+            "scope": ["entity.name.section.markdown", "punctuation.definition.heading.markdown"],
             "settings": {
                 "foreground": "#034c7c"
             }
@@ -290,57 +255,41 @@
             }
         },
         {
-            "scope": [
-                "markup.quote.markdown"
-            ],
+            "scope": ["markup.quote.markdown"],
             "settings": {
                 "fontStyle": "italic",
                 "foreground": "#003494"
             }
         },
         {
-            "scope": [
-                "markup.bold.markdown",
-                "punctuation.definition.bold.markdown"
-            ],
+            "scope": ["markup.bold.markdown", "punctuation.definition.bold.markdown"],
             "settings": {
                 "fontStyle": "bold",
                 "foreground": "#4e76b5"
             }
         },
         {
-            "scope": [
-                "markup.italic.markdown",
-                "punctuation.definition.italic.markdown"
-            ],
+            "scope": ["markup.italic.markdown", "punctuation.definition.italic.markdown"],
             "settings": {
                 "fontStyle": "italic",
                 "foreground": "#C792EA"
             }
         },
         {
-            "scope": [
-                "markup.inline.raw.string.markdown",
-                "markup.fenced_code.block.markdown"
-            ],
+            "scope": ["markup.inline.raw.string.markdown", "markup.fenced_code.block.markdown"],
             "settings": {
                 "fontStyle": "italic",
                 "foreground": "#0460b1"
             }
         },
         {
-            "scope": [
-                "punctuation.definition.metadata.markdown"
-            ],
+            "scope": ["punctuation.definition.metadata.markdown"],
             "settings": {
                 "foreground": "#00AC8F"
             }
         },
         {
-            "scope": [
-                "markup.underline.link.image.markdown",
-                "markup.underline.link.markdown"
-            ],
+            "scope": ["markup.underline.link.image.markdown", "markup.underline.link.markdown"],
             "settings": {
                 "foreground": "#924205"
             }
@@ -392,10 +341,7 @@
         },
         {
             "name": "Library class/type",
-            "scope": [
-                "support.type",
-                "support.class"
-            ],
+            "scope": ["support.type", "support.class"],
             "settings": {
                 "foreground": "#d45800"
             }
@@ -432,10 +378,7 @@
         },
         {
             "name": "[JSON] - String",
-            "scope": [
-                "source.json string",
-                "source.json punctuation.definition.string"
-            ],
+            "scope": ["source.json string", "source.json punctuation.definition.string"],
             "settings": {
                 "foreground": "#00820f"
             }
@@ -449,10 +392,7 @@
         },
         {
             "name": "Headings",
-            "scope": [
-                "markup.heading punctuation.definition.heading",
-                "entity.name.section"
-            ],
+            "scope": ["markup.heading punctuation.definition.heading", "entity.name.section"],
             "settings": {
                 "fontStyle": "",
                 "foreground": "#4FB4D8"
@@ -486,10 +426,7 @@
         },
         {
             "name": "Italic",
-            "scope": [
-                "markup.italic",
-                "punctuation.definition.italic"
-            ],
+            "scope": ["markup.italic", "punctuation.definition.italic"],
             "settings": {
                 "fontStyle": "italic",
                 "foreground": "#7681FF"
@@ -532,10 +469,7 @@
         },
         {
             "name": "User-defined constant",
-            "scope": [
-                "constant.character",
-                "constant.other"
-            ],
+            "scope": ["constant.character", "constant.other"],
             "settings": {
                 "foreground": "#7681FF"
             }