Merge pull request #4 from librasteve/steve-01

OK Singular & Regular Tags
librasteve · Jul 22, 2024 · 2fd7700 · 2fd7700
2 parents 5d609dc + e868190
commit 2fd7700
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 284 deletions.
diff --git a/Build.rakumod b/Build.rakumod
diff --git a/META6.json b/META6.json
@@ -13,10 +13,7 @@
   "provides": {
     "HTMX": "lib/HTMX.rakumod"
   },
-  "resources": [
-    "html5-tags-w3schools.csv",
-    "html5-tags-list.csv"
-  ],
+  "resources": [],
   "license": "Artistic-2.0",
   "tags": [],
   "source-url": ""

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ TODOS
 
 #### Follow On
 
+- [ ] consider adding back end template to this module (like this https://github.com/Konfuzian/htmx-examples-with-flask/tree/main)
 - [ ] CSS - try some alternatives, read some stuff, make a plan
 - [ ] Cro - how to integrate HTMX Static pages with Cro backend
 - [ ] Hummingbird - ditto for HB

diff --git a/bin/html5-tags-extract.raku b/bin/html5-tags-extract.raku
diff --git a/bin/synopsis-rahx b/bin/synopsis-rahx
@@ -4,4 +4,32 @@ use v6.d;
 use HTMX;
 
 
-say h1('text', :class<jumbotron>);
+say list-regulars;
+
+say h1('text', :class<jumbotron>);
+say h1 :class<doobie>;
+
+say div :class<jumbotron>, 'xx';
+
+say br;
+
+
+
+
+
+
+#my $page =
+#
+#    div (:class<jumbotron>,);
+#         [
+#             h1 "Welcome to Dunder Mifflin!",
+#
+#                 p  "Dunder Mifflin Inc. (stock symbol {strong 'DMI'}" ~
+#                     q:to/END/;
+#                is a micro-cap regional paper and office
+#                supply distributor with an emphasis on servicing
+#                small-business clients.
+#            END
+#         ]
+#    );
+#
diff --git a/index.html b/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="https://unpkg.com/[email protected]" integrity="sha384-QWGpdj554B4ETpJJC9z+ZHJcA/i59TyjxEPXiiUgN2WmTyV5OEZWCD6gQhgkdpB/"
+            crossorigin="anonymous"></script>
+    <link rel="stylesheet"
+          href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+
+    <style>
+      .jumbotron {
+        background-color: #e6ffe6;
+        text-align: center;
+      }
+    </style>
+    <meta>
+</head>
+
+<body>
+<div class="jumbotron">
+    <h1>Welcome to Dunder Mifflin!</h1>
+    <p>
+        Dunder Mifflin Inc. (stock symbol <strong>DMI</strong>) is
+        a micro-cap regional paper and office supply distributor with
+        an emphasis on servicing small-business clients.
+    </p>
+</div>
+</body>
+</html>
diff --git a/lib/HTMX.rakumod b/lib/HTMX.rakumod
@@ -2,27 +2,54 @@ unit class HTMX;
 
 constant term:<¶> = $?NL;
 
-
 ##### HTMX Tag Export #####
 
-my Str @tags = "$*HOME/.rahx-config/html5-tags-list.csv".IO.lines;
+#viz. https://www.w3schools.com/tags/default.asp
+
+constant @all-tags = <a abbr address area article aside audio b base bdi bdo blockquote body br
+    button canvas caption cite code col colgroup data datalist dd del details dfn dialog div
+    dl dt em embed fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 head header hgroup
+    hr html i iframe img input ins kbd label legend li link main map mark menu meta meter nav
+    noscript object ol optgroup option output p param picture pre progress q rp rt ruby s samp
+    script search section select small source span strong style sub summary sup svg table tbody
+    td template textarea tfoot th thead time title tr track u ul var video wbr>;
+
+#of which "empty" / "singular" tags from https://www.tutsinsider.com/html/html-empty-elements/
+constant @singular-tags = <area base br col embed hr img input link meta param source track wbr>;
+
+my @regular-tags = (@all-tags.Set (-) @singular-tags.Set).keys;
+
+sub list-tags is export {@all-tags.sort }
+sub list-singulars is export { @singular-tags.sort }
+sub list-regulars is export { @regular-tags }
 
 # Export them so that `h1("text")` makes `<h1>text</h1>` and so on
 # eg sub h1(Str $inner) {do-tag 'h1', $inner}
 
-sub do-tag( $tag, $inner, *%h ) {
+sub do-regular-tag( $tag, $inner?, *%h ) {
 
-    my Str $attrs = (+%h ?? ' ' !! '') ~ %h.map({ .key ~ '="' ~ .value ~ '"'  }).join(' ');
+    my $attrs = +%h ?? (' ' ~ %h.map({.key ~ '="' ~ .value ~ '"'}).join(' ') ) !! '';
 
-    '<' ~ $tag ~ $attrs ~ '>' ~ $inner ~ '</' ~ $tag ~ '>'
+    '<' ~ $tag ~ $attrs ~ '>' ~ ($inner // '') ~ '</' ~ $tag ~ '>'
+}
+
+sub do-singular-tag( $tag, *%h ) {
+
+    my $attrs = +%h ?? (' ' ~ %h.map({.key ~ '="' ~ .value ~ '"'}).join(' ') ) !! '';
+
+    '<' ~ $tag ~ $attrs ~ ' />'
 }
 
 # put in all the tags programmatically
 # viz. https://docs.raku.org/language/modules#Exporting_and_selective_importing
 
 my package EXPORT::DEFAULT {
-    for @tags -> $tag {
-        OUR::{'&' ~ $tag} := sub ($inner, *%h) { do-tag( "$tag", $inner, |%h ) }
+    for @regular-tags -> $tag {
+        OUR::{'&' ~ $tag} := sub ($inner?, *%h) { do-regular-tag( "$tag", $inner, |%h ) }
+    }
+
+    for @singular-tags -> $tag {
+        OUR::{'&' ~ $tag} := sub (*%h) { do-singular-tag( "$tag", |%h ) }
     }
 }
 

diff --git a/resources/html5-tags-list.csv b/resources/html5-tags-list.csv