Update module.private.modulemap

Kyle-Ye · Kyle-Ye · commit e84a2078189e · 2025-08-03T12:24:12.000+08:00
diff --git a/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp b/Sources/OpenGraphCxx/Attribute/OGAttribute.cpp
@@ -4,7 +4,7 @@
 
 #include <OpenGraph/OGAttribute.h>
 #include <OpenGraphCxx/Attribute/AttributeID.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <optional>
 
 const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Null);
diff --git a/Sources/OpenGraphCxx/Data/table.cpp b/Sources/OpenGraphCxx/Data/table.cpp
@@ -10,7 +10,7 @@
 #include <OpenGraphCxx/Data/page.hpp>
 #include <OpenGraphCxx/Data/page_const.hpp>
 #include <OpenGraphCxx/Data/zone.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <sys/mman.h>
 #include <dispatch/dispatch.h>
 #if OG_TARGET_OS_DARWIN
diff --git a/Sources/OpenGraphCxx/Data/zone.cpp b/Sources/OpenGraphCxx/Data/zone.cpp
@@ -5,7 +5,7 @@
 #include <OpenGraphCxx/Data/zone.hpp>
 #include <OpenGraphCxx/Data/table.hpp>
 #include <OpenGraphCxx/Data/page.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #if OG_TARGET_OS_DARWIN
 #include <malloc/malloc.h>
 #else
diff --git a/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm b/Sources/OpenGraphCxx/DebugServer/og-debug-server.mm
@@ -8,8 +8,8 @@
 #if OG_TARGET_OS_DARWIN
 
 #include <OpenGraph/OGGraphDescription.h>
-#include <OpenGraphCxx/Util/log.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/log.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <OpenGraphCxx/Graph/Graph.hpp>
 
 #include <iostream>
diff --git a/Sources/OpenGraphCxx/Graph/GraphContext.cpp b/Sources/OpenGraphCxx/Graph/GraphContext.cpp
@@ -4,7 +4,7 @@
 
 #include <OpenGraphCxx/Graph/Graph.hpp>
 #include <OpenGraph/OGGraph.h>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 OG::Graph::Context &OG::Graph::Context::from_cf(OGGraphRef storage) OG_NOEXCEPT {
     if (storage->context.isInvalid()) {
diff --git a/Sources/OpenGraphCxx/Graph/GraphDescription.cpp b/Sources/OpenGraphCxx/Graph/GraphDescription.cpp
@@ -5,7 +5,7 @@
 #include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 CFTypeRef OGGraphDescription(OGGraphRef graph, CFDictionaryRef options) {
     #if OG_OBJC_FOUNDATION
diff --git a/Sources/OpenGraphCxx/Graph/GraphDescription.mm b/Sources/OpenGraphCxx/Graph/GraphDescription.mm
@@ -5,7 +5,7 @@
 #include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #if OG_OBJC_FOUNDATION
 
diff --git a/Sources/OpenGraphCxx/Graph/OGGraph.cpp b/Sources/OpenGraphCxx/Graph/OGGraph.cpp
@@ -4,7 +4,7 @@
 
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Graph.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 #include <OpenGraphCxx/Data/ClosureFunction.hpp>
 #include <pthread.h>
 
diff --git a/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp b/Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
@@ -6,8 +6,8 @@
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraphCxx/Graph/Subgraph.hpp>
 #include <OpenGraph/OGGraphContext.h>
-#include <OpenGraphCxx/Util/assert.hpp>
-#include <OpenGraphCxx/Util/env.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
+#include <OpenGraphCxx/Misc/env.hpp>
 #include <pthread.h>
 #if !OG_TARGET_OS_WASI
 #include <dispatch/dispatch.h>
diff --git a/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp b/Sources/OpenGraphCxx/Runtime/OGTupleType.cpp
@@ -7,7 +7,7 @@
 
 #include <OpenGraph/OGTupleType.h>
 #include <OpenGraphCxx/Runtime/metadata.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 #include <swift/Runtime/Metadata.h>
diff --git a/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp b/Sources/OpenGraphCxx/Runtime/OGTypeID.cpp
@@ -7,7 +7,7 @@
 
 #include <OpenGraph/OGTypeID.h>
 #include <OpenGraphCxx/Runtime/metadata.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 #include <swift/Runtime/Metadata.h>
diff --git a/Sources/OpenGraphCxx/Util/assert.cpp b/Sources/OpenGraphCxx/Util/assert.cpp
@@ -2,8 +2,8 @@
 //  assert.cpp
 //  OpenGraphCxx
 
-#include <OpenGraphCxx/Util/assert.hpp>
-#include <OpenGraphCxx/Util/log.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
+#include <OpenGraphCxx/Misc/log.hpp>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Sources/OpenGraphCxx/Util/log.cpp b/Sources/OpenGraphCxx/Util/log.cpp
@@ -4,7 +4,7 @@
 //
 //  Audited for 2021 Release
 
-#include <OpenGraphCxx/Util/log.hpp>
+#include <OpenGraphCxx/Misc/log.hpp>
 
 #if OG_TARGET_OS_DARWIN
 
diff --git a/Sources/OpenGraphCxx/Util/realloc_vector.cpp b/Sources/OpenGraphCxx/Util/realloc_vector.cpp
@@ -2,8 +2,8 @@
 //  realloc_vector.cpp
 //  OpenGraphCxx
 
-#include <OpenGraphCxx/Util/realloc_vector.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Vector/realloc_vector.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #if OG_TARGET_OS_DARWIN
 #include <malloc/malloc.h>
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Attribute/AttributeID.hpp
@@ -7,7 +7,7 @@
 
 #include <OpenGraph/OGBase.h>
 #include <OpenGraph/OGAttribute.h>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 namespace OG {
 class AttributeID final {
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/assert.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/assert.hpp
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/env.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/env.hpp
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/log.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Misc/log.hpp
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/realloc_vector.hpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/realloc_vector.hpp
diff --git a/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.tpp b/Sources/OpenGraphCxx/include/OpenGraphCxx/Vector/vector.tpp
@@ -6,7 +6,7 @@
 //  Modified based Compute code
 
 #include <OpenGraphCxx/Vector/vector.hpp>
-#include <OpenGraphCxx/Util/assert.hpp>
+#include <OpenGraphCxx/Misc/assert.hpp>
 
 #include <algorithm>
 #if OG_TARGET_OS_DARWIN
diff --git a/Sources/OpenGraphCxx/include/module.private.modulemap b/Sources/OpenGraphCxx/include/module.private.modulemap
@@ -8,14 +8,44 @@ module OpenGraphCxx_Private.Attribute {
     export *
 }
 
+module OpenGraphCxx_Private.Comparison {
+    requires cplusplus
+    umbrella "OpenGraphCxx/Comparison"
+    export *
+}
+
 module OpenGraphCxx_Private.Data {
     requires cplusplus
     umbrella "OpenGraphCxx/Data"
     export *
 }
 
-module OpenGraphCxx_Private.Comparison {
+module OpenGraphCxx_Private.DebugServer {
     requires cplusplus
-    umbrella "OpenGraphCxx/Comparison"
+    umbrella "OpenGraphCxx/DebugServer"
+    export *
+}
+
+module OpenGraphCxx_Private.Graph {
+    requires cplusplus
+    umbrella "OpenGraphCxx/Graph"
+    export *
+}
+
+module OpenGraphCxx_Private.Misc {
+    requires cplusplus
+    umbrella "OpenGraphCxx/Misc"
+    export *
+}
+
+module OpenGraphCxx_Private.Runtime {
+    requires cplusplus
+    umbrella "OpenGraphCxx/Runtime"
+    export *
+}
+
+module OpenGraphCxx_Private.Vector {
+    requires cplusplus
+    umbrella "OpenGraphCxx/Vector"
     export *
 }
diff --git a/Tests/OpenGraphCxxTests/Data/PageTests.swift b/Tests/OpenGraphCxxTests/Data/PageTests.swift
@@ -2,10 +2,10 @@
 //  PageTests.swift
 //  OpenGraphCxxTests
 
-import OpenGraphCxx_Private
+#if canImport(Darwin)
+import OpenGraphCxx_Private.Data
 import Testing
 
-#if canImport(Darwin) // table() is not implemented on Linux yet.
 struct PageTests {
 
 }
diff --git a/Tests/OpenGraphCxxTests/Data/TableTests.swift b/Tests/OpenGraphCxxTests/Data/TableTests.swift
@@ -3,7 +3,7 @@
 //  OpenGraphCxxTests
 
 #if canImport(Darwin) // table() is not implemented on Linux yet.
-import OpenGraphCxx_Private
+import OpenGraphCxx_Private.Data
 import Testing
 
 struct TableTests {
diff --git a/Tests/OpenGraphCxxTests/Data/ZoneTests.swift b/Tests/OpenGraphCxxTests/Data/ZoneTests.swift
@@ -3,7 +3,7 @@
 //  OpenGraphCxxTests
 
 #if canImport(Darwin)
-import OpenGraphCxx_Private
+import OpenGraphCxx_Private.Data
 import Testing
 
 struct ZoneTests {
