Skip to content

Commit

Permalink
- Updated to use pristine-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
@etiennenoel
etiennenoel committed Feb 2, 2024
1 parent b1740cc commit a1c563c
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 32 deletions.
14 changes: 7 additions & 7 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
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@aws-sdk/client-dynamodb": "^3.10.0",
"@pristine-ts/metadata": "^1.0.6",
"@pristine-ts/metadata": "^1.0.7",
"reflect-metadata": "^0.1.13"
},
"peerDependencies": {
Expand Down
44 changes: 22 additions & 22 deletions packages/dynamodb-data-mapper-annotations/src/attribute.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe('attribute', () => {
decorator(target, 'property');

const reflectionCalls = (Reflect.getMetadata as any).mock.calls;
expect(reflectionCalls.length).toBe(1);
expect(reflectionCalls.length).toBe(2);
expect(reflectionCalls[0][0]).toBe(METADATA_TYPE_KEY);
expect(reflectionCalls[0][1]).toBe(target);
expect(reflectionCalls[0][2]).toBe('property');
Expand All @@ -153,7 +153,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of String as a string`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => String);
(Reflect.getMetadata as any).mockImplementationOnce(() => String);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -167,7 +167,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of Number as a number`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => Number);
(Reflect.getMetadata as any).mockImplementationOnce(() => Number);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -181,7 +181,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of Boolean as a boolean`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => Boolean);
(Reflect.getMetadata as any).mockImplementationOnce(() => Boolean);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -195,7 +195,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of Date as a date`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => Date);
(Reflect.getMetadata as any).mockImplementationOnce(() => Date);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -210,7 +210,7 @@ describe('attribute', () => {
`should recognize values with a constructor that subclasses Date as a date`,
() => {
class MyDate extends Date {}
(Reflect.getMetadata as any).mockImplementation(() => MyDate);
(Reflect.getMetadata as any).mockImplementationOnce(() => MyDate);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -224,7 +224,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of BinarySet as a set of binary values`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => BinarySet);
(Reflect.getMetadata as any).mockImplementationOnce(() => BinarySet);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -239,7 +239,7 @@ describe('attribute', () => {
`should recognize values with a constructor that subclasses BinarySet as a set of binary values`,
() => {
class MyBinarySet extends BinarySet {}
(Reflect.getMetadata as any).mockImplementation(() => MyBinarySet);
(Reflect.getMetadata as any).mockImplementationOnce(() => MyBinarySet);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -253,7 +253,7 @@ describe('attribute', () => {
it(
`should recognize values with a constructor of NumberValueSet as a set of number values`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => NumberValueSet);
(Reflect.getMetadata as any).mockImplementationOnce(() => NumberValueSet);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -268,7 +268,7 @@ describe('attribute', () => {
`should recognize values with a constructor that subclasses NumberValueSet as a set of number values`,
() => {
class MyNumberValueSet extends NumberValueSet {}
(Reflect.getMetadata as any).mockImplementation(() => MyNumberValueSet);
(Reflect.getMetadata as any).mockImplementationOnce(() => MyNumberValueSet);

const decorator = attribute();
const target = Object.create(null);
Expand All @@ -280,7 +280,7 @@ describe('attribute', () => {
);

it(`should recognize values with a constructor of Set as a set`, () => {
(Reflect.getMetadata as any).mockImplementation(() => Set);
(Reflect.getMetadata as any).mockImplementationOnce(() => Set);

const decorator = attribute({memberType: 'String'});
const target = Object.create(null);
Expand All @@ -294,7 +294,7 @@ describe('attribute', () => {
`should recognize values with a constructor that subclasses Set as a set`,
() => {
class MySet extends Set {}
(Reflect.getMetadata as any).mockImplementation(() => MySet);
(Reflect.getMetadata as any).mockImplementationOnce(() => MySet);

const decorator = attribute({memberType: 'Number'});
const target = Object.create(null);
Expand All @@ -308,7 +308,7 @@ describe('attribute', () => {
it(
`should throw on values with a constructor of Set that lack a memberType declaration`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => Set);
(Reflect.getMetadata as any).mockImplementationOnce(() => Set);

const decorator = attribute();
expect(() => decorator({}, 'property'))
Expand All @@ -317,7 +317,7 @@ describe('attribute', () => {
);

it(`should recognize values with a constructor of Map as a map`, () => {
(Reflect.getMetadata as any).mockImplementation(() => Map);
(Reflect.getMetadata as any).mockImplementationOnce(() => Map);
const memberType: SchemaType = {
type: 'Document',
members: {},
Expand All @@ -335,7 +335,7 @@ describe('attribute', () => {
`should recognize values with a constructor that subclasses Map as a map`,
() => {
class MyMap extends Map {}
(Reflect.getMetadata as any).mockImplementation(() => MyMap);
(Reflect.getMetadata as any).mockImplementationOnce(() => MyMap);
const memberType: SchemaType = {
type: 'Tuple',
members: [
Expand All @@ -356,7 +356,7 @@ describe('attribute', () => {
it(
`should throw on values with a constructor of Map that lack a memberType declaration`,
() => {
(Reflect.getMetadata as any).mockImplementation(() => Map);
(Reflect.getMetadata as any).mockImplementationOnce(() => Map);

const decorator = attribute();
expect(() => decorator({}, 'property'))
Expand All @@ -373,7 +373,7 @@ describe('attribute', () => {
}
}

(Reflect.getMetadata as any).mockImplementation(() => Document);
(Reflect.getMetadata as any).mockImplementationOnce(() => Document);
const decorator = attribute();
const target = Object.create(null);
decorator(target, 'property');
Expand All @@ -387,7 +387,7 @@ describe('attribute', () => {
);

it('should treat arrays as collection types', () => {
(Reflect.getMetadata as any).mockImplementation(() => Array);
(Reflect.getMetadata as any).mockImplementationOnce(() => Array);
const decorator = attribute();
const target = Object.create(null);
decorator(target, 'property');
Expand All @@ -400,7 +400,7 @@ describe('attribute', () => {
it(
'should treat arrays with a declared memberType as list types',
() => {
(Reflect.getMetadata as any).mockImplementation(() => Array);
(Reflect.getMetadata as any).mockImplementationOnce(() => Array);

const memberType: SchemaType = {type: 'String'};
const decorator = attribute({memberType});
Expand All @@ -417,7 +417,7 @@ describe('attribute', () => {
it(
'should treat arrays with members as tuple types',
() => {
(Reflect.getMetadata as any).mockImplementation(() => Array);
(Reflect.getMetadata as any).mockImplementationOnce(() => Array);

const members: Array<SchemaType> = [
{type: 'Boolean'},
Expand All @@ -438,7 +438,7 @@ describe('attribute', () => {
'should constructors that descend from Array as collection types',
() => {
class MyArray extends Array {}
(Reflect.getMetadata as any).mockImplementation(() => MyArray);
(Reflect.getMetadata as any).mockImplementationOnce(() => MyArray);
const decorator = attribute();
const target = Object.create(null);
decorator(target, 'property');
Expand All @@ -452,7 +452,7 @@ describe('attribute', () => {
it(
'should treat values with an unrecognized constructor as an "Any" type',
() => {
(Reflect.getMetadata as any).mockImplementation(() => Object);
(Reflect.getMetadata as any).mockImplementationOnce(() => Object);
const decorator = attribute();
const target = Object.create(null);
decorator(target, 'property');
Expand Down
6 changes: 4 additions & 2 deletions packages/dynamodb-data-mapper-annotations/src/attribute.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ export function attribute(
parameters: Partial<SchemaType> = {}
): PropertyAnnotation {
return (target, propertyKey) => {
// Mark the property as seen for @pristine-ts/metadata to automatically register the types.
PropertyMetadata.propertySeen(target, propertyKey);


if (!Object.prototype.hasOwnProperty.call(target, DynamoDbSchema)) {
Object.defineProperty(
Expand Down Expand Up @@ -96,6 +95,9 @@ export function attribute(
}

(target as any)[DynamoDbSchema][propertyKey] = schemaType;

// Mark the property as seen for @pristine-ts/metadata to automatically register the types.
PropertyMetadata.propertySeen(target, propertyKey);
};
}

Expand Down

0 comments on commit a1c563c

Please sign in to comment.