Context type/proc fixes.

src/nexus/cmd/service/generate/modules/gen_context_procs.nim

@@ -74,10 +74,7 @@ proc generateContextProc*(
   if module.nameInPascalCase != "NexusCore":
 
     str &=
-      &"    {module.nameInPascalCase}DbContext(dbConn: getDbConn())\n" &
-       "\n" &
-      &"  {module.nameInCamelCase}Context.nexusCoreDbContext =\n" &
-      &"    NexusCoreDbContext(dbConn: {module.nameInCamelCase}Context.db.dbConn)\n"
+      &"    {module.nameInPascalCase}DbContext(dbConn: getDbConn())\n"
 
   else:
     str &=
@@ -87,6 +84,7 @@ proc generateContextProc*(
   # For web-enabled modules or Nexus Core (which is a include web library procs)
   if module.isWeb == true or
      module.nameInPascalCase == "NexusCore":
+
     str &=
        "\n" &
       &"  {module.nameInCamelCase}Context.web =\n" &
@@ -99,6 +97,25 @@ proc generateContextProc*(
     else:
       str &= &"                    {module.nameInCamelCase}Context.nexusCoreDbContext))\n"
 
+  # For modules other than Nexus Core, create a Nexus Core context
+  if module.nameInPascalCase != "NexusCore":
+
+    str &=
+       "\n" &
+      &"  {module.nameInCamelCase}Context.nexusCoreContext =\n" &
+       "    NexusCoreContext(\n" &
+       "      NexusCoreDbContext(\n" &
+      &"        dbConn: {module.nameInCamelCase}Context.db.dbConn)"
+
+    if module.isWeb == true or
+       module.nameInPascalCase == "NexusCore":
+
+      str &=
+         ",\n" &
+        &"        web: {module.nameInCamelCase}Context.web"
+
+    str &= ")\n"
+
   # Generate: return
   str &=
      "\n" &

src/nexus/cmd/service/generate/modules/gen_context_type.nim

@@ -40,7 +40,7 @@ proc generateContextType*(
     str &= "import options\n"
 
   if module.nameInPascalCase != "NexusCore":
-    str &= "import nexus/core/types/model_types as nexus_core_model_types\n"
+    str &= "import nexus/core/types/context_type as nexus_core_context_type\n"
 
   if module.isWeb == true or
      module.nameInPascalCase == "NexusCore":
@@ -59,7 +59,7 @@ proc generateContextType*(
            "\n"
 
   if module.nameInPascalCase != "NexusCore":
-    str &= "    nexusCoreDbContext*: NexusCoreDbContext\n" &
+    str &= "    nexusCoreContext*: NexusCoreContext\n" &
            "\n"
 
   str &= "    # Add your own context vars below this comment\n" &

src/nexus/core_extras/service/module/context.nim

@@ -1,3 +1,4 @@
+import nexus/core/data_access/db_conn
 import core_extras/types/context_type
 import core_extras/types/model_types
 
@@ -8,10 +9,12 @@ proc newNexusCoreExtrasContext*():
   var nexusCoreExtrasContext = NexusCoreExtrasContext()
 
   nexusCoreExtrasContext.db =
-    NexusCoreExtrasDbContext()
+    NexusCoreExtrasDbContext(dbConn: getDbConn())
 
-  nexusCoreExtrasContext.nexusCoreDbContext =
-    NexusCoreDbContext(dbConn: nexusCoreExtrasContext.db.dbConn)
+  nexusCoreExtrasContext.nexusCoreContext =
+    NexusCoreContext(
+      NexusCoreDbContext(
+        dbConn: nexusCoreExtrasContext.db.dbConn))
 
   return nexusCoreExtrasContext
 

src/nexus/core_extras/types/context_type.nim

@@ -1,11 +1,11 @@
-import nexus/core/types/model_types as nexus_core_model_types
+import nexus/core/types/context_type as nexus_core_context_type
 import model_types
 
 
 type
   NexusCoreExtrasContext* = object
     db*: NexusCoreExtrasDbContext
-    nexusCoreDbContext*: NexusCoreDbContext
+    nexusCoreContext*: NexusCoreContext
 
     # Add your own context vars below this comment
 

src/nexus/crm/service/module/context.nim

@@ -1,3 +1,4 @@
+import nexus/core/data_access/db_conn
 import crm/types/context_type
 import crm/types/model_types
 
@@ -8,10 +9,12 @@ proc newNexusCRMContext*():
   var nexusCRMContext = NexusCRMContext()
 
   nexusCRMContext.db =
-    NexusCRMDbContext()
+    NexusCRMDbContext(dbConn: getDbConn())
 
-  nexusCRMContext.nexusCoreDbContext =
-    NexusCoreDbContext(dbConn: nexusCRMContext.db.dbConn)
+  nexusCRMContext.nexusCoreContext =
+    NexusCoreContext(
+      NexusCoreDbContext(
+        dbConn: nexusCRMContext.db.dbConn))
 
   return nexusCRMContext
 

src/nexus/crm/types/context_type.nim

@@ -1,11 +1,11 @@
-import nexus/core/types/model_types as nexus_core_model_types
+import nexus/core/types/context_type as nexus_core_context_type
 import model_types
 
 
 type
   NexusCRMContext* = object
     db*: NexusCRMDbContext
-    nexusCoreDbContext*: NexusCoreDbContext
+    nexusCoreContext*: NexusCoreContext
 
     # Add your own context vars below this comment
 

src/nexus/social/service/module/context.nim

@@ -1,3 +1,4 @@
+import nexus/core/data_access/db_conn
 import social/types/context_type
 import social/types/model_types
 
@@ -8,10 +9,12 @@ proc newNexusSocialContext*():
   var nexusSocialContext = NexusSocialContext()
 
   nexusSocialContext.db =
-    NexusSocialDbContext()
+    NexusSocialDbContext(dbConn: getDbConn())
 
-  nexusSocialContext.nexusCoreDbContext =
-    NexusCoreDbContext(dbConn: nexusSocialContext.db.dbConn)
+  nexusSocialContext.nexusCoreContext =
+    NexusCoreContext(
+      NexusCoreDbContext(
+        dbConn: nexusSocialContext.db.dbConn))
 
   return nexusSocialContext
 

src/nexus/social/types/context_type.nim

@@ -1,11 +1,11 @@
-import nexus/core/types/model_types as nexus_core_model_types
+import nexus/core/types/context_type as nexus_core_context_type
 import model_types
 
 
 type
   NexusSocialContext* = object
     db*: NexusSocialDbContext
-    nexusCoreDbContext*: NexusCoreDbContext
+    nexusCoreContext*: NexusCoreContext
 
     # Add your own context vars below this comment