xmlui 0.8.6 → 0.9.0

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

@@ -5,6 +5,9 @@ exports.innermostBlockScope = innermostBlockScope;
 exports.innermostTryScope = innermostTryScope;
 exports.createLoopScope = createLoopScope;
 exports.releaseLoopScope = releaseLoopScope;
+exports.toStatementItems = toStatementItems;
+exports.guard = guard;
+exports.closing = closing;
 exports.provideLoopBody = provideLoopBody;
 exports.createTryScope = createTryScope;
 exports.provideTryBody = provideTryBody;
@@ -13,8 +16,10 @@ exports.provideFinallyBody = provideFinallyBody;
 exports.provideFinallyErrorBody = provideFinallyErrorBody;
 exports.ensureMainThread = ensureMainThread;
 exports.hoistFunctionDeclarations = hoistFunctionDeclarations;
-const modules_1 = require("../../parsers/scripting/modules");
+const ScriptingSourceTreeExp_1 = require("../../abstractions/scripting/ScriptingSourceTreeExp");
+const eval_tree_common_1 = require("./eval-tree-common");
 const statement_queue_1 = require("./statement-queue");
+const Parser_1 = require("../../parsers/scripting-exp/Parser");
 function innermostLoopScope(thread) {
     if (!thread.loops || thread.loops.length === 0) {
         throw new Error("Missing loop scope");
@@ -54,14 +59,31 @@ function releaseLoopScope(thread, skipContinuation = true) {
         (_a = thread.loops) === null || _a === void 0 ? void 0 : _a.pop();
     }
     if (thread.blocks) {
-        thread.blocks.length = skipContinuation ? loopScope.breakBlockDepth : loopScope.continueBlockDepth;
+        thread.blocks.length = skipContinuation
+            ? loopScope.breakBlockDepth
+            : loopScope.continueBlockDepth;
     }
 }
+// --- Converts statement to queable items
+function toStatementItems(statements) {
+    return statements.map((s) => ({ statement: s }));
+}
+// --- Create a guarded statement for the specified one
+function guard(statement) {
+    return { statement, execInfo: { guard: true } };
+}
+// --- Create a closing statement that removes the block scope
+function closing() {
+    return {
+        statement: { type: ScriptingSourceTreeExp_1.T_EMPTY_STATEMENT, nodeId: (0, Parser_1.createXmlUiTreeNodeId)() },
+        execInfo: { removeBlockScope: true },
+    };
+}
 // --- Create a list of body statements according to the specified loop statement and scope
 function provideLoopBody(loopScope, loopStatement, breakLabelValue) {
     // --- Stay in the loop, add the body and the guard condition
-    const guardStatement = Object.assign(Object.assign({}, loopStatement), { guard: true });
-    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([loopStatement.body, guardStatement]);
+    const guardStatement = guard(loopStatement);
+    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([{ statement: loopStatement.body }, guardStatement]);
     // --- The next queue label is for "break"
     loopScope.breakLabel = breakLabelValue !== null && breakLabelValue !== void 0 ? breakLabelValue : -1;
     // --- The guard action's label is for "continue"
@@ -83,54 +105,47 @@ function createTryScope(thread, tryStatement) {
 // --- Provide a body for the try block
 function provideTryBody(thread, tryScope) {
     // --- Stay in the error handling block, add the body and the guard condition
-    const guardStatement = Object.assign(Object.assign({}, tryScope.statement), { guard: true });
+    const guardStatement = guard(tryScope.statement);
     // --- New block scope for try
     thread.blocks.push({
         vars: {},
     });
-    // --- Prepare an empty statement that will only remove the block scope when the entire block is processed
-    const closing = {
-        type: "EmptyS",
-        removeBlockScope: true,
-    }; // --- We need the cast as we do not provide required props
-    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([...tryScope.statement.tryBlock.statements, closing, guardStatement]);
+    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+        ...toStatementItems(tryScope.statement.tryB.stmts),
+        closing(),
+        guardStatement,
+    ]);
     tryScope.tryLabel = toUnshift[toUnshift.length - 1].label;
     return toUnshift;
 }
 // --- Provide a body for the catch block
 function provideCatchBody(thread, tryScope) {
     // --- Stay in the error handling block, add the body and the guard condition
-    const guardStatement = Object.assign(Object.assign({}, tryScope.statement), { guard: true });
+    const guardStatement = guard(tryScope.statement);
     // --- New block scope for catch
     thread.blocks.push({
         vars: {},
     });
-    // --- Prepare an empty statement that will only remove the block scope when the entire block is processed
-    const closing = {
-        type: "EmptyS",
-        removeBlockScope: true,
-    }; // --- We need the cast as we do not provide required props
-    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([...tryScope.statement.catchBlock.statements, closing, guardStatement]);
+    const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
+        ...toStatementItems(tryScope.statement.catchB.stmts),
+        closing(),
+        guardStatement,
+    ]);
     tryScope.tryLabel = toUnshift[toUnshift.length - 1].label;
     return toUnshift;
 }
 // --- Provide a body for the finally block
 function provideFinallyBody(thread, tryScope) {
     // --- Stay in the error handling block, add the body and the guard condition
-    const guardStatement = Object.assign(Object.assign({}, tryScope.statement), { guard: true });
+    const guardStatement = guard(tryScope.statement);
     // --- New block scope for finally
     thread.blocks.push({
         vars: {},
     });
-    // --- Prepare an empty statement that will only remove the block scope when the entire block is processed
-    const closing = {
-        type: "EmptyS",
-        removeBlockScope: true,
-    }; // --- We need the cast as we do not provide required props
-    const finallyBlock = tryScope.statement.finallyBlock;
+    const finallyBlock = tryScope.statement.finallyB;
     const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([
-        ...(finallyBlock ? finallyBlock.statements : []),
-        closing,
+        ...toStatementItems(finallyBlock ? finallyBlock.stmts : []),
+        closing(),
         guardStatement,
     ]);
     tryScope.tryLabel = toUnshift[toUnshift.length - 1].label;
@@ -139,7 +154,7 @@ function provideFinallyBody(thread, tryScope) {
 // --- Provide a body for the error block in finally
 function provideFinallyErrorBody(tryScope) {
     // --- Stay in the error handling block, add the body and the guard condition
-    const guardStatement = Object.assign(Object.assign({}, tryScope.statement), { guard: true });
+    const guardStatement = guard(tryScope.statement);
     const toUnshift = (0, statement_queue_1.mapStatementsToQueueItems)([guardStatement]);
     tryScope.tryLabel = toUnshift[0].label;
     return toUnshift;
@@ -167,21 +182,21 @@ function hoistFunctionDeclarations(thread, statements) {
         throw new Error("Missing block scope");
     }
     statements
-        .filter((stmt) => stmt.type === "FuncD")
+        .filter((stmt) => stmt.type === ScriptingSourceTreeExp_1.T_FUNCTION_DECLARATION)
         .forEach((stmt) => {
         var _a;
         const funcDecl = stmt;
         // --- Turn the function into an arrow expression
         const arrowExpression = {
-            type: "ArrowE",
+            type: ScriptingSourceTreeExp_1.T_ARROW_EXPRESSION,
             args: funcDecl.args,
-            statement: funcDecl.statement,
-            closureContext: (0, modules_1.obtainClosures)(thread),
+            statement: funcDecl.stmt,
+            closureContext: (0, eval_tree_common_1.obtainClosures)(thread),
             _ARROW_EXPR_: true,
         };
         // --- Remove the functions from the closure list
         // --- Check name uniqueness
-        const id = funcDecl.name;
+        const id = funcDecl.id.name;
         if (block.vars[id]) {
             throw new Error(`Variable ${id} is already declared in the current scope.`);
         }