@acidgreen-au/ag-cicd-cli 0.6.1 → 0.8.0

package/dist/cli.mjs

@@ -629,8 +629,9 @@ function duplicateTheme(themeId, name) {
 	const result = execSync(`shopify theme duplicate -j --theme "${themeId}" --name "${name}"`, { encoding: "utf-8" });
 	return JSON.parse(result);
 }
-function pushTheme(path, themeId, ignorePatterns = [], allowLive = false) {
-	const result = execSync(`shopify theme push --path ${path} --theme "${themeId}" ${ignorePatterns.map((p) => `--ignore "${path}/${p}"`).join(" ")}${allowLive ? " --allow-live" : ""} --json`, { encoding: "utf-8" });
+function pushTheme(themeId, options = {}) {
+	const { allowLive = false, environment } = options;
+	const result = execSync(`shopify theme push --theme "${themeId}"${environment ? ` --environment "${environment}"` : ""}${allowLive ? " --allow-live" : ""} --json`, { encoding: "utf-8" });
 	return JSON.parse(result);
 }
 function deleteTheme(themeId) {
@@ -670,6 +671,19 @@ const DEFAULT_IGNORES = [
 	"public/*",
 	"assets/.vite"
 ];
+const CONFIG_PATH = "shopify.theme.toml";
+function requireShopifyConfig(environment = "default") {
+	if (!existsSync(CONFIG_PATH)) {
+		console.error(`Error: ${CONFIG_PATH} not found.\n\nRun 'ag config:shopify --preset ci' to create the configuration.`);
+		process.exit(1);
+		return;
+	}
+	const config = parse(readFileSync(CONFIG_PATH, "utf-8"));
+	if (!config.environments?.[environment]) {
+		console.error(`Error: Environment '${environment}' not found in ${CONFIG_PATH}.\n\nAvailable environments: ${Object.keys(config.environments ?? {}).join(", ") || "(none)"}\nRun 'ag config:shopify ${environment}' to create it.`);
+		process.exit(1);
+	}
+}
 
 //#endregion
 //#region src/commands/config-shopify.ts
@@ -812,6 +826,9 @@ Details:
   Pushes theme files to a specific Shopify theme ID. Use this for deploying
   to staging or production themes where you know the target theme ID.
 
+  Requires shopify.theme.toml configuration. Run 'ag config:shopify --preset ci'
+  to create it. Path and ignore patterns are read from the config file.
+
   Writes deployment info to deploy.env:
     - PREVIEW_URL: Theme preview URL
     - EDITOR_URL: Theme editor URL
@@ -823,16 +840,20 @@ Environment:
 
 Examples:
   $ ag deploy --theme-id 123456789
-  $ ag deploy -t 123456789 --path ./theme
   $ ag deploy -t 123456789 --allow-live
+  $ ag deploy -t 123456789 --environment production
   $ ag deploy -t 123456789 --env staging --branch feature/auth`;
 function register$6(program$1) {
-	program$1.command("deploy").description("Deploy theme to an existing Shopify theme by ID").addHelpText("after", helpText$6).requiredOption("-t, --theme-id <id>", "Target Shopify theme ID").option("-p, --path <path>", "Theme directory path", "theme").option("--allow-live", "Allow pushing to a live (published) theme", false).option("-e, --env <env>", "Environment name for theme rename").option("-b, --branch <branch>", "Branch name for theme rename").action(deploy);
+	program$1.command("deploy").description("Deploy theme to an existing Shopify theme by ID").addHelpText("after", helpText$6).requiredOption("-t, --theme-id <id>", "Target Shopify theme ID").option("--environment <env>", "Shopify theme environment from shopify.theme.toml", "default").option("--allow-live", "Allow pushing to a live (published) theme", false).option("-e, --env <env>", "Environment name for theme rename").option("-b, --branch <branch>", "Branch name for theme rename").action(deploy);
 }
 function deploy(options) {
-	const { themeId, path, allowLive, env, branch } = options;
-	const themeIdNum = parseInt(themeId, 10);
-	const { preview_url, editor_url } = pushTheme(path, themeIdNum, DEFAULT_IGNORES, allowLive).theme;
+	const { themeId, allowLive, environment, env, branch } = options;
+	const themeIdNum = Number.parseInt(themeId, 10);
+	requireShopifyConfig(environment);
+	const { preview_url, editor_url } = pushTheme(themeIdNum, {
+		allowLive,
+		environment
+	}).theme;
 	console.log("Release deployed successfully!");
 	console.log(`Preview URL: ${preview_url}`);
 	console.log(`Editor URL: ${editor_url}`);
@@ -845,15 +866,18 @@ function deploy(options) {
 }
 
 //#endregion
-//#region src/commands/deploy-review.ts
+//#region src/commands/deploy-preview.ts
 const helpText$5 = `
 Details:
-  Creates or updates an unpublished theme for reviewing branch changes.
+  Creates or updates an unpublished theme for previewing branch changes.
   Theme is named "AG Preview: <branch>" for easy identification.
 
   On first deploy: Clones the live theme (or --source theme) as a starting point.
   On subsequent deploys: Updates the existing preview theme.
 
+  Requires shopify.theme.toml configuration. Run 'ag config:shopify --preset ci'
+  to create it. Path and ignore patterns are read from the config file.
+
   Use --theme to update a specific theme directly (skips theme lookup/creation).
   Use --source to specify which theme to clone from instead of the live theme.
 
@@ -869,23 +893,24 @@ Environment:
   CI_COMMIT_REF_NAME       Git branch name (GitLab CI)
 
 Examples:
-  $ ag deploy:review --branch feature/new-header
-  $ ag deploy:review -b $CI_COMMIT_REF_NAME
-  $ ag deploy:review -b my-branch --theme 123456789
-  $ ag deploy:review -b my-branch --source 987654321`;
+  $ ag deploy:preview --branch feature/new-header
+  $ ag deploy:preview -b $CI_COMMIT_REF_NAME
+  $ ag deploy:preview -b my-branch --theme 123456789
+  $ ag deploy:preview -b my-branch --environment production`;
 function register$5(program$1) {
-	program$1.command("deploy:review").description("Deploy a review app theme for the current branch").addHelpText("after", helpText$5).requiredOption("-b, --branch <branch>", "Git branch name").option("-p, --path <path>", "Theme directory path", "theme").option("-t, --theme <themeId>", "Target theme ID to update directly").option("-s, --source <themeId>", "Source theme ID to duplicate from").action(deployReview);
+	program$1.command("deploy:preview").description("Deploy a preview theme for the current branch").addHelpText("after", helpText$5).requiredOption("-b, --branch <branch>", "Git branch name").option("--environment <env>", "Shopify theme environment from shopify.theme.toml", "default").option("-t, --theme <themeId>", "Target theme ID to update directly").option("-s, --source <themeId>", "Source theme ID to duplicate from").action(deployPreview);
 }
-function deployReview(options) {
-	const { branch, path, theme, source } = options;
+function deployPreview(options) {
+	const { branch, environment, theme, source } = options;
 	const themeName = previewBranchName(branch);
-	console.log(`Setting up review app for branch: ${branch}`);
-	let reviewThemeId;
+	requireShopifyConfig(environment);
+	console.log(`Setting up preview for branch: ${branch}`);
+	let previewThemeId;
 	let existingTheme;
 	if (theme) {
-		reviewThemeId = Number.parseInt(theme, 10);
-		console.log(`Using provided theme ID: ${reviewThemeId}`);
-		existingTheme = { id: reviewThemeId };
+		previewThemeId = Number.parseInt(theme, 10);
+		console.log(`Using provided theme ID: ${previewThemeId}`);
+		existingTheme = { id: previewThemeId };
 	} else {
 		existingTheme = findThemeByName(themeName);
 		if (!existingTheme) {
@@ -900,18 +925,18 @@ function deployReview(options) {
 				sourceThemeId = liveTheme.id;
 				console.log(`Cloning from published theme ID: ${sourceThemeId}`);
 			}
-			reviewThemeId = duplicateTheme(sourceThemeId, themeName).theme.id;
+			previewThemeId = duplicateTheme(sourceThemeId, themeName).theme.id;
 		} else {
 			console.log(`Theme already exists with ID: ${existingTheme.id}`);
-			reviewThemeId = existingTheme.id;
+			previewThemeId = existingTheme.id;
 		}
 	}
-	console.log(`Deploying branch ${branch} to theme ID: ${reviewThemeId}`);
-	const { preview_url, editor_url } = pushTheme(path, reviewThemeId, DEFAULT_IGNORES).theme;
-	console.log("Review app deployed successfully!");
+	console.log(`Deploying branch ${branch} to theme ID: ${previewThemeId}`);
+	const { preview_url, editor_url } = pushTheme(previewThemeId, { environment }).theme;
+	console.log("Preview deployed successfully!");
 	console.log(`Preview URL: ${preview_url}`);
 	console.log(`Editor URL: ${editor_url}`);
-	writeDeployEnv(preview_url, editor_url, reviewThemeId, { EXISTING_THEME_ID: existingTheme?.id?.toString() ?? "" });
+	writeDeployEnv(preview_url, editor_url, previewThemeId, { EXISTING_THEME_ID: existingTheme?.id?.toString() ?? "" });
 }
 
 //#endregion
@@ -960,10 +985,16 @@ async function dev(_options, command) {
 const helpText$3 = `
 Details:
   Creates a new theme for production releases. Clones the current live theme
-  to preserve any theme editor customizations, then pushes your code changes.
+  (or --source theme) to preserve any theme editor customizations, then pushes
+  your code changes.
 
   Theme is named "AG Release: <name>" for easy identification.
 
+  Requires shopify.theme.toml configuration. Run 'ag config:shopify --preset ci'
+  to create it. Path and ignore patterns are read from the config file.
+
+  Use --source to specify which theme to clone from instead of the live theme.
+
   Writes deployment info to deploy.env:
     - PREVIEW_URL: Release theme preview URL
     - EDITOR_URL: Release theme editor URL
@@ -977,26 +1008,38 @@ Environment:
 
 Examples:
   $ ag release --name v1.2.3
-  $ ag release -n $CI_COMMIT_TAG`;
+  $ ag release -n $CI_COMMIT_TAG
+  $ ag release -n v1.2.3 --environment production`;
 function register$3(program$1) {
-	program$1.command("release").description("Create a release theme by cloning live and pushing changes").addHelpText("after", helpText$3).requiredOption("-n, --name <name>", "Release name (usually git tag)").option("-p, --path <path>", "Theme directory path", "theme").action(release);
+	program$1.command("release").description("Create a release theme by cloning live and pushing changes").addHelpText("after", helpText$3).requiredOption("-n, --name <name>", "Release name (usually git tag)").option("--environment <env>", "Shopify theme environment from shopify.theme.toml", "default").option("-s, --source <themeId>", "Source theme ID to clone from").action(release);
 }
 function release(options) {
-	const { name, path } = options;
+	const { name, environment, source } = options;
 	const themeName = `AG Release: ${name}`;
-	const liveTheme = findLiveTheme();
-	if (!liveTheme) throw new Error("No live theme found to clone from");
-	console.log(`Cloning from published theme ID: ${liveTheme.id}`);
-	const releaseThemeId = duplicateTheme(liveTheme.id, themeName).theme.id;
-	const { preview_url, editor_url } = pushTheme(path, releaseThemeId, DEFAULT_IGNORES).theme;
+	requireShopifyConfig(environment);
+	let sourceThemeId;
+	let liveThemeId;
+	if (source) {
+		sourceThemeId = Number.parseInt(source, 10);
+		console.log(`Using provided source theme ID: ${sourceThemeId}`);
+		liveThemeId = findLiveTheme()?.id;
+	} else {
+		const liveTheme = findLiveTheme();
+		if (!liveTheme) throw new Error("No live theme found to clone from");
+		sourceThemeId = liveTheme.id;
+		liveThemeId = liveTheme.id;
+		console.log(`Cloning from published theme ID: ${sourceThemeId}`);
+	}
+	const releaseThemeId = duplicateTheme(sourceThemeId, themeName).theme.id;
+	const { preview_url, editor_url } = pushTheme(releaseThemeId, { environment }).theme;
 	console.log("Release deployed successfully!");
 	console.log(`Preview URL: ${preview_url}`);
 	console.log(`Editor URL: ${editor_url}`);
-	writeDeployEnv(preview_url, editor_url, releaseThemeId, { PUBLISHED_THEME_ID: liveTheme.id.toString() });
+	writeDeployEnv(preview_url, editor_url, releaseThemeId, { PUBLISHED_THEME_ID: liveThemeId?.toString() ?? "" });
 }
 
 //#endregion
-//#region src/commands/stop-review.ts
+//#region src/commands/stop-preview.ts
 const helpText$2 = `
 Details:
   Finds and deletes the unpublished theme named "AG Preview: <branch>".
@@ -1010,20 +1053,20 @@ Environment:
   CI_COMMIT_REF_NAME       Git branch name (GitLab CI)
 
 Examples:
-  $ ag stop:review --branch feature/new-header
-  $ ag stop:review -b $CI_COMMIT_REF_NAME`;
+  $ ag stop:preview --branch feature/new-header
+  $ ag stop:preview -b $CI_COMMIT_REF_NAME`;
 function register$2(program$1) {
-	program$1.command("stop:review").description("Delete the review app theme for a branch").addHelpText("after", helpText$2).requiredOption("-b, --branch <branch>", "Git branch name").action(stopReview);
+	program$1.command("stop:preview").description("Delete the preview theme for a branch").addHelpText("after", helpText$2).requiredOption("-b, --branch <branch>", "Git branch name").action(stopPreview);
 }
-function stopReview(options) {
+function stopPreview(options) {
 	const { branch } = options;
 	const themeName = previewBranchName(branch);
-	console.log(`Cleaning up review app for branch: ${branch}`);
+	console.log(`Cleaning up preview for branch: ${branch}`);
 	const theme = findThemeByName(themeName);
 	if (theme) {
 		console.log(`Deleting theme: ${themeName} (ID: ${theme.id})`);
 		deleteTheme(theme.id);
-		console.log("Review app cleaned up successfully!");
+		console.log("Preview cleaned up successfully!");
 	} else console.log(`No theme found with name: ${themeName}`);
 }
 
@@ -1033,7 +1076,7 @@ const helpText$1 = `
 Contexts:
   all          Check all variables for all contexts (default)
   deploy       Check variables for theme deployment
-  review       Check variables for review app deployment
+  preview      Check variables for preview deployment
   release      Check variables for release deployment
   codequality  Check variables for code quality checks
 
@@ -1048,7 +1091,7 @@ Examples:
   $ ag validate-env --context deploy
   $ ag validate-env --vars SHOPIFY_FLAG_STORE CUSTOM_VAR`;
 function register$1(program$1) {
-	program$1.command("validate-env").description("Validate required environment variables are set").addHelpText("after", helpText$1).option("-c, --context <context>", "Validation context (deploy, review, release, codequality, all)").option("-v, --vars <vars...>", "Specific variables to check").action(validateEnv);
+	program$1.command("validate-env").description("Validate required environment variables are set").addHelpText("after", helpText$1).option("-c, --context <context>", "Validation context (deploy, preview, release, codequality, all)").option("-v, --vars <vars...>", "Specific variables to check").action(validateEnv);
 }
 const commonVars = [{
 	name: "SHOPIFY_CLI_THEME_TOKEN",
@@ -1065,10 +1108,10 @@ const contextVars = {
 		required: true,
 		description: "Target theme ID for deployment"
 	}],
-	review: [{
+	preview: [{
 		name: "CI_COMMIT_REF_NAME",
 		required: true,
-		description: "Git branch name for review app"
+		description: "Git branch name for preview"
 	}],
 	release: [{
 		name: "CI_COMMIT_TAG",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acidgreen-au/ag-cicd-cli",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "Acidgreen CI/CD CLI tools",
   "type": "module",
   "bin": {