Skip to content

Support function type as the default schema option #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support function type as the default schema option #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91ea2e
feat: support function as default schema option
unpin Aug 22, 2022
f7d0ec4
chore: replace string with propertyName variable
unpin Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,11 @@ class Query {
propertyOptions: optionsObject
) {
if (!Object.prototype.hasOwnProperty.call(queryObject, propertyName)) {
queryObject[propertyName] = propertyOptions.default;
if (typeof propertyOptions.default === 'function') {
queryObject[propertyName] = propertyOptions.default();
} else {
queryObject[propertyName] = propertyOptions.default;
}
}
return true;
}
Expand Down
13 changes: 13 additions & 0 deletions tests/test_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ describe('test Query methods', () => {
required: false,
default: null,
},
createdAt: {
type: 'date',
required: false,
default: () => new Date()
}
};

const collectionName = 'testCollection';
Expand Down Expand Up @@ -101,6 +106,14 @@ describe('test Query methods', () => {
assertStrictEquals(queryObject[propertyName], null);
});

it('will set property value in queryObject by calling default if it is a function', () => {
queryObject = { name: 'Mr. D' };
propertyName = 'createdAt'
propertyOptions = testSchema.schemaMap[propertyName];
query.setDefault(queryObject, propertyName, propertyOptions);
assertInstanceOf(queryObject[propertyName], Date);
})

it('will not assign a default value to a property in queryObject if it already has an assigned value', () => {
queryObject = { name: 'Mr. D', occupation: 'baker' };
query.setDefault(queryObject, propertyName, propertyOptions);
Expand Down