Merge branch 'refactor/json' into feat/wasm-try-2

Author: juleswritescode

crates/pglt_workspace/src/configuration.rs

@@ -169,7 +169,7 @@ pub fn create_config(
         }
     })?;
 
-    // we now check if biome is installed inside `node_modules` and if so, we use the schema from there
+    // we now check if pglt is installed inside `node_modules` and if so, we use the schema from there
     if VERSION == "0.0.0" {
         let schema_path = Path::new("./node_modules/@pglt/pglt/schema.json");
         let options = OpenOptions::default().read(true);
@@ -265,3 +265,110 @@ pub fn strip_jsonc_comments(jsonc_input: &str) -> String {
 
     json_output
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_strip_jsonc_comments_line_comments() {
+        let input = r#"{
+  "name": "test", // This is a line comment
+  "value": 42 // Another comment
+}"#;
+
+        let expected = r#"{
+  "name": "test",
+  "value": 42
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+
+    #[test]
+    fn test_strip_jsonc_comments_block_comments() {
+        let input = r#"{
+  /* This is a block comment */
+  "name": "test",
+  "value": /* inline comment */ 42
+}"#;
+
+        let expected = r#"{
+
+  "name": "test",
+  "value":                       42
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+
+    #[test]
+    fn test_strip_jsonc_comments_nested_block_comments() {
+        let input = r#"{
+  /* Outer comment /* Nested comment */ still outer */
+  "name": "test"
+}"#;
+
+        let expected = r#"{
+
+  "name": "test"
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+
+    #[test]
+    fn test_strip_jsonc_comments_in_strings() {
+        let input = r#"{
+  "comment_like": "This is not a // comment",
+  "another": "This is not a /* block comment */ either"
+}"#;
+
+        let expected = r#"{
+  "comment_like": "This is not a // comment",
+  "another": "This is not a /* block comment */ either"
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+
+    #[test]
+    fn test_strip_jsonc_comments_escaped_quotes() {
+        let input = r#"{
+  "escaped\": \"quote": "value", // Comment after escaped quotes
+  "normal": "value" // Normal comment
+}"#;
+
+        let expected = r#"{
+  "escaped\": \"quote": "value",
+  "normal": "value"
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+
+    #[test]
+    fn test_strip_jsonc_comments_multiline_block() {
+        let input = r#"{
+  /* This is a
+     multiline block
+     comment */
+  "name": "test"
+}"#;
+
+        let expected = r#"{
+
+
+
+  "name": "test"
+}
+"#;
+
+        assert_eq!(strip_jsonc_comments(input), expected);
+    }
+}

docs/codegen/src/utils.rs

@@ -12,8 +12,13 @@ pub(crate) fn replace_section(
         section_identifier, section_identifier
     );
     let re = Regex::new(&pattern).unwrap();
-    re.replace_all(content, format!("${{1}}{}${{2}}", replacement))
-        .to_string()
+
+    // Use a replacement function instead of a replacement string to avoid
+    // issues with special characters like $ in the replacement text
+    re.replace_all(content, |caps: &regex::Captures| {
+        format!("{}{}{}", &caps[1], replacement, &caps[2])
+    })
+    .to_string()
 }
 
 #[derive(Default)]

docs/index.md

@@ -41,7 +41,7 @@ After running the `init` command, you’ll have a `pglt.jsonc` file in your dire
 
 ```json
 {
-  "": "https://supabase-community.github.io/postgres_lsp/schemas/0.0.0/schema.json",
+  "$schema": "https://supabase-community.github.io/postgres_lsp/schemas/0.0.0/schema.json",
   "vcs": {
     "enabled": false,
     "clientKind": "git",