Fix macro

src/PSRBridge.jl

@@ -22,6 +22,7 @@ export
     TimeSeriesFileData,
     TimeSeriesVectorData,
     Cache,
+    raw_data,
     initialize!,
     update!,
     adjust!,

src/data/adjusted_vector.jl

@@ -19,6 +19,10 @@ function Base.isempty(parameter::AdjustedVectorData{T}) where {T}
     return isempty(parameter.data)
 end
 
+function raw_data(parameter::AdjustedVectorData)
+    return parameter.data
+end
+
 function initialize!(parameter::AdjustedVectorData{T}, collection::AbstractCollection, db::DatabaseSQLite; kwargs...) where {T}
     size = PSRI.max_elements(db, collection.id)
     parameter.data = Vector{T}(undef, size)

src/data/any.jl

@@ -1,3 +1,7 @@
+function raw_data(parameter::Any)
+    return parameter
+end
+
 function initialize!(parameter::Any, collection::AbstractCollection, db::DatabaseSQLite; kwargs...)
     return nothing
 end

src/data/map.jl

@@ -20,6 +20,10 @@ function Base.isempty(parameter::MapData)
     return isempty(parameter.data)
 end
 
+function raw_data(parameter::MapData)
+    return parameter.data
+end
+
 function initialize!(parameter::MapData, collection::AbstractCollection, db::DatabaseSQLite; kwargs...)
     parameter.data = PSRI.get_map(db, collection.id, parameter.collection_to, parameter.id)
     return nothing

src/data/static_vector.jl

@@ -19,6 +19,10 @@ function Base.isempty(parameter::StaticVectorData{T}) where {T}
     return isempty(parameter.data)
 end
 
+function raw_data(parameter::StaticVectorData)
+    return parameter.data
+end
+
 function initialize!(parameter::StaticVectorData{T}, collection::AbstractCollection, db::DatabaseSQLite; kwargs...) where {T}
     parameter.data = PSRI.get_parms(db, collection.id, parameter.id) .|> T
     return nothing

src/data/time_series_file.jl

@@ -11,6 +11,10 @@ function (parameter::TimeSeriesFileData)()
     return parameter.path
 end
 
+function raw_data(parameter::TimeSeriesFileData)
+    return parameter.path
+end
+
 function initialize!(parameter::TimeSeriesFileData, collection::AbstractCollection, db::DatabaseSQLite; kwargs...)
     parameter.path = PSRDatabaseSQLite.read_time_series_file(db, collection.id, parameter.id)
     return nothing

src/data/time_series_vector.jl

@@ -19,6 +19,10 @@ function Base.isempty(parameter::TimeSeriesVectorData{T}) where {T}
     return isempty(parameter.data)
 end
 
+function raw_data(parameter::TimeSeriesVectorData)
+    return parameter.data
+end
+
 function initialize!(parameter::TimeSeriesVectorData{T}, collection::AbstractCollection, db::DatabaseSQLite; kwargs...) where {T}
     return nothing
 end

src/macros.jl

@@ -6,15 +6,15 @@ $description
 """
 end
 
-function getters_field(;name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
+function getters_field(; name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
     getters = Expr[]
 
     description = "Get the $field_name field from the $name collection."
 
     doc_string = build_doc_string("$function_name($name_snakecase::$name)", description)
     push!(getters, quote
         @doc $doc_string function $function_name($name_snakecase::$name)
-            return $name_snakecase.$field_name
+            return raw_data($name_snakecase.$field_name)
         end
     end)
 
@@ -35,7 +35,7 @@ function getters_field(;name::Symbol, name_snakecase::Symbol, function_name::Sym
     return getters
 end
 
-function getters_callable(;name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
+function getters_callable(; name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
     getters = Expr[]
 
     description = "Get the $field_name field from the $name collection."
@@ -64,7 +64,7 @@ function getters_callable(;name::Symbol, name_snakecase::Symbol, function_name::
     return getters
 end
 
-function getters_array1(;name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
+function getters_array1(; name::Symbol, name_snakecase::Symbol, function_name::Symbol, field_name::Symbol)
     getters = Expr[]
 
     description = "Get the $field_name field from the $name collection at index i."
@@ -129,8 +129,8 @@ macro collection(expression)
 
     getters = Expr[]
 
-    push!(getters, 
-        getters_collection(name_snakecase = name_snakecase)...
+    push!(getters,
+        getters_collection(name_snakecase = name_snakecase)...,
     )
 
     for field in fields
@@ -144,16 +144,16 @@ macro collection(expression)
         function_name = Symbol(name_snakecase, :_, field_name)
 
         push!(getters,
-            getters_field(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...
+            getters_field(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...,
         )
 
         if field_type == :TimeSeriesFileData
-            push!(getters, 
-                getters_callable(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...
+            push!(getters,
+                getters_callable(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...,
             )
         else
-            push!(getters, 
-                getters_array1(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...
+            push!(getters,
+                getters_array1(name = name, name_snakecase = name_snakecase, function_name = function_name, field_name = field_name)...,
             )
         end
     end
@@ -166,4 +166,4 @@ macro collection(expression)
             ]...,
         ),
     )
-end
+end