Merge branch 'main' into 'main'

fix: Make `command` required Closes #122 See merge request jwestman/blueprint-compiler!135
Add tests for nested templates
2025-05-04 15:59:08 -04:00 · 2025-04-01 23:44:02 +00:00 · 2025-03-30 10:27:11 +01:00 · 2025-03-28 20:53:03 +00:00 · 2023-08-01 11:55:33 +02:00
5 changed files with 81 additions and 2 deletions
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@ -39,8 +39,7 @@ LIBDIR = None
 class BlueprintApp:
    def main(self):
        self.parser = argparse.ArgumentParser()
-        self.subparsers = self.parser.add_subparsers(metavar="command")
-        self.parser.set_defaults(func=self.cmd_help)
+        self.subparsers = self.parser.add_subparsers(metavar="command", required=True)

        compile = self.add_subcommand(
            "compile", "Compile blueprint files", self.cmd_compile
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@ -73,6 +73,7 @@ class XmlEmitter:
        self._needs_newline = False

    def put_cdata(self, text: str):
+        text = text.replace("]]>", "]]]]><![CDATA[>")
        self.result += f"<![CDATA[{text}]]>"
        self._needs_newline = False

--- a/tests/samples/list_factory_nested.blp
+++ b/tests/samples/list_factory_nested.blp
@ -0,0 +1,17 @@
+using Gtk 4.0;
+
+Gtk.ListView {
+  factory: Gtk.BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: Gtk.ListView {
+        factory: Gtk.BuilderListItemFactory list_item_factory {
+          template ListItem {
+            child: Gtk.Label {
+              label: bind template.item as <$MyObject>.name;
+            };
+          }
+        };
+      };
+    }
+  };
+}
--- a/tests/samples/list_factory_nested.ui
+++ b/tests/samples/list_factory_nested.ui
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT EDIT!
+This file was @generated by blueprint-compiler. Instead, edit the
+corresponding .blp file and regenerate this file with blueprint-compiler.
+-->
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkListView">
+    <property name="factory">
+      <object class="GtkBuilderListItemFactory" id="list_item_factory">
+        <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkListView">
+        <property name="factory">
+          <object class="GtkBuilderListItemFactory" id="list_item_factory">
+            <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <binding name="label">
+          <lookup name="name" type="MyObject">
+            <lookup name="item" type="GtkListItem">
+              <constant>GtkListItem</constant>
+            </lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>]]]]><![CDATA[></property>
+          </object>
+        </property>
+      </object>
+    </property>
+  </template>
+</interface>]]></property>
+      </object>
+    </property>
+  </object>
+</interface>
--- a/tests/samples/list_factory_nested_dec.blp
+++ b/tests/samples/list_factory_nested_dec.blp
@ -0,0 +1,18 @@
+using Gtk 4.0;
+
+ListView {
+  factory: BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: ListView {
+        factory: BuilderListItemFactory list_item_factory {
+          template ListItem {
+            child: Label {
+              label: bind template.item as <$MyObject>.name;
+            };
+          }
+        };
+      };
+    }
+  };
+}
+
Author	SHA1	Message	Date
Giovanni Santini	373e998c3e	Merge branch 'main' into 'main' fix: Make `command` required Closes #122 See merge request jwestman/blueprint-compiler!135	2025-04-01 23:44:02 +00:00
Tom Greig	cc09f3d3bb	Add tests for nested templates Basically just a copy of the list_factory test, but with an extra copy of the list factory inside it.	2025-03-30 10:27:11 +01:00
Tom Greig	f93d5d2acd	Handle nested CDATA from nested templates When putting CDATA into the output, any instances of ']]>' in the text are replaced with ']]]]><![CDATA[>'. This allows nested templates, e.g. from list views inside list views to work properly.	2025-03-28 20:53:03 +00:00
Giovanni Santini	c683254761	fix: Make `command` required This solves a weird issue where the help function is executed everytime even when we specify a command. Fixes #122.	2023-08-01 11:55:33 +02:00