@beseif-solutions/prow-core 0.4.4 → 0.4.6

package/dist/entities/commons.d.ts

@@ -7,6 +7,7 @@ export type CoreConfig = {
 };
 type Configuration<Config extends CoreConfig> = ({
     sandbox: boolean;
+    context?: string;
     organization?: string;
 } & (Config[`inputs`] extends undefined ? {} : {
     inputs: Config[`inputs`];
@@ -19,7 +20,7 @@ type CommonConfig = Pick<CoreConfig, `credentials`> & {
 };
 export type Common<Config extends CommonConfig = {}> = {
     id: Config[`id`] extends string ? Config[`id`] : string;
-    helpers?: Record<string, CoreFunction<{
+    helpers: Record<string, CoreFunction<{
         credentials: Config[`credentials`];
         inputs: any;
         outputs: any;

package/dist/entities/commons.js

@@ -11,6 +11,7 @@ exports.idSchema = idSchema;
 const commonSchema = () => joi_1.default.object({
     id: (0, exports.idSchema)(),
     helpers: joi_1.default.object()
-        .pattern(joi_1.default.string(), joi_1.default.function()),
+        .pattern(joi_1.default.string(), joi_1.default.function())
+        .required(),
 });
 exports.commonSchema = commonSchema;

package/dist/minified-utils/context.d.ts

@@ -2,6 +2,7 @@ import { Field } from "./fields";
 export declare const isExpression: (value: any) => boolean;
 export declare const hasExpression: (value: any) => boolean;
 export declare const split: (value: string) => string[];
+export declare const getPath: (expression: string) => string;
 declare class Context {
     readonly resolve: (field: Field, source: any, data: Record<string, any>) => any;
 }

package/dist/minified-utils/context.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.split = exports.hasExpression = exports.isExpression = void 0;
+exports.getPath = exports.split = exports.hasExpression = exports.isExpression = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const IS_EXPRESSION_REGEX = /^{{2,3}[^}]+}{2,3}$/;
 const isExpression = (value) => typeof value === `string` ? IS_EXPRESSION_REGEX.test(value) : false;
@@ -14,6 +14,8 @@ exports.hasExpression = hasExpression;
 const SPLIT_REGEX = /{{2,3}[^}]+}{2,3}|[^{}]+/g;
 const split = (value) => typeof value === `string` ? Array.from(value.match(SPLIT_REGEX) || []) : [];
 exports.split = split;
+const getPath = (expression) => expression.replace(/^{+/g, ``).replace(/}+$/g, ``);
+exports.getPath = getPath;
 class Context {
     constructor() {
         this.resolve = (field, source, data) => {
@@ -29,20 +31,13 @@ class Context {
             else if (typeof source === `string`) {
                 unresolved = source;
             }
-            else {
-                return source;
-            }
             if (!unresolved || !(0, exports.hasExpression)(unresolved)) {
                 return source;
             }
             const clonedData = lodash_1.default.cloneDeep(data);
-            const parts = (0, exports.split)(unresolved);
             let resolved = unresolved;
-            for (const expression of parts) {
-                if (!(0, exports.isExpression)(expression)) {
-                    continue;
-                }
-                const path = expression.replace(/^{+/g, ``).replace(/}+$/g, ``);
+            if ((0, exports.isExpression)(unresolved)) {
+                const path = (0, exports.getPath)(unresolved);
                 if (lodash_1.default.has(clonedData, path)) {
                     const get = lodash_1.default.get(clonedData, path);
                     const shouldInfer = field.as_array && lodash_1.default.isArray(get)
@@ -52,19 +47,34 @@ class Context {
                         || field.type === `string` && typeof get === `string`
                         || field.type === `boolean` && typeof get === `boolean`
                         || field.type === `any`;
-                    if (unresolved === expression && shouldInfer) {
+                    if (shouldInfer) {
                         resolved = get;
-                        break;
                     }
                     else {
-                        if (serialized) {
-                            resolved = resolved.replace(`"${expression}"`, lodash_1.default.isObject(get) ? JSON.stringify(get) : `"${get}"`);
-                        }
-                        resolved = resolved.replace(expression, get);
+                        resolved = lodash_1.default.toString(get);
                     }
                 }
                 else {
-                    resolved = resolved.replace(expression, ``);
+                    resolved = ``;
+                }
+            }
+            else {
+                const parts = (0, exports.split)(unresolved);
+                for (const expression of parts) {
+                    if (!(0, exports.isExpression)(expression)) {
+                        continue;
+                    }
+                    const path = (0, exports.getPath)(expression);
+                    if (lodash_1.default.has(clonedData, path)) {
+                        const get = lodash_1.default.get(clonedData, path);
+                        if (serialized) {
+                            resolved = resolved.replace(`"${expression}"`, (lodash_1.default.isObject(get) || lodash_1.default.isString(get)) ? JSON.stringify(get) : get);
+                        }
+                        resolved = resolved.replace(expression, lodash_1.default.toString(get));
+                    }
+                    else {
+                        resolved = resolved.replace(expression, ``);
+                    }
                 }
             }
             const parsed = serialized ? JSON.parse(resolved) : resolved;

package/dist/minified-utils/fields.js

@@ -58,13 +58,14 @@ const defaultSchema = (type) => joi_1.default.when(`as_array`, {
     then: joi_1.default.array().items(type),
     otherwise: type,
 });
-const anySchema = () => {
+const anySchema = (nullish = true) => {
     const randId = Math.random().toString(36).substring(2, 15);
-    return joi_1.default.alternatives(joi_1.default.string(), joi_1.default.bool(), joi_1.default.number(), joi_1.default.array().items(joi_1.default.link(`#${randId}`)), joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.link(`#${randId}`)))
+    return joi_1.default.alternatives(joi_1.default.string(), joi_1.default.bool(), joi_1.default.number(), joi_1.default.array().items(joi_1.default.link(`#${randId}`)), joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.link(`#${randId}`)), ...nullish ? [joi_1.default.valid(null, ``)] : [])
         .id(randId);
 };
 const anyInputFieldSchema = () => joi_1.default.object({
     default: defaultSchema(anySchema()),
+    allow_nullish: joi_1.default.bool().default(true),
 })
     .concat(joi_1.default.object({
     format: joi_1.default.string().valid(`select`),
@@ -248,10 +249,7 @@ const getSimpleFieldSchema = (field) => {
     let typeSchema;
     switch (field.type) {
         case `any`:
-            typeSchema = anySchema();
-            if (field.allow_nullish) {
-                typeSchema = typeSchema.allow(null, ``, 0);
-            }
+            typeSchema = anySchema(field.allow_nullish);
             break;
         case `boolean`:
             typeSchema = joi_1.default.bool();

package/package.json

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

package/src/entities/commons.ts

@@ -9,6 +9,7 @@ export type CoreConfig = {
 
 type Configuration<Config extends CoreConfig> = ({
   sandbox: boolean,
+  context?: string,
   organization?: string,
 } & (
     Config[`inputs`] extends undefined ?
@@ -30,7 +31,7 @@ type CommonConfig = Pick<CoreConfig, `credentials`> & { id?: string };
 
 export type Common<Config extends CommonConfig = {}> = {
   id: Config[`id`] extends string ? Config[`id`] : string,
-  helpers?: Record<string, CoreFunction<{ credentials: Config[`credentials`], inputs: any, outputs: any }>>,
+  helpers: Record<string, CoreFunction<{ credentials: Config[`credentials`], inputs: any, outputs: any }>>,
 };
 
 export const idSchema = () =>
@@ -41,5 +42,6 @@ export const commonSchema = () =>
   Joi.object({
     id: idSchema(),
     helpers: Joi.object()
-      .pattern(Joi.string(), Joi.function()),
+      .pattern(Joi.string(), Joi.function())
+      .required(),
   });

package/src/minified-utils/context.ts

@@ -13,6 +13,9 @@ const SPLIT_REGEX = /{{2,3}[^}]+}{2,3}|[^{}]+/g;
 export const split = (value: string) =>
   typeof value === `string` ? Array.from(value.match(SPLIT_REGEX) || []) : [];
 
+export const getPath = (expression: string) =>
+  expression.replace(/^{+/g, ``).replace(/}+$/g, ``);
+
 class Context {
 
   public readonly resolve = (field: Field, source: any, data: Record<string, any>) => {
@@ -25,23 +28,18 @@ class Context {
       unresolved = JSON.stringify(source);
     } else if (typeof source === `string`) {
       unresolved = source;
-    } else { return source; }
+    }
 
     if (!unresolved || !hasExpression(unresolved)) { return source; }
 
     const clonedData = _.cloneDeep(data);
 
-    const parts = split(unresolved);
-
     let resolved: any = unresolved;
-    for (const expression of parts) {
-      if (!isExpression(expression)) { continue; }
-
-      const path = expression.replace(/^{+/g, ``).replace(/}+$/g, ``);
-
+    if (isExpression(unresolved)) {
+      // full expression
+      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)
@@ -51,15 +49,25 @@ class Context {
           || field.type === `boolean` && typeof get === `boolean`
           || field.type === `any`;
 
-        if (unresolved === expression && shouldInfer) {
+        if (shouldInfer) {
           resolved = get;
-          break;
         } else {
-          if (serialized) { resolved = resolved.replace(`"${expression}"`, _.isObject(get) ? JSON.stringify(get) : `"${get}"`); }
-          resolved = resolved.replace(expression, get);
-
+          resolved = _.toString(get);
         }
-      } else { resolved = resolved.replace(expression, ``); }
+      } else { resolved = ``; }
+    } else {
+      // partial expression
+      const parts = split(unresolved);
+      for (const expression of parts) {
+        if (!isExpression(expression)) { continue; }
+
+        const path = getPath(expression);
+        if (_.has(clonedData, path)) {
+          const get = _.get(clonedData, path);
+          if (serialized) { resolved = resolved.replace(`"${expression}"`, (_.isObject(get) || _.isString(get)) ? JSON.stringify(get) : get); }
+          resolved = resolved.replace(expression, _.toString(get));
+        } else { resolved = resolved.replace(expression, ``); }
+      }
     }
 
     const parsed = serialized ? JSON.parse(resolved) : resolved;

package/src/minified-utils/fields.ts

@@ -249,7 +249,7 @@ const defaultSchema = (type: Joi.Schema) =>
     otherwise: type,
   });
 
-const anySchema = () => {
+const anySchema = (nullish = true) => {
   // eslint-disable-next-line @typescript-eslint/no-magic-numbers
   const randId = Math.random().toString(36).substring(2, 15);
   return Joi.alternatives(
@@ -257,13 +257,16 @@ const anySchema = () => {
     Joi.bool(),
     Joi.number(),
     Joi.array().items(Joi.link(`#${randId}`)),
-    Joi.object().pattern(Joi.string(), Joi.link(`#${randId}`)))
+    Joi.object().pattern(Joi.string(), Joi.link(`#${randId}`)),
+    ...nullish ? [Joi.valid(null, ``)] : [],
+  )
     .id(randId);
 };
 
 const anyInputFieldSchema = () =>
   Joi.object({
     default: defaultSchema(anySchema()),
+    allow_nullish: Joi.bool().default(true),
   })
     .concat(Joi.object({
       format: Joi.string().valid(`select`),
@@ -474,9 +477,7 @@ const getSimpleFieldSchema = (field: Field) => {
   let typeSchema: Joi.Schema;
   switch (field.type) {
     case `any`:
-      typeSchema = anySchema();
-      // allow null values for any type
-      if (field.allow_nullish) { typeSchema = typeSchema.allow(null, ``, 0); }
+      typeSchema = anySchema(field.allow_nullish);
       break;
     case `boolean`:
       typeSchema = Joi.bool();