@comprehend/telemetry-node 0.1.2 → 0.1.3

package/.claude/settings.local.json

@@ -1,8 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(npm test:*)",
-      "Bash(grep:*)"
+      "Bash(npm test:*)"
     ],
     "deny": []
   }

package/.idea/telemetry-node.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
     </content>

package/dist/sql-analyzer.js

@@ -23,6 +23,7 @@ function analyzeSQL(sql) {
     let skippingValues = false;
     let lookingForCommaOrEnd = false;
     let valuesDepth = 0;
+    let skippedWhitespace = [];
     for (let token of tokenizeSQL(sql)) {
         switch (token.type) {
             case "whitespace":
@@ -136,23 +137,31 @@ function analyzeSQL(sql) {
             switch (token.type) {
                 case "comment":
                 case "whitespace":
-                    // Skip whitespace/comments while looking for comma or end
+                    // Collect whitespace/comments while looking for comma or end
+                    skippedWhitespace.push(token);
                     break;
                 case "punct":
                     if (token.value === ",") {
-                        // More tuples coming, continue skipping
+                        // More tuples coming, clear skipped whitespace and continue skipping
+                        skippedWhitespace = [];
                         lookingForCommaOrEnd = false;
                         skippingValues = true;
                     }
                     else {
                         // Not a comma, so VALUES clause is done
+                        // Add back the skipped whitespace, then the current token
+                        presentableTokens.push(...skippedWhitespace);
                         presentableTokens.push(token);
+                        skippedWhitespace = [];
                         lookingForCommaOrEnd = false;
                     }
                     break;
                 default:
                     // VALUES clause is done, resume normal processing
+                    // Add back the skipped whitespace, then the current token
+                    presentableTokens.push(...skippedWhitespace);
                     presentableTokens.push(token);
+                    skippedWhitespace = [];
                     lookingForCommaOrEnd = false;
                     break;
             }

package/dist/sql-analyzer.test.js

@@ -482,4 +482,16 @@ describe('SQL Analyzer - bulk INSERT VALUES cardinality reduction', () => {
         expect(result.presentableQuery).toEqual(`INSERT INTO comments (text, author) VALUES
             (...)`);
     });
+    it('preserves whitespace before ON CONFLICT after VALUES clause', () => {
+        const sql = `INSERT INTO users (name, email) VALUES ('Alice', 'alice@example.com') ON CONFLICT (email) DO NOTHING`;
+        const result = (0, sql_analyzer_1.analyzeSQL)(sql);
+        expect(result.tableOperations).toEqual({ users: ['INSERT'] });
+        expect(result.presentableQuery).toEqual(`INSERT INTO users (name, email) VALUES (...) ON CONFLICT (email) DO NOTHING`);
+    });
+    it('preserves whitespace before ON CONFLICT with multiple VALUES tuples', () => {
+        const sql = `INSERT INTO users (name, email) VALUES ('Alice', 'alice@example.com'), ('Bob', 'bob@example.com') ON CONFLICT (email) DO UPDATE SET name = EXCLUDED.name`;
+        const result = (0, sql_analyzer_1.analyzeSQL)(sql);
+        expect(result.tableOperations).toEqual({ users: ['INSERT'] });
+        expect(result.presentableQuery).toEqual(`INSERT INTO users (name, email) VALUES (...) ON CONFLICT (email) DO UPDATE SET name = EXCLUDED.name`);
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comprehend/telemetry-node",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Integration of comprehend.dev with OpenTelemetry in Node.js and similar environemnts.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/sql-analyzer.test.ts

@@ -580,4 +580,20 @@ describe('SQL Analyzer - bulk INSERT VALUES cardinality reduction', () => {
         expect(result.presentableQuery).toEqual(`INSERT INTO comments (text, author) VALUES
             (...)`);
     });
+
+    it('preserves whitespace before ON CONFLICT after VALUES clause', () => {
+        const sql = `INSERT INTO users (name, email) VALUES ('Alice', 'alice@example.com') ON CONFLICT (email) DO NOTHING`;
+        const result = analyzeSQL(sql);
+
+        expect(result.tableOperations).toEqual({ users: ['INSERT'] });
+        expect(result.presentableQuery).toEqual(`INSERT INTO users (name, email) VALUES (...) ON CONFLICT (email) DO NOTHING`);
+    });
+
+    it('preserves whitespace before ON CONFLICT with multiple VALUES tuples', () => {
+        const sql = `INSERT INTO users (name, email) VALUES ('Alice', 'alice@example.com'), ('Bob', 'bob@example.com') ON CONFLICT (email) DO UPDATE SET name = EXCLUDED.name`;
+        const result = analyzeSQL(sql);
+
+        expect(result.tableOperations).toEqual({ users: ['INSERT'] });
+        expect(result.presentableQuery).toEqual(`INSERT INTO users (name, email) VALUES (...) ON CONFLICT (email) DO UPDATE SET name = EXCLUDED.name`);
+    });
 });

package/src/sql-analyzer.ts

@@ -28,6 +28,7 @@ export function analyzeSQL(sql: string): SQLAnalysisResult {
     let skippingValues = false;
     let lookingForCommaOrEnd = false;
     let valuesDepth = 0;
+    let skippedWhitespace: Token[] = [];
     for (let token of tokenizeSQL(sql)) {
         switch (token.type) {
             case "whitespace":
@@ -140,22 +141,30 @@ export function analyzeSQL(sql: string): SQLAnalysisResult {
             switch (token.type) {
                 case "comment":
                 case "whitespace":
-                    // Skip whitespace/comments while looking for comma or end
+                    // Collect whitespace/comments while looking for comma or end
+                    skippedWhitespace.push(token);
                     break;
                 case "punct":
                     if (token.value === ",") {
-                        // More tuples coming, continue skipping
+                        // More tuples coming, clear skipped whitespace and continue skipping
+                        skippedWhitespace = [];
                         lookingForCommaOrEnd = false;
                         skippingValues = true;
                     } else {
                         // Not a comma, so VALUES clause is done
+                        // Add back the skipped whitespace, then the current token
+                        presentableTokens.push(...skippedWhitespace);
                         presentableTokens.push(token);
+                        skippedWhitespace = [];
                         lookingForCommaOrEnd = false;
                     }
                     break;
                 default:
                     // VALUES clause is done, resume normal processing
+                    // Add back the skipped whitespace, then the current token
+                    presentableTokens.push(...skippedWhitespace);
                     presentableTokens.push(token);
+                    skippedWhitespace = [];
                     lookingForCommaOrEnd = false;
                     break;
             }