@smartive/graphql-magic 16.1.4 → 16.2.0

package/migrations/20230912185644_setup.ts

@@ -3,18 +3,18 @@ import { Knex } from 'knex';
 export const up = async (knex: Knex) => {
   await knex.raw(`CREATE TYPE "someEnum" AS ENUM ('A','B','C')`);
 
-  await knex.raw(`CREATE TYPE "reactionType" AS ENUM ('Review','Question','Answer')`);
+  await knex.raw(`CREATE TYPE "role" AS ENUM ('ADMIN','USER')`);
 
-  await knex.schema.alterTable('User', (table) => {
-    table.string('username', undefined);
-  });
+  await knex.raw(`CREATE TYPE "reactionType" AS ENUM ('Review','Question','Answer')`);
 
-  await knex.schema.alterTable('User', (table) => {
+  await knex.schema.createTable('User', (table) => {
+    table.uuid('id').notNullable().primary();
+    table.string('username', undefined).nullable();
     table.enum('role', null as any, {
       useNative: true,
       existingType: true,
       enumName: 'role',
-    }).nullable().alter();
+    }).nullable();
   });
 
   await knex.schema.createTable('AnotherObject', (table) => {
@@ -101,29 +101,9 @@ export const up = async (knex: Knex) => {
     table.decimal('rating', undefined, undefined).nullable();
   });
 
-  await knex.schema.alterTable('User', (table) => {
-    table.dropColumn('createdAt');
-    table.dropColumn('updatedAt');
-  });
-
 };
 
 export const down = async (knex: Knex) => {
-  await knex.schema.alterTable('User', (table) => {
-    table.timestamp('createdAt');
-    table.timestamp('updatedAt');
-  });
-
-  await knex('User').update({
-    createdAt: 'TODO',
-    updatedAt: 'TODO',
-  });
-
-  await knex.schema.alterTable('User', (table) => {
-    table.timestamp('createdAt').notNullable().alter();
-    table.timestamp('updatedAt').notNullable().alter();
-  });
-
   await knex.schema.dropTable('ReviewRevision');
 
   await knex.schema.dropTable('Review');
@@ -138,19 +118,10 @@ export const down = async (knex: Knex) => {
 
   await knex.schema.dropTable('AnotherObject');
 
-  await knex.schema.alterTable('User', (table) => {
-    table.enum('role', null as any, {
-      useNative: true,
-      existingType: true,
-      enumName: 'role',
-    }).notNullable().alter();
-  });
-
-  await knex.schema.alterTable('User', (table) => {
-    table.dropColumn('username');
-  });
+  await knex.schema.dropTable('User');
 
   await knex.raw('DROP TYPE "reactionType"');
+  await knex.raw('DROP TYPE "role"');
   await knex.raw('DROP TYPE "someEnum"');
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "16.1.4",
+  "version": "16.2.0",
   "description": "",
   "source": "src/index.ts",
   "type": "module",
@@ -36,7 +36,7 @@
   },
   "overrides": {
     "graphql": "$graphql",
-    "rollup": "3.29.4"
+    "rollup": "3.29.5"
   },
   "browserslist": "> 0.25%, not dead",
   "publishConfig": {
@@ -71,21 +71,21 @@
   "devDependencies": {
     "@smartive/eslint-config": "3.3.0",
     "@smartive/prettier-config": "3.1.2",
-    "@types/jest": "29.5.12",
-    "@types/lodash": "4.17.6",
+    "@types/jest": "29.5.13",
+    "@types/lodash": "4.17.10",
     "@types/luxon": "3.4.2",
-    "@types/pg": "8.11.6",
+    "@types/pg": "8.11.10",
     "@types/uuid": "9.0.8",
     "create-ts-index": "1.14.0",
     "del-cli": "5.1.0",
-    "esbuild": "0.22.0",
-    "eslint": "8.57.0",
+    "esbuild": "0.24.0",
+    "eslint": "8.57.1",
     "graphql-request": "6.1.0",
     "jest": "29.7.0",
     "mock-knex": "0.4.13",
     "prettier": "2.8.8",
-    "ts-jest": "29.1.5",
+    "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
-    "typescript": "5.5.2"
+    "typescript": "5.5.4"
   }
 }

package/src/resolvers/filters.ts

@@ -84,6 +84,36 @@ const applyWhere = (node: WhereNode, where: Where, ops: QueryBuilderOps, joins:
   for (const key of Object.keys(where)) {
     const value = where[key];
 
+    if (key === 'NOT') {
+      const subOps: QueryBuilderOps = [];
+      applyWhere(node, value as Where, subOps, joins);
+      ops.push((query) => query.whereNot((subQuery) => apply(subQuery, subOps)));
+      continue;
+    }
+
+    if (key === 'AND') {
+      for (const subWhere of value as Where[]) {
+        applyWhere(node, subWhere, ops, joins);
+      }
+      continue;
+    }
+
+    if (key === 'OR') {
+      const allSubOps: QueryBuilderOps[] = [];
+      for (const subWhere of value as Where[]) {
+        const subOps: QueryBuilderOps = [];
+        applyWhere(node, subWhere, subOps, joins);
+        allSubOps.push(subOps);
+      }
+      ops.push((query) =>
+        ors(
+          query,
+          allSubOps.map((subOps) => (subQuery) => apply(subQuery, subOps))
+        )
+      );
+      continue;
+    }
+
     const specialFilter = key.match(/^(\w+)_(\w+)$/);
     if (specialFilter) {
       const [, actualKey, filter] = specialFilter;

package/src/schema/generate.ts

@@ -95,6 +95,20 @@ export const generateDefinitions = ({
                 type: `${relation.targetModel.name}Where`,
               },
             ]),
+          {
+            name: 'NOT',
+            type: `${model.name}Where`,
+          },
+          {
+            name: 'AND',
+            type: `${model.name}Where`,
+            list: true,
+          },
+          {
+            name: 'OR',
+            type: `${model.name}Where`,
+            list: true,
+          },
         ]),
         input(
           `${model.name}WhereUnique`,

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

@@ -1,5 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`query AND works 1`] = `
+{
+  "manyObjects": [
+    {
+      "id": "fc4e013e-4cb0-4ef8-9f2e-3d475bdf2b90",
+    },
+  ],
+}
+`;
+
+exports[`query NOT works 1`] = `
+{
+  "manyObjects": [
+    {
+      "id": "fc4e013e-4cb0-4ef8-9f2e-3d475bdf2b90",
+    },
+    {
+      "id": "37a23870-e7f5-45c8-86e5-f14d9f2405f9",
+    },
+  ],
+}
+`;
+
+exports[`query OR works 1`] = `
+{
+  "manyObjects": [
+    {
+      "id": "fc4e013e-4cb0-4ef8-9f2e-3d475bdf2b90",
+    },
+    {
+      "id": "604ab55d-ec3e-4857-9f27-219158f80e64",
+    },
+  ],
+}
+`;
+
 exports[`query can be executed 1`] = `
 {
   "manyObjects": [

package/tests/api/query.spec.ts

@@ -1,5 +1,5 @@
 import { gql } from '../../src';
-import { ANOTHER_ID, SOME_ID } from '../utils/database/seed';
+import { ANOTHER_ID, SOME_ID, SOME_ID_2 } from '../utils/database/seed';
 import { withServer } from '../utils/server';
 
 describe('query', () => {
@@ -72,4 +72,46 @@ describe('query', () => {
       ).toMatchSnapshot();
     });
   });
+
+  it('NOT works', async () => {
+    await withServer(async (request) => {
+      expect(
+        await request(gql`
+          query NotQuery {
+            manyObjects(where: { NOT: { id: "${SOME_ID}" } }, orderBy: [{ xyz: DESC }]) {
+              id
+            }
+          }
+        `)
+      ).toMatchSnapshot();
+    });
+  });
+
+  it('AND works', async () => {
+    await withServer(async (request) => {
+      expect(
+        await request(gql`
+          query AndQuery {
+            manyObjects(where: { xyz: 2, AND: [{ id: "${SOME_ID_2}" }] }, orderBy: [{ xyz: DESC }]) {
+              id
+            }
+          }
+        `)
+      ).toMatchSnapshot();
+    });
+  });
+
+  it('OR works', async () => {
+    await withServer(async (request) => {
+      expect(
+        await request(gql`
+          query OrQuery {
+            manyObjects(where: { OR: [{ id: "${SOME_ID}" }, { id: "${SOME_ID_2}"}] }, orderBy: [{ xyz: DESC }]) {
+              id
+            }
+          }
+        `)
+      ).toMatchSnapshot();
+    });
+  });
 });

package/tests/generated/api/index.ts

@@ -54,6 +54,9 @@ export type AnotherObjectOrderBy = {
 };
 
 export type AnotherObjectWhere = {
+  AND?: InputMaybe<Array<AnotherObjectWhere>>;
+  NOT?: InputMaybe<AnotherObjectWhere>;
+  OR?: InputMaybe<Array<AnotherObjectWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
   manyObjects_NONE?: InputMaybe<SomeObjectWhere>;
@@ -122,6 +125,9 @@ export type AnswerOrderBy = {
 };
 
 export type AnswerWhere = {
+  AND?: InputMaybe<Array<AnswerWhere>>;
+  NOT?: InputMaybe<AnswerWhere>;
+  OR?: InputMaybe<Array<AnswerWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -421,6 +427,9 @@ export type QuestionOrderBy = {
 };
 
 export type QuestionWhere = {
+  AND?: InputMaybe<Array<QuestionWhere>>;
+  NOT?: InputMaybe<QuestionWhere>;
+  OR?: InputMaybe<Array<QuestionWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -492,6 +501,9 @@ export enum ReactionType {
 }
 
 export type ReactionWhere = {
+  AND?: InputMaybe<Array<ReactionWhere>>;
+  NOT?: InputMaybe<ReactionWhere>;
+  OR?: InputMaybe<Array<ReactionWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -559,6 +571,9 @@ export type ReviewOrderBy = {
 };
 
 export type ReviewWhere = {
+  AND?: InputMaybe<Array<ReviewWhere>>;
+  NOT?: InputMaybe<ReviewWhere>;
+  OR?: InputMaybe<Array<ReviewWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
   rating_GT?: InputMaybe<Scalars['Float']['input']>;
@@ -612,10 +627,14 @@ export type SomeObjectOrderBy = {
 };
 
 export type SomeObjectWhere = {
+  AND?: InputMaybe<Array<SomeObjectWhere>>;
+  NOT?: InputMaybe<SomeObjectWhere>;
+  OR?: InputMaybe<Array<SomeObjectWhere>>;
   another?: InputMaybe<AnotherObjectWhere>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   float?: InputMaybe<Array<Scalars['Float']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
+  xyz?: InputMaybe<Array<Scalars['Int']['input']>>;
 };
 
 export type SomeObjectWhereUnique = {
@@ -800,6 +819,9 @@ export type UserUpdatedReviewsArgs = {
 };
 
 export type UserWhere = {
+  AND?: InputMaybe<Array<UserWhere>>;
+  NOT?: InputMaybe<UserWhere>;
+  OR?: InputMaybe<Array<UserWhere>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
 

package/tests/generated/client/index.ts

@@ -51,6 +51,9 @@ export type AnotherObjectOrderBy = {
 };
 
 export type AnotherObjectWhere = {
+  AND?: InputMaybe<Array<AnotherObjectWhere>>;
+  NOT?: InputMaybe<AnotherObjectWhere>;
+  OR?: InputMaybe<Array<AnotherObjectWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
   manyObjects_NONE?: InputMaybe<SomeObjectWhere>;
@@ -119,6 +122,9 @@ export type AnswerOrderBy = {
 };
 
 export type AnswerWhere = {
+  AND?: InputMaybe<Array<AnswerWhere>>;
+  NOT?: InputMaybe<AnswerWhere>;
+  OR?: InputMaybe<Array<AnswerWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -418,6 +424,9 @@ export type QuestionOrderBy = {
 };
 
 export type QuestionWhere = {
+  AND?: InputMaybe<Array<QuestionWhere>>;
+  NOT?: InputMaybe<QuestionWhere>;
+  OR?: InputMaybe<Array<QuestionWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -489,6 +498,9 @@ export enum ReactionType {
 }
 
 export type ReactionWhere = {
+  AND?: InputMaybe<Array<ReactionWhere>>;
+  NOT?: InputMaybe<ReactionWhere>;
+  OR?: InputMaybe<Array<ReactionWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
@@ -556,6 +568,9 @@ export type ReviewOrderBy = {
 };
 
 export type ReviewWhere = {
+  AND?: InputMaybe<Array<ReviewWhere>>;
+  NOT?: InputMaybe<ReviewWhere>;
+  OR?: InputMaybe<Array<ReviewWhere>>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
   rating_GT?: InputMaybe<Scalars['Float']['input']>;
@@ -609,10 +624,14 @@ export type SomeObjectOrderBy = {
 };
 
 export type SomeObjectWhere = {
+  AND?: InputMaybe<Array<SomeObjectWhere>>;
+  NOT?: InputMaybe<SomeObjectWhere>;
+  OR?: InputMaybe<Array<SomeObjectWhere>>;
   another?: InputMaybe<AnotherObjectWhere>;
   deleted?: InputMaybe<Array<Scalars['Boolean']['input']>>;
   float?: InputMaybe<Array<Scalars['Float']['input']>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
+  xyz?: InputMaybe<Array<Scalars['Int']['input']>>;
 };
 
 export type SomeObjectWhereUnique = {
@@ -797,6 +816,9 @@ export type UserupdatedReviewsArgs = {
 };
 
 export type UserWhere = {
+  AND?: InputMaybe<Array<UserWhere>>;
+  NOT?: InputMaybe<UserWhere>;
+  OR?: InputMaybe<Array<UserWhere>>;
   id?: InputMaybe<Array<Scalars['ID']['input']>>;
 };
 
@@ -859,6 +881,21 @@ 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 }> }>, noneFloat2: Array<{ __typename: 'AnotherObject', id: string, manyObjects: Array<{ __typename: 'SomeObject', float: number }> }> };
 
+export type NotQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type NotQueryQuery = { manyObjects: Array<{ __typename: 'SomeObject', id: string }> };
+
+export type AndQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type AndQueryQuery = { manyObjects: Array<{ __typename: 'SomeObject', id: string }> };
+
+export type OrQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type OrQueryQuery = { manyObjects: Array<{ __typename: 'SomeObject', id: string }> };
+
 export type DeleteAnotherObjectMutationMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1065,6 +1102,24 @@ export namespace ReverseFiltersQuery {
   export type _____manyObjects = NonNullable<(NonNullable<NonNullable<(NonNullable<ReverseFiltersQueryQuery['noneFloat2']>)[number]>['manyObjects']>)[number]>;
 }
 
+export namespace NotQuery {
+  export type Variables = NotQueryQueryVariables;
+  export type query = NotQueryQuery;
+  export type manyObjects = NonNullable<(NonNullable<NotQueryQuery['manyObjects']>)[number]>;
+}
+
+export namespace AndQuery {
+  export type Variables = AndQueryQueryVariables;
+  export type query = AndQueryQuery;
+  export type manyObjects = NonNullable<(NonNullable<AndQueryQuery['manyObjects']>)[number]>;
+}
+
+export namespace OrQuery {
+  export type Variables = OrQueryQueryVariables;
+  export type query = OrQueryQuery;
+  export type manyObjects = NonNullable<(NonNullable<OrQueryQuery['manyObjects']>)[number]>;
+}
+
 export namespace DeleteAnotherObjectMutation {
   export type Variables = DeleteAnotherObjectMutationMutationVariables;
   export type mutation = DeleteAnotherObjectMutationMutation;

package/tests/generated/db/index.ts

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

package/tests/generated/models.json

@@ -165,7 +165,8 @@
         "nonNull": true,
         "creatable": true,
         "updatable": true,
-        "orderable": true
+        "orderable": true,
+        "filterable": true
       },
       {
         "name": "createdAt",