@augment-vir/common 19.4.0 → 19.4.1

package/dist/cjs/augments/object/map-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapObjectValues = exports.mapObjectValuesSync = void 0;
-const __1 = require("../..");
+const object_entries_1 = require("./object-entries");
 /**
  * Map an object's keys to new values synchronously. This is different from plain mapObjectValues in
  * that this will not wrap the return value in a promise if any of the new object values are
@@ -9,15 +9,11 @@ const __1 = require("../..");
  * to explicitly state the return type.
  *
  * @example
- *     mapObjectValuesSync({objectToIterateOver: 'initial value'})<{objectToIterateOver: number}>(
- *         (key, value) => ({
- *             newValue: value.length,
- *         }),
- *     );
+ *     mapObjectValuesSync({objectToIterateOver: 'initial value'})(callback);
  */
 function mapObjectValuesSync(inputObject) {
     function innerMap(mapCallback) {
-        const mappedObject = (0, __1.getObjectTypedKeys)(inputObject).reduce((accum, currentKey) => {
+        const mappedObject = (0, object_entries_1.getObjectTypedKeys)(inputObject).reduce((accum, currentKey) => {
             const mappedValue = mapCallback(currentKey, inputObject[currentKey], inputObject);
             return {
                 ...accum,
@@ -35,7 +31,7 @@ exports.mapObjectValuesSync = mapObjectValuesSync;
  */
 function mapObjectValues(inputObject, mapCallback) {
     let gotAPromise = false;
-    const mappedObject = (0, __1.getObjectTypedKeys)(inputObject).reduce((accum, currentKey) => {
+    const mappedObject = (0, object_entries_1.getObjectTypedKeys)(inputObject).reduce((accum, currentKey) => {
         const mappedValue = mapCallback(currentKey, inputObject[currentKey], inputObject);
         if (mappedValue instanceof Promise) {
             gotAPromise = true;
@@ -48,7 +44,7 @@ function mapObjectValues(inputObject, mapCallback) {
     if (gotAPromise) {
         return new Promise(async (resolve, reject) => {
             try {
-                await Promise.all((0, __1.getObjectTypedKeys)(mappedObject).map(async (key) => {
+                await Promise.all((0, object_entries_1.getObjectTypedKeys)(mappedObject).map(async (key) => {
                     const value = await mappedObject[key];
                     mappedObject[key] = value;
                 }));

package/dist/esm/augments/error.js

@@ -1,4 +1,4 @@
-import { isPromiseLike, isTruthy, typedHasProperty, } from '..';
+import { isPromiseLike, isTruthy, typedHasProperty } from '..';
 export function combineErrors(errors) {
     if (!errors || errors.length === 0) {
         return undefined;

package/dist/esm/augments/object/map-object.js

@@ -1,4 +1,4 @@
-import { getObjectTypedKeys } from '../..';
+import { getObjectTypedKeys } from './object-entries';
 /**
  * Map an object's keys to new values synchronously. This is different from plain mapObjectValues in
  * that this will not wrap the return value in a promise if any of the new object values are
@@ -6,11 +6,7 @@ import { getObjectTypedKeys } from '../..';
  * to explicitly state the return type.
  *
  * @example
- *     mapObjectValuesSync({objectToIterateOver: 'initial value'})<{objectToIterateOver: number}>(
- *         (key, value) => ({
- *             newValue: value.length,
- *         }),
- *     );
+ *     mapObjectValuesSync({objectToIterateOver: 'initial value'})(callback);
  */
 export function mapObjectValuesSync(inputObject) {
     function innerMap(mapCallback) {

package/dist/types/augments/error.d.ts

@@ -1,5 +1,5 @@
 import { RequireExactlyOne } from 'type-fest';
-import { AtLeastTuple, NoInputsFunction, UnPromise } from '..';
+import { AtLeastTuple, NoInputsFunction } from '..';
 export declare function combineErrors(errors: AtLeastTuple<Error, 1>): Error;
 export declare function combineErrors(errors: ReadonlyArray<never>): undefined;
 export declare function combineErrors(errors: ReadonlyArray<Error>): Error | undefined;
@@ -15,5 +15,5 @@ export type TryWrapInputs<CallbackReturn, FallbackReturn> = {
     catchCallback: (error: unknown) => FallbackReturn;
 }>;
 export declare function wrapInTry<CallbackReturn, FallbackReturn>(inputs: TryWrapInputs<CallbackReturn, FallbackReturn>): FallbackReturn | CallbackReturn;
-export declare function executeAndReturnError<CallbackGeneric extends NoInputsFunction<PromiseLike<any>>>(callback: CallbackGeneric): Promise<Error | UnPromise<ReturnType<CallbackGeneric>>>;
+export declare function executeAndReturnError<CallbackGeneric extends NoInputsFunction<PromiseLike<any>>>(callback: CallbackGeneric): Promise<Error | Awaited<ReturnType<CallbackGeneric>>>;
 export declare function executeAndReturnError<CallbackGeneric extends NoInputsFunction>(callback: CallbackGeneric): Error | ReturnType<CallbackGeneric>;

package/dist/types/augments/object/map-object.d.ts

@@ -1,8 +1,8 @@
-import { PropertyValueType, UnPromise } from '../..';
+import { PropertyValueType } from './object';
 export type InnerMappedValues<EntireInputGeneric extends object, MappedValueGeneric> = {
     [MappedProp in keyof EntireInputGeneric]: MappedValueGeneric;
 };
-export type MappedValues<EntireInputGeneric extends object, MappedValueGeneric> = MappedValueGeneric extends PromiseLike<unknown> ? Promise<InnerMappedValues<EntireInputGeneric, UnPromise<MappedValueGeneric>>> : InnerMappedValues<EntireInputGeneric, UnPromise<MappedValueGeneric>>;
+export type MappedValues<EntireInputGeneric extends object, MappedValueGeneric> = MappedValueGeneric extends PromiseLike<unknown> ? Promise<InnerMappedValues<EntireInputGeneric, Awaited<MappedValueGeneric>>> : InnerMappedValues<EntireInputGeneric, Awaited<MappedValueGeneric>>;
 /**
  * Map an object's keys to new values synchronously. This is different from plain mapObjectValues in
  * that this will not wrap the return value in a promise if any of the new object values are
@@ -10,11 +10,7 @@ export type MappedValues<EntireInputGeneric extends object, MappedValueGeneric>
  * to explicitly state the return type.
  *
  * @example
- *     mapObjectValuesSync({objectToIterateOver: 'initial value'})<{objectToIterateOver: number}>(
- *         (key, value) => ({
- *             newValue: value.length,
- *         }),
- *     );
+ *     mapObjectValuesSync({objectToIterateOver: 'initial value'})(callback);
  */
 export declare function mapObjectValuesSync<EntireInputGeneric extends object>(inputObject: EntireInputGeneric): <OutputObjectGeneric extends object>(mapCallback: (inputKey: keyof EntireInputGeneric, keyValue: EntireInputGeneric[keyof EntireInputGeneric], fullObject: EntireInputGeneric) => never extends PropertyValueType<OutputObjectGeneric> ? any : PropertyValueType<OutputObjectGeneric>) => OutputObjectGeneric;
 /**

package/dist/types/augments/promise.d.ts

@@ -1,8 +1,7 @@
 export declare function wait(delayMs: number): Promise<void>;
 export declare function waitValue<ResolutionValue>(delayMs: number, returnValue: ResolutionValue): Promise<ResolutionValue>;
 export declare function isPromiseLike<T>(input: T | unknown): input is T extends PromiseLike<infer ValueType> ? PromiseLike<ValueType> : PromiseLike<unknown>;
-export type UnPromise<T> = T extends PromiseLike<infer PromiseType> ? Awaited<PromiseType> : T;
-export type MaybePromise<T> = Promise<UnPromise<T>> | UnPromise<T>;
+export type MaybePromise<T> = Promise<T> | T;
 export declare class PromiseTimeoutError extends Error {
     readonly durationMs: number;
     readonly message: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "19.4.0",
+    "version": "19.4.1",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"