@smartive/graphql-magic 9.1.3 → 11.0.0

package/tests/utils/server.ts

@@ -3,11 +3,11 @@ 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';
-import { setupSchema } from './database/schema';
 import { ADMIN_ID, setupSeed } from './database/seed';
-import { models, permissions, rawModels } from './models';
+import { models, permissions } from './models';
 
 const MIN_PORT = 49152;
 const MAX_PORT = 65535;
@@ -30,7 +30,8 @@ export const withServer = async (
       await new Promise<void>((res, rej) => server.listen(port, res).once('error', rej));
       break;
     } catch (e) {
-      console.error(e);
+      console.warn(`Wait did we really get a port collision? Craaaaazy.`);
+      console.warn(e);
     }
   }
 
@@ -42,7 +43,7 @@ export const withServer = async (
   const knex = getKnex(dbName);
 
   try {
-    await setupSchema(knex);
+    await up(knex);
     await setupSeed(knex);
 
     handler = async (req, res) => {
@@ -63,7 +64,6 @@ export const withServer = async (
         locale: 'en',
         locales: ['en'],
         user,
-        rawModels,
         models,
         permissions,
         now: DateTime.fromISO('2020-01-01T00:00:00.000Z'),

package/tsconfig.eslint.json

@@ -1,4 +1,5 @@
 {
   "extends": "./tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules", "dist"],
 }

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

@@ -1,128 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`generate generates a schema 1`] = `
-"type AnotherObject {
-  id: ID!
-  name: String
-  myself: AnotherObject
-  deleted: Boolean!
-  deletedAt: DateTime
-  deletedBy: User
-  self(where: AnotherObjectWhere, orderBy: [AnotherObjectOrderBy!], limit: Int, offset: Int): AnotherObject
-  manyObjects(where: SomeObjectWhere, search: String, orderBy: [SomeObjectOrderBy!], limit: Int, offset: Int): [SomeObject!]!
-}
-
-input AnotherObjectOrderBy {
-  name: Order
-  deletedAt: Order
-}
-
-input AnotherObjectWhere {
-  id: [ID!]
-  deleted: [Boolean!]
-}
-
-input AnotherObjectWhereUnique {
-  id: ID
-}
-
-input CreateSomeObject {
-  xyz: Int!
-}
-
-scalar DateTime
-
-type Mutation {
-  deleteAnotherObject(where: AnotherObjectWhereUnique!, dryRun: Boolean): ID!
-  restoreAnotherObject(where: AnotherObjectWhereUnique!): ID!
-  createSomeObject(data: CreateSomeObject!): SomeObject!
-  updateSomeObject(where: SomeObjectWhereUnique!, data: UpdateSomeObject!): SomeObject!
-  deleteSomeObject(where: SomeObjectWhereUnique!, dryRun: Boolean): ID!
-  restoreSomeObject(where: SomeObjectWhereUnique!): ID!
-}
-
-enum Order {
-  ASC
-  DESC
-}
-
-type Query {
-  me: User
-  someObject(where: SomeObjectWhereUnique!): SomeObject!
-  anotherObjects(where: AnotherObjectWhere, orderBy: [AnotherObjectOrderBy!], limit: Int, offset: Int): [AnotherObject!]!
-  manyObjects(where: SomeObjectWhere, search: String, orderBy: [SomeObjectOrderBy!], limit: Int, offset: Int): [SomeObject!]!
-}
-
-enum Role {
-  ADMIN
-  USER
-}
-
-enum SomeEnum {
-  A
-  B
-  C
-}
-
-type SomeObject {
-  id: ID!
-  field: String
-  another: AnotherObject!
-  list(magic: Boolean): [Float!]!
-  xyz: Int!
-  createdAt: DateTime!
-  createdBy: User!
-  updatedAt: DateTime!
-  updatedBy: User!
-  deleted: Boolean!
-  deletedAt: DateTime
-  deletedBy: User
-}
-
-input SomeObjectOrderBy {
-  xyz: Order
-  createdAt: Order
-  updatedAt: Order
-  deletedAt: Order
-}
-
-input SomeObjectWhere {
-  id: [ID!]
-  deleted: [Boolean!]
-  another: AnotherObjectWhere
-}
-
-input SomeObjectWhereUnique {
-  id: ID
-}
-
-type SomeRawObject {
-  field: String
-}
-
-input UpdateSomeObject {
-  anotherId: ID
-  xyz: Int
-}
-
-scalar Upload
-
-type User {
-  id: ID!
-  username: String
-  role: Role
-  deletedAnotherObjects(where: AnotherObjectWhere, orderBy: [AnotherObjectOrderBy!], limit: Int, offset: Int): [AnotherObject!]!
-  createdManyObjects(where: SomeObjectWhere, search: String, orderBy: [SomeObjectOrderBy!], limit: Int, offset: Int): [SomeObject!]!
-  updatedManyObjects(where: SomeObjectWhere, search: String, orderBy: [SomeObjectOrderBy!], limit: Int, offset: Int): [SomeObject!]!
-  deletedManyObjects(where: SomeObjectWhere, search: String, orderBy: [SomeObjectOrderBy!], limit: Int, offset: Int): [SomeObject!]!
-}
-
-input UserWhere {
-  id: [ID!]
-}
-
-input UserWhereUnique {
-  id: ID
-}
-"
-`;

package/tests/unit/generate.spec.ts

@@ -1,8 +0,0 @@
-import { printSchemaFromModels } from '../../src';
-import { rawModels } from '../utils/models';
-
-describe('generate', () => {
-  it('generates a schema', () => {
-    expect(printSchemaFromModels(rawModels)).toMatchSnapshot();
-  });
-});

package/tests/utils/database/schema.ts

@@ -1,64 +0,0 @@
-import { Knex } from 'knex';
-
-export const setupSchema = async (knex: Knex) => {
-  await knex.raw(`CREATE TYPE "someEnum" AS ENUM ('A','B','C')`);
-
-  await knex.raw(`CREATE TYPE "role" AS ENUM ('ADMIN','USER')`);
-
-  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();
-  });
-
-  await knex.schema.createTable('AnotherObject', (table) => {
-    table.uuid('id').notNullable().primary();
-    table.uuid('myselfId').notNullable();
-    table.foreign('myselfId').references('id').inTable('AnotherObject');
-    table.boolean('deleted').notNullable().defaultTo(false);
-    table.timestamp('deletedAt').nullable();
-    table.uuid('deletedById').nullable();
-    table.foreign('deletedById').references('id').inTable('User');
-  });
-
-  await knex.schema.createTable('AnotherObjectRevision', (table) => {
-    table.uuid('id').notNullable().primary();
-    table.boolean('deleted').notNullable();
-  });
-  
-  await knex.schema.createTable('SomeObject', (table) => {
-    table.uuid('id').notNullable().primary();
-    table.string('field', undefined).nullable();
-    table.uuid('anotherId').notNullable();
-    table.foreign('anotherId').references('id').inTable('AnotherObject');
-    table.decimal('list', 1, 1).notNullable();
-    table.integer('xyz').notNullable();
-    table.timestamp('createdAt').notNullable();
-    table.uuid('createdById').notNullable();
-    table.foreign('createdById').references('id').inTable('User');
-    table.timestamp('updatedAt').notNullable();
-    table.uuid('updatedById').notNullable();
-    table.foreign('updatedById').references('id').inTable('User');
-    table.boolean('deleted').notNullable().defaultTo(false);
-    table.timestamp('deletedAt').nullable();
-    table.uuid('deletedById').nullable();
-    table.foreign('deletedById').references('id').inTable('User');
-  });
-
-  await knex.schema.createTable('SomeObjectRevision', (table) => {
-    table.uuid('id').notNullable().primary();
-    table.uuid('someObjectId').notNullable();
-    table.uuid('anotherId').notNullable();
-    table.foreign('anotherId').references('id').inTable('AnotherObject');
-    table.uuid('createdById').notNullable();
-    table.timestamp('createdAt').notNullable().defaultTo(knex.fn.now(0));
-    table.boolean('deleted').notNullable();
-    table.integer('xyz').notNullable();
-  });
-};

package/tests/utils/generate-migration.ts

@@ -1,24 +0,0 @@
-import { writeFileSync } from 'fs';
-import { simpleGit } from 'simple-git';
-import { MigrationGenerator, getMigrationDate } from '../../src/migrations/generate';
-import { getKnex } from './database/knex';
-import { rawModels } from './models';
-
-const git = simpleGit();
-
-
-const writeMigration = async () => {
-  const name = process.argv[2] || (await git.branch()).current.split('/').pop();
-
-  const knex = getKnex();
-
-  try {
-    const migrations = await new MigrationGenerator(knex, rawModels).generate();
-
-    writeFileSync(`tmp/${getMigrationDate()}_${name}.ts`, migrations);
-  } finally {
-    await knex.destroy();
-  }
-};
-
-void writeMigration();