hikkaku 0.3.3 → 0.3.5

package/{project-CpV5Dm-X.d.mts → index-kUDvI5sE.d.mts}

@@ -1,9 +1,27 @@
+import { InputType } from "sb3-types/enum";
 import * as sb3 from "sb3-types";
 import { Costume, Sound } from "sb3-types";
 
 //#region src/core/types.d.ts
 type PrimitiveAvailableOnScratch = number | boolean | string;
-type PrimitiveSource<T extends PrimitiveAvailableOnScratch> = T | HikkakuBlock;
+type HikkakuTypeTag = 'number' | 'bool' | 'string';
+type HikkakuBrand<T extends HikkakuTypeTag> = {
+  readonly __hikkakuType: T;
+};
+type HikkakuNumber = HikkakuBrand<'number'>;
+type HikkakuBool = HikkakuBrand<'bool'>;
+type HikkakuString = HikkakuBrand<'string'>;
+type HikkakuType = HikkakuNumber | HikkakuBool | HikkakuString;
+type PrimitiveToHikkakuType<T extends PrimitiveAvailableOnScratch> = T extends number ? HikkakuNumber : T extends boolean ? HikkakuBool : T extends string ? HikkakuString : never;
+type HikkakuTypeToPrimitive<T extends HikkakuType> = T extends HikkakuNumber ? number : T extends HikkakuBool ? boolean : T extends HikkakuString ? string : never;
+interface HikkakuBlock {
+  isBlock: true;
+  id: string;
+}
+interface HikkakuReporterBlock<T extends HikkakuType = HikkakuType> extends HikkakuBlock {
+  readonly __hikkakuType: T['__hikkakuType'];
+}
+type PrimitiveSource<T extends HikkakuType> = HikkakuTypeToPrimitive<T> | HikkakuReporterBlock;
 interface VariableBase {
   id: string;
   name: string;
@@ -36,8 +54,8 @@ interface VariableReference extends VariableBase {
   type: 'variable';
 }
 interface VariableDefinition extends VariableReference {
-  get(): HikkakuBlock;
-  set(value: PrimitiveSource<number | string>): HikkakuBlock;
+  get(): HikkakuReporterBlock<HikkakuNumber | HikkakuString>;
+  set(value: PrimitiveSource<HikkakuNumber | HikkakuString>): HikkakuBlock;
 }
 interface ListReference extends VariableBase {
   type: 'list';
@@ -46,16 +64,12 @@ interface CostumeReference {
   name: string;
   type: 'costume';
 }
-type CostumeSource = PrimitiveSource<string> | CostumeReference;
+type CostumeSource = PrimitiveSource<HikkakuString> | CostumeReference;
 interface SoundReference {
   name: string;
   type: 'sound';
 }
-type SoundSource = PrimitiveSource<string> | SoundReference;
-interface HikkakuBlock {
-  isBlock: true;
-  id: string;
-}
+type SoundSource = PrimitiveSource<HikkakuString> | SoundReference;
 type CostumeData = Costume & {
   _data?: Uint8Array;
 };
@@ -64,17 +78,45 @@ type SoundData = Sound & {
 };
 //#endregion
 //#region src/core/block-helper.d.ts
-declare const fromPrimitiveSource: <T extends PrimitiveAvailableOnScratch>(source: PrimitiveSource<T>) => sb3.Input;
-declare const fromPrimitiveSourceColor: (color: PrimitiveSource<`#${string}` | (string & {})>) => sb3.Input;
-declare const unwrapCostumeSource: (source: CostumeSource) => PrimitiveSource<string>;
-declare const unwrapSoundSource: (source: SoundSource) => PrimitiveSource<string>;
+type MappingToPrimitive<T extends PrimitiveInputType> = T extends InputType.Number ? number : T extends InputType.PositiveNumber ? number : T extends InputType.Integer ? number : T extends InputType.Angle ? number : T extends InputType.PositiveInteger ? number : T extends InputType.String ? string | number : T extends InputType.Broadcast ? string : T extends InputType.Color ? string : never;
+type PrimitiveInputType = sb3.InputPrimitive['0'];
+declare function fromPrimitiveSource<T extends PrimitiveInputType>(inputType: T, source: PrimitiveSource<PrimitiveToHikkakuType<MappingToPrimitive<T>>>, defaultValue?: MappingToPrimitive<T>): sb3.Input;
+declare function fromBooleanSource(source: PrimitiveSource<HikkakuBool>): sb3.Input;
+declare const unwrapCostumeSource: (source: CostumeSource) => PrimitiveSource<HikkakuString>;
+declare const unwrapSoundSource: (source: SoundSource) => PrimitiveSource<HikkakuString>;
 declare const isHikkakuBlock: (block: unknown) => block is HikkakuBlock;
-declare const menuInput: <T extends PrimitiveAvailableOnScratch>(source: PrimitiveSource<T>, createMenu: (source?: T) => HikkakuBlock) => sb3.Input;
+declare const menuInput: <T extends PrimitiveAvailableOnScratch>(source: PrimitiveSource<PrimitiveToHikkakuType<T>>, createMenu: (source?: T) => HikkakuReporterBlock<HikkakuString>) => sb3.Input;
 declare const isCostumeReference: (source: unknown) => source is CostumeReference;
 declare const isSoundReference: (source: unknown) => source is SoundReference;
 //#endregion
 //#region src/core/composer.d.ts
 type Handler = () => void;
+type BuildScopeKind = 'run' | 'stack';
+interface BuildScopeFrame {
+  id: number;
+  kind: BuildScopeKind;
+  forbidStop: boolean;
+  onExit: Set<() => void>;
+}
+interface RootContext {
+  blocks: Record<string, sb3.Block>;
+  adder?: (id: string, block: sb3.Block) => void;
+  usedAsValueSet: WeakSet<sb3.Block>;
+  valueBlockSet: WeakSet<sb3.Block>;
+  blockToId: WeakMap<sb3.Block, string>;
+  scopeStack: BuildScopeFrame[];
+  nextScopeId: number;
+}
+declare const getRootContext: () => RootContext;
+interface BuildScopeFrameSnapshot {
+  id: number;
+  kind: BuildScopeKind;
+  depth: number;
+  forbidStop: boolean;
+}
+declare const __unstable_getBuildScopeFrame: () => BuildScopeFrameSnapshot | null;
+declare const __unstable_onBuildScopeExit: (callback: () => void) => void;
+declare const __unstable_forbidStopInCurrentScope: () => void;
 interface BlockInit {
   inputs?: Record<string, sb3.Input>;
   fields?: Record<string, sb3.Fields>;
@@ -84,7 +126,7 @@ interface BlockInit {
   isValue?: boolean;
 }
 declare const block: (opcode: string, init: BlockInit) => HikkakuBlock;
-declare const valueBlock: (opcode: string, init: BlockInit) => HikkakuBlock;
+declare const valueBlock: <T extends HikkakuType>(opcode: string, init: BlockInit) => HikkakuReporterBlock<T>;
 declare const substack: (handler: Handler) => string | null;
 declare const attachStack: (parentId: string, handler?: Handler) => string | null;
 declare const createBlocks: (handler: Handler) => Record<string, sb3.Block>;
@@ -131,6 +173,7 @@ interface SpriteOptions {
   x?: number;
   y?: number;
 }
+declare const __unstable_getBuildTarget: () => Target | null;
 declare class Target<IsStage extends boolean = boolean> {
   #private;
   readonly isStage: IsStage;
@@ -157,4 +200,4 @@ declare class Project {
   getAdditionalAssets(): Map<string, Uint8Array>;
 }
 //#endregion
-export { SoundData as A, CreateVariableOptions as C, MonitorPosition as D, ListReference as E, VariableMonitorMode as F, VariableMonitorOptions as I, VariableReference as L, SoundSource as M, VariableBase as N, PrimitiveAvailableOnScratch as O, VariableDefinition as P, CreateListOptions as S, ListMonitorOptions as T, unwrapCostumeSource as _, Handler as a, CostumeReference as b, createBlocks as c, fromPrimitiveSource as d, fromPrimitiveSourceColor as f, menuInput as g, isSoundReference as h, BlockInit as i, SoundReference as j, PrimitiveSource as k, substack as l, isHikkakuBlock as m, SpriteOptions as n, attachStack as o, isCostumeReference as p, Target as r, block as s, Project as t, valueBlock as u, unwrapSoundSource as v, HikkakuBlock as w, CostumeSource as x, CostumeData as y };
+export { CreateVariableOptions as A, MonitorPosition as B, menuInput as C, CostumeReference as D, CostumeData as E, HikkakuString as F, SoundReference as G, PrimitiveSource as H, HikkakuType as I, VariableDefinition as J, SoundSource as K, HikkakuTypeToPrimitive as L, HikkakuBool as M, HikkakuNumber as N, CostumeSource as O, HikkakuReporterBlock as P, ListMonitorOptions as R, isSoundReference as S, unwrapSoundSource as T, PrimitiveToHikkakuType as U, PrimitiveAvailableOnScratch as V, SoundData as W, VariableMonitorOptions as X, VariableMonitorMode as Y, VariableReference as Z, valueBlock as _, BlockInit as a, isCostumeReference as b, Handler as c, __unstable_onBuildScopeExit as d, attachStack as f, substack as g, getRootContext as h, __unstable_getBuildTarget as i, HikkakuBlock as j, CreateListOptions as k, __unstable_forbidStopInCurrentScope as l, createBlocks as m, SpriteOptions as n, BuildScopeFrameSnapshot as o, block as p, VariableBase as q, Target as r, BuildScopeKind as s, Project as t, __unstable_getBuildScopeFrame as u, fromBooleanSource as v, unwrapCostumeSource as w, isHikkakuBlock as x, fromPrimitiveSource as y, ListReference as z };

package/index.d.mts

@@ -1,2 +1,2 @@
-import { A as SoundData, C as CreateVariableOptions, D as MonitorPosition, E as ListReference, F as VariableMonitorMode, I as VariableMonitorOptions, L as VariableReference, M as SoundSource, N as VariableBase, O as PrimitiveAvailableOnScratch, P as VariableDefinition, S as CreateListOptions, T as ListMonitorOptions, _ as unwrapCostumeSource, a as Handler, b as CostumeReference, c as createBlocks, d as fromPrimitiveSource, f as fromPrimitiveSourceColor, g as menuInput, h as isSoundReference, i as BlockInit, j as SoundReference, k as PrimitiveSource, l as substack, m as isHikkakuBlock, n as SpriteOptions, o as attachStack, p as isCostumeReference, r as Target, s as block, t as Project, u as valueBlock, v as unwrapSoundSource, w as HikkakuBlock, x as CostumeSource, y as CostumeData } from "./project-CpV5Dm-X.mjs";
-export { BlockInit, CostumeData, CostumeReference, CostumeSource, CreateListOptions, CreateVariableOptions, Handler, HikkakuBlock, ListMonitorOptions, ListReference, MonitorPosition, PrimitiveAvailableOnScratch, PrimitiveSource, Project, SoundData, SoundReference, SoundSource, SpriteOptions, Target, VariableBase, VariableDefinition, VariableMonitorMode, VariableMonitorOptions, VariableReference, attachStack, block, createBlocks, fromPrimitiveSource, fromPrimitiveSourceColor, isCostumeReference, isHikkakuBlock, isSoundReference, menuInput, substack, unwrapCostumeSource, unwrapSoundSource, valueBlock };
+import { A as CreateVariableOptions, B as MonitorPosition, C as menuInput, D as CostumeReference, E as CostumeData, F as HikkakuString, G as SoundReference, H as PrimitiveSource, I as HikkakuType, J as VariableDefinition, K as SoundSource, L as HikkakuTypeToPrimitive, M as HikkakuBool, N as HikkakuNumber, O as CostumeSource, P as HikkakuReporterBlock, R as ListMonitorOptions, S as isSoundReference, T as unwrapSoundSource, U as PrimitiveToHikkakuType, V as PrimitiveAvailableOnScratch, W as SoundData, X as VariableMonitorOptions, Y as VariableMonitorMode, Z as VariableReference, _ as valueBlock, a as BlockInit, b as isCostumeReference, c as Handler, d as __unstable_onBuildScopeExit, f as attachStack, g as substack, h as getRootContext, i as __unstable_getBuildTarget, j as HikkakuBlock, k as CreateListOptions, l as __unstable_forbidStopInCurrentScope, m as createBlocks, n as SpriteOptions, o as BuildScopeFrameSnapshot, p as block, q as VariableBase, r as Target, s as BuildScopeKind, t as Project, u as __unstable_getBuildScopeFrame, v as fromBooleanSource, w as unwrapCostumeSource, x as isHikkakuBlock, y as fromPrimitiveSource, z as ListReference } from "./index-kUDvI5sE.mjs";
+export { BlockInit, BuildScopeFrameSnapshot, BuildScopeKind, CostumeData, CostumeReference, CostumeSource, CreateListOptions, CreateVariableOptions, Handler, HikkakuBlock, HikkakuBool, HikkakuNumber, HikkakuReporterBlock, HikkakuString, HikkakuType, HikkakuTypeToPrimitive, ListMonitorOptions, ListReference, MonitorPosition, PrimitiveAvailableOnScratch, PrimitiveSource, PrimitiveToHikkakuType, Project, SoundData, SoundReference, SoundSource, SpriteOptions, Target, VariableBase, VariableDefinition, VariableMonitorMode, VariableMonitorOptions, VariableReference, __unstable_forbidStopInCurrentScope, __unstable_getBuildScopeFrame, __unstable_getBuildTarget, __unstable_onBuildScopeExit, attachStack, block, createBlocks, fromBooleanSource, fromPrimitiveSource, getRootContext, isCostumeReference, isHikkakuBlock, isSoundReference, menuInput, substack, unwrapCostumeSource, unwrapSoundSource, valueBlock };

package/index.mjs

@@ -1,4 +1,5 @@
-import { a as valueBlock, c as isCostumeReference, d as menuInput, f as unwrapCostumeSource, i as substack, l as isHikkakuBlock, n as block, o as fromPrimitiveSource, p as unwrapSoundSource, r as createBlocks, s as fromPrimitiveSourceColor, t as attachStack, u as isSoundReference } from "./composer-bPcsVhIg.mjs";
+import { _ as valueBlock, a as isSoundReference, c as unwrapSoundSource, d as __unstable_onBuildScopeExit, f as attachStack, g as substack, h as getRootContext, i as isHikkakuBlock, l as __unstable_forbidStopInCurrentScope, m as createBlocks, n as fromPrimitiveSource, o as menuInput, p as block, r as isCostumeReference, s as unwrapCostumeSource, t as fromBooleanSource, u as __unstable_getBuildScopeFrame } from "./block-helper-DaOyXkRZ.mjs";
+import { InputType } from "sb3-types/enum";
 
 //#region src/core/monitors.ts
 const createVariableMonitor = (id, name, defaultValue, spriteName, options) => {
@@ -76,6 +77,10 @@ const collectExtensions = (targets) => {
 	}
 	return Array.from(extensions).sort();
 };
+const buildTargetStack = [];
+const __unstable_getBuildTarget = () => {
+	return buildTargetStack[buildTargetStack.length - 1] ?? null;
+};
 var Target = class {
 	isStage;
 	name;
@@ -97,9 +102,15 @@ var Target = class {
 		this.#y = options?.y;
 	}
 	run(handler) {
-		const blocks = createBlocks(() => {
-			handler(this);
-		});
+		buildTargetStack.push(this);
+		let blocks = {};
+		try {
+			blocks = createBlocks(() => {
+				handler(this);
+			});
+		} finally {
+			buildTargetStack.pop();
+		}
 		this.#blocks = {
 			...this.#blocks,
 			...blocks
@@ -120,7 +131,7 @@ var Target = class {
 			type: "variable",
 			get: () => valueBlock("data_variable", { fields: { VARIABLE: [name, id] } }),
 			set: (value) => block("data_setvariableto", {
-				inputs: { VALUE: fromPrimitiveSource(value) },
+				inputs: { VALUE: fromPrimitiveSource(InputType.String, value) },
 				fields: { VARIABLE: [name, id] }
 			})
 		};
@@ -229,4 +240,4 @@ var Project = class {
 };
 
 //#endregion
-export { Project, Target, attachStack, block, createBlocks, fromPrimitiveSource, fromPrimitiveSourceColor, isCostumeReference, isHikkakuBlock, isSoundReference, menuInput, substack, unwrapCostumeSource, unwrapSoundSource, valueBlock };
+export { Project, Target, __unstable_forbidStopInCurrentScope, __unstable_getBuildScopeFrame, __unstable_getBuildTarget, __unstable_onBuildScopeExit, attachStack, block, createBlocks, fromBooleanSource, fromPrimitiveSource, getRootContext, isCostumeReference, isHikkakuBlock, isSoundReference, menuInput, substack, unwrapCostumeSource, unwrapSoundSource, valueBlock };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hikkaku",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "type": "module",
   "private": false,
   "exports": {
@@ -31,14 +31,17 @@
   },
   "scripts": {
     "build": "bun --bun tsdown",
+    "test": "vp test run",
     "typecheck": "tsgo"
   },
   "devDependencies": {
     "@turbowarp/packager": "^3.11.0",
     "@types/bun": "latest",
     "@typescript/native-preview": "^7.0.0-dev.20260127.1",
+    "@vitest/coverage-v8": "4.0.18",
     "rolldown": "1.0.0-rc.4",
-    "tsdown": "^0.20.0-beta.4"
+    "tsdown": "^0.20.0-beta.4",
+    "vite-plus": "^0.0.0-3262bda4.20260210-0221"
   },
   "peerDependencies": {
     "typescript": "^5"

package/types.d.mts

@@ -18,4 +18,11 @@ declare module '*.mp3?scratch' {
   import * as sb3 from 'sb3-types';
   const content: sb3.Sound;
   export default content;
+}
+declare module 'vite-plus' {
+  export function defineConfig<T>(config: T): T;
+}
+declare module 'vite-plus/test' {
+  export { describe, expect, it, test } from 'bun:test';
+  export type { TestInterface } from 'bun:test';
 }

package/vite/index.mjs

@@ -1,9 +1,8 @@
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, rm, writeFile } from "node:fs/promises";
 import * as path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { pathToFileURL } from "node:url";
 import { zip, zipSync } from "fflate/node";
 import { createServerModuleRunner } from "vite";
-import crypto from "node:crypto";
 
 //#region src/vite/plugin-scratch-import.ts
 const pluginScratchImport = () => ({
@@ -22,22 +21,28 @@ const pluginScratchImport = () => ({
 			const url = new URL(id.slice(9, -8));
 			const ext = url.pathname.split(".").pop();
 			if (!ext) throw new Error(`Unsupported scratch asset type: ${url.pathname}`);
-			const file = await readFile(fileURLToPath(url));
-			const hash = crypto.createHash("md5");
-			hash.update(file);
-			const md5 = hash.digest("hex");
-			const data = {
-				name: path.basename(url.pathname),
-				_data: Buffer.from(file).toString("base64"),
-				assetId: md5,
-				dataFormat: ext,
-				md5ext: `${md5}.${ext}`
-			};
 			return `
-        const data = ${JSON.stringify(data)}
-        // to Uint8Array
-        data._data = Uint8Array.from(atob(data._data), c => c.charCodeAt(0));
+        import crypto from 'node:crypto';
+        import { readFile } from 'node:fs/promises';
+        import * as path from 'node:path';
+        import { fileURLToPath } from 'node:url';
+        
+        const pathUrl = new URL(${JSON.stringify(url.href)});
+        const ext = ${JSON.stringify(ext)};
+        const file = await readFile(fileURLToPath(pathUrl));
 
+        const hash = crypto.createHash('md5');
+        hash.update(file);
+        const md5 = hash.digest('hex');
+  
+        const data = {
+          name: path.basename(pathUrl.pathname),
+          _data: Uint8Array.from(file),
+          assetId: md5,
+          dataFormat: ext,
+          md5ext: md5 + "." + ext,
+        }
+        
         export default data
       `;
 		}