From b74424b0fbbf05c68b3e5e4cb418f2296a1cdcf0 Mon Sep 17 00:00:00 2001 From: electrovir Date: Sat, 22 Jun 2024 18:09:39 +0000 Subject: [PATCH] [patch] remove useless collapse input to selectCollapsedFrom --- package-lock.json | 24 +++++++++---------- package.json | 2 +- packages/browser-testing/package.json | 6 ++--- packages/browser/package.json | 6 ++--- packages/chai/package.json | 6 ++--- packages/common-tests/package.json | 8 +++---- .../src/tests/object/selection-set.test.ts | 13 +++++----- packages/common/package.json | 2 +- .../src/augments/object/selection-set.ts | 10 ++++---- packages/docker/package.json | 6 ++--- packages/node-js/package.json | 6 ++--- packages/prisma-node-js/package.json | 6 ++--- packages/scripts/package.json | 6 ++--- packages/testing/package.json | 4 ++-- 14 files changed, 51 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6174c26b..ddc98544 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "augment-vir", - "version": "29.1.1", + "version": "29.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "augment-vir", - "version": "29.1.1", + "version": "29.1.2", "license": "(MIT or CC0 1.0)", "workspaces": [ "./packages/*" @@ -16521,7 +16521,7 @@ }, "packages/browser": { "name": "@augment-vir/browser", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16548,7 +16548,7 @@ }, "packages/browser-testing": { "name": "@augment-vir/browser-testing", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16594,7 +16594,7 @@ }, "packages/chai": { "name": "@augment-vir/chai", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16622,7 +16622,7 @@ }, "packages/common": { "name": "@augment-vir/common", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "browser-or-node": "^3.0.0", @@ -16635,7 +16635,7 @@ }, "packages/common-tests": { "name": "@augment-vir/common-tests", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "devDependencies": { "@augment-vir/chai": "^29.1.1", @@ -16682,7 +16682,7 @@ }, "packages/docker": { "name": "@augment-vir/docker", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16694,7 +16694,7 @@ }, "packages/node-js": { "name": "@augment-vir/node-js", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16735,7 +16735,7 @@ }, "packages/prisma-node-js": { "name": "@augment-vir/prisma-node-js", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16761,7 +16761,7 @@ }, "packages/scripts": { "name": "@augment-vir/scripts", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", @@ -16797,7 +16797,7 @@ }, "packages/testing": { "name": "@augment-vir/testing", - "version": "29.1.1", + "version": "29.1.2", "license": "MIT", "dependencies": { "@augment-vir/common": "^29.1.1", diff --git a/package.json b/package.json index 9ebc29aa..a7a07901 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "augment-vir", - "version": "29.1.1", + "version": "29.1.2", "private": true, "homepage": "https://github.com/electrovir/augment-vir", "bugs": { diff --git a/packages/browser-testing/package.json b/packages/browser-testing/package.json index 77d0c8b8..0ff3662d 100644 --- a/packages/browser-testing/package.json +++ b/packages/browser-testing/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/browser-testing", - "version": "29.1.1", + "version": "29.1.2", "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.1", - "@augment-vir/testing": "^29.1.1", + "@augment-vir/common": "^29.1.2", + "@augment-vir/testing": "^29.1.2", "@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 index abc571fb..db62afc4 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/browser", - "version": "29.1.1", + "version": "29.1.2", "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.1", + "@augment-vir/common": "^29.1.2", "html-spec-tags": "^2.2.0", "run-time-assertions": "^1.5.1" }, "devDependencies": { - "@augment-vir/browser-testing": "^29.1.1", + "@augment-vir/browser-testing": "^29.1.2", "@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 index da26a1d1..2a39180e 100644 --- a/packages/chai/package.json +++ b/packages/chai/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/chai", - "version": "29.1.1", + "version": "29.1.2", "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.1", - "@augment-vir/testing": "^29.1.1", + "@augment-vir/common": "^29.1.2", + "@augment-vir/testing": "^29.1.2", "type-fest": "^4.20.1" }, "devDependencies": { diff --git a/packages/common-tests/package.json b/packages/common-tests/package.json index 7c5ba607..bc6a15d0 100644 --- a/packages/common-tests/package.json +++ b/packages/common-tests/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/common-tests", - "version": "29.1.1", + "version": "29.1.2", "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.1", - "@augment-vir/common": "^29.1.1", - "@augment-vir/node-js": "^29.1.1", + "@augment-vir/chai": "^29.1.2", + "@augment-vir/common": "^29.1.2", + "@augment-vir/node-js": "^29.1.2", "@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 index 2028ba3e..6a02dbb7 100644 --- a/packages/common-tests/src/tests/object/selection-set.test.ts +++ b/packages/common-tests/src/tests/object/selection-set.test.ts @@ -1,8 +1,8 @@ import {itCases} from '@augment-vir/chai'; import { AnyObject, - FirstSelectedValue, GenericSelectionSet, + PickCollapsedSelection, PickSelection, SelectionSet, selectCollapsedFrom, @@ -33,7 +33,7 @@ describe('GenericSelectionSet', () => { }); describe(selectCollapsedFrom.name, () => { - itCases(selectCollapsedFrom, [ + itCases(selectCollapsedFrom, [ { it: 'collapses a selection', inputs: [ @@ -70,7 +70,6 @@ describe(selectCollapsedFrom.name, () => { }, }, }, - true, ], expect: [ 3, @@ -475,10 +474,10 @@ describe('PickSelection', () => { }); }); -describe('FirstSelectedValue', () => { +describe('PickCollapsedSelection', () => { it('collapses selection', () => { assertTypeOf< - FirstSelectedValue< + PickCollapsedSelection< { hi: string; bye: number; @@ -514,7 +513,7 @@ describe('FirstSelectedValue', () => { }); it('collapses to a primitive', () => { assertTypeOf< - FirstSelectedValue< + PickCollapsedSelection< { hi: string; bye: number; @@ -548,7 +547,7 @@ describe('FirstSelectedValue', () => { }); it('preserves selections with multiple branches', () => { assertTypeOf< - FirstSelectedValue< + PickCollapsedSelection< { hi: string; bye: number; diff --git a/packages/common/package.json b/packages/common/package.json index 17686d0e..2e7d0b06 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/common", - "version": "29.1.1", + "version": "29.1.2", "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 index 43804791..8dea5a80 100644 --- a/packages/common/src/augments/object/selection-set.ts +++ b/packages/common/src/augments/object/selection-set.ts @@ -58,7 +58,7 @@ export type PickSelection< * 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 FirstSelectedValue< +export type PickCollapsedSelection< Full extends Readonly, Selection extends GenericSelectionSet, Depth extends TsRecursionTracker = TsRecursionStart, @@ -66,7 +66,7 @@ export type FirstSelectedValue< ? 'Error: recursive object depth is too deep.' : KeyCount> extends 1 ? Selection[keyof PickSelection] extends GenericSelectionSet - ? FirstSelectedValue< + ? PickCollapsedSelection< Full[keyof PickSelection], Selection[keyof PickSelection], TsRecurse @@ -128,15 +128,13 @@ export function selectFrom< export function selectCollapsedFrom< Full extends AnyObject, const Selection extends SelectionSet>, - const Collapse extends boolean | undefined, >( originalObject: Readonly, selectionSet: Readonly, - collapse?: Collapse, -): FirstSelectedValue { +): PickCollapsedSelection { const selected = selectFrom(originalObject, selectionSet); - return collapseObject(selected) as FirstSelectedValue; + return collapseObject(selected) as PickCollapsedSelection; } function collapseObject(input: AnyObject): AnyObject { diff --git a/packages/docker/package.json b/packages/docker/package.json index eb1f36c4..7758b796 100644 --- a/packages/docker/package.json +++ b/packages/docker/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/docker", - "version": "29.1.1", + "version": "29.1.2", "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.1", - "@augment-vir/node-js": "^29.1.1" + "@augment-vir/common": "^29.1.2", + "@augment-vir/node-js": "^29.1.2" }, "devDependencies": { "typescript": "5.5.2" diff --git a/packages/node-js/package.json b/packages/node-js/package.json index d69e568e..20f1ae81 100644 --- a/packages/node-js/package.json +++ b/packages/node-js/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/node-js", - "version": "29.1.1", + "version": "29.1.2", "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.1", + "@augment-vir/common": "^29.1.2", "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.1", + "@augment-vir/chai": "^29.1.2", "@electrovir/nyc": "^15.1.0-fix0", "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/chai": "^4.3.16", diff --git a/packages/prisma-node-js/package.json b/packages/prisma-node-js/package.json index e927453f..756530a9 100644 --- a/packages/prisma-node-js/package.json +++ b/packages/prisma-node-js/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/prisma-node-js", - "version": "29.1.1", + "version": "29.1.2", "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/prisma-node-js", "bugs": { "url": "https://github.com/electrovir/augment-vir/issues" @@ -22,8 +22,8 @@ "test:coverage": "npm test" }, "dependencies": { - "@augment-vir/common": "^29.1.1", - "@augment-vir/node-js": "^29.1.1", + "@augment-vir/common": "^29.1.2", + "@augment-vir/node-js": "^29.1.2", "type-fest": "^4.20.1" }, "devDependencies": { diff --git a/packages/scripts/package.json b/packages/scripts/package.json index aa6bf8df..ce096678 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/scripts", - "version": "29.1.1", + "version": "29.1.2", "private": true, "license": "MIT", "author": { @@ -14,8 +14,8 @@ "verify": "ts-node src/index.ts" }, "dependencies": { - "@augment-vir/common": "^29.1.1", - "@augment-vir/node-js": "^29.1.1" + "@augment-vir/common": "^29.1.2", + "@augment-vir/node-js": "^29.1.2" }, "devDependencies": { "@electrovir/nyc": "^15.1.0-fix0", diff --git a/packages/testing/package.json b/packages/testing/package.json index 8cd9f0c0..90e14371 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@augment-vir/testing", - "version": "29.1.1", + "version": "29.1.2", "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/testing", "bugs": { "url": "https://github.com/electrovir/augment-vir/issues" @@ -23,7 +23,7 @@ "test:coverage": "npm test coverage" }, "dependencies": { - "@augment-vir/common": "^29.1.1", + "@augment-vir/common": "^29.1.2", "expect-type": "^0.15.0", "type-fest": "^4.20.1" },