Fixes for latest errors.

jfilby · Dec 8, 2024 · 8982cf0 · 8982cf0
1 parent 6c5e865
commit 8982cf0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/env.sh b/env.sh
@@ -14,5 +14,5 @@ export WEB_APP_INVITE_ONLY=Y
 export WEB_APP_LOG_LEVEL=INFO
 export WEB_APP_PORT=5000
 
-export NIM_COMPILE_OPTIONS="--path:.. --path:$DOCUI_SRC_PATH --path:$EXS_SRC_PATH -d:ssl -d:chronicles_log_level:$WEB_APP_LOG_LEVEL -d:chronicles_line_numbers -d:chronicles_colors:NativeColors -d:chronicles_sinks:json[file]"
+export NIM_COMPILE_OPTIONS="--path:../.. --path:$DOCUI_SRC_PATH --path:$EXS_SRC_PATH -d:ssl -d:chronicles_log_level:$WEB_APP_LOG_LEVEL -d:chronicles_line_numbers -d:chronicles_colors:NativeColors -d:chronicles_sinks:json[file]"
 
diff --git a/env.template.sh b/env.template.sh
@@ -12,5 +12,5 @@ export WEB_APP_INVITE_ONLY=Y
 export WEB_APP_LOG_LEVEL=INFO
 export WEB_APP_PORT=5000
 
-export NIM_COMPILE_OPTIONS="--path:.. --path:$DOCUI_SRC_PATH --path:$EXS_SRC_PATH -d:ssl -d:chronicles_log_level:$WEB_APP_LOG_LEVEL -d:chronicles_line_numbers -d:chronicles_colors:NativeColors -d:chronicles_sinks:json[file]"
+export NIM_COMPILE_OPTIONS="--path:../.. --path:$DOCUI_SRC_PATH --path:$EXS_SRC_PATH -d:ssl -d:chronicles_log_level:$WEB_APP_LOG_LEVEL -d:chronicles_line_numbers -d:chronicles_colors:NativeColors -d:chronicles_sinks:json[file]"
 
diff --git a/src/nexus/cmd/service/generate/models/cached/cached_data_access_helpers.nim b/src/nexus/cmd/service/generate/models/cached/cached_data_access_helpers.nim
@@ -1,7 +1,7 @@
 import strformat, strutils
-import nexus/cmd/service/generate/models/model_utils
 import nexus/core/service/format/case_utils
-import types/types
+import nexus/cmd/service/generate/models/model_utils
+import nexus/cmd/types/types
 
 
 # Forward declarations

diff --git a/src/nexus/cmd/service/generate/models/drivers/stdlib_dbi/data_access_helpers.nim b/src/nexus/cmd/service/generate/models/drivers/stdlib_dbi/data_access_helpers.nim
@@ -500,7 +500,7 @@ proc listFieldNames*(
        listFields: seq[string]) =
 
   debug "listFieldNames()",
-    fields = fields
+    listFields = listFields
 
   var first = true
 

diff --git a/src/nexus/cmd/service/generate/models/gen_model_utils.nim b/src/nexus/cmd/service/generate/models/gen_model_utils.nim
@@ -26,7 +26,7 @@ proc getModel*(modelYaml: ModelYAML,
                isRef: bool): Model =
 
   debug "getModel()",
-    modelName = model.name
+    modelName = modelYaml.name
 
   # Set moduleImport
   # warn "to do"

diff --git a/src/nexus/cmd/service/generate/tmp_dict/tmp_dict_utils.nim b/src/nexus/cmd/service/generate/tmp_dict/tmp_dict_utils.nim
@@ -64,13 +64,9 @@ proc updateTmpDictFileWritten*(
 proc writeTmpDict*(tmpDict: Table[string, string],
                    filename: string) =
 
-  {.hint[XCannotRaiseY]: off.}
+  # {.hint[XCannotRaiseY]: off.}
 
-  var output =
-        dump(tmpDict,
-             tsRootOnly,
-             asTidy,
-             defineOptions(style = psMinimal))
+  let output = Dumper().dump(tmpDict)
 
   writeFile(filename,
             output)