Feature 57 (config and provisioning): modules declare config and provisions, their files rendered from templates; synced with main (issues of feature 57, 874)

modules/xterm/cmd/xterm-tools/xterm_test.go

@@ -23,6 +23,11 @@ type manifest struct {
 	Environment struct {
 		Variables map[string]string `json:"variables"`
 	} `json:"environment"`
+	Items []struct {
+		Collection string            `json:"collection"`
+		Attributes map[string]string `json:"attributes"`
+		Template   string            `json:"template"`
+	} `json:"items"`
 	Shell []struct {
 		For, Slot, Code string
 	} `json:"shell"`
@@ -41,6 +46,23 @@ func readManifest(t *testing.T) manifest {
 	if err := json.Unmarshal(raw, &m); err != nil {
 		t.Fatal(err)
 	}
+	// The module's code and variables are the templates of its items (design 57 L3, issues 795 and 807).
+	for _, it := range m.Items {
+		text, err := os.ReadFile(filepath.Join("..", "..", it.Template))
+		if err != nil {
+			t.Fatal(err)
+		}
+		parts := strings.Split(it.Collection, ":")
+		switch {
+		case len(parts) == 3 && parts[0] == "shell":
+			m.Shell = append(m.Shell, struct{ For, Slot, Code string }{parts[1], parts[2], string(text)})
+		case it.Collection == "environment" && it.Attributes["kind"] == "variable":
+			if m.Environment.Variables == nil {
+				m.Environment.Variables = map[string]string{}
+			}
+			m.Environment.Variables[it.Attributes["name"]] = strings.TrimSuffix(string(text), "\n")
+		}
+	}
 	return m
 }
 

modules/xterm/files/env-terminal

@@ -0,0 +1 @@
+xterm

modules/xterm/files/xresources-normal

@@ -0,0 +1,31 @@
+! xterm: the face, the palette and the clipboard keys. Scoped to the XTerm class, so they
+! outrank any `*name` resource of yours and touch no other X program.
+XTerm*termName: xterm-256color
+XTerm*saveLines: 10000
+XTerm*renderFont: true
+XTerm*faceName: JetBrainsMono Nerd Font
+XTerm*faceSize: 12
+XTerm*boldMode: false
+XTerm*alwaysBoldMode: false
+XTerm*allowBoldFonts: true
+XTerm*background: #000000
+XTerm*foreground: #a8a8a8
+XTerm*color0: #000000
+XTerm*color8: #666666
+XTerm*color1: #9e1828
+XTerm*color9: #bc5766
+XTerm*color2: #008800
+XTerm*color10: #61a171
+XTerm*color3: #d2bb4b
+XTerm*color11: #e7db52
+XTerm*color4: #414171
+XTerm*color12: #5085af
+XTerm*color5: #963c59
+XTerm*color13: #a97a99
+XTerm*color6: #418179
+XTerm*color14: #6ba4a4
+XTerm*color7: #bebebe
+XTerm*color15: #ffffff
+XTerm*VT100.Translations: #override \n\
+  Ctrl Shift ~Alt <Key> C: copy-selection(CLIPBOARD) \n\
+  Ctrl Shift ~Alt <Key> V: insert-selection(CLIPBOARD)

modules/xterm/module.json

@@ -1,6 +1,7 @@
 {
   "module": "xterm",
   "version": "1",
+  "moved": true,
   "capabilities": [
     "package-manager"
   ],
@@ -20,16 +21,20 @@
     "xterm_font",
     "xterm_colours"
   ],
-  "environment": {
-    "variables": {
-      "TERMINAL": "xterm"
-    }
-  },
-  "shell": [
+  "items": [
     {
-      "for": "xresources",
-      "slot": "normal",
-      "code": "! xterm: the face, the palette and the clipboard keys. Scoped to the XTerm class, so they\n! outrank any `*name` resource of yours and touch no other X program.\nXTerm*termName: xterm-256color\nXTerm*saveLines: 10000\nXTerm*renderFont: true\nXTerm*faceName: JetBrainsMono Nerd Font\nXTerm*faceSize: 12\nXTerm*boldMode: false\nXTerm*alwaysBoldMode: false\nXTerm*allowBoldFonts: true\nXTerm*background: #000000\nXTerm*foreground: #a8a8a8\nXTerm*color0: #000000\nXTerm*color8: #666666\nXTerm*color1: #9e1828\nXTerm*color9: #bc5766\nXTerm*color2: #008800\nXTerm*color10: #61a171\nXTerm*color3: #d2bb4b\nXTerm*color11: #e7db52\nXTerm*color4: #414171\nXTerm*color12: #5085af\nXTerm*color5: #963c59\nXTerm*color13: #a97a99\nXTerm*color6: #418179\nXTerm*color14: #6ba4a4\nXTerm*color7: #bebebe\nXTerm*color15: #ffffff\nXTerm*VT100.Translations: #override \\n\\\n  Ctrl Shift ~Alt <Key> C: copy-selection(CLIPBOARD) \\n\\\n  Ctrl Shift ~Alt <Key> V: insert-selection(CLIPBOARD)\n"
+      "collection": "environment",
+      "name": "terminal",
+      "attributes": {
+        "kind": "variable",
+        "name": "TERMINAL"
+      },
+      "template": "files/env-terminal"
+    },
+    {
+      "collection": "shell:xresources:normal",
+      "name": "xresources-normal",
+      "template": "files/xresources-normal"
     }
   ],
   "resources": [
@@ -51,6 +56,11 @@
         "loads": [
           "xterm-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }