scratch-blocks 2.0.2 → 2.0.4

package/src/constants.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Copyright 2024 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,78 +7,72 @@
  * String representing the variable type of scalar variables.
  * This string, for use in differentiating between types of variables,
  * indicates that the current variable is a scalar variable.
- * @const {string}
  */
-const SCALAR_VARIABLE_TYPE = "";
-export { SCALAR_VARIABLE_TYPE };
+const SCALAR_VARIABLE_TYPE = ''
+export { SCALAR_VARIABLE_TYPE }
 
 /**
  * String representing the variable type of broadcast message blocks.
  * This string, for use in differentiating between types of variables,
  * indicates that the current variable is a broadcast message.
- * @const {string}
  */
-const BROADCAST_MESSAGE_VARIABLE_TYPE = "broadcast_msg";
-export { BROADCAST_MESSAGE_VARIABLE_TYPE };
+const BROADCAST_MESSAGE_VARIABLE_TYPE = 'broadcast_msg'
+export { BROADCAST_MESSAGE_VARIABLE_TYPE }
 
 /**
  * String representing the variable type of list blocks.
  * This string, for use in differentiating between types of variables,
  * indicates that the current variable is a list.
- * @const {string}
  */
-const LIST_VARIABLE_TYPE = "list";
-export { LIST_VARIABLE_TYPE };
+const LIST_VARIABLE_TYPE = 'list'
+export { LIST_VARIABLE_TYPE }
 
 /*
  * The type of all procedure definition blocks.
  * @const {string}
  */
-const PROCEDURES_DEFINITION_BLOCK_TYPE = "procedures_definition";
-export { PROCEDURES_DEFINITION_BLOCK_TYPE };
+const PROCEDURES_DEFINITION_BLOCK_TYPE = 'procedures_definition'
+export { PROCEDURES_DEFINITION_BLOCK_TYPE }
 
 /*
  * The type of all procedure declaration blocks.
  * @const {string}
  */
-const PROCEDURES_DECLARATION_BLOCK_TYPE = "procedures_declaration";
-export { PROCEDURES_DECLARATION_BLOCK_TYPE };
+const PROCEDURES_DECLARATION_BLOCK_TYPE = 'procedures_declaration'
+export { PROCEDURES_DECLARATION_BLOCK_TYPE }
 
 /**
  * The type of all procedure prototype blocks.
- * @const {string}
  */
-const PROCEDURES_PROTOTYPE_BLOCK_TYPE = "procedures_prototype";
-export { PROCEDURES_PROTOTYPE_BLOCK_TYPE };
+const PROCEDURES_PROTOTYPE_BLOCK_TYPE = 'procedures_prototype'
+export { PROCEDURES_PROTOTYPE_BLOCK_TYPE }
 
 /**
  * The type of all procedure call blocks.
- * @const {string}
  */
-const PROCEDURES_CALL_BLOCK_TYPE = "procedures_call";
-export { PROCEDURES_CALL_BLOCK_TYPE };
+const PROCEDURES_CALL_BLOCK_TYPE = 'procedures_call'
+export { PROCEDURES_CALL_BLOCK_TYPE }
 
-const OUTPUT_SHAPE_HEXAGONAL = 1;
-export { OUTPUT_SHAPE_HEXAGONAL };
+const OUTPUT_SHAPE_HEXAGONAL = 1
+export { OUTPUT_SHAPE_HEXAGONAL }
 
-const OUTPUT_SHAPE_ROUND = 2;
-export { OUTPUT_SHAPE_ROUND };
+const OUTPUT_SHAPE_ROUND = 2
+export { OUTPUT_SHAPE_ROUND }
 
 /**
  * String for use in the dropdown created in field_variable,
  * specifically for broadcast messages.
  * This string indicates that this option in the dropdown is 'New message...'
  * and if selected, should trigger the prompt to create a new message.
- * @const {string}
  */
-const NEW_BROADCAST_MESSAGE_ID = "NEW_BROADCAST_MESSAGE_ID";
-export { NEW_BROADCAST_MESSAGE_ID };
+const NEW_BROADCAST_MESSAGE_ID = 'NEW_BROADCAST_MESSAGE_ID'
+export { NEW_BROADCAST_MESSAGE_ID }
 
 /**
  * Enum defining supported Scratch block themes.
  * Scratch block themes can customize the shape of blocks independently of their color.
  */
 export enum ScratchBlocksTheme {
-  CLASSIC = "classic",
-  CAT_BLOCKS = "catblocks",
+  CLASSIC = 'classic',
+  CAT_BLOCKS = 'catblocks',
 }

package/src/context_menu_items.ts

@@ -1,10 +1,8 @@
 /**
- * @license
  * Copyright 2024 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-
-import * as Blockly from "blockly/core";
+import * as Blockly from 'blockly/core'
 
 /**
  * Registers a block delete option that ignores shadows in the block count.
@@ -12,46 +10,41 @@ import * as Blockly from "blockly/core";
 export function registerDeleteBlock() {
   const deleteOption = {
     displayText(scope: Blockly.ContextMenuRegistry.Scope) {
-      const descendantCount = getDeletableBlocksInStack(scope.block!).length;
+      const descendantCount = getDeletableBlocksInStack(scope.block!).length
       return descendantCount === 1
-        ? Blockly.Msg["DELETE_BLOCK"]
-        : Blockly.Msg["DELETE_X_BLOCKS"].replace("%1", `${descendantCount}`);
+        ? Blockly.Msg.DELETE_BLOCK
+        : Blockly.Msg.DELETE_X_BLOCKS.replace('%1', `${descendantCount}`)
     },
     preconditionFn(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.block!.isInFlyout && scope.block!.isDeletable()) {
-        return "enabled";
+        return 'enabled'
       }
-      return "hidden";
+      return 'hidden'
     },
     callback(scope: Blockly.ContextMenuRegistry.Scope) {
-      Blockly.Events.setGroup(true);
-      scope.block!.dispose(true, true);
-      Blockly.Events.setGroup(false);
+      Blockly.Events.setGroup(true)
+      scope.block!.dispose(true, true)
+      Blockly.Events.setGroup(false)
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
-    id: "blockDelete",
+    id: 'blockDelete',
     weight: 6,
-  };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  }
+  Blockly.ContextMenuRegistry.registry.register(deleteOption)
 }
 
-function getDeletableBlocksInStack(
-  block: Blockly.BlockSvg
-): Blockly.BlockSvg[] {
-  let descendants = block.getDescendants(false).filter(isDeletable);
+function getDeletableBlocksInStack(block: Blockly.BlockSvg): Blockly.BlockSvg[] {
+  let descendants = block.getDescendants(false).filter(isDeletable)
   if (block.getNextBlock()) {
     // Next blocks are not deleted.
-    const nextDescendants = block
-      .getNextBlock()!
-      .getDescendants(false)
-      .filter(isDeletable);
-    descendants = descendants.filter((b) => !nextDescendants.includes(b));
+    const nextDescendants = block.getNextBlock()!.getDescendants(false).filter(isDeletable)
+    descendants = descendants.filter((b) => !nextDescendants.includes(b))
   }
-  return descendants;
+  return descendants
 }
 
 function isDeletable(block: Blockly.BlockSvg): boolean {
-  return block.isDeletable() && !block.isShadow();
+  return block.isDeletable() && !block.isShadow()
 }
 
 /**
@@ -61,55 +54,45 @@ export function registerDeleteAll() {
   const deleteOption = {
     displayText(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
-        return "";
+        return ''
       }
-      const deletableBlocksLength = getDeletableBlocksInWorkspace(
-        scope.workspace
-      ).length;
+      const deletableBlocksLength = getDeletableBlocksInWorkspace(scope.workspace).length
       if (deletableBlocksLength === 1) {
-        return Blockly.Msg["DELETE_BLOCK"];
+        return Blockly.Msg.DELETE_BLOCK
       }
-      return Blockly.Msg["DELETE_X_BLOCKS"].replace(
-        "%1",
-        `${deletableBlocksLength}`
-      );
+      return Blockly.Msg.DELETE_X_BLOCKS.replace('%1', `${deletableBlocksLength}`)
     },
     preconditionFn(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
-        return "disabled";
+        return 'disabled'
       }
-      const deletableBlocksLength = getDeletableBlocksInWorkspace(
-        scope.workspace
-      ).length;
-      return deletableBlocksLength > 0 ? "enabled" : "disabled";
+      const deletableBlocksLength = getDeletableBlocksInWorkspace(scope.workspace).length
+      return deletableBlocksLength > 0 ? 'enabled' : 'disabled'
     },
     callback(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
-        return;
+        return
       }
-      scope.workspace.cancelCurrentGesture();
-      const deletableBlocks = getDeletableBlocksInWorkspace(scope.workspace);
+      scope.workspace.cancelCurrentGesture()
+      const deletableBlocks = getDeletableBlocksInWorkspace(scope.workspace)
       if (deletableBlocks.length < 2) {
-        deleteNext(deletableBlocks);
+        deleteNext(deletableBlocks)
       } else {
         Blockly.dialog.confirm(
-          Blockly.Msg["DELETE_ALL_BLOCKS"].replace(
-            "%1",
-            String(deletableBlocks.length)
-          ),
-          function (ok: boolean) {
+          Blockly.Msg.DELETE_ALL_BLOCKS.replace('%1', String(deletableBlocks.length)),
+          (ok: boolean) => {
             if (ok) {
-              deleteNext(deletableBlocks);
+              deleteNext(deletableBlocks)
             }
-          }
-        );
+          },
+        )
       }
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
-    id: "workspaceDelete",
+    id: 'workspaceDelete',
     weight: 6,
-  };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  }
+  Blockly.ContextMenuRegistry.registry.register(deleteOption)
 }
 
 /*
@@ -118,41 +101,34 @@ export function registerDeleteAll() {
  * @param workspace to delete all blocks from.
  * @returns list of blocks to delete.
  */
-function getDeletableBlocksInWorkspace(
-  workspace: Blockly.WorkspaceSvg
-): Blockly.BlockSvg[] {
-  return workspace
-    .getTopBlocks(true)
-    .flatMap((b: Blockly.BlockSvg) =>
-      b.getDescendants(false).filter(isDeletable)
-    );
+function getDeletableBlocksInWorkspace(workspace: Blockly.WorkspaceSvg): Blockly.BlockSvg[] {
+  return workspace.getTopBlocks(true).flatMap((b: Blockly.BlockSvg) => b.getDescendants(false).filter(isDeletable))
 }
 
 /**
  * Deletes the given blocks. Used to delete all blocks in the workspace.
- *
  * @param deleteList List of blocks to delete.
  * @param eventGroup Event group ID with which all delete events should be
  *     associated.  If not specified, create a new group.
  */
 function deleteNext(deleteList: Blockly.BlockSvg[], eventGroup?: string) {
-  const DELAY = 10;
+  const DELAY = 10
   if (eventGroup) {
-    Blockly.Events.setGroup(eventGroup);
+    Blockly.Events.setGroup(eventGroup)
   } else {
-    Blockly.Events.setGroup(true);
-    eventGroup = Blockly.Events.getGroup();
+    Blockly.Events.setGroup(true)
+    eventGroup = Blockly.Events.getGroup()
   }
-  const block = deleteList.shift();
+  const block = deleteList.shift()
   if (block) {
     if (!block.isDeadOrDying()) {
-      block.dispose(false, true);
-      setTimeout(deleteNext, DELAY, deleteList, eventGroup);
+      block.dispose(false, true)
+      setTimeout(deleteNext, DELAY, deleteList, eventGroup)
     } else {
-      deleteNext(deleteList, eventGroup);
+      deleteNext(deleteList, eventGroup)
     }
   }
-  Blockly.Events.setGroup(false);
+  Blockly.Events.setGroup(false)
 }
 
 /**
@@ -160,21 +136,20 @@ function deleteNext(deleteList: Blockly.BlockSvg[], eventGroup?: string) {
  * all subsequent blocks in the stack.
  */
 export function registerDuplicateBlock() {
-  const original =
-    Blockly.ContextMenuRegistry.registry.getItem("blockDuplicate")!;
+  const original = Blockly.ContextMenuRegistry.registry.getItem('blockDuplicate')!
   const duplicateOption = {
     displayText: original.displayText!,
     preconditionFn: original.preconditionFn!,
     callback(scope: Blockly.ContextMenuRegistry.Scope) {
-      if (!scope.block) return;
-      const data = scope.block.toCopyData(true);
-      if (!data) return;
-      Blockly.clipboard.paste(data, scope.block.workspace);
+      if (!scope.block) return
+      const data = scope.block.toCopyData(true)
+      if (!data) return
+      Blockly.clipboard.paste(data, scope.block.workspace)
     },
     scopeType: original.scopeType,
     id: original.id,
     weight: original.weight,
-  };
-  Blockly.ContextMenuRegistry.registry.unregister(duplicateOption.id);
-  Blockly.ContextMenuRegistry.registry.register(duplicateOption);
+  }
+  Blockly.ContextMenuRegistry.registry.unregister(duplicateOption.id)
+  Blockly.ContextMenuRegistry.registry.register(duplicateOption)
 }

package/src/css.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Visual Blocks Editor
  *
  * Copyright 2013 Google Inc.
@@ -17,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as Blockly from "blockly/core";
+import * as Blockly from 'blockly/core'
 
 const styles = `
   .blocklySvg {
@@ -1209,6 +1208,6 @@ const styles = `
   .blocklyInsertionMarker > g:not(:last-child) {
     visibility: hidden;
   }
-`;
+`
 
-Blockly.Css.register(styles);
+Blockly.Css.register(styles)