[patch] fix recursive SelectionSet in partial properties

electrovir · Jul 6, 2024 · 78993c8 · 78993c8
1 parent 4b64603
commit 78993c8
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 61 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "augment-vir",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "private": true,
     "homepage": "https://github.com/electrovir/augment-vir",
     "bugs": {

diff --git a/packages/browser-testing/package.json b/packages/browser-testing/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/browser-testing",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -23,8 +23,8 @@
         "test:coverage": "npm test"
     },
     "dependencies": {
-        "@augment-vir/common": "^29.1.8",
-        "@augment-vir/testing": "^29.1.8",
+        "@augment-vir/common": "^29.1.9",
+        "@augment-vir/testing": "^29.1.9",
         "@open-wc/testing": "^4.0.0",
         "@types/mocha": "^10.0.7",
         "@web/test-runner-commands": "^0.9.0",

diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/browser",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/browser",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -24,12 +24,12 @@
         "test:watch": "web-test-runner --color --config configs/web-test-runner.config.mjs --watch"
     },
     "dependencies": {
-        "@augment-vir/common": "^29.1.8",
+        "@augment-vir/common": "^29.1.9",
         "html-spec-tags": "^2.2.0",
         "run-time-assertions": "^1.5.1"
     },
     "devDependencies": {
-        "@augment-vir/browser-testing": "^29.1.8",
+        "@augment-vir/browser-testing": "^29.1.9",
         "@open-wc/testing": "^4.0.0",
         "@types/chai": "^4.3.16",
         "@types/mocha": "^10.0.7",

diff --git a/packages/chai/package.json b/packages/chai/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/chai",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -23,8 +23,8 @@
         "test:coverage": "npm test"
     },
     "dependencies": {
-        "@augment-vir/common": "^29.1.8",
-        "@augment-vir/testing": "^29.1.8",
+        "@augment-vir/common": "^29.1.9",
+        "@augment-vir/testing": "^29.1.9",
         "type-fest": "^4.20.1"
     },
     "devDependencies": {

diff --git a/packages/common-tests/package.json b/packages/common-tests/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common-tests",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "private": true,
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common-tests",
     "bugs": {
@@ -22,9 +22,9 @@
         "test:types": "tsc --noEmit"
     },
     "devDependencies": {
-        "@augment-vir/chai": "^29.1.8",
-        "@augment-vir/common": "^29.1.8",
-        "@augment-vir/node-js": "^29.1.8",
+        "@augment-vir/chai": "^29.1.9",
+        "@augment-vir/common": "^29.1.9",
+        "@augment-vir/node-js": "^29.1.9",
         "@electrovir/nyc": "^15.1.0-fix0",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
         "@types/chai": "^4.3.16",

diff --git a/packages/common-tests/src/tests/object/selection-set.test.ts b/packages/common-tests/src/tests/object/selection-set.test.ts
@@ -2,6 +2,7 @@ import {itCases} from '@augment-vir/chai';
 import {
     AnyObject,
     GenericSelectionSet,
+    PartialAndUndefined,
     PickCollapsedSelection,
     PickSelection,
     SelectionSet,
@@ -364,6 +365,16 @@ describe('SelectionSet', () => {
         }>();
     });
 
+    it('allows selecting into potentially undefined properties', () => {
+        const test: SelectionSet<PartialAndUndefined<{top: {mid: {low: string[]}}}>> = {
+            top: {
+                mid: {
+                    low: true,
+                },
+            },
+        };
+    });
+
     it('combines unions', () => {
         assertTypeOf<
             SelectionSet<{
@@ -439,6 +450,28 @@ describe('PickSelection', () => {
             };
         }>();
     });
+
+    it('allows selecting into potentially undefined properties', () => {
+        assertTypeOf<
+            PickSelection<
+                PartialAndUndefined<{top: {mid: {low: string[]}}}>,
+                {
+                    top: {
+                        mid: {
+                            low: true;
+                        };
+                    };
+                }
+            >
+        >().toEqualTypeOf<{
+            top:
+                | undefined
+                | {
+                      mid: {low: string[]};
+                  };
+        }>();
+    });
+
     it('selects through arrays', () => {
         assertTypeOf<
             PickSelection<

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"

diff --git a/packages/common/src/augments/object/selection-set.ts b/packages/common/src/augments/object/selection-set.ts
@@ -82,15 +82,19 @@ export type SelectionSet<
     IsAny<Full> extends true
         ? any
         : Depth extends TsTooMuchRecursion
-          ? ['Error: recursive object depth is too deep.']
+          ? 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
-                      : boolean | UnionToIntersection<SelectionSet<Full[Key], TsRecurse<Depth>>>;
+                      :
+                            | UnionToIntersection<
+                                  SelectionSet<NonNullable<Required<Full>[Key]>, TsRecurse<Depth>>
+                              >
+                            | boolean;
               }>;
 
 export function selectFrom<

diff --git a/packages/docker/package.json b/packages/docker/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/docker",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/docker",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -22,8 +22,8 @@
         "test:coverage": "npm test"
     },
     "dependencies": {
-        "@augment-vir/common": "^29.1.8",
-        "@augment-vir/node-js": "^29.1.8"
+        "@augment-vir/common": "^29.1.9",
+        "@augment-vir/node-js": "^29.1.9"
     },
     "devDependencies": {
         "typescript": "5.5.2"

diff --git a/packages/node-js/package.json b/packages/node-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/node-js",
-    "version": "29.1.8",
+    "version": "29.1.9",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/node-js",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"
@@ -22,7 +22,7 @@
         "test:coverage": "npm test coverage"
     },
     "dependencies": {
-        "@augment-vir/common": "^29.1.8",
+        "@augment-vir/common": "^29.1.9",
         "ansi-colors": "^4.1.3",
         "axios": "^1.7.2",
         "fs-extra": "^11.2.0",
@@ -31,7 +31,7 @@
         "type-fest": "^4.20.1"
     },
     "devDependencies": {
-        "@augment-vir/chai": "^29.1.8",
+        "@augment-vir/chai": "^29.1.9",
         "@electrovir/nyc": "^15.1.0-fix0",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
         "@types/chai": "^4.3.16",