sandstone 1.1.4 → 1.1.5

package/dist/_internal/index.js

@@ -4408,6 +4408,7 @@ WorldBorderCommand = class WorldBorderCommand extends CommandArguments {
     };
   };
 ConditionNode = class ConditionNode extends Node {
+    preNodes;
   };
 SingleConditionNode = class SingleConditionNode extends ConditionNode {
     getValue = (negated = false) => {
@@ -4564,9 +4565,13 @@ DataPointEqualsConditionNode = class DataPointEqualsConditionNode extends Single
       this.value = value;
       const { DataVariable, Variable, commands: commands2 } = sandstoneCore2.pack;
       const { execute: execute2 } = commands2;
+      const mcFunction = sandstoneCore2.getCurrentMCFunctionOrThrow();
+      const before = mcFunction.body.length;
       const anon = DataVariable(this.dataPoint);
       this.conditional = Variable();
       execute2.store.result(this.conditional).run(() => anon.set(this.value));
+      const after = mcFunction.body.length;
+      this.preNodes = mcFunction.body.splice(before, after - before);
     }
     getValue = (negated) => (negated ? ["if", ...this.getCondition()] : ["unless", ...this.getCondition()]).join(" ");
     getCondition() {
@@ -4631,7 +4636,11 @@ CommandConditionNode = class CommandConditionNode extends SingleConditionNode {
       this.result = result;
       const store = sandstoneCore2.pack.commands.execute.store[type];
       this.variable = sandstoneCore2.pack.Variable(undefined, "condition");
+      const mcFunction = sandstoneCore2.getCurrentMCFunctionOrThrow();
+      const before = mcFunction.body.length;
       command(store(this.variable));
+      const after = mcFunction.body.length;
+      this.preNodes = mcFunction.body.splice(before, after - before);
     }
     getCondition() {
       if (this.type === "success") {
@@ -5128,54 +5137,186 @@ LoopTransformationVisitor = class LoopTransformationVisitor extends GenericSands
     visitForINode = this.visitLoopNode;
     visitForOfNode = this.visitLoopNode;
   };
+FunctionReturnConditionNode = class FunctionReturnConditionNode extends ConditionNode {
+    sandstoneCore;
+    functionName;
+    constructor(sandstoneCore2, functionName) {
+      super(sandstoneCore2);
+      this.sandstoneCore = sandstoneCore2;
+      this.functionName = functionName;
+    }
+    getValue = () => `if function ${this.functionName}`;
+  };
 OrTransformationVisitor = class OrTransformationVisitor extends GenericSandstoneVisitor {
     visitIfNode = (node_) => {
-      const { preNodes, conditionNode } = this.parseConditionNode(node_.condition);
+      const { preNodes, conditionNode } = this.parseConditionNode(node_.condition, node_.parentMCFunction);
       node_.condition = conditionNode;
       return [...preNodes, this.genericVisit(node_)];
     };
-    parseConditionNode = (node) => {
+    parseConditionNode = (node, parentMCFunction) => {
       if (node instanceof OrNode) {
-        return this.parseOrNode(node);
+        return this.parseOrNode(node, parentMCFunction);
       }
       if (node instanceof AndNode) {
-        return this.parseAndNode(node);
+        return this.parseAndNode(node, parentMCFunction);
       }
       if (node instanceof NotNode) {
-        return this.parseNotNode(node);
+        return this.parseNotNode(node, parentMCFunction);
       }
-      return { preNodes: [], conditionNode: node };
+      return { preNodes: [...node.preNodes ?? []], conditionNode: node };
     };
-    parseOrNode = (node) => {
-      const variable = this.core.pack.Variable(undefined, "condition");
-      const conditionNode = variable.equalTo(1)._toMinecraftCondition();
-      const realPreNodes = [new ScoreboardCommandNode(this.pack, "players", "reset", variable)];
-      const orExecuteNodes = node.conditions.map((condition2) => {
-        const { preNodes, conditionNode: parsedConditionNode } = this.parseConditionNode(condition2);
-        realPreNodes.push(...preNodes);
-        const ifNode = new IfNode(this.core, parsedConditionNode);
-        ifNode.body = [new ScoreboardCommandNode(this.pack, "players", "set", variable, 1)];
-        return ifNode;
+    parseOrNode = (node, parentMCFunction) => {
+      if (node.conditions.length === 1) {
+        return this.parseConditionNode(node.conditions[0], parentMCFunction);
+      }
+      const parentName = parentMCFunction?.resource.name ?? "__sandstone";
+      const orMCFunction = new MCFunctionClass(this.core, `${parentName}/or_check`, {
+        addToSandstoneCore: true,
+        creator: "sandstone",
+        onConflict: "rename"
       });
+      this.core.enterMCFunction(orMCFunction);
+      try {
+        for (const condition2 of node.conditions) {
+          this.pushCheckBranch(orMCFunction.node, this.parseConditionNode(condition2, orMCFunction.node), false, new ReturnCommandNode(this.pack, [1]));
+        }
+        orMCFunction.node.body.push(new ReturnCommandNode(this.pack, [0]));
+      } finally {
+        this.core.exitMCFunction();
+      }
       return {
-        preNodes: [...realPreNodes, ...orExecuteNodes],
-        conditionNode
+        preNodes: [],
+        conditionNode: new FunctionReturnConditionNode(this.core, orMCFunction.name)
       };
     };
-    parseAndNode = (node) => {
-      const finalPreNodes = [];
-      const conditionNode = new AndNode(node.sandstoneCore, node.conditions.map((condition2) => {
-        const { preNodes, conditionNode: conditionNode2 } = this.parseConditionNode(condition2);
-        finalPreNodes.push(...preNodes);
-        return conditionNode2;
-      }));
+    parseAndNode = (node, parentMCFunction) => {
+      if (node.conditions.length === 1) {
+        return this.parseConditionNode(node.conditions[0], parentMCFunction);
+      }
+      const parsed = node.conditions.map((condition2) => this.parseConditionNode(condition2, parentMCFunction));
+      const anyHasCommands = parsed.some((p) => (p.preNodes ?? []).length > 0);
+      if (!anyHasCommands) {
+        const finalPreNodes = [];
+        const conditionNode = new AndNode(node.sandstoneCore, parsed.map((p) => {
+          finalPreNodes.push(...p.preNodes);
+          return p.conditionNode;
+        }));
+        return { preNodes: finalPreNodes, conditionNode };
+      }
+      const parentName = parentMCFunction?.resource.name ?? "__sandstone";
+      const andMCFunction = new MCFunctionClass(this.core, `${parentName}/and_check`, {
+        addToSandstoneCore: true,
+        creator: "sandstone",
+        onConflict: "rename"
+      });
+      this.core.enterMCFunction(andMCFunction);
+      try {
+        let batch = { preNodes: [], conditionNodes: [] };
+        const flushBatch = () => {
+          if (batch.conditionNodes.length === 0 && batch.preNodes.every((pn) => pn.length === 0)) {
+            batch = { preNodes: [], conditionNodes: [] };
+            return;
+          }
+          const tracker = this.core.pack.Variable(undefined, "and_batch");
+          this.pushBatchedCheckBranch(andMCFunction.node, batch.preNodes.flat(), batch.conditionNodes, tracker);
+          batch = { preNodes: [], conditionNodes: [] };
+        };
+        for (const p of parsed) {
+          if (p.preNodes.length === 0) {
+            batch.preNodes.push(p.preNodes);
+            batch.conditionNodes.push(p.conditionNode);
+          } else {
+            flushBatch();
+            this.pushFailFastBranch(andMCFunction.node, p, new ReturnCommandNode(this.pack, [0]));
+          }
+        }
+        flushBatch();
+        andMCFunction.node.body.push(new ReturnCommandNode(this.pack, [1]));
+      } finally {
+        this.core.exitMCFunction();
+      }
       return {
-        preNodes: finalPreNodes,
-        conditionNode
+        preNodes: [],
+        conditionNode: new FunctionReturnConditionNode(this.core, andMCFunction.name)
       };
     };
-    parseNotNode = (node) => {
-      const { preNodes, conditionNode } = this.parseConditionNode(node.condition);
+    pushBatchedCheckBranch = (targetMCFunction, preNodes, conditionNodes, tracker) => {
+      for (const n of preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      targetMCFunction.body.push(new ScoreboardCommandNode(this.pack, "players", "reset", tracker));
+      const args = [];
+      for (const c of conditionNodes) {
+        const condStr = c.getValue(false);
+        const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+        if (!match) {
+          throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+        }
+        const [, keyword, condBody] = match;
+        args.push([keyword, condBody]);
+      }
+      if (args.length === 0) {
+        targetMCFunction.body.push(new ScoreboardCommandNode(this.pack, "players", "set", tracker, 1));
+      } else {
+        const executeNode = new ExecuteCommandNode(this.pack, args, {
+          isSingleExecute: true,
+          body: []
+        });
+        targetMCFunction.enterContext(executeNode, false);
+        executeNode.body = [new ScoreboardCommandNode(this.pack, "players", "set", tracker, 1)];
+        targetMCFunction.body.push(executeNode);
+        targetMCFunction.exitContext();
+      }
+      const failCheckNode = new ExecuteCommandNode(this.pack, [["unless", `score ${tracker} matches 1`]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(failCheckNode, false);
+      failCheckNode.body = [new ReturnCommandNode(this.pack, [0])];
+      targetMCFunction.body.push(failCheckNode);
+      targetMCFunction.exitContext();
+    };
+    pushCheckBranch = (targetMCFunction, parsed, negated, bodyNode) => {
+      for (const n of parsed.preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      const condStr = parsed.conditionNode.getValue(negated);
+      const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+      if (!match) {
+        throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+      }
+      const [, keyword, condBody] = match;
+      const executeNode = new ExecuteCommandNode(this.pack, [[keyword, condBody]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(executeNode, false);
+      executeNode.body = [bodyNode];
+      targetMCFunction.body.push(executeNode);
+      targetMCFunction.exitContext();
+    };
+    pushFailFastBranch = (targetMCFunction, parsed, bodyNode) => {
+      for (const n of parsed.preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      const condStr = parsed.conditionNode.getValue(true);
+      const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+      if (!match) {
+        throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+      }
+      const flippedKeyword = match[1] === "if" ? "unless" : "if";
+      const condBody = match[2];
+      const executeNode = new ExecuteCommandNode(this.pack, [[flippedKeyword, condBody]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(executeNode, false);
+      executeNode.body = [bodyNode];
+      targetMCFunction.body.push(executeNode);
+      targetMCFunction.exitContext();
+    };
+    parseNotNode = (node, parentMCFunction) => {
+      const { preNodes, conditionNode } = this.parseConditionNode(node.condition, parentMCFunction);
       return {
         preNodes,
         conditionNode: new NotNode(node.sandstoneCore, conditionNode)
@@ -6429,6 +6570,7 @@ SleepClass = class SleepClass extends AwaitNode {
 // src/variables/abstractClasses.ts
 
 class ConditionClass {
+  preNodes;
   _toMinecraftCondition() {
     throw new Error("Not implemented");
   }
@@ -10255,8 +10397,14 @@ class Flow {
     this.sandstoneCore = sandstoneCore2;
   }
   if = (condition2, callback) => new IfStatement(this.sandstoneCore, conditionToNode(condition2), callback);
-  and = (...conditions) => new AndNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
-  or = (...conditions) => new OrNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  and(...args) {
+    const conditions = args[0] instanceof Array ? args[0] : args;
+    return new AndNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  }
+  or(...args) {
+    const conditions = args[0] instanceof Array ? args[0] : args;
+    return new OrNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  }
   not = (condition2) => new NotNode(this.sandstoneCore, conditionToNode(condition2));
   get return() {
     return this.sandstoneCore.pack.commands.returnCmd;
@@ -10516,12 +10664,13 @@ var init_loopTransformationVisitor = __esm(() => {
   });
 
 // src/pack/visitors/orTransformationVisitor.ts
-var OrTransformationVisitor;
+var FunctionReturnConditionNode, OrTransformationVisitor;
 var init_orTransformationVisitor = __esm(() => {
   init_commands2();
+  init_core();
   init_flow();
   init_visitor();
-  });
+    });
 
 // src/pack/visitors/optimizeMacroTemporaries.ts
 var flattenArgs = (args) => args.flatMap((arg) => Array.isArray(arg) ? flattenArgs(arg) : [arg]), referencesStoragePoint = (node, point) => {
@@ -10763,10 +10912,11 @@ class SandstonePack {
     return pack;
   }
   setupLantern = () => {
-    const loadStatus = this.Objective.create("load.status", "dummy", undefined, { useDefaultNamespace: false });
+    const loadStatus = this.Objective.create("load.status", "dummy", undefined, { useDefaultNamespace: false, alreadyExists: true });
     const privateInit = this.Tag("function", "load:_private/init", [
       this.MCFunction("load:_private/init", () => {
         this.commands.comment("Reset scoreboards so packs can set values accurate for current load.");
+        this.commands.scoreboard.objectives.add(loadStatus.name, "dummy");
         loadStatus.reset();
       })
     ]);
@@ -54082,5 +54232,5 @@ export {
   ACTIVITIES_SET
 };
 
-//# debugId=C3B58667DCFE12B864756E2164756E21
+//# debugId=4AE8B281EBDAB42264756E2164756E21
 //# sourceMappingURL=index.js.map