drizzle-graphql-plus 0.8.18 → 0.8.20

package/index.js

@@ -2264,89 +2264,95 @@ var allowedNameChars2 = /^[a-zA-Z0-9_]+$/;
 var customScalars = /* @__PURE__ */ new Set();
 var enumDefinitions = /* @__PURE__ */ new Map();
 var requiredFieldFilters = /* @__PURE__ */ new Set();
+var foreignKeyTypes = /* @__PURE__ */ new Map();
 var columnToSDL = (column, columnName, tableName, forceNullable = false) => {
   let baseType;
   if (column.customGraphqlType) {
     baseType = column.customGraphqlType;
   } else {
-    switch (column.dataType) {
-      case "boolean":
-        baseType = "Boolean";
-        break;
-      case "json":
-        if (column.columnType === "PgGeometryObject") {
-          baseType = "PgGeometryObject";
-          customScalars.add("PgGeometryObject");
-        } else {
-          baseType = "JSON";
-          customScalars.add("JSON");
-        }
-        break;
-      case "date":
-        baseType = "Date";
-        customScalars.add("Date");
-        break;
-      case "string":
-        if (column.enumValues?.length) {
-          const enumName = `${capitalize(tableName)}${capitalize(
-            columnName
-          )}Enum`;
-          baseType = enumName;
-          if (!enumDefinitions.has(enumName)) {
-            enumDefinitions.set(enumName, {
-              name: enumName,
-              values: column.enumValues.map(
-                (e, index) => allowedNameChars2.test(e) ? e : `Option${index}`
-              )
-            });
+    const foreignKeyType = foreignKeyTypes.get(`${tableName}.${columnName}`);
+    if (foreignKeyType) {
+      baseType = foreignKeyType;
+    } else {
+      switch (column.dataType) {
+        case "boolean":
+          baseType = "Boolean";
+          break;
+        case "json":
+          if (column.columnType === "PgGeometryObject") {
+            baseType = "PgGeometryObject";
+            customScalars.add("PgGeometryObject");
+          } else {
+            baseType = "JSON";
+            customScalars.add("JSON");
           }
-        } else {
-          baseType = "String";
-        }
-        break;
-      case "bigint":
-        baseType = "BigInt";
-        customScalars.add("BigInt");
-        break;
-      case "number":
-        if (is7(column, PgInteger2) || is7(column, PgSerial2) || is7(column, MySqlInt2) || is7(column, MySqlSerial2) || is7(column, SQLiteInteger2)) {
-          baseType = "Int";
-        } else {
-          baseType = "Float";
-        }
-        break;
-      case "buffer":
-        baseType = "[Int!]";
-        break;
-      case "array":
-        if (column.columnType === "PgVector") {
-          baseType = "[Float!]";
-        } else if (column.columnType === "PgGeometry") {
-          baseType = "[Float!]";
-        } else {
-          const scalarName = `${capitalize(tableName)}${capitalize(
-            columnName
-          )}Array`;
-          baseType = scalarName;
-          customScalars.add(scalarName);
-        }
-        break;
-      case "custom":
-      default:
-        if (column.columnType) {
-          baseType = column.columnType;
-          customScalars.add(column.columnType);
-        } else {
-          const customScalarName = `${capitalize(tableName)}${capitalize(
-            columnName
-          )}`;
-          baseType = customScalarName;
-          customScalars.add(customScalarName);
-        }
-        break;
+          break;
+        case "date":
+          baseType = "Date";
+          customScalars.add("Date");
+          break;
+        case "string":
+          if (column.enumValues?.length) {
+            const enumName = `${capitalize(tableName)}${capitalize(
+              columnName
+            )}Enum`;
+            baseType = enumName;
+            if (!enumDefinitions.has(enumName)) {
+              enumDefinitions.set(enumName, {
+                name: enumName,
+                values: column.enumValues.map(
+                  (e, index) => allowedNameChars2.test(e) ? e : `Option${index}`
+                )
+              });
+            }
+          } else {
+            baseType = "String";
+          }
+          break;
+        case "bigint":
+          baseType = "BigInt";
+          customScalars.add("BigInt");
+          break;
+        case "number":
+          if (is7(column, PgInteger2) || is7(column, PgSerial2) || is7(column, MySqlInt2) || is7(column, MySqlSerial2) || is7(column, SQLiteInteger2)) {
+            baseType = "Int";
+          } else {
+            baseType = "Float";
+          }
+          break;
+        case "buffer":
+          baseType = "[Int!]";
+          break;
+        case "array":
+          if (column.columnType === "PgVector") {
+            baseType = "[Float!]";
+          } else if (column.columnType === "PgGeometry") {
+            baseType = "[Float!]";
+          } else {
+            const scalarName = `${capitalize(tableName)}${capitalize(
+              columnName
+            )}Array`;
+            baseType = scalarName;
+            customScalars.add(scalarName);
+          }
+          break;
+        case "custom":
+        default:
+          if (column.columnType) {
+            baseType = column.columnType;
+            customScalars.add(column.columnType);
+          } else {
+            const customScalarName = `${capitalize(tableName)}${capitalize(
+              columnName
+            )}`;
+            baseType = customScalarName;
+            customScalars.add(customScalarName);
+          }
+          break;
+      }
     }
   }
-  if (!forceNullable && column.notNull && !column.hasDefault && !column.defaultFn) {
+  if (!forceNullable && column.notNull) {
     return `${baseType}!`;
   }
   return baseType;
@@ -2400,6 +2406,53 @@ var generateTypeDefs = (tables, relations) => {
   customScalars.clear();
   enumDefinitions.clear();
   requiredFieldFilters.clear();
+  foreignKeyTypes.clear();
+  for (const [tableName, tableRelations] of Object.entries(relations)) {
+    const tableInfo = tables[tableName];
+    if (!tableInfo)
+      continue;
+    for (const [relationName, relationInfo] of Object.entries(tableRelations)) {
+      const relation = relationInfo.relation;
+      if (!is7(relation, One2))
+        continue;
+      const config = relation.config;
+      if (!config?.fields || !config?.references)
+        continue;
+      const referencedTableName = relationInfo.targetTableName;
+      const referencedTable = tables[referencedTableName];
+      if (!referencedTable)
+        continue;
+      for (let i = 0; i < config.fields.length; i++) {
+        const field = config.fields[i];
+        const reference = config.references[i];
+        if (!field || !reference)
+          continue;
+        const fieldColumnName = field.name;
+        const referenceColumnName = reference.name;
+        const foreignKeyColumn = Object.values(tableInfo.columns).find(
+          (col) => col.name === fieldColumnName
+        );
+        const referencedColumn = Object.values(referencedTable.columns).find(
+          (col) => col.name === referenceColumnName
+        );
+        if (!foreignKeyColumn || !referencedColumn)
+          continue;
+        const foreignKeyPropertyName = Object.keys(tableInfo.columns).find(
+          (key) => tableInfo.columns[key] === foreignKeyColumn
+        );
+        if (!foreignKeyPropertyName)
+          continue;
+        const referencedCustomType = referencedColumn.customGraphqlType;
+        const foreignKeyHasCustomType = !!foreignKeyColumn.customGraphqlType;
+        if (referencedCustomType && !foreignKeyHasCustomType) {
+          foreignKeyTypes.set(
+            `${tableName}.${foreignKeyPropertyName}`,
+            referencedCustomType
+          );
+        }
+      }
+    }
+  }
   for (const [tableName, tableInfo] of Object.entries(tables)) {
     const typeName = capitalize(tableName);
     const fields = [];