@vixt/core 0.12.1 → 0.13.0

package/dist/node/index.d.mts

@@ -1,5 +1,5 @@
 import { ConfigLayer, ConfigLayerMeta, LoadConfigOptions, ResolvedConfig } from "c12";
-import { HtmlTagDescriptor, InlineConfig, LogLevel, PluginOption, ServerOptions, UserConfig } from "vite";
+import { HtmlTagDescriptor, PluginOption, ServerOptions, UserConfig } from "vite";
 import Legacy from "@vitejs/plugin-legacy";
 import Analyzer from "vite-bundle-analyzer";
 import Ssl from "@vitejs/plugin-basic-ssl";
@@ -7,7 +7,6 @@ import AutoImport from "unplugin-auto-import/vite";
 import { NitroPluginConfig } from "nitro/vite";
 import Checker from "vite-plugin-checker";
 import { TSConfig } from "pkg-types";
-
 //#region src/node/types/layer.d.ts
 interface VixtConfigLayerMeta extends ConfigLayerMeta {
   /** layer name */
@@ -28,7 +27,7 @@ interface Vixt {
   _layers: VixtConfigLayer[];
   _modules: VixtModule[];
 }
-type ExtractPluginOptions<Options = any> = (Options extends ((...args: any[]) => any) ? Parameters<Options>[0] : Options);
+type ExtractPluginOptions<Options = any> = Options extends ((...args: any[]) => any) ? Parameters<Options>[0] : Options;
 //#endregion
 //#region src/node/types/module.d.ts
 type ModuleOptions = Record<string, any>;
@@ -180,24 +179,24 @@ interface BuildOptions {
   /**
    * Set to true to enable bundle analysis, or pass an object with `enabled: true` and options: [vite-bundle-analyzer](https://github.com/nonzzz/vite-bundle-analyzer)
    */
-  analyze?: boolean | ExtractPluginOptions<typeof Analyzer> & {
+  analyze?: boolean | (ExtractPluginOptions<typeof Analyzer> & {
     enabled?: boolean;
-  };
+  });
   /**
    * Set to true to enable legacy mode, or pass an object with `enabled: true` and options: [@vitejs/plugin-legacy](https://github.com/vitejs/vite/tree/main/packages/plugin-legacy)
    */
-  legacy?: boolean | ExtractPluginOptions<typeof Legacy> & {
+  legacy?: boolean | (ExtractPluginOptions<typeof Legacy> & {
     enabled?: boolean;
-  };
+  });
 }
 interface DevServerOptions extends Pick<ServerOptions, 'port' | 'host' | 'cors'> {
   /**
    * Whether to enable HTTPS by using [@vitejs/plugin-basic-ssl](https://github.com/vitejs/vite-plugin-basic-ssl).
    * @default false
    */
-  https?: boolean | ExtractPluginOptions<typeof Ssl> & {
+  https?: boolean | (ExtractPluginOptions<typeof Ssl> & {
     enabled?: boolean;
-  };
+  });
   /**
    * The watch property lets you define patterns that will restart the dev server when changed.
    */
@@ -398,34 +397,128 @@ interface VixtOptions extends VixtConfig {
  */
 declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare function loadVixtConfig(opts?: LoadVixtConfigOptions): Promise<ResolvedVixtConfig>;
-declare function applyLayers({
-  config,
-  layers
-}: ResolvedVixtConfig): VixtConfigLayer[];
+declare function applyLayers({ config, layers }: ResolvedVixtConfig): VixtConfigLayer[];
 declare function isSamePath(a: string, b: string): boolean;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 //#endregion
+//#region ../../node_modules/.pnpm/citty@0.2.2/node_modules/citty/dist/index.d.mts
+//#region src/types.d.ts
+type ArgType = "boolean" | "string" | "enum" | "positional" | undefined;
+type _ArgDef<T extends ArgType, VT extends boolean | number | string> = {
+  type?: T;
+  description?: string;
+  valueHint?: string;
+  alias?: string | string[];
+  default?: VT;
+  required?: boolean;
+  options?: string[];
+};
+type BooleanArgDef = Omit<_ArgDef<"boolean", boolean>, "options"> & {
+  negativeDescription?: string;
+};
+type StringArgDef = Omit<_ArgDef<"string", string>, "options">;
+type EnumArgDef = _ArgDef<"enum", string>;
+type PositionalArgDef = Omit<_ArgDef<"positional", string>, "alias" | "options">;
+type ArgDef = BooleanArgDef | StringArgDef | PositionalArgDef | EnumArgDef;
+type ArgsDef = Record<string, ArgDef>;
+type ResolveParsedArgType<T extends ArgDef, VT> = T extends {
+  default?: any;
+  required?: boolean;
+} ? T["default"] extends NonNullable<VT> ? VT : T["required"] extends true ? VT : VT | undefined : VT | undefined;
+type ParsedPositionalArg<T extends ArgDef> = T extends {
+  type: "positional";
+} ? ResolveParsedArgType<T, string> : never;
+type ParsedStringArg<T extends ArgDef> = T extends {
+  type: "string";
+} ? ResolveParsedArgType<T, string> : never;
+type ParsedBooleanArg<T extends ArgDef> = T extends {
+  type: "boolean";
+} ? ResolveParsedArgType<T, boolean> : never;
+type ParsedEnumArg<T extends ArgDef> = T extends {
+  type: "enum";
+  options: infer U;
+} ? U extends Array<any> ? ResolveParsedArgType<T, U[number]> : never : never;
+type RawArgs = {
+  _: string[];
+};
+type ParsedArg<T extends ArgDef> = T["type"] extends "positional" ? ParsedPositionalArg<T> : T["type"] extends "boolean" ? ParsedBooleanArg<T> : T["type"] extends "string" ? ParsedStringArg<T> : T["type"] extends "enum" ? ParsedEnumArg<T> : never;
+type ParsedArgs<T extends ArgsDef = ArgsDef> = RawArgs & { [K in keyof T]: ParsedArg<T[K]>; } & { [K in keyof T as T[K] extends {
+  alias: string;
+} ? T[K]["alias"] : never]: ParsedArg<T[K]>; } & { [K in keyof T as T[K] extends {
+  alias: string[];
+} ? T[K]["alias"][number] : never]: ParsedArg<T[K]>; } & Record<string, string | number | boolean | string[]>;
+//#endregion
 //#region src/node/env.d.ts
-/** https://github.com/vitejs/vite/blob/main/packages/vite/src/node/cli.ts */
-interface GlobalCLIOptions {
-  '--'?: string[];
-  'c'?: boolean | string;
-  'config'?: string;
-  'base'?: string;
-  'l'?: LogLevel;
-  'logLevel'?: LogLevel;
-  'clearScreen'?: boolean;
-  'configLoader'?: InlineConfig['configLoader'];
-  'd'?: boolean | string;
-  'debug'?: boolean | string;
-  'f'?: string;
-  'filter'?: string;
-  'm'?: string;
-  'mode'?: string;
-  'force'?: boolean;
-  'w'?: boolean;
-}
-declare function loadCLIOptions(): GlobalCLIOptions;
+declare function loadCLIOptions(): ParsedArgs<{
+  https: {
+    type: "boolean";
+    description: string;
+  };
+  host: {
+    type: "string";
+    description: string;
+  };
+  port: {
+    type: "string";
+    description: string;
+    alias: string[];
+  };
+  open: {
+    type: "boolean";
+    description: string;
+    alias: string[];
+    default: false;
+  };
+  cors: {
+    type: "boolean";
+    description: string;
+  };
+  strictPort: {
+    type: "boolean";
+    description: string;
+  };
+  root: {
+    type: "positional";
+    description: string;
+    required: false;
+    default: undefined;
+  };
+  debug: {
+    type: "boolean";
+    description: string;
+    alias: string[];
+    default: false;
+  };
+  mode: {
+    type: "string";
+    description: string;
+    alias: string[];
+  };
+  logLevel: {
+    type: "enum";
+    description: string;
+    options: ("error" | "warn" | "info" | "silent")[];
+    alias: string[];
+  };
+  clear: {
+    type: "boolean";
+    description: string;
+    default: false;
+  };
+  force: {
+    type: "boolean";
+    description: string;
+    default: false;
+  };
+  legacy: {
+    type: "boolean";
+    description: string;
+  };
+  analyze: {
+    type: "boolean";
+    description: string;
+  };
+}>;
 declare function loadMode(): string | undefined;
 /**
  * Load workspace and cwd env variables by default
@@ -498,10 +591,7 @@ declare function defineVitePlugin<Options = any>(pluginFn: (options?: Options) =
  */
 declare function defineVixtModule<T extends ModuleOptions = ModuleOptions>(definition: ModuleDefinition<T> | VixtModule<T>): VixtModule<T>;
 declare function installModule<T extends ModuleOptions = ModuleOptions>(module: VixtModule<T>, inlineOptions: any, vixt: Vixt): PluginOption;
-declare function applyLayerModules({
-  config,
-  layers
-}: ResolvedVixtConfig): Promise<VixtModule[]>;
+declare function applyLayerModules({ config, layers }: ResolvedVixtConfig): Promise<VixtModule[]>;
 //#endregion
 //#region src/node/modules/index.d.ts
 declare const virtualModuleIds: {
@@ -515,4 +605,4 @@ declare const builtinModules: (VixtModule<ModuleOptions> | VixtModule<AliasOptio
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => import("vite").PluginOption;
 //#endregion
-export { AliasOptions, AppHead, AppHeadAttrs, AppOptions, BuildOptions, DevServerOptions, ExtractPluginOptions, GlobalCLIOptions, ImportsOptions, LoadVixtConfigOptions, ModuleDefinition, ModuleMeta, ModuleOptions, NitroOptions, ResolvedVixtConfig, TypescriptOptions, Vixt, VixtConfig, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, VixtOptions, applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };
+export { AliasOptions, AppHead, AppHeadAttrs, AppOptions, BuildOptions, DevServerOptions, ExtractPluginOptions, ImportsOptions, LoadVixtConfigOptions, ModuleDefinition, ModuleMeta, ModuleOptions, NitroOptions, ResolvedVixtConfig, TypescriptOptions, Vixt, VixtConfig, VixtConfigLayer, VixtConfigLayerMeta, VixtModule, VixtOptions, applyLayerModules, applyLayers, builtinModules, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, findUpWorkspaceDir, installModule, isSamePath, loadCLIOptions, loadEnv, loadMode, loadVixt, loadVixtConfig, loadWorkspaceEnv, resolveLayersDirs, virtualModuleIds };

package/dist/node/index.mjs

@@ -1,8 +1,8 @@
+import { cwd, env } from "node:process";
 import { loadConfig } from "c12";
 import fs from "fs-extra";
 import path, { normalize, resolve } from "pathe";
-import { cwd, env } from "node:process";
-import { cac } from "cac";
+import { parseVixtArgs } from "@vixt/cli";
 import { findUpSync } from "find-up";
 import { loadEnv as loadEnv$1, mergeConfig, parseAst } from "vite";
 import defu from "defu";
@@ -18,11 +18,11 @@ import Checker from "vite-plugin-checker";
 import { builders, parseExpression, parseModule } from "magicast";
 //#region src/node/env.ts
 function loadCLIOptions() {
-	return cac().parse().options ?? {};
+	return parseVixtArgs();
 }
 function loadMode() {
-	const { mode, m } = loadCLIOptions();
-	return mode || m || env.NODE_ENV;
+	const { mode } = loadCLIOptions();
+	return mode || env.NODE_ENV;
 }
 /**
 * Load workspace and cwd env variables by default
@@ -69,10 +69,12 @@ function defineVixtConfig(input) {
 	return input;
 }
 async function loadVixtConfig(opts) {
+	const cliOptions = loadCLIOptions();
 	const result = await loadConfig({
 		name: "vixt",
 		rcFile: false,
-		...opts
+		...opts,
+		...cliOptions.root ? { cwd: cliOptions.root } : {}
 	});
 	const { config, cwd } = result;
 	config.rootDir ??= cwd;
@@ -83,6 +85,10 @@ async function loadVixtConfig(opts) {
 	config.srcDir ??= resolve(config.rootDir, "src");
 	config.modulesDir ??= resolve(config.srcDir, "modules");
 	config.pluginsDir ??= resolve(config.srcDir, "plugins");
+	config.debug = !!cliOptions.debug;
+	config.dev = env.NODE_ENV !== "production";
+	config.test = env.NODE_ENV === "test";
+	cliOptions.force && fs.removeSync(config.buildDir);
 	return result;
 }
 function applyLayers({ config, layers = [] }) {
@@ -201,7 +207,9 @@ function defineVixtModule(definition) {
 	const module = definition;
 	function getOptions(inlineOptions, vixt) {
 		const configKey = module.meta?.configKey || module.meta?.name;
-		const resolvedOptions = defu(inlineOptions, configKey ? vixt.options[configKey] : {}, typeof module.defaults === "function" ? module.defaults(vixt) : module.defaults);
+		const configOptions = configKey ? vixt.options[configKey] : {};
+		const defaultOptions = typeof module.defaults === "function" ? module.defaults(vixt) : module.defaults;
+		const resolvedOptions = defu(inlineOptions, configOptions, defaultOptions);
 		if (configKey) vixt.options[configKey] = resolvedOptions;
 		return resolvedOptions;
 	}
@@ -360,13 +368,16 @@ var build_default = defineVixtModule({
 		configKey: "build"
 	},
 	setup(options) {
+		const cliOptions = loadCLIOptions();
 		const analyzeOptions = {
 			enabled: !!options.analyze,
-			...typeof options.analyze === "object" ? options.analyze : {}
+			...typeof options.analyze === "object" ? options.analyze : {},
+			...cliOptions.analyze ? { enabled: true } : {}
 		};
 		const legacyOptions = {
 			enabled: !!options.legacy,
-			...typeof options.legacy === "object" ? options.legacy : {}
+			...typeof options.legacy === "object" ? options.legacy : {},
+			...cliOptions.legacy ? { enabled: true } : {}
 		};
 		return [analyzeOptions.enabled && Analyzer(analyzeOptions), legacyOptions.enabled && Legacy(legacyOptions)];
 	}
@@ -398,9 +409,11 @@ var dev_server_default = defineVixtModule({
 		return { watch: watchFiles };
 	},
 	setup(options) {
+		const cliOptions = loadCLIOptions();
 		const sslOptions = {
 			enabled: !!options.https,
-			...typeof options.https === "object" ? options.https : {}
+			...typeof options.https === "object" ? options.https : {},
+			...cliOptions.https ? { enabled: true } : {}
 		};
 		const watchFiles = options.watch ?? [];
 		let timer;
@@ -761,13 +774,8 @@ const builtinModules = [
 ];
 //#endregion
 //#region src/node/vixt.ts
-async function loadVixt(opts) {
+async function loadVixt(opts = {}) {
 	const result = await loadVixtConfig(opts);
-	const cliOptions = loadCLIOptions();
-	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 {

package/package.json

@@ -1,54 +1,53 @@
 {
   "name": "@vixt/core",
-  "type": "module",
-  "version": "0.12.1",
-  "author": "SoulLyoko<https://github.com/SoulLyoko>",
-  "license": "MIT",
+  "version": "0.13.0",
+  "keywords": [
+    "nuxt",
+    "react",
+    "uni",
+    "vite",
+    "vitepress",
+    "vixt",
+    "vue"
+  ],
   "homepage": "https://soullyoko.github.io/vixt/",
+  "license": "MIT",
+  "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "repository": {
     "type": "git",
     "url": "https://github.com/SoulLyoko/vixt.git"
   },
-  "keywords": [
-    "vixt",
-    "vite",
-    "nuxt",
-    "vue",
-    "uni",
-    "vitepress",
-    "react"
+  "files": [
+    "dist"
   ],
+  "type": "module",
+  "main": "./dist/node/index.mjs",
+  "browser": "./dist/client/index.js",
+  "types": "./dist/node/index.d.mts",
   "exports": {
     ".": "./dist/node/index.mjs",
-    "./cli": "./dist/cli/index.mjs",
     "./client": "./dist/client/index.js",
     "./package.json": "./package.json"
   },
-  "main": "./dist/node/index.mjs",
-  "types": "./dist/node/index.d.mts",
-  "browser": "./dist/client/index.js",
-  "files": [
-    "dist"
-  ],
   "dependencies": {
+    "@types/fs-extra": "^11.0.4",
     "@vitejs/plugin-basic-ssl": "^2.3.0",
-    "@vitejs/plugin-legacy": "^8.1.0",
+    "@vitejs/plugin-legacy": "^8.2.3",
+    "@vixt/cli": "0.13.0",
     "@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.6",
+    "fs-extra": "^11.4.0",
     "jiti": "^2.7.0",
-    "magicast": "^0.5.3",
+    "magicast": "^0.5.4",
     "mlly": "^1.8.2",
     "nitro": "^3.0.260610-beta",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
-    "unplugin-auto-import": "^21.0.0",
-    "vite": "^8.1.2",
-    "vite-bundle-analyzer": "^1.3.8",
-    "vite-plugin-checker": "^0.14.4"
+    "unplugin-auto-import": "^21.1.0",
+    "vite": "^8.2.2",
+    "vite-bundle-analyzer": "^1.3.9",
+    "vite-plugin-checker": "^0.14.5"
   }
 }

package/dist/cli/index.d.mts

@@ -1 +0,0 @@
-export { };

package/dist/cli/index.mjs

@@ -1,27 +0,0 @@
-import { defineCommand, runMain } from "citty";
-//#region src/cli/index.ts
-runMain(defineCommand({
-	meta: {
-		name: "vixt",
-		description: "Vixt CLI"
-	},
-	args: { command: {
-		type: "positional",
-		required: true
-	} },
-	subCommands: { prepare: defineCommand({
-		meta: {
-			name: "prepare",
-			description: "Prepare Vixt"
-		},
-		async run() {
-			const { loadConfigFromFile } = await import("vite");
-			await loadConfigFromFile({
-				command: "serve",
-				mode: "dev"
-			}, void 0, void 0, void 0, void 0, "native");
-		}
-	}) }
-}));
-//#endregion
-export {};