blockly 11.0.0-beta.5 → 11.0.0-beta.6

package/generators/dart/dart_generator.d.ts

@@ -11,23 +11,23 @@ import type { Workspace } from '../../core/workspace.js';
  * https://dart.dev/guides/language/language-tour#operators
  */
 export declare enum Order {
-    ATOMIC = 0,
-    UNARY_POSTFIX = 1,
-    UNARY_PREFIX = 2,
-    MULTIPLICATIVE = 3,
-    ADDITIVE = 4,
-    SHIFT = 5,
-    BITWISE_AND = 6,
-    BITWISE_XOR = 7,
-    BITWISE_OR = 8,
-    RELATIONAL = 9,
-    EQUALITY = 10,
-    LOGICAL_AND = 11,
-    LOGICAL_OR = 12,
-    IF_NULL = 13,
-    CONDITIONAL = 14,
-    CASCADE = 15,
-    ASSIGNMENT = 16,
+    ATOMIC = 0,// 0 "" ...
+    UNARY_POSTFIX = 1,// expr++ expr-- () [] . ?.
+    UNARY_PREFIX = 2,// -expr !expr ~expr ++expr --expr
+    MULTIPLICATIVE = 3,// * / % ~/
+    ADDITIVE = 4,// + -
+    SHIFT = 5,// << >>
+    BITWISE_AND = 6,// &
+    BITWISE_XOR = 7,// ^
+    BITWISE_OR = 8,// |
+    RELATIONAL = 9,// >= > <= < as is is!
+    EQUALITY = 10,// == !=
+    LOGICAL_AND = 11,// &&
+    LOGICAL_OR = 12,// ||
+    IF_NULL = 13,// ??
+    CONDITIONAL = 14,// expr ? expr: expr
+    CASCADE = 15,// ..
+    ASSIGNMENT = 16,// = *= /= ~/= %= += -= <<= >>= &= ^= |=
     NONE = 99
 }
 /**

package/generators/dart/text.d.ts

@@ -10,7 +10,6 @@ import type { Block } from '../../core/block.js';
 import type { DartGenerator } from './dart_generator.js';
 import { Order } from './dart_generator.js';
 export declare function text(block: Block, generator: DartGenerator): [string, Order];
-export declare function text_multiline(block: Block, generator: DartGenerator): [string, Order];
 export declare function text_join(block: Block, generator: DartGenerator): [string, Order];
 export declare function text_append(block: Block, generator: DartGenerator): string;
 export declare function text_length(block: Block, generator: DartGenerator): [string, Order];

package/generators/javascript/javascript_generator.d.ts

@@ -11,40 +11,40 @@ import type { Workspace } from '../../core/workspace.js';
  * https://developer.mozilla.org/en/JavaScript/Reference/Operators/Operator_Precedence
  */
 export declare enum Order {
-    ATOMIC = 0,
-    NEW = 1.1,
-    MEMBER = 1.2,
-    FUNCTION_CALL = 2,
-    INCREMENT = 3,
-    DECREMENT = 3,
-    BITWISE_NOT = 4.1,
-    UNARY_PLUS = 4.2,
-    UNARY_NEGATION = 4.3,
-    LOGICAL_NOT = 4.4,
-    TYPEOF = 4.5,
-    VOID = 4.6,
-    DELETE = 4.7,
-    AWAIT = 4.8,
-    EXPONENTIATION = 5,
-    MULTIPLICATION = 5.1,
-    DIVISION = 5.2,
-    MODULUS = 5.3,
-    SUBTRACTION = 6.1,
-    ADDITION = 6.2,
-    BITWISE_SHIFT = 7,
-    RELATIONAL = 8,
-    IN = 8,
-    INSTANCEOF = 8,
-    EQUALITY = 9,
-    BITWISE_AND = 10,
-    BITWISE_XOR = 11,
-    BITWISE_OR = 12,
-    LOGICAL_AND = 13,
-    LOGICAL_OR = 14,
-    CONDITIONAL = 15,
-    ASSIGNMENT = 16,
-    YIELD = 17,
-    COMMA = 18,
+    ATOMIC = 0,// 0 "" ...
+    NEW = 1.1,// new
+    MEMBER = 1.2,// . []
+    FUNCTION_CALL = 2,// ()
+    INCREMENT = 3,// ++
+    DECREMENT = 3,// --
+    BITWISE_NOT = 4.1,// ~
+    UNARY_PLUS = 4.2,// +
+    UNARY_NEGATION = 4.3,// -
+    LOGICAL_NOT = 4.4,// !
+    TYPEOF = 4.5,// typeof
+    VOID = 4.6,// void
+    DELETE = 4.7,// delete
+    AWAIT = 4.8,// await
+    EXPONENTIATION = 5,// **
+    MULTIPLICATION = 5.1,// *
+    DIVISION = 5.2,// /
+    MODULUS = 5.3,// %
+    SUBTRACTION = 6.1,// -
+    ADDITION = 6.2,// +
+    BITWISE_SHIFT = 7,// << >> >>>
+    RELATIONAL = 8,// < <= > >=
+    IN = 8,// in
+    INSTANCEOF = 8,// instanceof
+    EQUALITY = 9,// == != === !==
+    BITWISE_AND = 10,// &
+    BITWISE_XOR = 11,// ^
+    BITWISE_OR = 12,// |
+    LOGICAL_AND = 13,// &&
+    LOGICAL_OR = 14,// ||
+    CONDITIONAL = 15,// ?:
+    ASSIGNMENT = 16,// = += -= **= *= /= %= <<= >>= ...
+    YIELD = 17,// yield
+    COMMA = 18,// ,
     NONE = 99
 }
 /**
@@ -100,7 +100,6 @@ export declare class JavascriptGenerator extends CodeGenerator {
      * @param code The JavaScript code created for this block.
      * @param thisOnly True to generate code for only this statement.
      * @returns JavaScript code with comments and subsequent blocks added.
-     * @protected
      */
     scrub_(block: Block, code: string, thisOnly?: boolean): string;
     /**

package/generators/javascript/text.d.ts

@@ -10,7 +10,6 @@ import type { Block } from '../../core/block.js';
 import type { JavascriptGenerator } from './javascript_generator.js';
 import { Order } from './javascript_generator.js';
 export declare function text(block: Block, generator: JavascriptGenerator): [string, Order];
-export declare function text_multiline(block: Block, generator: JavascriptGenerator): [string, Order];
 export declare function text_join(block: Block, generator: JavascriptGenerator): [string, Order];
 export declare function text_append(block: Block, generator: JavascriptGenerator): string;
 export declare function text_length(block: Block, generator: JavascriptGenerator): [string, Order];

package/generators/lua/lua_generator.d.ts

@@ -11,16 +11,16 @@ import type { Workspace } from '../../core/workspace.js';
  * http://www.lua.org/manual/5.3/manual.html#3.4.8
  */
 export declare enum Order {
-    ATOMIC = 0,
-    HIGH = 1,
-    EXPONENTIATION = 2,
-    UNARY = 3,
-    MULTIPLICATIVE = 4,
-    ADDITIVE = 5,
-    CONCATENATION = 6,
-    RELATIONAL = 7,
-    AND = 8,
-    OR = 9,
+    ATOMIC = 0,// literals
+    HIGH = 1,// Function calls, tables[]
+    EXPONENTIATION = 2,// ^
+    UNARY = 3,// not # - ~
+    MULTIPLICATIVE = 4,// * / %
+    ADDITIVE = 5,// + -
+    CONCATENATION = 6,// ..
+    RELATIONAL = 7,// < > <=  >= ~= ==
+    AND = 8,// and
+    OR = 9,// or
     NONE = 99
 }
 /**

package/generators/lua/text.d.ts

@@ -10,7 +10,6 @@ import type { Block } from '../../core/block.js';
 import type { LuaGenerator } from './lua_generator.js';
 import { Order } from './lua_generator.js';
 export declare function text(block: Block, generator: LuaGenerator): [string, Order];
-export declare function text_multiline(block: Block, generator: LuaGenerator): [string, Order];
 export declare function text_join(block: Block, generator: LuaGenerator): [string, Order];
 export declare function text_append(block: Block, generator: LuaGenerator): string;
 export declare function text_length(block: Block, generator: LuaGenerator): [string, Order];

package/generators/php/php_generator.d.ts

@@ -11,42 +11,42 @@ import type { Workspace } from '../../core/workspace.js';
  * http://php.net/manual/en/language.operators.precedence.php
  */
 export declare enum Order {
-    ATOMIC = 0,
-    CLONE = 1,
-    NEW = 1,
-    MEMBER = 2.1,
-    FUNCTION_CALL = 2.2,
-    POWER = 3,
-    INCREMENT = 4,
-    DECREMENT = 4,
-    BITWISE_NOT = 4,
-    CAST = 4,
-    SUPPRESS_ERROR = 4,
-    INSTANCEOF = 5,
-    LOGICAL_NOT = 6,
-    UNARY_PLUS = 7.1,
-    UNARY_NEGATION = 7.2,
-    MULTIPLICATION = 8.1,
-    DIVISION = 8.2,
-    MODULUS = 8.3,
-    ADDITION = 9.1,
-    SUBTRACTION = 9.2,
-    STRING_CONCAT = 9.3,
-    BITWISE_SHIFT = 10,
-    RELATIONAL = 11,
-    EQUALITY = 12,
-    REFERENCE = 13,
-    BITWISE_AND = 13,
-    BITWISE_XOR = 14,
-    BITWISE_OR = 15,
-    LOGICAL_AND = 16,
-    LOGICAL_OR = 17,
-    IF_NULL = 18,
-    CONDITIONAL = 19,
-    ASSIGNMENT = 20,
-    LOGICAL_AND_WEAK = 21,
-    LOGICAL_XOR = 22,
-    LOGICAL_OR_WEAK = 23,
+    ATOMIC = 0,// 0 "" ...
+    CLONE = 1,// clone
+    NEW = 1,// new
+    MEMBER = 2.1,// []
+    FUNCTION_CALL = 2.2,// ()
+    POWER = 3,// **
+    INCREMENT = 4,// ++
+    DECREMENT = 4,// --
+    BITWISE_NOT = 4,// ~
+    CAST = 4,// (int) (float) (string) (array) ...
+    SUPPRESS_ERROR = 4,// @
+    INSTANCEOF = 5,// instanceof
+    LOGICAL_NOT = 6,// !
+    UNARY_PLUS = 7.1,// +
+    UNARY_NEGATION = 7.2,// -
+    MULTIPLICATION = 8.1,// *
+    DIVISION = 8.2,// /
+    MODULUS = 8.3,// %
+    ADDITION = 9.1,// +
+    SUBTRACTION = 9.2,// -
+    STRING_CONCAT = 9.3,// .
+    BITWISE_SHIFT = 10,// << >>
+    RELATIONAL = 11,// < <= > >=
+    EQUALITY = 12,// == != === !== <> <=>
+    REFERENCE = 13,// &
+    BITWISE_AND = 13,// &
+    BITWISE_XOR = 14,// ^
+    BITWISE_OR = 15,// |
+    LOGICAL_AND = 16,// &&
+    LOGICAL_OR = 17,// ||
+    IF_NULL = 18,// ??
+    CONDITIONAL = 19,// ?:
+    ASSIGNMENT = 20,// = += -= *= /= %= <<= >>= ...
+    LOGICAL_AND_WEAK = 21,// and
+    LOGICAL_XOR = 22,// xor
+    LOGICAL_OR_WEAK = 23,// or
     NONE = 99
 }
 export declare class PhpGenerator extends CodeGenerator {

package/generators/php/text.d.ts

@@ -10,7 +10,6 @@ import type { Block } from '../../core/block.js';
 import { Order } from './php_generator.js';
 import type { PhpGenerator } from './php_generator.js';
 export declare function text(block: Block, generator: PhpGenerator): [string, Order];
-export declare function text_multiline(block: Block, generator: PhpGenerator): [string, Order];
 export declare function text_join(block: Block, generator: PhpGenerator): [string, Order];
 export declare function text_append(block: Block, generator: PhpGenerator): string;
 export declare function text_length(block: Block, generator: PhpGenerator): [string, Order];

package/generators/python/python_generator.d.ts

@@ -11,26 +11,26 @@ import type { Workspace } from '../../core/workspace.js';
  * http://docs.python.org/reference/expressions.html#summary
  */
 export declare enum Order {
-    ATOMIC = 0,
-    COLLECTION = 1,
-    STRING_CONVERSION = 1,
-    MEMBER = 2.1,
-    FUNCTION_CALL = 2.2,
-    EXPONENTIATION = 3,
-    UNARY_SIGN = 4,
-    BITWISE_NOT = 4,
-    MULTIPLICATIVE = 5,
-    ADDITIVE = 6,
-    BITWISE_SHIFT = 7,
-    BITWISE_AND = 8,
-    BITWISE_XOR = 9,
-    BITWISE_OR = 10,
-    RELATIONAL = 11,
-    LOGICAL_NOT = 12,
-    LOGICAL_AND = 13,
-    LOGICAL_OR = 14,
-    CONDITIONAL = 15,
-    LAMBDA = 16,
+    ATOMIC = 0,// 0 "" ...
+    COLLECTION = 1,// tuples, lists, dictionaries
+    STRING_CONVERSION = 1,// `expression...`
+    MEMBER = 2.1,// . []
+    FUNCTION_CALL = 2.2,// ()
+    EXPONENTIATION = 3,// **
+    UNARY_SIGN = 4,// + -
+    BITWISE_NOT = 4,// ~
+    MULTIPLICATIVE = 5,// * / // %
+    ADDITIVE = 6,// + -
+    BITWISE_SHIFT = 7,// << >>
+    BITWISE_AND = 8,// &
+    BITWISE_XOR = 9,// ^
+    BITWISE_OR = 10,// |
+    RELATIONAL = 11,// in, not in, is, is not, >, >=, <>, !=, ==
+    LOGICAL_NOT = 12,// not
+    LOGICAL_AND = 13,// and
+    LOGICAL_OR = 14,// or
+    CONDITIONAL = 15,// if else
+    LAMBDA = 16,// lambda
     NONE = 99
 }
 /**
@@ -90,7 +90,6 @@ export declare class PythonGenerator extends CodeGenerator {
      * @param code The Python code created for this block.
      * @param thisOnly True to generate code for only this statement.
      * @returns Python code with comments and subsequent blocks added.
-  
      */
     scrub_(block: Block, code: string, thisOnly?: boolean): string;
     /**

package/generators/python/text.d.ts

@@ -7,7 +7,6 @@ import type { Block } from '../../core/block.js';
 import { Order } from './python_generator.js';
 import type { PythonGenerator } from './python_generator.js';
 export declare function text(block: Block, generator: PythonGenerator): [string, Order];
-export declare function text_multiline(block: Block, generator: PythonGenerator): [string, Order];
 export declare function text_join(block: Block, generator: PythonGenerator): [string, Order];
 export declare function text_append(block: Block, generator: PythonGenerator): string;
 export declare function text_length(block: Block, generator: PythonGenerator): [string, Order];

package/index.js

@@ -1,13 +1,13 @@
 /* eslint-disable */
 ;(function(root, factory) {
   if (typeof define === 'function' && define.amd) { // AMD
-    define(['./browser'], factory);
+    define(['blockly/core', 'blockly/msg/en', 'blockly/blocks'], factory);
   } else if (typeof exports === 'object') { // Node.js
-    module.exports = factory(require('./node'));
+    module.exports = factory(require('blockly/core'), require('blockly/msg/en'), require('blockly/blocks'));
   } else { // Browser
-    root.Blockly = factory(root.Blockly);
+    root.Blockly = factory(root.Blockly, root.Blockly.Msg, root.Blockly.Blocks);
   }
-}(this, function(Blockly) {
+}(this, function(Blockly, en, blocks) {
 /**
  * @license
  * Copyright 2019 Google LLC
@@ -15,10 +15,22 @@
  */
 
 /**
- * @fileoverview Blockly module; this is a wrapper which selects
- *     either browser.js or node.js, depending on which environment we
- *     are running in.
+ * @file Main entrypoint for blockly package.  Via its UMD wrapper,
+ * this module loads blockly/core, blockly/blocks and blockly/msg/en
+ * and then calls setLocale(en).
+ *
+ * This entrypoint previously also loaded one or more generators
+ * (JavaScript in browser, all five in node.js environments) but it no
+ * longer makes sense to do so because of changes to generators
+ * exports (they no longer have the side effect of defining
+ * Blockly.JavaScript, etc., when loaded as modules).
  */
 
+/* eslint-disable */
+'use strict';
+
+// Include the EN Locale by default.
+Blockly.setLocale(en);
+
 return Blockly;
 }));

package/javascript.d.ts

@@ -4,44 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export enum Order {
-  ATOMIC = 0,            // 0 "" ...
-  NEW = 1.1,             // new
-  MEMBER = 1.2,          // . []
-  FUNCTION_CALL = 2,     // ()
-  INCREMENT = 3,         // ++
-  DECREMENT = 3,         // --
-  BITWISE_NOT = 4.1,     // ~
-  UNARY_PLUS = 4.2,      // +
-  UNARY_NEGATION = 4.3,  // -
-  LOGICAL_NOT = 4.4,     // !
-  TYPEOF = 4.5,          // typeof
-  VOID = 4.6,            // void
-  DELETE = 4.7,          // delete
-  AWAIT = 4.8,           // await
-  EXPONENTIATION = 5.0,  // **
-  MULTIPLICATION = 5.1,  // *
-  DIVISION = 5.2,        // /
-  MODULUS = 5.3,         // %
-  SUBTRACTION = 6.1,     // -
-  ADDITION = 6.2,        // +
-  BITWISE_SHIFT = 7,     // << >> >>>
-  RELATIONAL = 8,        // < <= > >=
-  IN = 8,                // in
-  INSTANCEOF = 8,        // instanceof
-  EQUALITY = 9,          // == != === !==
-  BITWISE_AND = 10,      // &
-  BITWISE_XOR = 11,      // ^
-  BITWISE_OR = 12,       // |
-  LOGICAL_AND = 13,      // &&
-  LOGICAL_OR = 14,       // ||
-  CONDITIONAL = 15,      // ?:
-  ASSIGNMENT = 16,       // = += -= **= *= /= %= <<= >>= ...
-  YIELD = 17,            // yield
-  COMMA = 18,            // ,
-  NONE = 99,             // (...)
-}
-
-export declare const javascriptGenerator: any;
-
-export {JavascriptGenerator} from './generators/javascript';
+export * from './generators/javascript';

package/javascript_compressed.js

@@ -12,42 +12,8 @@
   }
 }(this, function(__parent__) {
 var $=__parent__.__namespace__;
-var colour_picker$$module$build$src$generators$javascript$colour=function(a,b){return[b.quote_(a.getFieldValue("COLOUR")),Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},colour_random$$module$build$src$generators$javascript$colour=function(a,b){return[b.provideFunction_("colourRandom",`
-function ${b.FUNCTION_NAME_PLACEHOLDER_}() {
-  var num = Math.floor(Math.random() * Math.pow(2, 24));
-  return '#' + ('00000' + num.toString(16)).substr(-6);
-}
-`)+"()",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},colour_rgb$$module$build$src$generators$javascript$colour=function(a,b){const c=b.valueToCode(a,"RED",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||0,d=b.valueToCode(a,"GREEN",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||0;a=b.valueToCode(a,"BLUE",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||0;return[b.provideFunction_("colourRgb",
-`
-function ${b.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
-  r = Math.max(Math.min(Number(r), 100), 0) * 2.55;
-  g = Math.max(Math.min(Number(g), 100), 0) * 2.55;
-  b = Math.max(Math.min(Number(b), 100), 0) * 2.55;
-  r = ('0' + (Math.round(r) || 0).toString(16)).slice(-2);
-  g = ('0' + (Math.round(g) || 0).toString(16)).slice(-2);
-  b = ('0' + (Math.round(b) || 0).toString(16)).slice(-2);
-  return '#' + r + g + b;
-}
-`)+"("+c+", "+d+", "+a+")",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},colour_blend$$module$build$src$generators$javascript$colour=function(a,b){const c=b.valueToCode(a,"COLOUR1",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"'#000000'",d=b.valueToCode(a,"COLOUR2",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"'#000000'";a=b.valueToCode(a,"RATIO",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||
-.5;return[b.provideFunction_("colourBlend",`
-function ${b.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
-  ratio = Math.max(Math.min(Number(ratio), 1), 0);
-  var r1 = parseInt(c1.substring(1, 3), 16);
-  var g1 = parseInt(c1.substring(3, 5), 16);
-  var b1 = parseInt(c1.substring(5, 7), 16);
-  var r2 = parseInt(c2.substring(1, 3), 16);
-  var g2 = parseInt(c2.substring(3, 5), 16);
-  var b2 = parseInt(c2.substring(5, 7), 16);
-  var r = Math.round(r1 * (1 - ratio) + r2 * ratio);
-  var g = Math.round(g1 * (1 - ratio) + g2 * ratio);
-  var b = Math.round(b1 * (1 - ratio) + b2 * ratio);
-  r = ('0' + (r || 0).toString(16)).slice(-2);
-  g = ('0' + (g || 0).toString(16)).slice(-2);
-  b = ('0' + (b || 0).toString(16)).slice(-2);
-  return '#' + r + g + b;
-}
-`)+"("+c+", "+d+", "+a+")",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},lists_create_empty$$module$build$src$generators$javascript$lists=function(a,b){return["[]",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},lists_create_with$$module$build$src$generators$javascript$lists=function(a,b){const c=Array(a.itemCount_);for(let d=0;d<a.itemCount_;d++)c[d]=b.valueToCode(a,"ADD"+d,Order$$module$build$src$generators$javascript$javascript_generator.NONE)||
-"null";return["["+c.join(", ")+"]",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},lists_repeat$$module$build$src$generators$javascript$lists=function(a,b){const c=b.provideFunction_("listsRepeat",`
+var lists_create_empty$$module$build$src$generators$javascript$lists=function(a,b){return["[]",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},lists_create_with$$module$build$src$generators$javascript$lists=function(a,b){const c=Array(a.itemCount_);for(let d=0;d<a.itemCount_;d++)c[d]=b.valueToCode(a,"ADD"+d,Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"null";return["["+c.join(", ")+"]",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},
+lists_repeat$$module$build$src$generators$javascript$lists=function(a,b){const c=b.provideFunction_("listsRepeat",`
 function ${b.FUNCTION_NAME_PLACEHOLDER_}(value, n) {
   var array = [];
   for (var i = 0; i < n; i++) {
@@ -216,14 +182,13 @@ Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"0")+"
 (e=b.prefixLines(b.injectId(b.INFINITE_LOOP_TRAP,a),b.INDENT));const f=b.statementToCode(a,"STACK");let g=b.valueToCode(a,"RETURN",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"",h="";f&&g&&(h=d);g&&(g=b.INDENT+"return "+g+";\n");const k=[],l=a.getVars();for(let m=0;m<l.length;m++)k[m]=b.getVariableName(l[m]);d="function "+c+"("+k.join(", ")+") {\n"+d+e+f+h+g+"}";d=b.scrub_(a,d);b.definitions_["%"+c]=d;return null},procedures_callreturn$$module$build$src$generators$javascript$procedures=
 function(a,b){const c=b.getProcedureName(a.getFieldValue("NAME")),d=[],e=a.getVars();for(let f=0;f<e.length;f++)d[f]=b.valueToCode(a,"ARG"+f,Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"null";return[c+"("+d.join(", ")+")",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},procedures_callnoreturn$$module$build$src$generators$javascript$procedures=function(a,b){return b.forBlock.procedures_callreturn(a,b)[0]+";\n"},procedures_ifreturn$$module$build$src$generators$javascript$procedures=
 function(a,b){let c="if ("+(b.valueToCode(a,"CONDITION",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"false")+") {\n";b.STATEMENT_SUFFIX&&(c+=b.prefixLines(b.injectId(b.STATEMENT_SUFFIX,a),b.INDENT));a.hasReturnValue_?(a=b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"null",c+=b.INDENT+"return "+a+";\n"):c+=b.INDENT+"return;\n";return c+"}\n"},text$$module$build$src$generators$javascript$text=function(a,b){return[b.quote_(a.getFieldValue("TEXT")),
-Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},text_multiline$$module$build$src$generators$javascript$text=function(a,b){a=b.multiline_quote_(a.getFieldValue("TEXT"));b=-1!==a.indexOf("+")?Order$$module$build$src$generators$javascript$javascript_generator.ADDITION:Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC;return[a,b]},text_join$$module$build$src$generators$javascript$text=function(a,b){switch(a.itemCount_){case 0:return["''",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC];
-case 1:return a=b.valueToCode(a,"ADD0",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''",forceString$$module$build$src$generators$javascript$text(a);case 2:var c=b.valueToCode(a,"ADD0",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";a=b.valueToCode(a,"ADD1",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return[forceString$$module$build$src$generators$javascript$text(c)[0]+" + "+forceString$$module$build$src$generators$javascript$text(a)[0],
-Order$$module$build$src$generators$javascript$javascript_generator.ADDITION];default:c=Array(a.itemCount_);for(let d=0;d<a.itemCount_;d++)c[d]=b.valueToCode(a,"ADD"+d,Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return["["+c.join(",")+"].join('')",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]}},text_append$$module$build$src$generators$javascript$text=function(a,b){const c=b.getVariableName(a.getFieldValue("VAR"));a=b.valueToCode(a,
-"TEXT",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return c+" += "+forceString$$module$build$src$generators$javascript$text(a)[0]+";\n"},text_length$$module$build$src$generators$javascript$text=function(a,b){return[(b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''")+".length",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER]},text_isEmpty$$module$build$src$generators$javascript$text=
-function(a,b){return["!"+(b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''")+".length",Order$$module$build$src$generators$javascript$javascript_generator.LOGICAL_NOT]},text_indexOf$$module$build$src$generators$javascript$text=function(a,b){const c="FIRST"===a.getFieldValue("END")?"indexOf":"lastIndexOf",d=b.valueToCode(a,"FIND",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";b=(b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||
-"''")+"."+c+"("+d+")";return a.workspace.options.oneBasedIndex?[b+" + 1",Order$$module$build$src$generators$javascript$javascript_generator.ADDITION]:[b,Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},text_charAt$$module$build$src$generators$javascript$text=function(a,b){const c=a.getFieldValue("WHERE")||"FROM_START",d=b.valueToCode(a,"VALUE","RANDOM"===c?Order$$module$build$src$generators$javascript$javascript_generator.NONE:Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||
-"''";switch(c){case "FIRST":return[d+".charAt(0)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "LAST":return[d+".slice(-1)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "FROM_START":return a=b.getAdjusted(a,"AT"),[d+".charAt("+a+")",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "FROM_END":return a=b.getAdjusted(a,"AT",1,!0),[d+".slice("+a+").charAt(0)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];
-case "RANDOM":return[b.provideFunction_("textRandomLetter",`
+Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC]},text_join$$module$build$src$generators$javascript$text=function(a,b){switch(a.itemCount_){case 0:return["''",Order$$module$build$src$generators$javascript$javascript_generator.ATOMIC];case 1:return a=b.valueToCode(a,"ADD0",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''",forceString$$module$build$src$generators$javascript$text(a);case 2:var c=b.valueToCode(a,"ADD0",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||
+"''";a=b.valueToCode(a,"ADD1",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return[forceString$$module$build$src$generators$javascript$text(c)[0]+" + "+forceString$$module$build$src$generators$javascript$text(a)[0],Order$$module$build$src$generators$javascript$javascript_generator.ADDITION];default:c=Array(a.itemCount_);for(let d=0;d<a.itemCount_;d++)c[d]=b.valueToCode(a,"ADD"+d,Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return["["+
+c.join(",")+"].join('')",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]}},text_append$$module$build$src$generators$javascript$text=function(a,b){const c=b.getVariableName(a.getFieldValue("VAR"));a=b.valueToCode(a,"TEXT",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";return c+" += "+forceString$$module$build$src$generators$javascript$text(a)[0]+";\n"},text_length$$module$build$src$generators$javascript$text=function(a,b){return[(b.valueToCode(a,
+"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''")+".length",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER]},text_isEmpty$$module$build$src$generators$javascript$text=function(a,b){return["!"+(b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''")+".length",Order$$module$build$src$generators$javascript$javascript_generator.LOGICAL_NOT]},text_indexOf$$module$build$src$generators$javascript$text=
+function(a,b){const c="FIRST"===a.getFieldValue("END")?"indexOf":"lastIndexOf",d=b.valueToCode(a,"FIND",Order$$module$build$src$generators$javascript$javascript_generator.NONE)||"''";b=(b.valueToCode(a,"VALUE",Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''")+"."+c+"("+d+")";return a.workspace.options.oneBasedIndex?[b+" + 1",Order$$module$build$src$generators$javascript$javascript_generator.ADDITION]:[b,Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL]},
+text_charAt$$module$build$src$generators$javascript$text=function(a,b){const c=a.getFieldValue("WHERE")||"FROM_START",d=b.valueToCode(a,"VALUE","RANDOM"===c?Order$$module$build$src$generators$javascript$javascript_generator.NONE:Order$$module$build$src$generators$javascript$javascript_generator.MEMBER)||"''";switch(c){case "FIRST":return[d+".charAt(0)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "LAST":return[d+".slice(-1)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];
+case "FROM_START":return a=b.getAdjusted(a,"AT"),[d+".charAt("+a+")",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "FROM_END":return a=b.getAdjusted(a,"AT",1,!0),[d+".slice("+a+").charAt(0)",Order$$module$build$src$generators$javascript$javascript_generator.FUNCTION_CALL];case "RANDOM":return[b.provideFunction_("textRandomLetter",`
 function ${b.FUNCTION_NAME_PLACEHOLDER_}(text) {
   var x = Math.floor(Math.random() * text.length);
   return text[x];
@@ -273,7 +238,7 @@ for(c=0;c<a.length;c++)b.push(this.nameDB_.getName(a[c].getId(),$.NameType$$modu
 b,c=!1){let d="";if(!a.outputConnection||!a.outputConnection.targetConnection){var e=a.getCommentText();e&&(e=$.wrap$$module$build$src$core$utils$string(e,this.COMMENT_WRAP-3),d+=this.prefixLines(e+"\n","// "));for(let f=0;f<a.inputList.length;f++)a.inputList[f].type===$.inputTypes$$module$build$src$core$inputs$input_types.VALUE&&(e=a.inputList[f].connection.targetBlock())&&(e=this.allNestedComments(e))&&(d+=this.prefixLines(e,"// "))}a=a.nextConnection&&a.nextConnection.targetBlock();c=c?"":this.blockToCode(a);
 return d+b+c}getAdjusted(a,b,c=0,d=!1,e=Order$$module$build$src$generators$javascript$javascript_generator.NONE){a.workspace.options.oneBasedIndex&&c--;const f=a.workspace.options.oneBasedIndex?"1":"0";let g=e;0<c?g=Order$$module$build$src$generators$javascript$javascript_generator.ADDITION:0>c?g=Order$$module$build$src$generators$javascript$javascript_generator.SUBTRACTION:d&&(g=Order$$module$build$src$generators$javascript$javascript_generator.UNARY_NEGATION);a=this.valueToCode(a,b,g)||f;if(0===
 c&&!d)return a;if($.isNumber$$module$build$src$core$utils$string(a))return a=String(Number(a)+c),d&&(a=String(-Number(a))),a;0<c?a=`${a} + ${c}`:0>c&&(a=`${a} - ${-c}`);d&&(a=c?`-(${a})`:`-${a}`);Math.floor(e)>=Math.floor(g)&&(a=`(${a})`);return a}},module$build$src$generators$javascript$javascript_generator={};module$build$src$generators$javascript$javascript_generator.JavascriptGenerator=JavascriptGenerator$$module$build$src$generators$javascript$javascript_generator;
-module$build$src$generators$javascript$javascript_generator.Order=Order$$module$build$src$generators$javascript$javascript_generator;var module$build$src$generators$javascript$colour={};module$build$src$generators$javascript$colour.colour_blend=colour_blend$$module$build$src$generators$javascript$colour;module$build$src$generators$javascript$colour.colour_picker=colour_picker$$module$build$src$generators$javascript$colour;module$build$src$generators$javascript$colour.colour_random=colour_random$$module$build$src$generators$javascript$colour;module$build$src$generators$javascript$colour.colour_rgb=colour_rgb$$module$build$src$generators$javascript$colour;var getSubstringIndex$$module$build$src$generators$javascript$lists=function(a,b,c){return"FIRST"===b?"0":"FROM_END"===b?a+".length - 1 - "+c:"LAST"===b?a+".length - 1":c},module$build$src$generators$javascript$lists={};module$build$src$generators$javascript$lists.lists_create_empty=lists_create_empty$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_create_with=lists_create_with$$module$build$src$generators$javascript$lists;
+module$build$src$generators$javascript$javascript_generator.Order=Order$$module$build$src$generators$javascript$javascript_generator;var getSubstringIndex$$module$build$src$generators$javascript$lists=function(a,b,c){return"FIRST"===b?"0":"FROM_END"===b?a+".length - 1 - "+c:"LAST"===b?a+".length - 1":c},module$build$src$generators$javascript$lists={};module$build$src$generators$javascript$lists.lists_create_empty=lists_create_empty$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_create_with=lists_create_with$$module$build$src$generators$javascript$lists;
 module$build$src$generators$javascript$lists.lists_getIndex=lists_getIndex$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_getSublist=lists_getSublist$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_indexOf=lists_indexOf$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_isEmpty=lists_isEmpty$$module$build$src$generators$javascript$lists;
 module$build$src$generators$javascript$lists.lists_length=lists_length$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_repeat=lists_repeat$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_reverse=lists_reverse$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_setIndex=lists_setIndex$$module$build$src$generators$javascript$lists;
 module$build$src$generators$javascript$lists.lists_sort=lists_sort$$module$build$src$generators$javascript$lists;module$build$src$generators$javascript$lists.lists_split=lists_split$$module$build$src$generators$javascript$lists;var controls_ifelse$$module$build$src$generators$javascript$logic=controls_if$$module$build$src$generators$javascript$logic,module$build$src$generators$javascript$logic={};module$build$src$generators$javascript$logic.controls_if=controls_if$$module$build$src$generators$javascript$logic;module$build$src$generators$javascript$logic.controls_ifelse=controls_if$$module$build$src$generators$javascript$logic;module$build$src$generators$javascript$logic.logic_boolean=logic_boolean$$module$build$src$generators$javascript$logic;
@@ -287,10 +252,10 @@ module$build$src$generators$javascript$procedures.procedures_defnoreturn=procedu
 "FROM_END"===b?a+".length - 1 - "+c:"LAST"===b?a+".length - 1":c},text_prompt$$module$build$src$generators$javascript$text=text_prompt_ext$$module$build$src$generators$javascript$text,module$build$src$generators$javascript$text={};module$build$src$generators$javascript$text.text=text$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_append=text_append$$module$build$src$generators$javascript$text;
 module$build$src$generators$javascript$text.text_changeCase=text_changeCase$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_charAt=text_charAt$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_count=text_count$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_getSubstring=text_getSubstring$$module$build$src$generators$javascript$text;
 module$build$src$generators$javascript$text.text_indexOf=text_indexOf$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_isEmpty=text_isEmpty$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_join=text_join$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_length=text_length$$module$build$src$generators$javascript$text;
-module$build$src$generators$javascript$text.text_multiline=text_multiline$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_print=text_print$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_prompt=text_prompt_ext$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_prompt_ext=text_prompt_ext$$module$build$src$generators$javascript$text;
-module$build$src$generators$javascript$text.text_replace=text_replace$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_reverse=text_reverse$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_trim=text_trim$$module$build$src$generators$javascript$text;var module$build$src$generators$javascript$variables={};module$build$src$generators$javascript$variables.variables_get=variables_get$$module$build$src$generators$javascript$variables;module$build$src$generators$javascript$variables.variables_set=variables_set$$module$build$src$generators$javascript$variables;var module$build$src$generators$javascript$variables_dynamic={};module$build$src$generators$javascript$variables_dynamic.variables_get_dynamic=variables_get$$module$build$src$generators$javascript$variables;module$build$src$generators$javascript$variables_dynamic.variables_set_dynamic=variables_set$$module$build$src$generators$javascript$variables;var javascriptGenerator$$module$build$src$generators$javascript=new JavascriptGenerator$$module$build$src$generators$javascript$javascript_generator,generators$$module$build$src$generators$javascript=Object.assign({},module$build$src$generators$javascript$colour,module$build$src$generators$javascript$lists,module$build$src$generators$javascript$logic,module$build$src$generators$javascript$loops,module$build$src$generators$javascript$math,module$build$src$generators$javascript$procedures,module$build$src$generators$javascript$text,
-module$build$src$generators$javascript$variables,module$build$src$generators$javascript$variables_dynamic);for(const a in generators$$module$build$src$generators$javascript)javascriptGenerator$$module$build$src$generators$javascript.forBlock[a]=generators$$module$build$src$generators$javascript[a];var module$build$src$generators$javascript={};module$build$src$generators$javascript.JavascriptGenerator=JavascriptGenerator$$module$build$src$generators$javascript$javascript_generator;
-module$build$src$generators$javascript.Order=Order$$module$build$src$generators$javascript$javascript_generator;module$build$src$generators$javascript.javascriptGenerator=javascriptGenerator$$module$build$src$generators$javascript;
+module$build$src$generators$javascript$text.text_print=text_print$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_prompt=text_prompt_ext$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_prompt_ext=text_prompt_ext$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_replace=text_replace$$module$build$src$generators$javascript$text;
+module$build$src$generators$javascript$text.text_reverse=text_reverse$$module$build$src$generators$javascript$text;module$build$src$generators$javascript$text.text_trim=text_trim$$module$build$src$generators$javascript$text;var module$build$src$generators$javascript$variables={};module$build$src$generators$javascript$variables.variables_get=variables_get$$module$build$src$generators$javascript$variables;module$build$src$generators$javascript$variables.variables_set=variables_set$$module$build$src$generators$javascript$variables;var module$build$src$generators$javascript$variables_dynamic={};module$build$src$generators$javascript$variables_dynamic.variables_get_dynamic=variables_get$$module$build$src$generators$javascript$variables;module$build$src$generators$javascript$variables_dynamic.variables_set_dynamic=variables_set$$module$build$src$generators$javascript$variables;var javascriptGenerator$$module$build$src$generators$javascript=new JavascriptGenerator$$module$build$src$generators$javascript$javascript_generator,generators$$module$build$src$generators$javascript=Object.assign({},module$build$src$generators$javascript$lists,module$build$src$generators$javascript$logic,module$build$src$generators$javascript$loops,module$build$src$generators$javascript$math,module$build$src$generators$javascript$procedures,module$build$src$generators$javascript$text,module$build$src$generators$javascript$variables,
+module$build$src$generators$javascript$variables_dynamic);for(const a in generators$$module$build$src$generators$javascript)javascriptGenerator$$module$build$src$generators$javascript.forBlock[a]=generators$$module$build$src$generators$javascript[a];var module$build$src$generators$javascript={};module$build$src$generators$javascript.JavascriptGenerator=JavascriptGenerator$$module$build$src$generators$javascript$javascript_generator;module$build$src$generators$javascript.Order=Order$$module$build$src$generators$javascript$javascript_generator;
+module$build$src$generators$javascript.javascriptGenerator=javascriptGenerator$$module$build$src$generators$javascript;
 module$build$src$generators$javascript.__namespace__=$;
 return module$build$src$generators$javascript;
 }));