@smartive/graphql-magic 7.0.1 → 8.1.0

package/src/models/utils.ts

@@ -6,19 +6,20 @@ import kebabCase from 'lodash/kebabCase';
 import startCase from 'lodash/startCase';
 import {
   BooleanField,
+  CustomField,
   DateTimeField,
+  EntityModel,
   EnumField,
   EnumModel,
+  InputModel,
   Model,
   ModelField,
   Models,
   ObjectModel,
   PrimitiveField,
   RawEnumModel,
-  RawField,
   RawModel,
   RawModels,
-  RawObjectModel,
   Relation,
   RelationField,
   ReverseRelation,
@@ -33,7 +34,7 @@ export const merge = <T>(objects: ({ [name: string]: T } | undefined | false)[]
 // Target -> target
 export const typeToField = (type: string) => type.substr(0, 1).toLowerCase() + type.substr(1);
 
-export const getModelPlural = (model: ObjectModel | Model) => model.plural || pluralize(model.name);
+export const getModelPlural = (model: EntityModel | Model) => model.plural || pluralize(model.name);
 
 export const getModelPluralField = (model: Model) => typeToField(getModelPlural(model));
 
@@ -45,7 +46,7 @@ export const getModelLabel = (model: Model) => getLabel(model.name);
 
 export const getLabel = (s: string) => startCase(camelCase(s));
 
-export const isObjectModel = (model: RawModel): model is ObjectModel => model.kind === 'object';
+export const isEntityModel = (model: RawModel): model is EntityModel => model.kind === 'entity';
 
 export const isEnumModel = (model: RawModel): model is EnumModel => model.kind === 'enum';
 
@@ -53,7 +54,9 @@ export const isRawEnumModel = (model: RawModel): model is RawEnumModel => model.
 
 export const isScalarModel = (model: RawModel): model is ScalarModel => model.kind === 'scalar';
 
-export const isRawObjectModel = (model: RawModel): model is RawObjectModel => model.kind === 'raw';
+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';
@@ -76,11 +79,11 @@ export const isToOneRelation = (field: ModelField): field is RelationField => is
 
 export const isQueriableField = ({ queriable }: ModelField) => queriable !== false;
 
-export const isRaw = (field: ModelField): field is RawField => field.kind === 'raw';
+export const isCustomField = (field: ModelField): field is CustomField => field.kind === 'custom';
 
 export const isVisible = ({ hidden }: ModelField) => hidden !== true;
 
-export const isSimpleField = and(not(isRelation), not(isRaw));
+export const isSimpleField = and(not(isRelation), not(isCustomField));
 
 export const isUpdatable = ({ updatable }: ModelField) => !!updatable;
 
@@ -108,7 +111,7 @@ export const actionableRelations = (model: Model, action: 'create' | 'update' |
     );
 
 export const getModels = (rawModels: RawModels): Models => {
-  const models: Models = rawModels.filter(isObjectModel).map((model) => {
+  const models: Models = rawModels.filter(isEntityModel).map((model) => {
     const objectModel: Model = {
       ...model,
       fieldsByName: {},

package/src/resolvers/node.ts

@@ -9,7 +9,7 @@ import type {
 
 import { FullContext } from '../context';
 import { Model } from '../models/models';
-import { get, isRawObjectModel, summonByKey, summonByName } from '../models/utils';
+import { get, isObjectModel, summonByKey, summonByName } from '../models/utils';
 import {
   getFragmentTypeName,
   getNameOrAlias,
@@ -150,7 +150,7 @@ export const getJoins = (node: ResolverNode, toMany: boolean) => {
 
     const typeName = getTypeName(fieldDefinition.type);
 
-    if (isRawObjectModel(summonByName(ctx.rawModels, typeName))) {
+    if (isObjectModel(summonByName(ctx.rawModels, typeName))) {
       continue;
     }
 

package/src/resolvers/resolver.ts

@@ -115,7 +115,7 @@ const applySelects = (node: ResolverNode, query: Knex.QueryBuilder, joins: Joins
         .filter((n) => {
           const field = node.model.fields.find(({ name }) => name === n.name.value);
 
-          if (!field || field.kind === 'relation' || field.kind === 'raw') {
+          if (!field || field.kind === 'relation' || field.kind === 'custom') {
             return false;
           }
 

package/src/schema/generate.ts

@@ -5,9 +5,10 @@ import {
   getModelPluralField,
   getModels,
   isEnumModel,
+  isInputModel,
+  isObjectModel,
   isQueriableField,
   isRawEnumModel,
-  isRawObjectModel,
   isRelation,
   isScalarModel,
   typeToField,
@@ -26,15 +27,19 @@ 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(isRawObjectModel).map((model) => object(model.name, model.fields)),
     ...rawModels
-      .filter(isRawObjectModel)
+      .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) =>
         models.some((m) => m.creatable && m.fields.some((f) => f.creatable && f.kind === 'json' && f.type === model.name))
       )
       .map((model) => input(`Create${model.name}`, model.fields)),
     ...rawModels
-      .filter(isRawObjectModel)
+      .filter(isObjectModel)
       .filter((model) =>
         models.some((m) => m.creatable && m.fields.some((f) => f.creatable && f.kind === 'json' && f.type === model.name))
       )
@@ -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/tests/utils/models.ts

@@ -16,12 +16,12 @@ export const rawModels: RawModels = [
 
   {
     name: 'SomeRawObject',
-    kind: 'raw',
+    kind: 'object',
     fields: [{ name: 'field', type: 'String' }],
   },
 
   {
-    kind: 'object',
+    kind: 'entity',
     name: 'User',
     fields: [
       {
@@ -36,7 +36,7 @@ export const rawModels: RawModels = [
     ],
   },
   {
-    kind: 'object',
+    kind: 'entity',
     name: 'AnotherObject',
     listQueriable: true,
     deletable: true,
@@ -57,7 +57,7 @@ export const rawModels: RawModels = [
     ],
   },
   {
-    kind: 'object',
+    kind: 'entity',
     name: 'SomeObject',
     plural: 'ManyObjects',
     description: 'An object',