@augment-vir/common 31.1.0 → 31.1.1

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

@@ -1,6 +1,6 @@
-import type { AnyObject } from '@augment-vir/core';
-import { IsAny, IsNever, Primitive, UnionToIntersection } from 'type-fest';
-import { TsRecurse, TsRecursionStart, TsRecursionTracker, TsTooMuchRecursion } from '../type/type-recursion.js';
+import { type AnyObject, type RequiredKeysOf } from '@augment-vir/core';
+import { type IsAny, type IsNever, type OptionalKeysOf, type Primitive, type UnionToIntersection } from 'type-fest';
+import { type TsRecurse, type TsRecursionStart, type TsRecursionTracker, type TsTooMuchRecursion } from '../type/type-recursion.js';
 /** All types that won't be recursed into when defining a {@link SelectionSet}. */
 type SelectionTypesToPreserve = Primitive | RegExp | Promise<any>;
 /**
@@ -13,6 +13,15 @@ type SelectionTypesToPreserve = Primitive | RegExp | Promise<any>;
 export type GenericSelectionSet = {
     [Key in PropertyKey]: unknown;
 };
+type MakeKeysOptional<Full extends AnyObject, T extends AnyObject> = IsNever<Extract<OptionalKeysOf<Full>, keyof T>> extends true ? {
+    [Key in keyof T]: T[Key];
+} : IsNever<Extract<RequiredKeysOf<Full>, keyof T>> extends true ? {
+    [Key in keyof T]?: T[Key];
+} : /** Optional and required keys. */ {
+    [Key in Extract<RequiredKeysOf<Full>, keyof T>]: T[Key];
+} & {
+    [Key in Extract<OptionalKeysOf<Full>, keyof T>]?: T[Key];
+};
 /**
  * Performs a SQL-like nested selection on an object, extracting the selected values. This produces
  * the output type for `selectFrom`.
@@ -21,9 +30,9 @@ export type GenericSelectionSet = {
  * @category Package : @augment-vir/common
  * @package [`@augment-vir/common`](https://www.npmjs.com/package/@augment-vir/common)
  */
-export type SelectFrom<Full extends Readonly<AnyObject>, Selection extends SelectionSet<Full>, Depth extends TsRecursionTracker = TsRecursionStart> = Depth extends TsTooMuchRecursion ? ['Error: recursive object depth is too deep.'] : Full extends ReadonlyArray<infer Element extends any> ? (SelectFrom<Extract<Element, AnyObject>, Selection, TsRecurse<Depth>> | Exclude<Element, AnyObject>)[] : {
+export type SelectFrom<Full extends Readonly<AnyObject>, Selection extends SelectionSet<Full>, Depth extends TsRecursionTracker = TsRecursionStart> = Depth extends TsTooMuchRecursion ? ['Error: recursive object depth is too deep.'] : Full extends ReadonlyArray<infer Element extends any> ? (SelectFrom<Extract<Element, AnyObject>, Selection, TsRecurse<Depth>> | Exclude<Element, AnyObject>)[] : MakeKeysOptional<Full, {
     -readonly [Key in keyof Selection as Selection[Key] extends false ? never : Key extends keyof Full ? Key : never]: (Selection[Key] extends GenericSelectionSet ? SelectFrom<NonNullable<Extract<Full[Key], AnyObject>>, Selection[Key], TsRecurse<Depth>> : Full[Key]) | Exclude<Full[Key], AnyObject>;
-};
+}>;
 /**
  * Defines a selection set for a given object type. This is used in {@link SelectFrom}.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "31.1.0",
+    "version": "31.1.1",
     "description": "A collection of augments, helpers types, functions, and classes for any JavaScript environment.",
     "keywords": [
         "augment",
@@ -39,8 +39,8 @@
         "test:web": "virmator --no-deps test web"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.1.0",
-        "@augment-vir/core": "^31.1.0",
+        "@augment-vir/assert": "^31.1.1",
+        "@augment-vir/core": "^31.1.1",
         "@date-vir/duration": "^7.0.1",
         "ansi-styles": "^6.2.1",
         "json5": "^2.2.3",