hikkaku 0.2.1 → 0.3.0

package/blocks/index.d.mts

@@ -1,4 +1,4 @@
-import { S as PrimitiveSource, _ as HikkakuBlock, k as VariableReference, m as CostumeSource, w as SoundSource, y as ListReference } from "../project-Ca9rsVT3.mjs";
+import { D as SoundSource, M as VariableReference, g as CostumeSource, w as PrimitiveSource, x as ListReference, y as HikkakuBlock } from "../project-djJPtrq7.mjs";
 
 //#region src/blocks/control.d.ts
 type StopOption = 'all' | 'this script' | 'other scripts in sprite' | 'other scripts in stage';
@@ -2570,9 +2570,18 @@ type SoundEffect = 'pitch' | 'pan';
  * @returns Scratch statement block definition that is appended to the current script stack.
  * @example
  * ```ts
+ * import { Project } from 'hikkaku'
+ * import { SOUNDS } from 'hikkaku/assets'
  * import { playSound } from 'hikkaku/blocks'
  *
- * playSound('pop')
+ * const project = new Project()
+ * const sprite = project.createSprite('Sprite')
+ * const sound = sprite.addSound({
+ *   ...SOUNDS.COMPUTER_BEEP,
+ *   name: 'beep',
+ * })
+ *
+ * playSound(sound)
  * ```
  */
 declare const playSound: (sound: SoundSource) => HikkakuBlock;
@@ -2586,9 +2595,17 @@ declare const playSound: (sound: SoundSource) => HikkakuBlock;
  * @returns Scratch statement block definition that is appended to the current script stack.
  * @example
  * ```ts
+ * import { Project } from 'hikkaku'
+ * import { SOUNDS } from 'hikkaku/assets'
  * import { playSoundUntilDone } from 'hikkaku/blocks'
  *
- * playSoundUntilDone('pop')
+ * const project = new Project()
+ * const sound = project.addSound({
+ *   ...SOUNDS.COMPUTER_BEEP,
+ *   name: 'beep',
+ * })
+ *
+ * playSoundUntilDone(sound)
  * ```
  */
 declare const playSoundUntilDone: (sound: SoundSource) => HikkakuBlock;

package/blocks/index.mjs

@@ -1,4 +1,4 @@
-import { a as valueBlock, c as fromSoundSource, i as substack, l as InputType, n as block, o as fromCostumeSource, s as fromPrimitiveSource, t as attachStack, u as Shadow } from "../composer-BudVTTBs.mjs";
+import { a as valueBlock, c as fromSoundSource, i as substack, l as InputType, n as block, o as fromCostumeSource, s as fromPrimitiveSource, t as attachStack, u as Shadow } from "../composer-DpyUR2R3.mjs";
 
 //#region src/blocks/control.ts
 /**
@@ -3136,9 +3136,18 @@ const getUsername = () => {
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
+* import { Project } from 'hikkaku'
+* import { SOUNDS } from 'hikkaku/assets'
 * import { playSound } from 'hikkaku/blocks'
 *
-* playSound('pop')
+* const project = new Project()
+* const sprite = project.createSprite('Sprite')
+* const sound = sprite.addSound({
+*   ...SOUNDS.COMPUTER_BEEP,
+*   name: 'beep',
+* })
+*
+* playSound(sound)
 * ```
 */
 const playSound = (sound) => {
@@ -3154,9 +3163,17 @@ const playSound = (sound) => {
 * @returns Scratch statement block definition that is appended to the current script stack.
 * @example
 * ```ts
+* import { Project } from 'hikkaku'
+* import { SOUNDS } from 'hikkaku/assets'
 * import { playSoundUntilDone } from 'hikkaku/blocks'
 *
-* playSoundUntilDone('pop')
+* const project = new Project()
+* const sound = project.addSound({
+*   ...SOUNDS.COMPUTER_BEEP,
+*   name: 'beep',
+* })
+*
+* playSoundUntilDone(sound)
 * ```
 */
 const playSoundUntilDone = (sound) => {

package/chunk-DQk6qfdC.mjs

@@ -0,0 +1,18 @@
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) {
+		__defProp(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+	}
+	if (!no_symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
+	return target;
+};
+
+//#endregion
+export { __exportAll as t };

package/client/index.mjs

@@ -35,7 +35,14 @@ const getScratchInternalStates = (root) => {
 		}
 		return false;
 	});
-	vm.runtime.storage.webHelper.assetTool.tools.splice(0, 1);
+	const storage = vm.runtime.storage;
+	storage.webHelper.assetTool.tools.splice(0, 1);
+	storage.webHelper.stores.splice(0, storage.webHelper.stores.length);
+	storage.addWebStore([
+		storage.AssetType.ImageVector,
+		storage.AssetType.ImageBitmap,
+		storage.AssetType.Sound
+	], (asset) => `/hikkaku-assets/${asset.assetId}.${asset.dataFormat}`, null, null);
 	return {
 		reduxState,
 		vm,

package/index.d.mts

@@ -1,2 +1,2 @@
-import { C as SoundReference, D as VariableMonitorMode, E as VariableDefinition, O as VariableMonitorOptions, S as PrimitiveSource, T as VariableBase, _ as HikkakuBlock, a as attachStack, b as MonitorPosition, c as substack, d as fromPrimitiveSource, f as fromSoundSource, g as CreateVariableOptions, h as CreateListOptions, i as Handler, k as VariableReference, l as valueBlock, m as CostumeSource, n as Target, o as block, p as CostumeReference, r as BlockInit, s as createBlocks, t as Project, u as fromCostumeSource, v as ListMonitorOptions, w as SoundSource, x as PrimitiveAvailableOnScratch, y as ListReference } from "./project-Ca9rsVT3.mjs";
-export { BlockInit, CostumeReference, CostumeSource, CreateListOptions, CreateVariableOptions, Handler, HikkakuBlock, ListMonitorOptions, ListReference, MonitorPosition, PrimitiveAvailableOnScratch, PrimitiveSource, Project, SoundReference, SoundSource, Target, VariableBase, VariableDefinition, VariableMonitorMode, VariableMonitorOptions, VariableReference, attachStack, block, createBlocks, fromCostumeSource, fromPrimitiveSource, fromSoundSource, substack, valueBlock };
+import { A as VariableMonitorMode, C as PrimitiveAvailableOnScratch, D as SoundSource, E as SoundReference, M as VariableReference, O as VariableBase, S as MonitorPosition, T as SoundData, _ as CreateListOptions, a as Handler, b as ListMonitorOptions, c as createBlocks, d as fromCostumeSource, f as fromPrimitiveSource, g as CostumeSource, h as CostumeReference, i as BlockInit, j as VariableMonitorOptions, k as VariableDefinition, l as substack, m as CostumeData, n as SpriteOptions, o as attachStack, p as fromSoundSource, r as Target, s as block, t as Project, u as valueBlock, v as CreateVariableOptions, w as PrimitiveSource, x as ListReference, y as HikkakuBlock } from "./project-djJPtrq7.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, fromCostumeSource, fromPrimitiveSource, fromSoundSource, substack, valueBlock };

package/index.mjs

@@ -1,4 +1,4 @@
-import { a as valueBlock, c as fromSoundSource, i as substack, n as block, o as fromCostumeSource, r as createBlocks, s as fromPrimitiveSource, t as attachStack } from "./composer-BudVTTBs.mjs";
+import { a as valueBlock, c as fromSoundSource, i as substack, n as block, o as fromCostumeSource, r as createBlocks, s as fromPrimitiveSource, t as attachStack } from "./composer-DpyUR2R3.mjs";
 
 //#region src/core/monitors.ts
 const createVariableMonitor = (id, name, defaultValue, spriteName, options) => {
@@ -86,9 +86,15 @@ var Target = class {
 	#monitors = [];
 	#costumes = [];
 	#sounds = [];
-	constructor(isStage, name) {
+	#size;
+	#x;
+	#y;
+	constructor(isStage, name, options) {
 		this.isStage = isStage;
 		this.name = name;
+		this.#size = options?.size;
+		this.#x = options?.x;
+		this.#y = options?.y;
 	}
 	run(handler) {
 		const blocks = createBlocks(() => {
@@ -171,9 +177,18 @@ var Target = class {
 			...target,
 			isStage: false,
 			name: this.name,
-			visible: true
+			visible: true,
+			size: this.#size,
+			x: this.#x,
+			y: this.#y
 		};
 	}
+	getAdditionalAssets() {
+		const assets = /* @__PURE__ */ new Map();
+		for (const costume of this.#costumes) if (costume._data) assets.set(`${costume.assetId}.${costume.dataFormat}`, costume._data);
+		for (const sound of this.#sounds) if (sound._data) assets.set(`${sound.assetId}.${sound.dataFormat}`, sound._data);
+		return assets;
+	}
 };
 var Project = class {
 	stage;
@@ -183,11 +198,17 @@ var Project = class {
 		this.stage = target;
 		this.#targets.push(target);
 	}
-	createSprite(name) {
-		const sprite = new Target(false, name);
+	createSprite(name, options) {
+		const sprite = new Target(false, name, options);
 		this.#targets.push(sprite);
 		return sprite;
 	}
+	addCostume(costume) {
+		return this.stage.addCostume(costume);
+	}
+	addSound(sound) {
+		return this.stage.addSound(sound);
+	}
 	toScratch() {
 		const targets = this.#targets.map((target) => target.toScratch());
 		return {
@@ -200,6 +221,11 @@ var Project = class {
 			}
 		};
 	}
+	getAdditionalAssets() {
+		const assets = /* @__PURE__ */ new Map();
+		for (const target of this.#targets) for (const [key, value] of target.getAdditionalAssets()) assets.set(key, value);
+		return assets;
+	}
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hikkaku",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "private": false,
   "exports": {
@@ -23,6 +23,10 @@
     "./vite": {
       "import": "./vite/index.mjs",
       "types": "./vite/index.d.mts"
+    },
+    "./types": {
+      "import": "./types.d.mjs",
+      "types": "./types.d.mts"
     }
   },
   "scripts": {

package/{project-Ca9rsVT3.d.mts → project-djJPtrq7.d.mts}

@@ -1,4 +1,5 @@
 import * as sb3 from "sb3-types";
+import { Costume, Sound } from "sb3-types";
 
 //#region src/core/types.d.ts
 type PrimitiveAvailableOnScratch = number | boolean | string;
@@ -55,6 +56,12 @@ interface HikkakuBlock {
   isBlock: true;
   id: string;
 }
+type CostumeData = Costume & {
+  _data?: Uint8Array;
+};
+type SoundData = Sound & {
+  _data?: Uint8Array;
+};
 //#endregion
 //#region src/core/block-helper.d.ts
 declare const fromPrimitiveSource: <T extends PrimitiveAvailableOnScratch>(source: PrimitiveSource<T>) => sb3.Input;
@@ -114,26 +121,35 @@ interface ListMonitor {
 type Monitor = VariableMonitor | ListMonitor;
 //#endregion
 //#region src/core/project.d.ts
+interface SpriteOptions {
+  size?: number;
+  x?: number;
+  y?: number;
+}
 declare class Target<IsStage extends boolean = boolean> {
   #private;
   readonly isStage: IsStage;
   readonly name: IsStage extends true ? 'Stage' : string;
   currentCostume: number;
-  constructor(isStage: IsStage, name: IsStage extends true ? 'Stage' : string);
+  constructor(isStage: IsStage, name: IsStage extends true ? 'Stage' : string, options?: IsStage extends false ? SpriteOptions : undefined);
   run(handler: (target: Target<IsStage>) => void): void;
   createVariable(name: string, defaultValue?: sb3.ScalarVal, isCloudVariableOrOptions?: boolean | CreateVariableOptions): VariableDefinition;
   createList(name: string, defaultValue?: sb3.ScalarVal[], options?: CreateListOptions): ListReference;
-  addCostume(costume: sb3.Costume): CostumeReference;
-  addSound(sound: sb3.Sound): SoundReference;
+  addCostume(costume: CostumeData): CostumeReference;
+  addSound(sound: SoundData): SoundReference;
   get monitors(): readonly Monitor[];
   toScratch(): IsStage extends true ? sb3.Stage : sb3.Sprite;
+  getAdditionalAssets(): Map<string, Uint8Array>;
 }
 declare class Project {
   #private;
   readonly stage: Target<true>;
   constructor();
-  createSprite(name: string): Target<false>;
+  createSprite(name: string, options?: SpriteOptions): Target<false>;
+  addCostume(costume: CostumeData): CostumeReference;
+  addSound(sound: SoundData): SoundReference;
   toScratch(): sb3.ScratchProject;
+  getAdditionalAssets(): Map<string, Uint8Array>;
 }
 //#endregion
-export { SoundReference as C, VariableMonitorMode as D, VariableDefinition as E, VariableMonitorOptions as O, PrimitiveSource as S, VariableBase as T, HikkakuBlock as _, attachStack as a, MonitorPosition as b, substack as c, fromPrimitiveSource as d, fromSoundSource as f, CreateVariableOptions as g, CreateListOptions as h, Handler as i, VariableReference as k, valueBlock as l, CostumeSource as m, Target as n, block as o, CostumeReference as p, BlockInit as r, createBlocks as s, Project as t, fromCostumeSource as u, ListMonitorOptions as v, SoundSource as w, PrimitiveAvailableOnScratch as x, ListReference as y };
+export { VariableMonitorMode as A, PrimitiveAvailableOnScratch as C, SoundSource as D, SoundReference as E, VariableReference as M, VariableBase as O, MonitorPosition as S, SoundData as T, CreateListOptions as _, Handler as a, ListMonitorOptions as b, createBlocks as c, fromCostumeSource as d, fromPrimitiveSource as f, CostumeSource as g, CostumeReference as h, BlockInit as i, VariableMonitorOptions as j, VariableDefinition as k, substack as l, CostumeData as m, SpriteOptions as n, attachStack as o, fromSoundSource as p, Target as r, block as s, Project as t, valueBlock as u, CreateVariableOptions as v, PrimitiveSource as w, ListReference as x, HikkakuBlock as y };

package/types.d.mts

@@ -0,0 +1,21 @@
+//#region src/types.d.ts
+declare module '*.svg?scratch' {
+  import * as sb3 from 'sb3-types';
+  const content: sb3.Costume;
+  export default content;
+}
+declare module '*.png?scratch' {
+  import * as sb3 from 'sb3-types';
+  const content: sb3.Costume;
+  export default content;
+}
+declare module '*.wav?scratch' {
+  import * as sb3 from 'sb3-types';
+  const content: sb3.Sound;
+  export default content;
+}
+declare module '*.mp3?scratch' {
+  import * as sb3 from 'sb3-types';
+  const content: sb3.Sound;
+  export default content;
+}

package/vite/index.mjs

@@ -1,15 +1,66 @@
 import { zip } from "fflate";
-import { mkdir, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import * as path from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { createServerModuleRunner } from "vite";
+import crypto from "node:crypto";
 
+//#region src/vite/plugin-scratch-import.ts
+const pluginScratchImport = () => ({
+	name: "vite-plugin-hikkaku:scratch-import",
+	enforce: "pre",
+	resolveId(source, importer, _options) {
+		if (source.endsWith("?scratch")) {
+			if (source.endsWith(".svg?scratch") || source.endsWith(".png?scratch") || source.endsWith(".wav?scratch") || source.endsWith(".mp3?scratch")) {
+				const importerPath = pathToFileURL(importer ?? "");
+				return { id: `\0scratch:${new URL(source, importerPath)}` };
+			}
+		}
+	},
+	async load(id, _options) {
+		if (id.startsWith("\0scratch:")) {
+			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));
+
+        export default data
+      `;
+		}
+	}
+});
+
+//#endregion
 //#region src/vite/index.ts
 const BASE_URL = "https://scratchfoundation.github.io/scratch-gui/";
 const VIRTUAL_MODULE_IDS = { project: "/@virtual/hikkaku-project" };
 function hikkaku(init) {
 	let runner = null;
-	return {
+	let additionalAssets = /* @__PURE__ */ new Map();
+	const assetCache = /* @__PURE__ */ new Map();
+	const setContentType = (res, assetId) => {
+		const assetExt = path.extname(assetId).toLowerCase();
+		if (assetExt === ".png") res.setHeader("Content-Type", "image/png");
+		else if (assetExt === ".jpg" || assetExt === ".jpeg") res.setHeader("Content-Type", "image/jpeg");
+		else if (assetExt === ".wav") res.setHeader("Content-Type", "audio/wav");
+		else if (assetExt === ".mp3") res.setHeader("Content-Type", "audio/mpeg");
+		else res.setHeader("Content-Type", "application/octet-stream");
+	};
+	return [{
 		name: "vite-plugin-hikkaku",
 		config(config, env) {
 			if (env.command === "build") (config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vite-plugin-turbowarp-packager"))?.api.setEntry(path.join(process.cwd(), "dist", "project.sb3"));
@@ -38,8 +89,12 @@ function hikkaku(init) {
 			}
 			const { default: project } = await import(pathToFileURL(path.join(process.cwd(), "dist/.tmp", "project.mjs")).href);
 			const projectJSON = project.toScratch();
+			const assets = project.getAdditionalAssets();
 			const zipData = await new Promise((resolve, reject) => {
-				zip({ "project.json": new TextEncoder().encode(JSON.stringify(projectJSON)) }, (err, data) => {
+				zip({
+					"project.json": new TextEncoder().encode(JSON.stringify(projectJSON)),
+					...Object.fromEntries(assets.entries())
+				}, (err, data) => {
 					if (err) reject(err);
 					else resolve(data);
 				});
@@ -56,6 +111,12 @@ function hikkaku(init) {
 				name: "project.json",
 				source: JSON.stringify(projectJSON, null, 2)
 			});
+			for (const [assetId, data] of assets.entries()) this.emitFile({
+				type: "asset",
+				fileName: `assets/${assetId}`,
+				name: `assets/${assetId}`,
+				source: data
+			});
 			await rm(tmpDir, {
 				recursive: true,
 				force: true
@@ -88,6 +149,7 @@ function hikkaku(init) {
 			if (this.environment.name !== "hikkaku") return;
 			if (!runner) throw new Error("Module runner is not initialized.");
 			const project = (await runner.import(init.entry)).default;
+			additionalAssets = project.getAdditionalAssets();
 			options.server.environments.client.hot.send("hikkaku:project", project.toScratch());
 		},
 		async configureServer(server) {
@@ -98,9 +160,54 @@ function hikkaku(init) {
 			server.environments.client.hot.on("vite:client:connect", async () => {
 				if (!runner) throw new Error("Module runner is not initialized.");
 				const project = (await runner.import(init.entry)).default;
+				additionalAssets = project.getAdditionalAssets();
 				server.environments.client.hot.send("hikkaku:project", project.toScratch());
 			});
 			server.middlewares.use(async (req, res, next) => {
+				if (req.url?.startsWith("/hikkaku-assets/")) {
+					const segments = req.url.split("/");
+					const assetId = segments[segments.indexOf("hikkaku-assets") + 1];
+					if (!assetId) {
+						res.statusCode = 400;
+						res.end("Asset ID is required");
+						return;
+					}
+					const assetData = additionalAssets.get(assetId);
+					if (!assetData) {
+						if (assetCache.has(assetId)) {
+							const cached = assetCache.get(assetId);
+							if (cached === false) {
+								res.statusCode = 404;
+								res.end("Asset not found");
+								return;
+							}
+							setContentType(res, assetId);
+							res.end(cached);
+							return;
+						}
+						const assetData = await fetch(`https://assets.scratch.mit.edu/internalapi/asset/${assetId}/get/`).then((r) => {
+							if (!r.ok) return null;
+							return r.arrayBuffer();
+						}).catch((e) => {
+							console.warn("Failed to fetch asset from network:", e);
+							return null;
+						});
+						if (assetData) {
+							const uint8array = new Uint8Array(assetData);
+							assetCache.set(assetId, uint8array);
+							setContentType(res, assetId);
+							res.end(uint8array);
+							return;
+						}
+						assetCache.set(assetId, false);
+						res.statusCode = 404;
+						res.end("Asset not found");
+						return;
+					}
+					setContentType(res, assetId);
+					res.end(assetData);
+					return;
+				}
 				if (req.url === "/") {
 					const html = (await fetch(BASE_URL).then((res) => res.text())).replace("gui.js", "https://scratchfoundation.github.io/scratch-gui/gui.js").replace("</head>", "<script src=\"/@vite/client\" type=\"module\"><\/script><script type=\"module\" src=\"/@virtual/hikkaku-client\"><\/script></head>");
 					res.setHeader("Content-Type", "text/html");
@@ -122,7 +229,7 @@ function hikkaku(init) {
 				next();
 			});
 		}
-	};
+	}, pluginScratchImport()];
 }
 
 //#endregion