Ast fixes

.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(mkdir:*)",
+      "Bash(curl:*)"
+    ]
+  }
+}

core/src/main/java/lucee/runtime/compiler/CFMLCompilerImpl.java

@@ -41,6 +41,7 @@
 import lucee.runtime.exp.TemplateException;
 import lucee.runtime.op.Caster;
 import lucee.runtime.type.Array;
+import lucee.runtime.type.ArrayImpl;
 import lucee.runtime.type.Struct;
 import lucee.runtime.type.StructImpl;
 import lucee.runtime.type.util.KeyConstants;
@@ -84,32 +85,40 @@ public Struct ast(ConfigPro config, PageSource ps, boolean ignoreScopes) throws
 
 		BytecodeFactory factory = BytecodeFactory.getInstance(config);
 		// , cwi.getFLDs()
-		PageImpl page = ((PageImpl) cfmlTagTransformer.transform(factory, config, ps, config.getTLDs(), config.getFLDs(), false, ignoreScopes));
+		PageImpl page = ((PageImpl) cfmlTagTransformer.transform(factory, config, ps, config.getTLDs(), config.getFLDs(), false, ignoreScopes, true));
 		Struct root = new StructImpl(Struct.TYPE_LINKED);
 		page.dump(root);
 
-		// TODO better solution than simply look at the offset from script
-		if (page.getSourceCode().getSourceOffset() == 10) {
+		boolean isScript = page.getSourceCode().isWrappedInScript();
+		boolean isCFMLCompExt = Constants.isCFMLComponentExtension(ResourceUtil.getExtension(ps.getResource(), ""));
 
-			boolean isCFMLCompExt = Constants.isCFMLComponentExtension(ResourceUtil.getExtension(ps.getResource(), ""));
+		// If parser wrapped script content in cfscript tags, unwrap it in the AST output
+		if (isScript) {
 			// in case of a component Lucee moves the component to the root, so at the first position is just an
-			// empty script, we simply have to emove this
-			// TODO remove the script after moving in the parser
+			// empty script, we simply have to remove this
 			if (isCFMLCompExt) {
 				removeEmptyScriptTag(root);
 			}
 			else {
 				extractScriptTagInRoot(root);
 			}
 		}
+		// Handle <cfscript>component { }</cfscript> pattern - file wasn't wrapped by parser
+		// but component is inside an explicit cfscript tag that needs unwrapping
+		else if (isCFMLCompExt) {
+			extractComponentFromCfscript(root);
+		}
+
+		// Add compiler metadata to AST root
+		addASTMetadata(root, config, isScript);
+
 		return root;
 	}
 
 	public Struct ast(ConfigPro config, SourceCode sc, boolean ignoreScopes, Boolean script) throws PageException {
 		BytecodeFactory factory = BytecodeFactory.getInstance(config);
-		// TODO auto when script is null
 
-		if (script != null && script) {
+		if (script) {
 			TagLibTag scriptTag = CFMLTransformer.getTLT(sc, Constants.CFML_SCRIPT_TAG_NAME, config.getIdentification());
 
 			sc.setPos(0);
@@ -124,13 +133,23 @@ public Struct ast(ConfigPro config, SourceCode sc, boolean ignoreScopes, Boolean
 		Struct root = new StructImpl(Struct.TYPE_LINKED);
 		page.dump(root);
 
-		if (script != null && script) {
+		if (script) {
 			extractScriptTagInRoot(root);
 		}
 
+		// Add compiler metadata to AST root
+		addASTMetadata(root, config, script);
+
 		return root;
 	}
 
+	// Add compiler settings metadata to the AST Program node
+	private void addASTMetadata(Struct root, ConfigPro config, boolean isScript) {
+		root.setEL("sourceType", isScript ? "script" : "tag");
+		root.setEL("dotNotationUpperCase", config.getDotNotationUpperCase());
+		root.setEL("handleUnquotedAttrValueAsString", config.getHandleUnQuotedAttrValueAsString());
+	}
+
 	// remove script again (a bit complicated, but atm the only way to do it)
 	private void extractScriptTagInRoot(Struct root) {
 		Array body = Caster.toArray(root.get(KeyConstants._body, null), null);
@@ -150,14 +169,58 @@ private void extractScriptTagInRoot(Struct root) {
 
 	private void removeEmptyScriptTag(Struct root) {
 		Array body = Caster.toArray(root.get(KeyConstants._body, null), null);
-		if (body != null && body.size() > 1) {
+		if (body != null && body.size() >= 1) {
 			Struct first = Caster.toStruct(body.get(1, null), null);
 			if (first != null) {
 				if ("cfscript".equalsIgnoreCase(Caster.toString(first.get("fullname", null), null))) {
 					Struct body2 = Caster.toStruct(first.get(KeyConstants._body, null), null);
 					Array body3 = Caster.toArray(body2.get(KeyConstants._body, null), null);
-					if (body3 != null && body3.size() == 0) {
-						body.removeEL(1);
+					if (body3 != null) {
+						if (body3.size() == 0) {
+							// Empty cfscript - just remove it
+							body.removeEL(1);
+						}
+						else {
+							// cfscript has content (component) - extract it
+							// Replace root body with cfscript contents
+							root.setEL(KeyConstants._body, body3);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Extract component from explicit <cfscript>component { }</cfscript> wrapper
+	// This handles CFC files where the component is wrapped in cfscript tags by the author
+	private void extractComponentFromCfscript(Struct root) {
+		Array body = Caster.toArray(root.get(KeyConstants._body, null), null);
+		if (body == null || body.size() < 1) return;
+
+		// Look for cfscript tag containing a component
+		for (int i = 1; i <= body.size(); i++) {
+			Struct item = Caster.toStruct(body.get(i, null), null);
+			if (item == null) continue;
+
+			if ("cfscript".equalsIgnoreCase(Caster.toString(item.get("fullname", null), null))) {
+				Struct scriptBody = Caster.toStruct(item.get(KeyConstants._body, null), null);
+				if (scriptBody == null) continue;
+
+				Array scriptContents = Caster.toArray(scriptBody.get(KeyConstants._body, null), null);
+				if (scriptContents == null) continue;
+
+				// Find component inside cfscript body (CFMLTag with name "component" or "interface")
+				for (int j = 1; j <= scriptContents.size(); j++) {
+					Struct child = Caster.toStruct(scriptContents.get(j, null), null);
+					if (child == null) continue;
+
+					String name = Caster.toString(child.get(KeyConstants._name, null), null);
+					if ("component".equalsIgnoreCase(name) || "interface".equalsIgnoreCase(name)) {
+						// Found component - replace root body with just the component
+						Array newBody = new ArrayImpl();
+						newBody.appendEL(child);
+						root.setEL(KeyConstants._body, newBody);
+						return;
 					}
 				}
 			}

core/src/main/java/lucee/runtime/functions/ast/AstFromString.java

@@ -23,9 +23,12 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
 		Boolean script = Boolean.FALSE;
 		if (args.length == 2) {
 			String mode = Caster.toString(args[1], null);
-			//
-			if ("script".equalsIgnoreCase(mode)) script = Boolean.TRUE;
-
+			if ("script".equalsIgnoreCase(mode)) {
+				script = Boolean.TRUE;
+			}
+			else if (mode != null && !"tag".equalsIgnoreCase(mode)) {
+				throw new FunctionException(pc, "AstFromString", 2, "mode", "invalid mode [" + mode + "], valid values are [tag, script]");
+			}
 		}
 
 		return ((PageContextImpl) pc).transform(new SourceCode(null, content, false, 0), script);

core/src/main/java/lucee/runtime/type/util/KeyConstants.java

@@ -393,6 +393,7 @@ private static Collection.Key init(String key) {
 	public static final Key _dc_subject = init("dc_subject");
 	public static final Key _debug = init("debug");
 	public static final Key _debugging = init("debugging");
+	public static final Key _declaration = init("declaration");
 	public static final Key _decorator = init("decorator");
 	public static final Key _default = init("default");
 	public static final Key _delete = init("delete");
@@ -757,6 +758,8 @@ private static Collection.Key init(String key) {
 	public static final Key _statuscode = init("statuscode");
 	public static final Key _statustext = init("statustext");
 	public static final Key _extends = init("extends");
+	public static final Key _explicit = init("explicit");
+	public static final Key _accessExplicit = init("accessExplicit");
 	public static final Key _implements = init("implements");
 	public static final Key __toDateTime = init("_toDateTime");
 	public static final Key __toNumeric = init("_toNumeric");

core/src/main/java/lucee/transformer/Factory.java

@@ -160,6 +160,8 @@ public abstract class Factory {
 
 	public abstract ExprString opString(Expression left, Expression right, boolean concatStatic);
 
+	public abstract ExprString opStringInterpolation(Expression left, Expression right);
+
 	public abstract ExprBoolean opBool(Expression left, Expression right, int operation);
 
 	public abstract ExprNumber opNumber(Expression left, Expression right, int operation);

core/src/main/java/lucee/transformer/Page.java

@@ -11,6 +11,8 @@ public interface Page extends Root {
 
 	public boolean isComponent();
 
+	public boolean isAST();
+
 	public SourceCode getSourceCode();
 
 	public Config getConfig();

core/src/main/java/lucee/transformer/bytecode/BodyBase.java

@@ -71,7 +71,9 @@ public void addStatement(Statement statement) {
 
 		if (statement instanceof PrintOut) {
 			Expression expr = ((PrintOut) statement).getExpr();
-			if (expr instanceof LitString && concatPrintouts(((LitString) expr).getString())) return;
+			// LDEV-5983: Only concatenate if the statement doesn't already belong to another body.
+			// Otherwise concatenating modifies the original PrintOut which may still be used elsewhere.
+			if (expr instanceof LitString && statement.getParent() == null && concatPrintouts(((LitString) expr).getString())) return;
 		}
 		statement.setParent(this);
 		this.statements.add(statement);

core/src/main/java/lucee/transformer/bytecode/BytecodeFactory.java

@@ -288,14 +288,21 @@ public Variable createVariable(int scope, Position start, Position end) {
 
 	@Override
 	public ExprString opString(Expression left, Expression right) {
-		return OpString.toExprString(left, right, true);
+		// Pass false to preserve string literal structure for AST output (LDEV-6022)
+		// Otherwise "<c" & "fsc" merges to "<cfsc" which breaks re-parsing
+		return OpString.toExprString(left, right, false);
 	}
 
 	@Override
 	public ExprString opString(Expression left, Expression right, boolean concatStatic) {
 		return OpString.toExprString(left, right, concatStatic);
 	}
 
+	@Override
+	public ExprString opStringInterpolation(Expression left, Expression right) {
+		return OpString.toExprStringInterpolation(left, right);
+	}
+
 	@Override
 	public ExprBoolean opBool(Expression left, Expression right, int operation) {
 		return OpBool.toExprBoolean(left, right, operation);

core/src/main/java/lucee/transformer/bytecode/PageImpl.java

@@ -264,6 +264,7 @@ public final class PageImpl extends BodyBase implements Page {
 	private int hash;
 	private List<JavaFunction> javaFunctions;
 	private Set<String> javaFunctionNames;
+	private boolean forAST;
 
 	/**
 	 * @param factory
@@ -1763,6 +1764,15 @@ public boolean isPage() {
 		return getTagCFObject(null) == null;
 	}
 
+	@Override
+	public boolean isAST() {
+		return forAST;
+	}
+
+	public void setAST(boolean forAST) {
+		this.forAST = forAST;
+	}
+
 	/**
 	 * @return the lastModifed
 	 */

core/src/main/java/lucee/transformer/bytecode/StaticBody.java

@@ -17,12 +17,27 @@
  */
 package lucee.transformer.bytecode;
 
+import lucee.runtime.type.Struct;
 import lucee.transformer.Factory;
+import lucee.transformer.Position;
 
 public final class StaticBody extends BodyBase {
 
 	public StaticBody(Factory f) {
 		super(f);
 	}
 
+	public StaticBody(Factory f, Position start, Position end) {
+		super(f);
+		setStart(start);
+		setEnd(end);
+	}
+
+	@Override
+	public void dump(Struct sct) {
+		super.dump(sct);
+		// Mark this block as a static initializer
+		sct.setEL("static", Boolean.TRUE);
+	}
+
 }