fix: Fix codegen/template destination.

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+#### 🚀 Updates
+
+- Updated codegen/template `destination` to be relative from the workspace root if prefixed with
+  `/`, otherwise the current working directory.
+
+#### 🐞 Fixes
+
+- Fixed an issue where `[working_dir]` and `[workspace_root]` variables were not working in the
+  `template.yml` `destination` setting.
+
 ## 1.29.3
 
 #### 🐞 Fixes

crates/app/src/commands/generate.rs

@@ -59,9 +59,11 @@ pub async fn generate(session: CliSession, args: GenerateArgs) -> AppResult {
 
     // Gather variables
     let mut context = gather_variables(&args, &template, &session.console)?;
+    context.insert("working_dir", &session.working_dir);
+    context.insert("workspace_root", &session.workspace_root);
 
     // Determine the destination path
-    let relative_dest = PathBuf::from(match &args.dest {
+    let relative_dest = match &args.dest {
         Some(dest) => dest.to_owned(),
         None => {
             if let Some(dest) = &template.config.destination {
@@ -78,17 +80,20 @@ pub async fn generate(session: CliSession, args: GenerateArgs) -> AppResult {
                     .into_diagnostic()?
             }
         }
+    };
+    let relative_from_root = relative_dest.starts_with('/');
+    let relative_dest = template.interpolate_path(&PathBuf::from(relative_dest), &context)?;
+    let dest = relative_dest.to_logical_path(if relative_from_root {
+        &session.workspace_root
+    } else {
+        &session.working_dir
     });
-    let relative_dest = template.interpolate_path(&relative_dest, &context)?;
-    let dest = relative_dest.to_logical_path(&session.working_dir);
 
     debug!(dest = ?dest, "Destination path set");
 
     // Inject built-in context variables
     context.insert("dest_dir", &dest);
     context.insert("dest_rel_dir", &relative_dest);
-    context.insert("working_dir", &session.working_dir);
-    context.insert("workspace_root", &session.workspace_root);
 
     // Load template files and determine when to overwrite
     template.load_files(&dest, &context)?;

crates/cli/tests/generate_test.rs

@@ -54,6 +54,40 @@ fn generates_files_into_default_dest() {
     assert!(sandbox.path().join("apps/foo-bar/file.txt").exists());
 }
 
+#[test]
+fn generates_files_into_workspace_relative_dest() {
+    let sandbox = generate_sandbox();
+    sandbox.create_file("sub/dir/file.txt", "");
+
+    sandbox
+        .run_moon(|cmd| {
+            cmd.arg("generate")
+                .arg("dest")
+                .arg("/custom/dest")
+                .current_dir(sandbox.path().join("sub/dir"));
+        })
+        .success();
+
+    assert!(sandbox.path().join("custom/dest/file.txt").exists());
+}
+
+#[test]
+fn generates_files_into_cwd_relative_dest() {
+    let sandbox = generate_sandbox();
+    sandbox.create_file("sub/dir/file.txt", "");
+
+    sandbox
+        .run_moon(|cmd| {
+            cmd.arg("generate")
+                .arg("dest")
+                .arg("custom/dest")
+                .current_dir(sandbox.path().join("sub/dir"));
+        })
+        .success();
+
+    assert!(sandbox.path().join("sub/dir/custom/dest/file.txt").exists());
+}
+
 #[test]
 fn doesnt_generate_files_when_dryrun() {
     let sandbox = generate_sandbox();

crates/codegen/src/generate_command.rs

@@ -20,7 +20,7 @@ pub struct GenerateArgs {
     #[arg(help = "Name of template to generate")]
     pub name: String,
 
-    #[arg(help = "Destination path, relative from the current working directory")]
+    #[arg(help = "Destination path, relative from workspace root or working directory")]
     pub dest: Option<String>,
 
     #[arg(

crates/config/src/template_config.rs

@@ -231,7 +231,7 @@ pub struct TemplateConfig {
     pub description: String,
 
     /// A pre-populated destination to scaffold to, relative from the
-    /// workspace root.
+    /// workspace root when leading with `/`, otherwise the working directory.
     pub destination: Option<String>,
 
     /// Extends one or many other templates.

packages/types/src/project-config.ts

@@ -2,8 +2,8 @@
 
 /* eslint-disable */
 
-import type { PartialTaskConfig, PlatformType, TaskConfig } from './tasks-config';
 import type { UnresolvedVersionSpec } from './toolchain-config';
+import type { PartialTaskConfig, PlatformType, TaskConfig } from './tasks-config';
 
 /** The scope and or relationship of the dependency. */
 export type DependencyScope = 'build' | 'development' | 'peer' | 'production' | 'root';

packages/types/src/template-config.ts

@@ -109,7 +109,7 @@ export interface TemplateConfig {
 	description: string;
 	/**
 	 * A pre-populated destination to scaffold to, relative from the
-	 * workspace root.
+	 * workspace root when leading with `/`, otherwise the working directory.
 	 */
 	destination: string | null;
 	/** Extends one or many other templates. */
@@ -214,7 +214,7 @@ export interface PartialTemplateConfig {
 	description?: string | null;
 	/**
 	 * A pre-populated destination to scaffold to, relative from the
-	 * workspace root.
+	 * workspace root when leading with `/`, otherwise the working directory.
 	 */
 	destination?: string | null;
 	/** Extends one or many other templates. */

website/docs/config/template.mdx

@@ -53,9 +53,12 @@ description: |
 
 <HeadingApiLink to="/api/types/interface/TemplateConfig#destination" />
 
-An optional file path, relative from the workspace root, in which this template should be generated
-into. This provides a mechanism for standardizing a destination location, and avoids having to
-manually pass a destination to [`moon generate`](../commands/generate).
+An optional file path in which this template should be generated into. This provides a mechanism for
+standardizing a destination location, and avoids having to manually pass a destination to
+[`moon generate`](../commands/generate).
+
+If the destination is prefixed with `/`, it will be relative from the workspace root, otherwise it
+is relative from the current working directory.
 
 ```yaml title="template.yml"
 destination: 'packages/[name]'

website/static/schemas/template.json

@@ -15,7 +15,7 @@
     },
     "destination": {
       "title": "destination",
-      "description": "A pre-populated destination to scaffold to, relative from the workspace root.",
+      "description": "A pre-populated destination to scaffold to, relative from the workspace root when leading with /, otherwise the working directory.",
       "anyOf": [
         {
           "type": "string"
@@ -24,7 +24,7 @@
           "type": "null"
         }
       ],
-      "markdownDescription": "A pre-populated destination to scaffold to, relative from the workspace root."
+      "markdownDescription": "A pre-populated destination to scaffold to, relative from the workspace root when leading with `/`, otherwise the working directory."
     },
     "extends": {
       "title": "extends",