hikkaku 0.3.3 → 0.3.4

package/README.md

@@ -1,8 +1,9 @@
 <img src="https://raw.githubusercontent.com/pnsk-lab/hikkaku/refs/heads/main/docs/assets/logo.svg" alt="Hikkaku Logo" width="128" height="128" align="right" />
 
+
 # Hikkaku
 
-[![NPM Version](https://img.shields.io/npm/v/hikkaku)](https://www.npmjs.com/package/hikkaku)
+[![NPM Version](https://img.shields.io/npm/v/hikkaku)](https://www.npmjs.com/package/hikkaku) [![codecov](https://codecov.io/gh/pnsk-lab/hikkaku/graph/badge.svg)](https://codecov.io/gh/pnsk-lab/hikkaku)
 
 [Docs](https://pnsk-lab.github.io/hikkaku/) | [Playground](https://pnsk-lab.github.io/playground/)
 

package/{composer-bPcsVhIg.mjs → block-helper-DaOyXkRZ.mjs}

@@ -1,73 +1,5 @@
 import { InputType, Shadow } from "sb3-types/enum";
 
-//#region src/core/sb3-enum.ts
-const toNumericEnum = (value, fallback) => {
-	if (typeof value === "number" && Number.isInteger(value)) return value;
-	if (typeof value === "string") {
-		const normalized = value.trim();
-		if (normalized.length === 0) return fallback;
-		const parsed = Number(normalized);
-		if (Number.isInteger(parsed)) return parsed;
-	}
-	return fallback;
-};
-const shadow = Shadow;
-const inputType = InputType;
-const Shadow$1 = {
-	SameBlockShadow: toNumericEnum(shadow.SameBlockShadow ?? shadow.UnObscured, 1),
-	NoShadow: toNumericEnum(shadow.NoShadow ?? shadow.No, 2),
-	DiffBlockShadow: toNumericEnum(shadow.DiffBlockShadow ?? shadow.Obscured, 3)
-};
-const InputType$1 = {
-	Number: toNumericEnum(inputType.Number, 4),
-	PositiveInteger: toNumericEnum(inputType.PositiveInteger ?? inputType.PossiveInteger, 6),
-	String: toNumericEnum(inputType.String, 10),
-	Broadcast: toNumericEnum(inputType.Broadcast, 11),
-	Color: toNumericEnum(inputType.Color, 9)
-};
-
-//#endregion
-//#region src/core/block-helper.ts
-const fromPrimitiveSource = (source) => {
-	if (typeof source === "number") return [Shadow$1.SameBlockShadow, [InputType$1.Number, source]];
-	if (typeof source === "boolean") return [Shadow$1.SameBlockShadow, [InputType$1.PositiveInteger, source ? 1 : 0]];
-	if (typeof source === "string") return [Shadow$1.SameBlockShadow, [InputType$1.String, source]];
-	return [Shadow$1.SameBlockShadow, source.id];
-};
-const fromPrimitiveSourceColor = (color) => {
-	if (typeof color === "string") return [Shadow$1.SameBlockShadow, [InputType$1.Color, color]];
-	return fromPrimitiveSource(color);
-};
-const unwrapCostumeSource = (source) => {
-	if (isCostumeReference(source)) return source.name;
-	return source;
-};
-const unwrapSoundSource = (source) => {
-	if (isSoundReference(source)) return source.name;
-	return source;
-};
-const isHikkakuBlock = (block) => {
-	return typeof block === "object" && block !== null && "isBlock" in block && block.isBlock === true && "id" in block && typeof block.id === "string";
-};
-const menuInput = (source, createMenu) => {
-	if (isHikkakuBlock(source)) {
-		const shadow = createMenu();
-		return [
-			Shadow$1.DiffBlockShadow,
-			source.id,
-			shadow.id
-		];
-	}
-	return fromPrimitiveSource(createMenu(source));
-};
-const isCostumeReference = (source) => {
-	return typeof source === "object" && source !== null && "type" in source && source.type === "costume";
-};
-const isSoundReference = (source) => {
-	return typeof source === "object" && source !== null && "type" in source && source.type === "sound";
-};
-
-//#endregion
 //#region src/core/composer.ts
 let id = 0;
 const nextId = () => (++id).toString(16);
@@ -76,8 +8,52 @@ const getRootContext = () => {
 	if (!rootContext) throw new Error("Root context is not initialized. Call createBlocks first.");
 	return rootContext;
 };
+const getCurrentScope = (ctx) => {
+	return ctx.scopeStack[ctx.scopeStack.length - 1] ?? null;
+};
+const __unstable_getBuildScopeFrame = () => {
+	if (!rootContext) return null;
+	const frame = getCurrentScope(rootContext);
+	if (!frame) return null;
+	return {
+		id: frame.id,
+		kind: frame.kind,
+		depth: rootContext.scopeStack.length,
+		forbidStop: frame.forbidStop
+	};
+};
+const __unstable_onBuildScopeExit = (callback) => {
+	const frame = getCurrentScope(getRootContext());
+	if (!frame) throw new Error("Build scope is not initialized.");
+	frame.onExit.add(callback);
+};
+const __unstable_forbidStopInCurrentScope = () => {
+	const frame = getCurrentScope(getRootContext());
+	if (!frame) throw new Error("Build scope is not initialized.");
+	frame.forbidStop = true;
+};
+const withScope = (kind, handler) => {
+	const ctx = getRootContext();
+	const frame = {
+		id: ctx.nextScopeId++,
+		kind,
+		forbidStop: false,
+		onExit: /* @__PURE__ */ new Set()
+	};
+	ctx.scopeStack.push(frame);
+	try {
+		return handler();
+	} finally {
+		for (const callback of frame.onExit) callback();
+		if (ctx.scopeStack.pop() !== frame) {
+			console.warn("Build scope stack is corrupted.");
+			ctx.scopeStack.length = 0;
+		}
+	}
+};
 const block = (opcode, init) => {
 	const ctx = getRootContext();
+	if (opcode === "control_stop" && ctx.scopeStack.some((scope) => scope.forbidStop)) throw new Error("control_stop is not allowed inside gobox-managed scoped values.");
 	const id = nextId();
 	const block = {
 		opcode,
@@ -176,7 +152,7 @@ const layoutTopLevelBlocks = (blocks) => {
 const substack = (handler) => {
 	const ctx = getRootContext();
 	const blocks = [];
-	catchNewBlocks(handler, (id, block) => {
+	catchNewBlocks(() => withScope("stack", handler), (id, block) => {
 		ctx.blocks[id] = block;
 		blocks.push(block);
 	});
@@ -187,7 +163,7 @@ const attachStack = (parentId, handler) => {
 	if (!handler) return null;
 	const ctx = getRootContext();
 	const blocks = [];
-	catchNewBlocks(handler, (id, block) => {
+	catchNewBlocks(() => withScope("stack", handler), (id, block) => {
 		ctx.blocks[id] = block;
 		blocks.push(block);
 	});
@@ -205,32 +181,130 @@ const attachStack = (parentId, handler) => {
 };
 const createBlocks = (handler) => {
 	const blocks = {};
-	rootContext = {
+	const ctx = {
 		blocks,
 		usedAsValueSet: /* @__PURE__ */ new WeakSet(),
 		valueBlockSet: /* @__PURE__ */ new WeakSet(),
-		blockToId: /* @__PURE__ */ new WeakMap()
+		blockToId: /* @__PURE__ */ new WeakMap(),
+		scopeStack: [],
+		nextScopeId: 1
 	};
-	const blocksForAddingNext = [];
-	catchNewBlocks(handler, (id, block) => {
-		blocks[id] = block;
-		blocksForAddingNext.push(block);
-	});
-	applyNextAndParent(blocksForAddingNext);
-	layoutTopLevelBlocks(blocksForAddingNext);
-	const unconnectedValueBlocks = [];
-	for (const [blockId, block] of Object.entries(blocks)) if (rootContext.valueBlockSet.has(block) && !rootContext.usedAsValueSet.has(block)) unconnectedValueBlocks.push({
-		id: blockId,
-		opcode: block.opcode
-	});
-	if (unconnectedValueBlocks.length > 0) {
-		const formatted = unconnectedValueBlocks.map(({ id, opcode }) => `${opcode} (${id})`).join(", ");
+	rootContext = ctx;
+	try {
+		const blocksForAddingNext = [];
+		catchNewBlocks(() => withScope("run", handler), (id, block) => {
+			blocks[id] = block;
+			blocksForAddingNext.push(block);
+		});
+		applyNextAndParent(blocksForAddingNext);
+		layoutTopLevelBlocks(blocksForAddingNext);
+		const unconnectedValueBlocks = [];
+		for (const [blockId, block] of Object.entries(blocks)) if (ctx.valueBlockSet.has(block) && !ctx.usedAsValueSet.has(block)) unconnectedValueBlocks.push({
+			id: blockId,
+			opcode: block.opcode
+		});
+		if (unconnectedValueBlocks.length > 0) {
+			const formatted = unconnectedValueBlocks.map(({ id, opcode }) => `${opcode} (${id})`).join(", ");
+			throw new Error(`Unconnected value block(s): ${formatted}`);
+		}
+		return blocks;
+	} finally {
 		rootContext = null;
-		throw new Error(`Unconnected value block(s): ${formatted}`);
 	}
-	rootContext = null;
-	return blocks;
 };
 
 //#endregion
-export { valueBlock as a, isCostumeReference as c, menuInput as d, unwrapCostumeSource as f, Shadow$1 as h, substack as i, isHikkakuBlock as l, InputType$1 as m, block as n, fromPrimitiveSource as o, unwrapSoundSource as p, createBlocks as r, fromPrimitiveSourceColor as s, attachStack as t, isSoundReference as u };
+//#region src/core/block-helper.ts
+function isShadowBlock(blockId) {
+	try {
+		return getRootContext().blocks[blockId]?.shadow ?? false;
+	} catch {
+		return false;
+	}
+}
+function getDefaultValue(inputType) {
+	switch (inputType) {
+		case InputType.Number:
+		case InputType.PositiveNumber:
+		case InputType.Integer: return 0;
+		case InputType.Angle: return 90;
+		case InputType.PositiveInteger: return 1;
+		case InputType.String:
+		case InputType.Broadcast: return "";
+		case InputType.Color: return "#000000";
+		default: return 0;
+	}
+}
+function fromPrimitiveSource(inputType, source, defaultValue) {
+	defaultValue = defaultValue ?? getDefaultValue(inputType);
+	if (isHikkakuBlock(source)) {
+		if (isShadowBlock(source.id)) return [Shadow.SameBlockShadow, source.id];
+		return [
+			Shadow.DiffBlockShadow,
+			source.id,
+			createInput(inputType, defaultValue)
+		];
+	}
+	return [Shadow.SameBlockShadow, createInput(inputType, source)];
+}
+function createInput(inputType, value) {
+	switch (inputType) {
+		case InputType.Number:
+		case InputType.PositiveNumber:
+		case InputType.Integer:
+		case InputType.Angle:
+		case InputType.PositiveInteger: return [inputType, Number(value)];
+		case InputType.String: return [inputType, String(value)];
+		case InputType.Broadcast: return [
+			inputType,
+			String(value),
+			String(value)
+		];
+		case InputType.Color: return [inputType, String(value)];
+		case InputType.Variable:
+		case InputType.List: throw new Error("unimplemented");
+		default: throw new Error(`Unsupported input type: ${inputType}`);
+	}
+}
+function fromBooleanSource(source) {
+	if (typeof source === "boolean") if (source === true) {
+		const TRUE = valueBlock("operator_not", {});
+		return [Shadow.SameBlockShadow, TRUE.id];
+	} else {
+		const FALSE = valueBlock("operator_and", {});
+		return [Shadow.SameBlockShadow, FALSE.id];
+	}
+	return [Shadow.SameBlockShadow, source.id];
+}
+const unwrapCostumeSource = (source) => {
+	if (isCostumeReference(source)) return source.name;
+	return source;
+};
+const unwrapSoundSource = (source) => {
+	if (isSoundReference(source)) return source.name;
+	return source;
+};
+const isHikkakuBlock = (block) => {
+	return typeof block === "object" && block !== null && "isBlock" in block && block.isBlock === true && "id" in block && typeof block.id === "string";
+};
+const menuInput = (source, createMenu) => {
+	if (isHikkakuBlock(source)) {
+		const shadow = createMenu();
+		return [
+			Shadow.DiffBlockShadow,
+			source.id,
+			shadow.id
+		];
+	}
+	const menu = createMenu(source);
+	return fromPrimitiveSource(InputType.String, menu);
+};
+const isCostumeReference = (source) => {
+	return typeof source === "object" && source !== null && "type" in source && source.type === "costume";
+};
+const isSoundReference = (source) => {
+	return typeof source === "object" && source !== null && "type" in source && source.type === "sound";
+};
+
+//#endregion
+export { valueBlock as _, isSoundReference as a, unwrapSoundSource as c, __unstable_onBuildScopeExit as d, attachStack as f, substack as g, getRootContext as h, isHikkakuBlock as i, __unstable_forbidStopInCurrentScope as l, createBlocks as m, fromPrimitiveSource as n, menuInput as o, block as p, isCostumeReference as r, unwrapCostumeSource as s, fromBooleanSource as t, __unstable_getBuildScopeFrame as u };