@vixt/core 0.10.1 → 0.11.1

package/dist/node/index.mjs

@@ -11,6 +11,9 @@ import { pathToFileURL } from "mlly";
 import Legacy from "@vitejs/plugin-legacy";
 import Analyzer from "vite-bundle-analyzer";
 import Ssl from "@vitejs/plugin-basic-ssl";
+import AutoImport from "unplugin-auto-import/vite";
+import { writeTypes } from "nitro/builder";
+import { nitro } from "nitro/vite";
 import Checker from "vite-plugin-checker";
 import { builders, parseExpression, parseModule } from "magicast";
 //#region src/node/env.ts
@@ -50,6 +53,18 @@ function loadWorkspaceEnv(mode, prefixes) {
 }
 //#endregion
 //#region src/node/config.ts
+/**
+* Define the Vixt config.
+* @example
+* ```ts
+* // vixt.config.ts
+* import { defineVixtConfig } from 'vixt'
+*
+* export default defineVixtConfig({
+*   // Vixt配置
+* })
+* ```
+*/
 function defineVixtConfig(input) {
 	return input;
 }
@@ -64,7 +79,6 @@ async function loadVixtConfig(opts) {
 	config.buildDir ??= resolve(config.rootDir, ".vixt");
 	config.buildTypesDir ??= resolve(config.buildDir, "types");
 	config.buildLayersDir ??= resolve(config.buildDir, "layers");
-	config.buildImportsDir ??= resolve(config.buildDir, "imports");
 	config.workspaceDir ??= findUpWorkspaceDir();
 	config.srcDir ??= resolve(config.rootDir, "src");
 	config.modulesDir ??= resolve(config.srcDir, "modules");
@@ -123,17 +137,65 @@ function resolveLayersDirs(layers = []) {
 	}
 	return dirs;
 }
-const VixtClientAutoImports = { "@vixt/core/client": [
-	"defineAppConfig",
-	"defineVixtPlugin",
-	"useAppConfig",
-	"useVixtApp"
-] };
 //#endregion
 //#region src/node/module.ts
+/**
+* A helper function for creating Vite plugins.
+* @example
+* ```ts
+* import { defineVitePlugin } from 'vixt'
+*
+* interface PluginOptions {
+*   enabled?: boolean
+* }
+*
+* export const myVitePlugin = defineVitePlugin<PluginOptions>((options) => {
+*   console.log(options)
+*   return {
+*     name: 'my-vite-plugin',
+*     configResolved(config) {
+*       console.log(config)
+*     }
+*   }
+* })
+* ```
+*/
 function defineVitePlugin(pluginFn) {
 	return pluginFn;
 }
+/**
+* Define a Vixt module.
+* @example
+* ```ts
+* // src/modules/my-module.ts
+* import { defineVixtModule } from 'vixt'
+*
+* interface ModuleOptions {
+*   enabled?: boolean
+* }
+*
+* declare module 'vixt' {
+*   interface VixtOptions {
+*     myModuleOptions?: ModuleOptions
+*   }
+* }
+*
+* const name = 'my-module'
+* export default defineVixtModule<ModuleOptions>({
+*   meta: { name },
+*   defaults: { enabled: true },
+*   setup(options, vixt) {
+*     console.log(options) // { enabled: true }
+*     return {
+*       name,
+*       configResolved(config) {
+*         console.log(config)
+*       }
+*     } // return one or more vite plugins
+*   }
+* })
+* ```
+*/
 function defineVixtModule(definition) {
 	if (typeof definition == "function") return defineVixtModule({ setup: definition });
 	const module = definition;
@@ -170,10 +232,10 @@ async function applyLayerModules({ config, layers = [] }) {
 }
 //#endregion
 //#region src/node/modules/alias.ts
-const name$8 = "vixt:alias";
+const name$9 = "vixt:alias";
 var alias_default = defineVixtModule({
 	meta: {
-		name: name$8,
+		name: name$9,
 		configKey: "alias"
 	},
 	defaults(vixt) {
@@ -190,7 +252,7 @@ var alias_default = defineVixtModule({
 	},
 	setup(options) {
 		return {
-			name: name$8,
+			name: name$9,
 			enforce: "pre",
 			config() {
 				return { resolve: { alias: options } };
@@ -226,10 +288,10 @@ function isEmptyCode(code) {
 		return false;
 	}
 }
-const name$7 = "vixt:app";
+const name$8 = "vixt:app";
 var app_default = defineVixtModule({
 	meta: {
-		name: name$7,
+		name: name$8,
 		configKey: "app"
 	},
 	defaults: {
@@ -248,47 +310,47 @@ var app_default = defineVixtModule({
 		const relativeEntryPath = `/${path.basename(srcDir)}/${entryFile}`;
 		const absoluteEntryPath = path.resolve(srcDir, entryFile);
 		if (transformEntryFile && !fs.existsSync(absoluteEntryPath)) fs.outputFileSync(absoluteEntryPath, "");
+		function transformEntryFileHandler(code) {
+			if (isEmptyCode(code)) return options.entryCode;
+		}
+		function transformIndexHtmlHandler(html = "") {
+			const { rootTag, rootId, head } = options;
+			const tags = Object.entries(head ?? {}).map(([tag, attrs]) => attrs.map((attr) => resolveHead(tag, attr))).flat();
+			const loadingTemplate = resolveLoadingTemplate(options, vixt);
+			return {
+				html: `<!DOCTYPE html>\n${html}`,
+				tags: [
+					{
+						tag: rootTag,
+						attrs: { id: rootId },
+						children: loadingTemplate,
+						injectTo: "body"
+					},
+					{
+						tag: "script",
+						attrs: {
+							type: "module",
+							src: relativeEntryPath
+						},
+						injectTo: "body"
+					},
+					...tags
+				]
+			};
+		}
 		const order = "pre";
 		return {
-			name: name$7,
+			name: name$8,
 			enforce: order,
-			transform: {
+			transform: transformEntryFile ? {
 				order,
 				filter: { id: absoluteEntryPath },
-				handler(code) {
-					if (!transformEntryFile) return;
-					if (isEmptyCode(code)) return options.entryCode;
-				}
-			},
-			transformIndexHtml: {
+				handler: transformEntryFileHandler
+			} : void 0,
+			transformIndexHtml: transformIndexHtml ? {
 				order,
-				handler(html = "") {
-					if (!transformIndexHtml) return;
-					const { rootTag, rootId, head } = options;
-					const tags = Object.entries(head ?? {}).map(([tag, attrs]) => attrs.map((attr) => resolveHead(tag, attr))).flat();
-					const loadingTemplate = resolveLoadingTemplate(options, vixt);
-					return {
-						html: `<!DOCTYPE html>\n${html}`,
-						tags: [
-							{
-								tag: rootTag,
-								attrs: { id: rootId },
-								children: loadingTemplate,
-								injectTo: "body"
-							},
-							{
-								tag: "script",
-								attrs: {
-									type: "module",
-									src: relativeEntryPath
-								},
-								injectTo: "body"
-							},
-							...tags
-						]
-					};
-				}
-			}
+				handler: transformIndexHtmlHandler
+			} : void 0
 		};
 	}
 });
@@ -311,10 +373,10 @@ var build_default = defineVixtModule({
 });
 //#endregion
 //#region src/node/modules/dev-server.ts
-const name$5 = "vixt:dev-server";
+const name$6 = "vixt:dev-server";
 var dev_server_default = defineVixtModule({
 	meta: {
-		name: name$5,
+		name: name$6,
 		configKey: "devServer"
 	},
 	defaults(vixt) {
@@ -347,7 +409,7 @@ var dev_server_default = defineVixtModule({
 			timer = setTimeout(fn, 500);
 		}
 		return [{
-			name: name$5,
+			name: name$6,
 			enforce: "pre",
 			config() {
 				const { port, host, cors } = options;
@@ -366,6 +428,92 @@ var dev_server_default = defineVixtModule({
 		}, sslOptions.enabled && Ssl(sslOptions)];
 	}
 });
+var imports_default = defineVixtModule({
+	meta: {
+		name: "vixt:imports",
+		configKey: "imports"
+	},
+	defaults(vixt) {
+		const { buildTypesDir } = vixt.options;
+		const { composables = [], constants = [], hooks = [], stores = [], utils = [] } = resolveLayersDirs([...vixt._layers].reverse());
+		return {
+			imports: [{ "@vixt/core/client": [
+				"defineAppConfig",
+				"defineVixtPlugin",
+				"useAppConfig",
+				"useVixtApp",
+				"$fetch"
+			] }],
+			dts: `${buildTypesDir}/auto-imports.d.ts`,
+			dirs: [
+				composables,
+				constants,
+				hooks,
+				stores,
+				utils
+			].flat()
+		};
+	},
+	setup(options) {
+		return AutoImport(options);
+	}
+});
+//#endregion
+//#region src/node/modules/nitro.ts
+let nitroCtx;
+function setNitroCtx(ctx) {
+	nitroCtx = ctx;
+}
+function writeTypes$1() {
+	return nitroCtx && writeTypes(nitroCtx);
+}
+var nitro_default = defineVixtModule({
+	meta: {
+		name: "vixt:nitro",
+		configKey: "nitro"
+	},
+	defaults(vixt) {
+		return {
+			enabled: false,
+			scanDirs: vixt._layers.map((layer) => {
+				const { serverDir = "./server" } = layer.config?.nitro ?? {};
+				return path.join(layer.cwd, serverDir);
+			}),
+			serverDir: "./server",
+			typescript: { generatedTypesDir: vixt.options.buildTypesDir },
+			modules: [(nitro) => {
+				nitro.hooks.hook("build:before", setNitroCtx);
+			}]
+		};
+	},
+	setup(options, vixt) {
+		if (!options.enabled) return;
+		return [
+			nitro(options),
+			{
+				name: "vixt:nitro-types",
+				configureServer(server) {
+					writeTypes$1();
+					const routesDirs = vixt._layers.map((e) => `${e.cwd}/server/routes`);
+					const watcher = server.watcher;
+					watcher.add(routesDirs);
+					watcher.on("all", (_, p) => {
+						if (routesDirs.some((r) => path.normalize(p).includes(path.normalize(r)))) writeTypes$1();
+					});
+				}
+			},
+			{
+				name: "vixt:config-outdir-for-unocss",
+				config() {
+					let publicDir = ".output/public";
+					if (options.output?.publicDir) publicDir = options.output.publicDir;
+					else if (options.output?.dir) publicDir = path.join(options.output.dir, "public");
+					return { build: { outDir: publicDir } };
+				}
+			}
+		];
+	}
+});
 //#endregion
 //#region src/node/modules/typescript.ts
 function generateTsConfig(options, vixt) {
@@ -485,6 +633,11 @@ var virtual_app_config_default = defineVixtModule({
 						defuCall.$args.push(parseExpression(appConfigName));
 					}
 				}
+				try {
+					defuCall.$args.push(JSON.parse(JSON.stringify(vixt.options.appConfig ?? {})));
+				} catch (err) {
+					console.error(err);
+				}
 				defuCall.$args.push({
 					baseURL,
 					rootId
@@ -589,8 +742,8 @@ var vite_default = defineVixtModule({
 //#endregion
 //#region src/node/modules/index.ts
 const virtualModuleIds = {
-	css: virtual_css_default.getMeta().name,
 	appConfig: virtual_app_config_default.getMeta().name,
+	css: virtual_css_default.getMeta().name,
 	plugins: virtual_plugins_default.getMeta().name
 };
 const builtinModules = [
@@ -599,6 +752,8 @@ const builtinModules = [
 	app_default,
 	build_default,
 	dev_server_default,
+	imports_default,
+	nitro_default,
 	typescript_default,
 	virtual_app_config_default,
 	virtual_css_default,
@@ -612,6 +767,7 @@ async function loadVixt(opts) {
 	cliOptions.force && fs.removeSync(result.config.buildDir);
 	result.config.debug = !!cliOptions.debug;
 	result.config.dev = env.NODE_ENV !== "production";
+	result.config.test = env.NODE_ENV === "test";
 	result.layers = applyLayers(result);
 	const layerModules = await applyLayerModules(result);
 	return {
@@ -631,4 +787,4 @@ function createVixtPlugin(loadOptions) {
 	});
 }
 //#endregion
-export { VixtClientAutoImports, applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };
+export { applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -30,21 +30,23 @@
   "dependencies": {
     "@types/fs-extra": "^11.0.4",
     "@vitejs/plugin-basic-ssl": "^2.3.0",
-    "@vitejs/plugin-legacy": "^8.0.1",
+    "@vitejs/plugin-legacy": "^8.0.2",
     "@vue/tsconfig": "^0.9.1",
     "c12": "^3.3.4",
     "cac": "^7.0.0",
     "citty": "^0.2.2",
     "defu": "^6.1.7",
     "find-up": "^8.0.0",
-    "fs-extra": "^11.3.4",
-    "jiti": "^2.6.1",
-    "magicast": "^0.5.2",
+    "fs-extra": "^11.3.5",
+    "jiti": "^2.7.0",
+    "magicast": "^0.5.3",
     "mlly": "^1.8.2",
+    "nitro": "^3.0.260522-beta",
     "pathe": "^2.0.3",
-    "pkg-types": "^2.3.0",
-    "vite": "^8.0.7",
-    "vite-bundle-analyzer": "^1.3.7",
-    "vite-plugin-checker": "^0.12.0"
+    "pkg-types": "^2.3.1",
+    "unplugin-auto-import": "^21.0.0",
+    "vite": "^8.0.14",
+    "vite-bundle-analyzer": "^1.3.8",
+    "vite-plugin-checker": "^0.13.0"
   }
 }