Skip to content

Commit

Permalink
[patch] remove useless collapse input to selectCollapsedFrom
Browse files Browse the repository at this point in the history
  • Loading branch information
@electrovir
electrovir committed Jun 22, 2024
1 parent c825a7c commit b74424b
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 54 deletions.
24 changes: 12 additions & 12 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/browser-testing/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/browser/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/chai/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions packages/common-tests/package.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
13 changes: 6 additions & 7 deletions packages/common-tests/src/tests/object/selection-set.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {itCases} from '@augment-vir/chai';
import {
AnyObject,
FirstSelectedValue,
GenericSelectionSet,
PickCollapsedSelection,
PickSelection,
SelectionSet,
selectCollapsedFrom,
Expand Down Expand Up @@ -33,7 +33,7 @@ describe('GenericSelectionSet', () => {
});

describe(selectCollapsedFrom.name, () => {
itCases(selectCollapsedFrom, [
itCases(selectCollapsedFrom<any, any>, [
{
it: 'collapses a selection',
inputs: [
Expand Down Expand Up @@ -70,7 +70,6 @@ describe(selectCollapsedFrom.name, () => {
},
},
},
true,
],
expect: [
3,
Expand Down Expand Up @@ -475,10 +474,10 @@ describe('PickSelection', () => {
});
});

describe('FirstSelectedValue', () => {
describe('PickCollapsedSelection', () => {
it('collapses selection', () => {
assertTypeOf<
FirstSelectedValue<
PickCollapsedSelection<
{
hi: string;
bye: number;
Expand Down Expand Up @@ -514,7 +513,7 @@ describe('FirstSelectedValue', () => {
});
it('collapses to a primitive', () => {
assertTypeOf<
FirstSelectedValue<
PickCollapsedSelection<
{
hi: string;
bye: number;
Expand Down Expand Up @@ -548,7 +547,7 @@ describe('FirstSelectedValue', () => {
});
it('preserves selections with multiple branches', () => {
assertTypeOf<
FirstSelectedValue<
PickCollapsedSelection<
{
hi: string;
bye: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 4 additions & 6 deletions packages/common/src/augments/object/selection-set.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ 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<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
? FirstSelectedValue<
? PickCollapsedSelection<
Full[keyof PickSelection<Full, Selection, Depth>],
Selection[keyof PickSelection<Full, Selection, Depth>],
TsRecurse<Depth>
Expand Down Expand Up @@ -128,15 +128,13 @@ export function selectFrom<
export function selectCollapsedFrom<
Full extends AnyObject,
const Selection extends SelectionSet<NoInfer<Full>>,
const Collapse extends boolean | undefined,
>(
originalObject: Readonly<Full>,
selectionSet: Readonly<Selection>,
collapse?: Collapse,
): FirstSelectedValue<Full, Selection> {
): PickCollapsedSelection<Full, Selection> {
const selected = selectFrom(originalObject, selectionSet);

return collapseObject(selected) as FirstSelectedValue<Full, Selection>;
return collapseObject(selected) as PickCollapsedSelection<Full, Selection>;
}

function collapseObject(input: AnyObject): AnyObject {
Expand Down
6 changes: 3 additions & 3 deletions packages/docker/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packages/node-js/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/prisma-node-js/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/scripts/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@augment-vir/scripts",
"version": "29.1.1",
"version": "29.1.2",
"private": true,
"license": "MIT",
"author": {
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/package.json
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
},
Expand Down

0 comments on commit b74424b

Please sign in to comment.