Migrate to GitQL SDK 0.23.0

Author: AmrDeveloper

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "fileql"
 authors = ["AmrDeveloper"]
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 description = "A tool to run SQL-like query on local files using GitQL SDK"
 license = "MIT"
@@ -13,10 +13,10 @@ categories = ["command-line-utilities"]
 exclude = [".github/**", "docs/**", "media/**", "scripts/**"]
 
 [dependencies]
-gitql-core = "0.1.0"
-gitql-std = "0.1.0"
-gitql-cli = "0.20.0"
-gitql-ast = "0.18.0"
-gitql-parser = "0.19.0"
-gitql-engine = "0.20.0"
+gitql-core = "0.2.0"
+gitql-std = "0.2.0"
+gitql-cli = "0.23.0"
+gitql-ast = "0.20.0"
+gitql-parser = "0.22.0"
+gitql-engine = "0.23.0"
 atty = "0.2.14"

Cargo.toml

@@ -23,4 +23,9 @@
    ```
 
    This will trigger a GitHub Action workflow which will create a GitHub release and
-   publish to Cargo.
+   publish to Cargo.
+
+# Releasing GitQL SDK crate
+
+  1. Update `Cargo.toml` with the new version.
+  2. `cargo publish --allow-dirty`

RELEASING.md

@@ -30,17 +30,17 @@ impl DataProvider for FileDataProvider {
         fields_names: &[String],
         titles: &[String],
         fields_values: &[Box<dyn Expression>],
-    ) -> GitQLObject {
+        hidden_selection_count: i64,
+    ) -> Result<GitQLObject, String> {
         let mut groups: Vec<Group> = vec![];
         if table.is_empty() {
-            if let Ok(group) = select_values(env, titles, fields_values) {
-                groups.push(group);
-            }
+            let group = select_values(env, titles, fields_values)?;
+            groups.push(group);
 
-            return GitQLObject {
+            return Ok(GitQLObject {
                 titles: titles.to_vec(),
                 groups,
-            };
+            });
         }
 
         let mut files: Vec<String> = vec![];
@@ -65,17 +65,17 @@ impl DataProvider for FileDataProvider {
             let path = Path::new(&file);
 
             for index in 0..names_len {
-                let field_name = &fields_names[index as usize];
-
-                if (index - padding) >= 0 {
+                if index >= hidden_selection_count && (index - padding) >= 0 {
                     let value = &fields_values[(index - padding) as usize];
                     if value.as_any().downcast_ref::<SymbolExpression>().is_none() {
-                        let evaluated = evaluate_expression(env, value, titles, &values);
-                        values.push(evaluated.unwrap_or(Value::Null));
+                        let evaluated = evaluate_expression(env, value, titles, &values)?;
+                        values.push(evaluated);
                         continue;
                     }
                 }
 
+                let field_name = &fields_names[index as usize];
+
                 if field_name == "path" {
                     let file_path_string = path.to_str().unwrap_or("");
                     values.push(Value::Text(file_path_string.to_string()));
@@ -125,10 +125,10 @@ impl DataProvider for FileDataProvider {
         }
 
         groups.push(Group { rows });
-        GitQLObject {
+        Ok(GitQLObject {
             titles: titles.to_vec(),
             groups,
-        }
+        })
     }
 }