@augment-vir/common 29.1.8 → 29.1.10

package/dist/cjs/augments/object/selection-set.js

@@ -24,6 +24,9 @@ function selectFrom(originalObject, selectionSet) {
             keysToRemove.push(key);
             return undefined;
         }
+        else if (shouldPreserve(value)) {
+            return value;
+        }
         else {
             return selectFrom(value, selection);
         }

package/dist/esm/augments/object/selection-set.js

@@ -20,6 +20,9 @@ export function selectFrom(originalObject, selectionSet) {
             keysToRemove.push(key);
             return undefined;
         }
+        else if (shouldPreserve(value)) {
+            return value;
+        }
         else {
             return selectFrom(value, selection);
         }

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

@@ -1,4 +1,4 @@
-import { Writable } from 'type-fest';
+import { RequireAtLeastOne, Writable } from 'type-fest';
 export type PartialAndNullable<T extends object> = {
     [Prop in keyof T]?: T[Prop] | null | undefined;
 };
@@ -17,3 +17,5 @@ export type ExcludeKeysWithMatchingValues<OriginalObject extends object, Matcher
     [Prop in keyof OriginalObject as OriginalObject[Prop] extends Matcher ? never : Prop]: Prop;
 };
 export type RemovePartial<Input> = Input extends Partial<Record<infer K extends PropertyKey, infer V>> ? Required<Record<K, V>> : Required<Input>;
+/** Excludes empty objects from a union. */
+export type ExcludeEmpty<T> = T extends RequireAtLeastOne<T> ? T : never;

package/dist/types/augments/object/selection-set.d.ts

@@ -3,7 +3,7 @@ import { TsRecurse, TsRecursionStart, TsRecursionTracker, TsTooMuchRecursion } f
 import { UnionToIntersection } from '../union';
 import { AnyObject } from './any-object';
 import { KeyCount } from './key-count';
-import { PropertyValueType } from './object';
+import { ExcludeEmpty, PropertyValueType } from './object';
 /** All types that won't be recursed into when defining a {@link SelectionSet}. */
 export type SelectionTypesToPreserve = Primitive | RegExp | Promise<any>;
 /** A generic selection set without specific keys. */
@@ -18,10 +18,10 @@ export type PickSelection<Full extends Readonly<AnyObject>, Selection extends Ge
  * Collapses a selected value to the first part of the selection that contains more than 1 key or
  * that is not an object.
  */
-export type PickCollapsedSelection<Full extends Readonly<AnyObject>, Selection extends GenericSelectionSet, Depth extends TsRecursionTracker = TsRecursionStart> = Depth extends TsTooMuchRecursion ? 'Error: recursive object depth is too deep.' : KeyCount<PickSelection<Full, Selection, Depth>> extends 1 ? Selection[keyof PickSelection<Full, Selection, Depth>] extends GenericSelectionSet ? PickCollapsedSelection<Full[keyof PickSelection<Full, Selection, Depth>], Selection[keyof PickSelection<Full, Selection, Depth>], TsRecurse<Depth>> : PropertyValueType<PickSelection<Full, Selection, Depth>> : PickSelection<Full, Selection, Depth>;
+export type PickCollapsedSelection<Full extends Readonly<AnyObject>, Selection extends GenericSelectionSet, Depth extends TsRecursionTracker = TsRecursionStart> = Depth extends TsTooMuchRecursion ? 'Error: recursive object depth is too deep.' : KeyCount<ExcludeEmpty<NonNullable<PickSelection<Full, Selection, Depth>>>> extends 1 ? Selection[keyof PickSelection<Full, Selection, Depth>] extends GenericSelectionSet ? PickCollapsedSelection<NonNullable<Full[keyof PickSelection<Full, Selection, Depth>]>, Selection[keyof PickSelection<Full, Selection, Depth>], TsRecurse<Depth>> | Extract<Full[keyof PickSelection<Full, Selection, Depth>], undefined | null> : PropertyValueType<PickSelection<Full, Selection, Depth>> : PickSelection<Full, Selection, Depth>;
 /** Defines a selection set for the given object. */
-export type SelectionSet<Full extends Readonly<AnyObject>, Depth extends TsRecursionTracker = TsRecursionStart> = IsAny<Full> extends true ? any : Depth extends TsTooMuchRecursion ? ['Error: recursive object depth is too deep.'] : Full extends ReadonlyArray<infer FullChild extends AnyObject> ? SelectionSet<FullChild, TsRecurse<Depth>> : Partial<{
-    [Key in keyof Full]: IsNever<Exclude<Full[Key], SelectionTypesToPreserve>> extends true ? boolean : boolean | UnionToIntersection<SelectionSet<Full[Key], TsRecurse<Depth>>>;
+export type SelectionSet<Full extends Readonly<AnyObject>, Depth extends TsRecursionTracker = TsRecursionStart> = IsAny<Full> extends true ? any : Depth extends TsTooMuchRecursion ? boolean : Full extends ReadonlyArray<infer FullChild extends AnyObject> ? SelectionSet<FullChild, TsRecurse<Depth>> : Partial<{
+    [Key in keyof Full]: IsNever<Exclude<Full[Key], SelectionTypesToPreserve>> extends true ? boolean : UnionToIntersection<SelectionSet<NonNullable<Required<Full>[Key]>, TsRecurse<Depth>>> | boolean;
 }>;
 export declare function selectFrom<Full extends AnyObject, const Selection extends SelectionSet<NoInfer<Full>>>(originalObject: Readonly<Full>, selectionSet: Readonly<Selection>): PickSelection<Full, Selection>;
 export declare function selectCollapsedFrom<Full extends AnyObject, const Selection extends SelectionSet<NoInfer<Full>>>(originalObject: Readonly<Full>, selectionSet: Readonly<Selection>): PickCollapsedSelection<Full, Selection>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "29.1.8",
+    "version": "29.1.10",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -26,7 +26,7 @@
     "dependencies": {
         "browser-or-node": "^3.0.0",
         "run-time-assertions": "^1.5.1",
-        "type-fest": "^4.20.1"
+        "type-fest": "^4.21.0"
     },
     "devDependencies": {
         "typescript": "5.5.2"