Merge branch 'nickel'

Author: douwe

R/read.R

@@ -252,7 +252,8 @@ read_data <- function(drfile, guide, checkname = FALSE) {
       rlang::abort(glue::glue("Unsupported location type: {location$type}"))
     )
 
-    atomicclass <- location$atomicclass %||% "character"
+    # The default atomic class is "character"
+    atomicclass <- if (!is.null(location$atomicclass)) location$atomicclass else "character"
 
     # Read data using the appropriate function
     chunk <- if (location$type == "cells") {
@@ -324,9 +325,10 @@ combine_results <- function(existing, chunk, type) {
 #' @noRd
 validate_template_version <- function(template_version, guide) {
   if (grepl("^\\d+$", template_version)) {
+    template_version_curr <- template_version
     template_version <- paste0(template_version, ".0")
     rlang::warn(glue::glue(
-      "Incorrectly formatted template version number '{template_version}'. Version numbers must have a minor number. Interpreting as '{template_version}'."
+      "Incorrectly formatted template version number '{template_version_curr}'. Version numbers must have a minor number. Interpreting as '{template_version}'."
     ))
   }
 

data-raw/schema.cue

@@ -0,0 +1,69 @@
+// usage: cue vet -c schema.cue file.yml 
+
+"guide.version"!        : #Version
+"template.name"!        : string
+"template.min.version"! : #Version
+"template.max.version"! : #Version | null
+"plate.format"!         : #Plateformat
+"locations"!            : [...#Location]
+"translations"          : [...#Translation]
+
+#Version: =~ "^\\d+\\.\\d+$" // Only version numbers in major.minor format allowed
+
+#Plateformat: 96 | 384
+
+//#AnyLocation: {
+//    "sheet"!       : string
+//    "varname"!     : #VariableName
+//    "translate"?   : bool | *false
+//    "atomicclass"? : #Atom | [...#Atom] | *"character"
+//}
+
+//#CellLocation: {
+//     "type"!     : "cells"
+//   "variables"! : [...#Variable]
+//    ...
+//}
+
+//#RangeLocation: {
+//    "type"!   : "keyvalue" | "platedata" | "table"
+//    "ranges"! : [...#Range]
+//    ...
+//}
+
+// This does not work:
+// #Location: #AnyLocation & {#CellLocation | #RangeLocation}
+
+#Location: {
+   "sheet"!        : string
+    "varname"!     : #VariableName
+    "translate"?   : bool | *false
+    "type"!        : "cells"
+    "variables"!   : [...#Variable]
+    "atomicclass"? : #Atom | [...#Atom] | *"character"
+} | {
+    "sheet"!       : string
+    "varname"!     : #VariableName
+    "translate"?   : bool | *false
+    "type"!        : "keyvalue" | "platedata" | "table"
+    "ranges"!      : [...#Range]
+    "atomicclass"? : #Atom | [...#Atom] | *"character"
+}
+
+#Variable: {
+    "name"! : #VariableName
+    "cell"! : #Cell
+}
+
+#Translation: {
+    "short"! : string
+    "long"!  : string
+}
+
+#Atom : "character" | "date" | "numeric"
+
+#Range : =~ "^[A-Z]\\d+:[A-Z]\\d+$" // Valid spreadsheed range value required
+
+#Cell : =~ "^[A-Z]\\d+$" // Valid spreadsheed cell value required
+
+#VariableName : =~ "[^\\s]" // variable names are not allowed to contain space-like characters

data-raw/shell.nix

@@ -0,0 +1,15 @@
+# Install the nix package manager if it is not available: https://nixos.org/download/#download-nix
+# This nix shell definition lets you run 'cue' in a nix shell.
+# Install it by running the command 'nix-shell' in a terminal in this folder, then run `cue` in the
+# nix shell. Enter 'exit' to exit the nix shell.
+
+let
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-25.05";
+  pkgs = import nixpkgs { config = {}; overlays = []; };
+in
+
+pkgs.mkShellNoCC {
+  packages = with pkgs; [
+    cue
+  ];
+}