I think I fixed the compiler errors with the correct exports

tanelso2 · Dec 27, 2023 · 914fef2 · 914fef2
1 parent d51f1c1
commit 914fef2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/yanyl/codegen.nim b/src/yanyl/codegen.nim
@@ -3,7 +3,6 @@ import
   sequtils,
   strformat,
   sugar,
-  ./core,
   ./reflection
 
 proc mkYNodeGetCall(n: NimNode, k: string): NimNode =

diff --git a/src/yanyl/core.nim b/src/yanyl/core.nim
@@ -6,7 +6,11 @@ import
     strutils,
     sugar,
     tables,
-    yaml
+    yaml,
+    yaml/data,
+    yaml/dom
+
+export data, dom
 
 type
   YNodeKind* = enum
@@ -343,8 +347,7 @@ proc loadNode*(s: string | Stream): YNode =
     doAssert n.get("i", int) == 3
     doAssert n.get("f", float) == 0.32
 
-  var node: YamlNode
-  load(s,node)
+  var node: YamlNode = loadAs[YamlNode](s)
   return translate(node)
 
 proc newline(i: int): string =

diff --git a/tests/example.yaml b/tests/example.yaml
@@ -0,0 +1,5 @@
+name: Peter Parker
+occupation: Photographer
+aliases:
+- Tiger
+- Pete
diff --git a/tests/tcomparison_output.nim b/tests/tcomparison_output.nim
@@ -11,6 +11,6 @@ deriveYaml Obj
 
 var o = Obj(i: 42, s: "Hello galaxy")
 # NimYAML
-echo dump(o)
+echo dump(jsonDumper(), o)
 # Yanyl
-echo toYamlStr(o)
+echo toYamlStr(o)
diff --git a/tests/tderiveyamls.nim b/tests/tderiveyamls.nim
@@ -1,5 +1,6 @@
 import
-    yanyl
+    yanyl,
+    std/macros
 
 type
     Owner = ref object of RootObj
@@ -22,4 +23,4 @@ owner:
 let garf = ofYamlStr(sample, Pet)
 doAssert garf.name == "Garfield"
 doAssert garf.kind == "cat"
-doAssert garf.owner.name == "J. Arbuckle"
+doAssert garf.owner.name == "J. Arbuckle"
diff --git a/tests/tloadnode.nim b/tests/tloadnode.nim
@@ -19,5 +19,6 @@ assert y.get("c").kind == ynList
 import
   streams
 
-let s2 = newFileStream("example.yaml")
+let s2 = newFileStream("tests/example.yaml")
 let y2: YNode = s2.loadNode()
+assert y2.get("name").kind == ynString