Merge pull request #85 from TidierOrg/no-escape-types

Author: kdpsingh

NEWS.md

@@ -1,5 +1,8 @@
 # TidierData.jl updates
 
+## v0.14.6 - 2024-02-03
+- Bug fix to ensure that data type constructors are not escaped
+
 ## v0.14.5 - 2024-01-23
 - Adds `@relocate()`
 

Project.toml

@@ -1,7 +1,7 @@
 name = "TidierData"
 uuid = "fe2206b3-d496-4ee9-a338-6a095c4ece80"
 authors = ["Karandeep Singh"]
-version = "0.14.5"
+version = "0.14.6"
 
 [deps]
 Chain = "8be319e6-bccf-4806-a6f7-6fae938471bc"

src/parsing.jl

@@ -351,7 +351,7 @@ function parse_escape_function(rhs_expr::Union{Expr,Symbol})
     # If it's already escaped, make sure it needs to remain escaped
     if @capture(x, esc(variable_Symbol))
       if hasproperty(Base, variable) && !(typeof(getproperty(Base, variable)) <: Function)
-        # Remove the escaping if referring to a constant value like Base.pi
+        # Remove the escaping if referring to a constant value like Base.pi and Base.Int64
        return variable
       elseif @capture(x, variable_Symbol) && hasproperty(Core, variable) && !(typeof(getproperty(Core, variable)) <: Function)
         # Remove the escaping if referring to a data type like Core.Int64
@@ -364,21 +364,41 @@ function parse_escape_function(rhs_expr::Union{Expr,Symbol})
        return variable
       end
     elseif @capture(x, fn_(args__))
-      if hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
+      if fn in not_escaped[]
+        return x
+      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
         return x
       elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
         return x
       elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
         return x
-      elseif fn in not_escaped[]
+      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
+        return x
+      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
+        return x
+      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
         return x
       elseif contains(string(fn), r"[^\W0-9]\w*$") # valid variable name
         return :($(esc(fn))($(args...)))
       else
         return x
       end
     elseif @capture(x, fn_.(args__))
-      if fn in [:esc :in :∈ :∉ :Ref :Set :Cols :(:) :∘ :across :desc :mean :std :var :median :first :last :minimum :maximum :sum :length :skipmissing :quantile :passmissing :startswith :contains :endswith]
+      # if fn in [:esc :in :∈ :∉ :Ref :Set :Cols :(:) :∘ :across :desc :mean :std :var :median :first :last :minimum :maximum :sum :length :skipmissing :quantile :passmissing :startswith :contains :endswith]
+      #  return x
+      if fn in not_escaped[]
+        return x
+      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
+        return x
+      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
+        return x
+      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
+        return x
+      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
+        return x
+      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
+        return x
+      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
         return x
       elseif contains(string(fn), r"[^\W0-9]\w*$") # valid variable name
         return :($(esc(fn)).($(args...)))
@@ -439,9 +459,11 @@ function parse_interpolation(var_expr::Union{Expr,Symbol,Number,String};
     elseif @capture(x, variable_Symbol)
       if variable in not_escaped[]
         return variable
-      elseif hasproperty(Base, variable) && !(typeof(getproperty(Base, variable)) <: Function)
+      elseif hasproperty(Base, variable) && !(typeof(getproperty(Base, variable)) <: Function) && !(typeof(getproperty(Base, variable)) <: Type)
         return esc(variable)
-      elseif @capture(x, variable_Symbol) && hasproperty(Core, variable) && !(typeof(getproperty(Core, variable)) <: Function)
+      elseif hasproperty(Core, variable) && !(typeof(getproperty(Core, variable)) <: Function) && !(typeof(getproperty(Core, variable)) <: Type)
+        return esc(variable)
+      elseif hasproperty(Statistics, variable) && !(typeof(getproperty(Statistics, variable)) <: Function) && !(typeof(getproperty(Statistics, variable)) <: Type)
         return esc(variable)
       else
         return variable