drizzle-graphql-plus 0.8.29 → 0.8.31

package/index.cjs

@@ -2460,8 +2460,17 @@ ${fields.join("\n")}
         false,
         isPrimaryKey
       );
-      const nullableType = typeStr.endsWith("!") ? typeStr.slice(0, -1) : typeStr;
-      insertFields.push(`  ${columnName}: ${nullableType}`);
+      const hasDefault = column.hasDefault || column.default !== void 0;
+      const isAutoIncrement = column.autoIncrement || column.generatedAlwaysAs;
+      const isNotNull3 = column.notNull;
+      const shouldBeOptional = hasDefault || isAutoIncrement || isPrimaryKey && !isNotNull3;
+      let insertFieldType;
+      if (shouldBeOptional) {
+        insertFieldType = typeStr.endsWith("!") ? typeStr.slice(0, -1) : typeStr;
+      } else {
+        insertFieldType = isNotNull3 && !typeStr.endsWith("!") ? `${typeStr}!` : typeStr;
+      }
+      insertFields.push(`  ${columnName}: ${insertFieldType}`);
     }
     if (insertFields.length > 0) {
       typeDefs.push(
@@ -2731,6 +2740,126 @@ var buildWhereClause = (tableInfo, where) => {
   return (0, import_drizzle_orm10.and)(...conditions);
 };
 
+// src/export-tool/utils.ts
+function isExportVariable(value) {
+  return typeof value === "string" && value.startsWith("$_") && value.length > 2;
+}
+function getVariableName(value) {
+  if (!isExportVariable(value)) {
+    return null;
+  }
+  return value.slice(2);
+}
+async function resolveExportVariables(args, exportStore, timeout, allowNull = true) {
+  if (isExportVariable(args)) {
+    const varName = getVariableName(args);
+    return await exportStore.waitFor(varName, timeout, allowNull);
+  }
+  if (Array.isArray(args)) {
+    const resolved = await Promise.all(
+      args.map(async (item) => {
+        if (isExportVariable(item)) {
+          const varName = getVariableName(item);
+          return await exportStore.waitFor(varName, timeout, allowNull);
+        } else if (typeof item === "object" && item !== null) {
+          return await resolveExportVariables(item, exportStore, timeout, allowNull);
+        }
+        return item;
+      })
+    );
+    return resolved;
+  }
+  if (typeof args === "object" && args !== null) {
+    const resolved = {};
+    for (const [key, value] of Object.entries(args)) {
+      if (isExportVariable(value)) {
+        const varName = getVariableName(value);
+        resolved[key] = await exportStore.waitFor(varName, timeout, allowNull);
+      } else if (Array.isArray(value)) {
+        resolved[key] = await resolveExportVariables(
+          value,
+          exportStore,
+          timeout,
+          allowNull
+        );
+      } else if (typeof value === "object" && value !== null) {
+        resolved[key] = await resolveExportVariables(
+          value,
+          exportStore,
+          timeout,
+          allowNull
+        );
+      } else {
+        resolved[key] = value;
+      }
+    }
+    return resolved;
+  }
+  return args;
+}
+function getExportDirective(fieldNode) {
+  const node = fieldNode;
+  if (!node || !node.directives) {
+    return null;
+  }
+  const exportDirective = node.directives.find(
+    (directive) => directive.name.value === "export"
+  );
+  if (!exportDirective) {
+    return null;
+  }
+  const asArg = exportDirective.arguments?.find(
+    (arg) => arg.name.value === "as"
+  );
+  if (!asArg || asArg.value.kind !== "StringValue") {
+    return null;
+  }
+  return asArg.value.value;
+}
+function hasExportVariables(args) {
+  if (isExportVariable(args)) {
+    return true;
+  }
+  if (Array.isArray(args)) {
+    return args.some((item) => hasExportVariables(item));
+  }
+  if (typeof args === "object" && args !== null) {
+    for (const value of Object.values(args)) {
+      if (hasExportVariables(value)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function processExports(result, selectionSet, exportStore) {
+  if (!result || !selectionSet)
+    return;
+  for (const selection of selectionSet.selections) {
+    if (selection.kind !== "Field")
+      continue;
+    const resultKey = selection.alias?.value ?? selection.name.value;
+    if (!(resultKey in result))
+      continue;
+    const value = result[resultKey];
+    const exportName = getExportDirective(selection);
+    if (exportName) {
+      exportStore.set(exportName, value);
+    }
+    if (selection.selectionSet && value !== null && value !== void 0) {
+      if (Array.isArray(value)) {
+        value.forEach((item) => {
+          if (item && typeof item === "object") {
+            processExports(item, selection.selectionSet, exportStore);
+          }
+        });
+      } else if (typeof value === "object") {
+        processExports(value, selection.selectionSet, exportStore);
+      }
+    }
+  }
+}
+
 // src/buildSchemaSDL/generator/utils/selection.ts
 var buildOrderByClause = (tableInfo, orderBy) => {
   if (!orderBy || Object.keys(orderBy).length === 0) {
@@ -2761,7 +2890,7 @@ var extractSelectedColumns = (fields, tableInfo) => {
   }
   return Object.keys(columns).length > 0 ? columns : {};
 };
-var extractRelationsParams2 = (relationMap, tables, tableName, fields) => {
+var extractRelationsParams2 = async (relationMap, tables, tableName, fields, context) => {
   const relations = relationMap[tableName];
   if (!relations)
     return void 0;
@@ -2787,10 +2916,15 @@ var extractRelationsParams2 = (relationMap, tables, tableName, fields) => {
     const relationArgs = relationField.args;
     if (relationArgs) {
       if (relationArgs["where"]) {
-        thisRecord.where = buildWhereClause(
-          targetTable,
-          relationArgs["where"]
-        );
+        let whereClause = relationArgs["where"];
+        if (context?.exportStore && hasExportVariables(whereClause)) {
+          try {
+            whereClause = await resolveExportVariables(whereClause, context.exportStore);
+          } catch (error) {
+            console.warn(`Failed to resolve export variables in nested relation ${relName}:`, error);
+          }
+        }
+        thisRecord.where = buildWhereClause(targetTable, whereClause);
       }
       if (relationArgs["orderBy"]) {
         thisRecord.orderBy = buildOrderByClause(
@@ -2805,11 +2939,12 @@ var extractRelationsParams2 = (relationMap, tables, tableName, fields) => {
         thisRecord.offset = relationArgs["offset"];
       }
     }
-    const nestedWith = extractRelationsParams2(
+    const nestedWith = await extractRelationsParams2(
       relationMap,
       tables,
       targetTableName,
-      allFields
+      allFields,
+      context
     );
     if (nestedWith) {
       thisRecord.with = nestedWith;
@@ -2839,11 +2974,12 @@ var createFindManyResolver = (queryBase, tableInfo, tables, relations) => {
         limit,
         orderBy: buildOrderByClause(tableInfo, orderBy),
         where: buildWhereClause(tableInfo, where),
-        with: extractRelationsParams2(
+        with: await extractRelationsParams2(
           relations,
           tables,
           tableInfo.name,
-          allFields
+          allFields,
+          context
         )
       });
       return result;
@@ -2872,11 +3008,12 @@ var createFindFirstResolver = (queryBase, tableInfo, tables, relations) => {
         columns: extractSelectedColumns(allFields, tableInfo),
         orderBy: buildOrderByClause(tableInfo, orderBy),
         where: buildWhereClause(tableInfo, where),
-        with: extractRelationsParams2(
+        with: await extractRelationsParams2(
           relations,
           tables,
           tableInfo.name,
-          allFields
+          allFields,
+          context
         )
       });
       return result || null;
@@ -2934,7 +3071,9 @@ var createInsertManyResolver = (db, queryBase, tableInfo, tables, relations, pri
         values,
         tableInfo.table
       );
-      const insertedRows = await db.insert(tableInfo.table).values(remappedValues).returning();
+      const insertedRows = await db.insert(tableInfo.table).values(remappedValues).returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const insertedIds = insertedRows.map(
         (row) => row[primaryKeyColumn.name]
       );
@@ -2976,7 +3115,9 @@ var createUpdateManyResolver = (db, queryBase, tableInfo, tables, relations, pri
       if (whereClause) {
         query = query.where(whereClause);
       }
-      const updatedRows = await query.returning();
+      const updatedRows = await query.returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const updatedIds = updatedRows.map(
         (row) => row[primaryKeyColumn.name]
       );
@@ -3014,7 +3155,9 @@ var createDeleteManyResolver = (db, queryBase, tableInfo, tables, relations, pri
       if (whereClause) {
         deleteQuery = deleteQuery.where(whereClause);
       }
-      const deletedRows = await deleteQuery.returning();
+      const deletedRows = await deleteQuery.returning({
+        [primaryKeyColumn.name]: primaryKeyColumn
+      });
       const deletedItems = deletedRows.map((row) => ({
         id: row[primaryKeyColumn.name]
       }));
@@ -3149,8 +3292,9 @@ var ExportStore = class {
    * Wait for a value to be available
    * Returns immediately if value already exists
    * Returns a Promise that resolves when value is set
+   * If timeout occurs and allowNull is true, resolves with null instead of rejecting
    */
-  async waitFor(name, timeout = 5e3) {
+  async waitFor(name, timeout = 5e3, allowNull = false) {
     if (this.store.has(name)) {
       return this.store.get(name);
     }
@@ -3165,7 +3309,11 @@ var ExportStore = class {
           const index = callbacks.indexOf(resolve);
           if (index > -1) {
             callbacks.splice(index, 1);
-            reject(new Error(`Timeout waiting for export variable "${name}"`));
+            if (allowNull) {
+              resolve(null);
+            } else {
+              reject(new Error(`Timeout waiting for export variable "${name}"`));
+            }
           }
         }
       }, timeout);
@@ -3192,124 +3340,6 @@ var ExportStore = class {
   }
 };
 
-// src/export-tool/utils.ts
-function isExportVariable(value) {
-  return typeof value === "string" && value.startsWith("$_") && value.length > 2;
-}
-function getVariableName(value) {
-  if (!isExportVariable(value)) {
-    return null;
-  }
-  return value.slice(2);
-}
-async function resolveExportVariables(args, exportStore, timeout) {
-  if (isExportVariable(args)) {
-    const varName = getVariableName(args);
-    return await exportStore.waitFor(varName, timeout);
-  }
-  if (Array.isArray(args)) {
-    const resolved = await Promise.all(
-      args.map(async (item) => {
-        if (isExportVariable(item)) {
-          const varName = getVariableName(item);
-          return await exportStore.waitFor(varName, timeout);
-        } else if (typeof item === "object" && item !== null) {
-          return await resolveExportVariables(item, exportStore, timeout);
-        }
-        return item;
-      })
-    );
-    return resolved;
-  }
-  if (typeof args === "object" && args !== null) {
-    const resolved = {};
-    for (const [key, value] of Object.entries(args)) {
-      if (isExportVariable(value)) {
-        const varName = getVariableName(value);
-        resolved[key] = await exportStore.waitFor(varName, timeout);
-      } else if (Array.isArray(value)) {
-        resolved[key] = await resolveExportVariables(
-          value,
-          exportStore,
-          timeout
-        );
-      } else if (typeof value === "object" && value !== null) {
-        resolved[key] = await resolveExportVariables(
-          value,
-          exportStore,
-          timeout
-        );
-      } else {
-        resolved[key] = value;
-      }
-    }
-    return resolved;
-  }
-  return args;
-}
-function getExportDirective(fieldNode) {
-  const node = fieldNode;
-  if (!node || !node.directives) {
-    return null;
-  }
-  const exportDirective = node.directives.find(
-    (directive) => directive.name.value === "export"
-  );
-  if (!exportDirective) {
-    return null;
-  }
-  const asArg = exportDirective.arguments?.find(
-    (arg) => arg.name.value === "as"
-  );
-  if (!asArg || asArg.value.kind !== "StringValue") {
-    return null;
-  }
-  return asArg.value.value;
-}
-function hasExportVariables(args) {
-  if (isExportVariable(args)) {
-    return true;
-  }
-  if (Array.isArray(args)) {
-    return args.some((item) => hasExportVariables(item));
-  }
-  if (typeof args === "object" && args !== null) {
-    for (const value of Object.values(args)) {
-      if (hasExportVariables(value)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-function processExports(result, selectionSet, exportStore) {
-  if (!result || !selectionSet)
-    return;
-  for (const selection of selectionSet.selections) {
-    if (selection.kind !== "Field")
-      continue;
-    const resultKey = selection.alias?.value ?? selection.name.value;
-    if (!(resultKey in result))
-      continue;
-    const value = result[resultKey];
-    const exportName = getExportDirective(selection);
-    if (exportName) {
-      exportStore.set(exportName, value);
-    }
-    if (selection.selectionSet && value !== null && value !== void 0) {
-      if (Array.isArray(value)) {
-        value.forEach((item) => {
-          if (item && typeof item === "object") {
-            processExports(item, selection.selectionSet, exportStore);
-          }
-        });
-      } else if (typeof value === "object") {
-        processExports(value, selection.selectionSet, exportStore);
-      }
-    }
-  }
-}
-
 // src/export-tool/middleware.ts
 function createExportMiddleware() {
   return (next) => {
@@ -3323,6 +3353,11 @@ function createExportMiddleware() {
         try {
           resolvedArgs = await resolveExportVariables(args, exportStore);
         } catch (error) {
+          if (error instanceof Error && error.message.includes("Timeout waiting for export variable")) {
+            throw new Error(
+              `Failed to resolve export variables in ${info.parentType.name}.${info.fieldName}: ${error.message}. Consider using a fallback value or checking if the exported field can return null.`
+            );
+          }
           throw new Error(
             `Failed to resolve export variables in ${info.parentType.name}.${info.fieldName}: ${error instanceof Error ? error.message : String(error)}`
           );
@@ -3333,7 +3368,7 @@ function createExportMiddleware() {
       if (!fieldNode)
         return result;
       const selfExportName = getExportDirective(fieldNode);
-      if (selfExportName && result !== void 0 && result !== null) {
+      if (selfExportName && result !== void 0) {
         exportStore.set(selfExportName, result);
       }
       if (fieldNode.selectionSet && result !== void 0 && result !== null) {