@beseif-solutions/prow-core 0.3.2 → 0.3.3

package/dist/core.d.ts

@@ -1,6 +1,6 @@
-import { AxiosStatic } from "axios";
+import { AxiosInstance } from "axios";
 import Joi from "joi";
-import { LoDashStatic } from "lodash";
+import lodash from "lodash";
 import moment from "moment-timezone";
 import { FromCatalog, FromDirectory, T } from "./minified-utils/locales";
 type SyncOrAsync<T> = T | Promise<T>;
@@ -15,9 +15,9 @@ export type SourceFunctions = {
     unregister: (source: string, sandbox: boolean, id: string) => SyncOrAsync<void>;
 };
 export type Core = {
-    axios: AxiosStatic;
+    axios: AxiosInstance;
     moment: typeof moment;
-    lodash: LoDashStatic;
+    lodash: lodash.LoDashStatic;
     env: Record<string, any>;
     joi: Joi.Root;
     sources?: SourceFunctions;
@@ -28,5 +28,5 @@ type CoreOptions = {
     sources?: SourceFunctions;
     localization: FromDirectory | FromCatalog;
 };
-export declare const core: (options: CoreOptions) => Core;
+export declare const core: (options: CoreOptions) => Promise<Core>;
 export {};

package/dist/core.js

@@ -20,8 +20,10 @@ const FALLBACK_SOURCES = {
         throw new Error(`Sources not available: valid implementation not provided`);
     },
 };
-const core = (options) => ({
-    axios: axios_1.default,
+const core = async (options) => ({
+    axios: axios_1.default.create({
+        adapter: axios_1.default.getAdapter(`http`),
+    }),
     moment: moment_timezone_1.default,
     lodash: lodash_1.default,
     env: options.env || {},

package/dist/minified-utils/fields.js

@@ -456,7 +456,9 @@ const recursive_schema = async (field, data, options) => {
             : newField.key;
         const value = lodash_1.default.get(data, relativeKey, newField.default);
         const resolved = context_1.default.resolve(newField, value, options.context);
-        lodash_1.default.set(data, relativeKey, resolved);
+        if (typeof resolved !== `undefined`) {
+            lodash_1.default.set(data, relativeKey, resolved);
+        }
         let calculatedSchema;
         if (newField.as_array) {
             const noArrayField = lodash_1.default.omit(newField, [`as_array`, `array_min`, `array_max`, `array_length`]);
@@ -489,7 +491,6 @@ const recursive_schema = async (field, data, options) => {
                     genericItemSchema = getSimpleFieldSchema(noArrayField);
                 }
                 calculatedSchema = getItemsArrayFieldSchema(newField, [genericItemSchema]);
-                lodash_1.default.unset(data, relativeKey);
             }
         }
         else if (newField.type === `dict` && newField.items) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beseif-solutions/prow-core",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Prow core functionalities and classes",
   "main": "dist/index.js",
   "scripts": {

package/src/core.ts

@@ -1,6 +1,6 @@
-import axios, { AxiosStatic } from "axios";
+import axios, { AxiosInstance } from "axios";
 import Joi from "joi";
-import _, { LoDashStatic } from "lodash";
+import lodash from "lodash";
 import moment from "moment-timezone";
 import { FromCatalog, FromDirectory, i18n, T } from "./minified-utils/locales";
 
@@ -25,9 +25,9 @@ const FALLBACK_SOURCES: SourceFunctions = {
 };
 
 export type Core = {
-  axios: AxiosStatic,
+  axios: AxiosInstance,
   moment: typeof moment,
-  lodash: LoDashStatic,
+  lodash: lodash.LoDashStatic,
   env: Record<string, any>,
   joi: Joi.Root,
   sources?: SourceFunctions,
@@ -41,10 +41,13 @@ type CoreOptions = {
 };
 
 /* eslint-disable @typescript-eslint/unbound-method */
-export const core = (options: CoreOptions): Core => ({
-  axios: axios,
+export const core = async (options: CoreOptions): Promise<Core> => ({
+  // explicit adapter for NodeJS -> avoid DOM errors
+  axios: axios.create({
+    adapter: axios.getAdapter(`http`),
+  }),
   moment: moment,
-  lodash: _,
+  lodash: lodash,
   env: options.env || {},
   joi: Joi,
   sources: options.sources || FALLBACK_SOURCES,

package/src/minified-utils/fields.ts

@@ -661,9 +661,9 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     const value = _.get(data, relativeKey, newField.default);
 
-    // resolve value with context (even if it's not valid)
+    // resolve value with context (even if it's not valid - omit undefined)
     const resolved = context.resolve(newField, value, options.context);
-    _.set(data, relativeKey, resolved);
+    if (typeof resolved !== `undefined`) { _.set(data, relativeKey, resolved); }
 
     // get schema for field with data
     let calculatedSchema: Joi.Schema;
@@ -697,9 +697,6 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
         }
 
         calculatedSchema = getItemsArrayFieldSchema(newField, [genericItemSchema]);
-
-        // unset value if it wasn't resolved
-        _.unset(data, relativeKey);
       }
     } else if (newField.type === `dict` && newField.items) {
       const items: { key: string, schema: Joi.Schema, field: Field }[] = [];