alepha 0.13.7 → 0.13.8

package/dist/cli/index.d.ts

@@ -1,9 +1,9 @@
 import * as alepha0 from "alepha";
 import { Alepha } from "alepha";
 import { FileSystemProvider } from "alepha/file";
-import * as alepha_command1 from "alepha/command";
+import * as alepha_command0 from "alepha/command";
 import { CliProvider, RunnerMethod } from "alepha/command";
-import * as alepha_logger2 from "alepha/logger";
+import * as alepha_logger3 from "alepha/logger";
 
 //#region ../../src/cli/apps/AlephaCli.d.ts
 declare const AlephaCli: alepha0.Service<alepha0.Module>;
@@ -20,7 +20,7 @@ declare class AlephaPackageBuilderCli {
   src: string;
   dist: string;
   fs: FileSystemProvider;
-  make: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  make: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
 }
 declare function analyzeModules(srcDir: string, packageName: string): Promise<Module[]>;
 //#endregion
@@ -36,7 +36,7 @@ declare function analyzeModules(srcDir: string, packageName: string): Promise<Mo
  * - Alepha instance loading
  */
 declare class AlephaCliUtils {
-  protected readonly log: alepha_logger2.Logger;
+  protected readonly log: alepha_logger3.Logger;
   protected readonly fs: FileSystemProvider;
   /**
    * Execute a command using npx with inherited stdio.
@@ -101,7 +101,7 @@ declare class AlephaCliUtils {
    * @param root - The root directory of the project
    * @param modes - Configuration for which dependencies to include
    */
-  ensurePackageJson(root: string, modes: DependencyModes): Promise<void>;
+  ensurePackageJson(root: string, modes: DependencyModes): Promise<object>;
   ensureConfig(root: string, opts: {
     packageJson?: boolean | DependencyModes;
     tsconfigJson?: boolean;
@@ -109,7 +109,7 @@ declare class AlephaCliUtils {
     indexHtml?: boolean;
     biomeJson?: boolean;
     editorconfig?: boolean;
-  }): Promise<void>;
+  }): Promise<Array<void | object>>;
   /**
    * Ensure tsconfig.json exists in the project.
    *
@@ -237,6 +237,13 @@ declare class AlephaCliUtils {
    * @returns True if the package is in dependencies or devDependencies
    */
   hasDependency(root: string, packageName: string): Promise<boolean>;
+  /**
+   * Check if Expo is present in the project.
+   *
+   * @param root - The root directory of the project
+   * @returns True if expo is in dependencies or devDependencies
+   */
+  hasExpo(root: string): Promise<boolean>;
   /**
    * Install a dependency if it's missing from the project.
    *
@@ -251,36 +258,37 @@ declare class AlephaCliUtils {
 interface DependencyModes {
   react?: boolean;
   ui?: boolean;
+  expo?: boolean;
 }
 //#endregion
 //#region ../../src/cli/commands/BiomeCommands.d.ts
 declare class BiomeCommands {
-  protected readonly log: alepha_logger2.Logger;
+  protected readonly log: alepha_logger3.Logger;
   protected readonly utils: AlephaCliUtils;
-  readonly format: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
-  readonly lint: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly format: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly lint: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
 }
 //#endregion
 //#region ../../src/cli/commands/CoreCommands.d.ts
 declare class CoreCommands {
-  protected readonly log: alepha_logger2.Logger;
+  protected readonly log: alepha_logger3.Logger;
   protected readonly cli: CliProvider;
   protected readonly utils: AlephaCliUtils;
   /**
    * Called when no command is provided
    */
-  readonly root: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  readonly root: alepha_command0.CommandPrimitive<alepha0.TObject<{
     version: alepha0.TOptional<alepha0.TBoolean>;
   }>, alepha0.TSchema>;
   /**
    * Clean the project, removing the "dist" directory
    */
-  readonly clean: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly clean: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
   /**
    * Ensure the project has the necessary Alepha configuration files.
    * Add the correct dependencies to package.json and install them.
    */
-  readonly init: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  readonly init: alepha_command0.CommandPrimitive<alepha0.TObject<{
     yarn: alepha0.TOptional<alepha0.TBoolean>;
     pnpm: alepha0.TOptional<alepha0.TBoolean>;
     npm: alepha0.TOptional<alepha0.TBoolean>;
@@ -293,12 +301,12 @@ declare class CoreCommands {
 //#endregion
 //#region ../../src/cli/commands/DrizzleCommands.d.ts
 declare class DrizzleCommands {
-  log: alepha_logger2.Logger;
+  log: alepha_logger3.Logger;
   utils: AlephaCliUtils;
   /**
    * Check if database migrations are up to date.
    */
-  check: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  check: alepha_command0.CommandPrimitive<alepha0.TObject<{
     provider: alepha0.TOptional<alepha0.TString>;
   }>, alepha0.TOptional<alepha0.TString>>;
   /**
@@ -310,7 +318,7 @@ declare class DrizzleCommands {
    * - Writes these definitions to a temporary schema file. (node_modules/.db/entities.ts)
    * - Invokes Drizzle Kit's CLI to generate migration files based on the current schema.
    */
-  generate: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  generate: alepha_command0.CommandPrimitive<alepha0.TObject<{
     provider: alepha0.TOptional<alepha0.TString>;
     custom: alepha0.TOptional<alepha0.TString>;
   }>, alepha0.TOptional<alepha0.TString>>;
@@ -322,7 +330,7 @@ declare class DrizzleCommands {
    * - Creates temporary entity definitions and Drizzle config.
    * - Invokes Drizzle Kit's push command to apply schema changes directly.
    */
-  push: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  push: alepha_command0.CommandPrimitive<alepha0.TObject<{
     provider: alepha0.TOptional<alepha0.TString>;
   }>, alepha0.TOptional<alepha0.TString>>;
   /**
@@ -333,7 +341,7 @@ declare class DrizzleCommands {
    * - Creates temporary entity definitions and Drizzle config.
    * - Invokes Drizzle Kit's migrate command to apply pending migrations.
    */
-  migrate: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  migrate: alepha_command0.CommandPrimitive<alepha0.TObject<{
     provider: alepha0.TOptional<alepha0.TString>;
   }>, alepha0.TOptional<alepha0.TString>>;
   /**
@@ -344,7 +352,7 @@ declare class DrizzleCommands {
    * - Creates temporary entity definitions and Drizzle config.
    * - Invokes Drizzle Kit's studio command to launch the web-based database browser.
    */
-  studio: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  studio: alepha_command0.CommandPrimitive<alepha0.TObject<{
     provider: alepha0.TOptional<alepha0.TString>;
   }>, alepha0.TOptional<alepha0.TString>>;
 }
@@ -365,21 +373,21 @@ declare class VerifyCommands {
    * - Build the project
    * - Clean the project again
    */
-  readonly verify: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly verify: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
   /**
    * Run TypeScript type checking across the codebase with no emit.
    */
-  readonly typecheck: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly typecheck: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
 }
 //#endregion
 //#region ../../src/cli/commands/ViteCommands.d.ts
 declare class ViteCommands {
-  protected readonly log: alepha_logger2.Logger;
+  protected readonly log: alepha_logger3.Logger;
   protected readonly utils: AlephaCliUtils;
   protected readonly env: {
     VITEST_ARGS: string;
   };
-  readonly run: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  readonly run: alepha_command0.CommandPrimitive<alepha0.TObject<{
     watch: alepha0.TOptional<alepha0.TBoolean>;
   }>, alepha0.TString>;
   /**
@@ -388,8 +396,8 @@ declare class ViteCommands {
    * - If an index.html file is found in the project root, it will run Vite in dev mode.
    * - Otherwise, it will look for a server entry file and run it with tsx in watch mode.
    */
-  readonly dev: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TOptional<alepha0.TString>>;
-  readonly build: alepha_command1.CommandPrimitive<alepha0.TObject<{
+  readonly dev: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TOptional<alepha0.TString>>;
+  readonly build: alepha_command0.CommandPrimitive<alepha0.TObject<{
     stats: alepha0.TOptional<alepha0.TBoolean>;
     vercel: alepha0.TOptional<alepha0.TBoolean>;
     cloudflare: alepha0.TOptional<alepha0.TBoolean>;
@@ -397,7 +405,7 @@ declare class ViteCommands {
     sitemap: alepha0.TOptional<alepha0.TString>;
     prerender: alepha0.TOptional<alepha0.TBoolean>;
   }>, alepha0.TOptional<alepha0.TString>>;
-  readonly test: alepha_command1.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
+  readonly test: alepha_command0.CommandPrimitive<alepha0.TObject<alepha0.TProperties>, alepha0.TSchema>;
 }
 //#endregion
 //#region ../../src/cli/version.d.ts

package/dist/cli/index.js

@@ -272,6 +272,13 @@ var AlephaCliUtils = class {
 	generatePackageJsonContent(modes) {
 		const dependencies = { alepha: `^${version}` };
 		const devDependencies = {};
+		const scripts = {
+			dev: "alepha dev",
+			build: "alepha build",
+			lint: "alepha lint",
+			typecheck: "alepha typecheck",
+			verify: "alepha verify"
+		};
 		if (modes.ui) {
 			dependencies["@alepha/ui"] = `^${version}`;
 			modes.react = true;
@@ -286,11 +293,7 @@ var AlephaCliUtils = class {
 			type: "module",
 			dependencies,
 			devDependencies,
-			scripts: {
-				dev: "alepha dev",
-				build: "alepha build",
-				verify: "alepha verify"
-			}
+			scripts
 		};
 	}
 	/**
@@ -309,8 +312,9 @@ var AlephaCliUtils = class {
 		try {
 			await access(packageJsonPath);
 		} catch (error) {
-			await writeFile(packageJsonPath, JSON.stringify(this.generatePackageJsonContent(modes), null, 2));
-			return;
+			const obj = this.generatePackageJsonContent(modes);
+			await writeFile(packageJsonPath, JSON.stringify(obj, null, 2));
+			return obj;
 		}
 		const content = await readFile(packageJsonPath, "utf8");
 		const packageJson$1 = JSON.parse(content);
@@ -323,6 +327,7 @@ var AlephaCliUtils = class {
 		Object.assign(packageJson$1.devDependencies, newPackageJson.devDependencies);
 		Object.assign(packageJson$1.scripts, newPackageJson.scripts);
 		await writeFile(packageJsonPath, JSON.stringify(packageJson$1, null, 2));
+		return packageJson$1;
 	}
 	async ensureConfig(root, opts) {
 		const tasks = [];
@@ -332,7 +337,7 @@ var AlephaCliUtils = class {
 		if (opts.indexHtml) tasks.push(this.ensureIndexHtml(root));
 		if (opts.biomeJson) tasks.push(this.ensureBiomeConfig(root));
 		if (opts.editorconfig) tasks.push(this.ensureEditorConfig(root));
-		await Promise.all(tasks);
+		return await Promise.all(tasks);
 	}
 	/**
 	* Ensure tsconfig.json exists in the project.
@@ -615,6 +620,15 @@ ${models.map((it) => `export const ${it} = models["${it}"];`).join("\n")}
 		}
 	}
 	/**
+	* Check if Expo is present in the project.
+	*
+	* @param root - The root directory of the project
+	* @returns True if expo is in dependencies or devDependencies
+	*/
+	async hasExpo(root) {
+		return this.hasDependency(root, "expo");
+	}
+	/**
 	* Install a dependency if it's missing from the project.
 	*
 	* Automatically detects the package manager (yarn, pnpm, npm) and installs
@@ -722,6 +736,7 @@ var CoreCommands = class {
 		}),
 		handler: async ({ run, flags, root }) => {
 			if (flags.ui) flags.react = true;
+			const isExpo = await this.utils.hasExpo(root);
 			await run({
 				name: "ensuring configuration files",
 				handler: async () => {
@@ -729,9 +744,9 @@ var CoreCommands = class {
 						tsconfigJson: true,
 						packageJson: flags,
 						biomeJson: true,
-						viteConfigTs: true,
+						viteConfigTs: !isExpo,
 						editorconfig: true,
-						indexHtml: !!flags.react
+						indexHtml: !!flags.react && !isExpo
 					});
 					if (!flags.react) await this.utils.ensureSrcMain(root);
 				}
@@ -743,6 +758,8 @@ var CoreCommands = class {
 			} else if (pm === "pnpm") await this.utils.ensurePnpm(root);
 			else await this.utils.ensureNpm(root);
 			await run(`${pm} install`, { alias: `installing dependencies with ${pm}` });
+			if (!isExpo) await this.utils.ensureDependency(root, "vite", { run });
+			await this.utils.ensureDependency(root, "@biomejs/biome", { run });
 			if (flags.test) {
 				await this.utils.ensureTestDir(root);
 				await run(`${pm} ${pm === "yarn" ? "add" : "install"} -D vitest`, { alias: "setup testing with Vitest" });
@@ -958,7 +975,7 @@ var VerifyCommands = class {
 			await run("alepha typecheck");
 			if ((await this.utils.readPackageJson(root)).devDependencies?.vitest) await run("alepha test");
 			if (await this.utils.exists(root, "migrations")) await run("alepha db:check-migrations");
-			await run("alepha build");
+			if (!await this.utils.hasExpo(root)) await run("alepha build");
 			await run("alepha clean");
 		}
 	});
@@ -983,6 +1000,7 @@ var ViteCommands = class {
 	env = $env(t.object({ VITEST_ARGS: t.string({ default: "" }) }));
 	run = $command({
 		name: "run",
+		hide: true,
 		description: "Run a TypeScript file directly",
 		flags: t.object({ watch: t.optional(t.boolean({
 			description: "Watch file for changes",
@@ -1012,10 +1030,15 @@ var ViteCommands = class {
 			description: "Filepath to run"
 		})),
 		handler: async ({ args, root }) => {
+			const expo = await this.utils.hasExpo(root);
 			await this.utils.ensureConfig(root, {
-				viteConfigTs: true,
+				viteConfigTs: !expo,
 				tsconfigJson: true
 			});
+			if (expo) {
+				await this.utils.exec(`expo start`);
+				return;
+			}
 			const entry = await boot.getServerEntry(root, args);
 			this.log.trace("Entry file found", { entry });
 			try {
@@ -1049,6 +1072,7 @@ var ViteCommands = class {
 		}),
 		handler: async ({ flags, args, run, root }) => {
 			process.env.ALEPHA_BUILD_MODE = "cli";
+			if (await this.utils.hasExpo(root)) return;
 			await this.utils.ensureConfig(root, {
 				viteConfigTs: true,
 				tsconfigJson: true
@@ -1093,12 +1117,11 @@ var ViteCommands = class {
 					if (clientBuilt && hasServer) await unlink(`${distDir}/${clientDir}/index.html`);
 				}
 			});
-			await run({
-				name: "copy assets",
-				handler: () => copyAssets({
-					entry: `${distDir}/index.js`,
-					distDir
-				})
+			await copyAssets({
+				root,
+				entry: `${distDir}/index.js`,
+				distDir,
+				run
 			});
 			if (hasClient) {
 				const sitemapBaseUrl = flags.sitemap ?? (typeof viteAlephaBuildOptions.client === "object" ? viteAlephaBuildOptions.client.sitemap?.hostname : void 0);
@@ -1208,7 +1231,9 @@ var AlephaPackageBuilderCli = class {
 			});
 			pkgData.exports = {};
 			for (const item of modules) {
-				const path = item.name === "core" ? "." : `./${item.name.replace("-", "/")}`;
+				let m = `./${item.name.replace("core", "")}`;
+				if (m.endsWith("/")) m = m.slice(0, -1);
+				const path = m;
 				pkgData.exports[path] = {};
 				pkgData.exports[path].types = `./src/${item.name}/index.ts`;
 				if (item.native) pkgData.exports[path]["react-native"] = `./src/${item.name}/index.native.ts`;
@@ -1229,7 +1254,7 @@ var AlephaPackageBuilderCli = class {
 			const external = [
 				"alepha",
 				packageName,
-				...modules.map((item) => `${packageName}/${item.name.replace("-", "/")}`)
+				...modules.map((item) => `${packageName}/${item.name.replace("-", "/").replace("/core", "")}`)
 			];
 			await run.rm(this.dist);
 			const build = async (item) => {
@@ -1261,10 +1286,9 @@ var AlephaPackageBuilderCli = class {
 					dts: false,
 					external
 				});
-				const config = join(tmpDir, `tsdown-${item.name}.config.js`);
+				const config = join(tmpDir, `tsdown-${item.name.replace("/", "-")}.config.js`);
 				await this.fs.writeFile(config, `export default ${JSON.stringify(entries, null, 2)};`);
 				await run(`npx tsdown -c=${config}`);
-				await this.fs.rm(config);
 			};
 			const concurrency = Math.ceil(os.cpus().length / 2);
 			const queue = modules.slice();
@@ -1341,32 +1365,37 @@ function detectCircularDependencies(modules) {
 }
 async function analyzeModules(srcDir, packageName) {
 	const modules = [];
-	const entries = await readdir(srcDir, { withFileTypes: true });
-	for (const entry of entries) if (entry.isDirectory()) {
-		const moduleName = entry.name;
-		const modulePath = join(srcDir, moduleName);
-		const dependencies = /* @__PURE__ */ new Set();
-		const hasBrowser = await fileExists(join(modulePath, "index.browser.ts"));
-		const hasNative = await fileExists(join(modulePath, "index.native.ts"));
-		const hasNode = await fileExists(join(modulePath, "index.node.ts"));
-		const files = await getAllFiles(modulePath);
-		for (const file of files) {
-			const deps = extractAlephaDependencies(await readFile(file, "utf-8"), packageName, moduleName);
-			for (const dep of deps) {
-				if (dep.endsWith(".ts")) throw new Error(`Invalid dependency '${dep}' in module '${moduleName}'. Do not include file extensions in Alepha module imports.`);
-				if (dep.includes("-")) throw new Error(`Invalid dependency '${dep}' in module '${moduleName}'. Use '/' instead of '-' in Alepha module imports.`);
-				dependencies.add(dep);
-			}
+	async function scanDirectory(dir, prefix) {
+		const entries = await readdir(dir, { withFileTypes: true });
+		for (const entry of entries) if (entry.isDirectory()) {
+			const moduleName = prefix ? `${prefix}/${entry.name}` : entry.name;
+			const modulePath = join(dir, entry.name);
+			if (await fileExists(join(modulePath, "index.ts"))) {
+				const dependencies = /* @__PURE__ */ new Set();
+				const hasBrowser = await fileExists(join(modulePath, "index.browser.ts"));
+				const hasNative = await fileExists(join(modulePath, "index.native.ts"));
+				const hasNode = await fileExists(join(modulePath, "index.node.ts"));
+				const files = await getAllFiles(modulePath);
+				for (const file of files) {
+					const deps = extractAlephaDependencies(await readFile(file, "utf-8"), packageName, moduleName);
+					for (const dep of deps) {
+						if (dep.endsWith(".ts")) throw new Error(`Invalid dependency '${dep}' in module '${moduleName}'. Do not include file extensions in Alepha module imports.`);
+						if (dep.includes("-")) throw new Error(`Invalid dependency '${dep}' in module '${moduleName}'. Use '/' instead of '-' in Alepha module imports.`);
+						dependencies.add(dep);
+					}
+				}
+				const module = {
+					name: moduleName,
+					dependencies: Array.from(dependencies)
+				};
+				if (hasNative) module.native = true;
+				if (hasBrowser) module.browser = true;
+				if (hasNode) module.node = true;
+				modules.push(module);
+			} else await scanDirectory(modulePath, moduleName);
 		}
-		const module = {
-			name: moduleName,
-			dependencies: Array.from(dependencies)
-		};
-		if (hasNative) module.native = true;
-		if (hasBrowser) module.browser = true;
-		if (hasNode) module.node = true;
-		modules.push(module);
 	}
+	await scanDirectory(srcDir, "");
 	detectCircularDependencies(modules);
 	return modules;
 }