@smartive/graphql-magic 8.0.0 → 8.1.1

package/src/models/models.ts

@@ -13,6 +13,10 @@ export type RawModel = {
   | { kind: 'enum'; values: string[]; deleted?: true }
   | { kind: 'raw-enum'; values: string[] }
   | { kind: 'interface'; fields: ModelField[] }
+  | {
+      kind: 'input';
+      fields: ObjectField[];
+    }
   | {
       kind: 'object';
       fields: ObjectField[];
@@ -42,6 +46,7 @@ export type EnumModel = Extract<RawModel, { kind: 'enum' }>;
 export type RawEnumModel = Extract<RawModel, { kind: 'raw-enum' }>;
 export type InterfaceModel = Extract<RawModel, { kind: 'interface' }>;
 export type ObjectModel = Extract<RawModel, { kind: 'object' }>;
+export type InputModel = Extract<RawModel, { kind: 'input' }>;
 export type EntityModel = Extract<RawModel, { kind: 'entity' }>;
 
 type BaseNumberType = {

package/src/models/utils.ts

@@ -11,6 +11,7 @@ import {
   EntityModel,
   EnumField,
   EnumModel,
+  InputModel,
   Model,
   ModelField,
   Models,
@@ -55,6 +56,8 @@ export const isScalarModel = (model: RawModel): model is ScalarModel => model.ki
 
 export const isObjectModel = (model: RawModel): model is ObjectModel => model.kind === 'object';
 
+export const isInputModel = (model: RawModel): model is InputModel => model.kind === 'input';
+
 export const isEnumList = (models: RawModels, field: ModelField) =>
   field?.list === true && models.find(({ name }) => name === field.kind)?.kind === 'enum';
 

package/src/schema/generate.ts

@@ -5,6 +5,7 @@ import {
   getModelPluralField,
   getModels,
   isEnumModel,
+  isInputModel,
   isObjectModel,
   isQueriableField,
   isRawEnumModel,
@@ -26,7 +27,11 @@ export const generateDefinitions = (rawModels: RawModels): DefinitionNode[] => {
     ...rawModels.filter(isEnumModel).map((model) => enm(model.name, model.values)),
     ...rawModels.filter(isRawEnumModel).map((model) => enm(model.name, model.values)),
     ...rawModels.filter(isScalarModel).map((model) => scalar(model.name)),
-    ...rawModels.filter(isObjectModel).map((model) => object(model.name, model.fields)),
+    ...rawModels
+      .filter(isObjectModel)
+      .filter(({ name }) => !['Query', 'Mutation'].includes(name))
+      .map((model) => object(model.name, model.fields)),
+    ...rawModels.filter(isInputModel).map((model) => input(model.name, model.fields)),
     ...rawModels
       .filter(isObjectModel)
       .filter((model) =>
@@ -188,6 +193,10 @@ export const generateDefinitions = (rawModels: RawModels): DefinitionNode[] => {
             { name: 'offset', type: 'Int' },
           ],
         })),
+      ...rawModels
+        .filter(isObjectModel)
+        .filter((model) => model.name === 'Query')
+        .flatMap((model) => model.fields),
     ]),
 
     object('Mutation', [
@@ -264,6 +273,10 @@ export const generateDefinitions = (rawModels: RawModels): DefinitionNode[] => {
           return mutations;
         })
       ),
+      ...rawModels
+        .filter(isObjectModel)
+        .filter((model) => model.name === 'Mutation')
+        .flatMap((model) => model.fields),
     ]),
   ];
 };

package/tests/utils/generate-migration.ts

@@ -1,22 +1,11 @@
 import { writeFileSync } from 'fs';
 import { simpleGit } from 'simple-git';
-import { MigrationGenerator } from '../../src/migrations/generate';
+import { MigrationGenerator, getMigrationDate } from '../../src/migrations/generate';
 import { getKnex } from './database/knex';
 import { rawModels } from './models';
 
 const git = simpleGit();
 
-const getDate = () => {
-  const date = new Date();
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-
-  return `${year}${month}${day}${hours}${minutes}${seconds}`;
-};
 
 const writeMigration = async () => {
   const name = process.argv[2] || (await git.branch()).current.split('/').pop();
@@ -26,7 +15,7 @@ const writeMigration = async () => {
   try {
     const migrations = await new MigrationGenerator(knex, rawModels).generate();
 
-    writeFileSync(`tmp/${getDate()}_${name}.ts`, migrations);
+    writeFileSync(`tmp/${getMigrationDate()}_${name}.ts`, migrations);
   } finally {
     await knex.destroy();
   }

package/tsconfig.eslint.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "dist"],
+}

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "include": ["./src/**/*.ts", "./src/**/*.tsx"],
-  "exclude": ["node_modules", "dist"],
+  "exclude": ["node_modules", "dist", "src/bin"],
   "compilerOptions": {
     "outDir": "./dist/esm",
     "rootDir": "./src",