sdnext 0.0.4 → 0.0.5

package/dist/utils/hook.d.ts

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

package/dist/utils/hook.js

@@ -2,13 +2,11 @@ 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[^a-z]/.test(name)) return "get";
-    if (/^query[^a-z]/.test(name)) return "query";
+    if (/^(get|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) {
@@ -30,7 +28,9 @@ ${match[0]}
 export const ${name}Client = createRequestFn(${hasSchema ? `{
     fn: ${name}Action,
     schema: ${match[1]},
-}` : `${name}Action`})
+}` : `{
+    fn: ${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,8 +56,8 @@ export function use${upName}<TOnMutateResult = unknown>({ onMutate, onSuccess, o
     })
 }
 `;
-    const getHook = `import { useQuery } from "@tanstack/react-query"
-import { createRequestFn, isNonNullable } from "deepsea-tools"
+    const queryHook = `import { createRequestFn } from "deepsea-tools"
+import { createUseQuery } from "soda-tanstack-query"
 
 import { ${name}Action } from "@/actions/${join(dir, name)}"
 ${hasSchema ? `
@@ -66,44 +66,16 @@ ${match[0].replace(match[1], `${match[1].replace(/Schema$/, "Params").replace(/^
 export const ${name}Client = createRequestFn(${hasSchema ? `{
     fn: ${name}Action,
     schema: ${match[1]},
-}` : `${name}Action`})
-
-export interface Use${upName}Params {
-    id?: ${hasSchema ? `${match[1].replace(/Schema$/, "Params").replace(/^./, (char)=>char.toUpperCase())} | ` : ""}undefined
-    enabled?: boolean
-}
-
-export function use${upName}(idOrParams?: Use${upName}Params | ${hasSchema ? `${match[1].replace(/Schema$/, "Params").replace(/^./, (char)=>char.toUpperCase())} | ` : ""}undefined) {
-    const { id, enabled = true } = typeof idOrParams === "object" ? idOrParams : { id: idOrParams, enabled: true }
-
-    return useQuery({
-        queryKey: ["${key}", id],
-        queryFn: () => (isNonNullable(id) ? ${name}Client(id) : null),
-        enabled,
-    })
-}
-`;
-    const queryHook = `import { useQuery } from "@tanstack/react-query"
-import { createRequestFn } from "deepsea-tools"
-
-import { ${name}Action } from "@/actions/${join(dir, name)}"
-${hasSchema ? `
-${match[0].replace(match[1], `${match[1].replace(/Schema$/, "Params").replace(/^./, (char)=>char.toUpperCase())}, ${match[1]}`)}
-` : ""}
-export const ${name}Client = createRequestFn(${hasSchema ? `{
+}` : `{
     fn: ${name}Action,
-    schema: ${match[1]},
-}` : `${name}Action`})
+}`})
 
-export function use${upName}(${hasSchema ? `params: ${match[1].replace(/Schema$/, "Params").replace(/^./, (char)=>char.toUpperCase())} = {}` : ""}) {
-    return useQuery({
-        queryKey: ["${key}", params],
-        queryFn: () => ${name}Client(params),
-    })
-}
+export const use${upName} = createUseQuery({
+    queryFn: ${name}Client,
+    queryKey: "${key}",
+})
 `;
     const map = {
-        get: getHook,
         query: queryHook,
         mutation: mutationHook
     };
@@ -151,7 +123,6 @@ async function hook(options, { args }) {
             choices: [
                 "mutation",
                 "query",
-                "get",
                 "skip"
             ],
             default: type

package/package.json

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

package/src/utils/build.ts

@@ -1,33 +1,33 @@
-import { spawn } from "child_process"
-import { readdir, stat } from "fs/promises"
-import { join } from "path"
-
-import { Command } from "commander"
-
-import { createAction } from "./createAction"
-import { excludeActions } from "./excludeActions"
-
-export async function buildFolder(dir: string) {
-    const content = await readdir(dir)
-
-    for (const item of content) {
-        const path = join(dir, item)
-        const stats = await stat(path)
-
-        if (stats.isDirectory()) await buildFolder(path)
-        else await createAction(path)
-    }
-}
-
-export async function build(options: Record<string, string>, { args }: Command) {
-    await excludeActions()
-
-    await buildFolder("shared")
-
-    if (args.length === 0) return
-
-    spawn(args.join(" "), {
-        stdio: "inherit",
-        shell: true,
-    })
-}
+import { spawn } from "child_process"
+import { readdir, stat } from "fs/promises"
+import { join } from "path"
+
+import { Command } from "commander"
+
+import { createAction } from "./createAction"
+import { excludeActions } from "./excludeActions"
+
+export async function buildFolder(dir: string) {
+    const content = await readdir(dir)
+
+    for (const item of content) {
+        const path = join(dir, item)
+        const stats = await stat(path)
+
+        if (stats.isDirectory()) await buildFolder(path)
+        else await createAction(path)
+    }
+}
+
+export async function build(options: Record<string, string>, { args }: Command) {
+    await excludeActions()
+
+    await buildFolder("shared")
+
+    if (args.length === 0) return
+
+    spawn(args.join(" "), {
+        stdio: "inherit",
+        shell: true,
+    })
+}

package/src/utils/hook.ts

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

package/src/utils/watch.ts

@@ -1,27 +1,27 @@
-import { rm } from "fs/promises"
-import { join, relative } from "path"
-
-import { watch } from "chokidar"
-
-import { createAction } from "./createAction"
-
-const watcher = watch("shared", {
-    awaitWriteFinish: true,
-    persistent: true,
-})
-
-watcher.on("add", createAction)
-
-watcher.on("change", createAction)
-
-watcher.on("unlink", async path => {
-    path = relative("shared", path).replace(/\\/g, "/")
-    const actionPath = join("actions", path)
-    await rm(actionPath, { recursive: true, force: true })
-})
-
-watcher.on("unlinkDir", async path => {
-    path = relative("shared", path).replace(/\\/g, "/")
-    const actionPath = join("actions", path)
-    await rm(actionPath, { recursive: true, force: true })
-})
+import { rm } from "fs/promises"
+import { join, relative } from "path"
+
+import { watch } from "chokidar"
+
+import { createAction } from "./createAction"
+
+const watcher = watch("shared", {
+    awaitWriteFinish: true,
+    persistent: true,
+})
+
+watcher.on("add", createAction)
+
+watcher.on("change", createAction)
+
+watcher.on("unlink", async path => {
+    path = relative("shared", path).replace(/\\/g, "/")
+    const actionPath = join("actions", path)
+    await rm(actionPath, { recursive: true, force: true })
+})
+
+watcher.on("unlinkDir", async path => {
+    path = relative("shared", path).replace(/\\/g, "/")
+    const actionPath = join("actions", path)
+    await rm(actionPath, { recursive: true, force: true })
+})