sdnext 0.0.19 → 0.0.20

package/dist/utils/createAction.js

@@ -1,27 +1,16 @@
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { join, parse, relative } from "path";
-import { isNonNullable } from "deepsea-tools";
 async function createAction(path) {
     path = relative("shared", path).replace(/\\/g, "/");
     const { dir, name, ext } = parse(path);
     if (".ts" !== ext && ".tsx" !== ext && ".js" !== ext && ".jsx" !== ext) return;
-    const serverContent = await readFile(join("shared", path), "utf-8");
-    const match = serverContent.match(new RegExp(`export async function ${name}\\(.+?: (.+?)Params\\)`, "s"));
-    const schema = match?.[1].replace(/^./, (char)=>char.toLowerCase());
-    const hasSchema = isNonNullable(schema) && serverContent.includes(`from "@/schemas/${schema}"`);
     const content = `"use server"
-${hasSchema ? `
-import { ${schema}Schema } from "@/schemas/${schema}"
-` : ""}
+
 import { createResponseFn } from "@/server/createResponseFn"
 
 import { ${name} } from "@/shared/${join(dir, name)}"
 
-export const ${name}Action = createResponseFn({
-    fn: ${name},${hasSchema ? `
-    schema: ${schema}Schema,` : ""}
-    name: "${name}",
-})
+export const ${name}Action = createResponseFn(${name})
 `;
     const actionPath = join("actions", path);
     try {

package/dist/utils/hook.js

@@ -26,8 +26,8 @@ async function createHook(path, hookMap) {
     path = relative("actions", path).replace(/\\/g, "/");
     const { dir, name, ext, base } = parse(path);
     if (".ts" !== ext && ".tsx" !== ext && ".js" !== ext && ".jsx" !== ext) return;
-    const actionContent = await readFile(join("actions", path), "utf-8");
-    const match = actionContent.match(/^import { (.+Schema) } from "@\/schemas\/.+"$/m);
+    const serverContent = await readFile(join("shared", path), "utf-8");
+    const match = serverContent.match(new RegExp(`export async function ${name}\\(.+?: (.+?)Params\\)`, "s"));
     const hasSchema = !!match;
     const upName = name.replace(/^./, (char)=>char.toUpperCase());
     const key = name.replace(/[A-Z]/g, (char)=>`-${char.toLowerCase()}`);

package/package.json

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

package/src/utils/createAction.ts

@@ -1,38 +1,18 @@
 import { mkdir, readFile, writeFile } from "fs/promises"
 import { join, parse, relative } from "path"
 
-import { isNonNullable } from "deepsea-tools"
-
 export async function createAction(path: string) {
     path = relative("shared", path).replace(/\\/g, "/")
     const { dir, name, ext } = parse(path)
     if (ext !== ".ts" && ext !== ".tsx" && ext !== ".js" && ext !== ".jsx") return
-    const serverContent = await readFile(join("shared", path), "utf-8")
-    const match = serverContent.match(new RegExp(`export async function ${name}\\(.+?: (.+?)Params\\)`, "s"))
-    const schema = match?.[1].replace(/^./, char => char.toLowerCase())
-    const hasSchema = isNonNullable(schema) && serverContent.includes(`from "@/schemas/${schema}"`)
 
     const content = `"use server"
-${
-    hasSchema
-        ? `
-import { ${schema}Schema } from "@/schemas/${schema}"
-`
-        : ""
-}
+
 import { createResponseFn } from "@/server/createResponseFn"
 
 import { ${name} } from "@/shared/${join(dir, name)}"
 
-export const ${name}Action = createResponseFn({
-    fn: ${name},${
-        hasSchema
-            ? `
-    schema: ${schema}Schema,`
-            : ""
-    }
-    name: "${name}",
-})
+export const ${name}Action = createResponseFn(${name})
 `
 
     const actionPath = join("actions", path)

package/src/utils/hook.ts

@@ -46,8 +46,8 @@ export async function createHook(path: string, hookMap: Record<string, HookData>
     path = relative("actions", path).replace(/\\/g, "/")
     const { dir, name, ext, base } = parse(path)
     if (ext !== ".ts" && ext !== ".tsx" && ext !== ".js" && ext !== ".jsx") return
-    const actionContent = await readFile(join("actions", path), "utf-8")
-    const match = actionContent.match(/^import { (.+Schema) } from "@\/schemas\/.+"$/m)
+    const serverContent = await readFile(join("shared", path), "utf-8")
+    const match = serverContent.match(new RegExp(`export async function ${name}\\(.+?: (.+?)Params\\)`, "s"))
     const hasSchema = !!match
     const upName = name.replace(/^./, char => char.toUpperCase())
     const key = name.replace(/[A-Z]/g, char => `-${char.toLowerCase()}`)