@oidoid/void 0.1.0-6 → 0.1.0-7

package/dist/tools/void.js

@@ -2,29 +2,30 @@
 // void.ts --config=<void.json> [--minify] [--one-file] [--watch]
 // compiles images into an atlas and bundles an HTML entrypoint.
 import path from 'node:path';
-import packageJSON from '../package.json' with { type: 'json' };
+import voidPackageJSON from '../package.json' with { type: 'json' };
 import { parseConfigFile } from "../schema/config-file.js";
 import { bundle } from "./bundle/bundle.js";
 import { Config } from "./types/config.js";
 import { Argv } from "./utils/argv.js";
 import { exec } from "./utils/exec.js";
 import { parseHTML } from "./utils/html-parser.js";
-export async function build(args, env) {
+export async function build(args) {
     const argv = Argv(args);
     const configFile = await parseConfigFile(argv.opts['--config'] ?? 'void.json');
-    const config = Config(configFile, argv, env.npm_package_version);
+    const hash = (await exec('git', 'rev-parse', '--short', 'HEAD')).trim();
+    const packageJSON = JSON.parse((await exec('npm', 'pkg', 'get', 'version', 'published')) || '{}');
+    const config = Config(configFile, argv, packageJSON, hash);
     const doc = await parseHTML(config.entry);
     const srcFilenames = [
         ...doc.querySelectorAll("script[type='module'][src$='.ts']")
     ].map(el => path.resolve(path.dirname(config.entry), el.getAttribute('src')));
     const voidVersion = {
-        hash: (await exec('git', 'rev-parse', '--short', 'HEAD')).trim(),
-        published: packageJSON.published,
+        published: voidPackageJSON.published,
         // imported JSON doesn't treeshake. define as a constant.
-        version: packageJSON.version
+        version: voidPackageJSON.version
     };
     await bundle(config, srcFilenames, voidVersion);
 }
 if (import.meta.main)
-    await build(process.argv, process.env);
+    await build(process.argv);
 //# sourceMappingURL=void.js.map

package/dist/tools/void.js.map

@@ -1 +1 @@
-{"version":3,"file":"void.js","sourceRoot":"","sources":["../../tools/void.ts"],"names":[],"mappings":";AACA,iEAAiE;AACjE,gEAAgE;AAEhE,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAA;AAC7D,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAExD,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAgBhD,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,IAAuB,EACvB,GAAkD;IAElD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,CAAA;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAEhE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,YAAY,GAAG;QACnB,GAAG,GAAG,CAAC,gBAAgB,CACrB,mCAAmC,CACpC;KACF,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAE,CAAC,CAAC,CAAA;IAE9E,MAAM,WAAW,GAAgB;QAC/B,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE;QAChE,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,yDAAyD;QACzD,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAA;IAED,MAAM,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAA;AACjD,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI;IAAE,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA"}
+{"version":3,"file":"void.js","sourceRoot":"","sources":["../../tools/void.ts"],"names":[],"mappings":";AACA,iEAAiE;AACjE,gEAAgE;AAEhE,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,eAAe,MAAM,iBAAiB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAA;AACjE,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAA;AAExD,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAExC,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAgBhD,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,IAAuB;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,CAAA;IAC9E,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACvE,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CACzC,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,IAAI,IAAI,CAClE,CAAA;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;IAE1D,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,YAAY,GAAG;QACnB,GAAG,GAAG,CAAC,gBAAgB,CACrB,mCAAmC,CACpC;KACF,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAE,CAAC,CAAC,CAAA;IAE9E,MAAM,WAAW,GAAgB;QAC/B,SAAS,EAAE,eAAe,CAAC,SAAS;QACpC,yDAAyD;QACzD,OAAO,EAAE,eAAe,CAAC,OAAO;KACjC,CAAA;IAED,MAAM,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAA;AACjD,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI;IAAE,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA"}

package/package.json

@@ -9,7 +9,7 @@
     "esbuild": "0.25.11",
     "html-minifier-next": "3.0.0",
     "jsdom": "27.0.1",
-    "mem-font": "11.0.0-6"
+    "mem-font": "11.0.0-7"
   },
   "description": "basic 2D game library.",
   "devDependencies": {
@@ -22,7 +22,7 @@
     "node": ">=24.0"
   },
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/src/index.js"
   },
   "files": [
     "dist",
@@ -41,14 +41,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "published": "20251020",
+  "published": "20251021",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oidoid/void.git"
   },
   "scripts": {
     "build": "tsc --build && npm run build:favicon && npm run build:demo -- --minify --one-file",
-    "build:favicon": "for s in 1 2 3 4 12 32; do f=dist/public/favicon/favicon$(($s * 16)).png; aseprite src/demo/assets/favicon.aseprite --batch --color-mode=indexed --scale=$s --save-as=$f; zopflipng -y $f $f > /dev/null; done",
+    "build:favicon": "for s in 1 2 3 4 12; do f=dist/public/favicon/favicon$(($s * 16)); aseprite src/demo/assets/favicon.aseprite --batch --color-mode=indexed --scale=$s --save-as=$f.png && cwebp -exact -lossless -mt -quiet -z 9 $f.png -o $f.webp; done",
     "build:demo": "tools/void.ts --config=src/demo/void.json",
     "clean": "rm -rf dist",
     "format": "npm run formatter -- --fix",
@@ -62,5 +62,5 @@
     "version": "npm pkg set published=$(date +%Y%m%d) && npm test"
   },
   "type": "module",
-  "version": "0.1.0-6"
+  "version": "0.1.0-7"
 }

package/schema/config-file.test.ts

@@ -26,7 +26,7 @@ test('overrides', () => {
     entry: 'entry',
     meta: 'meta',
     out: {dir: 'outDir', name: 'name'},
-    preloadAtlas: {dir: 'dir/', image: 'image.png', json: 'json.json'}
+    preloadAtlas: {dir: 'dir/', image: 'image.webp', json: 'json.json'}
   }
   assert.deepEqual<ConfigFile>(
     parse('dirname/filename', JSON.stringify(config)),
@@ -37,7 +37,7 @@ test('overrides', () => {
       out: {dir: 'dirname/outDir', name: 'name'},
       preloadAtlas: {
         dir: 'dirname/dir/',
-        image: 'dirname/image.png',
+        image: 'dirname/image.webp',
         json: 'dirname/json.json'
       },
 

package/schema/config-file.v0.json

@@ -19,7 +19,7 @@
         "image": {
           "type": "string",
           "description": "sprite sheet image output.",
-          "examples": ["dist/public/atlas.png", "atlas.png"]
+          "examples": ["dist/public/atlas.webp", "atlas.png"]
         },
         "json": {
           "type": "string",

package/tools/atlas-pack/atlas-pack.ts

@@ -6,13 +6,12 @@ import {globAll} from '../utils/file-util.ts'
 import {parseAtlasJSON} from './atlas-json-parser.ts'
 
 // to-do: separate executable?
-export async function packAtlas(
-  config: Readonly<AtlasConfig>,
-  minify: boolean
-): Promise<void> {
+export async function packAtlas(config: Readonly<AtlasConfig>): Promise<void> {
   const filenames = await globAll(path.join(config.dir, '**.aseprite'))
   if (!filenames.length) return
 
+  const webp = config.image.endsWith('.webp')
+  const sheet = webp ? config.image.replace('.webp', '.png') : config.image
   const json = await exec(
     'aseprite',
     '--batch',
@@ -21,18 +20,32 @@ export async function packAtlas(
     '--list-slices',
     '--list-tags',
     '--merge-duplicates',
-    `--sheet=${config.image}`,
+    `--sheet=${sheet}`,
     '--sheet-pack',
     '--tagname-format={title}--{tag}',
     ...filenames
   )
 
-  if (minify) await exec('zopflipng', '-y', config.image, config.image)
+  if (webp)
+    await exec(
+      'cwebp',
+      '-exact',
+      '-lossless',
+      '-mt',
+      '-quiet',
+      '-z',
+      '9',
+      sheet,
+      '-o',
+      config.image
+    )
 
   await fs.writeFile(
     config.json,
     JSON.stringify(parseAtlasJSON(JSON.parse(json)))
   )
 
-  await exec('biome', 'check', '--fix', config.json)
+  try {
+    await exec('biome', 'check', '--fix', config.json)
+  } catch {}
 }

package/tools/bundle/bundle.ts

@@ -34,10 +34,10 @@ export async function bundle(
     target: 'es2024' // https://esbuild.github.io/content-types/#tsconfig-json
   }
 
-  if (config.preloadAtlas) await packAtlas(config.preloadAtlas, config.minify)
+  if (config.preloadAtlas) await packAtlas(config.preloadAtlas)
   if (config.preloadAtlas && config.watch) {
     fs.watch(config.preloadAtlas.dir, {recursive: true}, (ev, type) =>
-      onWatch(config.preloadAtlas!, config.minify, ev, type)
+      onWatch(config.preloadAtlas!, ev, type)
     )
     const ctx = await esbuild.context(opts)
     await Promise.all([
@@ -54,12 +54,11 @@ export async function bundle(
 const onWatch = V.debounce(
   async (
     config: Readonly<AtlasConfig>,
-    minify: boolean,
     ev: fs.WatchEventType,
     file: string | null
   ) => {
     console.log(`asset ${file} ${ev}.`)
-    await packAtlas(config, minify)
+    await packAtlas(config)
   },
   500 as V.Millis
 )

package/tools/bundle/html-plugin.ts

@@ -66,8 +66,7 @@ export function HTMLPlugin(config: Readonly<Config>): esbuild.Plugin {
           const manifest: Manifest = JSON.parse(
             await fs.readFile(manifestFilename, 'utf8')
           )
-          if (process.env.npm_package_version)
-            manifest.version = process.env.npm_package_version
+          if (config.version) manifest.version = config.version
 
           for (const icon of manifest.icons ?? []) {
             if (!icon.src || !icon.type) continue
@@ -116,15 +115,16 @@ export function HTMLPlugin(config: Readonly<Config>): esbuild.Plugin {
             removeComments: true,
             removeEmptyAttributes: true
           })
-        // to-do: what biome config does this use outside of the repo?
         else
-          html = await exec(
-            'biome',
-            'check',
-            '--fix',
-            `--stdin-file-path=${config.entry}`,
-            {stdin: html}
-          )
+          try {
+            html = await exec(
+              'biome',
+              'check',
+              '--fix',
+              `--stdin-file-path=${config.entry}`,
+              {stdin: html}
+            )
+          } catch {}
 
         // to-do: test.
         const outHTMLFilename = path.join(config.out.dir, config.out.filename)

package/tools/types/config.ts

@@ -1,6 +1,7 @@
 import path from 'node:path'
 import type {AtlasConfig, ConfigFile} from '../../schema/config-file.ts'
 import type {Argv} from '../utils/argv.ts'
+import type {PackageJSON} from './package-json.ts'
 
 export type Config = {
   $schema: string
@@ -17,27 +18,48 @@ export type Config = {
   minify: boolean
   oneFile: boolean
   watch: boolean
+
+  /** package publish date. */
+  published: string | undefined
+  /** package version. */
+  version: string | undefined
+
+  /** Git short hash. */
+  hash: string
 }
 
 export function Config(
   configFile: Readonly<ConfigFile>,
   argv: Readonly<Argv>,
-  version: string | undefined
+  packageJSON: Readonly<PackageJSON>,
+  hash: string
 ): Config {
-  let stem = path.basename(configFile.entry).replace(/\.[^.]+$/, '')
-  if (configFile.out.name && !argv.opts['--watch']) stem = configFile.out.name
-  let suffix = '.html'
-  if (version && !argv.opts['--watch']) suffix = `-v${version}.html`
+  let fileStem = path.basename(configFile.entry).replace(/\.[^.]+$/, '')
+  if (configFile.out.name && !argv.opts['--watch'])
+    fileStem = configFile.out.name
+  let fileSuffix = '.html'
+  if (!argv.opts['--watch']) {
+    const version = packageJSON.version ? `v${packageJSON.version}` : ''
+    const published =
+      packageJSON.version && packageJSON.published
+        ? `+${packageJSON.published}`
+        : ''
+    const hashStr = packageJSON.version && hash ? `.${hash}` : ''
+    fileSuffix = `-${version}${published}${hashStr}.html`
+  }
   return {
     $schema: configFile.$schema,
     entry: configFile.entry,
     meta: configFile.meta,
-    out: {dir: configFile.out.dir, filename: `${stem}${suffix}`},
+    out: {dir: configFile.out.dir, filename: `${fileStem}${fileSuffix}`},
     preloadAtlas: configFile.preloadAtlas,
     dirname: configFile.dirname,
     filename: configFile.filename,
     minify: argv.opts['--minify'] ?? false,
     oneFile: argv.opts['--one-file'] ?? false,
-    watch: argv.opts['--watch'] ?? false
+    watch: argv.opts['--watch'] ?? false,
+    published: packageJSON.published,
+    version: packageJSON.version,
+    hash
   }
 }

package/tools/types/package-json.ts

@@ -0,0 +1,4 @@
+export type PackageJSON = {
+  version?: string | undefined
+  published?: string | undefined
+}

package/tools/void.ts

@@ -3,11 +3,12 @@
 // compiles images into an atlas and bundles an HTML entrypoint.
 
 import path from 'node:path'
-import packageJSON from '../package.json' with {type: 'json'}
+import voidPackageJSON from '../package.json' with {type: 'json'}
 import {parseConfigFile} from '../schema/config-file.ts'
 import type {VoidVersion} from '../src/types/void-version.ts'
 import {bundle} from './bundle/bundle.ts'
 import {Config} from './types/config.ts'
+import type {PackageJSON} from './types/package-json.ts'
 import {Argv} from './utils/argv.ts'
 import {exec} from './utils/exec.ts'
 import {parseHTML} from './utils/html-parser.ts'
@@ -26,13 +27,14 @@ declare module './utils/argv.ts' {
   }
 }
 
-export async function build(
-  args: readonly string[],
-  env: {readonly [name: string]: string | undefined}
-): Promise<void> {
+export async function build(args: readonly string[]): Promise<void> {
   const argv = Argv(args)
   const configFile = await parseConfigFile(argv.opts['--config'] ?? 'void.json')
-  const config = Config(configFile, argv, env.npm_package_version)
+  const hash = (await exec('git', 'rev-parse', '--short', 'HEAD')).trim()
+  const packageJSON: PackageJSON = JSON.parse(
+    (await exec('npm', 'pkg', 'get', 'version', 'published')) || '{}'
+  )
+  const config = Config(configFile, argv, packageJSON, hash)
 
   const doc = await parseHTML(config.entry)
   const srcFilenames = [
@@ -42,13 +44,12 @@ export async function build(
   ].map(el => path.resolve(path.dirname(config.entry), el.getAttribute('src')!))
 
   const voidVersion: VoidVersion = {
-    hash: (await exec('git', 'rev-parse', '--short', 'HEAD')).trim(),
-    published: packageJSON.published,
+    published: voidPackageJSON.published,
     // imported JSON doesn't treeshake. define as a constant.
-    version: packageJSON.version
+    version: voidPackageJSON.version
   }
 
   await bundle(config, srcFilenames, voidVersion)
 }
 
-if (import.meta.main) await build(process.argv, process.env)
+if (import.meta.main) await build(process.argv)

package/dist/public/index.html

@@ -1,23 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>void</title>
-    <link
-      href="favicon/favicon16.png"
-      rel="icon"
-      sizes="16x16"
-      type="image/png"
-    >
-    <link rel="manifest" href="manifest.json">
-  </head>
-  <body style="background-color: #ffffb1">
-    <img
-      alt=""
-      id="preload-atlas"
-      style="display: none"
-      src="preload-atlas.png"
-    >
-    <script src="index.js" type="module" async=""></script>
-  </body>
-</html>

package/dist/public/manifest.json

@@ -1 +0,0 @@
-{"author":"oidoid","background_color":"#ffffb1","description":"void 2D game library demo.","display":"standalone","homepage_url":"https://oidoid.com/","icons":[{"src":"favicon/favicon16.png","sizes":"16x16","type":"image/png"},{"src":"favicon/favicon32.png","sizes":"32x32","type":"image/png"},{"src":"favicon/favicon48.png","sizes":"48x48","type":"image/png"},{"src":"favicon/favicon64.png","sizes":"64x64","type":"image/png"},{"src":"favicon/favicon192.png","sizes":"192x192","type":"image/png"},{"src":"favicon/favicon512.png","sizes":"512x512","type":"image/png"}],"manifest_version":3,"name":"void","orientation":"any","short_name":"void","start_url":"http://localhost:1234","theme_color":"#ffffb1","version":"0.1.0-4"}