@beseif-solutions/prow-core 1.0.0 → 1.0.2

package/src/minified-utils/context.ts

@@ -39,6 +39,15 @@ export const isDynamic = (data: any, processed: boolean): data is Dynamic => {
   return !error;
 };
 
+const shouldInfer = (field: Field, value: any): boolean =>
+  field.as_array && _.isArray(value)
+  || field.type === `dict` && _.isObject(value)
+  || field.type === `file` && _.isObject(value)
+  || field.type === `number` && typeof value === `number`
+  || field.type === `string` && typeof value === `string`
+  || field.type === `boolean` && typeof value === `boolean`
+  || field.type === `any`;
+
 const MAX_RESOLVE_DEPTH = 10;
 
 class Context {
@@ -49,9 +58,9 @@ class Context {
     let serialized = false;
     let unresolved: string;
 
-    const dynamicSource = isDynamic(source, false);
+    const dynamicSource = field.type === `dict` && field.items && isDynamic(source, false);
 
-    if ((_.isObject(source) || _.isArray(source)) && field.type === `dict` && (!field.items || dynamicSource)) {
+    if (((_.isObject(source) || _.isArray(source)) && field.type === `dict` && !field.items) || dynamicSource) {
       serialized = true;
       unresolved = JSON.stringify(source);
     } else if (typeof source === `string`) {
@@ -68,16 +77,7 @@ class Context {
       const path = getPath(unresolved);
       if (_.has(clonedData, path)) {
         const get = _.get(clonedData, path);
-        const shouldInfer =
-          field.as_array && _.isArray(get)
-          || field.type === `dict` && _.isObject(get)
-          || field.type === `file` && _.isObject(get)
-          || field.type === `number` && typeof get === `number`
-          || field.type === `string` && typeof get === `string`
-          || field.type === `boolean` && typeof get === `boolean`
-          || field.type === `any`;
-
-        if (shouldInfer) {
+        if (shouldInfer(field, get)) {
           resolved = get;
         } else {
           resolved = _.toString(get);
@@ -111,8 +111,17 @@ class Context {
         const item: Record<string, any> = {};
         for (const [key, map] of Object.entries(response.mapping)) {
           if (map.type === `property`) {
+            const child = field.items.find((fi) => fi.key === key);
+            if (!child) { continue; }
+
             const prop = _.get(i, map.value);
-            if (typeof prop !== `undefined`) { item[key] = prop; }
+            if (typeof prop !== `undefined`) {
+              if (shouldInfer(child, prop)) {
+                item[key] = prop;
+              } else {
+                item[key] = _.toString(prop);
+              }
+            }
           } else if (map.type === `literal`) {
             item[key] = map.value;
           }