dlin-cli 0.2.0b1__tar.gz → 0.2.0b2__tar.gz

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/Cargo.lock

@@ -231,7 +231,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "dlin"
-version = "0.2.0-beta.1"
+version = "0.2.0-beta.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -247,7 +247,7 @@ dependencies = [
 
 [[package]]
 name = "dlin-core"
-version = "0.2.0-beta.1"
+version = "0.2.0-beta.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -617,9 +617,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "polyglot-sql"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d58a3d9f8c43ce5549db154d456a8440eda074b888f1357ab775bc637a365e"
+checksum = "3e264f8907f3a2050232cd06503afb637525038ddd388a2c9e03424e336cd9c8"
 dependencies = [
  "serde",
  "serde_json",

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "3"
 
 [workspace.package]
-version = "0.2.0-beta.1"
+version = "0.2.0-beta.2"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/eitsupi/dlin"
@@ -23,7 +23,7 @@ indexmap = "2"
 minijinja = "2"
 rayon = "1"
 globset = "0.4"
-polyglot-sql = { version = "0.4.1", default-features = false, features = ["all-dialects", "semantic"] }
+polyglot-sql = { version = "0.4.2", default-features = false, features = ["all-dialects", "semantic"] }
 path-slash = "0.2.1"
 clap = { version = "4", features = ["derive", "env"] }
 libc = "0.2"
@@ -34,7 +34,7 @@ insta = "1"
 serial_test = "3.4.0"
 
 # internal
-dlin-core = { version = "0.2.0-beta.1", path = "crates/dlin-core" }
+dlin-core = { version = "0.2.0-beta.2", path = "crates/dlin-core" }
 
 [workspace.lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dlin-cli
-Version: 0.2.0b1
+Version: 0.2.0b2
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin/Cargo.toml

@@ -18,6 +18,7 @@ path = "src/main.rs"
 dlin-core = { workspace = true, features = ["clap", "column-lineage"] }
 clap = { workspace = true }
 anyhow = { workspace = true }
+regex = { workspace = true }
 serde_json = { workspace = true }
 path-slash = { workspace = true }
 polyglot-sql = { workspace = true }

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin/src/cli.rs

@@ -49,6 +49,8 @@ Examples:
   dlin graph orders -u 2 -d 1                      # orders with 2 upstream, 1 downstream
   dlin graph -o json --json-full                   # JSON with all fields
   dlin list -o json                                # List all node names as JSON
+  dlin list orders -o json --json-full             # Model details: path, description, columns, materialization
+  dlin list --search shipping                      # Search models by name or description (regex)
   dlin list orders stg_orders -o json              # List specific models as JSON
   dlin impact orders -o json                       # Downstream impact analysis
   dlin summary                                     # Project overview (node counts, etc.)
@@ -802,7 +804,9 @@ Output format (-o/--output):
                         conditional  CASE WHEN expression
                         unknown      could not classify
       sources[]
-        table         source model or raw table name
+        table         source model or raw table name; empty string (\"\") when the
+                      value originates from a literal (NULL, constant, UNNEST, etc.)
+                      — rendered as \"(literal)\" in plain/mermaid/dot outputs
         column        source column name
         model_path[]  intermediate [model, column, transformation] triples traversed (omitted if empty)
     errors[]    parse or resolution errors (non-empty → exit code 1)
@@ -1081,6 +1085,13 @@ Examples:
   # List models tagged 'finance'
   dlin list -s tag:finance
 
+  # Search models by name or description (regex, case-insensitive)
+  dlin list --search shipping
+  dlin list --search '^stg_'                     # models whose name starts with stg_
+  dlin list --search 'order|payment'             # OR: name/description contains either
+  dlin list --search staging --search customer   # AND: must match both patterns
+  dlin list --search shipping -o json --json-full
+
   # Count models (combine with standard tools)
   dlin list --node-type model | wc -l
 
@@ -1088,7 +1099,13 @@ Examples:
   dlin impact orders -o json | jq -r '.[].impacted_nodes[].unique_id' | dlin list -o json --json-fields unique_id,sql_content
 
   # List models from changed files
-  git diff --name-only main | dlin list -o json --json-fields unique_id,label"
+  git diff --name-only main | dlin list -o json --json-fields unique_id,label
+
+  # Find models that expose a specific column name (jq)
+  dlin list -o json --json-full | jq '.[] | select(any(.columns[]; . == \"order_id\"))'
+
+  # Find models whose column name partially matches (jq)
+  dlin list -o json --json-full | jq '.[] | select(any(.columns[]; contains(\"_amount\")))'  "
 )]
 pub struct ListArgs {
     /// Model names to list (lists all nodes if omitted)
@@ -1128,6 +1145,32 @@ All selectors support glob patterns (*, **, ?, []):
     )]
     pub select: Option<String>,
 
+    /// Filter nodes by name or description using a regex pattern (case-insensitive; repeatable for AND)
+    #[arg(
+        long,
+        value_name = "PATTERN",
+        action = clap::ArgAction::Append,
+        long_help = "\
+Filter nodes whose name or description matches the regex pattern (case-insensitive).
+
+Matching rules:
+  - Tested against model name and description field (OR within a single pattern)
+  - Plain text works as a simple substring match
+  - Repeating --search applies AND logic: all patterns must match
+
+Regex syntax (Rust regex, https://docs.rs/regex):
+  order|payment   match nodes containing 'order' or 'payment'
+  ^stg_           match nodes whose name starts with 'stg_'
+  (?-i)Order      opt out of case-insensitivity for this pattern
+
+Examples:
+  dlin list --search shipping
+  dlin list --search '^stg_'
+  dlin list --search 'order|payment'
+  dlin list --search staging --search customer   # AND: must match both"
+    )]
+    pub search: Vec<String>,
+
     /// Filter output by node type (comma-separated)
     #[arg(
         long = "node-type",

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin/src/main.rs

@@ -5,6 +5,7 @@ use anyhow::Result;
 use clap::Parser;
 use path_slash::PathExt as _;
 use polyglot_sql::{DialectType, Schema as _};
+use regex::RegexBuilder;
 
 mod cli;
 
@@ -360,6 +361,19 @@ fn run_list_command(args: ListArgs) -> Result<()> {
         );
     }
     let filtered = graph::filter::filter_output_node_types(&filtered, &type_names, false);
+
+    // Compile search patterns and apply filter (AND across all patterns)
+    let search_patterns = args
+        .search
+        .iter()
+        .map(|p| {
+            RegexBuilder::new(p)
+                .case_insensitive(true)
+                .build()
+                .map_err(|e| anyhow::anyhow!("invalid --search pattern {:?}: {}", p, e))
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let filtered = graph::filter::filter_by_search(&filtered, &search_patterns);
     warn_sql_mode_test_limitation(
         &args.source,
         filtered

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin-core/src/graph/column_lineage/tests/core.rs

@@ -971,6 +971,7 @@ fn test_cte_alias_resolution() {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: src_cols,
             database: None,
             schema: None,
@@ -1000,6 +1001,7 @@ fn test_cte_alias_resolution() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_cols,
             compiled_code: Some("select id as item_id, name, status from items".to_string()),
             database: None,
@@ -1029,6 +1031,7 @@ fn test_cte_alias_resolution() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: mart_cols,
             compiled_code: Some(
                 concat!(
@@ -1104,6 +1107,7 @@ fn test_select_star_chain_with_join() {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: user_cols,
             database: None,
             schema: None,
@@ -1130,6 +1134,7 @@ fn test_select_star_chain_with_join() {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: region_cols,
             database: None,
             schema: None,
@@ -1159,6 +1164,7 @@ fn test_select_star_chain_with_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_user_cols,
             compiled_code: Some("select id, name, area from users".to_string()),
             database: Some("mydb".to_string()),
@@ -1188,6 +1194,7 @@ fn test_select_star_chain_with_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_region_cols,
             compiled_code: Some("select id, region_name from regions".to_string()),
             database: Some("mydb".to_string()),
@@ -1221,6 +1228,7 @@ fn test_select_star_chain_with_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: mart_cols,
             compiled_code: Some(
                 concat!(
@@ -1322,6 +1330,7 @@ fn test_select_star_chain_with_cte_alias_and_join() {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: user_cols,
             database: None,
             schema: None,
@@ -1348,6 +1357,7 @@ fn test_select_star_chain_with_cte_alias_and_join() {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: region_cols,
             database: None,
             schema: None,
@@ -1377,6 +1387,7 @@ fn test_select_star_chain_with_cte_alias_and_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_user_cols,
             compiled_code: Some("select id, name, area from users".to_string()),
             database: Some("mydb".to_string()),
@@ -1406,6 +1417,7 @@ fn test_select_star_chain_with_cte_alias_and_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_region_cols,
             compiled_code: Some("select id, region_name from regions".to_string()),
             database: Some("mydb".to_string()),
@@ -1439,6 +1451,7 @@ fn test_select_star_chain_with_cte_alias_and_join() {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: mart_cols,
             compiled_code: Some(
                 concat!(

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin-core/src/graph/column_lineage/tests/mod.rs

@@ -36,6 +36,7 @@ fn make_test_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_orders_cols,
             compiled_code: Some(
                 "select id as order_id, user_id as customer_id, order_date, status from raw.orders"
@@ -67,6 +68,7 @@ fn make_test_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: orders_cols,
             compiled_code: Some("select o.order_id, o.customer_id, p.amount as total_amount from stg_orders o left join stg_payments p on o.order_id = p.order_id".to_string()),
             database: None,
@@ -93,6 +95,7 @@ fn make_test_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_payments_cols,
             compiled_code: Some(
                 "select id as payment_id, order_id, amount, payment_method from raw.payments"
@@ -123,6 +126,7 @@ fn make_test_manifest() -> Manifest {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: source_cols,
             database: None,
             schema: None,
@@ -160,6 +164,7 @@ fn make_cross_model_manifest() -> Manifest {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: raw_orders_cols,
             database: None,
             schema: None,
@@ -186,6 +191,7 @@ fn make_cross_model_manifest() -> Manifest {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: raw_payments_cols,
             database: None,
             schema: None,
@@ -215,6 +221,7 @@ fn make_cross_model_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_orders_cols,
             compiled_code: Some(
                 "select id as order_id, user_id as customer_id, order_date, status from orders"
@@ -247,6 +254,7 @@ fn make_cross_model_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: stg_payments_cols,
             compiled_code: Some(
                 "select id as payment_id, order_id, amount, payment_method from payments"
@@ -282,6 +290,7 @@ fn make_cross_model_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: orders_cols,
             compiled_code: Some(
                 concat!(
@@ -321,6 +330,7 @@ fn make_cross_model_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: customers_cols,
             compiled_code: Some(
                 concat!(
@@ -355,6 +365,7 @@ fn make_duplicate_name_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: {
                 let mut cols = HashMap::new();
                 cols.insert(
@@ -384,6 +395,7 @@ fn make_duplicate_name_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: {
                 let mut cols = HashMap::new();
                 cols.insert(
@@ -413,6 +425,7 @@ fn make_duplicate_name_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: {
                 let mut cols = HashMap::new();
                 cols.insert(
@@ -508,6 +521,7 @@ fn make_diamond_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: raw_cols,
             compiled_code: Some("select x, y from source_table".to_string()),
             database: None,
@@ -537,6 +551,7 @@ fn make_diamond_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: shared_cols,
             compiled_code: Some("select x, y from raw_data".to_string()),
             database: None,
@@ -564,6 +579,7 @@ fn make_diamond_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: left_cols,
             compiled_code: Some("select x from shared".to_string()),
             database: None,
@@ -591,6 +607,7 @@ fn make_diamond_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: right_cols,
             compiled_code: Some("select y from shared".to_string()),
             database: None,
@@ -623,6 +640,7 @@ fn make_diamond_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: out_cols,
             compiled_code: Some(
                 "select l.x as lx, r.y as ry from left_model l join right_model r on 1=1"
@@ -663,6 +681,7 @@ pub(super) fn make_transformation_manifest() -> Manifest {
             resource_type: "source".to_string(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: raw_cols,
             database: None,
             schema: None,
@@ -692,6 +711,7 @@ pub(super) fn make_transformation_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: scalar_cols,
             compiled_code: Some(
                 concat!(
@@ -730,6 +750,7 @@ pub(super) fn make_transformation_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: pt_upper_cols,
             compiled_code: Some(
                 concat!(
@@ -767,6 +788,7 @@ pub(super) fn make_transformation_manifest() -> Manifest {
             config: ManifestConfig::default(),
             description: None,
             path: None,
+            original_file_path: None,
             columns: pt_coalesce_cols,
             compiled_code: Some(
                 concat!(
@@ -819,6 +841,7 @@ pub(super) fn make_reconverging_manifest() -> Manifest {
         config: ManifestConfig::default(),
         description: None,
         path: None,
+        original_file_path: None,
         columns: {
             let mut cols = HashMap::new();
             cols.insert(

{dlin_cli-0.2.0b1 → dlin_cli-0.2.0b2}/crates/dlin-core/src/graph/filter.rs

@@ -512,6 +512,28 @@ pub fn collapse_intermediate(
     build_subgraph_with_transitive(graph, &keep)
 }
 
+/// Filter graph to nodes matching all of the given regex patterns (AND logic).
+///
+/// Each pattern is tested against the node's label and description (OR within a single pattern).
+/// A node is kept only if every pattern matches at least one of those fields.
+/// An empty slice returns the graph unchanged.
+pub fn filter_by_search(graph: &LineageGraph, patterns: &[regex::Regex]) -> LineageGraph {
+    if patterns.is_empty() {
+        return graph.clone();
+    }
+    let keep: HashSet<NodeIndex> = graph
+        .node_indices()
+        .filter(|&idx| {
+            let node = &graph[idx];
+            patterns.iter().all(|re| {
+                re.is_match(&node.label)
+                    || node.description.as_deref().is_some_and(|d| re.is_match(d))
+            })
+        })
+        .collect();
+    build_subgraph(graph, &keep)
+}
+
 /// BFS traversal collecting nodes up to max_depth levels away
 fn bfs_collect(
     graph: &LineageGraph,
@@ -2233,4 +2255,142 @@ mod tests {
         let filtered = filter_output_node_types(&g, &["source".into(), "model".into()], true);
         insta::assert_snapshot!(render_mermaid(&filtered));
     }
+
+    // -- filter_by_search tests -----------------------------------------------
+
+    fn make_node_with_desc(unique_id: &str, label: &str, description: Option<&str>) -> NodeData {
+        NodeData {
+            unique_id: unique_id.into(),
+            label: label.into(),
+            node_type: NodeType::Model,
+            file_path: None,
+            description: description.map(|s| s.to_string()),
+            materialization: None,
+            tags: vec![],
+            columns: vec![],
+            exposure: None,
+        }
+    }
+
+    fn make_search_graph() -> LineageGraph {
+        let mut g = LineageGraph::new();
+        g.add_node(make_node_with_desc(
+            "model.stg_orders",
+            "stg_orders",
+            Some("Staging model for order data"),
+        ));
+        g.add_node(make_node_with_desc(
+            "model.stg_customers",
+            "stg_customers",
+            Some("Staging model for customer data"),
+        ));
+        g.add_node(make_node_with_desc(
+            "model.order_summary",
+            "order_summary",
+            None,
+        ));
+        g.add_node(make_node_with_desc("model.payments", "payments", None));
+        g
+    }
+
+    fn re(pattern: &str) -> regex::Regex {
+        regex::RegexBuilder::new(pattern)
+            .case_insensitive(true)
+            .build()
+            .unwrap()
+    }
+
+    #[test]
+    fn test_search_by_label() {
+        let g = make_search_graph();
+        let result = filter_by_search(&g, &[re("order")]);
+        let labels: HashSet<String> = result
+            .node_indices()
+            .map(|i| result[i].label.clone())
+            .collect();
+        assert!(labels.contains("stg_orders"));
+        assert!(labels.contains("order_summary"));
+        assert!(!labels.contains("stg_customers"));
+        assert!(!labels.contains("payments"));
+    }
+
+    #[test]
+    fn test_search_by_description() {
+        let g = make_search_graph();
+        // "customer" only appears in stg_customers description
+        let result = filter_by_search(&g, &[re("customer")]);
+        let labels: HashSet<String> = result
+            .node_indices()
+            .map(|i| result[i].label.clone())
+            .collect();
+        assert!(labels.contains("stg_customers"));
+        assert_eq!(result.node_count(), 1);
+    }
+
+    #[test]
+    fn test_search_case_insensitive() {
+        let g = make_search_graph();
+        let result_lower = filter_by_search(&g, &[re("staging")]);
+        let result_upper = filter_by_search(&g, &[re("STAGING")]);
+        let result_mixed = filter_by_search(&g, &[re("Staging")]);
+        assert_eq!(result_lower.node_count(), result_upper.node_count());
+        assert_eq!(result_lower.node_count(), result_mixed.node_count());
+        assert_eq!(result_lower.node_count(), 2); // stg_orders and stg_customers descriptions
+    }
+
+    #[test]
+    fn test_search_no_match() {
+        let g = make_search_graph();
+        let result = filter_by_search(&g, &[re("nonexistent_xyz")]);
+        assert_eq!(result.node_count(), 0);
+    }
+
+    #[test]
+    fn test_search_empty_patterns_returns_all() {
+        let g = make_search_graph();
+        let result = filter_by_search(&g, &[]);
+        assert_eq!(result.node_count(), g.node_count());
+    }
+
+    #[test]
+    fn test_search_multiple_patterns_and_logic() {
+        let g = make_search_graph();
+        // Both "stg" AND "order" must match — only stg_orders qualifies
+        let result = filter_by_search(&g, &[re("stg"), re("order")]);
+        let labels: HashSet<String> = result
+            .node_indices()
+            .map(|i| result[i].label.clone())
+            .collect();
+        assert_eq!(result.node_count(), 1);
+        assert!(labels.contains("stg_orders"));
+    }
+
+    #[test]
+    fn test_search_regex_alternation() {
+        let g = make_search_graph();
+        // OR via regex alternation: matches stg_orders, stg_customers, payments
+        let result = filter_by_search(&g, &[re("customer|payment")]);
+        let labels: HashSet<String> = result
+            .node_indices()
+            .map(|i| result[i].label.clone())
+            .collect();
+        assert!(labels.contains("stg_customers"));
+        assert!(labels.contains("payments"));
+        assert!(!labels.contains("stg_orders"));
+        assert!(!labels.contains("order_summary"));
+    }
+
+    #[test]
+    fn test_search_regex_pattern() {
+        let g = make_search_graph();
+        // Regex: labels starting with "stg_"
+        let result = filter_by_search(&g, &[re("^stg_")]);
+        let labels: HashSet<String> = result
+            .node_indices()
+            .map(|i| result[i].label.clone())
+            .collect();
+        assert!(labels.contains("stg_orders"));
+        assert!(labels.contains("stg_customers"));
+        assert_eq!(result.node_count(), 2);
+    }
 }