@vixt/core 0.0.10 → 0.0.12

package/dist/index.d.mts

@@ -43,6 +43,10 @@ interface VixtOptions extends Record<string, any> {
      * @default '.vixt/types'
      */
     buildTypesDir?: string;
+    /**
+     * @default '.vixt/layers'
+     */
+    buildLayersDir?: string;
     /** layers */
     extends?: string[];
     /** modules */
@@ -116,6 +120,7 @@ declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
+declare const buildLayersDir = ".vixt/layers";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
@@ -127,4 +132,4 @@ declare function applyLayerModules(layers?: VixtConfigLayer[]): Promise<VixtModu
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/dist/index.d.ts

@@ -43,6 +43,10 @@ interface VixtOptions extends Record<string, any> {
      * @default '.vixt/types'
      */
     buildTypesDir?: string;
+    /**
+     * @default '.vixt/layers'
+     */
+    buildLayersDir?: string;
     /** layers */
     extends?: string[];
     /** modules */
@@ -116,6 +120,7 @@ declare function defineVixtConfig(input: VixtOptions): VixtOptions;
 declare const rootDir: string;
 declare const buildDir = ".vixt";
 declare const buildTypesDir = ".vixt/types";
+declare const buildLayersDir = ".vixt/layers";
 declare function loadVixtConfig(opts?: LoadConfigOptions<VixtOptions>): Promise<c12.ResolvedConfig<VixtOptions, c12.ConfigLayerMeta>>;
 declare function resolveLayersDirs(layers?: VixtConfigLayer[]): Record<string, string[] | undefined>;
 
@@ -127,4 +132,4 @@ declare function applyLayerModules(layers?: VixtConfigLayer[]): Promise<VixtModu
 declare function loadVixt(opts?: LoadConfigOptions<VixtOptions>): Promise<Vixt>;
 declare function createVixtPlugin(loadOptions: LoadConfigOptions<VixtOptions>): (options?: VixtOptions | undefined) => vite.PluginOption;
 
-export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { type AppHead, type AppOptions, type ModuleDefinition, type ModuleMeta, type ModuleOptions, type PluginOptions, type TypescriptOptions, type Vixt, type VixtConfigLayer, type VixtModule, type VixtOptions, alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { cwd } from 'node:process';
 import path from 'pathe';
+import { cwd } from 'node:process';
 import fs from 'fs-extra';
 import 'tsx/esm';
 import { pathToFileURL } from 'mlly';
@@ -11,17 +11,19 @@ const name$3 = "vixt:alias";
 const alias = defineVixtModule({
   meta: { name: name$3 },
   setup(_, vixt) {
+    const { rootDir, buildDir } = vixt.options;
     return {
       name: name$3,
       config() {
         return {
-          root: vixt.options.rootDir,
+          root: rootDir,
           resolve: {
             alias: {
-              "@": `${path.resolve(cwd(), "src")}`,
-              "~": `${path.resolve(cwd(), "src")}`,
-              "@@": path.resolve(cwd()),
-              "~~": path.resolve(cwd())
+              "@": `${path.resolve(rootDir, "src")}`,
+              "~": `${path.resolve(rootDir, "src")}`,
+              "@@": path.resolve(rootDir),
+              "~~": path.resolve(rootDir),
+              "#": path.resolve(rootDir, buildDir)
             }
           }
         };
@@ -33,9 +35,10 @@ const alias = defineVixtModule({
 function defineVixtConfig(input) {
   return input;
 }
-const rootDir = cwd();
+const rootDir = path.resolve(cwd());
 const buildDir = ".vixt";
 const buildTypesDir = `${buildDir}/types`;
+const buildLayersDir = `${buildDir}/layers`;
 async function loadVixtConfig(opts) {
   const result = await loadConfig({
     name: "vixt",
@@ -45,12 +48,28 @@ async function loadVixtConfig(opts) {
       rootDir,
       buildDir,
       buildTypesDir,
+      buildLayersDir,
       ...opts?.defaults
     }
   });
-  result.layers = result.layers?.filter((e) => e.cwd);
+  result.layers = result.layers?.filter((e) => e.cwd).map((e) => {
+    if (e.cwd !== rootDir) {
+      const layerRootDir = e.cwd.split("/").pop();
+      const newCwd = path.resolve(rootDir, buildLayersDir, layerRootDir);
+      fs.copySync(e.cwd, newCwd, { filter: (src) => {
+        const nodeModulesPath = path.resolve(e.cwd, "node_modules");
+        const tsConfigPath = path.resolve(e.cwd, "tsconfig.json");
+        return !isSamePath(src, nodeModulesPath) && !isSamePath(src, tsConfigPath);
+      } });
+      return { ...e, relatedCwd: e.cwd, cwd: newCwd };
+    }
+    return e;
+  });
   return result;
 }
+function isSamePath(a, b) {
+  return path.resolve(a) === path.resolve(b);
+}
 function resolveLayersDirs(layers = []) {
   const dirs = {};
   for (const layer of layers) {
@@ -271,7 +290,9 @@ const defaults = {
         "@": ["../src"],
         "@/*": ["../src/*"],
         "~": ["../src"],
-        "~/*": ["../src/*"]
+        "~/*": ["../src/*"],
+        "#": ["."],
+        "#/*": ["./*"]
       },
       types: ["vite/client"]
     },
@@ -323,4 +344,4 @@ function createVixtPlugin(loadOptions) {
   });
 }
 
-export { alias, app, applyLayerModules, buildDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };
+export { alias, app, applyLayerModules, buildDir, buildLayersDir, buildTypesDir, config, createVixtPlugin, defineVitePlugin, defineVixtConfig, defineVixtModule, installModule, loadVixt, loadVixtConfig, resolveLayersDirs, rootDir, typescript };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",