fix(cli): emit validatesPresenceOf and type validations from model attrs (#2219) (#2224)

Typed attrs passed to `wheels generate model` (e.g. `name:string email:email`)
were parsed into the migration but dropped from the generated model's config(),
producing an empty scaffold. Populate context.validations in CodeGen.generateModel
from the properties array, add a {{validations}} placeholder to ModelContent.txt,
and update the Templates.cfc substitution block to consume the pre-built string
(previously it unconditionally overwrote the generic-loop output with "" because
its only input was a never-set context.attributes).

Emits combined validatesPresenceOf("a,b,c") for all attrs plus per-property
validatesFormatOf for email and url types. Scaffold and api-resource inherit
the fix since both route through CodeGen.generateModel.

Strengthens tools/ci/smoke-test-module.sh to assert the new behavior and adds
CodeGenSpec coverage for combined presence, email format, URL format, and the
empty-properties case.

Author: bpamiri

app/snippets/ModelContent.txt

@@ -5,6 +5,7 @@
 		{{belongsToRelationships}}
 		{{hasManyRelationships}}
 		{{hasOneRelationships}}
+		{{validations}}
 	}
 
 }

cli/lucli/services/CodeGen.cfc

@@ -49,6 +49,7 @@ component {
 			belongsTo: arguments.belongsTo,
 			hasMany: arguments.hasMany,
 			hasOne: arguments.hasOne,
+			validations: buildModelValidations(arguments.properties),
 			timestamp: dateTimeFormat(now(), "yyyy-mm-dd HH:nn:ss")
 		};
 
@@ -61,6 +62,32 @@ component {
 		return result;
 	}
 
+	/**
+	 * Build validation code lines for a model's config() from typed properties.
+	 * Emits a single combined validatesPresenceOf("a,b,c") for all properties,
+	 * plus per-property validatesFormatOf for email and URL types.
+	 */
+	private string function buildModelValidations(required array properties) {
+		if (!arrayLen(arguments.properties)) return "";
+
+		var presenceProps = [];
+		var formatLines = [];
+
+		for (var prop in arguments.properties) {
+			arrayAppend(presenceProps, prop.name);
+			var propType = structKeyExists(prop, "type") ? lCase(prop.type) : "string";
+			if (propType == "email") {
+				arrayAppend(formatLines, "		validatesFormatOf(property=""#prop.name#"", type=""email"");");
+			} else if (propType == "url") {
+				arrayAppend(formatLines, "		validatesFormatOf(property=""#prop.name#"", type=""URL"");");
+			}
+		}
+
+		var lines = ["		validatesPresenceOf(""#arrayToList(presenceProps)#"");"];
+		lines.append(formatLines, true);
+		return arrayToList(lines, chr(10));
+	}
+
 	/**
 	 * Generate a controller file
 	 */

cli/lucli/services/Templates.cfc

@@ -90,14 +90,18 @@ component {
 		// Process relationship placeholders
 		processed = processRelationships(processed, arguments.context);
 
-		// Process attributes/validations
-		if (structKeyExists(arguments.context, "attributes") && len(arguments.context.attributes)) {
+		// Process {{validations}} placeholder. Prefer the pre-built `validations`
+		// code string from context (populated by CodeGen.generateModel); fall back
+		// to deriving from the legacy `attributes` string shape for callers that
+		// still use it.
+		var validationCode = "";
+		if (structKeyExists(arguments.context, "validations") && isSimpleValue(arguments.context.validations)) {
+			validationCode = arguments.context.validations;
+		} else if (structKeyExists(arguments.context, "attributes") && len(arguments.context.attributes)) {
 			var attributesStruct = parseAttributes(arguments.context.attributes);
-			var validationCode = generateValidationCode(attributesStruct);
-			processed = reReplace(processed, "\{\{validations\}\}", validationCode, "all");
-		} else {
-			processed = reReplace(processed, "\{\{validations\}\}", "", "all");
+			validationCode = generateValidationCode(attributesStruct);
 		}
+		processed = reReplace(processed, "\{\{validations\}\}", validationCode, "all");
 
 		// Process actions for controllers
 		if (structKeyExists(arguments.context, "actions") && isArray(arguments.context.actions)) {

cli/lucli/templates/app/app/snippets/ModelContent.txt

@@ -5,6 +5,7 @@
 		{{belongsToRelationships}}
 		{{hasManyRelationships}}
 		{{hasOneRelationships}}
+		{{validations}}
 	}
 
 }

cli/lucli/tests/specs/services/CodeGenSpec.cfc

@@ -53,6 +53,50 @@ component extends="wheels.wheelstest.system.BaseSpec" {
 					expect(content).toInclude("config()");
 				});
 
+				it("emits validatesPresenceOf combining all properties (##2219)", () => {
+					codegen.generateModel(
+						name = "Foo",
+						properties = [
+							{name: "bar", type: "string"},
+							{name: "baz", type: "integer"}
+						],
+						force = true
+					);
+					var content = fileRead(tempRoot & "/app/models/Foo.cfc");
+					expect(content).toInclude('validatesPresenceOf("bar,baz")');
+				});
+
+				it("emits validatesFormatOf for email-typed properties (##2219)", () => {
+					codegen.generateModel(
+						name = "Subscriber",
+						properties = [
+							{name: "name", type: "string"},
+							{name: "email", type: "email"}
+						],
+						force = true
+					);
+					var content = fileRead(tempRoot & "/app/models/Subscriber.cfc");
+					expect(content).toInclude('validatesPresenceOf("name,email")');
+					expect(content).toInclude('validatesFormatOf(property="email", type="email")');
+				});
+
+				it("emits validatesFormatOf for url-typed properties (##2219)", () => {
+					codegen.generateModel(
+						name = "Link",
+						properties = [{name: "website", type: "url"}],
+						force = true
+					);
+					var content = fileRead(tempRoot & "/app/models/Link.cfc");
+					expect(content).toInclude('validatesFormatOf(property="website", type="URL")');
+				});
+
+				it("skips validations when no properties given (##2219)", () => {
+					codegen.generateModel(name = "Empty", properties = [], force = true);
+					var content = fileRead(tempRoot & "/app/models/Empty.cfc");
+					expect(content).notToInclude("validatesPresenceOf");
+					expect(content).notToInclude("validatesFormatOf");
+				});
+
 			});
 
 			describe("generateController()", () => {

cli/src/templates/ModelContent.txt

@@ -5,6 +5,7 @@
 		{{belongsToRelationships}}
 		{{hasManyRelationships}}
 		{{hasOneRelationships}}
+		{{validations}}
 	}
 
 }

tools/ci/smoke-test-module.sh

@@ -145,13 +145,14 @@ echo ""
 echo "=== Phase 4: Exercise every template-driven generator ==="
 
 echo ""
-echo "--- generate model User name:string email:string ---"
-lucli wheels generate model User name:string email:string 2>&1 | sed 's/^/    /' || true
+echo "--- generate model User name:string email:email ---"
+lucli wheels generate model User name:string email:email 2>&1 | sed 's/^/    /' || true
 assert_file_nonempty "app/models/User.cfc" "model User.cfc generated"
-# Current ModelContent template renders component shell + config() scaffold but
-# does not emit validations from attrs. Assert structure, not content we don't emit.
 assert_grep 'extends="Model"' "app/models/User.cfc" "model extends Model"
 assert_grep "function config" "app/models/User.cfc" "model has config()"
+# Typed attrs must round-trip into validations in config(). See #2219.
+assert_grep 'validatesPresenceOf\("name,email"\)' "app/models/User.cfc" "model emits validatesPresenceOf for attrs"
+assert_grep 'validatesFormatOf\(property="email", type="email"\)' "app/models/User.cfc" "model emits validatesFormatOf for email-typed attr"
 
 echo ""
 echo "--- generate controller Users index show ---"