Frameloop nextgen update (with lint)

Signed-off-by: FurryR <[email protected]>

Author: FurryR

src/blocks/scratch3_json.js

@@ -65,7 +65,7 @@ class Scratch3JSONBlocks {
     valueOfKey (args) {
         args.OBJ = Cast.toObject(args.OBJ);
         args.KEY = Cast.toString(args.KEY);
-        return args.OBJ[args.KEY] ?? "";
+        return args.OBJ[args.KEY] ?? '';
     }
 
     setKey (args) {
@@ -106,12 +106,12 @@ class Scratch3JSONBlocks {
     valueOfIndex (args) {
         args.ARR = Cast.toArray(args.ARR);
         args.INDEX = Cast.toNumber(args.INDEX);
-        return args.ARR[args.INDEX] ?? "";
+        return args.ARR[args.INDEX] ?? '';
     }
 
     indexOfValue (args) {
         args.ARR = Cast.toArray(args.ARR);
-        return args.ARR.indexOf(args.VALUE) !== -1 ? args.ARR.indexOf(args.VALUE) : "";
+        return args.ARR.indexOf(args.VALUE) !== -1 ? args.ARR.indexOf(args.VALUE) : '';
     }
 
     addItem (args) {
@@ -126,9 +126,9 @@ class Scratch3JSONBlocks {
         if (args.INDEX >= 0 && args.INDEX < args.ARR.length) {
             args.ARR[args.INDEX] = args.ITEM;
             return args.ARR;
-        } else {
-            return new Array();
         }
+        return new Array();
+        
     }
 
     deleteIndex (args) {
@@ -137,15 +137,15 @@ class Scratch3JSONBlocks {
         if (args.INDEX >= 0 && args.INDEX < args.ARR.length) {
             args.ARR.splice(args.INDEX, 1);
             return args.ARR;
-        } else {
-            return new Array();
         }
+        return new Array();
+        
     }
 
     deleteAllOccurrences (args) {
         args.ARR = Cast.toArray(args.ARR);
         args.ITEM = Cast.toString(args.ITEM);
-        return args.ARR.filter((item) => item !== args.ITEM);
+        return args.ARR.filter(item => item !== args.ITEM);
     }
 
     mergeArray (args) {

src/blocks/scratch3_operators.js

@@ -39,7 +39,7 @@ class Scratch3OperatorsBlocks {
     }
 
     checkbox () {
-      return true;
+        return true;
     }
 
     add (args) {

src/blocks/scratch3_sensing.js

@@ -253,6 +253,7 @@ class Scratch3SensingBlocks {
         case 'hour': return date.getHours();
         case 'minute': return date.getMinutes();
         case 'second': return date.getSeconds();
+        case 'refreshTime': return this.runtime.screenRefreshTime / 1000;
         }
         return 0;
     }

src/compiler/irgen.js

@@ -728,6 +728,10 @@ class ScriptTreeGenerator {
                 return {
                     kind: 'sensing.second'
                 };
+            case 'refreshTime':
+                return {
+                    kind: 'sensing.refreshTime'
+                };
             }
             return {
                 kind: 'constant',
@@ -796,25 +800,25 @@ class ScriptTreeGenerator {
             return {
                 kind: 'comments.reporter',
                 value: this.descendInputOfBlock(block, 'VALUE'),
-                comment: this.descendInputOfBlock(block, 'COMMENT'),
+                comment: this.descendInputOfBlock(block, 'COMMENT')
             };
         case 'comments_boolean':
             return {
                 kind: 'comments.boolean',
                 value: this.descendInputOfBlock(block, 'VALUE'),
-                comment: this.descendInputOfBlock(block, 'COMMENT'),
+                comment: this.descendInputOfBlock(block, 'COMMENT')
             };
         case 'comments_object':
             return {
                 kind: 'comments.object',
                 value: this.descendInputOfBlock(block, 'VALUE'),
-                comment: this.descendInputOfBlock(block, 'COMMENT'),
+                comment: this.descendInputOfBlock(block, 'COMMENT')
             };
         case 'comments_array':
             return {
                 kind: 'comments.array',
                 value: this.descendInputOfBlock(block, 'VALUE'),
-                comment: this.descendInputOfBlock(block, 'COMMENT'),
+                comment: this.descendInputOfBlock(block, 'COMMENT')
             };
 
         case 'tw_getLastKeyPressed':
@@ -834,10 +838,10 @@ class ScriptTreeGenerator {
                 if (blockInfo) {
                     const type = blockInfo.info.blockType;
                     if (
-                        type === BlockType.REPORTER
-                        || type === BlockType.BOOLEAN
-                        || type === BlockType.OBJECT
-                        || type === BlockType.ARRAY
+                        type === BlockType.REPORTER ||
+                        type === BlockType.BOOLEAN ||
+                        type === BlockType.OBJECT ||
+                        type === BlockType.ARRAY
                     ) {
                         return this.descendCompatLayer(block);
                     }

src/compiler/jsexecute.js

@@ -2,7 +2,7 @@
  * @fileoverview Runtime for scripts generated by jsgen
  */
 
-const { supportsNullishCoalescing: canNullCoalsh } = require('./environment');
+const {supportsNullishCoalescing: canNullCoalsh} = require('./environment');
 
 /* eslint-disable no-unused-vars */
 /* eslint-disable prefer-template */

src/compiler/jsgen.js

@@ -778,6 +778,8 @@ class JSGenerator {
             return new TypedInput(`(new Date().getMinutes())`, TYPE_NUMBER);
         case 'sensing.month':
             return new TypedInput(`(new Date().getMonth() + 1)`, TYPE_NUMBER);
+        case 'sensing.refreshTime':
+            return new TypedInput(`(runtime.screenRefreshTime / 1000)`, TYPE_NUMBER_NAN);
         case 'sensing.of': {
             const object = this.descendInput(node.object).asString();
             const property = node.property;

src/engine/blocks.js

@@ -919,9 +919,9 @@ class Blocks {
         if (preserve) {
             const parent = this._blocks[block.parent];
             const next = this._blocks[block.next];
-            const input = parent?.inputs
-                ? Object.values(parent.inputs).find(input => input.block === blockId)
-                : null;
+            const input = parent?.inputs ?
+                Object.values(parent.inputs).find(input => input.block === blockId) :
+                null;
             if (parent && !input) {
                 parent.next = block.next;
             }