Merge commit '0c62b03109ca8619be61f122cf72a3bc389a325a' into search

Author: m1212e

.env.example

@@ -0,0 +1 @@
+NODE_ENV=development

.github/workflows/build_and_release.yml

@@ -19,16 +19,49 @@ jobs:
         run: bun run build
         env:
           REF_NAME: ${{ github.ref_name }}
-      - name: Set tag
-        id: tag
-        run: |
-          if [[ "${{ github.event.release.prerelease }}" == "true"  ]]; then
-            echo "tag=dev" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event.release.prerelease }}" == "false" ]]; then
-            echo "tag=latest" >> $GITHUB_OUTPUT
-          fi
-      - uses: JS-DevTools/npm-publish@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
-          token: ${{ secrets.NPM_TOKEN }}
-          package: ./out/package.json
-          tag: ${{ steps.tag.outputs.tag }}
+          name: client-build-output
+          path: out
+
+  publish:
+    strategy:
+      fail-fast: false
+      matrix:
+        registry-url: ["https://npm.pkg.github.com", "https://registry.npmjs.org"]
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      id-token: write
+    needs: [test_and_build]
+    steps:
+    - name: Download build output
+      uses: actions/download-artifact@v4
+      with:
+        name: client-build-output
+        path: .
+    - name: Set tag
+      id: tag
+      run: |
+        if [[ "${{ github.event.release.prerelease }}" == "true"  ]]; then
+          echo "tag=dev" >> $GITHUB_OUTPUT
+        elif [[ "${{ github.event.release.prerelease }}" == "false" ]]; then
+          echo "tag=latest" >> $GITHUB_OUTPUT
+        fi
+    - name: Set registry token
+      id: token
+      run: |
+        if [[ "${{ matrix.registry-url }}" == "https://npm.pkg.github.com" ]]; then
+          echo "token=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_OUTPUT
+        fi
+
+        if [[ "${{ matrix.registry-url }}" == "https://registry.npmjs.org" ]]; then
+          echo "token=${{ secrets.NPM_TOKEN }}" >> $GITHUB_OUTPUT
+        fi
+    - uses: JS-DevTools/npm-publish@v3
+      with:
+        token: ${{ steps.token.outputs.token }} 
+        registry: ${{ matrix.registry-url }}
+        tag: ${{ steps.tag.outputs.tag }}

README.md

@@ -5,8 +5,6 @@ rumble is a combined ability and graphql builder built around [drizzle](https://
 
 > Using rumble and reading these docs requires some basic knowledge about the above mentioned tools. If you feel stuck, please make sure to familiarize yourself with those first! Especially familiarity with pothos and its drizzle plugin are very helpful!
 
-> This is still in a very early stage and needs more testing. Please feel free to report everything you find/your feedback via the issues/discussion section of this repo!
-
 ## Getting started
 The following example is an excerpt from the example setup you can find [here](./example).
 
@@ -220,4 +218,4 @@ server.listen(3000, () => {
  console.info("Visit http://localhost:3000/graphql");
 });
 
-```
+```

bun.lock

@@ -126,7 +126,7 @@ abilityBuilder.posts.filter("read").by(({ context, entities }) => {
 const PostRef = schemaBuilder.drizzleObject("posts", {
 	name: "Post",
 	// this is how you can apply application level filter in manual object definitions
-	applyFilters: abilityBuilder.registeredFilters.posts.read,
+	applyFilters: abilityBuilder.z_registeredFilters.posts.read,
 	fields: (t) => ({
 		id: t.exposeInt("id"),
 		content: t.exposeString("content", { nullable: false }),
@@ -156,7 +156,11 @@ const UserRef = object({
 		return {
 			somethingElse: t.field({
 				type: "String",
-				resolve: (parent, args, context, info) => "something else",
+				args: {
+					amount: t.arg.int({ required: true }),
+				},
+				resolve: (parent, args, context, info) =>
+					`Hello ${parent.name}, you have provided the number: ${args.amount}`,
 			}),
 		};
 	},

example/src/main.ts

@@ -211,12 +211,21 @@ export const createAbilityBuilder = <
 
 	return {
 		...registrators,
-		/** @internal */
-		registeredQueryFilters: registeredQueryFilters,
-		/** @internal */
-		registeredFilters,
-		/** @internal */
-		buildWithUserContext: (userContext: UserContext) => {
+		/**
+		 * @internal
+		 * @ignore
+		 */
+		z_registeredQueryFilters: registeredQueryFilters,
+		/**
+		 * @internal
+		 * @ignore
+		 */
+		z_registeredFilters: registeredFilters,
+		/**
+		 * @internal
+		 * @ignore
+		 */
+		z_buildWithUserContext: (userContext: UserContext) => {
 			const builder: {
 				[key in TableName<DB>]: ReturnType<typeof createEntityObject<key>>;
 			} = {} as any;
@@ -324,7 +333,6 @@ export const createAbilityBuilder = <
 								// do some funky stuff with query resolve typing otherwise
 							});
 
-							// TODO: strongly type this based on table
 							const r = {
 								/**
 								 * Query filters for the drizzle query API.
@@ -344,7 +352,14 @@ export const createAbilityBuilder = <
 											return where();
 										},
 										columns: columns(),
-									},
+									} as Pick<
+										NonNullable<
+											NonNullable<
+												Parameters<DB["query"][TableNameT]["findFirst"]>[0]
+											>
+										>,
+										"columns" | "where"
+									>,
 									/**
 									 * For find many calls
 									 */
@@ -356,7 +371,14 @@ export const createAbilityBuilder = <
 										get limit() {
 											return limit();
 										},
-									},
+									} as Pick<
+										NonNullable<
+											NonNullable<
+												Parameters<DB["query"][TableNameT]["findMany"]>[0]
+											>
+										>,
+										"columns" | "where" | "limit"
+									>,
 								},
 								/**
 								 * Query filters for the drizzle SQL API as used in e.g. updates.
@@ -392,11 +414,8 @@ export const createAbilityBuilder = <
 							// as: don't return any columns
 							// therefore we need to delete it
 							if (!columns()) {
-								// biome-ignore lint/performance/noDelete: we need this to not exist
 								delete r.sql.columns;
-								// biome-ignore lint/performance/noDelete: we need this to not exist
 								delete r.query.many.columns;
-								// biome-ignore lint/performance/noDelete: we need this to not exist
 								delete r.query.single.columns;
 							}
 
@@ -533,7 +552,6 @@ export const createAbilityBuilder = <
 								? { OR: accumulatedWhereConditions }
 								: undefined;
 
-						//TODO make this actually typesafe
 						return transformToResponse({
 							where: combinedWhere,
 							columns: combinedAllowedColumns,

lib/abilityBuilder.ts

@@ -64,7 +64,7 @@ export const createContextFunction = <
 			: ({} as UserContext);
 		return {
 			...userContext,
-			abilities: abilityBuilder.buildWithUserContext(userContext),
+			abilities: abilityBuilder.z_buildWithUserContext(userContext),
 		};
 	};
 };

lib/context.ts

@@ -1,7 +1,6 @@
 import { toCamelCase } from "drizzle-orm/casing";
 import { type PgEnum, PgEnumColumn } from "drizzle-orm/pg-core";
-import { capitalizeFirstLetter } from "./helpers/capitalize";
-import { tableHelper } from "./helpers/tableHelpers";
+import { capitalize } from "es-toolkit";
 import type { SchemaBuilderType } from "./schemaBuilder";
 import type { GenericDrizzleDbTypeConstraints } from "./types/genericDrizzleDbType";
 import { RumbleError } from "./types/rumbleError";
@@ -132,7 +131,7 @@ Please ensure that you use the enum at least once as a column of a table!`);
 		}
 
 		const graphqlImplementationName =
-			refName ?? `${capitalizeFirstLetter(toCamelCase(enumSchemaName))}Enum`;
+			refName ?? `${capitalize(toCamelCase(enumSchemaName))}Enum`;
 
 		let ret: ReturnType<typeof implement> | undefined = referenceStorage.get(
 			graphqlImplementationName,