xmlui 0.9.1 → 0.9.3

package/dist/scripts/src/components-core/{DevTools.js → devtools/DevTools.js}

@@ -41,27 +41,39 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const react_2 = require("react");
 const react_rnd_1 = require("react-rnd");
-const XmluiCodeHighlighter_1 = require("./XmluiCodeHighlighter");
-const ThemeContext_1 = require("./theming/ThemeContext");
+const ThemeContext_1 = require("../theming/ThemeContext");
 const react_dom_1 = require("react-dom");
-const InspectorContext_1 = require("./InspectorContext");
-const ButtonNative_1 = require("../components/Button/ButtonNative");
+const InspectorContext_1 = require("../InspectorContext");
+const ButtonNative_1 = require("../../components/Button/ButtonNative");
 const DevTools_module_scss_1 = __importDefault(require("./DevTools.module.scss"));
 const react_tabs_1 = require("@radix-ui/react-tabs");
 const bi_1 = require("react-icons/bi");
 const DropdownMenu = __importStar(require("@radix-ui/react-dropdown-menu"));
-const all_1 = require("react-icons/all");
+const hi_1 = require("react-icons/hi");
 const hi2_1 = require("react-icons/hi2");
-const IconNative_1 = __importDefault(require("../components/Icon/IconNative"));
+const IconNative_1 = __importDefault(require("../../components/Icon/IconNative"));
+const loader_1 = __importDefault(require("@monaco-editor/loader"));
+const grammar_monacoLanguage_1 = require("../../syntax/monaco/grammar.monacoLanguage");
+const xmluiscript_monacoLanguage_1 = require("../../syntax/monaco/xmluiscript.monacoLanguage");
+const xmlui_light_1 = __importDefault(require("../../syntax/monaco/xmlui-light"));
+const xmlui_dark_1 = __importDefault(require("../../syntax/monaco/xmlui-dark"));
 const DevTools = ({ setIsOpen, node }) => {
     var _a;
     const [side, setSide] = (0, react_2.useState)("bottom");
-    const { root } = (0, ThemeContext_1.useTheme)();
+    const { root, activeThemeTone } = (0, ThemeContext_1.useTheme)();
     const { setDevToolsSize, setDevToolsSide } = (0, InspectorContext_1.useDevTools)();
     const [copied, setCopied] = (0, react_2.useState)(false);
+    const monacoEditorInstance = (0, react_1.useRef)(null);
+    const editorRef = (0, react_1.useRef)(null);
+    const [activeTab, setActiveTab] = (0, react_2.useState)("code");
+    const monacoSetupDone = (0, react_1.useRef)(false);
     const copyToClipboard = () => {
+        var _a;
         setCopied(true);
-        navigator.clipboard.writeText(value);
+        if (monacoEditorInstance === null || monacoEditorInstance === void 0 ? void 0 : monacoEditorInstance.current) {
+            const code = (_a = monacoEditorInstance === null || monacoEditorInstance === void 0 ? void 0 : monacoEditorInstance.current) === null || _a === void 0 ? void 0 : _a.getValue();
+            navigator.clipboard.writeText(code);
+        }
     };
     const { sources } = (0, react_1.useContext)(InspectorContext_1.InspectorContext);
     const value = (0, react_1.useMemo)(() => {
@@ -95,6 +107,50 @@ const DevTools = ({ setIsOpen, node }) => {
         });
         return prunedLines.map((line) => line.slice(trimBeginCount)).join("\n");
     }, [(_a = node.debug) === null || _a === void 0 ? void 0 : _a.source, sources]);
+    (0, react_1.useEffect)(() => {
+        if (activeTab === "code") {
+            if (monacoEditorInstance.current) {
+                monacoEditorInstance.current.layout();
+            }
+            else if (editorRef.current) {
+                loader_1.default.init().then((monaco) => {
+                    if (!editorRef.current || monacoEditorInstance.current)
+                        return;
+                    if (!monacoSetupDone.current) {
+                        monaco.languages.register({ id: grammar_monacoLanguage_1.XmluiGrammar.id });
+                        monaco.languages.setMonarchTokensProvider(grammar_monacoLanguage_1.XmluiGrammar.id, grammar_monacoLanguage_1.XmluiGrammar.language);
+                        monaco.languages.setLanguageConfiguration(grammar_monacoLanguage_1.XmluiGrammar.id, grammar_monacoLanguage_1.XmluiGrammar.config);
+                        monaco.languages.register({ id: xmluiscript_monacoLanguage_1.XmluiScripGrammar.id });
+                        monaco.languages.setMonarchTokensProvider(xmluiscript_monacoLanguage_1.XmluiScripGrammar.id, xmluiscript_monacoLanguage_1.XmluiScripGrammar.language);
+                        monaco.languages.setLanguageConfiguration(xmluiscript_monacoLanguage_1.XmluiScripGrammar.id, xmluiscript_monacoLanguage_1.XmluiScripGrammar.config);
+                        monaco.editor.defineTheme("xmlui-light", xmlui_light_1.default);
+                        monaco.editor.defineTheme("xmlui-dark", xmlui_dark_1.default);
+                        monacoSetupDone.current = true;
+                    }
+                    monaco.editor.setTheme(activeThemeTone === "dark" ? "xmlui-dark" : "xmlui-light");
+                    monacoEditorInstance.current = monaco.editor.create(editorRef.current, {
+                        value,
+                        language: "xmlui",
+                        readOnly: true,
+                        scrollBeyondLastLine: false,
+                        overviewRulerLanes: 0,
+                        hideCursorInOverviewRuler: true,
+                        minimap: { enabled: false },
+                        padding: {
+                            top: 10,
+                            bottom: 10
+                        }
+                    });
+                });
+            }
+        }
+        return () => {
+            if (monacoEditorInstance.current) {
+                monacoEditorInstance.current.dispose();
+                monacoEditorInstance.current = null;
+            }
+        };
+    }, [activeTab, activeThemeTone, value]);
     const getInitialSize = (0, react_1.useCallback)(() => {
         switch (side) {
             case "bottom":
@@ -120,6 +176,11 @@ const DevTools = ({ setIsOpen, node }) => {
     }, [side]);
     const [size, setSize] = (0, react_2.useState)(getInitialSize());
     const [position, setPosition] = (0, react_2.useState)(getInitialPosition());
+    (0, react_1.useEffect)(() => {
+        if ((monacoEditorInstance === null || monacoEditorInstance === void 0 ? void 0 : monacoEditorInstance.current) && activeTab === "code") {
+            monacoEditorInstance.current.layout();
+        }
+    }, [activeTab, size, position]);
     (0, react_1.useEffect)(() => {
         const handleResize = () => {
             setSize(getInitialSize());
@@ -153,12 +214,12 @@ const DevTools = ({ setIsOpen, node }) => {
                 height: ref.offsetHeight,
             });
             setPosition(position);
-        }, bounds: "window", children: (0, jsx_runtime_1.jsxs)(react_tabs_1.Root, { defaultValue: "code", className: DevTools_module_scss_1.default.tabs, style: { width: "100%", height: "100%" }, children: [(0, jsx_runtime_1.jsxs)(react_tabs_1.List, { className: DevTools_module_scss_1.default.list, children: [(0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.tabItems, children: [(0, jsx_runtime_1.jsx)(react_tabs_1.Trigger, { value: "code", children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "sm", children: "Code" }) }), (0, jsx_runtime_1.jsx)(react_tabs_1.Trigger, { value: "console", children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "sm", children: "Console" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.actions, children: [(0, jsx_runtime_1.jsxs)(DropdownMenu.Root, { children: [(0, jsx_runtime_1.jsx)(DropdownMenu.Trigger, { children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "xs", children: (0, jsx_runtime_1.jsx)(all_1.HiOutlineDotsVertical, { color: "currentColor" }) }) }), (0, jsx_runtime_1.jsx)(DropdownMenu.Portal, { container: root, children: (0, jsx_runtime_1.jsx)(DropdownMenu.Content, { className: DevTools_module_scss_1.default.menu, children: (0, jsx_runtime_1.jsxs)(DropdownMenu.Item, { className: DevTools_module_scss_1.default.menuItem, children: ["Dock side", (0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.sideButtons, children: [(0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { style: { padding: 8 }, onClick: () => {
+        }, bounds: "window", children: (0, jsx_runtime_1.jsxs)(react_tabs_1.Root, { defaultValue: "code", className: DevTools_module_scss_1.default.tabs, style: { width: "100%", height: "100%" }, onValueChange: setActiveTab, children: [(0, jsx_runtime_1.jsxs)(react_tabs_1.List, { className: DevTools_module_scss_1.default.list, children: [(0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.tabItems, children: [(0, jsx_runtime_1.jsx)(react_tabs_1.Trigger, { value: "code", children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "sm", children: "Code" }) }), (0, jsx_runtime_1.jsx)(react_tabs_1.Trigger, { value: "console", children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "sm", children: "Console" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.actions, children: [(0, jsx_runtime_1.jsxs)(DropdownMenu.Root, { children: [(0, jsx_runtime_1.jsx)(DropdownMenu.Trigger, { children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { variant: "ghost", size: "xs", children: (0, jsx_runtime_1.jsx)(hi_1.HiOutlineDotsVertical, { color: "currentColor" }) }) }), (0, jsx_runtime_1.jsx)(DropdownMenu.Portal, { container: root, children: (0, jsx_runtime_1.jsx)(DropdownMenu.Content, { className: DevTools_module_scss_1.default.menu, children: (0, jsx_runtime_1.jsxs)(DropdownMenu.Item, { className: DevTools_module_scss_1.default.menuItem, children: ["Dock side", (0, jsx_runtime_1.jsxs)("div", { className: DevTools_module_scss_1.default.sideButtons, children: [(0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { style: { padding: 8 }, onClick: () => {
                                                                         setSide("left");
                                                                     }, variant: "ghost", children: (0, jsx_runtime_1.jsx)(bi_1.BiDockLeft, { color: "currentColor", size: 16 }) }), (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { style: { padding: 8 }, onClick: () => {
                                                                         setSide("bottom");
                                                                     }, variant: "ghost", children: (0, jsx_runtime_1.jsx)(bi_1.BiDockBottom, { color: "currentColor", size: 16 }) }), (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { style: { padding: 8 }, onClick: () => {
                                                                         setSide("right");
-                                                                    }, variant: "ghost", children: (0, jsx_runtime_1.jsx)(bi_1.BiDockRight, { color: "currentColor", size: 16 }) })] })] }) }) })] }), (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { onClick: () => setIsOpen(false), size: "xs", variant: "ghost", icon: (0, jsx_runtime_1.jsx)(IconNative_1.default, { name: "close" }) })] })] }), (0, jsx_runtime_1.jsxs)(react_tabs_1.Content, { value: "code", className: DevTools_module_scss_1.default.content, children: [(0, jsx_runtime_1.jsx)(XmluiCodeHighlighter_1.XmluiCodeHighlighter, { value: value }), (0, jsx_runtime_1.jsx)("div", { className: DevTools_module_scss_1.default.copyButton, children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { onClick: copyToClipboard, variant: "solid", themeColor: "secondary", style: { padding: 8 }, size: "sm", children: copied ? ((0, jsx_runtime_1.jsx)(hi2_1.HiOutlineClipboardDocumentCheck, { size: 16 })) : ((0, jsx_runtime_1.jsx)(hi2_1.HiOutlineClipboardDocument, { size: 16 })) }) })] }), (0, jsx_runtime_1.jsx)(react_tabs_1.Content, { value: "console", className: DevTools_module_scss_1.default.content, children: "Debug console" })] }) }), root);
+                                                                    }, variant: "ghost", children: (0, jsx_runtime_1.jsx)(bi_1.BiDockRight, { color: "currentColor", size: 16 }) })] })] }) }) })] }), (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { onClick: () => setIsOpen(false), size: "xs", variant: "ghost", icon: (0, jsx_runtime_1.jsx)(IconNative_1.default, { name: "close" }) })] })] }), (0, jsx_runtime_1.jsxs)(react_tabs_1.Content, { value: "code", className: DevTools_module_scss_1.default.content, children: [(0, jsx_runtime_1.jsx)("div", { ref: editorRef, className: DevTools_module_scss_1.default.xmluiEditor }), (0, jsx_runtime_1.jsx)("div", { className: DevTools_module_scss_1.default.copyButton, children: (0, jsx_runtime_1.jsx)(ButtonNative_1.Button, { onClick: copyToClipboard, variant: "solid", themeColor: "secondary", style: { padding: 8 }, size: "sm", children: copied ? ((0, jsx_runtime_1.jsx)(hi2_1.HiOutlineClipboardDocumentCheck, { size: 16 })) : ((0, jsx_runtime_1.jsx)(hi2_1.HiOutlineClipboardDocument, { size: 16 })) }) })] }), (0, jsx_runtime_1.jsx)(react_tabs_1.Content, { value: "console", className: DevTools_module_scss_1.default.content, children: "Debug console" })] }) }), root);
 };
 exports.DevTools = DevTools;

package/dist/scripts/src/components-core/rendering/Container.js

@@ -52,7 +52,7 @@ const react_2 = require("@remix-run/react");
 const lodash_es_1 = require("lodash-es");
 const react_compose_refs_1 = require("@radix-ui/react-compose-refs");
 const memoize_one_1 = __importDefault(require("memoize-one"));
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 const containers_1 = require("../abstractions/containers");
 const AppContext_1 = require("../AppContext");
 const buildProxy_1 = require("../rendering/buildProxy");
@@ -163,7 +163,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
             else {
                 statements = [
                     {
-                        type: ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION_STATEMENT,
+                        type: ScriptingSourceTree_1.T_ARROW_EXPRESSION_STATEMENT,
                         expr: source, //TODO illesg (talk it through why we need to deep clone, it it's omitted, it gets slower every time we run it)
                     },
                 ];
@@ -278,7 +278,7 @@ exports.Container = (0, react_1.memo)((0, react_1.forwardRef)(function Container
         };
         try {
             const arrowStmt = {
-                type: ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION_STATEMENT,
+                type: ScriptingSourceTree_1.T_ARROW_EXPRESSION_STATEMENT,
                 expr: arrowExpression,
             };
             (0, process_statement_sync_1.processStatementQueue)([arrowStmt], evalContext);

package/dist/scripts/src/components-core/rendering/StateContainer.js

@@ -11,7 +11,7 @@ const lodash_es_1 = require("lodash-es");
 const memoize_one_1 = __importDefault(require("memoize-one"));
 const react_2 = require("@remix-run/react");
 const containers_1 = require("../abstractions/containers");
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 const constants_1 = require("../constants");
 const collectFnVarDeps_1 = require("../rendering/collectFnVarDeps");
 const reducer_1 = require("../rendering/reducer");
@@ -20,7 +20,7 @@ const ErrorBoundary_1 = require("../rendering/ErrorBoundary");
 const visitors_1 = require("../script-runner/visitors");
 const hooks_1 = require("../utils/hooks");
 const Container_1 = require("./Container");
-const code_behind_collect_1 = require("../../parsers/scripting-exp/code-behind-collect");
+const code_behind_collect_1 = require("../../parsers/scripting/code-behind-collect");
 const AppContext_1 = require("../AppContext");
 const ParameterParser_1 = require("../script-runner/ParameterParser");
 const eval_tree_sync_1 = require("../script-runner/eval-tree-sync");
@@ -78,7 +78,7 @@ exports.StateContainer = (0, react_1.memo)((0, react_1.forwardRef)(function Stat
     const functionDeps = (0, react_1.useMemo)(() => {
         const fnDeps = {};
         Object.entries(varDefinitions).forEach(([key, value]) => {
-            if (isParsedValue(value) && value.tree.type === ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION) {
+            if (isParsedValue(value) && value.tree.type === ScriptingSourceTree_1.T_ARROW_EXPRESSION) {
                 fnDeps[key] = (0, visitors_1.collectVariableDependencies)(value.tree, referenceTrackedApi);
             }
         });

package/dist/scripts/src/components-core/script-runner/ParameterParser.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseParameterString = parseParameterString;
-const Parser_1 = require("../../parsers/scripting-exp/Parser");
+const Parser_1 = require("../../parsers/scripting/Parser");
 /**
  * This function parses a parameter string and splits them into string literal and binding expression sections
  * @param source String to parse

package/dist/scripts/src/components-core/script-runner/eval-tree-async.js

@@ -13,7 +13,7 @@ exports.evalBindingAsync = evalBindingAsync;
 exports.executeArrowExpression = executeArrowExpression;
 exports.completeExprValue = completeExprValue;
 const lodash_es_1 = require("lodash-es");
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 const process_statement_async_1 = require("./process-statement-async");
 const eval_tree_common_1 = require("./eval-tree-common");
 const process_statement_common_1 = require("./process-statement-common");
@@ -47,7 +47,7 @@ function evalBindingAsync(expr, evalContext, thread) {
 function executeArrowExpression(expr, evalContext, thread, ...args) {
     return __awaiter(this, void 0, void 0, function* () {
         // --- Just an extra safety check
-        if (expr.type !== ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION) {
+        if (expr.type !== ScriptingSourceTree_1.T_ARROW_EXPRESSION) {
             throw new Error("executeArrowExpression expects an 'ArrowExpression' object.");
         }
         // --- This is the evaluator that an arrow expression uses internally
@@ -82,39 +82,39 @@ function evalBindingExpressionTreeAsync(thisStack, expr, evalContext, thread) {
         // --- Process the expression according to its type
         try {
             switch (expr.type) {
-                case ScriptingSourceTreeExp_1.T_TEMPLATE_LITERAL_EXPRESSION:
+                case ScriptingSourceTree_1.T_TEMPLATE_LITERAL_EXPRESSION:
                     return evalTemplateLiteralAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_LITERAL:
+                case ScriptingSourceTree_1.T_LITERAL:
                     return (0, eval_tree_common_1.evalLiteral)(thisStack, expr, thread);
-                case ScriptingSourceTreeExp_1.T_IDENTIFIER:
+                case ScriptingSourceTree_1.T_IDENTIFIER:
                     return (0, eval_tree_common_1.evalIdentifier)(thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION:
+                case ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION:
                     return yield evalMemberAccessAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
+                case ScriptingSourceTree_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
                     return yield evalCalculatedMemberAccessAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_SEQUENCE_EXPRESSION:
+                case ScriptingSourceTree_1.T_SEQUENCE_EXPRESSION:
                     return yield evalSequenceAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_ARRAY_LITERAL:
+                case ScriptingSourceTree_1.T_ARRAY_LITERAL:
                     return yield evalArrayLiteralAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_OBJECT_LITERAL:
+                case ScriptingSourceTree_1.T_OBJECT_LITERAL:
                     return yield evalObjectLiteralAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_UNARY_EXPRESSION:
+                case ScriptingSourceTree_1.T_UNARY_EXPRESSION:
                     return yield evalUnaryAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_BINARY_EXPRESSION:
+                case ScriptingSourceTree_1.T_BINARY_EXPRESSION:
                     return yield evalBinaryAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_CONDITIONAL_EXPRESSION:
+                case ScriptingSourceTree_1.T_CONDITIONAL_EXPRESSION:
                     return yield evalConditionalAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION:
+                case ScriptingSourceTree_1.T_ASSIGNMENT_EXPRESSION:
                     return yield evalAssignmentAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_PREFIX_OP_EXPRESSION:
-                case ScriptingSourceTreeExp_1.T_POSTFIX_OP_EXPRESSION:
+                case ScriptingSourceTree_1.T_PREFIX_OP_EXPRESSION:
+                case ScriptingSourceTree_1.T_POSTFIX_OP_EXPRESSION:
                     return yield evalPreOrPostAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_FUNCTION_INVOCATION_EXPRESSION:
+                case ScriptingSourceTree_1.T_FUNCTION_INVOCATION_EXPRESSION:
                     // --- Special async handling
                     return yield evalFunctionInvocationAsync(evaluator, thisStack, expr, evalContext, thread);
-                case ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION:
+                case ScriptingSourceTree_1.T_ARROW_EXPRESSION:
                     return (0, eval_tree_common_1.evalArrow)(thisStack, expr, thread);
-                case ScriptingSourceTreeExp_1.T_SPREAD_EXPRESSION:
+                case ScriptingSourceTree_1.T_SPREAD_EXPRESSION:
                     throw new Error("Cannot use spread expression (...) with the current intermediate value.");
                 default:
                     throw new Error(`Unknown expression tree node: ${expr.type}`);
@@ -166,7 +166,7 @@ function evalArrayLiteralAsync(evaluator, thisStack, expr, evalContext, thread)
     return __awaiter(this, void 0, void 0, function* () {
         const value = [];
         for (const item of expr.items) {
-            if (item.type === ScriptingSourceTreeExp_1.T_SPREAD_EXPRESSION) {
+            if (item.type === ScriptingSourceTree_1.T_SPREAD_EXPRESSION) {
                 const spreadArray = yield evaluator(thisStack, item.expr, evalContext, thread);
                 thisStack.pop();
                 if (!Array.isArray(spreadArray)) {
@@ -210,10 +210,10 @@ function evalObjectLiteralAsync(evaluator, thisStack, expr, evalContext, thread)
             // --- We're using key/[value] pairs
             let key;
             switch (prop[0].type) {
-                case ScriptingSourceTreeExp_1.T_LITERAL:
+                case ScriptingSourceTree_1.T_LITERAL:
                     key = prop[0].value;
                     break;
-                case ScriptingSourceTreeExp_1.T_IDENTIFIER:
+                case ScriptingSourceTree_1.T_IDENTIFIER:
                     key = prop[0].name;
                     break;
                 default:
@@ -312,11 +312,11 @@ function evalFunctionInvocationAsync(evaluator, thisStack, expr, evalContext, th
         let implicitContextObject = null;
         let hostObject;
         // --- Check for contexted object
-        if (expr.obj.type === ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION) {
+        if (expr.obj.type === ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION) {
             hostObject = yield evaluator(thisStack, expr.obj.obj, evalContext, thread);
             yield completeExprValue(expr.obj.obj, thread);
             functionObj = (0, eval_tree_common_1.evalMemberAccessCore)(thisStack, expr.obj, evalContext, thread);
-            if (expr.obj.obj.type === ScriptingSourceTreeExp_1.T_IDENTIFIER && (hostObject === null || hostObject === void 0 ? void 0 : hostObject._SUPPORT_IMPLICIT_CONTEXT)) {
+            if (expr.obj.obj.type === ScriptingSourceTree_1.T_IDENTIFIER && (hostObject === null || hostObject === void 0 ? void 0 : hostObject._SUPPORT_IMPLICIT_CONTEXT)) {
                 implicitContextObject = hostObject;
             }
         }
@@ -333,7 +333,7 @@ function evalFunctionInvocationAsync(evaluator, thisStack, expr, evalContext, th
             functionArgs.push(functionObj.args, evalContext, thread, ...expr.arguments.map((a) => (Object.assign(Object.assign({}, a), { _EXPRESSION_: true }))));
             functionObj = yield createArrowFunctionAsync(evaluator, functionObj);
         }
-        else if (expr.obj.type === ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION) {
+        else if (expr.obj.type === ScriptingSourceTree_1.T_ARROW_EXPRESSION) {
             // --- We delay evaluating expression values. We pass the argument names as the first parameter, and then
             // --- all parameter expressions
             functionArgs.push(expr.obj.args.map((a) => a.name), evalContext, thread, ...expr.arguments.map((a) => (Object.assign(Object.assign({}, a), { _EXPRESSION_: true }))));
@@ -342,7 +342,7 @@ function evalFunctionInvocationAsync(evaluator, thisStack, expr, evalContext, th
             // --- We evaluate the argument values to pass to a JavaScript function
             for (let i = 0; i < expr.arguments.length; i++) {
                 const arg = expr.arguments[i];
-                if (arg.type === ScriptingSourceTreeExp_1.T_SPREAD_EXPRESSION) {
+                if (arg.type === ScriptingSourceTree_1.T_SPREAD_EXPRESSION) {
                     yield evaluator([], arg.expr, evalContext, thread);
                     const funcArg = yield completeExprValue(arg.expr, thread);
                     if (!Array.isArray(funcArg)) {
@@ -351,7 +351,7 @@ function evalFunctionInvocationAsync(evaluator, thisStack, expr, evalContext, th
                     functionArgs.push(...funcArg);
                 }
                 else {
-                    if (arg.type === ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION) {
+                    if (arg.type === ScriptingSourceTree_1.T_ARROW_EXPRESSION) {
                         const funcArg = yield createArrowFunctionAsync(evaluator, arg);
                         const wrappedFunc = (...args) => __awaiter(this, void 0, void 0, function* () {
                             return funcArg(arg.args, evalContext, thread, ...args);
@@ -450,26 +450,26 @@ function createArrowFunctionAsync(evaluator, expr) {
                 const argSpec = argSpecs[i];
                 let decl;
                 switch (argSpec.type) {
-                    case ScriptingSourceTreeExp_1.T_IDENTIFIER: {
+                    case ScriptingSourceTree_1.T_IDENTIFIER: {
                         decl = {
-                            type: ScriptingSourceTreeExp_1.T_VAR_DECLARATION,
+                            type: ScriptingSourceTree_1.T_VAR_DECLARATION,
                             id: argSpec.name,
                         };
                         break;
                     }
-                    case ScriptingSourceTreeExp_1.T_DESTRUCTURE: {
+                    case ScriptingSourceTree_1.T_DESTRUCTURE: {
                         decl = {
-                            type: ScriptingSourceTreeExp_1.T_VAR_DECLARATION,
+                            type: ScriptingSourceTree_1.T_VAR_DECLARATION,
                             id: argSpec.id,
                             aDestr: argSpec.aDestr,
                             oDestr: argSpec.oDestr,
                         };
                         break;
                     }
-                    case ScriptingSourceTreeExp_1.T_SPREAD_EXPRESSION: {
+                    case ScriptingSourceTree_1.T_SPREAD_EXPRESSION: {
                         restFound = true;
                         decl = {
-                            type: ScriptingSourceTreeExp_1.T_VAR_DECLARATION,
+                            type: ScriptingSourceTree_1.T_VAR_DECLARATION,
                             id: argSpec.expr.name,
                         };
                         break;
@@ -506,19 +506,19 @@ function createArrowFunctionAsync(evaluator, expr) {
             let returnValue;
             let statements;
             switch (expr.statement.type) {
-                case ScriptingSourceTreeExp_1.T_EMPTY_STATEMENT:
+                case ScriptingSourceTree_1.T_EMPTY_STATEMENT:
                     statements = [];
                     break;
-                case ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT:
+                case ScriptingSourceTree_1.T_EXPRESSION_STATEMENT:
                     // --- Create a new thread for the call
                     statements = [
                         {
-                            type: ScriptingSourceTreeExp_1.T_RETURN_STATEMENT,
+                            type: ScriptingSourceTree_1.T_RETURN_STATEMENT,
                             expr: expr.statement.expr,
                         },
                     ];
                     break;
-                case ScriptingSourceTreeExp_1.T_BLOCK_STATEMENT:
+                case ScriptingSourceTree_1.T_BLOCK_STATEMENT:
                     // --- Create a new thread for the call
                     statements = expr.statement.stmts;
                     break;

package/dist/scripts/src/components-core/script-runner/eval-tree-common.js

@@ -16,7 +16,7 @@ exports.evalPreOrPostCore = evalPreOrPostCore;
 exports.evalArrow = evalArrow;
 exports.obtainClosures = obtainClosures;
 exports.evalTemplateLiteralCore = evalTemplateLiteralCore;
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 // --- Get the cached expression value
 function getExprValue(expr, thread) {
     var _a, _b;
@@ -129,12 +129,12 @@ function evalIdentifier(thisStack, expr, evalContext, thread) {
 // --- Gets the scope of the root ID
 function getRootIdScope(expr, evalContext, thread) {
     switch (expr.type) {
-        case ScriptingSourceTreeExp_1.T_IDENTIFIER:
+        case ScriptingSourceTree_1.T_IDENTIFIER:
             const idScope = getIdentifierScope(expr, evalContext, thread);
             return { type: idScope.type, name: expr.name };
-        case ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION:
+        case ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION:
             return getRootIdScope(expr.obj, evalContext, thread);
-        case ScriptingSourceTreeExp_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
+        case ScriptingSourceTree_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
             return getRootIdScope(expr.obj, evalContext, thread);
     }
     return null;
@@ -316,7 +316,7 @@ function evalAssignmentCore(thisStack, expr, evalContext, thread) {
         throw new Error(`Unknown left-hand value`);
     }
     // --- Check for const value
-    if (expr.leftValue.type === ScriptingSourceTreeExp_1.T_IDENTIFIER) {
+    if (expr.leftValue.type === ScriptingSourceTree_1.T_IDENTIFIER) {
         if (isConstVar(expr.leftValue.name, thread)) {
             throw new Error("A const variable cannot be modified");
         }
@@ -387,17 +387,17 @@ function evalPreOrPostCore(thisStack, expr, evalContext, thread) {
         throw new Error(`Evaluation of ${expr.op} requires a left-hand value.`);
     }
     // --- Check for const value
-    if (expr.expr.type === ScriptingSourceTreeExp_1.T_IDENTIFIER) {
+    if (expr.expr.type === ScriptingSourceTree_1.T_IDENTIFIER) {
         if (isConstVar(expr.expr.name, thread)) {
             // --- We cannot modify a const value
             throw new Error("A const variable cannot be modified");
         }
     }
     const value = expr.op === "++"
-        ? expr.type === ScriptingSourceTreeExp_1.T_PREFIX_OP_EXPRESSION
+        ? expr.type === ScriptingSourceTree_1.T_PREFIX_OP_EXPRESSION
             ? ++operand.valueScope[operand.valueIndex]
             : operand.valueScope[operand.valueIndex]++
-        : expr.type === ScriptingSourceTreeExp_1.T_PREFIX_OP_EXPRESSION
+        : expr.type === ScriptingSourceTree_1.T_PREFIX_OP_EXPRESSION
             ? --operand.valueScope[operand.valueIndex]
             : operand.valueScope[operand.valueIndex]--;
     setExprValue(expr, { value }, thread);