@smartive/graphql-magic 5.1.2 → 7.0.0

package/CHANGELOG.md

@@ -1,6 +1 @@
-## [5.1.2](https://github.com/smartive/graphql-magic/compare/v5.1.1...v5.1.2) (2023-08-25)
-
-
-### Bug Fixes
-
-* Schema generation again ([4e8c6cd](https://github.com/smartive/graphql-magic/commit/4e8c6cd1cf5639430e02077f506c66fdcbc01288))
+# [7.0.0](https://github.com/smartive/graphql-magic/compare/v6.0.0...v7.0.0) (2023-08-31)

package/dist/cjs/index.cjs

@@ -102,6 +102,7 @@ __export(src_exports, {
   inputValues: () => inputValues,
   isCreatable: () => isCreatable,
   isCreatableBy: () => isCreatableBy,
+  isEnum: () => isEnum,
   isEnumList: () => isEnumList,
   isEnumModel: () => isEnumModel,
   isFieldNode: () => isFieldNode,
@@ -109,6 +110,7 @@ __export(src_exports, {
   isInlineFragmentNode: () => isInlineFragmentNode,
   isListType: () => isListType,
   isObjectModel: () => isObjectModel,
+  isPrimitive: () => isPrimitive,
   isQueriableBy: () => isQueriableBy,
   isQueriableField: () => isQueriableField,
   isRaw: () => isRaw,
@@ -259,18 +261,20 @@ var getModelSlug = (model) => (0, import_kebabCase.default)(getModelPlural(model
 var getModelLabelPlural = (model) => getLabel(getModelPlural(model));
 var getModelLabel = (model) => getLabel(model.name);
 var getLabel = (s) => (0, import_startCase.default)((0, import_camelCase.default)(s));
-var isObjectModel = (model) => model.type === "object";
-var isEnumModel = (model) => model.type === "enum";
-var isRawEnumModel = (model) => model.type === "raw-enum";
-var isScalarModel = (model) => model.type === "scalar";
-var isRawObjectModel = (model) => model.type === "raw";
-var isEnumList = (models, field) => field?.list === true && models.find(({ name: name2 }) => name2 === field.type)?.type === "enum";
+var isObjectModel = (model) => model.kind === "object";
+var isEnumModel = (model) => model.kind === "enum";
+var isRawEnumModel = (model) => model.kind === "raw-enum";
+var isScalarModel = (model) => model.kind === "scalar";
+var isRawObjectModel = (model) => model.kind === "raw";
+var isEnumList = (models, field) => field?.list === true && models.find(({ name: name2 }) => name2 === field.kind)?.kind === "enum";
 var and = (...predicates) => (field) => predicates.every((predicate) => predicate(field));
 var not = (predicate) => (field) => !predicate(field);
-var isRelation = (field) => field.type === "relation";
+var isPrimitive = (field) => field.kind === void 0 || field.kind === "primitive";
+var isEnum = (field) => field.kind === "enum";
+var isRelation = (field) => field.kind === "relation";
 var isToOneRelation = (field) => isRelation(field) && !!field.toOne;
 var isQueriableField = ({ queriable }) => queriable !== false;
-var isRaw = (field) => field.type === "raw";
+var isRaw = (field) => field.kind === "raw";
 var isVisible = ({ hidden }) => hidden !== true;
 var isSimpleField = and(not(isRelation), not(isRaw));
 var isUpdatable = ({ updatable }) => !!updatable;
@@ -304,8 +308,8 @@ var getModels = (rawModels) => {
           },
           {
             name: "createdBy",
-            type: "relation",
-            typeName: "User",
+            kind: "relation",
+            type: "User",
             nonNull: true,
             reverse: `created${getModelPlural(model)}`,
             generated: true,
@@ -323,8 +327,8 @@ var getModels = (rawModels) => {
           },
           {
             name: "updatedBy",
-            type: "relation",
-            typeName: "User",
+            kind: "relation",
+            type: "User",
             nonNull: true,
             reverse: `updated${getModelPlural(model)}`,
             generated: true,
@@ -336,7 +340,7 @@ var getModels = (rawModels) => {
             name: "deleted",
             type: "Boolean",
             nonNull: true,
-            default: false,
+            defaultValue: false,
             filterable: { default: false },
             generated: true,
             ...typeof model.deletable === "object" && model.deletable.deleted
@@ -350,8 +354,8 @@ var getModels = (rawModels) => {
           },
           {
             name: "deletedBy",
-            type: "relation",
-            typeName: "User",
+            kind: "relation",
+            type: "User",
             reverse: `deleted${getModelPlural(model)}`,
             generated: true,
             ...typeof model.deletable === "object" && model.deletable.deletedBy
@@ -359,7 +363,7 @@ var getModels = (rawModels) => {
         ] : []
       ].map((field) => ({
         ...field,
-        ...field.type === "relation" && {
+        ...field.kind === "relation" && {
           foreignKey: field.foreignKey || `${field.name}Id`
         }
       }))
@@ -371,15 +375,15 @@ var getModels = (rawModels) => {
   });
   for (const model of models) {
     for (const field of model.fields) {
-      if (field.type !== "relation") {
+      if (field.kind !== "relation") {
         continue;
       }
-      const fieldModel = summonByName(models, field.typeName);
+      const fieldModel = summonByName(models, field.type);
       const reverseRelation = {
-        type: "relation",
+        kind: "relation",
         name: field.reverse || (field.toOne ? typeToField(model.name) : getModelPluralField(model)),
         foreignKey: get(field, "foreignKey"),
-        typeName: model.name,
+        type: model.name,
         toOne: !!field.toOne,
         fieldModel,
         field,
@@ -457,8 +461,8 @@ var getEditEntityRelationsQuery = (models, model, action, fields2, ignoreFields,
     ({ name: name2 }) => (!fields2 || fields2.includes(name2)) && (!ignoreFields || !ignoreFields.includes(name2))
   );
   return !!relations.length && `query ${(0, import_upperFirst.default)(action)}${model.name}Relations {
-      ${relations.map(({ name: name2, typeName }) => {
-    const model2 = summonByName(models, typeName);
+      ${relations.map(({ name: name2, type }) => {
+    const model2 = summonByName(models, type);
     let filters = "";
     if (model2.displayField) {
       const displayField2 = model2.fieldsByName[model2.displayField];
@@ -568,7 +572,7 @@ var getEntityQuery = (models, model, role, visibleRelationsByRole, typesWithSubR
     ${model.fields.filter(and(isSimpleField, isQueriableBy(role))).map(({ name: name2 }) => name2)}
     ${queryRelations(
   models,
-  model.fields.filter(and(isRelation, isVisibleRelation(visibleRelationsByRole, model.name, role))),
+  model.fields.filter(isRelation).filter(isVisibleRelation(visibleRelationsByRole, model.name, role)),
   role,
   typesWithSubRelations
 )}
@@ -618,34 +622,33 @@ var generateDBModels = (rawModels) => {
   }
   const models = getModels(rawModels);
   for (const model of models) {
-    const fields2 = model.fields.some((field) => field.type === "relation" && field.foreignKey === "id") ? model.fields.filter((field) => field.name !== "id") : model.fields;
+    const fields2 = model.fields.some((field) => field.kind === "relation" && field.foreignKey === "id") ? model.fields.filter((field) => field.name !== "id") : model.fields;
     writer.write(`export type ${model.name} = `).inlineBlock(() => {
       for (const field of fields2.filter(not(isRaw))) {
-        writer.write(`'${getFieldName(field)}': ${getFieldOutputType(field)}${field.nonNull ? "" : " | null"},`).newLine();
+        writer.write(`'${getFieldName(field)}': ${getFieldType(field)}${field.nonNull ? "" : " | null"},`).newLine();
       }
     }).blankLine();
     writer.write(`export type ${model.name}Initializer = `).inlineBlock(() => {
       for (const field of fields2.filter(not(isRaw))) {
         writer.write(
-          `'${getFieldName(field)}'${field.nonNull && field.default === void 0 ? "" : "?"}: ${getFieldInputType(
+          `'${getFieldName(field)}'${field.nonNull && field.defaultValue === void 0 ? "" : "?"}: ${getFieldType(
             field
-          )}${field.nonNull ? "" : " | null"},`
+          )}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"},`
         ).newLine();
       }
     }).blankLine();
     writer.write(`export type ${model.name}Mutator = `).inlineBlock(() => {
       for (const field of fields2.filter(not(isRaw))) {
-        writer.write(`'${getFieldName(field)}'?: ${getFieldInputType(field)}${field.nonNull ? "" : " | null"},`).newLine();
+        writer.write(
+          `'${getFieldName(field)}'?: ${getFieldType(field)}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"},`
+        ).newLine();
       }
     }).blankLine();
     writer.write(`export type ${model.name}Seed = `).inlineBlock(() => {
       for (const field of fields2.filter(not(isRaw))) {
         const fieldName = getFieldName(field);
         writer.write(
-          `'${getFieldName(field)}'${field.nonNull && field.default === void 0 && !OPTIONAL_SEED_FIELDS.includes(fieldName) ? "" : "?"}: ${getFieldInputType(
-            field,
-            rawModels.filter(isEnumModel).map(({ name: name2 }) => name2)
-          )}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"},`
+          `'${getFieldName(field)}'${field.nonNull && field.defaultValue === void 0 && !OPTIONAL_SEED_FIELDS.includes(fieldName) ? "" : "?"}: ${field.kind === "enum" ? field.list ? "string[]" : "string" : getFieldType(field)}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"},`
         ).newLine();
       }
     }).blankLine();
@@ -657,30 +660,26 @@ var generateDBModels = (rawModels) => {
   });
   return writer.toString();
 };
-var getFieldName = (field) => field.type === "relation" ? field.foreignKey || `${field.name}Id` : field.name;
-var getFieldOutputType = (field) => {
-  switch (field.type) {
+var getFieldName = (field) => field.kind === "relation" ? field.foreignKey || `${field.name}Id` : field.name;
+var getFieldType = (field) => {
+  const kind = field.kind;
+  switch (kind) {
     case "json":
       return "string";
     case "relation":
       return "string";
     case "enum":
-      return field.typeName + (field.list ? "[]" : "");
+      return field.type + (field.list ? "[]" : "");
     case "raw":
       throw new Error(`Raw fields are not in the db.`);
-    default:
+    case "primitive":
+    case void 0:
       return get(PRIMITIVE_TYPES, field.type) + (field.list ? "[]" : "");
-  }
-};
-var getFieldInputType = (field, stringTypes = []) => {
-  let outputType = getFieldOutputType(field);
-  if (field.list || stringTypes.includes(field.type)) {
-    outputType += " | string";
-    if (field.list && stringTypes.includes(field.type)) {
-      outputType += " | string[]";
+    default: {
+      const exhaustiveCheck = kind;
+      throw new Error(exhaustiveCheck);
     }
   }
-  return outputType;
 };
 var generateKnexTables = (rawModels) => {
   const writer = new import_code_block_writer.default["default"]({
@@ -805,15 +804,15 @@ var MigrationGenerator = class {
         this.createFields(
           model,
           model.fields.filter(
-            ({ name: name2, ...field }) => field.type !== "raw" && !this.columns[model.name].some(
-              (col) => col.name === (field.type === "relation" ? field.foreignKey || `${name2}Id` : name2)
+            ({ name: name2, ...field }) => field.kind !== "raw" && !this.columns[model.name].some(
+              (col) => col.name === (field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
             )
           ),
           up,
           down
         );
-        const existingFields = model.fields.filter(({ name: name2, type, nonNull: nonNull2 }) => {
-          const col = this.columns[model.name].find((col2) => col2.name === (type === "relation" ? `${name2}Id` : name2));
+        const existingFields = model.fields.filter(({ name: name2, kind, nonNull: nonNull2 }) => {
+          const col = this.columns[model.name].find((col2) => col2.name === (kind === "relation" ? `${name2}Id` : name2));
           if (!col) {
             return false;
           }
@@ -840,8 +839,8 @@ var MigrationGenerator = class {
                     if (model.deletable) {
                       writer.writeLine(`deleted: row.deleted,`);
                     }
-                    for (const { name: name2, type } of model.fields.filter(({ updatable }) => updatable)) {
-                      const col = type === "relation" ? `${name2}Id` : name2;
+                    for (const { name: name2, kind } of model.fields.filter(({ updatable }) => updatable)) {
+                      const col = kind === "relation" ? `${name2}Id` : name2;
                       writer.writeLine(`${col}: row.${col},`);
                     }
                   }).write(")));").newLine();
@@ -855,14 +854,14 @@ var MigrationGenerator = class {
         } else {
           const revisionTable = `${model.name}Revision`;
           const missingRevisionFields = model.fields.filter(
-            ({ name: name2, updatable, ...field }) => field.type !== "raw" && updatable && !this.columns[revisionTable].some(
-              (col) => col.name === (field.type === "relation" ? field.foreignKey || `${name2}Id` : name2)
+            ({ name: name2, updatable, ...field }) => field.kind !== "raw" && updatable && !this.columns[revisionTable].some(
+              (col) => col.name === (field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
             )
           );
           this.createRevisionFields(model, missingRevisionFields, up, down);
           const revisionFieldsToRemove = model.fields.filter(
-            ({ name: name2, updatable, generated, ...field }) => !generated && field.type !== "raw" && !updatable && !(field.type === "relation" && field.foreignKey === "id") && this.columns[revisionTable].some(
-              (col) => col.name === (field.type === "relation" ? field.foreignKey || `${name2}Id` : name2)
+            ({ name: name2, updatable, generated, ...field }) => !generated && field.kind !== "raw" && !updatable && !(field.kind === "relation" && field.foreignKey === "id") && this.columns[revisionTable].some(
+              (col) => col.name === (field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
             )
           );
           this.createRevisionFields(model, revisionFieldsToRemove, down, up);
@@ -915,8 +914,8 @@ var MigrationGenerator = class {
       for (const field of fields2) {
         this.alterTable(model.name, () => {
           this.renameColumn(
-            field.type === "relation" ? `${field.oldName}Id` : get(field, "oldName"),
-            field.type === "relation" ? `${field.name}Id` : field.name
+            field.kind === "relation" ? `${field.oldName}Id` : get(field, "oldName"),
+            field.kind === "relation" ? `${field.name}Id` : field.name
           );
         });
       }
@@ -925,14 +924,14 @@ var MigrationGenerator = class {
       for (const field of fields2) {
         this.alterTable(model.name, () => {
           this.renameColumn(
-            field.type === "relation" ? `${field.name}Id` : field.name,
-            field.type === "relation" ? `${field.oldName}Id` : get(field, "oldName")
+            field.kind === "relation" ? `${field.name}Id` : field.name,
+            field.kind === "relation" ? `${field.oldName}Id` : get(field, "oldName")
           );
         });
       }
     });
     for (const field of fields2) {
-      summonByName(this.columns[model.name], field.type === "relation" ? `${field.oldName}Id` : field.oldName).name = field.type === "relation" ? `${field.name}Id` : field.name;
+      summonByName(this.columns[model.name], field.kind === "relation" ? `${field.oldName}Id` : field.oldName).name = field.kind === "relation" ? `${field.name}Id` : field.name;
     }
   }
   createFields(model, fields2, up, down) {
@@ -944,8 +943,8 @@ var MigrationGenerator = class {
       const updates = [];
       const postAlter = [];
       for (const field of fields2) {
-        alter.push(() => this.column(field, { setNonNull: field.default !== void 0 }));
-        if (field.nonNull && field.default === void 0) {
+        alter.push(() => this.column(field, { setNonNull: field.defaultValue !== void 0 }));
+        if (field.nonNull && field.defaultValue === void 0) {
           updates.push(() => this.writer.write(`${field.name}: 'TODO',`).newLine());
           postAlter.push(() => this.column(field, { alter: true, foreign: false }));
         }
@@ -968,8 +967,8 @@ var MigrationGenerator = class {
     });
     down.push(() => {
       this.alterTable(model.name, () => {
-        for (const { type, name: name2 } of fields2) {
-          this.dropColumn(type === "relation" ? `${name2}Id` : name2);
+        for (const { kind, name: name2 } of fields2) {
+          this.dropColumn(kind === "relation" ? `${name2}Id` : name2);
         }
       });
     });
@@ -991,7 +990,7 @@ var MigrationGenerator = class {
           this.column(
             field,
             { alter: true },
-            summonByName(this.columns[model.name], field.type === "relation" ? `${field.name}Id` : field.name)
+            summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
           );
         }
       });
@@ -1014,7 +1013,7 @@ var MigrationGenerator = class {
             this.column(
               field,
               { alter: true },
-              summonByName(this.columns[model.name], field.type === "relation" ? `${field.name}Id` : field.name)
+              summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
             );
           }
         });
@@ -1048,7 +1047,7 @@ var MigrationGenerator = class {
           }
         });
         this.writer.write(`await knex('${model.name}Revision').update(`).inlineBlock(() => {
-          for (const { name: name2, type } of missingRevisionFields) {
+          for (const { name: name2, kind: type } of missingRevisionFields) {
             const col = type === "relation" ? `${name2}Id` : name2;
             this.writer.write(
               `${col}: knex.raw('(select "${col}" from "${model.name}" where "${model.name}".id = "${model.name}Revision"."${typeToField(model.name)}Id")'),`
@@ -1067,7 +1066,7 @@ var MigrationGenerator = class {
       down.push(() => {
         this.alterTable(revisionTable, () => {
           for (const field of missingRevisionFields) {
-            this.dropColumn(field.type === "relation" ? `${field.name}Id` : field.name);
+            this.dropColumn(field.kind === "relation" ? `${field.name}Id` : field.name);
           }
         });
       });
@@ -1133,8 +1132,8 @@ var MigrationGenerator = class {
           }
         }
       }
-      if (setDefault && field.default !== void 0) {
-        this.writer.write(`.defaultTo(${this.value(field.default)})`);
+      if (setDefault && field.defaultValue !== void 0) {
+        this.writer.write(`.defaultTo(${this.value(field.defaultValue)})`);
       }
       if (primary) {
         this.writer.write(".primary()");
@@ -1146,39 +1145,44 @@ var MigrationGenerator = class {
       }
       this.writer.write(";").newLine();
     };
-    switch (field.type) {
-      case "Boolean":
-        col(`table.boolean('${name2}')`);
-        break;
-      case "Int":
-        col(`table.integer('${name2}')`);
-        break;
-      case "Float":
-        if (field.double) {
-          col(`table.double('${name2}')`);
-        } else {
-          col(`table.decimal('${name2}', ${get(field, "precision")}, ${get(field, "scale")})`);
-        }
-        break;
-      case "String":
-        if (field.large) {
-          col(`table.text('${name2}')`);
-        } else {
-          col(`table.string('${name2}', ${field.maxLength})`);
+    const kind = field.kind;
+    switch (kind) {
+      case "primitive":
+        switch (field.type) {
+          case "Boolean":
+            col(`table.boolean('${name2}')`);
+            break;
+          case "Int":
+            col(`table.integer('${name2}')`);
+            break;
+          case "Float":
+            if (field.double) {
+              col(`table.double('${name2}')`);
+            } else {
+              col(`table.decimal('${name2}', ${get(field, "precision")}, ${get(field, "scale")})`);
+            }
+            break;
+          case "String":
+            if (field.large) {
+              col(`table.text('${name2}')`);
+            } else {
+              col(`table.string('${name2}', ${field.maxLength})`);
+            }
+            break;
+          case "DateTime":
+            col(`table.timestamp('${name2}')`);
+            break;
+          case "ID":
+            col(`table.uuid('${name2}')`);
+            break;
+          case "Upload":
+            break;
         }
         break;
-      case "DateTime":
-        col(`table.timestamp('${name2}')`);
-        break;
-      case "ID":
-        col(`table.uuid('${name2}')`);
-        break;
-      case "Upload":
-        break;
       case "relation":
         col(`table.uuid('${name2}Id')`);
         if (foreign && !alter) {
-          this.writer.writeLine(`table.foreign('${name2}Id').references('id').inTable('${field.typeName}');`);
+          this.writer.writeLine(`table.foreign('${name2}Id').references('id').inTable('${field.type}');`);
         }
         break;
       case "enum":
@@ -1193,8 +1197,15 @@ var MigrationGenerator = class {
         }
         col();
         break;
-      default:
-        throw new Error(`Unknown field type ${field.type}`);
+      case "json":
+        this.writer.write(`table.json('${typeToField(field.type)}')`);
+        break;
+      case "raw":
+        throw new Error("Raw fields aren't stored in the database");
+      default: {
+        const exhaustiveCheck = kind;
+        throw new Error(exhaustiveCheck);
+      }
     }
   }
 };
@@ -1418,8 +1429,8 @@ var checkCanWrite = async (ctx, model, data, action) => {
     if (!foreignId) {
       continue;
     }
-    const fieldPermissions = field[action === "CREATE" ? "creatableBy" : "updatableBy"];
-    if (fieldPermissions && !fieldPermissions.includes(ctx.user.role)) {
+    const fieldPermissions = field[action === "CREATE" ? "creatable" : "updatable"];
+    if (fieldPermissions && typeof fieldPermissions === "object" && !fieldPermissions.roles?.includes(ctx.user.role)) {
       throw new PermissionError(action, `this ${model.name}'s ${field.name}`, "field permission not available");
     }
     linked = true;
@@ -1733,7 +1744,7 @@ var applyWhere2 = (node, where, ops, joins) => {
     }
     const field = summonByName(node.model.fields, key);
     const fullKey = `${node.shortTableAlias}.${key}`;
-    if (field.type === "relation") {
+    if (field.kind === "relation") {
       const relation = get(node.model.relationsByName, field.name);
       const tableAlias = `${node.model.name}__W__${key}`;
       const subNode = {
@@ -1847,7 +1858,7 @@ var getSimpleFields = (node) => {
     if (!selection.selectionSet) {
       return true;
     }
-    return node.model.fields.some(({ type, name: name2 }) => type === "json" && name2 === selection.name.value);
+    return node.model.fields.some(({ kind: type, name: name2 }) => type === "json" && name2 === selection.name.value);
   });
 };
 var getInlineFragments = (node) => node.selectionSet.filter(isInlineFragmentNode).map(
@@ -1890,7 +1901,7 @@ var getJoins = (node, toMany) => {
       foreignKey = reverseRelation.foreignKey;
     } else {
       const modelField = baseModel.fieldsByName[fieldName];
-      if (modelField?.type !== "relation") {
+      if (modelField?.kind !== "relation") {
         continue;
       }
       foreignKey = modelField.foreignKey;
@@ -1983,7 +1994,7 @@ var applySelects = (node, query, joins) => {
       { field: "id", alias: ID_ALIAS },
       ...getSimpleFields(node).filter((n) => {
         const field = node.model.fields.find(({ name: name2 }) => name2 === n.name.value);
-        if (!field || field.type === "relation" || field.type === "raw") {
+        if (!field || field.kind === "relation" || field.kind === "raw") {
           return false;
         }
         if (typeof field.queriable === "object" && !field.queriable.roles?.includes(node.ctx.user.role)) {
@@ -2285,10 +2296,10 @@ var createRevision = async (model, data, ctx) => {
     if (model.deletable) {
       revisionData.deleted = data.deleted || false;
     }
-    for (const { type, name: name2, nonNull: nonNull2, ...field } of model.fields.filter(({ updatable }) => updatable)) {
+    for (const { kind: type, name: name2, nonNull: nonNull2, ...field } of model.fields.filter(({ updatable }) => updatable)) {
       const col = type === "relation" ? `${name2}Id` : name2;
       if (nonNull2 && (!(col in data) || col === void 0 || col === null)) {
-        revisionData[col] = get(field, "default");
+        revisionData[col] = get(field, "defaultValue");
       } else {
         revisionData[col] = data[col];
       }
@@ -2316,7 +2327,7 @@ var sanitize = (ctx, model, data) => {
     }
   }
 };
-var isEndOfDay = (field) => field.type === "DateTime" && field?.endOfDay === true && field?.dateTimeType === "date" && field?.type === "DateTime";
+var isEndOfDay = (field) => isPrimitive(field) && field.type === "DateTime" && field?.endOfDay === true && field?.dateTimeType === "date";
 
 // src/resolvers/resolvers.ts
 var getResolvers = (models) => ({
@@ -2399,7 +2410,7 @@ var inputValues = (fields2) => fields2.map(
     kind: "InputValueDefinition",
     name: name(field.name),
     type: fieldType(field),
-    defaultValue: field.default === void 0 ? void 0 : value(field.default),
+    defaultValue: field.defaultValue === void 0 ? void 0 : value(field.defaultValue),
     directives: directives(field.directives)
   })
 );
@@ -2412,7 +2423,7 @@ var fields = (fields2) => fields2.map(
       kind: "InputValueDefinition",
       name: name(arg.name),
       type: fieldType(arg),
-      defaultValue: arg.default === void 0 ? void 0 : value(arg.default)
+      defaultValue: arg.defaultValue === void 0 ? void 0 : value(arg.defaultValue)
     })),
     directives: directives(field.directives)
   })
@@ -2519,14 +2530,10 @@ var generateDefinitions = (rawModels) => {
     ...rawModels.filter(isScalarModel).map((model) => scalar(model.name)),
     ...rawModels.filter(isRawObjectModel).map((model) => object(model.name, model.fields)),
     ...rawModels.filter(isRawObjectModel).filter(
-      (model) => models.some(
-        (m) => m.creatable && m.fields.some((f) => f.creatable && f.type === "json" && f.typeName === model.name)
-      )
+      (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(
-      (model) => models.some(
-        (m) => m.creatable && m.fields.some((f) => f.creatable && f.type === "json" && f.typeName === model.name)
-      )
+      (model) => models.some((m) => m.creatable && m.fields.some((f) => f.creatable && f.kind === "json" && f.type === model.name))
     ).map((model) => input(`Update${model.name}`, model.fields)),
     ...(0, import_flatMap2.default)(
       models.map((model) => {
@@ -2536,7 +2543,7 @@ var generateDefinitions = (rawModels) => {
             [
               ...model.fields.filter(isQueriableField).map((field) => ({
                 ...field,
-                type: field.type === "relation" || field.type === "enum" || field.type === "raw" || field.type === "json" ? field.typeName : field.type,
+                type: field.type,
                 args: [...field.args || []],
                 directives: field.directives
               })),
@@ -2557,29 +2564,29 @@ var generateDefinitions = (rawModels) => {
             model.interfaces
           ),
           input(`${model.name}Where`, [
-            ...model.fields.filter(({ type, unique, filterable }) => (unique || filterable) && type !== "relation").map(({ type, name: name2, filterable }) => ({
-              name: name2,
-              type,
+            ...model.fields.filter(({ kind, unique, filterable }) => (unique || filterable) && kind !== "relation").map((field) => ({
+              name: field.name,
+              type: field.type,
               list: true,
-              default: typeof filterable === "object" ? filterable.default : void 0
+              default: typeof field.filterable === "object" ? field.filterable.default : void 0
             })),
             ...(0, import_flatMap2.default)(
               model.fields.filter(({ comparable }) => comparable),
-              ({ name: name2, type }) => [
-                { name: `${name2}_GT`, type },
-                { name: `${name2}_GTE`, type },
-                { name: `${name2}_LT`, type },
-                { name: `${name2}_LTE`, type }
+              (field) => [
+                { name: `${field.name}_GT`, type: field.type },
+                { name: `${field.name}_GTE`, type: field.type },
+                { name: `${field.name}_LT`, type: field.type },
+                { name: `${field.name}_LTE`, type: field.type }
               ]
             ),
-            ...model.fields.filter(isRelation).filter(({ filterable }) => filterable).map(({ name: name2, typeName }) => ({
+            ...model.fields.filter(isRelation).filter(({ filterable }) => filterable).map(({ name: name2, type }) => ({
               name: name2,
-              type: `${typeName}Where`
+              type: `${type}Where`
             }))
           ]),
           input(
             `${model.name}WhereUnique`,
-            model.fields.filter(({ unique }) => unique).map(({ name: name2, type }) => ({ name: name2, type }))
+            model.fields.filter(({ unique }) => unique).map((field) => ({ name: field.name, type: field.type }))
           ),
           ...model.fields.some(({ orderable }) => orderable) ? [
             input(
@@ -2593,11 +2600,11 @@ var generateDefinitions = (rawModels) => {
             input(
               `Create${model.name}`,
               model.fields.filter(({ creatable }) => creatable).map(
-                ({ name: name2, nonNull: nonNull2, list: list2, default: defaultValue, ...field }) => field.type === "relation" ? { name: `${name2}Id`, type: "ID", nonNull: nonNull2 } : {
-                  name: name2,
-                  type: field.type === "enum" ? field.typeName : field.type === "json" ? `Create${field.typeName}` : field.type,
-                  list: list2,
-                  nonNull: nonNull2 && defaultValue === void 0
+                (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID", nonNull: field.nonNull } : {
+                  name: field.name,
+                  type: field.kind === "json" ? `Create${field.type}` : field.type,
+                  list: field.list,
+                  nonNull: field.nonNull && field.defaultValue === void 0
                 }
               )
             )
@@ -2608,10 +2615,10 @@ var generateDefinitions = (rawModels) => {
             input(
               `Update${model.name}`,
               model.fields.filter(({ updatable }) => updatable).map(
-                ({ name: name2, list: list2, ...field }) => field.type === "relation" ? { name: `${name2}Id`, type: "ID" } : {
-                  name: name2,
-                  type: field.type === "enum" ? field.typeName : field.type === "json" ? `Update${field.typeName}` : field.type,
-                  list: list2
+                (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID" } : {
+                  name: field.name,
+                  type: field.kind === "json" ? `Update${field.type}` : field.type,
+                  list: field.list
                 }
               )
             )
@@ -2807,6 +2814,7 @@ var printSchemaFromModels = (models) => printSchema((0, import_graphql5.buildAST
   inputValues,
   isCreatable,
   isCreatableBy,
+  isEnum,
   isEnumList,
   isEnumModel,
   isFieldNode,
@@ -2814,6 +2822,7 @@ var printSchemaFromModels = (models) => printSchema((0, import_graphql5.buildAST
   isInlineFragmentNode,
   isListType,
   isObjectModel,
+  isPrimitive,
   isQueriableBy,
   isQueriableField,
   isRaw,