From 946b311e5652b1e29e10a0d26668c081b9c6b69a Mon Sep 17 00:00:00 2001
From: RTLcoil <oleg@rtl.co.il>
Date: Sat, 11 Apr 2020 15:55:52 +0300
Subject: [PATCH] Fix `normalize_expression` to ignore predefined variables

---
 js/jquery.cloudinary.js          |  2 +-
 src/expression.js                |  2 +-
 test/spec/transformation-spec.js | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/js/jquery.cloudinary.js b/js/jquery.cloudinary.js
index 9def7cf7..5cb37be2 100644
--- a/js/jquery.cloudinary.js
+++ b/js/jquery.cloudinary.js
@@ -1487,7 +1487,7 @@ var slice = [].slice,
       }
       expression = String(expression);
       operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*";
-      pattern = "((" + operators + ")(?=[ _])|" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
+      pattern = "((" + operators + ")(?=[ _])|(?<!\$)(" + Object.keys(Expression.PREDEFINED_VARS).join("|") + "))";
       replaceRE = new RegExp(pattern, "g");
       expression = expression.replace(replaceRE, function(match) {
         return Expression.OPERATORS[match] || Expression.PREDEFINED_VARS[match];
diff --git a/src/expression.js b/src/expression.js
index 566bcecb..c4779ee6 100644
--- a/src/expression.js
+++ b/src/expression.js
@@ -37,7 +37,7 @@ class Expression {
     }
     expression = String(expression);
     operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*";
-    pattern = "((" + operators + ")(?=[ _])|" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
+    pattern = "((" + operators + ")(?=[ _])|(?<!\\$)(" + Object.keys(Expression.PREDEFINED_VARS).join("|") + "))";
     replaceRE = new RegExp(pattern, "g");
     expression = expression.replace(replaceRE, function (match) {
       return Expression.OPERATORS[match] || Expression.PREDEFINED_VARS[match];
diff --git a/test/spec/transformation-spec.js b/test/spec/transformation-spec.js
index f0aae1cb..f5a4d85a 100644
--- a/test/spec/transformation-spec.js
+++ b/test/spec/transformation-spec.js
@@ -100,6 +100,19 @@ describe("Transformation", function() {
       transformation: {}
     })).toBe(protocol + '//res.cloudinary.com/test123/image/upload/test');
   });
+  it('should not change variable names even if they look like keywords', function() {
+    const options = { transformation: [
+        {
+          $width: 10,
+        },
+        {
+          width: '$width + 10 + width',
+          crop: 'scale',
+        },
+      ]};
+    const t = cloudinary.Transformation.new(options);
+    expect(t.toString()).toEqual('$width_10/c_scale,w_$width_add_10_add_w');
+  });
   describe("width and height", function() {
     it('should use width and height from options only if crop is given', function() {
       expect(cl.url('test', {