@fgv/ts-utils 5.0.1-0 → 5.0.1-10

package/lib/packlets/base/result.js

@@ -145,8 +145,9 @@ class Success {
      */
     report(reporter, options) {
         var _a;
-        const level = (_a = options === null || options === void 0 ? void 0 : options.success) !== null && _a !== void 0 ? _a : 'quiet';
-        reporter === null || reporter === void 0 ? void 0 : reporter.reportSuccess(level, this._value);
+        const successOptions = typeof (options === null || options === void 0 ? void 0 : options.success) === 'object' ? options.success : { level: options === null || options === void 0 ? void 0 : options.success };
+        const level = (_a = successOptions.level) !== null && _a !== void 0 ? _a : 'quiet';
+        reporter === null || reporter === void 0 ? void 0 : reporter.reportSuccess(level, this._value, undefined, successOptions.message);
         return this;
     }
     /**
@@ -272,8 +273,9 @@ class Failure {
      */
     report(reporter, options) {
         var _a, _b, _c;
-        const level = (_a = options === null || options === void 0 ? void 0 : options.failure) !== null && _a !== void 0 ? _a : 'error';
-        const message = (_c = (_b = options === null || options === void 0 ? void 0 : options.message) === null || _b === void 0 ? void 0 : _b.call(options, this._message)) !== null && _c !== void 0 ? _c : this._message;
+        const failureOptions = typeof (options === null || options === void 0 ? void 0 : options.failure) === 'object' ? options.failure : { level: options === null || options === void 0 ? void 0 : options.failure };
+        const level = (_a = failureOptions.level) !== null && _a !== void 0 ? _a : 'error';
+        const message = (_c = (_b = failureOptions.message) === null || _b === void 0 ? void 0 : _b.call(failureOptions, this._message)) !== null && _c !== void 0 ? _c : this._message;
         reporter === null || reporter === void 0 ? void 0 : reporter.reportFailure(level, message);
         return this;
     }
@@ -411,8 +413,11 @@ class DetailedSuccess extends Success {
      */
     report(reporter, options) {
         var _a;
-        const level = (_a = options === null || options === void 0 ? void 0 : options.success) !== null && _a !== void 0 ? _a : 'quiet';
-        reporter === null || reporter === void 0 ? void 0 : reporter.reportSuccess(level, this._value, this._detail);
+        const successOptions = typeof (options === null || options === void 0 ? void 0 : options.success) === 'object' ? options.success : { level: options === null || options === void 0 ? void 0 : options.success };
+        const level = (_a = successOptions.level) !== null && _a !== void 0 ? _a : 'quiet';
+        // Cast reporter to preserve detail type when calling reportSuccess
+        const detailedReporter = reporter;
+        detailedReporter === null || detailedReporter === void 0 ? void 0 : detailedReporter.reportSuccess(level, this._value, this._detail, successOptions.message);
         return this;
     }
     /**
@@ -503,10 +508,15 @@ class DetailedFailure extends Failure {
      * {@inheritdoc IResult.report}
      */
     report(reporter, options) {
-        var _a, _b, _c;
-        const level = (_a = options === null || options === void 0 ? void 0 : options.failure) !== null && _a !== void 0 ? _a : 'error';
-        const message = (_c = (_b = options === null || options === void 0 ? void 0 : options.message) === null || _b === void 0 ? void 0 : _b.call(options, this._message, this._detail)) !== null && _c !== void 0 ? _c : this._message;
-        reporter === null || reporter === void 0 ? void 0 : reporter.reportFailure(level, message, this._detail);
+        var _a, _b;
+        const failureOptions = typeof (options === null || options === void 0 ? void 0 : options.failure) === 'object' ? options.failure : { level: options === null || options === void 0 ? void 0 : options.failure };
+        const level = (_a = failureOptions.level) !== null && _a !== void 0 ? _a : 'error';
+        // Cast formatter to handle detail type properly
+        const formatter = failureOptions.message;
+        const message = (_b = formatter === null || formatter === void 0 ? void 0 : formatter(this._message, this._detail)) !== null && _b !== void 0 ? _b : this._message;
+        // Cast reporter to preserve detail type when calling reportFailure
+        const detailedReporter = reporter;
+        detailedReporter === null || detailedReporter === void 0 ? void 0 : detailedReporter.reportFailure(level, message, this._detail);
         return this;
     }
     orThrow(logOrFormat) {

package/lib/packlets/hash/crcNormalizer.js

@@ -23,7 +23,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Crc32Normalizer = void 0;
 const hashingNormalizer_1 = require("./hashingNormalizer");
-const textEncoder = new TextEncoder();
+function encodeUtf8(input) {
+    // Prefer built-in TextEncoder when available (browsers and modern Node)
+    // @ts-ignore - global TextEncoder may be unavailable in some environments
+    const GlobalTextEncoder = typeof TextEncoder !== 'undefined' ? TextEncoder : undefined;
+    if (GlobalTextEncoder) {
+        return new GlobalTextEncoder().encode(input);
+    }
+    // Very small manual UTF-8 encoder as a last resort
+    /* eslint-disable no-bitwise */
+    const bytes = [];
+    for (let i = 0; i < input.length; i++) {
+        let codePoint = input.charCodeAt(i);
+        if (codePoint >= 0xd800 && codePoint <= 0xdbff && i + 1 < input.length) {
+            const next = input.charCodeAt(i + 1);
+            if (next >= 0xdc00 && next <= 0xdfff) {
+                codePoint = ((codePoint - 0xd800) << 10) + (next - 0xdc00) + 0x10000;
+                i++;
+            }
+        }
+        if (codePoint < 0x80) {
+            bytes.push(codePoint);
+        }
+        else if (codePoint < 0x800) {
+            bytes.push(0xc0 | (codePoint >> 6));
+            bytes.push(0x80 | (codePoint & 0x3f));
+        }
+        else if (codePoint < 0x10000) {
+            bytes.push(0xe0 | (codePoint >> 12));
+            bytes.push(0x80 | ((codePoint >> 6) & 0x3f));
+            bytes.push(0x80 | (codePoint & 0x3f));
+        }
+        else {
+            bytes.push(0xf0 | (codePoint >> 18));
+            bytes.push(0x80 | ((codePoint >> 12) & 0x3f));
+            bytes.push(0x80 | ((codePoint >> 6) & 0x3f));
+            bytes.push(0x80 | (codePoint & 0x3f));
+        }
+    }
+    /* eslint-enable no-bitwise */
+    return new Uint8Array(bytes);
+}
 const POLYNOMIAL = 0xedb88320;
 const crc32Table = [];
 function crc32(bytes, crc = 0xffffffff) {
@@ -69,7 +109,7 @@ class Crc32Normalizer extends hashingNormalizer_1.HashingNormalizer {
         super(Crc32Normalizer.crc32Hash);
     }
     static crc32Hash(parts) {
-        return crc32(textEncoder.encode(parts.join('|')))
+        return crc32(encodeUtf8(parts.join('|')))
             .toString(16)
             .padStart(8, '0');
     }

package/lib/packlets/logging/logReporter.d.ts

@@ -1,5 +1,5 @@
 import { ILogger, ReporterLogLevel } from './logger';
-import { IResultReporter, MessageLogLevel, Success } from '../base';
+import { ErrorFormatter, IResultReporter, MessageLogLevel, Success } from '../base';
 /**
  * A function that formats a value for logging.
  * @public
@@ -26,10 +26,10 @@ export interface ILogReporterCreateParams<T, TD = unknown> {
  */
 export declare class LogReporter<T, TD = unknown> implements ILogger, IResultReporter<T, TD> {
     /**
-     * The logger to wrap.
-     * @internal
+     * Base logger used to by this reporter.
+     * @public
      */
-    protected readonly _logger: ILogger;
+    readonly logger: ILogger;
     /**
      * The formatter to use for values.
      * @internal
@@ -72,11 +72,17 @@ export declare class LogReporter<T, TD = unknown> implements ILogger, IResultRep
     /**
      * {@inheritDoc IResultReporter.reportSuccess}
      */
-    reportSuccess(level: MessageLogLevel, value: T, detail?: TD): void;
+    reportSuccess(level: MessageLogLevel, value: T, detail?: TD, message?: ErrorFormatter<TD>): void;
     /**
      * {@inheritDoc IResultReporter.reportFailure}
      */
     reportFailure(level: MessageLogLevel, message: string, detail?: TD): void;
+    /**
+     * Creates a new {@link Logging.LogReporter | LogReporter} with the same logger but a different value formatter.
+     * @param valueFormatter - The value formatter to use.
+     * @returns A new {@link Logging.LogReporter | LogReporter} with the same logger but a different value formatter.
+     */
+    withValueFormatter<TN>(valueFormatter: LogValueFormatter<TN, TD>): LogReporter<TN, TD>;
     /**
      * Generic method to try to format an object for logging.
      * @param value - The value to format.

package/lib/packlets/logging/logReporter.js

@@ -37,7 +37,7 @@ class LogReporter {
         var _a, _b, _c;
         /* c8 ignore next 1 */
         params = params !== null && params !== void 0 ? params : {};
-        this._logger = (_a = params.logger) !== null && _a !== void 0 ? _a : new logger_1.NoOpLogger();
+        this.logger = (_a = params.logger) !== null && _a !== void 0 ? _a : new logger_1.NoOpLogger();
         this._valueFormatter = (_b = params.valueFormatter) !== null && _b !== void 0 ? _b : LogReporter.tryFormatObject;
         this._messageFormatter = (_c = params.messageFormatter) !== null && _c !== void 0 ? _c : ((message, __detail) => message);
     }
@@ -45,43 +45,44 @@ class LogReporter {
      * {@inheritDoc Logging.ILogger.logLevel}
      */
     get logLevel() {
-        return this._logger.logLevel;
+        return this.logger.logLevel;
     }
     /**
      * {@inheritDoc Logging.ILogger.detail}
      */
     detail(message, ...parameters) {
-        return this._logger.detail(message, ...parameters);
+        return this.logger.detail(message, ...parameters);
     }
     /**
      * {@inheritDoc Logging.ILogger.info}
      */
     info(message, ...parameters) {
-        return this._logger.info(message, ...parameters);
+        return this.logger.info(message, ...parameters);
     }
     /**
      * {@inheritDoc Logging.ILogger.warn}
      */
     warn(message, ...parameters) {
-        return this._logger.warn(message, ...parameters);
+        return this.logger.warn(message, ...parameters);
     }
     /**
      * {@inheritDoc Logging.ILogger.error}
      */
     error(message, ...parameters) {
-        return this._logger.error(message, ...parameters);
+        return this.logger.error(message, ...parameters);
     }
     /**
      * {@inheritDoc Logging.ILogger.log}
      */
     log(level, message, ...parameters) {
-        return this._logger.log(level, message, ...parameters);
+        return this.logger.log(level, message, ...parameters);
     }
     /**
      * {@inheritDoc IResultReporter.reportSuccess}
      */
-    reportSuccess(level, value, detail) {
-        const formatted = this._valueFormatter(value, detail);
+    reportSuccess(level, value, detail, message) {
+        const formattedValue = this._valueFormatter(value, detail);
+        const formatted = message ? message(formattedValue, detail) : formattedValue;
         this.log(level, formatted);
     }
     /**
@@ -91,6 +92,18 @@ class LogReporter {
         const formatted = this._messageFormatter(message, detail);
         this.log(level, formatted);
     }
+    /**
+     * Creates a new {@link Logging.LogReporter | LogReporter} with the same logger but a different value formatter.
+     * @param valueFormatter - The value formatter to use.
+     * @returns A new {@link Logging.LogReporter | LogReporter} with the same logger but a different value formatter.
+     */
+    withValueFormatter(valueFormatter) {
+        return new LogReporter({
+            logger: this.logger,
+            valueFormatter,
+            messageFormatter: this._messageFormatter
+        });
+    }
     /**
      * Generic method to try to format an object for logging.
      * @param value - The value to format.

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "@fgv/ts-utils",
-  "version": "5.0.1-0",
+  "version": "5.0.1-10",
   "description": "Assorted Typescript Utilities",
   "main": "lib/index.js",
+  "module": "dist/index.js",
   "types": "dist/ts-utils.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/ts-utils.d.ts",
+      "import": "./dist/index.js",
+      "require": "./lib/index.js",
+      "default": "./lib/index.js"
+    }
+  },
   "sideEffects": false,
   "keywords": [
     "typescript",
@@ -17,33 +26,34 @@
   "homepage": "https://github.com/ErikFortune/fgv/tree/main/libraries/ts-utils#readme",
   "devDependencies": {
     "@jest/expect-utils": "^29.7.0",
-    "@microsoft/api-documenter": "^7.26.31",
-    "@microsoft/api-extractor": "^7.52.10",
+    "@microsoft/api-documenter": "^7.27.3",
+    "@microsoft/api-extractor": "^7.53.3",
     "@types/jest": "^29.5.14",
     "@types/luxon": "^3.7.1",
     "@types/mustache": "^4.2.5",
     "@types/node": "^20.14.9",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
-    "@typescript-eslint/parser": "^8.42.0",
-    "eslint": "^9.35.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.2",
+    "@typescript-eslint/parser": "^8.46.2",
+    "eslint": "^9.39.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.2",
     "jest-matcher-utils": "^29.7.0",
-    "rimraf": "^6.0.1",
-    "ts-jest": "^29.4.1",
+    "rimraf": "^6.1.0",
+    "ts-jest": "^29.4.5",
     "ts-node": "^10.9.2",
-    "typescript": "5.8.3",
-    "eslint-plugin-n": "^17.21.3",
+    "typescript": "5.9.3",
+    "eslint-plugin-n": "^17.23.1",
     "jest-snapshot": "~29.7.0",
-    "@rushstack/heft": "0.74.4",
-    "@rushstack/heft-node-rig": "2.9.5",
-    "@rushstack/eslint-config": "4.4.0",
+    "@rushstack/heft": "1.1.3",
+    "@rushstack/heft-node-rig": "2.11.4",
+    "@rushstack/eslint-config": "4.5.3",
     "@types/heft-jest": "1.0.6",
-    "@rushstack/heft-jest-plugin": "0.16.13",
-    "eslint-plugin-tsdoc": "~0.4.0"
+    "@rushstack/heft-jest-plugin": "1.1.3",
+    "eslint-plugin-tsdoc": "~0.4.0",
+    "@fgv/heft-dual-rig": "0.1.0"
   },
   "scripts": {
     "build": "heft build --clean",