@smartive/graphql-magic 15.4.0 → 16.0.0

package/src/schema/utils.ts

@@ -1,3 +1,4 @@
+import { Dayjs } from 'dayjs';
 import {
   ArgumentNode,
   DefinitionNode,
@@ -222,7 +223,13 @@ export const value = (val: Value = null): ValueNode =>
         kind: 'StringValue',
         value: val.toString(),
       }
-    : {
+    : val instanceof Dayjs
+    ? {
+        kind: 'StringValue',
+        value: val.toISOString(),
+      }
+    : typeof val === 'object'
+    ? {
         kind: 'ObjectValue',
         fields: Object.keys(val).map(
           (nme): ObjectFieldNode => ({
@@ -231,4 +238,9 @@ export const value = (val: Value = null): ValueNode =>
             value: value(val[nme]),
           })
         ),
-      };
+      }
+    : doThrow(`Unsupported value ${val}`);
+
+const doThrow = (message: string) => {
+  throw new Error(message);
+};

package/src/utils/dates.ts

@@ -0,0 +1,48 @@
+import { Dayjs, isDayjs } from 'dayjs';
+import { DateTime } from 'luxon';
+
+export type DateLibrary = 'luxon' | 'dayjs';
+
+export const DATE_CLASS: { [key in DateLibrary]: string } = {
+  luxon: 'DateTime',
+  dayjs: 'Dayjs',
+};
+
+export const DATE_CLASS_IMPORT = {
+  luxon: `import { DateTime } from 'luxon';`,
+  dayjs: `import { Dayjs } from 'dayjs';`,
+};
+
+export type AnyDateType = DateTime | Dayjs | Date | string;
+
+export const anyDateToLuxon = (date: unknown, zone: string | undefined, fallbackToNow = false) => {
+  if (!date) {
+    if (fallbackToNow) {
+      return DateTime.local({ zone });
+    } else {
+      return undefined;
+    }
+  }
+
+  if (DateTime.isDateTime(date)) {
+    return date.setZone(zone);
+  }
+
+  if (isDayjs(date)) {
+    return DateTime.fromISO(date.toISOString(), { zone });
+  }
+
+  if (date instanceof Date) {
+    return DateTime.fromJSDate(date, { zone });
+  }
+
+  if (typeof date === 'string' && date) {
+    return DateTime.fromISO(date, { zone });
+  }
+
+  if (typeof date === 'number') {
+    return DateTime.fromMillis(date, { zone });
+  }
+
+  throw new Error(`Unsupported date format: ${date} (${date.constructor.name})`);
+};

package/src/utils/index.ts

@@ -0,0 +1,3 @@
+// created from 'create-ts-index'
+
+export * from './dates';

package/src/values.ts

@@ -1,8 +1,4 @@
-import { DateTime } from 'luxon';
-
-export type BasicValue = undefined | null | boolean | string | number | DateTime;
-
-export type Value = any; // BasicValue | Symbol | Symbol[] | Record<string, Value> | Value[];
+export type Value = unknown;
 
 export type Values = {
   name: string;

package/tests/generated/client/index.ts

@@ -857,7 +857,7 @@ export type SomeQueryQuery = { manyObjects: Array<{ __typename: 'SomeObject', id
 export type ReverseFiltersQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type ReverseFiltersQueryQuery = { all: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, withFloat0: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, withFloat0_5: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, noneFloat0: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, noneFloat0_5: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }> };
+export type ReverseFiltersQueryQuery = { all: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, withFloat0: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, withFloat0_5: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, noneFloat0: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, noneFloat0_5: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }>, noneFloat2: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }> };
 
 export type DeleteAnotherObjectMutationMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1061,6 +1061,8 @@ export namespace ReverseFiltersQuery {
   export type ___manyObjects = NonNullable<(NonNullable<NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat0']>)[number]>['manyObjects']>)[number]>;
   export type noneFloat0_5 = NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat0_5']>)[number]>;
   export type ____manyObjects = NonNullable<(NonNullable<NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat0_5']>)[number]>['manyObjects']>)[number]>;
+  export type noneFloat2 = NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat2']>)[number]>;
+  export type _____manyObjects = NonNullable<(NonNullable<NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat2']>)[number]>['manyObjects']>)[number]>;
 }
 
 export namespace DeleteAnotherObjectMutation {

package/tests/generated/db/index.ts

@@ -35,7 +35,7 @@ export type AnotherObject = {
   'name': string | null;
   'myselfId': string | null;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
 }
 
@@ -44,7 +44,7 @@ export type AnotherObjectInitializer = {
   'name'?: string | null;
   'myselfId'?: string | null;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -53,7 +53,7 @@ export type AnotherObjectMutator = {
   'name'?: string | null;
   'myselfId'?: string | null;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -62,7 +62,7 @@ export type AnotherObjectSeed = {
   'name'?: string | null;
   'myselfId'?: string | null;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -73,12 +73,12 @@ export type SomeObject = {
   'float': number;
   'list': SomeEnum[];
   'xyz': number;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
 }
 
@@ -89,12 +89,12 @@ export type SomeObjectInitializer = {
   'float': number;
   'list': SomeEnum[] | string;
   'xyz': number;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -105,12 +105,12 @@ export type SomeObjectMutator = {
   'float'?: number;
   'list'?: SomeEnum[] | string;
   'xyz'?: number;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -121,12 +121,12 @@ export type SomeObjectSeed = {
   'float': number;
   'list': string[] | string;
   'xyz': number;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -135,12 +135,12 @@ export type Reaction = {
   'type': ReactionType;
   'parentId': string | null;
   'content': string | null;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
 }
 
@@ -149,12 +149,12 @@ export type ReactionInitializer = {
   'type': ReactionType;
   'parentId'?: string | null;
   'content'?: string | null;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -163,12 +163,12 @@ export type ReactionMutator = {
   'type'?: ReactionType;
   'parentId'?: string | null;
   'content'?: string | null;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -177,12 +177,12 @@ export type Review = {
   'type': ReactionType;
   'parentId': string | null;
   'content': string | null;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
   'rating': number | null;
 }
@@ -201,12 +201,12 @@ export type ReviewSeed = {
   'id': string;
   'parentId'?: string | null;
   'content'?: string | null;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
   'rating'?: number | null;
 }
@@ -216,12 +216,12 @@ export type Question = {
   'type': ReactionType;
   'parentId': string | null;
   'content': string | null;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
 }
 
@@ -237,12 +237,12 @@ export type QuestionSeed = {
   'id': string;
   'parentId'?: string | null;
   'content'?: string | null;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 
@@ -251,12 +251,12 @@ export type Answer = {
   'type': ReactionType;
   'parentId': string | null;
   'content': string | null;
-  'createdAt': DateTime | string;
+  'createdAt': DateTime;
   'createdById': string;
-  'updatedAt': DateTime | string;
+  'updatedAt': DateTime;
   'updatedById': string;
   'deleted': boolean;
-  'deletedAt': DateTime | string | null;
+  'deletedAt': DateTime | null;
   'deletedById': string | null;
 }
 
@@ -272,12 +272,12 @@ export type AnswerSeed = {
   'id': string;
   'parentId'?: string | null;
   'content'?: string | null;
-  'createdAt'?: DateTime | string;
+  'createdAt'?: DateTime;
   'createdById'?: string;
-  'updatedAt'?: DateTime | string;
+  'updatedAt'?: DateTime;
   'updatedById'?: string;
   'deleted'?: boolean;
-  'deletedAt'?: DateTime | string | null;
+  'deletedAt'?: DateTime | null;
   'deletedById'?: string | null;
 }
 

package/tests/utils/database/seed.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import { pick } from 'lodash';
-import { DateTime } from 'luxon';
 import { getColumnName, isInTable, modelNeedsTable } from '../../../src';
 import { SeedData } from '../../generated/db';
 import { models } from '../models';
@@ -78,19 +77,18 @@ export const seed: SeedData = {
   ],
 };
 
-export const setupSeed = async (knex: Knex) => {
-  const now = DateTime.now();
+export const setupSeed = async (knex: Knex, now: string) => {
   for (const [table, entities] of Object.entries(seed)) {
     const model = models.getModel(table, 'entity');
     const mappedEntities = entities.map((entity, i) => ({
       ...entity,
       ...(model.parent && { type: model.name }),
       ...(model.creatable && {
-        createdAt: now.plus({ second: i }),
+        createdAt: addSeconds(now, i),
         createdById: ADMIN_ID,
       }),
       ...(model.updatable && {
-        updatedAt: now.plus({ second: i }),
+        updatedAt: addSeconds(now, i),
         updatedById: ADMIN_ID,
       }),
     }));
@@ -112,3 +110,9 @@ export const setupSeed = async (knex: Knex) => {
     }
   }
 };
+
+const addSeconds = (dateString: string, seconds: number) => {
+  const date = new Date(dateString);
+  date.setSeconds(date.getSeconds() + seconds);
+  return date.toISOString();
+};

package/tests/utils/server.ts

@@ -2,7 +2,6 @@ import { TypedQueryDocumentNode } from 'graphql';
 import graphqlRequest, { RequestDocument, Variables } from 'graphql-request';
 import { RequestListener, createServer } from 'http';
 import { Knex } from 'knex';
-import { DateTime } from 'luxon';
 import { up } from '../../migrations/20230912185644_setup';
 import { execute } from '../../src';
 import { getKnex } from './database/knex';
@@ -44,7 +43,8 @@ export const withServer = async (
 
   try {
     await up(knex);
-    await setupSeed(knex);
+    const now = '2020-01-01T00:00:00.000Z';
+    await setupSeed(knex, now);
 
     handler = async (req, res) => {
       const user = await knex('User').where({ id: ADMIN_ID }).first();
@@ -66,7 +66,7 @@ export const withServer = async (
         user,
         models,
         permissions,
-        now: DateTime.fromISO('2020-01-01T00:00:00.000Z'),
+        now,
         body,
       });