utilium 3.4.0 → 3.4.1

package/dist/cache.js

@@ -80,8 +80,10 @@ export class Resource {
                 }
                 return acc;
             }, []);
-            // Extend buffer to include the new region
-            current.data = extendBuffer(current.data, next.offset + next.data.byteLength);
+            // Extend buffer to include the new region. `current.data` starts at
+            // `current.offset`, so its length is measured from there (the `.set()`
+            // destination is already relative to `current.offset`).
+            current.data = extendBuffer(current.data, next.offset + next.data.byteLength - current.offset);
             current.data.set(next.data, next.offset - current.offset);
             // Remove the next region after merging
             this.regions.splice(i + 1, 1);
@@ -165,8 +167,10 @@ export class Resource {
         const end = offset + data.byteLength;
         const region = this.regionAt(offset);
         if (region) {
-            region.data = extendBuffer(region.data, end);
-            region.data.set(data, offset);
+            // `region.data` holds bytes starting at `region.offset`, so positions
+            // within it are relative to `region.offset` (not absolute resource offsets).
+            region.data = extendBuffer(region.data, end - region.offset);
+            region.data.set(data, offset - region.offset);
             region.ranges.push({ start: offset, end });
             region.ranges.sort((a, b) => a.start - b.start);
             this.collect();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "utilium",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"description": "Typescript utilities",
 	"funding": {
 		"type": "individual",
@@ -26,6 +26,8 @@
 		"format:check": "prettier --check .",
 		"format": "prettier --write .",
 		"lint": "tsc --noEmit && eslint src",
+		"test": "tsx --test test/**/*.test.ts",
+		"build": "tsc -b",
 		"prepublishOnly": "npx tsc"
 	},
 	"repository": {
@@ -66,5 +68,8 @@
 		"printWidth": 120,
 		"arrowParens": "avoid",
 		"experimentalOperatorPosition": "start"
+	},
+	"allowScripts": {
+		"esbuild": true
 	}
 }

package/scripts/lice.js

@@ -4,7 +4,7 @@
 
 import { existsSync, globSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
-import { dirname, join, matchesGlob, relative } from 'node:path';
+import { dirname, extname, join, matchesGlob, relative } from 'node:path';
 import { parseArgs, styleText } from 'node:util';
 
 const { positionals: inputs, values: opts } = parseArgs({
@@ -45,9 +45,13 @@ function get_license() {
 		if (!existsSync(pkgPath)) continue;
 
 		const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-		if (pkg.spdx) return pkg.spdx;
-		if (pkg.spdxLicense) return pkg.spdxLicense;
-		if (pkg.license) return pkg.license;
+
+		const maybe = pkg.spdx || pkg.spdxLicense || pkg.license;
+
+		if (maybe) {
+			if (opts.verbose) console.log(styleText(['dim'], 'Auto-detected license:'), maybe);
+			return maybe;
+		}
 	}
 
 	return null;
@@ -60,6 +64,14 @@ if (opts.write && !expectedLicense) {
 	process.exit(1);
 }
 
+/** Some built-in extensions that we should never check */
+const excludeExtensions = ['.json'];
+
+/**
+ * @param {string} path
+ * @param {string} display
+ * @returns {boolean}
+ */
 function should_exclude(path, display) {
 	for (const pattern of opts.exclude) {
 		if (!matchesGlob(path, pattern)) continue;
@@ -67,11 +79,22 @@ function should_exclude(path, display) {
 		return true;
 	}
 
+	if (excludeExtensions.includes(extname(path))) return true;
+
 	return false;
 }
 
 const licenseSpec = /^([\s\/*!-]*)SPDX-License-Identifier: (.+)$/im;
 
+/**
+ * @typedef {('skipped'|'missing'|'with license'|'correct'|'mismatched')} CheckResult
+ */
+
+/**
+ * @param {string} path
+ * @param {string} display
+ * @returns {Promise<CheckResult>}
+ */
 async function check_file(path, display) {
 	if (should_exclude(path, display)) return 'skipped';
 
@@ -100,6 +123,15 @@ async function check_file(path, display) {
 	return 'mismatched';
 }
 
+/**
+ * @typedef {'correct' | 'skipped' | 'added' | 'overwritten'} WriteResult
+ */
+
+/**
+ * @param {string} path
+ * @param {string} display
+ * @returns {Promise<WriteResult>}
+ */
 async function write_file(path, display) {
 	if (should_exclude(path, display)) return 'skipped';
 
@@ -133,6 +165,12 @@ async function write_file(path, display) {
 	return 'overwritten';
 }
 
+/**
+ *
+ * @param {string} dir
+ * @param {string} display
+ * @returns {Generator<Promise<CheckResult | WriteResult>>}
+ */
 function* check_dir(dir, display) {
 	if (should_exclude(dir, display)) return 'skipped';
 
@@ -204,7 +242,7 @@ try {
 			.map(([key, value]) => `${key in styles ? styleText(styles[key], value.toString()) : value} ${key}`)
 			.join(', ')
 	);
-} catch (error) {
+} catch (/** @type {any} */ error) {
 	console.error(styleText('red', error.toString()));
 	process.exit(1);
 }

package/scripts/tsconfig.json

@@ -2,6 +2,7 @@
 	"compilerOptions": {
 		"checkJs": true,
 		"noEmit": true,
+		"types": ["node"],
 		"lib": ["ESNext"],
 		"module": "NodeNext",
 		"moduleResolution": "NodeNext"

package/dist/type-math.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/type-math.test.js

@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-// Copyright (c) 2025 James Prevett
-// addition
-const add_positive = 3;
-const add_zero = 0;
-const add_diff_signs = -1;
-const add_negative = -3;
-const add_float = 1.6;
-// @ts-expect-error 2 + 2 != 5
-let fail = 5;
-fail = 4;
-// subtraction for sanity
-const subtract_normal = -18;
-const subtract_from_neg = -9;
-const subtract_both_neg = 5;
-const subtract_zero = -1;
-const subtract_floats = 3.1;
-// were doing multiplication in the type system now?!
-// yup.
-const multiply_normal = 6;
-const multiply_by_zero = 0;
-const multiply_negative = -12;
-const multiply_both_negative = 21;
-const multiply_large = 896;
-// division
-const divide_normal = 5;
-const divide_by_zero = NaN;
-const divide_negative = -4;
-const divide_both_negative = 6;
-// floor/fraction
-const int_normal = 3;
-const int_negative = -3;
-const fraction_normal = 0.1415;
-const fraction_negative = 0.1415;
-// With type variable
-const pi = 3.141;
-// @ts-expect-error 2589 — Recently this started to become too deep even though it worked in the past
-const octo_pi = 24.1128;
-export {};