Merge branch 'main' into 'main'

fix: Make `command` required Closes #122 See merge request jwestman/blueprint-compiler!135
Sort keys in collect-sections.py
2025-05-04 15:59:08 -04:00 · 2025-03-28 12:41:11 +00:00 · 2025-03-24 22:58:43 +00:00 · 2025-03-21 01:01:24 +00:00 · 2025-03-02 15:26:42 +00:00 · 2024-12-18 17:46:26 +00:00
5 changed files with 10 additions and 8 deletions
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@ -225,12 +225,12 @@ class Flag(AstNode):
        return self.tokens["value"]

    @property
-    def value(self) -> T.Optional[int]:
+    def value(self) -> T.Optional[str]:
        type = self.context[ValueTypeCtx].value_type
        if not isinstance(type, Enumeration):
            return None
        elif member := type.members.get(self.name):
-            return member.value
+            return member.nick
        else:
            return None

--- 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/docs/collect-sections.py
+++ b/docs/collect-sections.py
@ -132,5 +132,8 @@ if __name__ == "__main__":
    # print the sections to a json file
    with open(outfile, "w") as f:
        json.dump(
-            {name: section.to_json() for name, section in sections.items()}, f, indent=2
+            {name: section.to_json() for name, section in sections.items()},
+            f,
+            indent=2,
+            sort_keys=True,
        )
--- a/docs/index.rst
+++ b/docs/index.rst
@ -26,7 +26,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.

   using Gtk 4.0;

-   template MyAppWindow : ApplicationWindow {
+   template $MyAppWindow: ApplicationWindow {
     default-width: 600;
     default-height: 300;
     title: _("Hello, Blueprint!");
@ -35,7 +35,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
     HeaderBar {}

     Label {
-       label: bind MyAppWindow.main_text;
+       label: bind template.main_text;
     }
   }

--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
  <requires lib="gtk" version="4.0"/>
  <object class="GApplication">
-    <property name="flags">1|4</property>
+    <property name="flags">is-service|handles-open</property>
  </object>
  <object class="GtkEventControllerScroll">
    <property name="flags">1</property>
Author	SHA1	Message	Date
Giovanni Santini	c65239283c	Merge branch 'main' into 'main' fix: Make `command` required Closes #122 See merge request jwestman/blueprint-compiler!135	2025-03-28 12:41:11 +00:00
Sertonix	394014429e	Sort keys in collect-sections.py This makes sure that the reference_docs.json file is build reproducible. Ref https://reproducible-builds.org/	2025-03-24 22:58:43 +00:00
Chris Mayo	a4e0c3701b	docs: Update overview example using format and compile	2025-03-21 01:01:24 +00:00
kotontrion	c1fbcef6d0	Merge branch blueprint-compiler:main into main	2025-03-02 15:26:42 +00:00
kotontrion	e07da3c339	flags: use nick instead of name	2024-12-18 17:46:26 +00:00
kotontrion	2ae41020ab	Fix flag return value type	2024-12-18 17:46:26 +00:00
kotontrion	f48b840cfa	compile: fix flag values gtk builder does not support combining interger values with \| in flags properties, so the short names are used instead.	2024-12-18 17:46:26 +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