@ls-stack/utils 3.31.0 → 3.33.0

package/lib/concurrentCalls.d.ts

@@ -1,21 +1,21 @@
-import { Result } from 't-result';
+import { ResultValidErrors, Result } from 't-result';
 
 declare class ConcurrentCallsAggregateError extends AggregateError {
-    errors: Error[];
+    errors: ResultValidErrors[];
     total: number;
     failed: number;
-    constructor(errors: Error[], total: number, failed: number);
+    constructor(errors: ResultValidErrors[], total: number, failed: number);
 }
 declare class ConcurrentCallsWithMetadataAggregateError<M extends ValidMetadata> extends AggregateError {
-    errors: Error[];
+    errors: ResultValidErrors[];
     errorsWithMetadata: {
-        error: Error;
+        error: ResultValidErrors;
         metadata: M;
     }[];
     total: number;
     failed: number;
     constructor(errors: {
-        error: Error;
+        error: ResultValidErrors;
         metadata: M;
     }[], total: number, failed: number);
 }
@@ -27,12 +27,12 @@ type SucceededCall<R, M> = {
     value: R;
     metadata: M;
 };
-type FailedCall<M, E extends Error = Error> = {
+type FailedCall<M, E extends ResultValidErrors = Error> = {
     metadata: M;
     error: E;
 };
-type Action<R, E extends Error> = () => Promise<Result<R, E>>;
-type SettledResultWithMetadata<R, M, E extends Error = Error> = {
+type Action<R, E extends ResultValidErrors> = () => Promise<Result<R, E>>;
+type SettledResultWithMetadata<R, M, E extends ResultValidErrors = Error> = {
     ok: true;
     value: R;
     metadata: M;
@@ -42,8 +42,10 @@ type SettledResultWithMetadata<R, M, E extends Error = Error> = {
     error: E;
     metadata: M;
 };
-declare class ConcurrentCalls<R = unknown, E extends Error = Error> {
+declare class ConcurrentCalls<R = unknown, E extends ResultValidErrors = Error> {
     #private;
+    allowResultify: boolean;
+    constructor(allowResultify: boolean);
     add(...calls: Action<R, E>[]): this;
     resultifyAdd(...calls: ((() => R) | (() => Promise<R>))[]): this;
     runAll({ delayStart }?: RunProps): Promise<Result<R[], E>>;
@@ -59,11 +61,12 @@ declare class ConcurrentCalls<R = unknown, E extends Error = Error> {
  * Executes multiple asynchronous calls concurrently and collects the results in a easier to use format.
  *
  * @template R - The type of the result value.
- * @template E - The type of the error.
  */
 declare function concurrentCalls<R = unknown>(): ConcurrentCalls<R, Error>;
-declare class ConcurrentCallsWithMetadata<M extends ValidMetadata, R = unknown, E extends Error = Error> {
+declare class ConcurrentCallsWithMetadata<M extends ValidMetadata, R = unknown, E extends ResultValidErrors = Error> {
     #private;
+    allowResultify: boolean;
+    constructor(allowResultify: boolean);
     add(...calls: {
         fn: Action<R, E>;
         metadata: M;
@@ -85,12 +88,25 @@ declare class ConcurrentCallsWithMetadata<M extends ValidMetadata, R = unknown,
     }>;
 }
 /**
- * Executes multiple asynchronous calls concurrently and collects the results in a easier to use format.
+ * Executes multiple asynchronous calls concurrently with metadata for each call and collects the results in a easier to use format.
  *
  * @template M - The type of the call metadata.
  * @template R - The type of the result value.
- * @template E - The type of the error from individual Result objects.
  */
 declare function concurrentCallsWithMetadata<M extends ValidMetadata, R = unknown>(): ConcurrentCallsWithMetadata<M, R, Error>;
+type ValueFromResult<R> = R extends Result<infer T, any> ? T : never;
+type ErrorFromResult<R> = R extends Result<any, infer E> ? E : never;
+/**
+ * Executes multiple asynchronous result calls concurrently and collects the results in a easier to use format.
+ *
+ * @template R - The type of the result function that will be called.
+ */
+declare function concurrentResultCalls<ResultFn extends (...args: any[]) => Promise<Result<unknown, ResultValidErrors>>>(): ConcurrentCalls<ValueFromResult<Awaited<ReturnType<ResultFn>>>, ErrorFromResult<Awaited<ReturnType<ResultFn>>>>;
+/**
+ * Executes multiple asynchronous result calls concurrently with metadata for each call and collects the results in a easier to use format.
+ *
+ * @template ResultFn - The type of the result function that will be called.
+ */
+declare function concurrentResultsWithMetadata<M extends ValidMetadata, ResultFn extends (...args: any[]) => Promise<Result<unknown, ResultValidErrors>>>(): ConcurrentCallsWithMetadata<M, ValueFromResult<Awaited<ReturnType<ResultFn>>>, ErrorFromResult<Awaited<ReturnType<ResultFn>>>>;
 
-export { ConcurrentCallsAggregateError, ConcurrentCallsWithMetadataAggregateError, concurrentCalls, concurrentCallsWithMetadata };
+export { ConcurrentCallsAggregateError, ConcurrentCallsWithMetadataAggregateError, concurrentCalls, concurrentCallsWithMetadata, concurrentResultCalls, concurrentResultsWithMetadata };

package/lib/concurrentCalls.js

@@ -4,9 +4,12 @@ import {
 import {
   sleep
 } from "./chunk-5DZT3Z5Z.js";
+import {
+  safeJsonStringify
+} from "./chunk-VAAMRG4K.js";
 import {
   truncateArray
-} from "./chunk-SRVMMYSW.js";
+} from "./chunk-RYBJST64.js";
 import {
   invariant
 } from "./chunk-C2SVCIWE.js";
@@ -16,7 +19,11 @@ import {
 } from "./chunk-JF2MDHOJ.js";
 
 // src/concurrentCalls.ts
-import { Result, resultify, unknownToError } from "t-result";
+import {
+  Result,
+  resultify,
+  unknownToError
+} from "t-result";
 function formatErrorMessagesWithCounts(messages, failed, total) {
   const errorMessageCounts = /* @__PURE__ */ new Map();
   for (const message of messages) {
@@ -38,7 +45,10 @@ var ConcurrentCallsAggregateError = class extends AggregateError {
   failed = 0;
   constructor(errors, total, failed) {
     const messages = errors.map(
-      (error) => `- ${truncateString(error.message, 100)}`
+      (error) => `- ${truncateString(
+        error instanceof Error ? error.message : safeJsonStringify(error) ?? "???",
+        100
+      )}`
     );
     const message = formatErrorMessagesWithCounts(messages, failed, total);
     super(errors, message);
@@ -67,7 +77,10 @@ var ConcurrentCallsWithMetadataAggregateError = class extends AggregateError {
         }
       } catch (_) {
       }
-      return `- ${metadataPrefix}${truncateString(error.message, 100)}`;
+      return `- ${metadataPrefix}${truncateString(
+        error instanceof Error ? error.message : safeJsonStringify(error) ?? "???",
+        100
+      )}`;
     });
     const message = formatErrorMessagesWithCounts(messages, failed, total);
     const errorInstances = errors.map((e) => e.error);
@@ -81,11 +94,20 @@ var ConcurrentCallsWithMetadataAggregateError = class extends AggregateError {
 var ConcurrentCalls = class {
   #pendingCalls = [];
   #alreadyRun = false;
+  allowResultify = true;
+  constructor(allowResultify) {
+    this.allowResultify = allowResultify;
+  }
   add(...calls) {
     this.#pendingCalls.push(...calls);
     return this;
   }
   resultifyAdd(...calls) {
+    if (!this.allowResultify) {
+      throw new Error(
+        "resultifyAdd is not allowed when using concurrentResults"
+      );
+    }
     const processedCalls = calls.map((call) => {
       return async () => {
         try {
@@ -166,11 +188,15 @@ var ConcurrentCalls = class {
   }
 };
 function concurrentCalls() {
-  return new ConcurrentCalls();
+  return new ConcurrentCalls(true);
 }
 var ConcurrentCallsWithMetadata = class {
   #pendingCalls = [];
   #alreadyRun = false;
+  allowResultify = true;
+  constructor(allowResultify) {
+    this.allowResultify = allowResultify;
+  }
   add(...calls) {
     invariant(
       !this.#alreadyRun,
@@ -180,6 +206,11 @@ var ConcurrentCallsWithMetadata = class {
     return this;
   }
   resultifyAdd(...items) {
+    if (!this.allowResultify) {
+      throw new Error(
+        "resultifyAdd is not allowed when using concurrentResultsWithMetadata"
+      );
+    }
     const processedItems = items.map(({ fn, metadata }) => {
       const cb = () => resultify(async () => {
         const valueOrPromise = fn();
@@ -297,11 +328,19 @@ var ConcurrentCallsWithMetadata = class {
   }
 };
 function concurrentCallsWithMetadata() {
-  return new ConcurrentCallsWithMetadata();
+  return new ConcurrentCallsWithMetadata(true);
+}
+function concurrentResultCalls() {
+  return new ConcurrentCalls(false);
+}
+function concurrentResultsWithMetadata() {
+  return new ConcurrentCallsWithMetadata(false);
 }
 export {
   ConcurrentCallsAggregateError,
   ConcurrentCallsWithMetadataAggregateError,
   concurrentCalls,
-  concurrentCallsWithMetadata
+  concurrentCallsWithMetadata,
+  concurrentResultCalls,
+  concurrentResultsWithMetadata
 };

package/lib/filterObjectOrArrayKeys.js

@@ -1,7 +1,7 @@
 import {
   filterObjectOrArrayKeys
-} from "./chunk-J3ILVKZC.js";
-import "./chunk-SRVMMYSW.js";
+} from "./chunk-XUNY3QUT.js";
+import "./chunk-RYBJST64.js";
 import "./chunk-C2SVCIWE.js";
 import "./chunk-JF2MDHOJ.js";
 export {

package/lib/serializeXML.cjs

@@ -69,7 +69,7 @@ function serializeXML(node, options) {
 function serializeWithLevel(node, options = {}, level) {
   const {
     indent,
-    escapeText: globalEscapeText = true,
+    escapeText: globalEscapeText = false,
     validateTagName = true,
     invalidNodes = "throw"
   } = options;

package/lib/serializeXML.js

@@ -1,6 +1,6 @@
 import {
   filterAndMap
-} from "./chunk-SRVMMYSW.js";
+} from "./chunk-RYBJST64.js";
 import "./chunk-C2SVCIWE.js";
 import {
   isTruthy
@@ -32,7 +32,7 @@ function serializeXML(node, options) {
 function serializeWithLevel(node, options = {}, level) {
   const {
     indent,
-    escapeText: globalEscapeText = true,
+    escapeText: globalEscapeText = false,
     validateTagName = true,
     invalidNodes = "throw"
   } = options;

package/lib/testUtils.js

@@ -11,7 +11,7 @@ import {
 } from "./chunk-JQFUKJU5.js";
 import {
   filterObjectOrArrayKeys
-} from "./chunk-J3ILVKZC.js";
+} from "./chunk-XUNY3QUT.js";
 import {
   defer
 } from "./chunk-DFXNVEH6.js";
@@ -22,7 +22,7 @@ import "./chunk-3LZQMZAS.js";
 import {
   arrayWithPrevAndIndex,
   filterAndMap
-} from "./chunk-SRVMMYSW.js";
+} from "./chunk-RYBJST64.js";
 import {
   isObject
 } from "./chunk-C2SVCIWE.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Universal TypeScript utilities for browser and Node.js",
-  "version": "3.31.0",
+  "version": "3.33.0",
   "license": "MIT",
   "files": [
     "lib",