ecopages 0.2.0-rc.7 → 0.2.0-rc.8

package/bin/git-template-source-providers.js

@@ -0,0 +1,56 @@
+import { repositoryName, withSubpath } from './git-template-source-shared.js';
+
+export function normalizeGithubParts(parts, source) {
+	if (parts.length < 2) {
+		return null;
+	}
+
+	const [owner, repositoryPart, marker, ref, ...subpath] = parts;
+	const repository = `${owner}/${repositoryName(repositoryPart)}`;
+	if (marker === 'tree' || marker === 'blob') {
+		if (!ref) throw new Error(`Template URL '${source}' is missing a Git ref.`);
+		return `github:${withSubpath(repository, subpath)}#${ref}`;
+	}
+	return `github:${repository}`;
+}
+
+export function normalizeGitlabParts(parts) {
+	const markerIndex = parts.indexOf('-');
+	const treeIndex = parts.findIndex((part) => part === 'tree' || part === 'blob');
+	if (markerIndex > 0 && treeIndex > markerIndex && parts[treeIndex + 1]) {
+		const repository = parts.slice(0, markerIndex).map(repositoryName).join('/');
+		const ref = parts[treeIndex + 1];
+		const subpath = parts.slice(treeIndex + 2);
+		return `gitlab:${withSubpath(repository, subpath)}#${ref}`;
+	}
+	if (parts.length >= 2) return `gitlab:${parts.join('/')}`;
+	return null;
+}
+
+export function normalizeBitbucketParts(parts) {
+	if (parts.length < 2) {
+		return null;
+	}
+
+	const [workspace, repositoryPart, marker, ref, ...subpath] = parts;
+	const repository = `${workspace}/${repositoryName(repositoryPart)}`;
+	if (marker === 'src' && ref) {
+		return `bitbucket:${withSubpath(repository, subpath)}#${ref}`;
+	}
+	return `bitbucket:${repository}`;
+}
+
+export function normalizeSourcehutParts(parts) {
+	if (parts.length < 2) {
+		return null;
+	}
+
+	const treeIndex = parts.findIndex((part) => part === 'tree' || part === 'blob');
+	if (treeIndex > 1 && parts[treeIndex + 1]) {
+		const repository = parts.slice(0, treeIndex).map(repositoryName).join('/');
+		const ref = parts[treeIndex + 1];
+		const subpath = parts.slice(treeIndex + 2);
+		return `sourcehut:${withSubpath(repository, subpath)}#${ref}`;
+	}
+	return `sourcehut:${parts.join('/')}`;
+}

package/bin/git-template-source-shared.js

@@ -0,0 +1,7 @@
+export function repositoryName(value) {
+	return value.replace(/\.git$/u, '');
+}
+
+export function withSubpath(repository, subpath) {
+	return subpath.length > 0 ? `${repository}/${subpath.join('/')}` : repository;
+}

package/bin/git-template-source.js

@@ -1,3 +1,10 @@
+import {
+	normalizeBitbucketParts,
+	normalizeGithubParts,
+	normalizeGitlabParts,
+	normalizeSourcehutParts,
+} from './git-template-source-providers.js';
+
 const GIT_PROVIDER_PREFIX = /^(github|gitlab|bitbucket|sourcehut):/u;
 
 const HOST_PROVIDER = {
@@ -7,12 +14,21 @@ const HOST_PROVIDER = {
 	'git.sr.ht': 'sourcehut',
 };
 
-function repositoryName(value) {
-	return value.replace(/\.git$/u, '');
-}
+const PROVIDER_NORMALIZERS = {
+	github: normalizeGithubParts,
+	gitlab: normalizeGitlabParts,
+	bitbucket: normalizeBitbucketParts,
+	sourcehut: normalizeSourcehutParts,
+};
+
+function normalizeProviderUrl(hostProvider, parts, source) {
+	const normalize = PROVIDER_NORMALIZERS[hostProvider];
+	const normalized = normalize?.(parts, source);
+	if (normalized) {
+		return normalized;
+	}
 
-function withSubpath(repository, subpath) {
-	return subpath.length > 0 ? `${repository}/${subpath.join('/')}` : repository;
+	throw new Error(`Unsupported template URL '${source}'. Include a repository and optional Git ref.`);
 }
 
 /**
@@ -42,47 +58,5 @@ export function normalizeGitSource(source) {
 		.split('/')
 		.filter(Boolean);
 
-	if (hostProvider === 'github' && parts.length >= 2) {
-		const [owner, repositoryPart, marker, ref, ...subpath] = parts;
-		const repository = `${owner}/${repositoryName(repositoryPart)}`;
-		if (marker === 'tree' || marker === 'blob') {
-			if (!ref) throw new Error(`Template URL '${source}' is missing a Git ref.`);
-			return `github:${withSubpath(repository, subpath)}#${ref}`;
-		}
-		return `github:${repository}`;
-	}
-
-	if (hostProvider === 'gitlab') {
-		const markerIndex = parts.indexOf('-');
-		const treeIndex = parts.findIndex((part) => part === 'tree' || part === 'blob');
-		if (markerIndex > 0 && treeIndex > markerIndex && parts[treeIndex + 1]) {
-			const repository = parts.slice(0, markerIndex).map(repositoryName).join('/');
-			const ref = parts[treeIndex + 1];
-			const subpath = parts.slice(treeIndex + 2);
-			return `gitlab:${withSubpath(repository, subpath)}#${ref}`;
-		}
-		if (parts.length >= 2) return `gitlab:${parts.join('/')}`;
-	}
-
-	if (hostProvider === 'bitbucket' && parts.length >= 2) {
-		const [workspace, repositoryPart, marker, ref, ...subpath] = parts;
-		const repository = `${workspace}/${repositoryName(repositoryPart)}`;
-		if (marker === 'src' && ref) {
-			return `bitbucket:${withSubpath(repository, subpath)}#${ref}`;
-		}
-		return `bitbucket:${repository}`;
-	}
-
-	if (hostProvider === 'sourcehut' && parts.length >= 2) {
-		const treeIndex = parts.findIndex((part) => part === 'tree' || part === 'blob');
-		if (treeIndex > 1 && parts[treeIndex + 1]) {
-			const repository = parts.slice(0, treeIndex).map(repositoryName).join('/');
-			const ref = parts[treeIndex + 1];
-			const subpath = parts.slice(treeIndex + 2);
-			return `sourcehut:${withSubpath(repository, subpath)}#${ref}`;
-		}
-		return `sourcehut:${parts.join('/')}`;
-	}
-
-	throw new Error(`Unsupported template URL '${source}'. Include a repository and optional Git ref.`);
+	return normalizeProviderUrl(hostProvider, parts, source);
 }

package/bin/init.js

@@ -220,52 +220,114 @@ function isCancelled(value) {
 	return false;
 }
 
+async function promptProjectDirectory() {
+	const answer = await prompts.text({
+		message: 'Project directory:',
+		placeholder: 'my-app',
+		validate: (value) => (value.trim().length === 0 ? 'Enter a project directory.' : undefined),
+	});
+	if (isCancelled(answer)) return null;
+	return answer.trim();
+}
+
+async function promptTemplateSelection() {
+	const answer = await prompts.select({
+		message: 'Select a template:',
+		options: [
+			...officialTemplates.map((template) => ({
+				label: template.displayName,
+				value: template.id,
+				hint: template.description,
+			})),
+			{
+				label: 'Community template',
+				value: '__community__',
+				hint: 'Use a Git repository or provider source.',
+			},
+		],
+	});
+	if (isCancelled(answer)) return null;
+	return answer;
+}
+
+async function promptCommunityTemplateSource() {
+	const sourceAnswer = await prompts.text({
+		message: 'Template source:',
+		placeholder: 'github:owner/repository#v1.0.0',
+		validate: (value) => (value.trim().length === 0 ? 'Enter a Git template source.' : undefined),
+	});
+	if (isCancelled(sourceAnswer)) return null;
+	return sourceAnswer.trim();
+}
+
+async function resolveInteractiveTemplateChoice(templateId, source) {
+	if (templateId || source) {
+		return { templateId, source };
+	}
+
+	const answer = await promptTemplateSelection();
+	if (answer === null) {
+		return null;
+	}
+	if (answer === '__community__') {
+		const communitySource = await promptCommunityTemplateSource();
+		if (communitySource === null) {
+			return null;
+		}
+		return { templateId, source: communitySource };
+	}
+	return { templateId: answer, source };
+}
+
+async function promptInstallChoice(packageManager, parsed) {
+	if (parsed.start) {
+		return true;
+	}
+	if (parsed.install !== undefined) {
+		return parsed.install;
+	}
+	if (!parsed.interactive) {
+		return undefined;
+	}
+
+	const answer = await prompts.confirm({
+		message: `Install dependencies with ${packageManager}?`,
+		initialValue: true,
+	});
+	if (isCancelled(answer)) return null;
+	return answer;
+}
+
+async function promptStartChoice(parsed, install) {
+	if (parsed.start !== undefined) {
+		return parsed.start;
+	}
+	if (!parsed.interactive || !install) {
+		return undefined;
+	}
+
+	const answer = await prompts.confirm({ message: 'Start the development server now?', initialValue: false });
+	if (isCancelled(answer)) return null;
+	return answer;
+}
+
 async function collectInitAnswers(parsed) {
 	const packageManager = detectPackageManager();
 	let dir = parsed.dir;
 	let templateId = parsed.template;
 	let source = parsed.from;
 
-	if (parsed.interactive) {
-		if (!dir) {
-			const answer = await prompts.text({
-				message: 'Project directory:',
-				placeholder: 'my-app',
-				validate: (value) => (value.trim().length === 0 ? 'Enter a project directory.' : undefined),
-			});
-			if (isCancelled(answer)) return null;
-			dir = answer.trim();
-		}
+	if (parsed.interactive && !dir) {
+		const promptedDir = await promptProjectDirectory();
+		if (promptedDir === null) return null;
+		dir = promptedDir;
+	}
 
-		if (!templateId && !source) {
-			const answer = await prompts.select({
-				message: 'Select a template:',
-				options: [
-					...officialTemplates.map((template) => ({
-						label: template.displayName,
-						value: template.id,
-						hint: template.description,
-					})),
-					{
-						label: 'Community template',
-						value: '__community__',
-						hint: 'Use a Git repository or provider source.',
-					},
-				],
-			});
-			if (isCancelled(answer)) return null;
-			if (answer === '__community__') {
-				const sourceAnswer = await prompts.text({
-					message: 'Template source:',
-					placeholder: 'github:owner/repository#v1.0.0',
-					validate: (value) => (value.trim().length === 0 ? 'Enter a Git template source.' : undefined),
-				});
-				if (isCancelled(sourceAnswer)) return null;
-				source = sourceAnswer.trim();
-			} else {
-				templateId = answer;
-			}
-		}
+	if (parsed.interactive) {
+		const templateChoice = await resolveInteractiveTemplateChoice(templateId, source);
+		if (templateChoice === null) return null;
+		templateId = templateChoice.templateId;
+		source = templateChoice.source;
 	}
 
 	if (!templateId && !source) templateId = defaultOfficialTemplate.id;
@@ -273,24 +335,13 @@ async function collectInitAnswers(parsed) {
 		prompts.log.step(`Resolved template source: ${getTemplateSource(templateId, source)}`);
 	}
 
-	let install = parsed.start ? true : parsed.install;
-	if (install === undefined && parsed.interactive) {
-		const answer = await prompts.confirm({
-			message: `Install dependencies with ${packageManager}?`,
-			initialValue: true,
-		});
-		if (isCancelled(answer)) return null;
-		install = answer;
-	}
-	install ??= false;
+	const installAnswer = await promptInstallChoice(packageManager, parsed);
+	if (installAnswer === null) return null;
+	const install = installAnswer ?? false;
 
-	let start = parsed.start;
-	if (start === undefined && parsed.interactive && install) {
-		const answer = await prompts.confirm({ message: 'Start the development server now?', initialValue: false });
-		if (isCancelled(answer)) return null;
-		start = answer;
-	}
-	start ??= false;
+	const startAnswer = await promptStartChoice(parsed, install);
+	if (startAnswer === null) return null;
+	const start = startAnswer ?? false;
 
 	return { dir, templateId, source, packageManager, install, start };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecopages",
-  "version": "0.2.0-rc.7",
+  "version": "0.2.0-rc.8",
   "description": "CLI utilities for Ecopages",
   "type": "module",
   "engines": {
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@ecopages/core": "0.2.0-rc.7",
+    "@ecopages/core": "0.2.0-rc.8",
     "@ecopages/logger": "^0.2.3",
     "giget": "^2.0.0",
     "tsx": "^4.22.3"