create-ej-app 10.0.0 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "scripts": {

package/template/base/src/lib/safe-action-client.ts

@@ -14,17 +14,34 @@ type AnyAction = (
 type ActionInput<T extends AnyAction> = Parameters<T>[0]
 type ActionData<T extends AnyAction> = Awaited<ReturnType<T>>['data']
 
+class SafeActionError extends Error {
+  constructor(
+    public message: string,
+    public validationErrors?: Record<string, string[] | undefined>
+  ) {
+    super(message)
+  }
+}
+
 export function useSafeActionQuery<TAction extends AnyAction>(
+  key: string,
   action: TAction,
   input: ActionInput<TAction>,
   options?: Omit<UseQueryOptions<ActionData<TAction>>, 'queryKey' | 'queryFn'>
 ) {
   return useQuery({
-    queryKey: [`${action.name}`, input],
+    queryKey: [key, input],
     queryFn: async () => {
       const result = await action(input)
-      if (result?.serverError) throw new Error(result.serverError)
-      if (result?.validationErrors) throw new Error('Validation failed')
+
+      if (result?.serverError) {
+        throw new SafeActionError(result.serverError)
+      }
+
+      if (result?.validationErrors) {
+        throw new SafeActionError('Validation failed', result.validationErrors)
+      }
+
       return result?.data
     },
     ...options
@@ -33,13 +50,24 @@ export function useSafeActionQuery<TAction extends AnyAction>(
 
 export function useSafeActionMutation<TAction extends AnyAction>(
   action: TAction,
-  options?: UseMutationOptions<ActionData<TAction>, Error, ActionInput<TAction>>
+  options?: UseMutationOptions<
+    ActionData<TAction>,
+    SafeActionError,
+    ActionInput<TAction>
+  >
 ) {
   return useMutation({
     mutationFn: async (input: ActionInput<TAction>) => {
       const result = await action(input)
-      if (result?.serverError) throw new Error(result.serverError)
-      if (result?.validationErrors) throw new Error('Validation failed')
+
+      if (result?.serverError) {
+        throw new SafeActionError(result.serverError)
+      }
+
+      if (result?.validationErrors) {
+        throw new SafeActionError('Validation failed', result.validationErrors)
+      }
+
       return result?.data
     },
     ...options