@smartive/graphql-magic 23.11.0 → 23.12.0-next.1

package/src/resolvers/resolvers.ts

@@ -1,8 +1,39 @@
+import { GraphQLScalarType, Kind } from 'graphql';
 import { Models } from '../models/models';
 import { and, isCreatable, isRootModel, isUpdatable, merge, not, typeToField } from '../models/utils';
 import { mutationResolver } from './mutations';
 import { queryResolver } from './resolver';
 
+const normalizeTimeToHHmmForSerialize = (value: unknown): string => {
+  if (typeof value !== 'string') {
+    throw new Error(`Time must be a string in HH:mm format. Received: ${typeof value}`);
+  }
+
+  // Postgres `time` columns may serialize to `HH:mm:ss`.
+  // Be permissive here and just extract the leading `HH:mm`.
+  const match = value.match(/^(\d{2}:\d{2})/);
+  if (!match) {
+    throw new Error(`Invalid Time value "${value}". Expected HH:mm.`);
+  }
+
+  return match[1];
+};
+
+const normalizeTimeToHHmmForParse = (value: unknown): string => {
+  if (typeof value !== 'string') {
+    throw new Error(`Time must be a string in HH:mm format. Received: ${typeof value}`);
+  }
+
+  // For input, we only accept time-without-timezone values.
+  // Accept `HH:mm` and `HH:mm:ss[.fraction]`, but explicitly reject `Z` and `+/-HH:mm`.
+  const match = value.match(/^(\d{2}):(\d{2})(?::\d{2}(?:\.\d+)?)?$/);
+  if (!match) {
+    throw new Error(`Invalid Time value "${value}". Expected HH:mm.`);
+  }
+
+  return `${match[1]}:${match[2]}`;
+};
+
 export const getResolvers = (models: Models) => {
   const resolvers: Record<string, any> = {
     Query: merge([
@@ -25,6 +56,19 @@ export const getResolvers = (models: Models) => {
           [`${model.pluralField}_AGGREGATE`]: queryResolver,
         })),
     ]),
+    Time: new GraphQLScalarType({
+      name: 'Time',
+      description: 'Time without date and timezone (HH:mm)',
+      serialize: (value) => (value == null ? value : normalizeTimeToHHmmForSerialize(value)),
+      parseValue: (value) => normalizeTimeToHHmmForParse(value),
+      parseLiteral: (ast) => {
+        if (ast.kind !== Kind.STRING) {
+          throw new Error(`Invalid literal for Time scalar. Expected STRING, got ${ast.kind}.`);
+        }
+
+        return normalizeTimeToHHmmForParse(ast.value);
+      },
+    }),
   };
   const mutations = [
     ...models.entities.filter(and(not(isRootModel), isCreatable)).map((model) => ({

package/tests/api/__snapshots__/query.spec.ts.snap

@@ -54,6 +54,7 @@ exports[`query can be executed 1`] = `
       },
       "field": null,
       "id": "fc4e013e-4cb0-4ef8-9f2e-3d475bdf2b90",
+      "time": "09:15",
       "xyz": 2,
     },
     {
@@ -68,6 +69,7 @@ exports[`query can be executed 1`] = `
       },
       "field": "Some value",
       "id": "604ab55d-ec3e-4857-9f27-219158f80e64",
+      "time": "14:30",
       "xyz": 1,
     },
   ],
@@ -333,3 +335,20 @@ exports[`query processes reverseFilters correctly 1`] = `
   ],
 }
 `;
+
+exports[`query returns Time values for SomeObject 1`] = `
+{
+  "manyObjects": [
+    {
+      "id": "fc4e013e-4cb0-4ef8-9f2e-3d475bdf2b90",
+      "time": "09:15",
+      "xyz": 2,
+    },
+    {
+      "id": "604ab55d-ec3e-4857-9f27-219158f80e64",
+      "time": "14:30",
+      "xyz": 1,
+    },
+  ],
+}
+`;

package/tests/api/query.spec.ts

@@ -12,6 +12,7 @@ describe('query', () => {
               id
               field
               xyz
+              time
               another {
                 id
                 manyObjects(where: { id: "${SOME_ID}" }) {
@@ -26,6 +27,22 @@ describe('query', () => {
     });
   });
 
+  it('returns Time values for SomeObject', async () => {
+    await withServer(async (request) => {
+      expect(
+        await request(gql`
+          query GetTimes {
+            manyObjects(where: { another: { id: "${ANOTHER_ID}" } }, orderBy: [{ xyz: DESC }]) {
+              id
+              xyz
+              time
+            }
+          }
+        `),
+      ).toMatchSnapshot();
+    });
+  });
+
   it('processes reverseFilters correctly', async () => {
     await withServer(async (request) => {
       expect(

package/tests/unit/__snapshots__/resolve.spec.ts.snap

@@ -39,5 +39,6 @@ exports[`resolvers are generated correctly 1`] = `
   "Reaction": {
     "__resolveType": [Function],
   },
+  "Time": "Time",
 }
 `;

package/tests/utils/database/seed.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { pick } from 'lodash';
 import { getColumnName, isInTable, modelNeedsTable } from '../../../src';
-import { SeedData } from '../../generated/db';
 import { models } from '../models';
 
 export const ADMIN_ID = '04e45b48-04cf-4b38-bb25-b9af5ae0b2c4';
@@ -16,7 +15,7 @@ export const QUESTION_ID = '3d0f3254-282f-4f1f-95e3-c1f699f3c1e5';
 export const ANSWER_ID = 'f2d7b3f1-8ea1-4c2c-91ec-024432da1b0d';
 export const REVIEW_ID = '817c55de-2f77-4159-bd44-9837d868f889';
 
-export const seed: SeedData = {
+export const seed = {
   User: [
     {
       id: ADMIN_ID,
@@ -42,6 +41,7 @@ export const seed: SeedData = {
       float: 0,
       list: ['A'],
       xyz: 1,
+      time: '14:30',
     },
     {
       id: SOME_ID_2,
@@ -50,6 +50,7 @@ export const seed: SeedData = {
       float: 0.5,
       list: ['B'],
       xyz: 2,
+      time: '09:15',
     },
     {
       id: SOME_ID_3,
@@ -57,6 +58,7 @@ export const seed: SeedData = {
       float: 0.5,
       list: ['B'],
       xyz: 2,
+      time: '23:45',
     },
     {
       id: SOME_ID_4,
@@ -64,6 +66,7 @@ export const seed: SeedData = {
       float: 0.5,
       list: ['B'],
       xyz: 2,
+      time: '00:05',
     },
   ],
   Question: [

package/tests/utils/models.ts

@@ -107,6 +107,12 @@ const modelDefinitions: ModelDefinitions = [
         orderable: true,
         filterable: true,
       },
+      {
+        name: 'time',
+        type: 'Time',
+        creatable: true,
+        updatable: true,
+      },
     ],
   },
   {