@vantreeseba/drizzle-graphql 7.8.0 → 7.9.1

package/dist/index.js

@@ -468,6 +468,7 @@ var remapToGraphQLCore = (key, value, tableName, column, relationMap) => {
   return value;
 };
 var remapToGraphQLSingleOutput = (queryOutput, tableName, table, relationMap) => {
+  const columns = getTableColumns2(table);
   for (const [key, value] of Object.entries(queryOutput)) {
     if (value === void 0 || value === null) {
       const relEntry = value === null ? relationMap?.[tableName]?.[key] : void 0;
@@ -478,7 +479,7 @@ var remapToGraphQLSingleOutput = (queryOutput, tableName, table, relationMap) =>
       delete queryOutput[key];
       continue;
     }
-    const column = table[key];
+    const column = columns[key];
     if (value === 0n && column && column.columnType === "SQLiteBigInt" && !column.notNull) {
       delete queryOutput[key];
       continue;
@@ -937,6 +938,7 @@ var resolveQueryExecutor = (db, context, tableName, buildTimeQueryBase) => {
     queryBase: buildTimeQueryBase ? executor?.query?.[tableName] ?? buildTimeQueryBase : buildTimeQueryBase
   };
 };
+var DEFAULT_TRANSACTION_TIMEOUT_MS = 3e4;
 var createMutationTxCtx = (options) => options ? { timeoutMs: options.timeoutMs, fieldNames: /* @__PURE__ */ new Set(), states: /* @__PURE__ */ new WeakMap() } : void 0;
 var includedByDirectives = (node, variables) => {
   for (const directive of node.directives ?? []) {
@@ -1195,14 +1197,8 @@ var createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limits
     if (localValue == null) {
       return isOne ? null : [];
     }
-    const {
-      where: whereArg,
-      orderBy: orderByArg,
-      limit: requestedLimit,
-      offset,
-      after,
-      deleted
-    } = args ?? {};
+    const { where: whereArg, limit: requestedLimit, offset, after, deleted } = args ?? {};
+    const orderByArg = isOne ? args?.orderBy : withDefaultOrderBy(args ?? {}, targetTableName, policies?.defaultOrderBy).orderBy;
     const limit = applyLimitPolicy(requestedLimit, limitPolicy, `${tableName}.${relationName}`);
     const distinct = (args ?? {}).distinct?.length ? (args ?? {}).distinct : void 0;
     const cursorSelected = !isOne && !!info && selectsCursorField(info, targetTable);
@@ -1334,6 +1330,13 @@ var inputFieldDocs = (docs, column, tableName, columnName, fieldType) => {
   }
   return resolved;
 };
+var withDefaultOrderBy = (args, tableName, defaults) => {
+  if (!defaults || args?.orderBy != null) {
+    return args;
+  }
+  const fallback = defaults(tableName);
+  return fallback ? { ...args, orderBy: fallback } : args;
+};
 var applyLimitPolicy = (limit, policy, fieldName) => {
   if (!policy) {
     return limit ?? void 0;
@@ -2800,11 +2803,12 @@ var withScope = (scope, tableName, table, condition, mode) => {
   const predicate = scope?.on(tableName, table, mode);
   return predicate ? and(condition, predicate) : condition;
 };
-var bindPolicies = (policies, filterCtx) => policies?.scope || policies?.contextValues || policies?.softDelete || policies?.onWrite ? {
+var bindPolicies = (policies, filterCtx) => policies?.scope || policies?.contextValues || policies?.softDelete || policies?.onWrite || policies?.defaultOrderBy ? {
   scope: policies.scope || policies.softDelete ? (context) => resolveScope(policies, context, filterCtx) : void 0,
   contextValues: policies.contextValues,
   softDelete: policies.softDelete,
-  onWrite: policies.onWrite
+  onWrite: policies.onWrite,
+  defaultOrderBy: policies.defaultOrderBy
 } : void 0;
 var applyContextValues = (values, hooks, context) => {
   if (!hooks) {
@@ -2833,7 +2837,7 @@ var stripContextValues = (values, hooks) => {
   }
   return values;
 };
-var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, originField, typeNameMapper, _isInitial = false, filterCtx, limits, scope) => {
+var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, originField, typeNameMapper, _isInitial = false, filterCtx, limits, scope, defaultOrderBy) => {
   const relationsForTable = relationMap[tableName];
   if (!relationsForTable) {
     return void 0;
@@ -2875,7 +2879,7 @@ var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, ori
     const thisRecord = {};
     thisRecord.columns = columns;
     const relationField = Object.values(baseField).find((e) => e.name === relName);
-    const relationArgs = relationField?.args;
+    const relationArgs = is3(relEntry.relation, One2) ? relationField?.args : relationField && withDefaultOrderBy(relationField.args ?? {}, targetTableName, defaultOrderBy);
     const offset = relationArgs?.offset ?? void 0;
     const limit = is3(relEntry.relation, One2) ? relationArgs?.limit ?? void 0 : applyLimitPolicy(relationArgs?.limit, limits?.(targetTableName), `${tableName}.${relName}`);
     const relWhere = relationArgs?.where;
@@ -2904,14 +2908,15 @@ var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, ori
       false,
       filterCtx,
       limits,
-      scope
+      scope,
+      defaultOrderBy
     ) : void 0;
     thisRecord.with = relWith;
     args[relName] = thisRecord;
   }
   return args;
 };
-var extractRelationsParams = (relationMap, tables, tableName, info, typeName, typeNameMapper, filterCtx, limits, scope) => {
+var extractRelationsParams = (relationMap, tables, tableName, info, typeName, typeNameMapper, filterCtx, limits, scope, defaultOrderBy) => {
   if (!info) {
     return void 0;
   }
@@ -2925,7 +2930,8 @@ var extractRelationsParams = (relationMap, tables, tableName, info, typeName, ty
     true,
     filterCtx,
     limits,
-    scope
+    scope,
+    defaultOrderBy
   );
 };
 var pruneNonEagerRelations = (relationMap, shouldEagerLoad) => {
@@ -3336,7 +3342,8 @@ var prepareMutationRelationColumns = (params) => {
     typeNameMapper,
     void 0,
     params.limits,
-    params.scope
+    params.scope,
+    params.defaultOrderBy
   ) : void 0;
   const hasRelations = !!(withParams && Object.keys(withParams).length);
   const baseColumns = extractSelectedColumnsFromTreeSQLFormat(parsedInfo.fieldsByTypeName[typeName], table, {
@@ -3678,7 +3685,8 @@ var runRelationalSelect = async (opts) => {
       typeNameMapper,
       filterCtx,
       opts.limits,
-      scope
+      scope,
+      opts.defaultOrderBy
     ) : void 0
   };
   if (single) {
@@ -3964,7 +3972,7 @@ var parseAggregateRequest = (info, target, rootTypeName = `${target.typeName}Agg
   for (const field of Object.values(selectionTree)) {
     if (field.name === "count") {
       request.count = true;
-      request.selection.count = count();
+      request.selection["count"] = count();
       continue;
     }
     if (!AGGREGATE_OPS.includes(field.name)) {
@@ -3990,7 +3998,7 @@ var parseAggregateRequest = (info, target, rootTypeName = `${target.typeName}Agg
 var assembleAggregateRow = (row, request, target) => {
   const result = {};
   if (request.count) {
-    result.count = row.count == null ? 0 : Number(row.count);
+    result["count"] = row["count"] == null ? 0 : Number(row["count"]);
   }
   for (const op of AGGREGATE_OPS) {
     if (!request.ops[op].length) {
@@ -4316,7 +4324,8 @@ var generateSelectArray = (db, tableName, tables, relationMap, orderArgs, filter
   );
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo2(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -4334,6 +4343,7 @@ var generateSelectArray = (db, tableName, tables, relationMap, orderArgs, filter
           single: false,
           filterCtx,
           limits,
+          defaultOrderBy: policies?.defaultOrderBy,
           scope: policies?.scope?.(context),
           pkNames,
           db: executor,
@@ -4359,7 +4369,8 @@ var generateSelectSingle = (db, tableName, tables, relationMap, orderArgs, filte
   const pkNames = mysqlPrimaryKeyPropNames(table);
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo2(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -4376,6 +4387,7 @@ var generateSelectSingle = (db, tableName, tables, relationMap, orderArgs, filte
           single: true,
           filterCtx,
           limits,
+          defaultOrderBy: policies?.defaultOrderBy,
           scope: policies?.scope?.(context),
           pkNames,
           db: executor
@@ -4883,7 +4895,7 @@ var generateSchemaData = (db, schema, relations, options) => {
   const inputs = {};
   const outputs = {};
   if (["insert", "upsert", "update", "delete"].some((feature) => anyTable(feature))) {
-    outputs.MutationReturn = mutationReturnType;
+    outputs["MutationReturn"] = mutationReturnType;
   }
   for (const [tableName, tableTypes] of Object.entries(gqlSchemaTypes)) {
     const tableFeatures = featureOf(tableName);
@@ -5795,7 +5807,8 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
   );
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo3(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -5816,6 +5829,7 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
             single: false,
             filterCtx,
             limits,
+            defaultOrderBy: policies?.defaultOrderBy,
             pkNames,
             db: executor,
             scope,
@@ -5925,7 +5939,8 @@ var generateSelectSingle2 = (db, tableName, tables, relationMap, orderArgs, filt
   const pkNames = pgPrimaryKeyPropNames(table);
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo3(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -5944,6 +5959,7 @@ var generateSelectSingle2 = (db, tableName, tables, relationMap, orderArgs, filt
             single: true,
             filterCtx,
             limits,
+            defaultOrderBy: policies?.defaultOrderBy,
             pkNames,
             db: executor,
             scope
@@ -6037,7 +6053,8 @@ var generateInsertArray2 = (db, tableName, table, tables, relationMap, baseType,
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntries ? nested.withJoinColumns(tableName, mergedOps(nestedEntries), { ...columns }, table) : columns;
             const runInsert = async (target, values) => {
@@ -6127,7 +6144,8 @@ var generateInsertSingle2 = (db, tableName, table, tables, relationMap, baseType
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntry ? nested.withJoinColumns(tableName, nestedEntry.ops, { ...columns }, table) : columns;
             const runInsert = async (target, values) => {
@@ -6229,7 +6247,8 @@ var generateUpsert2 = (db, tableName, table, tables, relationMap, baseType, onCo
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntries ? nested.withJoinColumns(tableName, mergedOps(nestedEntries), { ...columns }, table) : columns;
             const runUpsert = async (target, values) => {
@@ -6327,7 +6346,8 @@ var generateUpdate2 = (db, tableName, table, tables, relationMap, setArgs, filte
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const entry = nested?.enabled(tableName) ? nested.split(tableName, set) : void 0;
             const nestedOps = entry && nested.hasOps(entry.ops) ? entry.ops : void 0;
@@ -6441,7 +6461,8 @@ var generateUpdateMany2 = (db, tableName, table, tables, relationMap, updateMany
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const entries = updates.map(({ where, set }) => {
               const split = nested?.enabled(tableName) ? nested.split(tableName, set) : void 0;
@@ -6636,7 +6657,7 @@ function generateSchemaData2(db, schema, relations, options) {
   for (const excluded of excludedTables) {
     delete namedRelations[excluded];
   }
-  attachTargetPrimaryKeys(namedRelations, tables, pgPrimaryKeyPropNames);
+  attachTargetPrimaryKeys(namedRelations, tables, (table) => pgPrimaryKeyPropNames(table));
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
   const filterCtx = { tables, relationMap: namedRelations };
   const tablePolicies = options.policies;
@@ -7250,7 +7271,8 @@ var generateSelectArray3 = (db, tableName, tables, relationMap, orderArgs, filte
   );
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo4(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -7268,6 +7290,7 @@ var generateSelectArray3 = (db, tableName, tables, relationMap, orderArgs, filte
           single: false,
           filterCtx,
           limits,
+          defaultOrderBy: policies?.defaultOrderBy,
           pkNames,
           db: executor,
           scope: policies?.scope?.(context),
@@ -7293,7 +7316,8 @@ var generateSelectSingle3 = (db, tableName, tables, relationMap, orderArgs, filt
   const pkNames = sqlitePrimaryKeyPropNames(table);
   return {
     name: fieldName,
-    resolver: async (_source, args, context, info) => {
+    resolver: async (_source, rawArgs, context, info) => {
+      const args = withDefaultOrderBy(rawArgs, tableName, policies?.defaultOrderBy);
       try {
         const parsedInfo = parseResolveInfo4(info, { deep: true });
         const { executor, queryBase: requestQueryBase } = resolveQueryExecutor(db, context, tableName, queryBase);
@@ -7310,6 +7334,7 @@ var generateSelectSingle3 = (db, tableName, tables, relationMap, orderArgs, filt
           single: true,
           filterCtx,
           limits,
+          defaultOrderBy: policies?.defaultOrderBy,
           pkNames,
           db: executor,
           scope: policies?.scope?.(context)
@@ -7374,7 +7399,8 @@ var generateInsertArray3 = (db, tableName, table, tables, relationMap, baseType,
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntries ? nested.withJoinColumns(tableName, mergedOps(nestedEntries), { ...columns }, table) : columns;
             const runInsert = async (target, values) => {
@@ -7464,7 +7490,8 @@ var generateInsertSingle3 = (db, tableName, table, tables, relationMap, baseType
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntry ? nested.withJoinColumns(tableName, nestedEntry.ops, { ...columns }, table) : columns;
             const runInsert = async (target, values) => {
@@ -7566,7 +7593,8 @@ var generateUpsert3 = (db, tableName, table, tables, relationMap, baseType, onCo
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const returning = nestedEntries ? nested.withJoinColumns(tableName, mergedOps(nestedEntries), { ...columns }, table) : columns;
             const runUpsert = async (target, values) => {
@@ -7664,7 +7692,8 @@ var generateUpdate3 = (db, tableName, table, tables, relationMap, setArgs, filte
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const entry = nested?.enabled(tableName) ? nested.split(tableName, set) : void 0;
             const nestedOps = entry && nested.hasOps(entry.ops) ? entry.ops : void 0;
@@ -7778,7 +7807,8 @@ var generateUpdateMany3 = (db, tableName, table, tables, relationMap, updateMany
               pkNames,
               parsedInfo,
               limits,
-              scope
+              scope,
+              defaultOrderBy: policies?.defaultOrderBy
             });
             const entries = updates.map(({ where, set }) => {
               const split = nested?.enabled(tableName) ? nested.split(tableName, set) : void 0;
@@ -8765,7 +8795,9 @@ var buildSchema = (db, config) => {
     aggregateCost: (complexityConfig === true ? void 0 : complexityConfig.aggregateCost) ?? 10
   };
   const transactionsOpt = config?.transactions;
-  const transactions = transactionsOpt === void 0 || transactionsOpt === "none" ? void 0 : { timeoutMs: (transactionsOpt === "auto" ? void 0 : transactionsOpt.timeoutMs) ?? 3e4 };
+  const transactions = transactionsOpt === void 0 || transactionsOpt === "none" ? void 0 : {
+    timeoutMs: (transactionsOpt === "auto" ? void 0 : transactionsOpt.timeoutMs) ?? DEFAULT_TRANSACTION_TIMEOUT_MS
+  };
   const limitsConfig = config?.limits;
   if (limitsConfig) {
     const check = (policy, where) => {
@@ -8793,6 +8825,46 @@ var buildSchema = (db, config) => {
     limitPolicyCache.set(tableName, resolved);
     return resolved;
   } : void 0;
+  const defaultsConfig = config?.defaults;
+  const defaultOrderByByTable = /* @__PURE__ */ new Map();
+  if (defaultsConfig) {
+    const defaultsTableNames = new Set(tableKeys);
+    for (const [tableName, tableDefaults] of Object.entries(defaultsConfig)) {
+      if (!defaultsTableNames.has(tableName)) {
+        throw new Error(
+          `Drizzle-GraphQL Error: config.defaults names '${tableName}', which is not a table in the Drizzle schema.`
+        );
+      }
+      const orderBy = tableDefaults?.orderBy;
+      if (!orderBy || !Object.keys(orderBy).length) {
+        continue;
+      }
+      const columns = getColumns6(schema[tableName]);
+      const normalized = {};
+      for (const [columnName, entry] of Object.entries(orderBy)) {
+        if (!columns[columnName]) {
+          throw new Error(
+            `Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy names '${columnName}', which is not a column of '${tableName}'.`
+          );
+        }
+        const direction = typeof entry === "string" ? entry : entry?.direction;
+        if (direction !== "asc" && direction !== "desc") {
+          throw new Error(
+            `Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy.${columnName} must be 'asc', 'desc', or { direction, priority? }.`
+          );
+        }
+        const priority = typeof entry === "string" ? void 0 : entry?.priority;
+        if (priority !== void 0 && !Number.isInteger(priority)) {
+          throw new Error(
+            `Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy.${columnName}.priority must be an integer.`
+          );
+        }
+        normalized[columnName] = priority === void 0 ? { direction } : { direction, priority };
+      }
+      defaultOrderByByTable.set(tableName, normalized);
+    }
+  }
+  const defaultOrderBy = defaultOrderByByTable.size ? (tableName) => defaultOrderByByTable.get(tableName) : void 0;
   const scopeConfig = config?.scope;
   const contextValuesConfig = config?.contextValues;
   if (scopeConfig || contextValuesConfig) {
@@ -8873,11 +8945,12 @@ var buildSchema = (db, config) => {
     }
   }
   const onWrite = globalWriteHooks || writeHooks.size ? (tableName) => globalWriteHooks ?? writeHooks.get(tableName) : void 0;
-  const policies = scopeConfig || contextValuesConfig || softDeleteInfos.size || onWrite ? {
+  const policies = scopeConfig || contextValuesConfig || softDeleteInfos.size || onWrite || defaultOrderBy ? {
     scope: scopeConfig ? (tableName) => scopeConfig[tableName] : void 0,
     contextValues: contextValuesConfig ? (tableName) => contextValuesConfig[tableName] : void 0,
     softDelete: softDeleteInfos.size ? (tableName) => softDeleteInfos.get(tableName) : void 0,
-    onWrite
+    onWrite,
+    defaultOrderBy
   } : void 0;
   const exclude = config?.exclude;
   if (exclude) {