Fix a cli command parsing bug

mbloch · mbloch · commit 80a3d691262e · 2025-09-02T20:21:29.000-04:00
diff --git a/src/utils/mapshaper-utils.mjs b/src/utils/mapshaper-utils.mjs
@@ -1072,8 +1072,13 @@ export function trimQuotes(str) {
   if (len >= 2) {
     first = str.charAt(0);
     last = str.charAt(len-1);
-    if (first == '"' && last == '"' && !str.includes('","') ||
-        first == "'" && last == "'" && !str.includes("','")) {
+    // if (first == '"' && last == '"' && !str.includes('","') ||
+    //     first == "'" && last == "'" && !str.includes("','")) {
+    // don't strip if there are unescaped quotes
+    // e.g. expressions that start and end with quotes
+    // e.g. comma-separated list of quoted values
+    if (first == '"' && last == '"' && !/[^\\]"./.test(str) ||
+        first == "'" && last == "'" && !/[^\\]'./.test(str)) {
       str = str.substr(1, len-2);
       // remove string escapes
       str = str.replace(first == '"' ? /\\(?=")/g : /\\(?=')/g, '');
diff --git a/test/utils-test.mjs b/test/utils-test.mjs
@@ -18,6 +18,11 @@ describe('mapshaper-utils.js', function () {
       // but only if entire string is quoted
       assert.equal(utils.trimQuotes(`\\"yes\\" or \\"no\\"`), `\\"yes\\" or \\"no\\"`);
     })
+
+    it('preserves certain expressions', function() {
+      // shells seem to strip single quotes from expressions like: where='"hi" == "hi"'
+      assert.equal(utils.trimQuotes(`"hi" == "hi"`), `"hi" == "hi"`);
+    })
   })
 
   describe('findQuantile()', function() {
