Skip to content

Commit 3471c04

Browse files
viktorsperlingviktorsperling
committed
chore(dts-generator): review comments
1 parent ce06c95 commit 3471c04

File tree

7 files changed

+49
-49
lines changed

7 files changed

+49
-49
lines changed

‎test-packages/typed-json-model/webapp/model/model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class TypedJSONModel<Data extends object> extends JSONModel {
7171
mParameters?: object,
7272
): JSONListBinding;
7373
// Overload for relative paths
74-
bindList<Root extends AbsoluteBindingPath<Data>, Path extends RelativeListBindingPath<Data, Root>>(
74+
bindList<Path extends RelativeListBindingPath<Data, Root>, Root extends AbsoluteBindingPath<Data>>(
7575
sPath: Path,
7676
oContext: TypedJSONContext<Data, Root>,
7777
aSorters?: Sorter | Sorter[],

‎test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-inference.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ import { TypedJSONModel } from "../../model";
8282
* Check model.bindList
8383
**********************************************************************************************************************/
8484

85-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("/anArray");
86-
/** @expect ok */ ListBinding = model.bindList("/anArrayOfArrays/0");
87-
/** @expect ok */ ListBinding = model.bindList("/anObjectWithArray/anArray");
85+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("/anArray");
86+
/** @expect ok */ listBinding = model.bindList("/anArrayOfArrays/0");
87+
/** @expect ok */ listBinding = model.bindList("/anObjectWithArray/anArray");
8888

8989
// incorrect binding paths
90-
/** @expect ts2345 */ ListBinding = model.bindList("/aJsonSafeArray/0");
91-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfArrays/0/0");
92-
/** @expect ts2345 */ ListBinding = model.bindList("/anObjectWithArray/anArray/0");
93-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfPlaceholders/0");
94-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfObjects/0");
90+
/** @expect ts2345 */ listBinding = model.bindList("/aJsonSafeArray/0");
91+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfArrays/0/0");
92+
/** @expect ts2345 */ listBinding = model.bindList("/anObjectWithArray/anArray/0");
93+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfPlaceholders/0");
94+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfObjects/0");
9595

9696
// bindList always returns a JSONListBinding and cannot be assigned to other types
9797
/** @expect ts2739 */ aPlaceholder = model.bindList("/anArray");

‎test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-interface.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ import { TypedJSONModel } from "../../model";
8787
* Check model.bindList
8888
**********************************************************************************************************************/
8989

90-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("/anArray");
91-
/** @expect ok */ ListBinding = model.bindList("/anArrayOfArrays/0");
92-
/** @expect ok */ ListBinding = model.bindList("/anObjectWithArray/anArray");
90+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("/anArray");
91+
/** @expect ok */ listBinding = model.bindList("/anArrayOfArrays/0");
92+
/** @expect ok */ listBinding = model.bindList("/anObjectWithArray/anArray");
9393

9494
// incorrect binding paths
95-
/** @expect ts2345 */ ListBinding = model.bindList("/aJsonSafeArray/0");
96-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfArrays/0/0");
97-
/** @expect ts2345 */ ListBinding = model.bindList("/anObjectWithArray/anArray/0");
98-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfPlaceholders/0");
99-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfObjects/0");
95+
/** @expect ts2345 */ listBinding = model.bindList("/aJsonSafeArray/0");
96+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfArrays/0/0");
97+
/** @expect ts2345 */ listBinding = model.bindList("/anObjectWithArray/anArray/0");
98+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfPlaceholders/0");
99+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfObjects/0");
100100

101101
// bindList always returns a JSONListBinding and cannot be assigned to other types
102102
/** @expect ts2739 */ aPlaceholder = model.bindList("/anArray");

‎test-packages/typed-json-model/webapp/model/test/cases/absolute-complex-typeAlias.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ import { TypedJSONModel } from "../../model";
8787
* Check model.bindList
8888
**********************************************************************************************************************/
8989

90-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("/anArray");
91-
/** @expect ok */ ListBinding = model.bindList("/anArrayOfArrays/0");
92-
/** @expect ok */ ListBinding = model.bindList("/anObjectWithArray/anArray");
90+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("/anArray");
91+
/** @expect ok */ listBinding = model.bindList("/anArrayOfArrays/0");
92+
/** @expect ok */ listBinding = model.bindList("/anObjectWithArray/anArray");
9393

9494
// incorrect binding paths
95-
/** @expect ts2345 */ ListBinding = model.bindList("/aJsonSafeArray/0");
96-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfArrays/0/0");
97-
/** @expect ts2345 */ ListBinding = model.bindList("/anObjectWithArray/anArray/0");
98-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfPlaceholders/0");
99-
/** @expect ts2345 */ ListBinding = model.bindList("/anArrayOfObjects/0");
95+
/** @expect ts2345 */ listBinding = model.bindList("/aJsonSafeArray/0");
96+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfArrays/0/0");
97+
/** @expect ts2345 */ listBinding = model.bindList("/anObjectWithArray/anArray/0");
98+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfPlaceholders/0");
99+
/** @expect ts2345 */ listBinding = model.bindList("/anArrayOfObjects/0");
100100

101101
// bindList always returns a JSONListBinding and cannot be assigned to other types
102102
/** @expect ts2739 */ aPlaceholder = model.bindList("/anArray");

‎test-packages/typed-json-model/webapp/model/test/cases/relative-complex-inference.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ import { TypedJSONModel } from "../../model";
7373
* Check model.bindList
7474
**********************************************************************************************************************/
7575

76-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("anArray", context);
77-
/** @expect ok */ ListBinding = model.bindList("anArrayOfArrays/0", context);
78-
/** @expect ok */ ListBinding = model.bindList("anObjectWithArray/anArray", context);
76+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("anArray", context);
77+
/** @expect ok */ listBinding = model.bindList("anArrayOfArrays/0", context);
78+
/** @expect ok */ listBinding = model.bindList("anObjectWithArray/anArray", context);
7979

8080
// incorrect binding paths
81-
/** @expect ts2769 */ ListBinding = model.bindList("aJsonSafeArray/0", context);
82-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfArrays/0/0", context);
83-
/** @expect ts2769 */ ListBinding = model.bindList("anObjectWithArray/anArray/0", context);
84-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfPlaceholders/0", context);
85-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfObjects/0", context);
81+
/** @expect ts2769 */ listBinding = model.bindList("aJsonSafeArray/0", context);
82+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfArrays/0/0", context);
83+
/** @expect ts2769 */ listBinding = model.bindList("anObjectWithArray/anArray/0", context);
84+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfPlaceholders/0", context);
85+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfObjects/0", context);
8686

8787
// bindList always returns a JSONListBinding and cannot be assigned to other types
8888
/** @expect ts2739 */ aPlaceholder = model.bindList("anArray", context);

‎test-packages/typed-json-model/webapp/model/test/cases/relative-complex-interface.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ import { TypedJSONModel } from "../../model";
7373
* Check model.bindList
7474
**********************************************************************************************************************/
7575

76-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("anArray", context);
77-
/** @expect ok */ ListBinding = model.bindList("anArrayOfArrays/0", context);
78-
/** @expect ok */ ListBinding = model.bindList("anObjectWithArray/anArray", context);
76+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("anArray", context);
77+
/** @expect ok */ listBinding = model.bindList("anArrayOfArrays/0", context);
78+
/** @expect ok */ listBinding = model.bindList("anObjectWithArray/anArray", context);
7979

8080
// incorrect binding paths
81-
/** @expect ts2769 */ ListBinding = model.bindList("aJsonSafeArray/0", context);
82-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfArrays/0/0", context);
83-
/** @expect ts2769 */ ListBinding = model.bindList("anObjectWithArray/anArray/0", context);
84-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfPlaceholders/0", context);
85-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfObjects/0", context);
81+
/** @expect ts2769 */ listBinding = model.bindList("aJsonSafeArray/0", context);
82+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfArrays/0/0", context);
83+
/** @expect ts2769 */ listBinding = model.bindList("anObjectWithArray/anArray/0", context);
84+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfPlaceholders/0", context);
85+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfObjects/0", context);
8686

8787
// bindList always returns a JSONListBinding and cannot be assigned to other types
8888
/** @expect ts2739 */ aPlaceholder = model.bindList("anArray", context);

‎test-packages/typed-json-model/webapp/model/test/cases/relative-complex-typeAlias.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,16 @@ model.getProperty("/root/aPlaceholder", context);
7575
* Check model.bindList
7676
**********************************************************************************************************************/
7777

78-
/** @expect ok */ let ListBinding: JSONListBinding = model.bindList("anArray", context);
79-
/** @expect ok */ ListBinding = model.bindList("anArrayOfArrays/0", context);
80-
/** @expect ok */ ListBinding = model.bindList("anObjectWithArray/anArray", context);
78+
/** @expect ok */ let listBinding: JSONListBinding = model.bindList("anArray", context);
79+
/** @expect ok */ listBinding = model.bindList("anArrayOfArrays/0", context);
80+
/** @expect ok */ listBinding = model.bindList("anObjectWithArray/anArray", context);
8181

8282
// incorrect binding paths
83-
/** @expect ts2769 */ ListBinding = model.bindList("aJsonSafeArray/0", context);
84-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfArrays/0/0", context);
85-
/** @expect ts2769 */ ListBinding = model.bindList("anObjectWithArray/anArray/0", context);
86-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfPlaceholders/0", context);
87-
/** @expect ts2769 */ ListBinding = model.bindList("anArrayOfObjects/0", context);
83+
/** @expect ts2769 */ listBinding = model.bindList("aJsonSafeArray/0", context);
84+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfArrays/0/0", context);
85+
/** @expect ts2769 */ listBinding = model.bindList("anObjectWithArray/anArray/0", context);
86+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfPlaceholders/0", context);
87+
/** @expect ts2769 */ listBinding = model.bindList("anArrayOfObjects/0", context);
8888

8989
// bindList always returns a JSONListBinding and cannot be assigned to other types
9090
/** @expect ts2739 */ aPlaceholder = model.bindList("anArray", context);

0 commit comments

Comments
 (0)