@m1212e/rumble 0.18.8 → 0.20.0

package/out/index.mjs

@@ -1,5 +1,5 @@
-import { t as lazy } from "./lazy-BgeBy3-B.mjs";
-import { t as generateFromSchema } from "./generate-BxAyU8HE.mjs";
+import { t as lazy } from "./lazy-C7IyM4M4.mjs";
+import { t as generateFromSchema } from "./generate-B4w-hX0K.mjs";
 import { GraphQLError } from "graphql";
 import { EnvelopArmorPlugin } from "@escape.tech/graphql-armor";
 import { useDisableIntrospection } from "@graphql-yoga/plugin-disable-introspection";
@@ -8,7 +8,7 @@ import { AttributeNames, SpanNames, createOpenTelemetryWrapper } from "@pothos/t
 import { capitalize, cloneDeep, debounce, merge, toMerged } from "es-toolkit";
 import { createPubSub, createYoga } from "graphql-yoga";
 import { One, count, relationsFilterToSQL, sql } from "drizzle-orm";
-import { CasingCache, toCamelCase } from "drizzle-orm/casing";
+import { toCamelCase } from "drizzle-orm/casing";
 import { PgEnumColumn, PgTable } from "drizzle-orm/pg-core";
 import pluralize from "pluralize";
 import { MySqlTable } from "drizzle-orm/mysql-core";
@@ -180,7 +180,7 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.18.8";
+var version = "0.20.0";
 //#endregion
 //#region lib/helpers/mergeFilters.ts
 function mergeFilters(filterA, filterB, mode = "AND") {
@@ -303,23 +303,28 @@ function createDistinctValuesFromSQLType(sqlType) {
 const drizzleNameSymbol = Symbol.for("drizzle:Name");
 const drizzleOriginalNameSymbol = Symbol.for("drizzle:OriginalName");
 const drizzleBaseNameSymbol = Symbol.for("drizzle:BaseName");
+const drizzleColumnsSymbol = Symbol.for("drizzle:Columns");
 function tableHelper({ db, table }) {
-	if (typeof table !== "string") table = table.tsName || table.dbName || table[drizzleNameSymbol] || table[drizzleOriginalNameSymbol] || table[drizzleBaseNameSymbol];
-	const foundRelation = Object.values(db._.relations).find((schema) => schema.name === table || schema.table[drizzleNameSymbol] === table || schema.table[drizzleOriginalNameSymbol] === table || schema.table[drizzleBaseNameSymbol] === table);
-	if (!foundRelation) throw new RumbleError(`Could not find schema for ${JSON.stringify(table)}`);
-	const foundSchema = Object.values(db._.schema).find((schema) => schema.dbName === foundRelation.table[drizzleOriginalNameSymbol]);
-	if (!foundSchema) throw new RumbleError(`Could not find schema for ${JSON.stringify(table)}`);
-	const fullSchema = db._.fullSchema?.[foundSchema.tsName];
-	if (!fullSchema) throw new RumbleError(`Could not find full schema for ${JSON.stringify(table)}`);
+	let tableName;
+	if (typeof table !== "string") {
+		const t = table;
+		tableName = t.name ?? t[drizzleNameSymbol] ?? t[drizzleOriginalNameSymbol] ?? t[drizzleBaseNameSymbol];
+	} else tableName = table;
+	const foundRelation = Object.values(db._.relations).find((entry) => entry.name === tableName || entry.table[drizzleNameSymbol] === tableName || entry.table[drizzleOriginalNameSymbol] === tableName || entry.table[drizzleBaseNameSymbol] === tableName);
+	if (!foundRelation) throw new RumbleError(`Could not find schema for ${JSON.stringify(tableName)}`);
+	const tableObj = foundRelation.table;
+	const columns = tableObj[drizzleColumnsSymbol] ?? {};
+	const primaryKey = Object.fromEntries(Object.entries(columns).filter(([_, col]) => col.primary));
+	const dbName = tableObj[drizzleOriginalNameSymbol] ?? tableObj[drizzleBaseNameSymbol] ?? tableObj[drizzleNameSymbol] ?? foundRelation.name;
+	const tsName = foundRelation.name;
 	return {
-		columns: foundSchema.columns,
-		primaryKey: foundSchema.primaryKey,
+		columns,
+		primaryKey,
 		relations: foundRelation.relations,
-		dbName: foundSchema.dbName,
-		tsName: foundSchema.tsName,
-		foundSchema,
-		foundRelation,
-		fullSchema
+		dbName,
+		tsName,
+		table: tableObj,
+		foundRelation
 	};
 }
 //#endregion
@@ -472,7 +477,7 @@ by: (explicitFilter) => {
 								return limit ?? void 0;
 							});
 							const sqlTransformedWhere = lazy(() => {
-								const casing = db._.session?.dialect?.casing ?? new CasingCache();
+								const casing = db._.session?.dialect?.casing;
 								return filters?.where ? relationsFilterToSQL(tableSchema.foundRelation.table, filters.where, tableSchema.relations, db._.relations, casing) : void 0;
 							});
 							if (filters?.columns) return {
@@ -698,27 +703,30 @@ const createOrderArgImplementer = ({ db, schemaBuilder }) => {
 //#endregion
 //#region lib/enum.ts
 /**
-* Checks if a schema type is an enum
+* Checks if a column is a PgEnumColumn
 */
 function isEnumSchema(schemaType) {
 	return schemaType instanceof PgEnumColumn;
 }
-const createEnumImplementer = ({ db, schemaBuilder }) => {
+const createEnumImplementer = ({ schemaBuilder }) => {
 	const referenceStorage = /* @__PURE__ */ new Map();
-	const enumImplementer = ({ tsName, enumColumn, refName }) => {
+	/**
+	* Registers a Postgres enum as a GraphQL enum type.
+	*
+	* Pass the `enum` option with the pgEnum object (e.g. `moodEnum`),
+	* or pass the `enumColumn` option with a column that uses the enum.
+	* Use `refName` to override the auto-generated GraphQL type name.
+	*/
+	const enumImplementer = ({ enum: enumObject, enumColumn, refName }) => {
 		let enumSchemaName;
 		let enumValues;
-		if (tsName) {
-			const schemaEnum = db._.fullSchema[tsName];
-			enumSchemaName = tsName.toString();
-			const enumCol = Object.values(db._.schema).filter((s) => typeof s === "object").map((s) => Object.values(s.columns)).flat(2).filter(isEnumSchema).find((e) => e.config.enum === schemaEnum);
-			if (!enumCol) throw new RumbleError(`Could not find applied enum column for ${tsName.toString()}.
-Please ensure that you use the enum at least once as a column of a table!`);
-			enumValues = enumCol.enumValues;
+		if (enumObject) {
+			enumSchemaName = enumObject.enumName;
+			enumValues = enumObject.enumValues;
 		} else if (enumColumn) {
-			const entry = Object.entries(db._.fullSchema).filter(([_, value]) => enumColumn.config.enum === value)[0];
-			if (!entry) throw new RumbleError(`Could not find enum entry for ${enumColumn.config.name}.`);
-			enumSchemaName = entry[0];
+			const pgEnum = enumColumn.enum;
+			if (!pgEnum) throw new RumbleError(`Could not find enum definition on column. Make sure the column is a pgEnum column.`);
+			enumSchemaName = pgEnum.enumName;
 			enumValues = enumColumn.enumValues;
 		}
 		if (!enumSchemaName || !enumValues) throw new RumbleError("Could not determine enum structure!");
@@ -894,7 +902,7 @@ const createCountQueryImplementer = ({ db, schemaBuilder, whereArgImplementer, m
 				resolve: async (root, args, ctx, info) => {
 					if (isAllowed && !await isAllowed(ctx)) throw new RumbleErrorSafe("Not allowed to perform this action");
 					deepSetProto(args);
-					return db.select({ count: count() }).from(tableSchema.fullSchema).where(ctx.abilities[table].filter(listAction).merge(mapNullFieldsToUndefined(args)).sql.where).then(assertFirstEntryExists).then((r) => r.count);
+					return db.select({ count: count() }).from(tableSchema.table).where(ctx.abilities[table].filter(listAction).merge(mapNullFieldsToUndefined(args)).sql.where).then(assertFirstEntryExists).then((r) => r.count);
 				}
 			}) };
 		});
@@ -1639,19 +1647,6 @@ const createSchemaBuilder = ({ db, disableDefaultObjects, pubsub, pothosConfig,
 //#endregion
 //#region lib/rumble.ts
 const rumble = (rumbleInput) => {
-	if (!rumbleInput.db._.schema) throw new RumbleError(`
-rumble could not find any schema in the provided drizzle instance.
-Make sure you import the schema and pass it to the drizzle instance:
-
-export const db = drizzle(
-  "postgres://postgres:postgres@localhost:5432/postgres",
-  {
-    relations,
-    schema,    // <--- add this line
-  },
-);
-
-`);
 	if (!rumbleInput.db._.relations) throw new RumbleError(`
 rumble could not find any relations in the provided drizzle instance.
 Make sure you import the relations and pass them to the drizzle instance:
@@ -1660,7 +1655,6 @@ export const db = drizzle(
   "postgres://postgres:postgres@localhost:5432/postgres",
   {
     relations, // <--- add this line
-    schema,
   },
 );