sdnext 0.0.32 → 0.0.33

package/README.md

@@ -20,7 +20,6 @@ export async function addUser() {}
 "use server"
 
 import { createResponseFn } from "@/server/createResponseFn"
-
 import { addUser } from "@/shared/addUser"
 
 export const addUserAction = createResponseFn(addUser)
@@ -50,7 +49,6 @@ addUser.route = {}
 
 ```ts
 import { createRoute } from "@/server/createResponseFn"
-
 import { addUser } from "@/shared/addUser"
 
 export const { POST } = createRoute(addUser)

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { readFile } from "fs/promises";
-import { join } from "path";
-import { fileURLToPath } from "url";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import { build } from "./utils/build.js";
 import { dev } from "./utils/dev.js";

package/dist/utils/build.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 export declare function buildFolder(dir: string): Promise<void>;
 export declare function build(options: Record<string, string>, { args }: Command): Promise<void>;

package/dist/utils/build.js

@@ -1,5 +1,5 @@
-import { readdir, stat } from "fs/promises";
-import { join } from "path";
+import { readdir, stat } from "node:fs/promises";
+import { join } from "node:path";
 import { runCommand } from "./runCommand.js";
 import { syncSharedArtifacts } from "./syncSharedArtifacts.js";
 async function buildFolder(dir) {

package/dist/utils/createAction.js

@@ -1,4 +1,4 @@
-import { join } from "path";
+import { join } from "node:path";
 import { resolveProjectImportPath } from "./resolveProjectImportPath.js";
 import { getSharedModuleInfo, isScriptModule, writeGeneratedFile } from "./sharedArtifact.js";
 async function createAction(path) {

package/dist/utils/createRoute.js

@@ -1,7 +1,12 @@
-import { readdir } from "fs/promises";
-import { join } from "path";
+import { readdir } from "node:fs/promises";
+import { join } from "node:path";
 import { resolveProjectImportPath } from "./resolveProjectImportPath.js";
 import { getSharedModuleInfo, isScriptModule, writeGeneratedFile } from "./sharedArtifact.js";
+function getNamedImportStatement(modulePath, specifiers) {
+    const allType = specifiers.every((item)=>item.type);
+    const names = specifiers.map((item)=>allType || !item.type ? item.name : `type ${item.name}`).join(", ");
+    return `import ${allType ? "type " : ""}{ ${names} } from "${modulePath}"`;
+}
 async function createRoute(path) {
     if (path) {
         const info = getSharedModuleInfo(path);
@@ -37,14 +42,40 @@ async function getSharedModules(dir) {
 }
 async function getRouteFileContent(items, routePath) {
     const createRouteFnImportPath = await resolveProjectImportPath(routePath, "server/createResponseFn");
+    const nextServerImport = getNamedImportStatement("next/server", [
+        {
+            name: "NextRequest",
+            type: true
+        },
+        {
+            name: "NextResponse"
+        }
+    ]);
+    const createRouteFnImport = getNamedImportStatement(createRouteFnImportPath, [
+        {
+            name: "OriginalResponseFn",
+            type: true
+        },
+        {
+            name: "RouteBodyType",
+            type: true
+        },
+        {
+            name: "RouteHandler",
+            type: true
+        },
+        {
+            name: "createRouteFn"
+        }
+    ]);
     const importLines = (await Promise.all(items.map(async (item)=>{
         const importPath = await resolveProjectImportPath(routePath, `shared/${item.importPath}`);
         return `import { ${item.name} } from "${importPath}"`;
     }))).join("\n");
     const registerLines = items.map((item)=>`registerRoute(${item.name})`).join("\n");
-    return `import { NextRequest, NextResponse } from "next/server"
+    return `${nextServerImport}
 
-import { createRouteFn, OriginalResponseFn, RouteBodyType, RouteHandler } from "${createRouteFnImportPath}"
+${createRouteFnImport}
 ${importLines ? `\n${importLines}\n` : ""}
 const routeMap = new Map<string, RouteHandler>()
 

package/dist/utils/dev.d.ts

@@ -1,2 +1,2 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 export declare function dev(options: Record<string, string>, { args }: Command): Promise<void>;

package/dist/utils/dev.js

@@ -1,5 +1,5 @@
-import { spawn } from "child_process";
-import { fileURLToPath } from "url";
+import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
 import { buildFolder } from "./build.js";
 import { spawnCommand } from "./runCommand.js";
 async function dev(options, { args }) {

package/dist/utils/hook.d.ts

@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 export type HookType = "get" | "query" | "mutation";
 export type OperationType = HookType | "skip";
 export type HookContentMap = Record<HookType, string>;

package/dist/utils/hook.js

@@ -1,6 +1,6 @@
-import { readFile, readdir, stat } from "fs/promises";
-import { join, parse, relative } from "path";
-import { cwd } from "process";
+import { readFile, readdir, stat } from "node:fs/promises";
+import { join, parse, relative } from "node:path";
+import { cwd } from "node:process";
 import { checkbox as prompts_checkbox, select as prompts_select } from "@inquirer/prompts";
 import { readSdNextSetting } from "./readSdNextSetting.js";
 import { resolveProjectImportPath } from "./resolveProjectImportPath.js";

package/dist/utils/readSdNextSetting.d.ts

@@ -1,4 +1,4 @@
-import { OperationType } from "./hook";
+import type { OperationType } from "./hook";
 export interface SdNextSetting {
     hook?: Record<string, OperationType>;
 }

package/dist/utils/resolveProjectImportPath.js

@@ -143,10 +143,10 @@ function stripComments(content) {
                 escaped = true;
                 continue;
             }
-            if ("\"" === char) inString = false;
+            if ('"' === char) inString = false;
             continue;
         }
-        if ("\"" === char) {
+        if ('"' === char) {
             inString = true;
             output.push(char);
             continue;

package/dist/utils/runCommand.d.ts

@@ -1,4 +1,4 @@
-import { ChildProcess } from "child_process";
+import { type ChildProcess } from "node:child_process";
 export interface SpawnCommandParams {
     args: string[];
 }

package/dist/utils/runCommand.js

@@ -1,4 +1,4 @@
-import { spawn } from "child_process";
+import { spawn } from "node:child_process";
 function quotePosixArgument(arg) {
     if (0 === arg.length) return "''";
     return `'${arg.replaceAll("'", "'\"'\"'")}'`;

package/dist/utils/sharedArtifact.js

@@ -1,5 +1,5 @@
-import { mkdir, readFile, readdir, rm, writeFile } from "fs/promises";
-import { dirname, join, parse, relative } from "path";
+import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { dirname, join, parse, relative } from "node:path";
 const scriptModuleExtensions = [
     ".ts",
     ".tsx",

package/dist/utils/syncSharedArtifacts.js

@@ -1,4 +1,4 @@
-import { join } from "path";
+import { join } from "node:path";
 import { createAction } from "./createAction.js";
 import { createRoute } from "./createRoute.js";
 import { getSharedModuleInfo, isScriptModule, normalizeSharedPath, removeGeneratedFile } from "./sharedArtifact.js";

package/dist/utils/writeSdNextSetting.d.ts

@@ -1,2 +1,2 @@
-import { SdNextSetting } from "./readSdNextSetting";
+import type { SdNextSetting } from "./readSdNextSetting";
 export declare function writeSdNextSetting(setting: SdNextSetting): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdnext",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "",
   "type": "module",
   "exports": {
@@ -38,14 +38,14 @@
   },
   "homepage": "https://github.com/1adybug/deepsea/tree/main/packages/sdnext",
   "dependencies": {
-    "@inquirer/prompts": "^8.1.0",
+    "@inquirer/prompts": "^8.5.0",
     "chokidar": "^5.0.0",
     "commander": "^14.0.2",
-    "deepsea-tools": "5.48.0"
+    "deepsea-tools": "5.48.1"
   },
   "devDependencies": {
     "@types/node": "^24.12.4",
-    "typescript": ">=5.8.3"
+    "typescript": "^6.0.3"
   },
   "scripts": {
     "dev": "rslib build --watch",

package/src/index.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { readFile } from "fs/promises"
-import { join } from "path"
-import { fileURLToPath } from "url"
+import { readFile } from "node:fs/promises"
+import { join } from "node:path"
+import { fileURLToPath } from "node:url"
 
 import { Command } from "commander"
 

package/src/utils/build.ts

@@ -1,7 +1,7 @@
-import { readdir, stat } from "fs/promises"
-import { join } from "path"
+import { readdir, stat } from "node:fs/promises"
+import { join } from "node:path"
 
-import { Command } from "commander"
+import type { Command } from "commander"
 
 import { runCommand } from "./runCommand"
 import { syncSharedArtifacts } from "./syncSharedArtifacts"

package/src/utils/createAction.ts

@@ -1,4 +1,4 @@
-import { join } from "path"
+import { join } from "node:path"
 
 import { resolveProjectImportPath } from "./resolveProjectImportPath"
 import { getSharedModuleInfo, isScriptModule, writeGeneratedFile } from "./sharedArtifact"
@@ -21,6 +21,6 @@ import { createResponseFn } from "${createResponseFnImportPath}"
 import { ${info.name} } from "${sharedImportPath}"
 
 export const ${info.name}Action = createResponseFn(${info.name})
-`
+`,
     })
 }

package/src/utils/createRoute.ts

@@ -1,9 +1,21 @@
-import { readdir } from "fs/promises"
-import { join } from "path"
+import { readdir } from "node:fs/promises"
+import { join } from "node:path"
 
 import { resolveProjectImportPath } from "./resolveProjectImportPath"
 import { getSharedModuleInfo, isScriptModule, writeGeneratedFile } from "./sharedArtifact"
 
+interface NamedImportSpecifier {
+    name: string
+    type?: boolean
+}
+
+function getNamedImportStatement(modulePath: string, specifiers: NamedImportSpecifier[]) {
+    const allType = specifiers.every(item => item.type)
+    const names = specifiers.map(item => (allType || !item.type ? item.name : `type ${item.name}`)).join(", ")
+
+    return `import ${allType ? "type " : ""}{ ${names} } from "${modulePath}"`
+}
+
 export async function createRoute(path?: string) {
     if (path) {
         const info = getSharedModuleInfo(path)
@@ -59,15 +71,28 @@ export interface GetRouteFileContentParamsItem {
 
 async function getRouteFileContent(items: GetRouteFileContentParamsItem[], routePath: string) {
     const createRouteFnImportPath = await resolveProjectImportPath(routePath, "server/createResponseFn")
-    const importLines = (await Promise.all(items.map(async (item) => {
-        const importPath = await resolveProjectImportPath(routePath, `shared/${item.importPath}`)
-        return `import { ${item.name} } from "${importPath}"`
-    }))).join("\n")
+    const nextServerImport = getNamedImportStatement("next/server", [{ name: "NextRequest", type: true }, { name: "NextResponse" }])
+    const createRouteFnImport = getNamedImportStatement(createRouteFnImportPath, [
+        { name: "OriginalResponseFn", type: true },
+        { name: "RouteBodyType", type: true },
+        { name: "RouteHandler", type: true },
+        { name: "createRouteFn" },
+    ])
+
+    const importLines = (
+        await Promise.all(
+            items.map(async item => {
+                const importPath = await resolveProjectImportPath(routePath, `shared/${item.importPath}`)
+                return `import { ${item.name} } from "${importPath}"`
+            }),
+        )
+    ).join("\n")
+
     const registerLines = items.map(item => `registerRoute(${item.name})`).join("\n")
 
-    return `import { NextRequest, NextResponse } from "next/server"
+    return `${nextServerImport}
 
-import { createRouteFn, OriginalResponseFn, RouteBodyType, RouteHandler } from "${createRouteFnImportPath}"
+${createRouteFnImport}
 ${importLines ? `\n${importLines}\n` : ""}
 const routeMap = new Map<string, RouteHandler>()
 

package/src/utils/dev.ts

@@ -1,7 +1,7 @@
-import { spawn } from "child_process"
-import { fileURLToPath } from "url"
+import { spawn } from "node:child_process"
+import { fileURLToPath } from "node:url"
 
-import { Command } from "commander"
+import type { Command } from "commander"
 
 import { buildFolder } from "./build"
 import { spawnCommand } from "./runCommand"

package/src/utils/hook.ts

@@ -1,11 +1,11 @@
-import { readdir, readFile, stat } from "fs/promises"
-import { join, parse, relative } from "path"
-import { cwd } from "process"
+import { readdir, readFile, stat } from "node:fs/promises"
+import { join, parse, relative } from "node:path"
+import { cwd } from "node:process"
 
 import { checkbox, select } from "@inquirer/prompts"
-import { Command } from "commander"
+import type { Command } from "commander"
 
-import { readSdNextSetting, SdNextSetting } from "./readSdNextSetting"
+import { type SdNextSetting, readSdNextSetting } from "./readSdNextSetting"
 import { resolveProjectImportPath } from "./resolveProjectImportPath"
 import { isScriptModule, normalizePathSeparator, writeGeneratedFile } from "./sharedArtifact"
 import { writeSdNextSetting } from "./writeSdNextSetting"

package/src/utils/readSdNextSetting.ts

@@ -2,7 +2,7 @@ import { readFile } from "node:fs/promises"
 import { homedir } from "node:os"
 import { join } from "node:path"
 
-import { OperationType } from "./hook"
+import type { OperationType } from "./hook"
 
 export interface SdNextSetting {
     hook?: Record<string, OperationType>

package/src/utils/resolveProjectImportPath.ts

@@ -129,6 +129,7 @@ function splitWildcard(value: string) {
 async function resolveExtendsPath(extendsValue: string, baseDir: string) {
     if (isAbsolute(extendsValue) || extendsValue.startsWith(".")) {
         const relativeCandidates = getRelativeCandidates(resolve(baseDir, extendsValue))
+
         for (const candidate of relativeCandidates) {
             if (await exists(candidate)) return candidate
         }
@@ -165,6 +166,7 @@ async function readJsonConfig(path: string): Promise<JsonObject> {
 
 function stripComments(content: string) {
     const output: string[] = []
+
     let inString = false
     let escaped = false
 
@@ -174,6 +176,7 @@ function stripComments(content: string) {
 
         if (inString) {
             output.push(char)
+
             if (escaped) {
                 escaped = false
                 continue
@@ -184,12 +187,12 @@ function stripComments(content: string) {
                 continue
             }
 
-            if (char === "\"") inString = false
+            if (char === '"') inString = false
 
             continue
         }
 
-        if (char === "\"") {
+        if (char === '"') {
             inString = true
             output.push(char)
             continue

package/src/utils/runCommand.ts

@@ -1,4 +1,4 @@
-import { ChildProcess, spawn } from "child_process"
+import { type ChildProcess, spawn } from "node:child_process"
 
 export interface SpawnCommandParams {
     args: string[]
@@ -26,9 +26,7 @@ function formatShellCommand(args: string[]) {
     const [command, ...commandArgs] = args
     const quoteArgument = process.platform === "win32" ? quoteWindowsArgument : quotePosixArgument
 
-    if (process.platform === "win32") {
-        return [quoteWindowsCommand(command), ...commandArgs.map(quoteArgument)].join(" ")
-    }
+    if (process.platform === "win32") return [quoteWindowsCommand(command), ...commandArgs.map(quoteArgument)].join(" ")
 
     return args.map(quoteArgument).join(" ")
 }
@@ -52,6 +50,7 @@ export async function runCommand({ args }: SpawnCommandParams) {
 export async function waitForChild(child: ChildProcess) {
     return await new Promise<number>((resolve, reject) => {
         child.once("error", reject)
+
         child.once("close", (code, signal) => {
             if (typeof code === "number") {
                 resolve(code)

package/src/utils/sharedArtifact.ts

@@ -1,5 +1,5 @@
-import { mkdir, readFile, readdir, rm, writeFile } from "fs/promises"
-import { dirname, join, parse, relative } from "path"
+import { mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises"
+import { dirname, join, parse, relative } from "node:path"
 
 export interface SharedModuleInfo {
     dir: string

package/src/utils/syncSharedArtifacts.ts

@@ -1,4 +1,4 @@
-import { join } from "path"
+import { join } from "node:path"
 
 import { createAction } from "./createAction"
 import { createRoute } from "./createRoute"

package/src/utils/writeSdNextSetting.ts

@@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"
 import { homedir } from "node:os"
 import { join } from "node:path"
 
-import { SdNextSetting } from "./readSdNextSetting"
+import type { SdNextSetting } from "./readSdNextSetting"
 
 export async function writeSdNextSetting(setting: SdNextSetting) {
     const userDir = homedir()

package/tsconfig.json

@@ -1,11 +1,14 @@
 {
     "compilerOptions": {
+        "rootDir": "src",
         "strict": true,
         "declaration": true,
         "skipLibCheck": true,
         "target": "ESNext",
         "module": "ESNext",
         "moduleResolution": "Bundler",
+        "verbatimModuleSyntax": true,
+        "types": ["node"],
         "paths": {
             "@/*": ["./src/*"]
         }