2025.2.0

Author: pvlasov

cli/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.nasdanika.models.app</groupId>
-		<version>2025.1.0</version>
+		<version>2025.2.0</version>
 		<artifactId>parent</artifactId>
 		<relativePath>..</relativePath>
 	</parent>

cli/src/main/java/org/nasdanika/models/app/cli/ActionHelpMixIn.java

@@ -449,7 +449,7 @@ public static Action createCommandLineAction(
 
 			if (optAction != null) {				
 				optAction.setText(StringEscapeUtils.escapeHtml4(String.join(", ", opt.names())));
-				optAction.setName("opt_" + StringEscapeUtils.escapeHtml4(opt.shortestName()));
+				optAction.setName("opt" + StringEscapeUtils.escapeHtml4(opt.shortestName()));
 				if (optionsSection == null) {
 					optionsSection = createAction();
 					optionsSection.setText("Options");
@@ -502,7 +502,8 @@ protected static boolean generateDocumentation(
 								if (dStream != null) {
 									Collection<EObject> docObjs = docFactory.createDocumentation(
 											docContext, 
-											URI.createURI(resName).resolve(baseURI), 
+											URI.createURI(resName).resolve(baseURI),
+											null,
 											progressMonitor);							
 									action.getContent().addAll(docObjs);								
 									return true;
@@ -517,6 +518,7 @@ protected static boolean generateDocumentation(
 							Collection<EObject> docObjs = docFactory.createDocumentation(
 									docContext, 
 									resourceURI, 
+									null,
 									progressMonitor);							
 							action.getContent().addAll(docObjs);								
 							return true;
@@ -534,7 +536,8 @@ protected static boolean generateDocumentation(
 								docContext, 
 								doc, 
 								format, 
-								Util.createClassURI(clazz), 
+								Util.createClassURI(clazz),
+								null,
 								progressMonitor);
 
 						action.getContent().addAll(docObjs);								

cli/src/main/java/org/nasdanika/models/app/cli/DrawioHtmlAppGeneratorCommand.java

@@ -5,13 +5,15 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.function.Consumer;
 
 import org.eclipse.emf.common.util.URI;
 import org.nasdanika.capability.CapabilityLoader;
 import org.nasdanika.capability.ServiceCapabilityFactory;
 import org.nasdanika.cli.Description;
 import org.nasdanika.cli.ParentCommands;
+import org.nasdanika.common.Context;
 import org.nasdanika.common.Diagnostic;
 import org.nasdanika.common.Invocable;
 import org.nasdanika.common.ProgressMonitor;
@@ -49,22 +51,14 @@ public DrawioHtmlAppGeneratorCommand(CapabilityLoader capabilityLoader) {
 	protected Consumer<Diagnostic> createDiagnosticConsumer(ProgressMonitor progressMonitor) {		
 		return d -> progressMonitor.worked(d.getStatus(), 1, "Diagnostic: " + d.getMessage(), d);
 	}
+		
 
-	protected DrawioHtmlAppGenerator createDrawioActionGenerator(Collection<RepresentationElementFilter> representationElementFilters) {
+	protected DrawioHtmlAppGenerator createDrawioActionGenerator(URI baseURI, Collection<RepresentationElementFilter> representationElementFilters) {
 		return new DrawioHtmlAppGenerator() {
 
 			@Override
 			protected URI getBaseURI() {
-				URI baseURI = super.getBaseURI();
-				if (Util.isBlank(base)) {
-					return baseURI;
-				}
-				
-				URI bURI = URI.createURI(base);
-				if (bURI.isRelative()) {
-					bURI = bURI.resolve(baseURI);
-				}
-				return bURI;
+				return baseURI;
 			}
 
 			@Override
@@ -106,8 +100,7 @@ public void filterRepresentationElement(
 				"and prototype references. Resolved",
 				"relative to the document URI"				
 		})
-	private String refBase;
-	
+	private String refBase;	
 
 	@Option(
 		names = {"-x", "--index"},
@@ -149,7 +142,21 @@ You may change the file extension if you need to generate server pages (PHP, JSP
 
 	@Override
 	protected Collection<Label> getLabels(ProgressMonitor progressMonitor) {
-		Document document = documentSupplier.getDocument(progressMonitor); 
+		URI actionGeneratorBaseURI = URI.createURI("tmp://" + UUID.randomUUID() + "/" + UUID.randomUUID() + "/");
+		if (!Util.isBlank(base)) {
+			URI bURI = URI.createURI(base);
+			if (bURI.isRelative()) {
+				bURI = bURI.resolve(actionGeneratorBaseURI);
+			}
+			actionGeneratorBaseURI = bURI;
+		}				
+		
+		Map<String,String> properties = Map.of(Context.BASE_URI_PROPERTY, actionGeneratorBaseURI.toString());
+		
+		Document document = documentSupplier.getDocument(
+				null,
+				properties::get, 
+				progressMonitor); 
 		Collection<RepresentationElementFilter> refs = new ArrayList<>();		
 		File currentDir = new File(".");
 		URI baseURI = URI.createFileURI(currentDir.getAbsolutePath()).appendSegment("");		
@@ -162,7 +169,7 @@ protected Collection<Label> getLabels(ProgressMonitor progressMonitor) {
 			refs.add(ref);			
 		}		
 
-		DrawioHtmlAppGenerator actionGenerator = createDrawioActionGenerator(refs);
+		DrawioHtmlAppGenerator actionGenerator = createDrawioActionGenerator(actionGeneratorBaseURI, refs);
 		Supplier<Collection<Label>> labelSupplier = actionGenerator.createLabelsSupplier(document, progressMonitor);
 		Consumer<Diagnostic> diagnosticConsumer = createDiagnosticConsumer(progressMonitor);
 		return labelSupplier.call(progressMonitor, diagnosticConsumer);

cli/src/main/resources/org/nasdanika/models/app/cli/DrawioHtmlAppGeneratorCommand.md

@@ -9,29 +9,29 @@
     * Adds the generated labels to the root action
 * Passes the resulting model to the [site](site/index.html) sub-command to generate a documentation site
 
-## Diagram element configuration
+## Diagram element configuration – 
 
 Diagram elements can be configured with the following properties:
 
-* ``documentation`` – documentation text in documentation format
-* ``doc-format`` – explicitly specified documentation format for ``documentation`` and ``doc-ref`. Out of the box:
+* ``documentation`` - documentation text in documentation format
+* ``doc-format`` - explicitly specified documentation format for ``documentation`` and ``doc-ref`. Out of the box:
     * ``markdown`` (default), 
     * ``html``
     * ``text``
-* ``doc-ref`` – URI of a documentation resource resolved relative to the URI of the diagram file. Documentation format is derived from the URI extension, defaulting to ``markdown``. Use ``doc-format`` to override.
-* ``icon`` – diagram element icon URL resolved relative to the diagram file. If there is no slash (``/``) in the icon name then it is treated as a CSS style, e.g. ``fas fa-user``. 
+* ``doc-ref`` - URI of a documentation resource resolved relative to the URI of the diagram file. Documentation format is derived from the URI extension, defaulting to ``markdown``. Use ``doc-format`` to override.
+* ``icon`` - diagram element icon URL resolved relative to the diagram file. If there is no slash (``/``) in the icon name then it is treated as a CSS style, e.g. ``fas fa-user``. 
 For image diagram elements icons are derived from element images. It is recommended to use SVG 20x20 OR 18x18 pixels for icons because they are also used in page titles and PNG images get blurry when scaled up.
-* ``parent`` – Connection property with values ``source`` or ``target``. Use to generate documentation from mind maps where parent/child relationship is defined by connections, not by containment.
+* ``parent`` - Connection property with values ``source`` or ``target``. Use to generate documentation from mind maps where parent/child relationship is defined by connections, not by containment.
 * ``prototype`` & ``proto-ref`` – YAML specification of [html application](https://html-app.models.nasdanika.org/index.html) [action](https://html-app.models.nasdanika.org/references/eClassifiers/Action/index.html), [link](https://html-app.models.nasdanika.org/references/eClassifiers/Link/index.html) or [label](https://html-app.models.nasdanika.org/references/eClassifiers/Label/index.html). See load specifications of respective model elements for supported configuration keys. If both properties are specified, ``prototype`` takes precedence over ``proto-ref``. With prototypes you can:
-    * Generate complex site pages (actions) with children, navigation, sections, …
+    * Generate complex site pages (actions) with children, navigation, sections, ...
     * Reuse action models. For example, generate an action model from one diagram and use it as a prototype for an element of another diagram. Or generate an action model for CLI or Ecore documentation.
-* ``role`` – action/page role:
+* ``role`` - action/page role:
     * ``anonymous`` (default for connections)
     * ``child`` (default for nodes)
     * ``navigation``
     * ``section``
-* ``sort-key`` – By default generated pages (actions) are sorted alphabetically by title. This property can be used to customize sorting. If it is set then pages are sorted first by the property value and then by page title.
-* ``title`` – By default the element label is used as page title (action text). Use this property to explicitly set the page title. For example, for elements with long labels.
+* ``sort-key`` - By default generated pages (actions) are sorted alphabetically by title. This property can be used to customize sorting. If it is set then pages are sorted first by the property value and then by page title.
+* ``title`` - By default the element label is used as page title (action text). Use this property to explicitly set the page title. For example, for elements with long labels.
 
 Site pages are generated only for elements with: