Skip to content

Commit 8e0ffd2

Browse files
KeavonKeavon
committed
Move nodes from logic.rs to text/src/lib.rs
1 parent f71278f commit 8e0ffd2

File tree

13 files changed

+986
-987
lines changed

13 files changed

+986
-987
lines changed

‎Cargo.lock‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
15111511
NodeInput::import(concrete!(bool), 3),
15121512
NodeInput::import(concrete!(bool), 4),
15131513
],
1514-
implementation: DocumentNodeImplementation::ProtoNode(logic::regex_find::IDENTIFIER),
1514+
implementation: DocumentNodeImplementation::ProtoNode(text_nodes::regex_find::IDENTIFIER),
15151515
..Default::default()
15161516
},
15171517
// Node 1: index_elements at index 0 — extracts the whole match as a String

‎editor/src/messages/portfolio/document/node_graph/node_properties.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ use graph_craft::{Type, concrete};
1616
use graphene_std::NodeInputDecleration;
1717
use graphene_std::animation::RealTimeMode;
1818
use graphene_std::extract_xy::XY;
19-
use graphene_std::logic::StringCapitalization;
2019
use graphene_std::raster::curve::Curve;
2120
use graphene_std::raster::{
2221
BlendMode, CellularDistanceFunction, CellularReturnType, Color, DomainWarpType, FractalType, LuminanceCalculation, NoiseType, RedGreenBlue, RedGreenBlueAlpha, RelativeAbsolute,
2322
SelectiveColorChoice,
2423
};
2524
use graphene_std::table::{Table, TableRow};
2625
use graphene_std::text::{Font, TextAlign};
26+
use graphene_std::text_nodes::StringCapitalization;
2727
use graphene_std::transform::{Footprint, ReferencePoint, ScaleType, Transform};
2828
use graphene_std::vector::QRCodeErrorCorrectionLevel;
2929
use graphene_std::vector::misc::BooleanOperation;
@@ -1590,7 +1590,7 @@ pub(crate) fn exposure_properties(node_id: NodeId, context: &mut NodePropertiesC
15901590
}
15911591

15921592
pub(crate) fn format_number_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
1593-
use graphene_std::logic::format_number::{DecimalPlacesInput, DecimalSeparatorInput, FixedDecimalsInput, StartAt10000Input, ThousandsSeparatorInput, UseThousandsSeparatorInput};
1593+
use graphene_std::text_nodes::format_number::{DecimalPlacesInput, DecimalSeparatorInput, FixedDecimalsInput, StartAt10000Input, ThousandsSeparatorInput, UseThousandsSeparatorInput};
15941594

15951595
// Read current values before borrowing context mutably for widgets
15961596
let (no_decimals, decimal_sep_value, use_thousands, thousands_sep_value) = match get_document_node(node_id, context) {
@@ -1674,13 +1674,13 @@ pub(crate) fn format_number_properties(node_id: NodeId, context: &mut NodeProper
16741674
}
16751675

16761676
pub(crate) fn string_capitalization_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
1677-
use graphene_std::logic::string_capitalization::*;
1677+
use graphene_std::text_nodes::string_capitalization::*;
16781678

16791679
// Read the current values before borrowing context mutably for widgets
16801680
let (is_simple_case, use_joiner_enabled, joiner_value) = match get_document_node(node_id, context) {
16811681
Ok(document_node) => {
16821682
let capitalization_input = document_node.inputs.get(CapitalizationInput::INDEX);
1683-
let capitalization_exposed = capitalization_input.map_or(false, |input| input.is_exposed());
1683+
let capitalization_exposed = capitalization_input.is_some_and(|input| input.is_exposed());
16841684
// When exposed, the capitalization mode may change dynamically, so we can't assume it's a simple (joiner-inapplicable) mode
16851685
let is_simple = !capitalization_exposed
16861686
&& matches!(

‎editor/src/messages/portfolio/document_migration.rs‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
110110
aliases: &["graphene_core::animation::RealTimeNode"],
111111
},
112112
NodeReplacement {
113-
node: graphene_std::logic::serialize::IDENTIFIER,
114-
aliases: &["graphene_core::logic::SerializeNode"],
113+
node: graphene_std::text_nodes::serialize::IDENTIFIER,
114+
aliases: &["graphene_core::logic::SerializeNode", "graphene_core::text::SerializeNode"],
115115
},
116116
NodeReplacement {
117117
node: graphene_std::debug::size_of::IDENTIFIER,
@@ -122,32 +122,36 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
122122
aliases: &["graphene_core::ops::SomeNode"],
123123
},
124124
NodeReplacement {
125-
node: graphene_std::logic::string_concatenate::IDENTIFIER,
126-
aliases: &["graphene_core::logic::StringConcatenateNode"],
125+
node: graphene_std::text_nodes::string_concatenate::IDENTIFIER,
126+
aliases: &["graphene_core::logic::StringConcatenateNode", "graphene_core::text::StringConcatenateNode"],
127127
},
128128
NodeReplacement {
129-
node: graphene_std::logic::string_length::IDENTIFIER,
130-
aliases: &["graphene_core::logic::StringLengthNode"],
129+
node: graphene_std::text_nodes::string_length::IDENTIFIER,
130+
aliases: &["graphene_core::logic::StringLengthNode", "graphene_core::text::StringLengthNode"],
131131
},
132132
NodeReplacement {
133-
node: graphene_std::logic::string_replace::IDENTIFIER,
134-
aliases: &["graphene_core::logic::StringReplaceNode"],
133+
node: graphene_std::text_nodes::string_replace::IDENTIFIER,
134+
aliases: &["graphene_core::logic::StringReplaceNode", "graphene_core::text::StringReplaceNode"],
135135
},
136136
NodeReplacement {
137-
node: graphene_std::logic::string_slice::IDENTIFIER,
138-
aliases: &["graphene_core::logic::StringSliceNode"],
137+
node: graphene_std::text_nodes::string_slice::IDENTIFIER,
138+
aliases: &["graphene_core::logic::StringSliceNode", "graphene_core::text::StringSliceNode"],
139139
},
140140
NodeReplacement {
141-
node: graphene_std::logic::string_split::IDENTIFIER,
142-
aliases: &["graphene_core::logic::StringSplitNode"],
141+
node: graphene_std::text_nodes::string_split::IDENTIFIER,
142+
aliases: &["graphene_core::logic::StringSplitNode", "graphene_core::text::StringSplitNode"],
143143
},
144144
NodeReplacement {
145145
node: graphene_std::math_nodes::switch::IDENTIFIER,
146146
aliases: &["graphene_core::logic::SwitchNode"],
147147
},
148148
NodeReplacement {
149-
node: graphene_std::logic::to_string::IDENTIFIER,
150-
aliases: &["graphene_core::logic::ToStringNode"],
149+
node: graphene_std::text_nodes::to_string::IDENTIFIER,
150+
aliases: &["graphene_core::logic::ToStringNode", "graphene_core::text::ToStringNode"],
151+
},
152+
NodeReplacement {
153+
node: graphene_std::text_nodes::json_get::IDENTIFIER,
154+
aliases: &["graphene_core::logic::JsonGetNode", "graphene_core::text::JsonGetNode"],
151155
},
152156
NodeReplacement {
153157
node: graphene_std::debug::unwrap_option::IDENTIFIER,
@@ -418,8 +422,8 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
418422
aliases: &["graphene_math_nodes::SineInverseNode", "graphene_core::ops::SineInverseNode"],
419423
},
420424
NodeReplacement {
421-
node: graphene_std::math_nodes::string_value::IDENTIFIER,
422-
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode"],
425+
node: graphene_std::text_nodes::string_value::IDENTIFIER,
426+
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode", "math_nodes::StringValueNode"],
423427
},
424428
NodeReplacement {
425429
node: graphene_std::math_nodes::subtract::IDENTIFIER,

‎node-graph/graph-craft/src/document/value.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ tagged_value! {
233233
LuminanceCalculation(raster_nodes::adjustments::LuminanceCalculation),
234234
QRCodeErrorCorrectionLevel(vector_nodes::generator_nodes::QRCodeErrorCorrectionLevel),
235235
XY(graphene_core::extract_xy::XY),
236-
StringCapitalization(graphene_core::logic::StringCapitalization),
236+
StringCapitalization(text_nodes::StringCapitalization),
237237
RedGreenBlue(raster_nodes::adjustments::RedGreenBlue),
238238
RedGreenBlueAlpha(raster_nodes::adjustments::RedGreenBlueAlpha),
239239
RealTimeMode(graphene_core::animation::RealTimeMode),

‎node-graph/interpreted-executor/src/node_registry.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
110110
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::blending::BlendMode]),
111111
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::raster::adjustments::LuminanceCalculation]),
112112
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::extract_xy::XY]),
113-
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::logic::StringCapitalization]),
113+
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::text_nodes::StringCapitalization]),
114114
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::raster::adjustments::RedGreenBlue]),
115115
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::raster::adjustments::RedGreenBlueAlpha]),
116116
async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::animation::RealTimeMode]),
@@ -193,7 +193,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
193193
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::raster::LuminanceCalculation]),
194194
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::vector::QRCodeErrorCorrectionLevel]),
195195
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::extract_xy::XY]),
196-
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::logic::StringCapitalization]),
196+
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::text_nodes::StringCapitalization]),
197197
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::raster::RedGreenBlue]),
198198
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::raster::RedGreenBlueAlpha]),
199199
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::animation::RealTimeMode]),

‎node-graph/nodes/gcore/Cargo.toml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ node-macro = { workspace = true }
2727
dyn-any = { workspace = true }
2828
glam = { workspace = true }
2929
log = { workspace = true }
30-
serde_json = { workspace = true }
31-
convert_case = { workspace = true }
32-
titlecase = { workspace = true }
33-
fancy-regex = { workspace = true }
34-
unicode-segmentation = { workspace = true }
3530

3631
# Optional workspace dependencies
3732
serde = { workspace = true, optional = true }

‎node-graph/nodes/gcore/src/lib.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ pub mod context;
33
pub mod context_modification;
44
pub mod debug;
55
pub mod extract_xy;
6-
pub mod logic;
76
pub mod memo;
87
pub mod ops;
9-
108
// Re-export all nodes
119
pub use animation::*;
1210
pub use context::*;
1311
pub use context_modification::*;
1412
pub use debug::*;
1513
pub use extract_xy::*;
16-
pub use logic::*;
1714
pub use memo::*;
1815
pub use ops::*;

0 commit comments

Comments
 (0)