Revert "fix: #129 & #130"

This reverts commit 79018f6.

Author: P-nutsK

.gitignore

@@ -35,5 +35,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 
 # turbo
 .turbo
-# temporary files
-examples/tmp_*/**
+

bun.lock

@@ -1,4 +1,4 @@
-import { fromPrimitiveSource, menuInput } from '../core/block-helper'
+import { fromPrimitiveSource } from '../core/block-helper'
 import { attachStack, block, substack, valueBlock } from '../core/composer'
 import { Shadow } from '../core/sb3-enum'
 import type { PrimitiveSource, VariableReference } from '../core/types'
@@ -368,26 +368,14 @@ export const CREATE_CLONE_MYSELF = '_myself_'
  * ```ts
  * import { createClone } from 'hikkaku/blocks'
  *
- * createClone('Sprite1')
+ * createClone('mouse-pointer')
  * ```
  */
-
 export const createClone = (target: PrimitiveSource<string>) => {
   return block('control_create_clone_of', {
     inputs: {
-      CLONE_OPTION: menuInput(target, menuOfCreateClone),
-    },
-  })
-}
-
-export const menuOfCreateClone = (
-  target: (string & {}) | typeof CREATE_CLONE_MYSELF = CREATE_CLONE_MYSELF,
-) => {
-  return valueBlock('control_create_clone_of_menu', {
-    fields: {
-      CLONE_OPTION: [target, null],
+      CLONE_OPTION: fromPrimitiveSource(target),
     },
-    isShadow: true,
   })
 }
 

packages/hikkaku/src/blocks/control.ts

@@ -244,7 +244,7 @@ export const broadcast = (message: PrimitiveSource<string>) => {
         typeof message === 'string'
           ? ([
               Shadow.SameBlockShadow,
-              [InputType.Broadcast, message, message /* id */],
+              [InputType.Broadcast, message, message],
             ] as Input)
           : fromPrimitiveSource(message),
     },

packages/hikkaku/src/blocks/events.ts

@@ -1,8 +1,4 @@
-import {
-  fromPrimitiveSource,
-  menuInput,
-  unwrapCostumeSource,
-} from '../core/block-helper'
+import { fromCostumeSource, fromPrimitiveSource } from '../core/block-helper'
 import { block, valueBlock } from '../core/composer'
 import type { CostumeSource, PrimitiveSource } from '../core/types'
 
@@ -175,18 +171,10 @@ export const hide = () => {
 export const switchCostumeTo = (costume: CostumeSource) => {
   return block('looks_switchcostumeto', {
     inputs: {
-      COSTUME: menuInput(unwrapCostumeSource(costume), menuOfCostume),
+      COSTUME: fromCostumeSource(costume),
     },
   })
 }
-export const menuOfCostume = (costume: string = '') => {
-  return valueBlock('looks_costume', {
-    fields: {
-      COSTUME: [costume, null],
-    },
-    isShadow: true,
-  })
-}
 
 /**
  * Next costume.
@@ -224,17 +212,8 @@ export const nextCostume = () => {
 export const switchBackdropTo = (backdrop: PrimitiveSource<string>) => {
   return block('looks_switchbackdropto', {
     inputs: {
-      BACKDROP: menuInput(backdrop, menuOfBackdrop),
-    },
-  })
-}
-
-export const menuOfBackdrop = (backdrop: string = '') => {
-  return valueBlock('looks_backdrops', {
-    fields: {
-      BACKDROP: [backdrop, null],
+      BACKDROP: fromPrimitiveSource(backdrop),
     },
-    isShadow: true,
   })
 }
 
@@ -256,7 +235,7 @@ export const menuOfBackdrop = (backdrop: string = '') => {
 export const switchBackdropToAndWait = (backdrop: PrimitiveSource<string>) => {
   return block('looks_switchbackdroptoandwait', {
     inputs: {
-      BACKDROP: menuInput(backdrop, menuOfBackdrop),
+      BACKDROP: fromPrimitiveSource(backdrop),
     },
   })
 }

packages/hikkaku/src/blocks/looks.ts

@@ -1,4 +1,4 @@
-import { fromPrimitiveSource, menuInput } from '../core/block-helper'
+import { fromPrimitiveSource } from '../core/block-helper'
 import { block, valueBlock } from '../core/composer'
 import type { PrimitiveSource } from '../core/types'
 
@@ -160,21 +160,11 @@ export const setY = (y: PrimitiveSource<number>) => {
  * goTo('mouse-pointer')
  * ```
  */
-export const goTo = (target: PrimitiveSource<string>) => {
+export const goTo = (target: string) => {
   return block('motion_goto', {
-    inputs: {
-      TO: menuInput(target, menuOfGoTo),
-    },
-  })
-}
-export const GOTO_RANDOM = '_random_'
-export const menuOfGoTo = (target: string = GOTO_RANDOM) => {
-  console.log('menuOfGoTo', target)
-  return valueBlock('motion_goto_menu', {
     fields: {
       TO: [target, null],
     },
-    isShadow: true,
   })
 }
 
@@ -262,20 +252,11 @@ export const pointInDirection = (direction: PrimitiveSource<number>) => {
  * pointTowards('mouse-pointer')
  * ```
  */
-export const pointTowards = (target: PrimitiveSource<string>) => {
+export const pointTowards = (target: string) => {
   return block('motion_pointtowards', {
-    inputs: {
-      TOWARDS: menuInput(target, menuOfPointTowards),
-    },
-  })
-}
-const TOWARDS_MOUSE_POINTER = '_mouse_'
-export const menuOfPointTowards = (target: string = TOWARDS_MOUSE_POINTER) => {
-  return valueBlock('motion_pointtowards_menu', {
     fields: {
       TOWARDS: [target, null],
     },
-    isShadow: true,
   })
 }
 
@@ -330,17 +311,10 @@ export const glideTo = (seconds: PrimitiveSource<number>, target: string) => {
   return block('motion_glideto', {
     inputs: {
       SECS: fromPrimitiveSource(seconds),
-      TO: menuInput(target, menuOfGlideTo),
     },
-  })
-}
-
-export const menuOfGlideTo = (target: string = GOTO_RANDOM) => {
-  return valueBlock('motion_glideto_menu', {
     fields: {
-      GLIDETO_MENU: [target, null],
+      TO: [target, null],
     },
-    isShadow: true,
   })
 }
 

packages/hikkaku/src/blocks/motion.ts

@@ -1,9 +1,5 @@
-import {
-  fromPrimitiveSource,
-  fromPrimitiveSourceColor,
-  menuInput,
-} from '../core/block-helper'
-import { block, valueBlock } from '../core/composer'
+import { fromPrimitiveSource } from '../core/block-helper'
+import { block } from '../core/composer'
 import type { PrimitiveSource } from '../core/types'
 
 export type PenColorParam =
@@ -102,7 +98,7 @@ export const penUp = () => {
 /**
  * Sets pen color.
  *
- * Input: `color`. like: #ffffff, #fff, or 24-bit number.toString(), This does not accept values like "red" or "green" that CSS accepts.
+ * Input: `color`.
  * Output: Scratch statement block definition that is appended to the current script stack.
  *
  * @param color See function signature for accepted input values.
@@ -111,13 +107,13 @@ export const penUp = () => {
  * ```ts
  * import { setPenColorTo } from 'hikkaku/blocks'
  *
- * setPenColorTo("#ff0000")
+ * setPenColorTo(undefined as any)
  * ```
  */
-export const setPenColorTo = (color: PrimitiveSource<`#${string}`>) => {
+export const setPenColorTo = (color: PrimitiveSource<string>) => {
   return block('pen_setPenColorToColor', {
     inputs: {
-      COLOR: fromPrimitiveSourceColor(color),
+      COLOR: fromPrimitiveSource(color),
     },
   })
 }
@@ -160,19 +156,11 @@ export const changePenColorParamBy = (
 ) => {
   return block('pen_changePenColorParamBy', {
     inputs: {
-      COLOR_PARAM: menuInput(param, menuOfPenColorParam),
+      COLOR_PARAM: fromPrimitiveSource(param),
       VALUE: fromPrimitiveSource(value),
     },
   })
 }
-export const menuOfPenColorParam = (colorParam: PenColorParam = 'color') => {
-  return valueBlock('pen_menu_colorParam', {
-    fields: {
-      colorParam: [colorParam, null],
-    },
-    isShadow: true,
-  })
-}
 
 /**
  * Sets pen color parameter to value.
@@ -196,7 +184,7 @@ export const setPenColorParamTo = (
 ) => {
   return block('pen_setPenColorParamTo', {
     inputs: {
-      COLOR_PARAM: menuInput(param, menuOfPenColorParam),
+      COLOR_PARAM: fromPrimitiveSource(param),
       VALUE: fromPrimitiveSource(value),
     },
   })

packages/hikkaku/src/blocks/pen.ts

@@ -1,4 +1,4 @@
-import { fromPrimitiveSource, menuInput } from '../core/block-helper'
+import { fromPrimitiveSource } from '../core/block-helper'
 import { block, valueBlock } from '../core/composer'
 import type { PrimitiveSource } from '../core/types'
 
@@ -65,19 +65,11 @@ export type DragMode = 'draggable' | 'not draggable'
 export const touchingObject = (target: string) => {
   return valueBlock('sensing_touchingobject', {
     inputs: {
-      TOUCHINGOBJECTMENU: menuInput(target, menuOfTouchingObject),
+      TOUCHINGOBJECTMENU: fromPrimitiveSource(target),
     },
   })
 }
 
-export const menuOfTouchingObject = (target: string = '_mouse_') => {
-  return valueBlock('sensing_touchingobjectmenu', {
-    fields: {
-      TOUCHINGOBJECTMENU: [target, null],
-    },
-    isShadow: true,
-  })
-}
 /**
  * Touching color check.
  *
@@ -146,18 +138,9 @@ export const colorTouchingColor = (
  */
 export const distanceTo = (target: string) => {
   return valueBlock('sensing_distanceto', {
-    inputs: {
-      DISTANCETOMENU: menuInput(target, menuOfDistanceTo),
-    },
-  })
-}
-
-export const menuOfDistanceTo = (target: string = '_mouse_') => {
-  return valueBlock('sensing_distancetomenu', {
     fields: {
       DISTANCETOMENU: [target, null],
     },
-    isShadow: true,
   })
 }
 
@@ -256,20 +239,11 @@ export const getMouseDown = () => {
 export const getKeyPressed = (key: PrimitiveSource<string>) => {
   return valueBlock('sensing_keypressed', {
     inputs: {
-      KEY_OPTION: menuInput(key, menuOfKeyOptions),
+      KEY_OPTION: fromPrimitiveSource(key),
     },
   })
 }
 
-export const menuOfKeyOptions = (key: string = 'space') => {
-  return valueBlock('sensing_keyoptions', {
-    fields: {
-      KEY_OPTION: [key, null],
-    },
-    isShadow: true,
-  })
-}
-
 /**
  * Current date/time value.
  *
@@ -292,6 +266,7 @@ export const current = (menu: CurrentMenu) => {
     },
   })
 }
+
 /**
  * Reads target attribute.
  *
@@ -312,18 +287,8 @@ export const getAttributeOf = (property: string, target: string) => {
   return valueBlock('sensing_of', {
     fields: {
       PROPERTY: [property, null],
+      OBJECT: [target, null],
     },
-    inputs: {
-      OBJECT: menuInput(target, menuOfAttributeObject),
-    },
-  })
-}
-export const menuOfAttributeObject = (object: string = '_stage_') => {
-  return valueBlock('sensing_of_object_menu', {
-    fields: {
-      OBJECT: [object, null],
-    },
-    isShadow: true,
   })
 }