Merge pull request code-dot-org#24634 from code-dot-org/auto-artist

Fix a couple auto artist bugs

Author: balderdash

apps/package.json

@@ -40,7 +40,7 @@
     "@cdo/apps": "file:src",
     "@cdo/interpreted": "link:../dashboard/config/libraries",
     "@code-dot-org/artist": "0.2.1",
-    "@code-dot-org/blockly": "3.1.1",
+    "@code-dot-org/blockly": "3.1.3",
     "@code-dot-org/bramble": "0.1.26",
     "@code-dot-org/craft": "0.1.5",
     "@code-dot-org/johnny-five": "0.11.1-cdo.2",

apps/src/lib/tools/jsinterpreter/CustomMarshalingInterpreter.js

@@ -4,12 +4,11 @@ const Interpreter = require('@code-dot-org/js-interpreter');
 const CustomMarshaler = require('./CustomMarshaler');
 
 const DEFAULT_MAX_STEPS = 5e5;
-
-const defaultExecutionInfo = {
+export const DEFAULT_EXECUTION_INFO = {
   ticks: DEFAULT_MAX_STEPS,
   checkTimeout: function () {
     if (this.ticks-- < 0) {
-      throw 'Infinity';
+      throw new Error('Infinity');
     }
   },
   isTerminated: () => false,
@@ -33,7 +32,7 @@ function isCanvasImageData(nativeVar) {
   return nativeVar instanceof CanvasPixelArray;
 }
 
-module.exports = class CustomMarshalingInterpreter extends Interpreter {
+export default class CustomMarshalingInterpreter extends Interpreter {
   constructor(code, customMarshaler, opt_initFunc) {
     super(code, (thisInterpreter, scope) => {
       if (!(customMarshaler instanceof CustomMarshaler)) {
@@ -411,7 +410,7 @@ module.exports = class CustomMarshalingInterpreter extends Interpreter {
     let interpreter, currentCallback, lastReturnValue;
     const hooks = [];
     const apis = {
-      executionInfo: defaultExecutionInfo,
+      executionInfo: DEFAULT_EXECUTION_INFO,
       ...scope,
     };
 
@@ -588,7 +587,7 @@ module.exports = class CustomMarshalingInterpreter extends Interpreter {
    */
   static evalWith(code, scope, {asyncFunctionList, legacy}={}) {
     const globals = {
-      executionInfo: defaultExecutionInfo,
+      executionInfo: DEFAULT_EXECUTION_INFO,
       ...scope,
     };
 
@@ -806,5 +805,4 @@ module.exports = class CustomMarshalingInterpreter extends Interpreter {
       );
     };
   }
-
-};
+}

apps/src/maze/maze.js

@@ -4,7 +4,7 @@ const Provider = require('react-redux').Provider;
 
 const timeoutList = require('../lib/util/timeoutList');
 import AppView from '../templates/AppView';
-const CustomMarshalingInterpreter = require('../lib/tools/jsinterpreter/CustomMarshalingInterpreter');
+const CustomMarshalingInterpreter = require('../lib/tools/jsinterpreter/CustomMarshalingInterpreter').default;
 const codegen = require('../lib/tools/jsinterpreter/codegen');
 const dom = require('../dom');
 const utils = require('../utils');

apps/src/turtle/artist.js

@@ -57,6 +57,7 @@ import {SignInState} from '../code-studio/progressRedux';
 import Visualization from '@code-dot-org/artist';
 import experiments from '../util/experiments';
 import {ArtistAutorunOptions} from '@cdo/apps/util/sharedConstants';
+import {DEFAULT_EXECUTION_INFO} from '@cdo/apps/lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 
 const CANVAS_HEIGHT = 400;
 const CANVAS_WIDTH = 400;
@@ -181,8 +182,6 @@ var Artist = function () {
 
   // these get set by init based on skin.
   this.speedSlider = null;
-
-  this.immovableBlocks = [];
 };
 
 module.exports = Artist;
@@ -305,6 +304,11 @@ Artist.prototype.init = function (config) {
     this.level.autoRun === ArtistAutorunOptions.limited_auto_run;
   this.autoRun = experiments.isEnabled('auto-artist') || this.level.autoRun;
 
+  this.executionInfo = { ...DEFAULT_EXECUTION_INFO };
+  if (this.level.maxTickCount !== undefined) {
+    this.executionInfo.ticks = this.level.maxTickCount;
+  }
+
   config.grayOutUndeletableBlocks = true;
   config.forceInsertTopBlock = 'when_run';
   config.dropletConfig = dropletConfig;
@@ -726,23 +730,29 @@ Artist.prototype.resetButtonClick = function () {
   }
 };
 
-Artist.prototype.evalCode = function (code) {
+Artist.prototype.evalCode = function (code, executionInfo=this.executionInfo) {
   try {
     CustomMarshalingInterpreter.evalWith(code, {
-      Turtle: this.api
+      Turtle: this.api,
+      // The default executionInfo modifies itself, make a fresh copy each run
+      executionInfo: {
+        ...executionInfo,
+      },
     });
   } catch (e) {
     // Infinity is thrown if we detect an infinite loop. In that case we'll
     // stop further execution, animate what occurred before the infinite loop,
     // and analyze success/failure based on what was drawn.
     // Otherwise, abnormal termination is a user error.
-    if (e !== 'Infinity') {
+    if (e.message !== 'Infinity') {
       // call window.onerror so that we get new relic collection.  prepend with
       // UserCode so that it's clear this is in eval'ed code.
       if (window.onerror) {
         window.onerror("UserCode:" + e.message, document.URL, 0);
       }
-      window.alert(e);
+      if (this.shouldAnimate_) {
+        window.alert(e);
+      }
     }
   }
 };

apps/test/integration/levelSolutions/turtle/5_5.js

@@ -50,6 +50,55 @@ module.exports = {
         '    </next>' +
         '  </block>' +
         '</xml>'
+    },
+    {
+      description: "Free play level with more ticks than allowed",
+      expected: {
+        result: true,
+        testResult: TestResults.FREE_PLAY
+      },
+      runBeforeClick: function () {
+        // This is a free-play level: click Finish when drawing is done.
+        addEventListener('artistDrawingComplete', () => $('#finishButton').click());
+      },
+      levelDefinitionOverrides: {
+        maxTickCount: 10,
+      },
+      xml:
+        '<xml>' +
+        '    <block type="when_run" deletable="false" movable="false">' +
+        '      <next>' +
+        '        <block type="controls_for_counter" inline="true">' +
+        '          <mutation counter="counter"></mutation>' +
+        '          <value name="FROM">' +
+        '            <block type="math_number">' +
+        '              <title name="NUM">1</title>' +
+        '              </block>' +
+        '              </value>' +
+        '              <value name="TO">' +
+        '              <block type="math_number">' +
+        '              <title name="NUM">1000000</title>' +
+        '          </block>' +
+        '        </value>' +
+        '        <value name="BY">' +
+        '          <block type="math_number">' +
+        '            <title name="NUM">1</title>' +
+        '          </block>' +
+        '        </value>' +
+        '        <statement name="DO">' +
+        '          <block type="draw_move" inline="true">' +
+        '            <title name="DIR">moveForward</title>' +
+        '            <value name="VALUE">' +
+        '              <block type="math_number">' +
+        '                <title name="NUM">0</title>' +
+        '              </block>' +
+        '            </value>' +
+        '          </block>' +
+        '        </statement>' +
+        '      </block>' +
+        '    </next>' +
+        '  </block>' +
+        '</xml>'
     }
   ]
 };

apps/test/integration/util/testCollectionUtils.js

@@ -57,6 +57,10 @@ module.exports = {
     if (testCollection.levelFile) {
       var levels = data.levels[testCollection.levelFile];
       level = _.cloneDeep(levels[testCollection.levelId]);
+      level = {
+        ...level,
+        ...(testData.levelDefinitionOverrides || {}),
+      };
     } else {
       if (!testCollection.levelDefinition && !testData.delayLoadLevelDefinition) {
         logError('testCollection requires levelFile or levelDefinition');

apps/test/unit/turtle/turtleTest.js

@@ -3,6 +3,7 @@ import {expect} from '../../util/configuredChai';
 import {parseElement} from '@cdo/apps/xml';
 import {Position} from '@cdo/apps/constants';
 import {singleton as studioAppSingleton} from '@cdo/apps/StudioApp';
+import {DEFAULT_EXECUTION_INFO} from '@cdo/apps/lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 const Artist = require('@cdo/apps/turtle/artist');
 
 const SHORT_DIAGONAL = 50 * Math.sqrt(2);
@@ -400,4 +401,18 @@ describe('Artist', () => {
       expect(newDom.querySelector('block[type="when_run"]')).to.be.defined;
     });
   });
+
+  it('Does not alert for infinite loops', () => {
+    const artist = new Artist();
+    const alertStub = sinon.stub(window, 'alert');
+
+    artist.evalCode('while(true) executionInfo.checkTimeout();', {
+      ...DEFAULT_EXECUTION_INFO,
+      ticks: 10, // Declare an infinite loop after 10 ticks
+    });
+
+    expect(alertStub).to.not.have.been.called;
+
+    alertStub.restore();
+  });
 });

apps/yarn.lock

@@ -13,9 +13,9 @@
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@code-dot-org/artist/-/artist-0.2.1.tgz#fcfe7ea5cfb3f19ddb6b912e70e922ba4b7ef0b1"
 
-"@code-dot-org/[email protected].1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@code-dot-org/blockly/-/blockly-3.1.%3Cspan%20class="x x-first x-last">1.tgz#9ffe14124c4064fcd97a1bb5b0eca7232d478372"
+"@code-dot-org/[email protected].3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@code-dot-org/blockly/-/blockly-3.1.%3Cspan%20class="x x-first x-last">3.tgz#4ea81a4dd5bc542d831b4312ccdf0255a4234239"
 
 "@code-dot-org/[email protected]":
   version "0.1.26"