Move RuntimeField lang and params inside script

sudo-suhas · Apr 18, 2024 · 219e949 · 219e949
1 parent ec1d8b5
commit 219e949
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/core/runtime-field.js b/src/core/runtime-field.js
@@ -80,7 +80,9 @@ class RuntimeField {
      * @returns {RuntimeField} returns `this` so that calls can be chained.
      */
     lang(lang) {
-        this._body.lang = lang;
+        if (!isNil(this._body.script)) {
+            this._body.script.lang = lang;
+        }
         return this;
     }
 
@@ -91,7 +93,9 @@ class RuntimeField {
      * @returns {RuntimeField} returns `this` so that calls can be chained.
      */
     params(params) {
-        this._body.params = params;
+        if (!isNil(this._body.script)) {
+            this._body.script.params = params;
+        }
         return this;
     }
 

diff --git a/test/core-test/request-body-search.test.js b/test/core-test/request-body-search.test.js
@@ -181,12 +181,12 @@ test('Runtime mappging with lang and params', setsOption, 'runtimeMapping', {
     propValue: {
         test1: {
             type: 'keyword',
-            lang: 'painless',
             script: {
-                source: "emit(doc['my_field_name'].value * params.factor)"
-            },
-            params: {
-                factor: 2.0
+                lang: 'painless',
+                source: "emit(doc['my_field_name'].value * params.factor)",
+                params: {
+                    factor: 2.0
+                }
             }
         }
     },

diff --git a/test/core-test/runtime-field.test.js b/test/core-test/runtime-field.test.js
@@ -59,12 +59,12 @@ test('set script, lang and params', t => {
     fieldA.params({ factor: 2.0 });
     const expected = {
         type: 'keyword',
-        lang: 'painless',
         script: {
-            source: "emit(doc['my_field_name'].value * params.factor)"
-        },
-        params: {
-            factor: 2.0
+            lang: 'painless',
+            source: "emit(doc['my_field_name'].value * params.factor)",
+            params: {
+                factor: 2.0
+            }
         }
     };
     t.deepEqual(fieldA.toJSON(), expected);