Merge pull request #176 from azriel91/feature/157/id-newtype-macro-us…

…e-qualified-path

CHANGELOG.md

@@ -3,10 +3,16 @@
 ## unreleased
 
 * Provide more accurate feedback about interruption on CLI. ([#172], [#173])
+* Remove requirement to import `peace::cfg::AppName` when using `app_name!("..")` macro. ([#157], [#176])
+* Remove requirement to import `peace::cfg::FlowId` when using `flow_id!("..")` macro. ([#157], [#176])
+* Remove requirement to import `peace::cfg::ItemId` when using `item_id!("..")` macro. ([#157], [#176])
+* Remove requirement to import `peace::cfg::Profile` when using `profile!("..")` macro. ([#157], [#176])
 
 
 [#172]: https://github.com/azriel91/peace/issues/172
 [#173]: https://github.com/azriel91/peace/pull/173
+[#157]: https://github.com/azriel91/peace/issues/157
+[#176]: https://github.com/azriel91/peace/pull/176
 
 
 ## 0.0.12 (2023-12-30)

crate/static_check_macros/src/lib.rs

@@ -182,7 +182,7 @@ fn ensure_valid_id(
     if let Some(proposed_id) = proposed_id {
         if is_valid_id(proposed_id) {
             let ty_name = Ident::new(ty_name, Span::call_site());
-            quote!( #ty_name ::new_unchecked( #proposed_id ))
+            quote!( peace::cfg:: #ty_name ::new_unchecked( #proposed_id ))
         } else {
             let message = format!(
                 "\"{proposed_id}\" is not a valid `{ty_name}`.\n\
@@ -232,7 +232,10 @@ mod tests {
             None,
         );
 
-        assert_eq!(r#"Ty :: new_unchecked ("_")"#, tokens.to_string());
+        assert_eq!(
+            r#"peace :: cfg :: Ty :: new_unchecked ("_")"#,
+            tokens.to_string()
+        );
     }
 
     #[test]
@@ -242,15 +245,21 @@ mod tests {
             "Ty",
             None,
         );
-        assert_eq!(r#"Ty :: new_unchecked ("a")"#, tokens.to_string());
+        assert_eq!(
+            r#"peace :: cfg :: Ty :: new_unchecked ("a")"#,
+            tokens.to_string()
+        );
 
         let tokens = ensure_valid_id(
             &LitStrMaybe(Some(LitStr::new("A", Span::call_site()))),
             "Ty",
             None,
         );
 
-        assert_eq!(r#"Ty :: new_unchecked ("A")"#, tokens.to_string());
+        assert_eq!(
+            r#"peace :: cfg :: Ty :: new_unchecked ("A")"#,
+            tokens.to_string()
+        );
     }
 
     #[test]

examples/download/src/lib.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, item_id, AppName, FlowId, ItemId, Profile},
+    cfg::{app_name, item_id, FlowId, ItemId, Profile},
     cmd::{ctx::CmdCtx, scopes::SingleProfileSingleFlow},
     cmd_model::CmdOutcome,
     resources::resources::ts::SetUp,

examples/download/src/main.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use peace::{
-    cfg::{flow_id, profile, FlowId, Profile},
+    cfg::{flow_id, profile},
     rt_model::{output::CliOutput, WorkspaceSpec},
 };
 use peace_items::file_download::FileDownloadParams;

examples/download/src/wasm.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{flow_id, profile, FlowId, Profile},
+    cfg::{flow_id, profile},
     rt_model::{InMemoryTextOutput, WorkspaceSpec},
 };
 use peace_items::file_download::{FileDownloadParams, StorageForm};

examples/envman/src/cmds/app_upload_cmd.rs

@@ -1,6 +1,6 @@
 use futures::future::LocalBoxFuture;
 use peace::{
-    cfg::{app_name, item_id, AppName, ItemId, Profile},
+    cfg::{app_name, item_id, Profile},
     cmd::{
         ctx::CmdCtx,
         scopes::{

examples/envman/src/cmds/common.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, AppName},
+    cfg::app_name,
     cmd::ctx::CmdCtx,
     rt_model::{output::OutputWrite, Workspace, WorkspaceSpec},
 };

examples/envman/src/cmds/env_cmd.rs

@@ -1,6 +1,6 @@
 use futures::future::LocalBoxFuture;
 use peace::{
-    cfg::{app_name, item_id, state::Generated, AppName, ItemId, Profile},
+    cfg::{app_name, item_id, state::Generated, Profile},
     cmd::{
         ctx::CmdCtx,
         scopes::{

examples/envman/src/cmds/profile_init_cmd.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, item_id, AppName, ItemId, Profile},
+    cfg::{app_name, item_id, Profile},
     cmd::{
         ctx::CmdCtx,
         scopes::{

examples/envman/src/cmds/profile_list_cmd.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, AppName},
+    cfg::app_name,
     cmd::{ctx::CmdCtx, scopes::MultiProfileNoFlowView},
     fmt::presentable::{Heading, HeadingLevel},
     rt_model::{output::OutputWrite, Workspace, WorkspaceSpec},

examples/envman/src/cmds/profile_show_cmd.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, AppName, Profile},
+    cfg::{app_name, Profile},
     cmd::{ctx::CmdCtx, scopes::SingleProfileNoFlowView},
     fmt::presentln,
     rt_model::{output::OutputWrite, Workspace, WorkspaceSpec},

examples/envman/src/cmds/profile_switch_cmd.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, AppName},
+    cfg::app_name,
     cmd::{ctx::CmdCtx, scopes::MultiProfileNoFlowView},
     rt_model::output::OutputWrite,
 };

examples/envman/src/flows/app_upload_flow.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use peace::{
-    cfg::{app_name, flow_id, item_id, AppName, FlowId, ItemId, Profile},
+    cfg::{app_name, flow_id, item_id, Profile},
     params::{Params, ParamsSpec},
     rt_model::{Flow, ItemGraphBuilder},
 };

examples/envman/src/flows/env_deploy_flow.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use peace::{
-    cfg::{app_name, flow_id, item_id, state::Generated, AppName, FlowId, ItemId, Profile},
+    cfg::{app_name, flow_id, item_id, state::Generated, Profile},
     params::{Params, ParamsSpec},
     rt_model::{Flow, ItemGraphBuilder},
 };

workspace_tests/src/cfg/progress/progress_sender.rs

@@ -5,7 +5,6 @@ use peace::{
             CmdProgressUpdate, ProgressDelta, ProgressMsgUpdate, ProgressSender,
             ProgressUpdateAndId,
         },
-        ItemId,
     },
     rt_model::ProgressUpdate,
 };

workspace_tests/src/cfg/progress/progress_update_and_id.rs

@@ -4,7 +4,6 @@ use peace::cfg::{
         ProgressComplete, ProgressDelta, ProgressLimit, ProgressMsgUpdate, ProgressUpdate,
         ProgressUpdateAndId,
     },
-    ItemId,
 };
 
 #[test]

workspace_tests/src/cmd/ctx/cmd_ctx.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, flow_id, profile, AppName, FlowId, Profile},
+    cfg::{app_name, flow_id, profile, AppName},
     cmd::ctx::CmdCtxBuilder,
     rt_model::{Flow, ItemGraphBuilder, Workspace},
 };

workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_no_flow_builder.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use peace::{
-    cfg::{app_name, profile, AppName, Profile, ProfileInvalidFmt},
+    cfg::{app_name, profile, Profile, ProfileInvalidFmt},
     cmd::ctx::CmdCtx,
     resources::paths::{ProfileDir, ProfileHistoryDir},
     rt_model::{params::ParamsTypeRegs, Error as PeaceRtError, NativeError},

workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_single_flow_builder.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use peace::{
-    cfg::{app_name, flow_id, profile, AppName, FlowId, Profile},
+    cfg::{app_name, flow_id, profile},
     cmd::ctx::CmdCtx,
     resources::paths::{FlowDir, ProfileDir, ProfileHistoryDir},
     rt_model::{params::ParamsTypeRegs, Flow, ItemGraphBuilder, ParamsSpecsTypeReg, StatesTypeReg},

workspace_tests/src/cmd/ctx/cmd_ctx_builder/no_profile_no_flow_builder.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, profile, AppName, Profile},
+    cfg::{app_name, profile},
     cmd::ctx::CmdCtx,
 };
 

workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_no_flow_builder.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, profile, AppName, Profile},
+    cfg::{app_name, profile},
     cmd::ctx::CmdCtx,
     resources::paths::{ProfileDir, ProfileHistoryDir},
 };

workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_single_flow_builder.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, flow_id, item_id, profile, AppName, FlowId, Item, ItemId, Profile},
+    cfg::{app_name, flow_id, item_id, profile, Item, Profile},
     cmd::ctx::CmdCtx,
     params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
     resources::{

workspace_tests/src/cmd_model/cmd_block_outcome.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     cmd_model::{CmdBlockOutcome, StreamOutcomeAndErrors, ValueAndStreamOutcome},
     rt_model::{fn_graph::StreamOutcome, IndexMap},
 };

workspace_tests/src/cmd_model/item_stream_outcome.rs

@@ -1,8 +1,4 @@
-use peace::{
-    cfg::{item_id, ItemId},
-    cmd_model::ItemStreamOutcome,
-    rt_model::fn_graph::StreamOutcomeState,
-};
+use peace::{cfg::item_id, cmd_model::ItemStreamOutcome, rt_model::fn_graph::StreamOutcomeState};
 
 #[test]
 fn map() {

workspace_tests/src/cmd_rt/cmd_execution.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, profile, AppName, FlowId, Profile},
+    cfg::{app_name, profile, FlowId},
     cmd::ctx::CmdCtx,
     cmd_model::CmdOutcome,
     cmd_rt::{CmdBlockRt, CmdBlockWrapper, CmdExecution},

workspace_tests/src/cmd_rt/cmd_execution/cmd_execution_error_builder.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, profile, AppName, FlowId, Profile},
+    cfg::{app_name, profile, FlowId},
     cmd::ctx::CmdCtx,
     cmd_model::CmdExecutionError,
     cmd_rt::{CmdBlockWrapper, CmdExecution},

workspace_tests/src/items/sh_cmd_item.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{app_name, item_id, profile, AppName, FlowId, ItemId, Profile, State},
+    cfg::{app_name, item_id, profile, FlowId, ItemId, State},
     cmd::ctx::CmdCtx,
     cmd_model::CmdOutcome,
     data::marker::Clean,

workspace_tests/src/items/tar_x_item.rs

@@ -1,7 +1,7 @@
 use std::{io::Cursor, path::PathBuf};
 
 use peace::{
-    cfg::{app_name, item_id, profile, AppName, ApplyCheck, FlowId, Item, ItemId, Profile},
+    cfg::{app_name, item_id, profile, ApplyCheck, FlowId, Item, ItemId, Profile},
     cmd::{ctx::CmdCtx, scopes::SingleProfileSingleFlowView},
     cmd_model::CmdOutcome,
     data::Data,

workspace_tests/src/params/derive.rs

@@ -70,7 +70,7 @@ mod struct_params {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };
@@ -269,7 +269,7 @@ mod struct_with_type_params {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };
@@ -489,7 +489,7 @@ mod tuple_params {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };
@@ -665,7 +665,7 @@ mod tuple_with_type_params {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };
@@ -866,7 +866,7 @@ mod enum_params {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };
@@ -1499,7 +1499,7 @@ mod struct_recursive_value {
     use serde::{Deserialize, Serialize};
 
     use peace::{
-        cfg::{item_id, ItemId},
+        cfg::item_id,
         params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec},
         resources::{resources::ts::SetUp, Resources},
     };

workspace_tests/src/params/mapping_fn_impl.rs

@@ -41,7 +41,7 @@ macro_rules! mapping_tests {
         mod $module_name {
             use peace::{
                 data::marker::$value_resolution_mode,
-                cfg::{item_id, ItemId},
+                cfg::{item_id},
                 params::{
                     MappingFn, MappingFnImpl, ParamsResolveError,
                     ValueResolutionCtx, ValueResolutionMode,

workspace_tests/src/params/params_spec.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     params::{
         AnySpecRt, AnySpecRtBoxed, FieldNameAndType, FieldWiseSpecRt, Params, ParamsResolveError,
         ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec, ValueSpecRt,

workspace_tests/src/params/params_spec_fieldless.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     params::{
         AnySpecRt, AnySpecRtBoxed, ParamsFieldless, ParamsResolveError, ParamsSpecFieldless,
         ValueResolutionCtx, ValueResolutionMode, ValueSpecRt,

workspace_tests/src/params/params_specs.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     params::{ParamsSpec, ParamsSpecs},
 };
 

workspace_tests/src/params/value_resolution_ctx.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     params::{FieldNameAndType, ValueResolutionCtx, ValueResolutionMode},
 };
 

workspace_tests/src/params/value_spec.rs

@@ -1,5 +1,5 @@
 use peace::{
-    cfg::{item_id, ItemId},
+    cfg::item_id,
     params::{
         AnySpecRt, AnySpecRtBoxed, ParamsResolveError, ValueResolutionCtx, ValueResolutionMode,
         ValueSpec, ValueSpecRt,

workspace_tests/src/resources/dir/profile_dir.rs

@@ -1,7 +1,7 @@
 use std::{ffi::OsStr, path::Path};
 
 use peace::{
-    cfg::{app_name, profile, AppName, Profile},
+    cfg::{app_name, profile},
     resources::paths::{PeaceAppDir, PeaceDir, ProfileDir},
 };
 

workspace_tests/src/resources/dir/profile_history_dir.rs

@@ -1,7 +1,7 @@
 use std::{ffi::OsStr, path::Path};
 
 use peace::{
-    cfg::{app_name, profile, AppName, Profile},
+    cfg::{app_name, profile},
     resources::paths::{PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir},
 };
 

workspace_tests/src/resources/dir/states_current_file.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use peace::{
-    cfg::{app_name, flow_id, profile, AppName, FlowId, Profile},
+    cfg::{app_name, flow_id, profile},
     resources::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesCurrentFile},
 };
 

workspace_tests/src/resources/dir/states_goal_file.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use peace::{
-    cfg::{app_name, flow_id, profile, AppName, FlowId, Profile},
+    cfg::{app_name, flow_id, profile},
     resources::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesGoalFile},
 };