Skip to content

Commit d30853b

Browse files
committed
chore: remove generics
1 parent 574d8e7 commit d30853b

File tree

7 files changed

+25
-13
lines changed

7 files changed

+25
-13
lines changed

packages/odata-common/src/selectable/edm-type-field.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ export class EdmTypeField<
4949
DeSerializersT extends DeSerializers,
5050
EdmT extends EdmTypeShared<'any'>,
5151
NullableT extends boolean = false,
52-
SelectableT extends boolean = false,
53-
PrecisionT extends number = 0
52+
SelectableT extends boolean = false
5453
>
5554
extends Field<EntityT, NullableT, SelectableT>
5655
implements EntityIdentifiable<EntityT, DeSerializersT>
@@ -64,14 +63,15 @@ export class EdmTypeField<
6463
* @param edmType - Type of the field according to the metadata description.
6564
* @param _deSerializers - (De-)serializers used for transformation.
6665
* @param fieldOptions - Optional settings for this field.
66+
* @param precision - Optional precision provided for this field.
6767
*/
6868
constructor(
6969
fieldName: string,
7070
readonly _fieldOf: ConstructorOrField<EntityT>,
7171
readonly edmType: EdmT,
7272
public _deSerializers: DeSerializersT, // Only necessary for the type, unused otherwise
7373
fieldOptions?: FieldOptions<NullableT, SelectableT>,
74-
precision?: PrecisionT
74+
precision?: number
7575
) {
7676
super(fieldName, getEntityConstructor(_fieldOf), fieldOptions, precision);
7777
}

packages/odata-common/src/selectable/field-builder.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ export class FieldBuilder<
110110
* @param fieldName - Name of the field.
111111
* @param edmType - EDM type of the field.
112112
* @param isNullable - Whether the field is nullable.
113+
* @param precision - Precision provided for the field.
113114
* @returns An EDM type field.
114115
*/
115116
buildEdmTypeField<
@@ -143,10 +144,17 @@ export class FieldBuilder<
143144
isOrderableEdmType(edmType) ? OrderableEdmTypeField : EdmTypeField
144145
) as typeof EdmTypeField;
145146

146-
return new ctor(fieldName, this.fieldOf, edmType, this.deSerializers, {
147-
isNullable,
148-
isSelectable
149-
}, precision);
147+
return new ctor(
148+
fieldName,
149+
this.fieldOf,
150+
edmType,
151+
this.deSerializers,
152+
{
153+
isNullable,
154+
isSelectable
155+
},
156+
precision
157+
);
150158
}
151159

152160
/**

packages/odata-common/src/selectable/field.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export class Field<
6464
* @param _fieldName - Actual name of the field used in the OData request.
6565
* @param _entityConstructor - Constructor type of the entity the field belongs to.
6666
* @param fieldOptions - Optional settings for this field.
67+
* @param precision - Optional precision provided for this field.
6768
*/
6869
constructor(
6970
readonly _fieldName: string,

packages/odata-common/src/selectable/orderable-edm-type-field.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ export class OrderableEdmTypeField<
1717
DeSerializersT extends DeSerializers,
1818
EdmT extends EdmTypeShared<'any'>,
1919
NullableT extends boolean = false,
20-
SelectableT extends boolean = false,
21-
PrecisionT extends number = 0,
22-
> extends EdmTypeField<EntityT, DeSerializersT, EdmT, NullableT, SelectableT, PrecisionT> {
20+
SelectableT extends boolean = false
21+
> extends EdmTypeField<EntityT, DeSerializersT, EdmT, NullableT, SelectableT> {
2322
/**
2423
* Creates an instance of Filter for this field and the given value using the operator 'gt', i.e. `>`.
2524
* @param value - Value to be used in the filter.

packages/odata-v4/src/de-serializers/converters.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ export function deserializeDateTimeOffsetToMoment(
4242
/**
4343
* @internal
4444
*/
45-
export function serializeToDateTimeOffset(value: moment.Moment, precision: number): string {
45+
export function serializeToDateTimeOffset(
46+
value: moment.Moment,
47+
precision?: number
48+
): string {
49+
console.log('Precision being logged in the serialiser', precision);
4650
return value.utc().format('YYYY-MM-DDTHH:mm:ss.SSS') + 'Z';
4751
}
4852

packages/odata-v4/src/request-builder/update-request-builder.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function createTestEntity() {
2020
.keyPropertyString(keyPropString)
2121
.keyDateProperty(keyPropDate)
2222
.int32Property(int32Prop)
23+
.dateTimeOffSetProperty(keyPropDate)
2324
.build();
2425
}
2526

test-packages/test-services-odata-v4/test-service/TestEntityApi.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ export class TestEntityApi<
239239
DeSerializersT,
240240
'Edm.DateTimeOffset',
241241
true,
242-
true,
243-
2
242+
true
244243
>;
245244
DURATION_PROPERTY: OrderableEdmTypeField<
246245
TestEntity<DeSerializers>,

0 commit comments

Comments
 (0)