Fix extension interface

Author: MilesCranmer

ext/DynamicExpressionsSymbolicUtilsExt.jl

@@ -5,13 +5,15 @@ export node_to_symbolic, symbolic_to_node
 import Base: convert
 using SymbolicUtils
 if isdefined(Base, :get_extension)
+    import DynamicExpressions.EquationModule: Node, DEFAULT_NODE_TYPE
+    import DynamicExpressions.OperatorEnumModule: AbstractOperatorEnum
+    import DynamicExpressions.UtilsModule: isgood, isbad, @return_on_false
+    import DynamicExpressions.ExtensionInterfaceModule: node_to_symbolic, symbolic_to_node
+else
     import ..DynamicExpressions.EquationModule: Node, DEFAULT_NODE_TYPE
     import ..DynamicExpressions.OperatorEnumModule: AbstractOperatorEnum
     import ..DynamicExpressions.UtilsModule: isgood, isbad, @return_on_false
-else
-    import ..EquationModule: Node, DEFAULT_NODE_TYPE
-    import ..OperatorEnumModule: AbstractOperatorEnum
-    import ..UtilsModule: isgood, isbad, @return_on_false
+    import ..DynamicExpressions.ExtensionInterfaceModule: node_to_symbolic, symbolic_to_node
 end
 
 const SYMBOLIC_UTILS_TYPES = Union{<:Number,SymbolicUtils.Symbolic{<:Number}}
@@ -190,8 +192,10 @@ function node_to_symbolic(
 end
 
 function symbolic_to_node(
-    eqn::T, operators::AbstractOperatorEnum; varMap::Union{Array{String,1},Nothing}=nothing
-)::Node where {T<:SymbolicUtils.Symbolic}
+    eqn::SymbolicUtils.Symbolic,
+    operators::AbstractOperatorEnum;
+    varMap::Union{Array{String,1},Nothing}=nothing,
+)::Node
     return convert(Node, eqn, operators; varMap=varMap)
 end
 

src/DynamicExpressions.jl

@@ -9,6 +9,7 @@ include("EvaluateEquationDerivative.jl")
 include("EvaluationHelpers.jl")
 include("SimplifyEquation.jl")
 include("OperatorEnumConstruction.jl")
+include("ExtensionInterface.jl")
 
 if !isdefined(Base, :get_extension)
     using Requires
@@ -34,13 +35,12 @@ using Reexport
     eval_diff_tree_array, eval_grad_tree_array
 @reexport import .SimplifyEquationModule: combine_operators, simplify_tree
 @reexport import .EvaluationHelpersModule
+@reexport import .ExtensionInterfaceModule: node_to_symbolic, symbolic_to_node
 
 function __init__()
     @static if !isdefined(Base, :get_extension)
         @require SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b" begin
             include("../ext/DynamicExpressionsSymbolicUtilsExt.jl")
-            @reexport import .DynamicExpressionsSymbolicUtilsExt:
-                node_to_symbolic, symbolic_to_node
         end
     end
 end

test/test_symbolic_utils.jl

@@ -1,3 +1,4 @@
+using SymbolicUtils
 using DynamicExpressions
 using Test
 include("test_params.jl")