8000 post-rebase fixup · angular/angular@643e092 · GitHub
[go: up one dir, main page]
Skip to content

Commit 643e092

Browse files
mmalerbammalerba
committed
post-rebase fixup
1 parent 9d48da3 commit 643e092

20 files changed

+50
-82
lines changed

‎packages/forms/experimental/src/api/standard_schema.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ export function validateStandardSchema<T>(
1414
return computed(() => schema['~standard'].validate(value()));
1515
});
1616

17-
validateTree(path, ({data, resolve}) => {
17+
validateTree(path, ({state, fieldOf}) => {
1818
// Skip sync validation if the result is a Promise.
19-
const result = data(schemaResult)();
19+
const result = state.data(schemaResult)!();
2020
if (isPromise(result)) {
2121
return [];
2222
}
2323
return (
24-
result.issues?.map((issue) => standardIssueToFormTreeError(false, resolve(path), issue)) ?? []
24+
result.issues?.map((issue) => standardIssueToFormTreeError(false, fieldOf(path), issue)) ?? []
2525
);
2626
});
2727

2828
validateAsync(path, {
29-
request: ({data}) => {
29+
params: ({state}) => {
3030
// Skip async validation if the result is *not* a Promise.
31-
const result = data(schemaResult)();
31+
const result = state.data(schemaResult)!();
3232
return isPromise(result) ? result : undefined;
3333
},
34-
factory: (request) => {
34+
factory: (params) => {
3535
return resource({
36-
request,
37-
loader: async ({request}) => (await request)?.issues ?? [],
36+
params,
37+
loader: async ({params}) => (await params)?.issues ?? [],
3838
});
3939
},
40-
error: (issues, {resolve}) => {
41-
return issues.map((issue) => standardIssueToFormTreeError(true, resolve(path), issue));
40+
errors: (issues, {fieldOf}) => {
41+
return issues.map((issue) => standardIssueToFormTreeError(true, fieldOf(path), issue));
4242
},
4343
});
4444
}
@@ -54,7 +54,6 @@ export function standardIssueToFormTreeError(
5454
target = target[pathKey] as Field<Record<PropertyKey, unknown>>;
5555
}
5656
return {
57-
async, // TODO: remove; for testing only
5857
kind: '~standard',
5958
field: target,
6059
issue,

‎packages/forms/experimental/test/BUILD.bazel

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎packages/forms/experimental/test/node/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ts_library(
77
# Visible to //:saucelabs_unit_tests_poc target
88
visibility = ["//:__pkg__"],
99
deps = [
10+
"//packages/common/http",
11+
"//packages/common/http/testing",
1012
"//packages/core",
1113
"//packages/core/testing",
1214
"//packages/forms",

‎packages/forms/experimental/test/api/validators/email.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/email.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {form, email} from '../../../public_api';
11+
import {email, form} from '../../../../public_api';
1212

1313
describe('email validator', () => {
1414
it('returns requiredTrue error when the value is false', () => {

‎packages/forms/experimental/test/api/validators/max.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/max.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {MAX, form, max} from '../../../public_api';
11+
import {MAX, form, max} from '../../../../public_api';
1212

1313
describe('max validator', () => {
1414
it('returns max error when the value is larger', () => {

‎packages/forms/experimental/test/api/validators/max_length.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/max_length.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {MAX_LENGTH, form, maxLength} from '../../../public_api';
11+
import {MAX_LENGTH, form, maxLength} from '../../../../public_api';
1212

1313
describe('maxLength validator', () => {
1414
it('returns maxLength error when the length is larger for strings', () => {

‎packages/forms/experimental/test/api/validators/min.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/min.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {MIN, form, min} from '../../../public_api';
11+
import {MIN, form, min} from '../../../../public_api';
1212

1313
describe('min validator', () => {
1414
it('returns min error when the value is smaller', () => {

‎packages/forms/experimental/test/api/validators/min_length.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/min_length.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {MIN_LENGTH, form, minLength} from '../../../public_api';
11+
import {MIN_LENGTH, form, minLength} from '../../../../public_api';
1212

1313
describe('minLength validator', () => {
1414
it('returns minLength error when the length is smaller for strings', () => {

‎packages/forms/experimental/test/api/validators/pattern.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/pattern.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {PATTERN, form, pattern} from '../../../public_api';
11+
import {PATTERN, form, pattern} from '../../../../public_api';
1212

1313
describe('pattern validator', () => {
1414
it('validates whether a value matches the string pattern', () => {

‎packages/forms/experimental/test/api/validators/required.spec.ts renamed to ‎packages/forms/experimental/test/node/api/validators/required.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Injector, signal} from '@angular/core';
1010
import {TestBed} from '@angular/core/testing';
11-
import {form, required} from '../../../public_api';
11+
import {form, required} from '../../../../public_api';
1212

1313
describe('required validator', () => {
1414
it('returns required Error when the value is not present', () => {

0 commit comments

Comments
 (0)
0