hikkaku 0.3.3 → 0.3.5

package/blocks/index.mjs

@@ -1,4 +1,5 @@
-import { a as valueBlock, d as menuInput, f as unwrapCostumeSource, h as Shadow, i as substack, m as InputType, n as block, o as fromPrimitiveSource, p as unwrapSoundSource, s as fromPrimitiveSourceColor, t as attachStack } from "../composer-bPcsVhIg.mjs";
+import { _ as valueBlock, c as unwrapSoundSource, f as attachStack, g as substack, n as fromPrimitiveSource, o as menuInput, p as block, s as unwrapCostumeSource, t as fromBooleanSource } from "../block-helper-DaOyXkRZ.mjs";
+import { InputType, Shadow } from "sb3-types/enum";
 
 //#region src/blocks/control.ts
 /**
@@ -7,7 +8,7 @@ import { a as valueBlock, d as menuInput, f as unwrapCostumeSource, h as Shadow,
 * Input: `times`, `handler`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param times PrimitiveSource<number>. number of iterations
+* @param times PrimitiveSource<HikkakuNumber>. number of iterations
 * @param handler () => void. body of the loop
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
@@ -20,7 +21,7 @@ import { a as valueBlock, d as menuInput, f as unwrapCostumeSource, h as Shadow,
 const repeat = (times, handler) => {
 	const substackId = substack(handler);
 	return block("control_repeat", { inputs: {
-		TIMES: fromPrimitiveSource(times),
+		TIMES: fromPrimitiveSource(InputType.PositiveInteger, times, 10),
 		...substackId ? { SUBSTACK: [Shadow.NoShadow, substackId] } : {}
 	} });
 };
@@ -30,7 +31,7 @@ const repeat = (times, handler) => {
 * Input: `condition`, `handler`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param condition PrimitiveSource<boolean>
+* @param condition PrimitiveSource<HikkakuBool>
 * @param handler () => void
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
@@ -43,7 +44,7 @@ const repeat = (times, handler) => {
 const repeatUntil = (condition, handler) => {
 	const substackId = substack(handler);
 	return block("control_repeat_until", { inputs: {
-		CONDITION: fromPrimitiveSource(condition),
+		CONDITION: fromBooleanSource(condition),
 		...substackId ? { SUBSTACK: [Shadow.NoShadow, substackId] } : {}
 	} });
 };
@@ -53,7 +54,7 @@ const repeatUntil = (condition, handler) => {
 * Input: `condition`, `handler`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param condition PrimitiveSource<boolean>
+* @param condition PrimitiveSource<HikkakuBool>
 * @param handler () => void
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
@@ -66,7 +67,7 @@ const repeatUntil = (condition, handler) => {
 const repeatWhile = (condition, handler) => {
 	const substackId = substack(handler);
 	return block("control_while", { inputs: {
-		CONDITION: fromPrimitiveSource(condition),
+		CONDITION: fromBooleanSource(condition),
 		...substackId ? { SUBSTACK: [Shadow.NoShadow, substackId] } : {}
 	} });
 };
@@ -77,7 +78,7 @@ const repeatWhile = (condition, handler) => {
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
 * @param variable VariableReference
-* @param value PrimitiveSource<number>. upper bound
+* @param value PrimitiveSource<HikkakuNumber>. upper bound
 * @param handler () => void
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
@@ -91,7 +92,7 @@ const forEach = (variable, value, handler) => {
 	const substackId = substack(handler);
 	return block("control_for_each", {
 		inputs: {
-			VALUE: fromPrimitiveSource(value),
+			VALUE: fromPrimitiveSource(InputType.Number, value, 10),
 			...substackId ? { SUBSTACK: [Shadow.NoShadow, substackId] } : {}
 		},
 		fields: { VARIABLE: [variable.name, variable.id] }
@@ -122,7 +123,7 @@ const forever = (handler) => {
 * Input: `seconds`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param seconds PrimitiveSource<number>
+* @param seconds PrimitiveSource<HikkakuNumber>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -132,7 +133,7 @@ const forever = (handler) => {
 * ```
 */
 const wait = (seconds) => {
-	return block("control_wait", { inputs: { DURATION: fromPrimitiveSource(seconds) } });
+	return block("control_wait", { inputs: { DURATION: fromPrimitiveSource(InputType.Number, seconds, 1) } });
 };
 /**
 * Waits until condition becomes true.
@@ -140,7 +141,7 @@ const wait = (seconds) => {
 * Input: `condition`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param condition PrimitiveSource<boolean>
+* @param condition PrimitiveSource<HikkakuBool>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -150,7 +151,7 @@ const wait = (seconds) => {
 * ```
 */
 const waitUntil = (condition) => {
-	return block("control_wait_until", { inputs: { CONDITION: fromPrimitiveSource(condition) } });
+	return block("control_wait_until", { inputs: { CONDITION: fromBooleanSource(condition) } });
 };
 /**
 * Conditional execution.
@@ -158,7 +159,7 @@ const waitUntil = (condition) => {
 * Input: `condition`, `handler`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param condition PrimitiveSource<boolean>
+* @param condition PrimitiveSource<HikkakuBool>
 * @param handler () => void
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
@@ -171,7 +172,7 @@ const waitUntil = (condition) => {
 const ifThen = (condition, handler) => {
 	const substackId = substack(handler);
 	return block("control_if", { inputs: {
-		CONDITION: fromPrimitiveSource(condition),
+		CONDITION: fromBooleanSource(condition),
 		...substackId ? { SUBSTACK: [Shadow.NoShadow, substackId] } : {}
 	} });
 };
@@ -181,7 +182,7 @@ const ifThen = (condition, handler) => {
 * Input: `condition`, `thenHandler`, `elseHandler`.
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
-* @param condition PrimitiveSource<boolean>
+* @param condition PrimitiveSource<HikkakuBool>
 * @param thenHandler () => void
 * @param elseHandler () => void
 * @returns Scratch statement block definition that is appended to the current script stack.
@@ -196,7 +197,7 @@ const ifElse = (condition, thenHandler, elseHandler) => {
 	const thenSubstackId = substack(thenHandler);
 	const elseSubstackId = substack(elseHandler);
 	return block("control_if_else", { inputs: {
-		CONDITION: fromPrimitiveSource(condition),
+		CONDITION: fromBooleanSource(condition),
 		...thenSubstackId ? { SUBSTACK: [Shadow.NoShadow, thenSubstackId] } : {},
 		...elseSubstackId ? { SUBSTACK2: [Shadow.NoShadow, elseSubstackId] } : {}
 	} });
@@ -213,7 +214,7 @@ const ifElse = (condition, thenHandler, elseHandler) => {
 * ```ts
 * import { match } from 'hikkaku/blocks'
 *
-* match(...[[true, () => {}]] as any)
+* match([true, () => {}], () => {})
 * ```
 */
 const match = (...branches) => {
@@ -426,7 +427,7 @@ const getVariable = (variable) => {
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
 * @param variable VariableReference
-* @param value PrimitiveSource<number | string>
+* @param value PrimitiveSource<HikkakuNumber | HikkakuString>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -437,7 +438,7 @@ const getVariable = (variable) => {
 */
 const setVariableTo = (variable, value) => {
 	return block("data_setvariableto", {
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.String, value, "0") },
 		fields: { VARIABLE: toField(variable) }
 	});
 };
@@ -448,7 +449,7 @@ const setVariableTo = (variable, value) => {
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
 * @param variable VariableReference
-* @param value PrimitiveSource<number>
+* @param value PrimitiveSource<HikkakuNumber>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -459,7 +460,7 @@ const setVariableTo = (variable, value) => {
 */
 const changeVariableBy = (variable, value) => {
 	return block("data_changevariableby", {
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.Number, value, 0) },
 		fields: { VARIABLE: toField(variable) }
 	});
 };
@@ -524,7 +525,7 @@ const getListContents = (list) => {
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
 * @param list ListReference
-* @param item PrimitiveSource<string | number>
+* @param item PrimitiveSource<HikkakuString | HikkakuNumber>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -535,7 +536,7 @@ const getListContents = (list) => {
 */
 const addToList = (list, item) => {
 	return block("data_addtolist", {
-		inputs: { ITEM: fromPrimitiveSource(item) },
+		inputs: { ITEM: fromPrimitiveSource(InputType.String, item, "thing") },
 		fields: { LIST: toField(list) }
 	});
 };
@@ -546,7 +547,7 @@ const addToList = (list, item) => {
 * Output: Scratch statement block definition that is appended to the current script stack.
 *
 * @param list Input value used by this block.
-* @param index PrimitiveSource<number | string>
+* @param index PrimitiveSource<HikkakuNumber | HikkakuString>
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
@@ -557,7 +558,7 @@ const addToList = (list, item) => {
 */
 const deleteOfList = (list, index) => {
 	return block("data_deleteoflist", {
-		inputs: { INDEX: fromPrimitiveSource(index) },
+		inputs: { INDEX: fromPrimitiveSource(InputType.String, index, 1) },
 		fields: { LIST: toField(list) }
 	});
 };
@@ -599,8 +600,8 @@ const deleteAllOfList = (list) => {
 const insertAtList = (list, index, item) => {
 	return block("data_insertatlist", {
 		inputs: {
-			INDEX: fromPrimitiveSource(index),
-			ITEM: fromPrimitiveSource(item)
+			INDEX: fromPrimitiveSource(InputType.String, index, 1),
+			ITEM: fromPrimitiveSource(InputType.String, item, "thing")
 		},
 		fields: { LIST: toField(list) }
 	});
@@ -625,8 +626,8 @@ const insertAtList = (list, index, item) => {
 const replaceItemOfList = (list, index, item) => {
 	return block("data_replaceitemoflist", {
 		inputs: {
-			INDEX: fromPrimitiveSource(index),
-			ITEM: fromPrimitiveSource(item)
+			INDEX: fromPrimitiveSource(InputType.String, index, 1),
+			ITEM: fromPrimitiveSource(InputType.String, item, "thing")
 		},
 		fields: { LIST: toField(list) }
 	});
@@ -649,7 +650,7 @@ const replaceItemOfList = (list, index, item) => {
 */
 const getItemOfList = (list, index) => {
 	return valueBlock("data_itemoflist", {
-		inputs: { INDEX: fromPrimitiveSource(index) },
+		inputs: { INDEX: fromPrimitiveSource(InputType.String, index, 1) },
 		fields: { LIST: toField(list) }
 	});
 };
@@ -671,7 +672,7 @@ const getItemOfList = (list, index) => {
 */
 const getItemNumOfList = (list, item) => {
 	return valueBlock("data_itemnumoflist", {
-		inputs: { ITEM: fromPrimitiveSource(item) },
+		inputs: { ITEM: fromPrimitiveSource(InputType.String, item, "thing") },
 		fields: { LIST: toField(list) }
 	});
 };
@@ -711,7 +712,7 @@ const lengthOfList = (list) => {
 */
 const listContainsItem = (list, item) => {
 	return valueBlock("data_listcontainsitem", {
-		inputs: { ITEM: fromPrimitiveSource(item) },
+		inputs: { ITEM: fromPrimitiveSource(InputType.String, item, "thing") },
 		fields: { LIST: toField(list) }
 	});
 };
@@ -930,7 +931,7 @@ const whenTouchingObject = (target, stack) => {
 const whenGreaterThan = (menu, value, stack) => {
 	const res = block("event_whengreaterthan", {
 		topLevel: true,
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.Number, value, 10) },
 		fields: { WHENGREATERTHANMENU: [menu, null] }
 	});
 	attachStack(res.id, stack);
@@ -952,11 +953,7 @@ const whenGreaterThan = (menu, value, stack) => {
 * ```
 */
 const broadcast = (message) => {
-	return block("event_broadcast", { inputs: { BROADCAST_INPUT: typeof message === "string" ? [Shadow.SameBlockShadow, [
-		InputType.Broadcast,
-		message,
-		message
-	]] : fromPrimitiveSource(message) } });
+	return block("event_broadcast", { inputs: { BROADCAST_INPUT: fromPrimitiveSource(InputType.Broadcast, message, "message1") } });
 };
 /**
 * Broadcasts and waits.
@@ -974,11 +971,7 @@ const broadcast = (message) => {
 * ```
 */
 const broadcastAndWait = (message) => {
-	return block("event_broadcastandwait", { inputs: { BROADCAST_INPUT: typeof message === "string" ? [Shadow.SameBlockShadow, [
-		InputType.Broadcast,
-		message,
-		message
-	]] : fromPrimitiveSource(message) } });
+	return block("event_broadcastandwait", { inputs: { BROADCAST_INPUT: fromPrimitiveSource(InputType.Broadcast, message, "message1") } });
 };
 
 //#endregion
@@ -999,7 +992,7 @@ const broadcastAndWait = (message) => {
 * ```
 */
 const say = (message) => {
-	return block("looks_say", { inputs: { MESSAGE: fromPrimitiveSource(message) } });
+	return block("looks_say", { inputs: { MESSAGE: fromPrimitiveSource(InputType.String, message, "Hello!") } });
 };
 /**
 * Speaks for duration.
@@ -1019,8 +1012,8 @@ const say = (message) => {
 */
 const sayForSecs = (message, seconds) => {
 	return block("looks_sayforsecs", { inputs: {
-		MESSAGE: fromPrimitiveSource(message),
-		SECS: fromPrimitiveSource(seconds)
+		MESSAGE: fromPrimitiveSource(InputType.String, message, "Hello!"),
+		SECS: fromPrimitiveSource(InputType.Number, seconds, 2)
 	} });
 };
 /**
@@ -1039,7 +1032,7 @@ const sayForSecs = (message, seconds) => {
 * ```
 */
 const think = (message) => {
-	return block("looks_think", { inputs: { MESSAGE: fromPrimitiveSource(message) } });
+	return block("looks_think", { inputs: { MESSAGE: fromPrimitiveSource(InputType.String, message, "Hello!") } });
 };
 /**
 * Thinks for duration.
@@ -1059,8 +1052,8 @@ const think = (message) => {
 */
 const thinkForSecs = (message, seconds) => {
 	return block("looks_thinkforsecs", { inputs: {
-		MESSAGE: fromPrimitiveSource(message),
-		SECS: fromPrimitiveSource(seconds)
+		MESSAGE: fromPrimitiveSource(InputType.String, message, "Hello!"),
+		SECS: fromPrimitiveSource(InputType.Number, seconds, 2)
 	} });
 };
 /**
@@ -1215,7 +1208,7 @@ const nextBackdrop = () => {
 */
 const changeLooksEffectBy = (effect, value) => {
 	return block("looks_changeeffectby", {
-		inputs: { CHANGE: fromPrimitiveSource(value) },
+		inputs: { CHANGE: fromPrimitiveSource(InputType.Number, value, 10) },
 		fields: { EFFECT: [effect, null] }
 	});
 };
@@ -1237,7 +1230,7 @@ const changeLooksEffectBy = (effect, value) => {
 */
 const setLooksEffectTo = (effect, value) => {
 	return block("looks_seteffectto", {
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.Number, value, 100) },
 		fields: { EFFECT: [effect, null] }
 	});
 };
@@ -1274,7 +1267,7 @@ const clearGraphicEffects = () => {
 * ```
 */
 const changeSizeBy = (value) => {
-	return block("looks_changesizeby", { inputs: { CHANGE: fromPrimitiveSource(value) } });
+	return block("looks_changesizeby", { inputs: { CHANGE: fromPrimitiveSource(InputType.Number, value, 10) } });
 };
 /**
 * Sets size.
@@ -1292,7 +1285,7 @@ const changeSizeBy = (value) => {
 * ```
 */
 const setSizeTo = (value) => {
-	return block("looks_setsizeto", { inputs: { SIZE: fromPrimitiveSource(value) } });
+	return block("looks_setsizeto", { inputs: { SIZE: fromPrimitiveSource(InputType.Number, value, 100) } });
 };
 /**
 * Moves sprite layer.
@@ -1330,7 +1323,7 @@ const goToFrontBack = (position) => {
 */
 const goForwardBackwardLayers = (direction, layers) => {
 	return block("looks_goforwardbackwardlayers", {
-		inputs: { NUM: fromPrimitiveSource(layers) },
+		inputs: { NUM: fromPrimitiveSource(InputType.Integer, layers, 1) },
 		fields: { FORWARD_BACKWARD: [direction, null] }
 	});
 };
@@ -1406,7 +1399,7 @@ const getBackdropNumberName = (value) => {
 * ```
 */
 const moveSteps = (steps) => {
-	return block("motion_movesteps", { inputs: { STEPS: fromPrimitiveSource(steps) } });
+	return block("motion_movesteps", { inputs: { STEPS: fromPrimitiveSource(InputType.Number, steps, 10) } });
 };
 /**
 * Moves to coordinates.
@@ -1426,8 +1419,8 @@ const moveSteps = (steps) => {
 */
 const gotoXY = (x, y) => {
 	return block("motion_gotoxy", { inputs: {
-		X: fromPrimitiveSource(x),
-		Y: fromPrimitiveSource(y)
+		X: fromPrimitiveSource(InputType.Number, x, 0),
+		Y: fromPrimitiveSource(InputType.Number, y, 0)
 	} });
 };
 /**
@@ -1446,7 +1439,7 @@ const gotoXY = (x, y) => {
 * ```
 */
 const changeXBy = (dx) => {
-	return block("motion_changexby", { inputs: { DX: fromPrimitiveSource(dx) } });
+	return block("motion_changexby", { inputs: { DX: fromPrimitiveSource(InputType.Number, dx, 10) } });
 };
 /**
 * Changes Y.
@@ -1464,7 +1457,7 @@ const changeXBy = (dx) => {
 * ```
 */
 const changeYBy = (dy) => {
-	return block("motion_changeyby", { inputs: { DY: fromPrimitiveSource(dy) } });
+	return block("motion_changeyby", { inputs: { DY: fromPrimitiveSource(InputType.Number, dy, 10) } });
 };
 /**
 * Sets X.
@@ -1482,7 +1475,7 @@ const changeYBy = (dy) => {
 * ```
 */
 const setX = (x) => {
-	return block("motion_setx", { inputs: { X: fromPrimitiveSource(x) } });
+	return block("motion_setx", { inputs: { X: fromPrimitiveSource(InputType.Number, x, 0) } });
 };
 /**
 * Sets Y.
@@ -1500,7 +1493,7 @@ const setX = (x) => {
 * ```
 */
 const setY = (y) => {
-	return block("motion_sety", { inputs: { Y: fromPrimitiveSource(y) } });
+	return block("motion_sety", { inputs: { Y: fromPrimitiveSource(InputType.Number, y, 0) } });
 };
 /**
 * Moves to target.
@@ -1543,7 +1536,7 @@ const menuOfGoTo = (target = GOTO_RANDOM) => {
 * ```
 */
 const turnRight = (degrees) => {
-	return block("motion_turnright", { inputs: { DEGREES: fromPrimitiveSource(degrees) } });
+	return block("motion_turnright", { inputs: { DEGREES: fromPrimitiveSource(InputType.Number, degrees, 15) } });
 };
 /**
 * Turns left.
@@ -1561,7 +1554,7 @@ const turnRight = (degrees) => {
 * ```
 */
 const turnLeft = (degrees) => {
-	return block("motion_turnleft", { inputs: { DEGREES: fromPrimitiveSource(degrees) } });
+	return block("motion_turnleft", { inputs: { DEGREES: fromPrimitiveSource(InputType.Number, degrees, 15) } });
 };
 /**
 * Points direction.
@@ -1579,7 +1572,7 @@ const turnLeft = (degrees) => {
 * ```
 */
 const pointInDirection = (direction) => {
-	return block("motion_pointindirection", { inputs: { DIRECTION: fromPrimitiveSource(direction) } });
+	return block("motion_pointindirection", { inputs: { DIRECTION: fromPrimitiveSource(InputType.Angle, direction, 90) } });
 };
 /**
 * Points toward target.
@@ -1625,9 +1618,9 @@ const menuOfPointTowards = (target = TOWARDS_MOUSE_POINTER) => {
 */
 const glide = (seconds, x, y) => {
 	return block("motion_glidesecstoxy", { inputs: {
-		SECS: fromPrimitiveSource(seconds),
-		X: fromPrimitiveSource(x),
-		Y: fromPrimitiveSource(y)
+		SECS: fromPrimitiveSource(InputType.Number, seconds, 1),
+		X: fromPrimitiveSource(InputType.Number, x, 0),
+		Y: fromPrimitiveSource(InputType.Number, y, 0)
 	} });
 };
 /**
@@ -1648,7 +1641,7 @@ const glide = (seconds, x, y) => {
 */
 const glideTo = (seconds, target) => {
 	return block("motion_glideto", { inputs: {
-		SECS: fromPrimitiveSource(seconds),
+		SECS: fromPrimitiveSource(InputType.Number, seconds, 1),
 		TO: menuInput(target, menuOfGlideTo)
 	} });
 };
@@ -1765,8 +1758,8 @@ const getDirection = () => {
 */
 const playDrumForBeats = (drum, beats) => {
 	return block("music_playDrumForBeats", { inputs: {
-		DRUM: fromPrimitiveSource(drum),
-		BEATS: fromPrimitiveSource(beats)
+		DRUM: fromPrimitiveSource(InputType.Number, drum, 1),
+		BEATS: fromPrimitiveSource(InputType.Number, beats, .25)
 	} });
 };
 /**
@@ -1787,8 +1780,8 @@ const playDrumForBeats = (drum, beats) => {
 */
 const midiPlayDrumForBeats = (drum, beats) => {
 	return block("music_midiPlayDrumForBeats", { inputs: {
-		DRUM: fromPrimitiveSource(drum),
-		BEATS: fromPrimitiveSource(beats)
+		DRUM: fromPrimitiveSource(InputType.Number, drum, 1),
+		BEATS: fromPrimitiveSource(InputType.Number, beats, .25)
 	} });
 };
 /**
@@ -1807,7 +1800,7 @@ const midiPlayDrumForBeats = (drum, beats) => {
 * ```
 */
 const restForBeats = (beats) => {
-	return block("music_restForBeats", { inputs: { BEATS: fromPrimitiveSource(beats) } });
+	return block("music_restForBeats", { inputs: { BEATS: fromPrimitiveSource(InputType.Number, beats, .25) } });
 };
 /**
 * Plays note for beats.
@@ -1827,8 +1820,8 @@ const restForBeats = (beats) => {
 */
 const playNoteForBeats = (note, beats) => {
 	return block("music_playNoteForBeats", { inputs: {
-		NOTE: fromPrimitiveSource(note),
-		BEATS: fromPrimitiveSource(beats)
+		NOTE: fromPrimitiveSource(InputType.Number, note, 60),
+		BEATS: fromPrimitiveSource(InputType.Number, beats, .25)
 	} });
 };
 /**
@@ -1847,7 +1840,7 @@ const playNoteForBeats = (note, beats) => {
 * ```
 */
 const setInstrument = (instrument) => {
-	return block("music_setInstrument", { inputs: { INSTRUMENT: fromPrimitiveSource(instrument) } });
+	return block("music_setInstrument", { inputs: { INSTRUMENT: fromPrimitiveSource(InputType.Number, instrument, 1) } });
 };
 /**
 * Sets instrument with MIDI instrument mapping.
@@ -1865,7 +1858,7 @@ const setInstrument = (instrument) => {
 * ```
 */
 const midiSetInstrument = (instrument) => {
-	return block("music_midiSetInstrument", { inputs: { INSTRUMENT: fromPrimitiveSource(instrument) } });
+	return block("music_midiSetInstrument", { inputs: { INSTRUMENT: fromPrimitiveSource(InputType.Number, instrument, 1) } });
 };
 /**
 * Sets tempo.
@@ -1883,7 +1876,7 @@ const midiSetInstrument = (instrument) => {
 * ```
 */
 const setTempo = (tempo) => {
-	return block("music_setTempo", { inputs: { TEMPO: fromPrimitiveSource(tempo) } });
+	return block("music_setTempo", { inputs: { TEMPO: fromPrimitiveSource(InputType.Number, tempo, 20) } });
 };
 /**
 * Changes tempo.
@@ -1901,7 +1894,7 @@ const setTempo = (tempo) => {
 * ```
 */
 const changeTempo = (tempo) => {
-	return block("music_changeTempo", { inputs: { TEMPO: fromPrimitiveSource(tempo) } });
+	return block("music_changeTempo", { inputs: { TEMPO: fromPrimitiveSource(InputType.Number, tempo, 20) } });
 };
 /**
 * Returns tempo.
@@ -1941,8 +1934,8 @@ const getTempo = () => {
 */
 const add = (a, b) => {
 	return valueBlock("operator_add", { inputs: {
-		NUM1: fromPrimitiveSource(a),
-		NUM2: fromPrimitiveSource(b)
+		NUM1: fromPrimitiveSource(InputType.Number, a, 0),
+		NUM2: fromPrimitiveSource(InputType.Number, b, 0)
 	} });
 };
 /**
@@ -1963,8 +1956,8 @@ const add = (a, b) => {
 */
 const subtract = (a, b) => {
 	return valueBlock("operator_subtract", { inputs: {
-		NUM1: fromPrimitiveSource(a),
-		NUM2: fromPrimitiveSource(b)
+		NUM1: fromPrimitiveSource(InputType.Number, a, 0),
+		NUM2: fromPrimitiveSource(InputType.Number, b, 0)
 	} });
 };
 /**
@@ -1985,8 +1978,8 @@ const subtract = (a, b) => {
 */
 const multiply = (a, b) => {
 	return valueBlock("operator_multiply", { inputs: {
-		NUM1: fromPrimitiveSource(a),
-		NUM2: fromPrimitiveSource(b)
+		NUM1: fromPrimitiveSource(InputType.Number, a, 0),
+		NUM2: fromPrimitiveSource(InputType.Number, b, 0)
 	} });
 };
 /**
@@ -2007,8 +2000,8 @@ const multiply = (a, b) => {
 */
 const divide = (a, b) => {
 	return valueBlock("operator_divide", { inputs: {
-		NUM1: fromPrimitiveSource(a),
-		NUM2: fromPrimitiveSource(b)
+		NUM1: fromPrimitiveSource(InputType.Number, a, 0),
+		NUM2: fromPrimitiveSource(InputType.Number, b, 0)
 	} });
 };
 /**
@@ -2029,8 +2022,8 @@ const divide = (a, b) => {
 */
 const lt = (a, b) => {
 	return valueBlock("operator_lt", { inputs: {
-		OPERAND1: fromPrimitiveSource(a),
-		OPERAND2: fromPrimitiveSource(b)
+		OPERAND1: fromPrimitiveSource(InputType.String, a, ""),
+		OPERAND2: fromPrimitiveSource(InputType.String, b, "")
 	} });
 };
 /**
@@ -2051,8 +2044,8 @@ const lt = (a, b) => {
 */
 const equals = (a, b) => {
 	return valueBlock("operator_equals", { inputs: {
-		OPERAND1: fromPrimitiveSource(a),
-		OPERAND2: fromPrimitiveSource(b)
+		OPERAND1: fromPrimitiveSource(InputType.String, a, ""),
+		OPERAND2: fromPrimitiveSource(InputType.String, b, "")
 	} });
 };
 /**
@@ -2073,8 +2066,8 @@ const equals = (a, b) => {
 */
 const gt = (a, b) => {
 	return valueBlock("operator_gt", { inputs: {
-		OPERAND1: fromPrimitiveSource(a),
-		OPERAND2: fromPrimitiveSource(b)
+		OPERAND1: fromPrimitiveSource(InputType.String, a, ""),
+		OPERAND2: fromPrimitiveSource(InputType.String, b, "")
 	} });
 };
 /**
@@ -2095,8 +2088,8 @@ const gt = (a, b) => {
 */
 const and = (a, b) => {
 	return valueBlock("operator_and", { inputs: {
-		OPERAND1: fromPrimitiveSource(a),
-		OPERAND2: fromPrimitiveSource(b)
+		OPERAND1: fromBooleanSource(a),
+		OPERAND2: fromBooleanSource(b)
 	} });
 };
 /**
@@ -2117,8 +2110,8 @@ const and = (a, b) => {
 */
 const or = (a, b) => {
 	return valueBlock("operator_or", { inputs: {
-		OPERAND1: fromPrimitiveSource(a),
-		OPERAND2: fromPrimitiveSource(b)
+		OPERAND1: fromBooleanSource(a),
+		OPERAND2: fromBooleanSource(b)
 	} });
 };
 /**
@@ -2137,7 +2130,7 @@ const or = (a, b) => {
 * ```
 */
 const not = (operand) => {
-	return valueBlock("operator_not", { inputs: { OPERAND: fromPrimitiveSource(operand) } });
+	return valueBlock("operator_not", { inputs: { OPERAND: fromBooleanSource(operand) } });
 };
 /**
 * Random number.
@@ -2157,8 +2150,8 @@ const not = (operand) => {
 */
 const random = (from, to) => {
 	return valueBlock("operator_random", { inputs: {
-		FROM: fromPrimitiveSource(from),
-		TO: fromPrimitiveSource(to)
+		FROM: fromPrimitiveSource(InputType.Number, from, 1),
+		TO: fromPrimitiveSource(InputType.Number, to, 10)
 	} });
 };
 /**
@@ -2179,8 +2172,8 @@ const random = (from, to) => {
 */
 const join = (a, b) => {
 	return valueBlock("operator_join", { inputs: {
-		STRING1: fromPrimitiveSource(a),
-		STRING2: fromPrimitiveSource(b)
+		STRING1: fromPrimitiveSource(InputType.String, a, "apple"),
+		STRING2: fromPrimitiveSource(InputType.String, b, "banana")
 	} });
 };
 /**
@@ -2201,8 +2194,8 @@ const join = (a, b) => {
 */
 const letterOf = (letter, text) => {
 	return valueBlock("operator_letter_of", { inputs: {
-		LETTER: fromPrimitiveSource(letter),
-		STRING: fromPrimitiveSource(text)
+		LETTER: fromPrimitiveSource(InputType.PositiveInteger, letter, 1),
+		STRING: fromPrimitiveSource(InputType.String, text, "apple")
 	} });
 };
 /**
@@ -2221,7 +2214,7 @@ const letterOf = (letter, text) => {
 * ```
 */
 const length = (text) => {
-	return valueBlock("operator_length", { inputs: { STRING: fromPrimitiveSource(text) } });
+	return valueBlock("operator_length", { inputs: { STRING: fromPrimitiveSource(InputType.String, text, "apple") } });
 };
 /**
 * Substring check.
@@ -2241,8 +2234,8 @@ const length = (text) => {
 */
 const contains = (text, substring) => {
 	return valueBlock("operator_contains", { inputs: {
-		STRING1: fromPrimitiveSource(text),
-		STRING2: fromPrimitiveSource(substring)
+		STRING1: fromPrimitiveSource(InputType.String, text, "apple"),
+		STRING2: fromPrimitiveSource(InputType.String, substring, "a")
 	} });
 };
 /**
@@ -2263,8 +2256,8 @@ const contains = (text, substring) => {
 */
 const mod = (a, b) => {
 	return valueBlock("operator_mod", { inputs: {
-		NUM1: fromPrimitiveSource(a),
-		NUM2: fromPrimitiveSource(b)
+		NUM1: fromPrimitiveSource(InputType.Number, a, 0),
+		NUM2: fromPrimitiveSource(InputType.Number, b, 0)
 	} });
 };
 /**
@@ -2283,7 +2276,7 @@ const mod = (a, b) => {
 * ```
 */
 const round = (value) => {
-	return valueBlock("operator_round", { inputs: { NUM: fromPrimitiveSource(value) } });
+	return valueBlock("operator_round", { inputs: { NUM: fromPrimitiveSource(InputType.Number, value, 0) } });
 };
 /**
 * Math operation (sin, cos, log, etc.).
@@ -2303,7 +2296,7 @@ const round = (value) => {
 */
 const mathop = (operator, value) => {
 	return valueBlock("operator_mathop", {
-		inputs: { NUM: fromPrimitiveSource(value) },
+		inputs: { NUM: fromPrimitiveSource(InputType.Number, value, 0) },
 		fields: { OPERATOR: [operator, null] }
 	});
 };
@@ -2408,7 +2401,7 @@ const penUp = () => {
 * ```
 */
 const setPenColorTo = (color) => {
-	return block("pen_setPenColorToColor", { inputs: { COLOR: fromPrimitiveSourceColor(color) } });
+	return block("pen_setPenColorToColor", { inputs: { COLOR: fromPrimitiveSource(InputType.Color, color) } });
 };
 /**
 * Alias for {@link setPenColorTo}.
@@ -2444,7 +2437,7 @@ const setPenColorToColor = setPenColorTo;
 const changePenColorParamBy = (param, value) => {
 	return block("pen_changePenColorParamBy", { inputs: {
 		COLOR_PARAM: menuInput(param, menuOfPenColorParam),
-		VALUE: fromPrimitiveSource(value)
+		VALUE: fromPrimitiveSource(InputType.Number, value, 10)
 	} });
 };
 const menuOfPenColorParam = (colorParam = "color") => {
@@ -2472,7 +2465,7 @@ const menuOfPenColorParam = (colorParam = "color") => {
 const setPenColorParamTo = (param, value) => {
 	return block("pen_setPenColorParamTo", { inputs: {
 		COLOR_PARAM: menuInput(param, menuOfPenColorParam),
-		VALUE: fromPrimitiveSource(value)
+		VALUE: fromPrimitiveSource(InputType.Number, value, 10)
 	} });
 };
 /**
@@ -2491,7 +2484,7 @@ const setPenColorParamTo = (param, value) => {
 * ```
 */
 const changePenSizeBy = (size) => {
-	return block("pen_changePenSizeBy", { inputs: { SIZE: fromPrimitiveSource(size) } });
+	return block("pen_changePenSizeBy", { inputs: { SIZE: fromPrimitiveSource(InputType.Number, size, 1) } });
 };
 /**
 * Sets pen size to value.
@@ -2509,7 +2502,7 @@ const changePenSizeBy = (size) => {
 * ```
 */
 const setPenSizeTo = (size) => {
-	return block("pen_setPenSizeTo", { inputs: { SIZE: fromPrimitiveSource(size) } });
+	return block("pen_setPenSizeTo", { inputs: { SIZE: fromPrimitiveSource(InputType.Number, size, 1) } });
 };
 /**
 * Sets pen shade to value.
@@ -2527,7 +2520,7 @@ const setPenSizeTo = (size) => {
 * ```
 */
 const setPenShadeToNumber = (shade) => {
-	return block("pen_setPenShadeToNumber", { inputs: { SHADE: fromPrimitiveSource(shade) } });
+	return block("pen_setPenShadeToNumber", { inputs: { SHADE: fromPrimitiveSource(InputType.Number, shade, 50) } });
 };
 /**
 * Changes pen shade by amount.
@@ -2545,7 +2538,7 @@ const setPenShadeToNumber = (shade) => {
 * ```
 */
 const changePenShadeBy = (shade) => {
-	return block("pen_changePenShadeBy", { inputs: { SHADE: fromPrimitiveSource(shade) } });
+	return block("pen_changePenShadeBy", { inputs: { SHADE: fromPrimitiveSource(InputType.Number, shade, 50) } });
 };
 /**
 * Sets pen hue to value.
@@ -2563,7 +2556,7 @@ const changePenShadeBy = (shade) => {
 * ```
 */
 const setPenHueToNumber = (hue) => {
-	return block("pen_setPenHueToNumber", { inputs: { HUE: fromPrimitiveSource(hue) } });
+	return block("pen_setPenHueToNumber", { inputs: { HUE: fromPrimitiveSource(InputType.Number, hue, 0) } });
 };
 /**
 * Changes pen hue by amount.
@@ -2581,7 +2574,7 @@ const setPenHueToNumber = (hue) => {
 * ```
 */
 const changePenHueBy = (hue) => {
-	return block("pen_changePenHueBy", { inputs: { HUE: fromPrimitiveSource(hue) } });
+	return block("pen_changePenHueBy", { inputs: { HUE: fromPrimitiveSource(InputType.Number, hue, 0) } });
 };
 
 //#endregion
@@ -2613,7 +2606,7 @@ const procedureLabel = (text) => {
 * ```ts
 * import { procedureBoolean } from 'hikkaku/blocks'
 *
-* procedureBoolean(undefined as any)
+* procedureBoolean('flag')
 * ```
 */
 const procedureBoolean = (name) => {
@@ -2631,7 +2624,7 @@ const procedureBoolean = (name) => {
 * ```ts
 * import { procedureStringOrNumber } from 'hikkaku/blocks'
 *
-* procedureStringOrNumber(undefined as any)
+* procedureStringOrNumber('value')
 * ```
 */
 const procedureStringOrNumber = (name) => {
@@ -2769,21 +2762,25 @@ const callProcedure = (proccodeOrReference, argumentIdsOrInputs, inputsOrWarp, w
 	let proccode = "";
 	let argumentIds = [];
 	let inputs = {};
+	let procedureReference = null;
 	if (typeof proccodeOrReference === "string") {
 		proccode = proccodeOrReference;
 		argumentIds = argumentIdsOrInputs;
 		inputs = (typeof inputsOrWarp === "object" ? inputsOrWarp : void 0) ?? {};
 		warp = typeof inputsOrWarp === "boolean" ? inputsOrWarp : warp;
 	} else {
-		const procedureReference = "reference" in proccodeOrReference ? proccodeOrReference.reference : proccodeOrReference;
+		procedureReference = "reference" in proccodeOrReference ? proccodeOrReference.reference : proccodeOrReference;
 		proccode = procedureReference.proccode;
 		argumentIds = procedureReference.argumentids;
 		warp = typeof inputsOrWarp === "boolean" ? inputsOrWarp : procedureReference.warp;
 		if (Array.isArray(argumentIdsOrInputs) && argumentIdsOrInputs.every((input) => typeof input === "object" && input !== null && "reference" in input && "value" in input)) for (const input of argumentIdsOrInputs) inputs[input.reference.id] = input.value;
 		else if (!Array.isArray(argumentIdsOrInputs)) inputs = argumentIdsOrInputs;
 	}
+	const argumentTypeMap = {};
+	if (procedureReference) for (const arg of Object.values(procedureReference.arguments)) argumentTypeMap[arg.id] = arg.type;
 	const resolvedInputs = {};
-	for (const [key, value] of Object.entries(inputs)) resolvedInputs[key] = fromPrimitiveSource(value);
+	for (const [key, value] of Object.entries(inputs)) if (argumentTypeMap[key] === "boolean") resolvedInputs[key] = fromBooleanSource(value);
+	else resolvedInputs[key] = fromPrimitiveSource(InputType.String, value, "");
 	return block("procedures_call", {
 		inputs: resolvedInputs,
 		mutation: {
@@ -2804,7 +2801,13 @@ const callProcedure = (proccodeOrReference, argumentIdsOrInputs, inputsOrWarp, w
 * ```ts
 * import { argumentReporterStringNumber } from 'hikkaku/blocks'
 *
-* argumentReporterStringNumber(reference as any)
+* argumentReporterStringNumber({
+*   isProcedureArgument: true,
+*   name: 'value',
+*   type: 'stringOrNumber',
+*   id: 'var-id',
+*   getter: () => valueBlock<HikkakuString | HikkakuNumber>('argument_reporter_string_number', { fields: { VALUE: ['value', null] } }),
+* })
 * ```
 */
 const argumentReporterStringNumber = (reference) => {
@@ -2819,7 +2822,13 @@ const argumentReporterStringNumber = (reference) => {
 * ```ts
 * import { argumentReporterBoolean } from 'hikkaku/blocks'
 *
-* argumentReporterBoolean(reference as any)
+* argumentReporterBoolean({
+*   isProcedureArgument: true,
+*   name: 'flag',
+*   type: 'boolean',
+*   id: 'flag-id',
+*   getter: () => valueBlock<HikkakuBool>('argument_reporter_boolean', { fields: { VALUE: ['flag', null] } }),
+* })
 * ```
 */
 const argumentReporterBoolean = (reference) => {
@@ -2905,7 +2914,7 @@ const menuOfTouchingObject = (target = "_mouse_") => {
 * ```
 */
 const touchingColor = (color) => {
-	return valueBlock("sensing_touchingcolor", { inputs: { COLOR: fromPrimitiveSourceColor(color) } });
+	return valueBlock("sensing_touchingcolor", { inputs: { COLOR: fromPrimitiveSource(InputType.Color, color) } });
 };
 /**
 * Color overlap check.
@@ -2925,8 +2934,8 @@ const touchingColor = (color) => {
 */
 const colorTouchingColor = (color, targetColor) => {
 	return valueBlock("sensing_coloristouchingcolor", { inputs: {
-		COLOR: fromPrimitiveSourceColor(color),
-		COLOR2: fromPrimitiveSourceColor(targetColor)
+		COLOR: fromPrimitiveSource(InputType.Color, color),
+		COLOR2: fromPrimitiveSource(InputType.Color, targetColor)
 	} });
 };
 /**
@@ -3159,7 +3168,7 @@ const isLoud = () => {
 * ```
 */
 const askAndWait = (question) => {
-	return block("sensing_askandwait", { inputs: { QUESTION: fromPrimitiveSource(question) } });
+	return block("sensing_askandwait", { inputs: { QUESTION: fromPrimitiveSource(InputType.String, question, "What's your name?") } });
 };
 /**
 * Returns last answer.
@@ -3292,7 +3301,7 @@ const stopAllSounds = () => {
 */
 const setSoundEffectTo = (effect, value) => {
 	return block("sound_seteffectto", {
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.Number, value, 10) },
 		fields: { EFFECT: [effect, null] }
 	});
 };
@@ -3314,7 +3323,7 @@ const setSoundEffectTo = (effect, value) => {
 */
 const changeSoundEffectBy = (effect, value) => {
 	return block("sound_changeeffectby", {
-		inputs: { VALUE: fromPrimitiveSource(value) },
+		inputs: { VALUE: fromPrimitiveSource(InputType.Number, value, 10) },
 		fields: { EFFECT: [effect, null] }
 	});
 };
@@ -3351,7 +3360,7 @@ const clearEffects = () => {
 * ```
 */
 const setVolumeTo = (value) => {
-	return block("sound_setvolumeto", { inputs: { VOLUME: fromPrimitiveSource(value) } });
+	return block("sound_setvolumeto", { inputs: { VOLUME: fromPrimitiveSource(InputType.Number, value, 10) } });
 };
 /**
 * Changes volume.
@@ -3369,7 +3378,7 @@ const setVolumeTo = (value) => {
 * ```
 */
 const changeVolumeBy = (value) => {
-	return block("sound_changevolumeby", { inputs: { VOLUME: fromPrimitiveSource(value) } });
+	return block("sound_changevolumeby", { inputs: { VOLUME: fromPrimitiveSource(InputType.Number, value, 10) } });
 };
 /**
 * Returns volume.