Integrate unfinished server-rs refactor worklists

server-rs/crates/module-assets/src/application.rs

@@ -1,8 +1,45 @@
-//! 资产应用编排落位。
+//! 资产应用编排返回类型。
 //!
 //! 这里只组合纯校验与应用结果；对象探测、签名和持久化由 adapter 层完成。
 
-pub use crate::asset_object_core::{
-    AssetEntityBindingProcedureResult, AssetHistoryListResult, AssetObjectProcedureResult,
-    ConfirmAssetObjectResult, build_asset_entity_binding_input, build_asset_object_upsert_input,
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "spacetime-types")]
+use spacetimedb::SpacetimeType;
+
+use crate::domain::{
+    AssetEntityBindingSnapshot, AssetHistoryEntrySnapshot, AssetObjectRecord,
+    AssetObjectUpsertSnapshot,
+};
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetObjectProcedureResult {
+    pub ok: bool,
+    pub record: Option<AssetObjectUpsertSnapshot>,
+    pub error_message: Option<String>,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetHistoryListResult {
+    pub ok: bool,
+    pub entries: Vec<AssetHistoryEntrySnapshot>,
+    pub error_message: Option<String>,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetEntityBindingProcedureResult {
+    pub ok: bool,
+    pub record: Option<AssetEntityBindingSnapshot>,
+    pub error_message: Option<String>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ConfirmAssetObjectResult {
+    pub record: AssetObjectRecord,
+}
+
+pub use crate::asset_object_core::{
+    build_asset_entity_binding_input, build_asset_object_upsert_input,
 };

server-rs/crates/module-assets/src/asset_object_core.rs

@@ -1,223 +1,18 @@
-use std::{error::Error, fmt};
-
-use serde::{Deserialize, Serialize};
 use shared_kernel::{
     build_prefixed_seed_id, format_timestamp_micros, normalize_optional_string,
     normalize_required_string,
 };
-#[cfg(feature = "spacetime-types")]
-use spacetimedb::SpacetimeType;
 
-pub const ASSET_OBJECT_ID_PREFIX: &str = "assetobj_";
-pub const ASSET_BINDING_ID_PREFIX: &str = "assetbind_";
-pub const INITIAL_ASSET_OBJECT_VERSION: u32 = 1;
-
-// 资产对象访问策略先冻结为枚举，避免后续在 reducer、HTTP DTO 和脚本里散落字符串字面量。
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AssetObjectAccessPolicy {
-    Private,
-    PublicRead,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum AssetObjectFieldError {
-    MissingBucket,
-    MissingObjectKey,
-    MissingAssetKind,
-    MissingAssetObjectId,
-    MissingBindingId,
-    MissingEntityKind,
-    MissingEntityId,
-    MissingSlot,
-    InvalidVersion,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ConfirmAssetObjectInput {
-    pub bucket: Option<String>,
-    pub object_key: String,
-    pub content_type: Option<String>,
-    pub content_length: Option<u64>,
-    pub content_hash: Option<String>,
-    pub asset_kind: String,
-    pub access_policy: Option<AssetObjectAccessPolicy>,
-    pub source_job_id: Option<String>,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetObjectProcedureResult {
-    pub ok: bool,
-    pub record: Option<AssetObjectUpsertSnapshot>,
-    pub error_message: Option<String>,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetHistoryListInput {
-    pub asset_kind: String,
-    pub limit: u32,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetHistoryEntrySnapshot {
-    pub asset_object_id: String,
-    pub asset_kind: String,
-    pub image_src: String,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-    pub created_at_micros: i64,
-    pub updated_at_micros: i64,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetHistoryListResult {
-    pub ok: bool,
-    pub entries: Vec<AssetHistoryEntrySnapshot>,
-    pub error_message: Option<String>,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetEntityBindingProcedureResult {
-    pub ok: bool,
-    pub record: Option<AssetEntityBindingSnapshot>,
-    pub error_message: Option<String>,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetObjectUpsertInput {
-    pub asset_object_id: String,
-    pub bucket: String,
-    pub object_key: String,
-    pub access_policy: AssetObjectAccessPolicy,
-    pub content_type: Option<String>,
-    pub content_length: u64,
-    pub content_hash: Option<String>,
-    pub version: u32,
-    pub source_job_id: Option<String>,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-    pub asset_kind: String,
-    pub updated_at_micros: i64,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetObjectUpsertSnapshot {
-    pub asset_object_id: String,
-    pub bucket: String,
-    pub object_key: String,
-    pub access_policy: AssetObjectAccessPolicy,
-    pub content_type: Option<String>,
-    pub content_length: u64,
-    pub content_hash: Option<String>,
-    pub version: u32,
-    pub source_job_id: Option<String>,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-    pub asset_kind: String,
-    pub created_at_micros: i64,
-    pub updated_at_micros: i64,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetEntityBindingInput {
-    pub binding_id: String,
-    pub asset_object_id: String,
-    pub entity_kind: String,
-    pub entity_id: String,
-    pub slot: String,
-    pub asset_kind: String,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub updated_at_micros: i64,
-}
-
-#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AssetEntityBindingSnapshot {
-    pub binding_id: String,
-    pub asset_object_id: String,
-    pub entity_kind: String,
-    pub entity_id: String,
-    pub slot: String,
-    pub asset_kind: String,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub created_at_micros: i64,
-    pub updated_at_micros: i64,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct AssetObjectRecord {
-    pub asset_object_id: String,
-    pub bucket: String,
-    pub object_key: String,
-    pub access_policy: AssetObjectAccessPolicy,
-    pub content_type: Option<String>,
-    pub content_length: u64,
-    pub content_hash: Option<String>,
-    pub version: u32,
-    pub source_job_id: Option<String>,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-    pub asset_kind: String,
-    pub created_at: String,
-    pub updated_at: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct AssetHistoryEntryRecord {
-    pub asset_object_id: String,
-    pub asset_kind: String,
-    pub image_src: String,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub entity_id: Option<String>,
-    pub created_at: String,
-    pub updated_at: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ConfirmAssetObjectResult {
-    pub record: AssetObjectRecord,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct AssetEntityBindingRecord {
-    pub binding_id: String,
-    pub asset_object_id: String,
-    pub entity_kind: String,
-    pub entity_id: String,
-    pub slot: String,
-    pub asset_kind: String,
-    pub owner_user_id: Option<String>,
-    pub profile_id: Option<String>,
-    pub created_at: String,
-    pub updated_at: String,
-}
-
-impl AssetObjectAccessPolicy {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::Private => "private",
-            Self::PublicRead => "public_read",
-        }
-    }
-}
+use crate::{
+    commands::{AssetEntityBindingInput, AssetObjectUpsertInput},
+    domain::{
+        ASSET_BINDING_ID_PREFIX, ASSET_OBJECT_ID_PREFIX, AssetEntityBindingRecord,
+        AssetEntityBindingSnapshot, AssetHistoryEntryRecord, AssetHistoryEntrySnapshot,
+        AssetObjectAccessPolicy, AssetObjectRecord, AssetObjectUpsertSnapshot,
+        INITIAL_ASSET_OBJECT_VERSION,
+    },
+    errors::AssetObjectFieldError,
+};
 
 // 资产核心对象字段需要继续保留模块自己的错误语义，但基础必填字符串归一化统一走 shared-kernel。
 fn normalize_required_asset_field(
@@ -420,24 +215,6 @@ pub fn normalize_optional_value(value: Option<String>) -> Option<String> {
     normalize_optional_string(value)
 }
 
-impl fmt::Display for AssetObjectFieldError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::MissingBucket => f.write_str("asset_object.bucket 不能为空"),
-            Self::MissingObjectKey => f.write_str("asset_object.object_key 不能为空"),
-            Self::MissingAssetKind => f.write_str("asset_object.asset_kind 不能为空"),
-            Self::MissingAssetObjectId => f.write_str("asset_object.asset_object_id 不能为空"),
-            Self::MissingBindingId => f.write_str("asset_entity_binding.binding_id 不能为空"),
-            Self::MissingEntityKind => f.write_str("asset_entity_binding.entity_kind 不能为空"),
-            Self::MissingEntityId => f.write_str("asset_entity_binding.entity_id 不能为空"),
-            Self::MissingSlot => f.write_str("asset_entity_binding.slot 不能为空"),
-            Self::InvalidVersion => f.write_str("asset_object.version 必须大于 0"),
-        }
-    }
-}
-
-impl Error for AssetObjectFieldError {}
-
 #[cfg(test)]
 mod tests {
     use super::*;

server-rs/crates/module-assets/src/commands.rs

@@ -1,7 +1,105 @@
-//! 资产写入命令落位。
+//! 资产写入命令。
 //!
 //! 用于表达确认资产对象、绑定实体槽位和查询资产历史的输入，不直接访问 OSS。
 
-pub use crate::asset_object_core::{
-    AssetEntityBindingInput, AssetHistoryListInput, AssetObjectUpsertInput, ConfirmAssetObjectInput,
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "spacetime-types")]
+use spacetimedb::SpacetimeType;
+
+use crate::domain::{
+    AssetEntityBindingSnapshot, AssetObjectAccessPolicy, AssetObjectUpsertSnapshot,
 };
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ConfirmAssetObjectInput {
+    pub bucket: Option<String>,
+    pub object_key: String,
+    pub content_type: Option<String>,
+    pub content_length: Option<u64>,
+    pub content_hash: Option<String>,
+    pub asset_kind: String,
+    pub access_policy: Option<AssetObjectAccessPolicy>,
+    pub source_job_id: Option<String>,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetHistoryListInput {
+    pub asset_kind: String,
+    pub limit: u32,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetObjectUpsertInput {
+    pub asset_object_id: String,
+    pub bucket: String,
+    pub object_key: String,
+    pub access_policy: AssetObjectAccessPolicy,
+    pub content_type: Option<String>,
+    pub content_length: u64,
+    pub content_hash: Option<String>,
+    pub version: u32,
+    pub source_job_id: Option<String>,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub asset_kind: String,
+    pub updated_at_micros: i64,
+}
+
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetEntityBindingInput {
+    pub binding_id: String,
+    pub asset_object_id: String,
+    pub entity_kind: String,
+    pub entity_id: String,
+    pub slot: String,
+    pub asset_kind: String,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub updated_at_micros: i64,
+}
+
+impl From<AssetObjectUpsertInput> for AssetObjectUpsertSnapshot {
+    fn from(value: AssetObjectUpsertInput) -> Self {
+        Self {
+            asset_object_id: value.asset_object_id,
+            bucket: value.bucket,
+            object_key: value.object_key,
+            access_policy: value.access_policy,
+            content_type: value.content_type,
+            content_length: value.content_length,
+            content_hash: value.content_hash,
+            version: value.version,
+            source_job_id: value.source_job_id,
+            owner_user_id: value.owner_user_id,
+            profile_id: value.profile_id,
+            entity_id: value.entity_id,
+            asset_kind: value.asset_kind,
+            created_at_micros: value.updated_at_micros,
+            updated_at_micros: value.updated_at_micros,
+        }
+    }
+}
+
+impl From<AssetEntityBindingInput> for AssetEntityBindingSnapshot {
+    fn from(value: AssetEntityBindingInput) -> Self {
+        Self {
+            binding_id: value.binding_id,
+            asset_object_id: value.asset_object_id,
+            entity_kind: value.entity_kind,
+            entity_id: value.entity_id,
+            slot: value.slot,
+            asset_kind: value.asset_kind,
+            owner_user_id: value.owner_user_id,
+            profile_id: value.profile_id,
+            created_at_micros: value.updated_at_micros,
+            updated_at_micros: value.updated_at_micros,
+        }
+    }
+}

server-rs/crates/module-assets/src/domain.rs

@@ -1,15 +1,128 @@
-//! 资产领域模型落位。
+//! 资产领域模型。
 //!
-//! 当前先通过本文件承接对外领域 API 分层导出，旧实现仍留在
-//! `asset_object_core.rs` 内部文件中，后续再逐段搬入本文件或 `domain/` 子目录。
-//! 本层只允许保留资产对象、实体绑定、访问策略、版本和业务归属等纯规则。
+//! 本层只保留资产对象、实体绑定、访问策略、版本和业务归属等纯领域事实。
+//! OSS 对象探测、HTTP DTO 映射和 SpacetimeDB row 写入都属于外层 adapter。
 
-pub use crate::asset_object_core::{
-    ASSET_BINDING_ID_PREFIX, ASSET_OBJECT_ID_PREFIX, AssetEntityBindingRecord,
-    AssetEntityBindingSnapshot, AssetHistoryEntryRecord, AssetHistoryEntrySnapshot,
-    AssetObjectAccessPolicy, AssetObjectRecord, AssetObjectUpsertSnapshot,
-    INITIAL_ASSET_OBJECT_VERSION, build_asset_entity_binding_record,
-    build_asset_history_entry_record, build_asset_object_record, generate_asset_binding_id,
-    generate_asset_object_id, normalize_optional_value, validate_asset_entity_binding_fields,
-    validate_asset_object_fields,
-};
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "spacetime-types")]
+use spacetimedb::SpacetimeType;
+
+pub const ASSET_OBJECT_ID_PREFIX: &str = "assetobj_";
+pub const ASSET_BINDING_ID_PREFIX: &str = "assetbind_";
+pub const INITIAL_ASSET_OBJECT_VERSION: u32 = 1;
+
+// 资产对象访问策略先冻结为枚举，避免 reducer、HTTP DTO 和脚本里散落字符串字面量。
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AssetObjectAccessPolicy {
+    Private,
+    PublicRead,
+}
+
+impl AssetObjectAccessPolicy {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Private => "private",
+            Self::PublicRead => "public_read",
+        }
+    }
+}
+
+/// SpacetimeDB 写入前的资产对象快照。
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetObjectUpsertSnapshot {
+    pub asset_object_id: String,
+    pub bucket: String,
+    pub object_key: String,
+    pub access_policy: AssetObjectAccessPolicy,
+    pub content_type: Option<String>,
+    pub content_length: u64,
+    pub content_hash: Option<String>,
+    pub version: u32,
+    pub source_job_id: Option<String>,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub asset_kind: String,
+    pub created_at_micros: i64,
+    pub updated_at_micros: i64,
+}
+
+/// 资产历史列表的领域快照。
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetHistoryEntrySnapshot {
+    pub asset_object_id: String,
+    pub asset_kind: String,
+    pub image_src: String,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub created_at_micros: i64,
+    pub updated_at_micros: i64,
+}
+
+/// 业务实体与资产对象的绑定快照。
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct AssetEntityBindingSnapshot {
+    pub binding_id: String,
+    pub asset_object_id: String,
+    pub entity_kind: String,
+    pub entity_id: String,
+    pub slot: String,
+    pub asset_kind: String,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub created_at_micros: i64,
+    pub updated_at_micros: i64,
+}
+
+/// 面向 API 与前端展示的资产对象记录。
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AssetObjectRecord {
+    pub asset_object_id: String,
+    pub bucket: String,
+    pub object_key: String,
+    pub access_policy: AssetObjectAccessPolicy,
+    pub content_type: Option<String>,
+    pub content_length: u64,
+    pub content_hash: Option<String>,
+    pub version: u32,
+    pub source_job_id: Option<String>,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub asset_kind: String,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+/// 面向 API 与前端展示的资产历史记录。
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AssetHistoryEntryRecord {
+    pub asset_object_id: String,
+    pub asset_kind: String,
+    pub image_src: String,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+/// 面向 API 与前端展示的实体绑定记录。
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AssetEntityBindingRecord {
+    pub binding_id: String,
+    pub asset_object_id: String,
+    pub entity_kind: String,
+    pub entity_id: String,
+    pub slot: String,
+    pub asset_kind: String,
+    pub owner_user_id: Option<String>,
+    pub profile_id: Option<String>,
+    pub created_at: String,
+    pub updated_at: String,
+}

server-rs/crates/module-assets/src/errors.rs

@@ -1,5 +1,36 @@
-//! 资产领域错误落位。
+//! 资产领域错误。
 //!
 //! 字段错误和业务错误在这里收口，HTTP 状态码与 SpacetimeDB 字符串错误由 adapter 映射。
 
-pub use crate::asset_object_core::AssetObjectFieldError;
+use std::{error::Error, fmt};
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum AssetObjectFieldError {
+    MissingBucket,
+    MissingObjectKey,
+    MissingAssetKind,
+    MissingAssetObjectId,
+    MissingBindingId,
+    MissingEntityKind,
+    MissingEntityId,
+    MissingSlot,
+    InvalidVersion,
+}
+
+impl fmt::Display for AssetObjectFieldError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::MissingBucket => f.write_str("asset_object.bucket 不能为空"),
+            Self::MissingObjectKey => f.write_str("asset_object.object_key 不能为空"),
+            Self::MissingAssetKind => f.write_str("asset_object.asset_kind 不能为空"),
+            Self::MissingAssetObjectId => f.write_str("asset_object.asset_object_id 不能为空"),
+            Self::MissingBindingId => f.write_str("asset_entity_binding.binding_id 不能为空"),
+            Self::MissingEntityKind => f.write_str("asset_entity_binding.entity_kind 不能为空"),
+            Self::MissingEntityId => f.write_str("asset_entity_binding.entity_id 不能为空"),
+            Self::MissingSlot => f.write_str("asset_entity_binding.slot 不能为空"),
+            Self::InvalidVersion => f.write_str("asset_object.version 必须大于 0"),
+        }
+    }
+}
+
+impl Error for AssetObjectFieldError {}

server-rs/crates/module-assets/src/lib.rs

@@ -23,9 +23,12 @@ pub use domain::{
     ASSET_BINDING_ID_PREFIX, ASSET_OBJECT_ID_PREFIX, AssetEntityBindingRecord,
     AssetEntityBindingSnapshot, AssetHistoryEntryRecord, AssetHistoryEntrySnapshot,
     AssetObjectAccessPolicy, AssetObjectRecord, AssetObjectUpsertSnapshot,
-    INITIAL_ASSET_OBJECT_VERSION, build_asset_entity_binding_record,
-    build_asset_history_entry_record, build_asset_object_record, generate_asset_binding_id,
-    generate_asset_object_id, normalize_optional_value, validate_asset_entity_binding_fields,
-    validate_asset_object_fields,
+    INITIAL_ASSET_OBJECT_VERSION,
 };
 pub use errors::AssetObjectFieldError;
+
+pub use asset_object_core::{
+    build_asset_entity_binding_record, build_asset_history_entry_record, build_asset_object_record,
+    generate_asset_binding_id, generate_asset_object_id, normalize_optional_value,
+    validate_asset_entity_binding_fields, validate_asset_object_fields,
+};