Merge remote-tracking branch 'upstream/main' into refactor/split-large-files

# Conflicts:
#	mdl/executor/cmd_entities.go
#	mdl/executor/executor.go

Author: engalar

.claude/skills/mendix/create-page.md

@@ -8,7 +8,7 @@ Guide for writing CREATE PAGE statements in Mendix Definition Language (MDL).
 ```sql
 CREATE [OR REPLACE] PAGE Module.PageName
 (
-  [Params: { $ParamName: Module.EntityType, ... },]
+  [Params: { $ParamName: Module.EntityType | PrimitiveType, ... },]
   [Variables: { $varName: DataType = 'defaultExpression', ... },]
   Title: 'Page Title',
   Layout: Module.LayoutName,

README.md

@@ -170,11 +170,13 @@ mxcli -p app.mpr -c "SHOW MODULES"
 # List entities in a module
 mxcli -p app.mpr -c "SHOW ENTITIES IN MyModule"
 
-# Describe an entity, microflow, page, or workflow
+# Describe any element (module, entity, microflow, nanoflow, page, etc.)
+mxcli describe -p app.mpr module MyModule
 mxcli describe -p app.mpr entity MyModule.Customer
 mxcli describe -p app.mpr microflow MyModule.ProcessOrder
+mxcli describe -p app.mpr nanoflow MyModule.ValidateInput
 mxcli describe -p app.mpr page MyModule.CustomerOverview
-mxcli describe -p app.mpr workflow MyModule.MyWorkflow
+mxcli describe -p app.mpr json structure MyModule.CustomerResponse
 ```
 
 ### Full-Text Search

cmd/mxcli/cmd_describe.go

@@ -17,42 +17,48 @@ var describeCmd = &cobra.Command{
 	Long: `Describe an element from a Mendix project in MDL syntax.
 
 Types:
+  module           Describe a module (all contents)
   entity           Describe an entity
   externalentity   Describe an external entity (alias for entity)
   association      Describe an association
   enumeration      Describe an enumeration
   constant         Describe a constant
   microflow        Describe a microflow
+  nanoflow         Describe a nanoflow
   workflow         Describe a workflow
   page             Describe a page
   snippet          Describe a snippet
   layout           Describe a layout
   javaaction       Describe a java action
+  jsonstructure    Describe a JSON structure (also: "json structure")
+  importmapping    Describe an import mapping (also: "import mapping")
+  exportmapping    Describe an export mapping (also: "export mapping")
+  restclient       Describe a consumed REST service (also: "rest client")
   odataclient      Describe a consumed OData service
   odataservice     Describe a published OData service
+  imagecollection  Describe an image collection (also: "image collection")
   businesseventservice  Describe a business event service (also: "business event service")
+  databaseconnection    Describe a database connection (also: "database connection")
   modulerole       Describe a module role
   userrole         Describe a user role
   projectsecurity  Show project security settings
+  settings         Describe project settings
   demouser         Describe a demo user
   navigation       Describe a navigation profile
   systemoverview   Module dependency graph (requires --format elk)
 
 Example:
+  mxcli describe -p app.mpr module MyModule
   mxcli describe -p app.mpr entity MyModule.Customer
   mxcli describe -p app.mpr microflow MyModule.ProcessOrder
-  mxcli describe -p app.mpr workflow MyModule.MyWorkflow
+  mxcli describe -p app.mpr nanoflow MyModule.ValidateInput
+  mxcli describe -p app.mpr page MyModule.Customer_Overview
+  mxcli describe -p app.mpr json structure MyModule.CustomerResponse
+  mxcli describe -p app.mpr import mapping MyModule.IMM_Customer
+  mxcli describe -p app.mpr export mapping MyModule.EMM_Customer
+  mxcli describe -p app.mpr rest client MyModule.PetStoreAPI
+  mxcli describe -p app.mpr settings Settings
   mxcli describe -p app.mpr navigation Responsive
-  mxcli describe -p app.mpr layout Atlas_Core.PopupLayout
-  mxcli describe -p app.mpr javaaction MyModule.MyAction
-  mxcli describe -p app.mpr odataclient MyModule.ExternalAPI
-  mxcli describe -p app.mpr odataservice MyModule.CustomerAPI
-  mxcli describe -p app.mpr businesseventservice MyModule.CustomerEventsApi
-  mxcli describe -p app.mpr business event service MyModule.CustomerEventsApi
-  mxcli describe -p app.mpr constant MyModule.BaseUrl
-  mxcli describe -p app.mpr modulerole MyModule.User
-  mxcli describe -p app.mpr userrole Administrator
-  mxcli describe -p app.mpr projectsecurity ProjectSecurity
   mxcli describe -p app.mpr --format elk systemoverview SystemOverview
 `,
 	Args: cobra.MinimumNArgs(2),
@@ -70,6 +76,8 @@ Example:
 
 		var mdlCmd string
 		switch objectType {
+		case "MODULE":
+			mdlCmd = fmt.Sprintf("DESCRIBE MODULE %s", name)
 		case "ENTITY":
 			mdlCmd = fmt.Sprintf("DESCRIBE ENTITY %s", name)
 		case "ASSOCIATION":
@@ -78,6 +86,8 @@ Example:
 			mdlCmd = fmt.Sprintf("DESCRIBE ENUMERATION %s", name)
 		case "MICROFLOW":
 			mdlCmd = fmt.Sprintf("DESCRIBE MICROFLOW %s", name)
+		case "NANOFLOW":
+			mdlCmd = fmt.Sprintf("DESCRIBE NANOFLOW %s", name)
 		case "WORKFLOW":
 			mdlCmd = fmt.Sprintf("DESCRIBE WORKFLOW %s", name)
 		case "PAGE":
@@ -92,16 +102,28 @@ Example:
 			mdlCmd = fmt.Sprintf("DESCRIBE USER ROLE '%s'", name)
 		case "PROJECTSECURITY", "PROJECT SECURITY":
 			mdlCmd = "SHOW PROJECT SECURITY"
+		case "SETTINGS":
+			mdlCmd = "DESCRIBE SETTINGS"
 		case "DEMOUSER", "DEMO USER":
 			mdlCmd = fmt.Sprintf("DESCRIBE DEMO USER '%s'", name)
 		case "JAVAACTION", "JAVA ACTION":
 			mdlCmd = fmt.Sprintf("DESCRIBE JAVA ACTION %s", name)
 		case "CONSTANT":
 			mdlCmd = fmt.Sprintf("DESCRIBE CONSTANT %s", name)
+		case "JSONSTRUCTURE", "JSON STRUCTURE":
+			mdlCmd = fmt.Sprintf("DESCRIBE JSON STRUCTURE %s", name)
+		case "IMPORTMAPPING", "IMPORT MAPPING":
+			mdlCmd = fmt.Sprintf("DESCRIBE IMPORT MAPPING %s", name)
+		case "EXPORTMAPPING", "EXPORT MAPPING":
+			mdlCmd = fmt.Sprintf("DESCRIBE EXPORT MAPPING %s", name)
+		case "RESTCLIENT", "REST CLIENT":
+			mdlCmd = fmt.Sprintf("DESCRIBE REST CLIENT %s", name)
 		case "ODATACLIENT", "ODATA CLIENT":
 			mdlCmd = fmt.Sprintf("DESCRIBE ODATA CLIENT %s", name)
 		case "ODATASERVICE", "ODATA SERVICE":
 			mdlCmd = fmt.Sprintf("DESCRIBE ODATA SERVICE %s", name)
+		case "IMAGECOLLECTION", "IMAGE COLLECTION":
+			mdlCmd = fmt.Sprintf("DESCRIBE IMAGE COLLECTION %s", name)
 		case "BUSINESSEVENTSERVICE", "BUSINESS EVENT SERVICE":
 			mdlCmd = fmt.Sprintf("DESCRIBE BUSINESS EVENT SERVICE %s", name)
 		case "DATABASECONNECTION", "DATABASE CONNECTION":
@@ -116,8 +138,8 @@ Example:
 			mdlCmd = "" // handled directly by format-specific path
 		default:
 			fmt.Fprintf(os.Stderr, "Unknown type: %s\n", strings.Join(args[:len(args)-1], " "))
-			fmt.Fprintln(os.Stderr, "Valid types: entity, association, enumeration, constant, microflow, workflow, page, snippet, layout, javaaction, odataclient, odataservice, businesseventservice, databaseconnection, modulerole, userrole, projectsecurity, demouser, navigation, systemoverview")
-			fmt.Fprintln(os.Stderr, "Multi-word types also accepted: business event service, odata service, java action, database connection, etc.")
+			fmt.Fprintln(os.Stderr, "Valid types: module, entity, association, enumeration, constant, microflow, nanoflow, workflow, page, snippet, layout, javaaction, jsonstructure, importmapping, exportmapping, restclient, odataclient, odataservice, imagecollection, businesseventservice, databaseconnection, modulerole, userrole, projectsecurity, settings, demouser, navigation, systemoverview")
+			fmt.Fprintln(os.Stderr, "Multi-word types also accepted: json structure, import mapping, export mapping, rest client, image collection, business event service, etc.")
 			os.Exit(1)
 		}
 

cmd/mxcli/cmd_new.go

@@ -88,6 +88,13 @@ Examples:
 			os.Exit(1)
 		}
 
+		// Clean up duplicate locale files that mx create-project generates.
+		// MxBuild's AtlasPlugin.LoadTranslations crashes with "An item with the same
+		// key has already been added" when duplicate translation.json files exist.
+		if removed := cleanupDuplicateLocaleFiles(absDir); removed > 0 {
+			fmt.Printf("  Cleaned %d duplicate locale file(s)\n", removed)
+		}
+
 		// Verify .mpr was created — mx create-project names the file after --app-name
 		mprPath := filepath.Join(absDir, appName+".mpr")
 		if _, err := os.Stat(mprPath); os.IsNotExist(err) {
@@ -153,6 +160,51 @@ Examples:
 	},
 }
 
+// cleanupDuplicateLocaleFiles removes duplicate locale files that mx create-project
+// generates in themesource/atlas_core/. MxBuild crashes when multiple translation.json
+// files map to the same locale key (e.g., "en-US").
+//
+// Studio Pro-created projects have locale files only at:
+//   themesource/atlas_core/locales/<locale>/translation.json
+//
+// mx create-project additionally creates duplicates in nested subdirectories
+// (e.g., locales/en-US/atlas_core/locales/en-US/translation.json).
+// We keep only the top-level files and remove any deeper duplicates.
+func cleanupDuplicateLocaleFiles(projectDir string) int {
+	localesDir := filepath.Join(projectDir, "themesource", "atlas_core", "locales")
+	if _, err := os.Stat(localesDir); os.IsNotExist(err) {
+		return 0
+	}
+
+	removed := 0
+	// Walk locale directories (en-US, nl-NL, etc.)
+	entries, err := os.ReadDir(localesDir)
+	if err != nil {
+		return 0
+	}
+	for _, entry := range entries {
+		if !entry.IsDir() {
+			continue
+		}
+		localeDir := filepath.Join(localesDir, entry.Name())
+		// Check for nested subdirectories that duplicate the locale
+		subEntries, err := os.ReadDir(localeDir)
+		if err != nil {
+			continue
+		}
+		for _, sub := range subEntries {
+			if sub.IsDir() {
+				// Any subdirectory under a locale dir is a duplicate tree
+				dupPath := filepath.Join(localeDir, sub.Name())
+				if err := os.RemoveAll(dupPath); err == nil {
+					removed++
+				}
+			}
+		}
+	}
+	return removed
+}
+
 func init() {
 	newCmd.Flags().String("version", "", "Mendix version (e.g., 11.8.0) — required")
 	newCmd.Flags().String("output-dir", "", "Output directory (default: ./<app-name>)")

cmd/mxcli/cmd_rename.go

@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/mendixlabs/mxcli/mdl/visitor"
+	"github.com/spf13/cobra"
+)
+
+var renameCmd = &cobra.Command{
+	Use:   "rename <type> <qualified-name> <new-name>",
+	Short: "Rename a project element and update all references",
+	Long: `Rename an element and automatically update all cross-references.
+
+Types:
+  entity         Rename an entity
+  microflow      Rename a microflow
+  nanoflow       Rename a nanoflow
+  page           Rename a page
+  enumeration    Rename an enumeration
+  association    Rename an association
+  constant       Rename a constant
+  module         Rename a module (updates all qualified names)
+
+Use --dry-run to preview changes without modifying.
+
+Example:
+  mxcli rename -p app.mpr entity MyModule.Customer Client
+  mxcli rename -p app.mpr microflow MyModule.ACT_Old ACT_New
+  mxcli rename -p app.mpr page MyModule.OldPage NewPage
+  mxcli rename -p app.mpr module OldModule NewModule
+  mxcli rename -p app.mpr entity MyModule.Customer Client --dry-run
+`,
+	Args: cobra.ExactArgs(3),
+	Run: func(cmd *cobra.Command, args []string) {
+		projectPath, _ := cmd.Flags().GetString("project")
+		if projectPath == "" {
+			fmt.Fprintln(os.Stderr, "Error: --project (-p) is required")
+			os.Exit(1)
+		}
+
+		dryRun, _ := cmd.Flags().GetBool("dry-run")
+
+		objectType := strings.ToUpper(args[0])
+		qualifiedName := args[1]
+		newName := args[2]
+
+		var mdlCmd string
+		dryRunSuffix := ""
+		if dryRun {
+			dryRunSuffix = " DRY RUN"
+		}
+
+		switch objectType {
+		case "ENTITY":
+			mdlCmd = fmt.Sprintf("RENAME ENTITY %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "MICROFLOW":
+			mdlCmd = fmt.Sprintf("RENAME MICROFLOW %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "NANOFLOW":
+			mdlCmd = fmt.Sprintf("RENAME NANOFLOW %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "PAGE":
+			mdlCmd = fmt.Sprintf("RENAME PAGE %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "ENUMERATION":
+			mdlCmd = fmt.Sprintf("RENAME ENUMERATION %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "ASSOCIATION":
+			mdlCmd = fmt.Sprintf("RENAME ASSOCIATION %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "CONSTANT":
+			mdlCmd = fmt.Sprintf("RENAME CONSTANT %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		case "MODULE":
+			mdlCmd = fmt.Sprintf("RENAME MODULE %s TO %s%s", qualifiedName, newName, dryRunSuffix)
+		default:
+			fmt.Fprintf(os.Stderr, "Unknown type: %s\n", args[0])
+			fmt.Fprintln(os.Stderr, "Valid types: entity, microflow, nanoflow, page, enumeration, association, constant, module")
+			os.Exit(1)
+		}
+
+		exec, logger := newLoggedExecutor("subcommand")
+		defer logger.Close()
+		defer exec.Close()
+
+		// Connect
+		connectProg, _ := visitor.Build(fmt.Sprintf("CONNECT LOCAL '%s' FOR WRITING", projectPath))
+		for _, stmt := range connectProg.Statements {
+			if err := exec.Execute(stmt); err != nil {
+				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+				os.Exit(1)
+			}
+		}
+
+		// Execute rename
+		renameProg, errs := visitor.Build(mdlCmd)
+		if len(errs) > 0 {
+			for _, err := range errs {
+				fmt.Fprintf(os.Stderr, "Parse error: %v\n", err)
+			}
+			os.Exit(1)
+		}
+
+		for _, stmt := range renameProg.Statements {
+			if err := exec.Execute(stmt); err != nil {
+				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+				os.Exit(1)
+			}
+		}
+	},
+}
+
+func init() {
+	renameCmd.Flags().Bool("dry-run", false, "Preview changes without modifying")
+	rootCmd.AddCommand(renameCmd)
+}

cmd/mxcli/cmd_show.go

@@ -11,9 +11,10 @@ import (
 )
 
 var showCmd = &cobra.Command{
-	Use:   "show <type> [name]",
-	Short: "Show project elements",
-	Long: `Show elements from a Mendix project.
+	Use:     "show <type> [name]",
+	Aliases: []string{"list"},
+	Short:   "List project elements",
+	Long: `List elements from a Mendix project. (Also available as "mxcli list")
 
 Types:
   modules              List all modules

cmd/mxcli/help_topics/page.txt

@@ -14,10 +14,10 @@ Basic syntax:
     -- widgets
   }
 
-With parameters (for detail pages):
+With parameters (entity or primitive types):
   CREATE PAGE Module.Name
   (
-    Params: { $Param: Module.Entity },
+    Params: { $Param: Module.Entity, $Qty: Integer },
     Title: 'Title',
     Layout: Module.Layout
   )

cmd/mxcli/help_topics/snippet.txt

@@ -10,9 +10,9 @@ Basic syntax (no parameters):
     -- widgets
   }
 
-With parameters:
+With parameters (entity or primitive types):
   CREATE SNIPPET Module.Name (
-    Params: { $Param: Module.Entity }
+    Params: { $Param: Module.Entity, $Label: String }
   )
   {
     DATAVIEW dv (DataSource: $Param) {