Skip to content
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

Jump to bottom

always serialize date as only date, stripping time #2176

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

always serialize date as only date, stripping time #2176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e206a8a
always serialize date as only date, stripping time
ucarbehlul Nov 13, 2023
50a0fc3
increment version
ucarbehlul Nov 13, 2023
4bef984
fix type issue
ucarbehlul Nov 13, 2023
d13f984
accept datetime as date too, using only the date parts
ucarbehlul Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-scalars",
"version": "1.22.4",
"version": "1.22.5",
"type": "module",
"description": "A collection of scalar types not included in base GraphQL.",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions src/scalars/iso-date/Date.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { GraphQLScalarType, Kind } from 'graphql';
import type { GraphQLScalarTypeConfig } from 'graphql';
import { createGraphQLError } from '../../error.js';
import { parseDate, serializeDate } from './formatter.js';
import { validateDate, validateJSDate } from './validator.js';
import { validateDate, validateDateTime, validateJSDate } from './validator.js';

export const GraphQLDateConfig: GraphQLScalarTypeConfig<Date, string> = /*#__PURE__*/ {
name: 'Date',
Expand All @@ -26,8 +26,8 @@ export const GraphQLDateConfig: GraphQLScalarTypeConfig<Date, string> = /*#__PUR
}
throw createGraphQLError('Date cannot represent an invalid Date instance');
} else if (typeof value === 'string') {
if (validateDate(value)) {
return value;
if (validateDate(value) || validateDateTime(value)) {
return serializeDate(new Date(value));
}
throw createGraphQLError(`Date cannot represent an invalid date-string ${value}.`);
} else {
Expand Down