@ubean/cli 0.6.0-beta.5 → 0.6.1-beta.2

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { A as readViteManifest, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as summarizeBundle, k as formatKilobytes, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-C2Bde9EG.js";
+import { A as readViteManifest, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as summarizeBundle, k as formatKilobytes, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-DsRdPxwe.js";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { basename, join, relative, resolve } from "pathe";
 import { getLogger, setDebugLogging, setMinLevel } from "@ubean/shared/logger";
@@ -10,13 +10,13 @@ import { buildWithEnvironments } from "@ubean/build/production";
 import { NODE_REQUIREMENTS, diagnoseCapabilities, registerBuiltinPresets, resolvePresetByName } from "@ubean/preset";
 import { scanProject } from "@ubean/scan";
 import { bold, cyan, dim, green } from "kolorist";
-import { createServer } from "node:http";
+import { createServer, preview } from "vite";
 import { DEVTOOLS_PASS_THROUGH_PREFIXES, createCloudflarePreviewRunner, createVirtualRegistry, getDevApp, onDevScan, peekDevScanCoordinator, previewMimeType, resolvePreviewFile, ubeanDevRequestPlugin, ubeanPlugin, ubeanPreviewPlugin } from "@ubean/build/vite";
-import { createServer as createServer$1, preview } from "vite";
 import { ubeanVite } from "@ubean/build/vue";
 import { ubeanIslandsPlugin } from "@ubean/islands/vite";
 import { findAvailablePort, findUserViteConfig, getLanAddresses, isLoopbackHost, isWildcardHost } from "@ubean/shared/node";
 import { execSync } from "node:child_process";
+import { createServer as createServer$1 } from "node:http";
 //#region src/config.ts
 const logger$11 = getLogger("cli");
 const CONFIG_TEMPLATE = `import { defineConfig } from 'ubean';
@@ -523,7 +523,7 @@ async function createDevViteServer(options) {
 		config,
 		builtinPlugins
 	});
-	viteServer = await createServer$1({
+	viteServer = await createServer({
 		root: cwd,
 		configFile: userViteConfig ?? false,
 		customLogger: createGatedViteLogger({ lifecycle: config.logging.lifecycle }),
@@ -1549,7 +1549,7 @@ const prepareCommand = {
 */
 function startStaticServer(opts) {
 	const { root, port, host, mode } = opts;
-	return createServer(async (req, res) => {
+	return createServer$1(async (req, res) => {
 		try {
 			const url = new URL(req.url || "/", `http://${host}`);
 			const pathname = decodeURIComponent(url.pathname);

package/dist/index.js

@@ -1,3 +1,3 @@
 import { n as getScaffoldManifest, t as SCAFFOLD_CONTRACT_VERSION } from "./scaffold-manifest-TrH6OCX8.js";
-import { A as readViteManifest, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, T as toPascalCase, _ as renderCronTemplate, a as scaffold, b as renderPageTemplate, d as CRON_TEMPLATE, f as LAYOUT_TEMPLATE, g as renderApiTemplate, h as PLUGIN_TEMPLATE, i as recoverScaffold, j as summarizeBundle, m as PAGE_TEMPLATE, n as listScaffoldableFiles, p as MIDDLEWARE_TEMPLATE, t as deleteScaffold, u as API_TEMPLATE, v as renderLayoutTemplate, w as toKebabCase, x as renderPluginTemplate, y as renderMiddlewareTemplate } from "./page-C2Bde9EG.js";
+import { A as readViteManifest, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, T as toPascalCase, _ as renderCronTemplate, a as scaffold, b as renderPageTemplate, d as CRON_TEMPLATE, f as LAYOUT_TEMPLATE, g as renderApiTemplate, h as PLUGIN_TEMPLATE, i as recoverScaffold, j as summarizeBundle, m as PAGE_TEMPLATE, n as listScaffoldableFiles, p as MIDDLEWARE_TEMPLATE, t as deleteScaffold, u as API_TEMPLATE, v as renderLayoutTemplate, w as toKebabCase, x as renderPluginTemplate, y as renderMiddlewareTemplate } from "./page-DsRdPxwe.js";
 export { API_TEMPLATE, CRON_TEMPLATE, LAYOUT_TEMPLATE, MIDDLEWARE_TEMPLATE, PAGE_TEMPLATE, PLUGIN_TEMPLATE, SCAFFOLD_CONTRACT_VERSION, compareBundleBaseline, createFsOps, deleteScaffold, findClientManifest, getScaffoldManifest, listScaffoldableFiles, readViteManifest, recoverScaffold, renderApiTemplate, renderCronTemplate, renderLayoutTemplate, renderMiddlewareTemplate, renderPageTemplate, renderPluginTemplate, renderTemplate, scaffold, summarizeBundle, toCamelCase, toKebabCase, toPascalCase, writeBundleBaseline };

package/dist/{page-C2Bde9EG.js → page-DsRdPxwe.js}

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, promises, readFileSync, statSync, writeFileSync } from "node:fs";
 import { brotliCompressSync, gzipSync } from "node:zlib";
-import { dirname, join, resolve } from "pathe";
-import { dirname as dirname$1, extname, join as join$1, relative as relative$1, resolve as resolve$1 } from "node:path";
+import { dirname, extname, isAbsolute, join, normalize, relative, resolve } from "pathe";
+import { dirname as dirname$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "node:path";
 import { getLogger } from "@ubean/shared/logger";
 //#region src/analyze-lib.ts
 const CHUNK_VIOLATION_DISPLAY_LIMIT = 5;
@@ -399,6 +399,7 @@ const PACKAGE_JSON = `{
     "@soybeanjs/cli": "^1.8.1",
     "@soybeanjs/eslint-config-vue": "^0.1.1",
     "@soybeanjs/oxc-config": "^0.2.3",
+    "@valibot/to-json-schema": "^1.8.0",
     "eslint": "^10.8.0",
     "typescript": "^6.0.3",
     "vite-plus": "^0.2.6",
@@ -434,6 +435,11 @@ const TSCONFIG = `{
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true
   },
+  // .ubean/**/* 必须显式纳入：编译器默认的 include 是 **/*，但**排除**点开头目录，
+  // 于是 typed-router.d.ts / openapi.d.ts / auto-imports.d.ts 全部对 typecheck 不可见
+  // （实测：漏掉这一行时 import type { paths } from '../../.ubean/openapi' 报 TS2307，
+  // 且 RouteRecordInfo 的模块增强也不生效）。
+  "include": ["src/**/*", ".ubean/**/*"],
   "exclude": ["node_modules", "dist"]
 }
 `;
@@ -1375,46 +1381,46 @@ async function scaffoldBlogTemplate(fs, options) {
 //#region src/page.ts
 const logger = getLogger("cli");
 function getSrcDir(cwd) {
-	return join$1(cwd, "src");
+	return join(cwd, "src");
 }
 function getDirForType(cwd, type) {
 	const srcDir = getSrcDir(cwd);
 	switch (type) {
 		case "page":
-		case "reuse": return join$1(srcDir, "pages");
-		case "api": return join$1(srcDir, "routes");
-		case "layout": return join$1(srcDir, "layouts");
-		case "middleware": return join$1(srcDir, "middleware");
-		case "cron": return join$1(srcDir, "server", "crons");
-		case "plugin": return join$1(srcDir, "plugins");
+		case "reuse": return join(srcDir, "pages");
+		case "api": return join(srcDir, "routes");
+		case "layout": return join(srcDir, "layouts");
+		case "middleware": return join(srcDir, "middleware");
+		case "cron": return join(srcDir, "server", "crons");
+		case "plugin": return join(srcDir, "plugins");
 		default: return srcDir;
 	}
 }
 /** Resolve a baseDir that may be relative or absolute into an absolute path. */
 function resolveBaseDir(cwd, baseDir) {
-	return baseDir.startsWith("/") ? baseDir : join$1(cwd, baseDir);
+	return isAbsolute(baseDir) ? baseDir : join(cwd, baseDir);
 }
 function resolveTargetPath(baseDir, path, type) {
 	let normalizedPath = path.startsWith("/") ? path.slice(1) : path;
 	if (normalizedPath === "" || normalizedPath === "/") normalizedPath = type === "page" || type === "reuse" ? "index" : "index";
 	if (type === "page" || type === "layout" || type === "reuse") {
 		if (type === "page" || type === "layout") {
-			if (normalizedPath.endsWith(".vue")) return join$1(baseDir, normalizedPath);
+			if (normalizedPath.endsWith(".vue")) return join(baseDir, normalizedPath);
 			const ext = ".vue";
-			if (normalizedPath.endsWith("/") || normalizedPath === "") return join$1(baseDir, normalizedPath, `index${ext}`);
-			return join$1(baseDir, `${normalizedPath}${ext}`);
+			if (normalizedPath.endsWith("/") || normalizedPath === "") return join(baseDir, normalizedPath, `index${ext}`);
+			return join(baseDir, `${normalizedPath}${ext}`);
 		}
-		if (normalizedPath.endsWith(".reuse.ts")) return join$1(baseDir, normalizedPath);
-		if (normalizedPath.endsWith(".ts")) return join$1(baseDir, normalizedPath.replace(/\.ts$/, ".reuse.ts"));
+		if (normalizedPath.endsWith(".reuse.ts")) return join(baseDir, normalizedPath);
+		if (normalizedPath.endsWith(".ts")) return join(baseDir, normalizedPath.replace(/\.ts$/, ".reuse.ts"));
 		const ext = ".reuse.ts";
-		if (normalizedPath.endsWith("/") || normalizedPath === "") return join$1(baseDir, normalizedPath, `index${ext}`);
-		return join$1(baseDir, `${normalizedPath}${ext}`);
+		if (normalizedPath.endsWith("/") || normalizedPath === "") return join(baseDir, normalizedPath, `index${ext}`);
+		return join(baseDir, `${normalizedPath}${ext}`);
 	}
-	if (normalizedPath.endsWith(".ts") || normalizedPath.endsWith(".js")) return join$1(baseDir, normalizedPath);
+	if (normalizedPath.endsWith(".ts") || normalizedPath.endsWith(".js")) return join(baseDir, normalizedPath);
 	const ext = ".ts";
-	if (normalizedPath.endsWith("/") || normalizedPath === "") return join$1(baseDir, normalizedPath, `index${ext}`);
-	if ((type === "api" || type === "middleware" || type === "cron" || type === "plugin") && !normalizedPath.includes(".")) return join$1(baseDir, `${normalizedPath}${ext}`);
-	return join$1(baseDir, normalizedPath);
+	if (normalizedPath.endsWith("/") || normalizedPath === "") return join(baseDir, normalizedPath, `index${ext}`);
+	if ((type === "api" || type === "middleware" || type === "cron" || type === "plugin") && !normalizedPath.includes(".")) return join(baseDir, `${normalizedPath}${ext}`);
+	return join(baseDir, normalizedPath);
 }
 function sanitizeNameSegment(seg) {
 	return seg.replace(/^\[\.\.\.(.+)\]$/, "All$1").replace(/^\[\[(.+)\]\]$/, "$1Optional").replace(/^\[(.+)\]$/, "$1").replace(/[^a-zA-Z0-9$_]/g, "");
@@ -1490,7 +1496,8 @@ async function scaffold(options) {
 		errors: []
 	};
 	try {
-		const relativePath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type).replace(`${cwd}/`, "");
+		const targetPath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type);
+		const relativePath = relative(cwd, targetPath);
 		if (await fs.exists(relativePath)) {
 			if (!options.force) {
 				result.skipped.push(relativePath);
@@ -1522,7 +1529,8 @@ async function deleteScaffold(options) {
 		errors: []
 	};
 	try {
-		const relativePath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type).replace(`${cwd}/`, "");
+		const targetPath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type);
+		const relativePath = relative(cwd, targetPath);
 		if (!await fs.exists(relativePath)) {
 			result.errors.push(`${relativePath} does not exist`);
 			return result;
@@ -1554,7 +1562,8 @@ async function recoverScaffold(options) {
 		errors: []
 	};
 	try {
-		const relativePath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type).replace(`${cwd}/`, "");
+		const targetPath = resolveTargetPath(options.baseDir ? resolveBaseDir(cwd, options.baseDir) : getDirForType(cwd, options.type), options.path, options.type);
+		const relativePath = relative(cwd, targetPath);
 		if (options.dry) {
 			const backupPath = `${relativePath}.bak`;
 			if (await fs.exists(backupPath)) result.restored.push(relativePath);
@@ -1572,8 +1581,9 @@ async function recoverScaffold(options) {
 }
 async function listScaffoldableFiles(cwd, type, baseDir) {
 	const fs = createFsOps(cwd);
-	const relativeBase = (baseDir ? resolveBaseDir(cwd, baseDir) : getDirForType(cwd, type)).replace(`${cwd}/`, "");
-	return (await fs.listFiles(relativeBase)).map((f) => f.replace(`${cwd}/`, ""));
+	const absBaseDir = baseDir ? resolveBaseDir(cwd, baseDir) : getDirForType(cwd, type);
+	const relativeBase = relative(cwd, absBaseDir);
+	return (await fs.listFiles(relativeBase)).map((f) => normalize(f));
 }
 const scaffoldTypes = [
 	"page",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.6.0-beta.5",
+  "version": "0.6.1-beta.2",
   "description": "CLI for ubean (ubean-next binary: dev, build, prepare, init, preview, page, env, config, devtools, api/layout/middleware/cron/plugin scaffolds) plus the Vite dev server runner",
   "bin": {
     "ubean-next": "./bin/ubean-next.mjs"
@@ -24,32 +24,29 @@
     }
   },
   "dependencies": {
-    "@ubean/app": "0.6.0-beta.5",
-    "@ubean/build": "0.6.0-beta.5",
-    "@ubean/client": "0.6.0-beta.5",
-    "@ubean/config": "0.6.0-beta.5",
-    "@ubean/i18n": "0.6.0-beta.5",
-    "@ubean/islands": "0.6.0-beta.5",
-    "@ubean/preset": "0.6.0-beta.5",
-    "@ubean/scan": "0.6.0-beta.5",
-    "@ubean/shared": "0.6.0-beta.5",
+    "@ubean/build": "0.6.1-beta.2",
+    "@ubean/config": "0.6.1-beta.2",
+    "@ubean/i18n": "0.6.1-beta.2",
+    "@ubean/islands": "0.6.1-beta.2",
+    "@ubean/preset": "0.6.1-beta.2",
+    "@ubean/scan": "0.6.1-beta.2",
+    "@ubean/shared": "0.6.1-beta.2",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@types/node": "^26.6.3",
-    "@vitejs/plugin-vue": "^6.0.9",
-    "env-runner": "0.3.0",
+    "@types/node": "^26.6.4",
+    "env-runner": "0.3.3",
     "typescript": "npm:typescript-native-bridge@latest",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.0.0-rc.1",
-    "vite-plus": "1.0.0-rc.1"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
+    "vite-plus": "1.1.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.6.0-beta.5",
-    "@ubean/devtools": "0.6.0-beta.5",
+    "@ubean/content": "0.6.1-beta.2",
+    "@ubean/devtools": "0.6.1-beta.2",
     "@vitejs/plugin-vue": "^6.0.8",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.0.0-rc.1"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0"
   },
   "peerDependenciesMeta": {
     "@ubean/content": {