sdnext 0.0.5 → 0.0.6

package/dist/utils/hook.d.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-export type HookType = "query" | "mutation";
+export type HookType = "get" | "query" | "mutation";
 export type HookContentMap = Record<HookType, string>;
 export interface HookData extends HookContentMap {
     overwrite: boolean;

package/dist/utils/hook.js

@@ -2,11 +2,13 @@ import { mkdir, readFile, readdir, stat, writeFile } from "fs/promises";
 import { join, parse, relative } from "path";
 import { checkbox as prompts_checkbox, select as prompts_select } from "@inquirer/prompts";
 function getHookTypeFromName(name) {
-    if (/^(get|query)[^a-z]/.test(name)) return "query";
+    if (/^get[^a-z]/.test(name)) return "get";
+    if (/^query[^a-z]/.test(name)) return "query";
     return "mutation";
 }
 function getHookTypeFromContent(content) {
     if (content.includes("useMutation")) return "mutation";
+    if (content.includes("IdOrParams")) return "get";
     if (content.includes("useQuery")) return "query";
 }
 async function createHook(path, hookMap) {
@@ -28,9 +30,7 @@ ${match[0]}
 export const ${name}Client = createRequestFn(${hasSchema ? `{
     fn: ${name}Action,
     schema: ${match[1]},
-}` : `{
-    fn: ${name}Action,
-}`})
+}` : `${name}Action`})
 
 export interface Use${upName}Params<TOnMutateResult = unknown> extends Omit<
     UseMutationOptions<Awaited<ReturnType<typeof ${name}Client>>, Error, Parameters<typeof ${name}Client>[0], TOnMutateResult>,
@@ -56,7 +56,7 @@ export function use${upName}<TOnMutateResult = unknown>({ onMutate, onSuccess, o
     })
 }
 `;
-    const queryHook = `import { createRequestFn } from "deepsea-tools"
+    const getHook = `import { createRequestFn, isNonNullable } from "deepsea-tools"
 import { createUseQuery } from "soda-tanstack-query"
 
 import { ${name}Action } from "@/actions/${join(dir, name)}"
@@ -70,12 +70,34 @@ export const ${name}Client = createRequestFn(${hasSchema ? `{
     fn: ${name}Action,
 }`})
 
+export const ${name}ClientOptional = (id?: ${hasSchema ? `${match[1].replace(/Schema$/, "Params").replace(/^./, (char)=>char.toUpperCase())} | ` : ""}undefined) => (isNonNullable(id) ? ${name}Client(id) : null)
+
+export const use${upName} = createUseQuery({
+    queryFn: ${name}Client,
+    queryKey: "${key}",
+})
+`;
+    const queryHook = `import { createRequestFn } from "deepsea-tools"
+import { createUseQuery } from "soda-tanstack-query"
+
+import { ${name}Action } from "@/actions/${join(dir, name)}"
+${hasSchema ? `
+${match[0]}
+` : ""}
+export const ${name}Client = createRequestFn(${hasSchema ? `{
+    fn: ${name}Action,
+    schema: ${match[1]},
+}` : `{
+    fn: ${name}Action,
+}`})
+
 export const use${upName} = createUseQuery({
     queryFn: ${name}Client,
     queryKey: "${key}",
 })
 `;
     const map = {
+        get: getHook,
         query: queryHook,
         mutation: mutationHook
     };
@@ -123,6 +145,7 @@ async function hook(options, { args }) {
             choices: [
                 "mutation",
                 "query",
+                "get",
                 "skip"
             ],
             default: type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdnext",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "type": "module",
   "exports": {

package/src/utils/hook.ts

@@ -4,17 +4,19 @@ import { join, parse, relative } from "path"
 import { checkbox, select } from "@inquirer/prompts"
 import { Command } from "commander"
 
-export type HookType = "query" | "mutation"
+export type HookType = "get" | "query" | "mutation"
 
 export type HookContentMap = Record<HookType, string>
 
 function getHookTypeFromName(name: string): HookType {
-    if (/^(get|query)[^a-z]/.test(name)) return "query"
+    if (/^get[^a-z]/.test(name)) return "get"
+    if (/^query[^a-z]/.test(name)) return "query"
     return "mutation"
 }
 
 function getHookTypeFromContent(content: string): HookType | undefined {
     if (content.includes("useMutation")) return "mutation"
+    if (content.includes("IdOrParams")) return "get"
     if (content.includes("useQuery")) return "query"
     return undefined
 }
@@ -51,9 +53,7 @@ export const ${name}Client = createRequestFn(${
     fn: ${name}Action,
     schema: ${match[1]},
 }`
-            : `{
-    fn: ${name}Action,
-}`
+            : `${name}Action`
     })
 
 export interface Use${upName}Params<TOnMutateResult = unknown> extends Omit<
@@ -81,7 +81,7 @@ export function use${upName}<TOnMutateResult = unknown>({ onMutate, onSuccess, o
 }
 `
 
-    const queryHook = `import { createRequestFn } from "deepsea-tools"
+    const getHook = `import { createRequestFn, isNonNullable } from "deepsea-tools"
 import { createUseQuery } from "soda-tanstack-query"
 
 import { ${name}Action } from "@/actions/${join(dir, name)}"
@@ -103,6 +103,36 @@ export const ${name}Client = createRequestFn(${
 }`
     })
 
+export const ${name}ClientOptional = (id?: ${hasSchema ? `${match[1].replace(/Schema$/, "Params").replace(/^./, char => char.toUpperCase())} | ` : ""}undefined) => (isNonNullable(id) ? ${name}Client(id) : null)
+
+export const use${upName} = createUseQuery({
+    queryFn: ${name}Client,
+    queryKey: "${key}",
+})
+`
+
+    const queryHook = `import { createRequestFn } from "deepsea-tools"
+import { createUseQuery } from "soda-tanstack-query"
+
+import { ${name}Action } from "@/actions/${join(dir, name)}"
+${
+    hasSchema
+        ? `
+${match[0]}
+`
+        : ""
+}
+export const ${name}Client = createRequestFn(${
+        hasSchema
+            ? `{
+    fn: ${name}Action,
+    schema: ${match[1]},
+}`
+            : `{
+    fn: ${name}Action,
+}`
+    })
+
 export const use${upName} = createUseQuery({
     queryFn: ${name}Client,
     queryKey: "${key}",
@@ -110,6 +140,7 @@ export const use${upName} = createUseQuery({
 `
 
     const map: HookContentMap = {
+        get: getHook,
         query: queryHook,
         mutation: mutationHook,
     }
@@ -179,7 +210,7 @@ export async function hook(options: Record<string, string>, { args }: Command) {
 
         const answer = await select<OperationType>({
             message: path,
-            choices: ["mutation", "query", "skip"],
+            choices: ["mutation", "query", "get", "skip"],
             default: type,
         })