Smarter

DESCRIPTION

@@ -21,6 +21,7 @@ Imports:
     purrr,
     rlang (>= 1.1.0),
     S7,
+    snakecase,
     stbl,
     yaml
 Suggests: 

NAMESPACE

@@ -1,22 +1,34 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(length,"rapid::api_contact")
-S3method(length,"rapid::api_info")
-S3method(length,"rapid::api_license")
+S3method(length,"rapid::contact")
+S3method(length,"rapid::info")
+S3method(length,"rapid::license")
 S3method(length,"rapid::rapid")
-S3method(length,"rapid::server_variable")
 S3method(length,"rapid::servers")
-export(api_contact)
-export(api_info)
-export(api_license)
+S3method(length,"rapid::string_replacements")
+export(as_contact)
+export(as_info)
+export(as_license)
+export(as_rapid)
+export(as_server_variables)
+export(as_servers)
+export(as_string_replacements)
+export(contact)
+export(info)
+export(license)
 export(rapid)
-export(server_variable)
-export(server_variable_list)
+export(server_variables)
 export(servers)
+export(string_replacements)
 if (getRversion() < "4.3.0") importFrom("S7", "@")
+importFrom(S7,class_any)
+importFrom(S7,class_character)
+importFrom(S7,class_list)
+importFrom(S7,class_missing)
 importFrom(glue,glue)
 importFrom(rlang,"%||%")
 importFrom(rlang,check_dots_empty)
 importFrom(rlang,check_dots_used)
 importFrom(stbl,stabilize_chr_scalar)
 importFrom(stbl,to_chr_scalar)
+importFrom(yaml,read_yaml)

R/00-properties.R

@@ -2,9 +2,8 @@
 
 character_scalar_property <- function(x_arg, ...) {
   S7::new_property(
-    class = S7::class_character,
+    class = class_character,
     setter = function(self, value) {
-      # TODO: Watch S7 dev to see if this can be less hacky.
       call <- rlang::caller_env(3)
       value <- value %||% character()
       value <- stbl::stabilize_chr_scalar(
@@ -20,39 +19,9 @@ character_scalar_property <- function(x_arg, ...) {
   )
 }
 
-character_property <- function(x_arg, ...) {
-  S7::new_property(
-    class = S7::class_character,
-    setter = function(self, value) {
-      # TODO: Watch S7 dev to see if this can be less hacky.
-      call <- rlang::caller_env(3)
-      value <- value %||% character()
-      value <- stbl::stabilize_chr(
-        value,
-        allow_null = FALSE,
-        x_arg = x_arg,
-        call = call,
-        ...
-      )
-      S7::prop(self, x_arg, check = FALSE) <- value
-      self
-    }
-  )
-}
-
-.url_regex <- "http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),{}]|(?:%[0-9a-fA-F][0-9a-fA-F]))+"
-
-url_scalar_property <- function(x_arg) {
-  character_scalar_property(x_arg, regex = .url_regex)
-}
-
-url_property <- function(x_arg) {
-  character_property(x_arg, regex = .url_regex)
-}
-
 enum_property <- function(x_arg) {
   S7::new_property(
-    class = S7::class_list,
+    class = class_list,
     setter = function(self, value) {
       call <- rlang::caller_env(3)
       if (!is.null(value) && !is.list(value)) {
@@ -70,8 +39,13 @@ enum_property <- function(x_arg) {
           enumerations
         }
       )
+      if (!any(lengths(value))) {
+        value <- NULL
+      }
       S7::prop(self, x_arg, check = FALSE) <- value
       self
     }
   )
 }
+
+class_null <- S7::new_S3_class("NULL")

R/00-shared-params.R

@@ -2,9 +2,6 @@
 #'
 #' Reused parameter definitions are gathered here for easier editing.
 #'
-#' @param apid_list An API document as a list, such as that obtained by reading
-#'   an OAS document with [yaml::read_yaml()].
-#' @param apid_url The url for an API document.
 #' @param ... Catch-all for unimplemented properties.
 #' @name .shared-parameters
 #' @keywords internal