@vixt/core 0.1.28 → 0.1.29

package/dist/client/index.d.mts

@@ -1,4 +1,4 @@
-import { f as VixtAppConfig } from '../shared/core.b103189b.mjs';
+import { f as VixtAppConfig } from '../shared/core.CEkz_SNF.mjs';
 import { Pinia } from 'pinia';
 import { App, Plugin } from 'vue';
 import { Router, RouteRecord } from 'vue-router';

package/dist/client/index.d.ts

@@ -1,4 +1,4 @@
-import { f as VixtAppConfig } from '../shared/core.b103189b.js';
+import { f as VixtAppConfig } from '../shared/core.CEkz_SNF.js';
 import { Pinia } from 'pinia';
 import { App, Plugin } from 'vue';
 import { Router, RouteRecord } from 'vue-router';

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { V as VixtOptions, a as VixtConfigLayer, b as VixtConfigLayerMeta, M as ModuleOptions, c as ModuleDefinition, d as VixtModule, e as Vixt } from './shared/core.b103189b.mjs';
-export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.b103189b.mjs';
+import { V as VixtOptions, a as VixtConfigLayer, b as VixtConfigLayerMeta, M as ModuleOptions, c as ModuleDefinition, d as VixtModule, e as Vixt } from './shared/core.CEkz_SNF.mjs';
+export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.CEkz_SNF.mjs';
 import * as c12 from 'c12';
 import { LoadConfigOptions } from 'c12';
 import { RawVueCompilerOptions } from '@vue/language-core';
@@ -19,7 +19,7 @@ declare function applyLayers(layers: VixtConfigLayer[], config: VixtOptions): {
     configFile?: string;
 }[];
 declare function isSamePath(a: string, b: string): boolean;
-declare function resolveLayersDirs(layers: VixtConfigLayer[] | undefined, config: VixtOptions): Record<string, string[] | undefined>;
+declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
 /**
  * Load workspace and cwd env variables by default
@@ -33,7 +33,7 @@ declare function loadWorkspaceEnv(mode?: string, prefixes?: string | string[]):
 declare function defineVitePlugin<Options = any>(pluginFn: (options?: Options) => PluginOption): (options?: Options) => PluginOption;
 declare function defineVixtModule<T extends ModuleOptions>(definition: ModuleDefinition<T> | VixtModule<T>): VixtModule<T>;
 declare function installModule(module: VixtModule, inlineOptions: any, vixt: Vixt): PluginOption;
-declare function applyLayerModules(layers: VixtConfigLayer[], config: VixtOptions): Promise<VixtModule[]>;
+declare function applyLayerModules(layers: VixtConfigLayer[]): Promise<VixtModule[]>;
 
 declare const config: VixtModule<ModuleOptions>;
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { V as VixtOptions, a as VixtConfigLayer, b as VixtConfigLayerMeta, M as ModuleOptions, c as ModuleDefinition, d as VixtModule, e as Vixt } from './shared/core.b103189b.js';
-export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.b103189b.js';
+import { V as VixtOptions, a as VixtConfigLayer, b as VixtConfigLayerMeta, M as ModuleOptions, c as ModuleDefinition, d as VixtModule, e as Vixt } from './shared/core.CEkz_SNF.js';
+export { g as ModuleMeta, P as PluginOptions, f as VixtAppConfig } from './shared/core.CEkz_SNF.js';
 import * as c12 from 'c12';
 import { LoadConfigOptions } from 'c12';
 import { RawVueCompilerOptions } from '@vue/language-core';
@@ -19,7 +19,7 @@ declare function applyLayers(layers: VixtConfigLayer[], config: VixtOptions): {
     configFile?: string;
 }[];
 declare function isSamePath(a: string, b: string): boolean;
-declare function resolveLayersDirs(layers: VixtConfigLayer[] | undefined, config: VixtOptions): Record<string, string[] | undefined>;
+declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
 /**
  * Load workspace and cwd env variables by default
@@ -33,7 +33,7 @@ declare function loadWorkspaceEnv(mode?: string, prefixes?: string | string[]):
 declare function defineVitePlugin<Options = any>(pluginFn: (options?: Options) => PluginOption): (options?: Options) => PluginOption;
 declare function defineVixtModule<T extends ModuleOptions>(definition: ModuleDefinition<T> | VixtModule<T>): VixtModule<T>;
 declare function installModule(module: VixtModule, inlineOptions: any, vixt: Vixt): PluginOption;
-declare function applyLayerModules(layers: VixtConfigLayer[], config: VixtOptions): Promise<VixtModule[]>;
+declare function applyLayerModules(layers: VixtConfigLayer[]): Promise<VixtModule[]>;
 
 declare const config: VixtModule<ModuleOptions>;
 

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { cwd, env } from 'node:process';
 import { loadConfig } from 'c12';
 import fs from 'fs-extra';
-import path from 'pathe';
+import path, { resolve, normalize } from 'pathe';
+import { env, cwd } from 'node:process';
 import { cac } from 'cac';
 import { findUpSync } from 'find-up';
 import { loadEnv as loadEnv$1 } from 'vite';
@@ -14,67 +14,58 @@ function defineVixtConfig(input) {
   return input;
 }
 async function loadVixtConfig(opts) {
-  const rootDir = path.resolve(cwd());
-  const buildDirName = ".vixt";
-  const buildDir = path.resolve(rootDir, buildDirName);
-  const buildTypesDir = path.resolve(buildDir, "types");
-  const buildLayersDir = path.resolve(buildDir, "layers");
-  const buildImportsDir = path.resolve(buildDir, "imports");
-  const srcDirName = "src";
-  const srcDir = path.resolve(rootDir, srcDirName);
   const result = await loadConfig({
     name: "vixt",
     rcFile: false,
-    ...opts,
-    defaults: {
-      rootDir,
-      buildDirName,
-      buildDir,
-      buildTypesDir,
-      buildLayersDir,
-      buildImportsDir,
-      srcDirName,
-      srcDir,
-      ...opts?.defaults
-    }
+    ...opts
   });
+  const { config, cwd } = result;
+  config.rootDir ??= cwd;
+  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.srcDir ??= resolve(config.rootDir, "src");
   return result;
 }
 function applyLayers(layers, config) {
   const { rootDir, buildLayersDir } = config;
-  return layers.map((layer) => {
+  return layers.filter((e) => e.cwd).map((layer) => {
     const meta = layer.config?.meta ?? {};
     const layerName = meta.name || layer.cwd.split("/").pop();
-    if (!isSamePath(layer.cwd, path.resolve(rootDir)))
+    if (!isSamePath(layer.cwd, resolve(rootDir))) {
       meta.alias = `#/layers/${layerName}`;
+    }
     if (layer.cwd?.includes("node_modules")) {
-      const newCwd = path.resolve(buildLayersDir, layerName);
+      const newCwd = resolve(buildLayersDir, layerName);
       fs.copySync(layer.cwd, newCwd, {
         filter: (src) => {
-          const nodeModulesPath = path.resolve(layer.cwd, "node_modules");
-          const tsConfigPath = path.resolve(layer.cwd, "tsconfig.json");
+          const nodeModulesPath = resolve(layer.cwd, "node_modules");
+          const tsConfigPath = resolve(layer.cwd, "tsconfig.json");
           return !isSamePath(src, nodeModulesPath) && !isSamePath(src, tsConfigPath);
         }
       });
       layer.cwd = newCwd;
     }
+    layer.config ??= {};
+    layer.config.rootDir ??= layer.cwd;
+    layer.config.srcDir ??= resolve(layer.config.rootDir, "src");
     return { ...layer, meta };
   });
 }
 function isSamePath(a, b) {
-  return path.normalize(a) === path.normalize(b);
+  return normalize(a) === normalize(b);
 }
-function resolveLayersDirs(layers = [], config) {
-  const { srcDirName } = config;
+function resolveLayersDirs(layers = []) {
   const dirs = {};
   for (const layer of layers) {
-    const srcPath = path.resolve(layer.cwd, srcDirName);
+    const srcPath = layer.config.srcDir;
     const isExist = fs.existsSync(srcPath);
     const contents = isExist ? fs.readdirSync(srcPath) : [];
     for (const content of contents) {
-      const fileOrDirPath = path.resolve(srcPath, content);
+      const fileOrDirPath = resolve(srcPath, content);
       if (fs.statSync(fileOrDirPath).isDirectory()) {
-        dirs[content] ?? (dirs[content] = []);
+        dirs[content] ??= [];
         dirs[content].push(fileOrDirPath);
       }
     }
@@ -107,15 +98,17 @@ function defineVixtModule(definition) {
   const module = definition;
   function getOptions(inlineOptions, vixt) {
     const configKey = module.meta?.configKey || module.meta?.name;
+    const configOptions = configKey ? vixt.options[configKey] : {};
     const defaultOptions = typeof module.defaults === "function" ? module.defaults(vixt) : module.defaults;
-    const resolvedOptions = defu(inlineOptions, configKey ? vixt.options[configKey] : {}, defaultOptions);
+    const resolvedOptions = defu(inlineOptions, configOptions, defaultOptions);
     if (configKey) {
       vixt.options[configKey] = resolvedOptions;
     }
     return resolvedOptions;
   }
   function normalizedModule(inlineOptions, vixt) {
-    return module.setup?.(getOptions(inlineOptions, vixt), vixt);
+    const options = getOptions(inlineOptions, vixt);
+    return module.setup?.(options, vixt);
   }
   normalizedModule.getMeta = () => module.meta;
   normalizedModule.getOptions = getOptions;
@@ -124,10 +117,10 @@ function defineVixtModule(definition) {
 function installModule(module, inlineOptions, vixt) {
   return module(inlineOptions, vixt);
 }
-async function applyLayerModules(layers, config) {
-  const { modules: modulesDir = [] } = resolveLayersDirs(layers, config);
+async function applyLayerModules(layers) {
+  const { modules: modulesDirs = [] } = resolveLayersDirs(layers);
   const modules = [];
-  for (const m of modulesDir) {
+  for (const m of modulesDirs) {
     if (fs.existsSync(m)) {
       const files = fs.readdirSync(m);
       for (const f of files) {
@@ -184,8 +177,8 @@ const config = defineVixtModule({
       configureServer(server) {
         const mode = server.config.mode;
         const watchFiles = [];
-        const configFiles = vixt._layers.map((layer) => path.resolve(layer.cwd, "vixt.config.ts"));
-        const modulesDirs = vixt._layers.map((layer) => path.resolve(layer.cwd, vixt.options.srcDirName, "modules"));
+        const configFiles = vixt._layers.map((layer) => layer.configFile);
+        const modulesDirs = vixt._layers.map((layer) => path.resolve(layer.config.srcDir, "modules"));
         watchFiles.push(...configFiles, ...modulesDirs);
         const workspaceManifestLocation = findUpSync(["pnpm-workspace.yaml", "pnpm-workspace.yml"]);
         if (workspaceManifestLocation) {
@@ -326,8 +319,8 @@ async function loadVixt(opts) {
   if (isForce) {
     fs.removeSync(result.config.buildDir);
   }
-  result.layers = applyLayers(result.layers?.filter((e) => e.cwd) ?? [], result.config);
-  const layerModules = await applyLayerModules(result.layers ?? [], result.config);
+  result.layers = applyLayers(result.layers ?? [], result.config);
+  const layerModules = await applyLayerModules(result.layers ?? []);
   const vixt = {
     options: result.config,
     _layers: result.layers ?? [],

package/dist/shared/{core.b103189b.d.mts → core.CEkz_SNF.d.mts}

@@ -16,7 +16,7 @@ interface ModuleMeta extends Record<string, any> {
 interface ModuleDefinition<T extends ModuleOptions = ModuleOptions> {
     meta?: ModuleMeta;
     defaults?: T | ((vixt: Vixt) => T);
-    setup?: (this: void, resolvedOptions: T, vixt: Vixt) => PluginOption;
+    setup?: (this: void, resolvedOptions: T, vixt: Vixt) => PluginOption | void;
 }
 interface VixtModule<T extends ModuleOptions = ModuleOptions> {
     (this: void, inlineOptions: T, vixt: Vixt): PluginOption;
@@ -29,10 +29,6 @@ interface VixtOptions extends Record<string, any> {
      * @default process.cwd()
      */
     rootDir?: string;
-    /**
-     * @default '.vixt'
-     */
-    buildDirName?: string;
     /**
      * @default '<rootDir>/.vixt'
      */
@@ -49,10 +45,6 @@ interface VixtOptions extends Record<string, any> {
      * @default '<buildDir>/imports'
      */
     buildImportsDir?: string;
-    /**
-     * @default 'src'
-     */
-    srcDirName?: string;
     /**
      * @default '<rootDir>/src'
      */

package/dist/shared/{core.b103189b.d.ts → core.CEkz_SNF.d.ts}

@@ -16,7 +16,7 @@ interface ModuleMeta extends Record<string, any> {
 interface ModuleDefinition<T extends ModuleOptions = ModuleOptions> {
     meta?: ModuleMeta;
     defaults?: T | ((vixt: Vixt) => T);
-    setup?: (this: void, resolvedOptions: T, vixt: Vixt) => PluginOption;
+    setup?: (this: void, resolvedOptions: T, vixt: Vixt) => PluginOption | void;
 }
 interface VixtModule<T extends ModuleOptions = ModuleOptions> {
     (this: void, inlineOptions: T, vixt: Vixt): PluginOption;
@@ -29,10 +29,6 @@ interface VixtOptions extends Record<string, any> {
      * @default process.cwd()
      */
     rootDir?: string;
-    /**
-     * @default '.vixt'
-     */
-    buildDirName?: string;
     /**
      * @default '<rootDir>/.vixt'
      */
@@ -49,10 +45,6 @@ interface VixtOptions extends Record<string, any> {
      * @default '<buildDir>/imports'
      */
     buildImportsDir?: string;
-    /**
-     * @default 'src'
-     */
-    srcDirName?: string;
     /**
      * @default '<rootDir>/src'
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -26,19 +26,19 @@
   ],
   "dependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@vue/tsconfig": "^0.6.0",
+    "@vue/tsconfig": "^0.7.0",
     "c12": "^2.0.1",
     "cac": "^6.7.14",
     "defu": "^6.1.4",
     "find-up": "^7.0.0",
     "fs-extra": "^11.2.0",
-    "mlly": "^1.7.3",
-    "pathe": "^1.1.2",
-    "pkg-types": "^1.2.1",
+    "mlly": "^1.7.4",
+    "pathe": "^2.0.1",
+    "pkg-types": "^1.3.0",
     "tsx": "^4.19.2",
-    "vite": "^5.4.11",
+    "vite": "^6.0.7",
     "vite-plugin-checker": "^0.8.0",
-    "vue-tsc": "2.1.10"
+    "vue-tsc": "^2.2.0"
   },
   "scripts": {
     "build": "unbuild"