xmlui 0.9.1 → 0.9.3

package/dist/scripts/src/components-core/script-runner/process-statement-sync.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStatementQueue = processStatementQueue;
 exports.processDeclarations = processDeclarations;
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 const reportEngineError_1 = require("../reportEngineError");
 const EngineError_1 = require("../EngineError");
 const process_statement_common_1 = require("./process-statement-common");
 const eval_tree_sync_1 = require("./eval-tree-sync");
 const statement_queue_1 = require("./statement-queue");
-const Parser_1 = require("../../parsers/scripting-exp/Parser");
+const Parser_1 = require("../../parsers/scripting/Parser");
 const SYNC_EVAL_TIMEOUT = 1000;
 // --- Helper function to process the entire queue synchronously
 function processStatementQueue(statements, evalContext, thread) {
@@ -115,18 +115,18 @@ function processStatement(statement, execInfo, evalContext, thread) {
     let clearToLabel;
     // --- Process the statement according to its type
     switch (statement.type) {
-        case ScriptingSourceTreeExp_1.T_FUNCTION_DECLARATION:
+        case ScriptingSourceTree_1.T_FUNCTION_DECLARATION:
             // --- Function declarations are already hoisted, nothing to do
             break;
-        case ScriptingSourceTreeExp_1.T_VAR_STATEMENT:
+        case ScriptingSourceTree_1.T_VAR_STATEMENT:
             if (thread !== evalContext.mainThread) {
                 throw new Error("'var' declarations are not allowed within functions");
             }
             break;
-        case ScriptingSourceTreeExp_1.T_EMPTY_STATEMENT:
+        case ScriptingSourceTree_1.T_EMPTY_STATEMENT:
             // --- Nothing to do
             break;
-        case ScriptingSourceTreeExp_1.T_BLOCK_STATEMENT:
+        case ScriptingSourceTree_1.T_BLOCK_STATEMENT:
             // --- No statement, nothing to process
             if (statement.stmts.length === 0)
                 break;
@@ -142,21 +142,21 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 (0, process_statement_common_1.closing)(),
             ]);
             break;
-        case ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT:
+        case ScriptingSourceTree_1.T_EXPRESSION_STATEMENT:
             // --- Just evaluate it
             const statementValue = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
             if (thread.blocks && thread.blocks.length !== 0) {
                 thread.blocks[thread.blocks.length - 1].returnValue = statementValue;
             }
             break;
-        case ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION_STATEMENT:
+        case ScriptingSourceTree_1.T_ARROW_EXPRESSION_STATEMENT:
             // --- Compile the arrow expression
             const arrowFuncValue = (0, eval_tree_sync_1.executeArrowExpressionSync)(statement.expr, evalContext, thread, ...((_b = evalContext.eventArgs) !== null && _b !== void 0 ? _b : []));
             if (thread.blocks && thread.blocks.length !== 0) {
                 thread.blocks[thread.blocks.length - 1].returnValue = arrowFuncValue;
             }
             break;
-        case ScriptingSourceTreeExp_1.T_LET_STATEMENT: {
+        case ScriptingSourceTree_1.T_LET_STATEMENT: {
             // --- Create a new variable in the innermost scope
             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (!block) {
@@ -165,7 +165,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             processDeclarations(block, evalContext, thread, statement.decls);
             break;
         }
-        case ScriptingSourceTreeExp_1.T_CONST_STATEMENT: {
+        case ScriptingSourceTree_1.T_CONST_STATEMENT: {
             // --- Create a new variable in the innermost scope
             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (!block) {
@@ -174,7 +174,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             processDeclarations(block, evalContext, thread, statement.decls, true);
             break;
         }
-        case ScriptingSourceTreeExp_1.T_IF_STATEMENT:
+        case ScriptingSourceTree_1.T_IF_STATEMENT:
             // --- Evaluate the condition
             const condition = !!(0, eval_tree_sync_1.evalBinding)(statement.cond, evalContext, thread);
             if (condition) {
@@ -184,7 +184,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 toUnshift = (0, statement_queue_1.mapToItem)(statement.elseB);
             }
             break;
-        case ScriptingSourceTreeExp_1.T_RETURN_STATEMENT: {
+        case ScriptingSourceTree_1.T_RETURN_STATEMENT: {
             // --- Check if return is valid here
             let blockScope = (0, process_statement_common_1.innermostBlockScope)(thread);
             if (blockScope === undefined) {
@@ -213,7 +213,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_WHILE_STATEMENT: {
+        case ScriptingSourceTree_1.T_WHILE_STATEMENT: {
             // --- Create or get the loop's scope (guard is falsy for the first execution)
             let loopScope = execInfo.guard ? (0, process_statement_common_1.innermostLoopScope)(thread) : (0, process_statement_common_1.createLoopScope)(thread);
             // --- Evaluate the loop condition
@@ -227,7 +227,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_DO_WHILE_STATEMENT: {
+        case ScriptingSourceTree_1.T_DO_WHILE_STATEMENT: {
             if (!execInfo.guard) {
                 // --- First loop execution (do-while is a post-test loop)
                 toUnshift = (0, process_statement_common_1.provideLoopBody)((0, process_statement_common_1.createLoopScope)(thread), statement, thread.breakLabelValue);
@@ -244,7 +244,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_CONTINUE_STATEMENT: {
+        case ScriptingSourceTree_1.T_CONTINUE_STATEMENT: {
             // --- Search for the innermost non-switch loop scope, release the switch scopes
             if (!thread.loops || thread.loops.length === 0) {
                 throw new Error("Missing loop scope");
@@ -276,7 +276,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_BREAK_STATEMENT: {
+        case ScriptingSourceTree_1.T_BREAK_STATEMENT: {
             const loopScope = (0, process_statement_common_1.innermostLoopScope)(thread);
             if (loopScope === undefined) {
                 throw new Error("Missing loop scope");
@@ -303,7 +303,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_FOR_STATEMENT:
+        case ScriptingSourceTree_1.T_FOR_STATEMENT:
             if (!execInfo.guard) {
                 // --- Init the loop with a new scope
                 (0, process_statement_common_1.createLoopScope)(thread, 1);
@@ -328,7 +328,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
                     if (statement.upd) {
                         const updateStmt = {
                             statement: {
-                                type: ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT,
+                                type: ScriptingSourceTree_1.T_EXPRESSION_STATEMENT,
                                 nodeId: (0, Parser_1.createXmlUiTreeNodeId)(),
                                 expr: statement.upd,
                             },
@@ -356,7 +356,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 }
             }
             break;
-        case ScriptingSourceTreeExp_1.T_FOR_IN_STATEMENT:
+        case ScriptingSourceTree_1.T_FOR_IN_STATEMENT:
             if (!execInfo.guard) {
                 // --- Get the object keys
                 const keyedObject = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
@@ -385,14 +385,14 @@ function processStatement(statement, execInfo, evalContext, thread) {
                     switch (statement.varB) {
                         case "none": {
                             const assigmentExpr = {
-                                type: ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION,
+                                type: ScriptingSourceTree_1.T_ASSIGNMENT_EXPRESSION,
                                 leftValue: {
-                                    type: ScriptingSourceTreeExp_1.T_IDENTIFIER,
+                                    type: ScriptingSourceTree_1.T_IDENTIFIER,
                                     name: statement.id.name,
                                 },
                                 op: "=",
                                 expr: {
-                                    type: ScriptingSourceTreeExp_1.T_LITERAL,
+                                    type: ScriptingSourceTree_1.T_LITERAL,
                                     value: propValue,
                                 },
                             };
@@ -432,7 +432,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 }
             }
             break;
-        case ScriptingSourceTreeExp_1.T_FOR_OF_STATEMENT:
+        case ScriptingSourceTree_1.T_FOR_OF_STATEMENT:
             if (!execInfo.guard) {
                 // --- Get the object keys
                 const iteratorObject = (0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread);
@@ -466,14 +466,14 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 switch (statement.varB) {
                     case "none": {
                         const assigmentExpr = {
-                            type: ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION,
+                            type: ScriptingSourceTree_1.T_ASSIGNMENT_EXPRESSION,
                             leftValue: {
-                                type: ScriptingSourceTreeExp_1.T_IDENTIFIER,
+                                type: ScriptingSourceTree_1.T_IDENTIFIER,
                                 name: statement.id.name,
                             },
                             op: "=",
                             expr: {
-                                type: ScriptingSourceTreeExp_1.T_LITERAL,
+                                type: ScriptingSourceTree_1.T_LITERAL,
                                 value: propValue,
                             },
                         };
@@ -508,10 +508,10 @@ function processStatement(statement, execInfo, evalContext, thread) {
                 loopScope.continueLabel = toUnshift[1].label;
             }
             break;
-        case ScriptingSourceTreeExp_1.T_THROW_STATEMENT: {
+        case ScriptingSourceTree_1.T_THROW_STATEMENT: {
             throw new EngineError_1.ThrowStatementError((0, eval_tree_sync_1.evalBinding)(statement.expr, evalContext, thread));
         }
-        case ScriptingSourceTreeExp_1.T_TRY_STATEMENT: {
+        case ScriptingSourceTree_1.T_TRY_STATEMENT: {
             if (!execInfo.guard) {
                 // --- Execute the try block
                 toUnshift = (0, process_statement_common_1.provideTryBody)(thread, (0, process_statement_common_1.createTryScope)(thread, statement));
@@ -614,7 +614,7 @@ function processStatement(statement, execInfo, evalContext, thread) {
             }
             break;
         }
-        case ScriptingSourceTreeExp_1.T_SWITCH_STATEMENT: {
+        case ScriptingSourceTree_1.T_SWITCH_STATEMENT: {
             // --- Create or get the loop's scope (guard is falsy for the first execution)
             if (execInfo.guard) {
                 // --- Complete the switch

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectVariableDependencies = collectVariableDependencies;
 const lodash_es_1 = require("lodash-es");
 const eval_tree_common_1 = require("./eval-tree-common");
-const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const ScriptingSourceTree_1 = require("../../abstractions/scripting/ScriptingSourceTree");
 const process_statement_common_1 = require("./process-statement-common");
 /**
  * Collects the name of local context variables the specified program depends on
@@ -26,21 +26,21 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
             program.forEach((stmt) => {
                 let stmtDeps = [];
                 switch (stmt.type) {
-                    case ScriptingSourceTreeExp_1.T_BLOCK_STATEMENT:
+                    case ScriptingSourceTree_1.T_BLOCK_STATEMENT:
                         thread.blocks.push({ vars: {} });
                         stmtDeps = collectDependencies(stmt.stmts, stmt, "block");
                         thread.blocks.pop();
                         break;
-                    case ScriptingSourceTreeExp_1.T_EXPRESSION_STATEMENT:
+                    case ScriptingSourceTree_1.T_EXPRESSION_STATEMENT:
                         stmtDeps = collectDependencies(stmt.expr, stmt, "expression");
                         break;
-                    case ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION_STATEMENT:
+                    case ScriptingSourceTree_1.T_ARROW_EXPRESSION_STATEMENT:
                         thread.blocks.push({ vars: {} });
                         stmtDeps = collectDependencies(stmt.expr, stmt, "arrow");
                         thread.blocks.pop();
                         break;
-                    case ScriptingSourceTreeExp_1.T_LET_STATEMENT:
-                    case ScriptingSourceTreeExp_1.T_CONST_STATEMENT:
+                    case ScriptingSourceTree_1.T_LET_STATEMENT:
+                    case ScriptingSourceTree_1.T_CONST_STATEMENT:
                         processDeclarations((0, process_statement_common_1.innermostBlockScope)(thread), stmt.decls);
                         stmt.decls.forEach((decl) => {
                             if (decl.expr) {
@@ -48,27 +48,27 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                             }
                         });
                         break;
-                    case ScriptingSourceTreeExp_1.T_IF_STATEMENT:
+                    case ScriptingSourceTree_1.T_IF_STATEMENT:
                         stmtDeps = collectDependencies(stmt.cond, stmt, "if");
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.thenB], stmt, "if"));
                         if (stmt.elseB) {
                             stmtDeps = stmtDeps.concat(collectDependencies([stmt.elseB], stmt, "if"));
                         }
                         break;
-                    case ScriptingSourceTreeExp_1.T_RETURN_STATEMENT:
+                    case ScriptingSourceTree_1.T_RETURN_STATEMENT:
                         if (stmt.expr) {
                             stmtDeps = collectDependencies(stmt.expr, stmt, "return");
                         }
                         break;
-                    case ScriptingSourceTreeExp_1.T_WHILE_STATEMENT:
+                    case ScriptingSourceTree_1.T_WHILE_STATEMENT:
                         stmtDeps = collectDependencies(stmt.cond, stmt, "while");
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.body], stmt, "while"));
                         break;
-                    case ScriptingSourceTreeExp_1.T_DO_WHILE_STATEMENT:
+                    case ScriptingSourceTree_1.T_DO_WHILE_STATEMENT:
                         stmtDeps = collectDependencies(stmt.cond, stmt, "doWhile");
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.body], stmt, "doWhile"));
                         break;
-                    case ScriptingSourceTreeExp_1.T_FOR_STATEMENT:
+                    case ScriptingSourceTree_1.T_FOR_STATEMENT:
                         thread.blocks.push({ vars: {} });
                         if (stmt.init) {
                             stmtDeps.concat(collectDependencies([stmt.init], stmt, "for"));
@@ -82,7 +82,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.body], stmt, "for"));
                         thread.blocks.pop();
                         break;
-                    case ScriptingSourceTreeExp_1.T_FOR_IN_STATEMENT:
+                    case ScriptingSourceTree_1.T_FOR_IN_STATEMENT:
                         thread.blocks.push({ vars: {} });
                         if (stmt.varB !== "none") {
                             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
@@ -92,7 +92,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.body], stmt, "forIn"));
                         thread.blocks.pop();
                         break;
-                    case ScriptingSourceTreeExp_1.T_FOR_OF_STATEMENT:
+                    case ScriptingSourceTree_1.T_FOR_OF_STATEMENT:
                         thread.blocks.push({ vars: {} });
                         if (stmt.varB !== "none") {
                             const block = (0, process_statement_common_1.innermostBlockScope)(thread);
@@ -102,10 +102,10 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         stmtDeps = stmtDeps.concat(collectDependencies([stmt.body], stmt, "forOf"));
                         thread.blocks.pop();
                         break;
-                    case ScriptingSourceTreeExp_1.T_THROW_STATEMENT:
+                    case ScriptingSourceTree_1.T_THROW_STATEMENT:
                         stmtDeps = collectDependencies(stmt.expr, stmt, "throw");
                         break;
-                    case ScriptingSourceTreeExp_1.T_TRY_STATEMENT:
+                    case ScriptingSourceTree_1.T_TRY_STATEMENT:
                         stmtDeps = collectDependencies([stmt.tryB], stmt, "try");
                         if (stmt.catchB) {
                             thread.blocks.push({ vars: {} });
@@ -120,7 +120,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                             stmtDeps = stmtDeps.concat(collectDependencies([stmt.finallyB], stmt, "finallyBlock"));
                         }
                         break;
-                    case ScriptingSourceTreeExp_1.T_SWITCH_STATEMENT:
+                    case ScriptingSourceTree_1.T_SWITCH_STATEMENT:
                         stmtDeps = collectDependencies(stmt.expr, stmt, "switch");
                         stmt.cases.forEach((c) => {
                             if (c.caseE) {
@@ -139,17 +139,17 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
         else {
             // --- Visit expression
             switch (program.type) {
-                case ScriptingSourceTreeExp_1.T_IDENTIFIER:
+                case ScriptingSourceTree_1.T_IDENTIFIER:
                     // --- Any non-block-scoped variable is a dependency to return
                     const scope = (0, eval_tree_common_1.getIdentifierScope)(program, evalContext, thread);
                     return scope.type !== "block" ? [program.name] : [];
-                case ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION:
+                case ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION:
                     // --- Check for a simple member-access chain. If it exist, add the member to the chain with the "." syntax
                     const memberChain = traverseMemberAccessChain(program);
                     return memberChain
                         ? [memberChain]
                         : collectDependencies(program.obj, program, "memberAccess");
-                case ScriptingSourceTreeExp_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
+                case ScriptingSourceTree_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
                     // --- Check for a simple member-access chain. If it exist, add the member to the chain with the "[]" syntax
                     const calcMemberChain = traverseMemberAccessChain(program);
                     if (calcMemberChain) {
@@ -157,20 +157,20 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                     }
                     let calcDeps = collectDependencies(program.obj, program, "calculatedMember");
                     return calcDeps.concat(collectDependencies(program.member, program, "calculatedMember"));
-                case ScriptingSourceTreeExp_1.T_SEQUENCE_EXPRESSION:
+                case ScriptingSourceTree_1.T_SEQUENCE_EXPRESSION:
                     let sequenceDeps = [];
                     program.exprs.forEach((expr) => {
                         sequenceDeps = sequenceDeps.concat(collectDependencies(expr, program, "sequence"));
                     });
                     return sequenceDeps;
-                case ScriptingSourceTreeExp_1.T_FUNCTION_INVOCATION_EXPRESSION:
+                case ScriptingSourceTree_1.T_FUNCTION_INVOCATION_EXPRESSION:
                     let uncDeps = [];
                     (_a = program.arguments) === null || _a === void 0 ? void 0 : _a.forEach((arg) => {
                         uncDeps = uncDeps.concat(collectDependencies(arg, program, "functionInvocation"));
                     });
-                    if (program.obj.type === ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION) {
+                    if (program.obj.type === ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION) {
                         const caller = program.obj;
-                        if (caller.obj.type === ScriptingSourceTreeExp_1.T_IDENTIFIER) {
+                        if (caller.obj.type === ScriptingSourceTree_1.T_IDENTIFIER) {
                             if (typeof (0, lodash_es_1.get)(referenceTrackedApis, `${caller.obj.name}.${caller.member}`) ===
                                 "function") {
                                 uncDeps.push(`${caller.obj.name}.${caller.member}`);
@@ -179,8 +179,8 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                                 uncDeps.push(`${caller.obj.name}`);
                             }
                         }
-                        else if (caller.obj.type === ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION ||
-                            caller.obj.type === ScriptingSourceTreeExp_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION) {
+                        else if (caller.obj.type === ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION ||
+                            caller.obj.type === ScriptingSourceTree_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION) {
                             uncDeps = uncDeps.concat(collectDependencies(caller.obj, caller, "functionInvocation"));
                         }
                         else {
@@ -191,7 +191,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         uncDeps = uncDeps.concat(collectDependencies(program.obj, program, "functionInvocation"));
                     }
                     return uncDeps;
-                case ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION:
+                case ScriptingSourceTree_1.T_ARROW_EXPRESSION:
                     // --- Process the current arguments
                     thread.blocks.push({ vars: {} });
                     const block = (0, process_statement_common_1.innermostBlockScope)(thread);
@@ -202,17 +202,17 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         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,
                                     nodeId: argSpec.nodeId,
                                     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,
                                     nodeId: argSpec.nodeId,
                                     id: argSpec.id,
                                     aDestr: argSpec.aDestr,
@@ -220,10 +220,10 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                                 };
                                 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,
                                     nodeId: argSpec.nodeId,
                                     id: argSpec.expr.name,
                                 };
@@ -241,7 +241,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                     thread.blocks.pop();
                     // --- Done
                     return arrowDeps;
-                case ScriptingSourceTreeExp_1.T_OBJECT_LITERAL:
+                case ScriptingSourceTree_1.T_OBJECT_LITERAL:
                     let objectDeps = [];
                     program.props.forEach((prop) => {
                         if (Array.isArray(prop)) {
@@ -252,7 +252,7 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         }
                     });
                     return objectDeps;
-                case ScriptingSourceTreeExp_1.T_ARRAY_LITERAL:
+                case ScriptingSourceTree_1.T_ARRAY_LITERAL:
                     let arrayDeps = [];
                     program.items.forEach((expr) => {
                         if (expr) {
@@ -260,21 +260,21 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
                         }
                     });
                     return arrayDeps;
-                case ScriptingSourceTreeExp_1.T_UNARY_EXPRESSION:
+                case ScriptingSourceTree_1.T_UNARY_EXPRESSION:
                     return collectDependencies(program.expr, program, "unary");
-                case ScriptingSourceTreeExp_1.T_PREFIX_OP_EXPRESSION:
+                case ScriptingSourceTree_1.T_PREFIX_OP_EXPRESSION:
                     return collectDependencies(program.expr, program, "prefix");
-                case ScriptingSourceTreeExp_1.T_POSTFIX_OP_EXPRESSION:
+                case ScriptingSourceTree_1.T_POSTFIX_OP_EXPRESSION:
                     return collectDependencies(program.expr, program, "postfix");
-                case ScriptingSourceTreeExp_1.T_BINARY_EXPRESSION:
+                case ScriptingSourceTree_1.T_BINARY_EXPRESSION:
                     return collectDependencies(program.left, program, "left").concat(collectDependencies(program.right, program, "right"));
-                case ScriptingSourceTreeExp_1.T_ASSIGNMENT_EXPRESSION:
+                case ScriptingSourceTree_1.T_ASSIGNMENT_EXPRESSION:
                     return collectDependencies(program.expr, program, "right");
-                case ScriptingSourceTreeExp_1.T_CONDITIONAL_EXPRESSION:
+                case ScriptingSourceTree_1.T_CONDITIONAL_EXPRESSION:
                     return collectDependencies(program.cond, program, "condition").concat(collectDependencies(program.thenE, program, "trueExpr"), collectDependencies(program.elseE, program, "falseExpr"));
-                case ScriptingSourceTreeExp_1.T_VAR_DECLARATION:
+                case ScriptingSourceTree_1.T_VAR_DECLARATION:
                     return collectDependencies(program.expr, program, "varDeclaration");
-                case ScriptingSourceTreeExp_1.T_SPREAD_EXPRESSION:
+                case ScriptingSourceTree_1.T_SPREAD_EXPRESSION:
                     return collectDependencies(program.expr, program, "spread");
             }
         }
@@ -285,22 +285,22 @@ function collectVariableDependencies(program, referenceTrackedApis = {}) {
     function traverseMemberAccessChain(expr) {
         var _a, _b;
         switch (expr.type) {
-            case ScriptingSourceTreeExp_1.T_MEMBER_ACCESS_EXPRESSION:
+            case ScriptingSourceTree_1.T_MEMBER_ACCESS_EXPRESSION:
                 const memberChain = traverseMemberAccessChain(expr.obj);
                 return memberChain ? `${memberChain}.${expr.member}` : null;
-            case ScriptingSourceTreeExp_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
+            case ScriptingSourceTree_1.T_CALCULATED_MEMBER_ACCESS_EXPRESSION:
                 let value = null;
-                if (expr.member.type === ScriptingSourceTreeExp_1.T_LITERAL) {
+                if (expr.member.type === ScriptingSourceTree_1.T_LITERAL) {
                     value = `'${(_b = (_a = expr.member.value) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : null}'`;
                 }
-                else if (expr.member.type === ScriptingSourceTreeExp_1.T_IDENTIFIER) {
+                else if (expr.member.type === ScriptingSourceTree_1.T_IDENTIFIER) {
                     value = expr.member.name;
                 }
                 if (!value)
                     break;
                 const calcMemberChain = traverseMemberAccessChain(expr.obj);
                 return calcMemberChain ? `${calcMemberChain}[${value}]` : null;
-            case ScriptingSourceTreeExp_1.T_IDENTIFIER:
+            case ScriptingSourceTree_1.T_IDENTIFIER:
                 const scope = (0, eval_tree_common_1.getIdentifierScope)(expr, evalContext, thread);
                 return scope.type !== "block" ? expr.name : null;
         }

package/dist/scripts/src/components-core/theming/ThemeProvider.js

@@ -45,7 +45,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.builtInThemes = void 0;
 exports.useCompiledTheme = useCompiledTheme;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const abstractions_1 = require("./abstractions");
 const react_1 = require("react");
 const transformThemeVars_1 = require("./transformThemeVars");
 const misc_1 = require("../utils/misc");
@@ -58,6 +57,7 @@ const ComponentRegistryContext_1 = require("../../components/ComponentRegistryCo
 const xmlui_1 = require("../theming/themes/xmlui");
 const solid_1 = require("../theming/themes/solid");
 const hooks_1 = require("../utils/hooks");
+const ThemingDefs_1 = require("../../abstractions/ThemingDefs");
 function useCompiledTheme(activeTheme, activeTone, themes = constants_1.EMPTY_ARRAY, resources = constants_1.EMPTY_OBJECT, resourceMap = constants_1.EMPTY_OBJECT) {
     const componentRegistry = (0, ComponentRegistryContext_1.useComponentRegistry)();
     const { componentThemeVars, componentDefaultThemeVars } = componentRegistry;
@@ -204,7 +204,7 @@ exports.builtInThemes = [
 function ThemeProvider({ children, themes: custThemes = constants_1.EMPTY_ARRAY, defaultTheme = "xmlui", defaultTone = "light", resources = constants_1.EMPTY_OBJECT, resourceMap = constants_1.EMPTY_OBJECT, }) {
     const [activeThemeTone, setActiveThemeTone] = (0, react_1.useState)(() => {
         if (!defaultTone) {
-            return abstractions_1.ThemeToneKeys[0];
+            return ThemingDefs_1.ThemeToneKeys[0];
         }
         return defaultTone;
     });

package/dist/scripts/src/components-core/theming/themes/root.js

@@ -8,7 +8,7 @@ const { $colorSurface0, $colorSurface50, $colorSurface100, $colorSurface200, $co
 exports.RootThemeDefinition = {
     id: "root",
     resources: {
-        "font.inter": "https://rsms.me/inter/inter.css",
+    // "font.inter": "https://rsms.me/inter/inter.css",
     },
     themeVars: {
         // --- The unit of measurement for all sizes/spaces