@beseif-solutions/prow-core 0.3.16 → 0.4.1

package/dist/entities/events.d.ts

@@ -169,13 +169,14 @@ export type ScheduledTrigger<Config extends EventConfig> = CommonEvents<Config>
     };
 };
 export type Trigger<Config extends EventConfig = {}> = ImmediateTrigger<Config> | ScheduledTrigger<Config>;
-type StandardOutput<Config extends EventConfig> = {
+type StandardOutputWithMemory<Config extends MemoryEventConfig> = {
     output: ObjectOrArray<Config[`outputs`]>;
     flags: Partial<Record<Config[`flags`][`outputs`][number], true>>;
+    memory?: Config[`memory`];
 };
-type MemoryOutput<Config extends MemoryEventConfig> = {
+type OnlyMemoryOutput<Config extends MemoryEventConfig> = {
     memory: Config[`memory`];
-} & (StandardOutput<Config> | {});
+};
 export type SyncAction<Config extends MemoryEventConfig> = CommonEvents<Config> & {
     type: `action`;
     inputs: [DefaultConnectableEvent<Config[`flags`][`inputs`][number]>, ...AdditionalConnectableEvent<Config[`flags`][`inputs`][number]>[]];
@@ -188,7 +189,7 @@ export type SyncAction<Config extends MemoryEventConfig> = CommonEvents<Config>
                 flags: Partial<Record<Config[`flags`][`inputs`][number], true>>;
                 memory?: Config[`memory`];
             } & SourcePreferences<Config>;
-            outputs: StandardOutput<Config> | MemoryOutput<Config>;
+            outputs: StandardOutputWithMemory<Config> | OnlyMemoryOutput<Config>;
         }>;
     };
 };
@@ -209,7 +210,7 @@ export type AsyncAction<Config extends MemoryEventConfig> = CommonEvents<Config>
             outputs: {
                 done: boolean;
                 memory?: Config[`memory`];
-            };
+            } | StandardOutputWithMemory<Config>;
         }>;
         handle: CoreFunction<{
             credentials: Config[`credentials`];
@@ -218,7 +219,7 @@ export type AsyncAction<Config extends MemoryEventConfig> = CommonEvents<Config>
                 request: Request;
                 memory?: Config[`memory`];
             } & SourcePreferences<Config>;
-            outputs: StandardOutput<Config>;
+            outputs: StandardOutputWithMemory<Config>;
         }>;
         fire?: CoreFunction<{
             credentials: Config[`credentials`];

package/dist/entities/events.js

@@ -134,10 +134,8 @@ const actionOutputSchema = () => joi_1.default.alternatives(joi_1.default.object
     flags: joi_1.default.object()
         .pattern(joi_1.default.string(), joi_1.default.valid(true))
         .required(),
+    memory: joi_1.default.object(),
 }), joi_1.default.object({
     memory: joi_1.default.object().required(),
-    output: joi_1.default.alternatives(joi_1.default.array(), joi_1.default.object()),
-    flags: joi_1.default.object()
-        .pattern(joi_1.default.string(), joi_1.default.valid(true)),
-}).and(`output`, `flags`));
+}));
 exports.actionOutputSchema = actionOutputSchema;

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { Credentials, credentialsSchema, OAuthCredentials, oauthCredentialsSchem
 export { Action, actionOutputSchema, actionSchema, AsyncAction, Event, eventSchema, ImmediateTrigger, immediateTriggerSchema, Request, ScheduledTrigger, scheduledTriggerSchema, SyncAction, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
 export { Provider, providerSchema } from './entities/provider';
 export { Source } from './entities/source';
+export { hasExpression, isExpression, split } from './minified-utils/context';
 export { alter, Condition, extract, Field, fieldSchema, fieldsSchema, File, SelectFieldChoice, validate, ValidationResult } from './minified-utils/fields';
 export { DEFAULT_LOCALE, i18n, LocalizedField, LocalizedProperties, localizeFields, localizeGroup, localizeInputs, localizeOutputs, localizeProperties } from './minified-utils/locales';
 export { Properties } from './minified-utils/properties';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Protocol = exports.Properties = exports.localizeProperties = exports.localizeOutputs = exports.localizeInputs = exports.localizeGroup = exports.localizeFields = exports.i18n = exports.DEFAULT_LOCALE = exports.validate = exports.fieldsSchema = exports.fieldSchema = exports.extract = exports.alter = exports.providerSchema = exports.triggerSchema = exports.triggerOutputSchema = exports.syncActionSchema = exports.scheduledTriggerSchema = exports.immediateTriggerSchema = exports.eventSchema = exports.actionSchema = exports.actionOutputSchema = exports.staticCredentialsSchema = exports.sessionCredentialsSchema = exports.oauthCredentialsSchema = exports.credentialsSchema = exports.idSchema = exports.core = void 0;
+exports.Protocol = exports.Properties = exports.localizeProperties = exports.localizeOutputs = exports.localizeInputs = exports.localizeGroup = exports.localizeFields = exports.i18n = exports.DEFAULT_LOCALE = exports.validate = exports.fieldsSchema = exports.fieldSchema = exports.extract = exports.alter = exports.split = exports.isExpression = exports.hasExpression = exports.providerSchema = exports.triggerSchema = exports.triggerOutputSchema = exports.syncActionSchema = exports.scheduledTriggerSchema = exports.immediateTriggerSchema = exports.eventSchema = exports.actionSchema = exports.actionOutputSchema = exports.staticCredentialsSchema = exports.sessionCredentialsSchema = exports.oauthCredentialsSchema = exports.credentialsSchema = exports.idSchema = exports.core = void 0;
 var core_1 = require("./core");
 Object.defineProperty(exports, "core", { enumerable: true, get: function () { return core_1.core; } });
 var commons_1 = require("./entities/commons");
@@ -21,6 +21,10 @@ Object.defineProperty(exports, "triggerOutputSchema", { enumerable: true, get: f
 Object.defineProperty(exports, "triggerSchema", { enumerable: true, get: function () { return events_1.triggerSchema; } });
 var provider_1 = require("./entities/provider");
 Object.defineProperty(exports, "providerSchema", { enumerable: true, get: function () { return provider_1.providerSchema; } });
+var context_1 = require("./minified-utils/context");
+Object.defineProperty(exports, "hasExpression", { enumerable: true, get: function () { return context_1.hasExpression; } });
+Object.defineProperty(exports, "isExpression", { enumerable: true, get: function () { return context_1.isExpression; } });
+Object.defineProperty(exports, "split", { enumerable: true, get: function () { return context_1.split; } });
 var fields_1 = require("./minified-utils/fields");
 Object.defineProperty(exports, "alter", { enumerable: true, get: function () { return fields_1.alter; } });
 Object.defineProperty(exports, "extract", { enumerable: true, get: function () { return fields_1.extract; } });

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

@@ -1,4 +1,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[];
 declare class Context {
     readonly resolve: (field: Field, source: any, data: Record<string, any>) => any;
 }

package/dist/minified-utils/context.js

@@ -3,7 +3,17 @@ 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;
 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;
+exports.isExpression = isExpression;
+const HAS_EXPRESSION_REGEX = /{{2,3}[^}]+}{2,3}/;
+const hasExpression = (value) => typeof value === `string` ? HAS_EXPRESSION_REGEX.test(value) : false;
+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;
 class Context {
     constructor() {
         this.resolve = (field, source, data) => {
@@ -22,14 +32,14 @@ class Context {
             else {
                 return source;
             }
-            if (!unresolved || !unresolved.includes(`{{`)) {
+            if (!unresolved || !(0, exports.hasExpression)(unresolved)) {
                 return source;
             }
             const clonedData = lodash_1.default.cloneDeep(data);
-            const parts = Array.from(unresolved.match(/{{[^}]+}}|[^{}]+/g) || []);
+            const parts = (0, exports.split)(unresolved);
             let resolved = unresolved;
             for (const expression of parts) {
-                if (!expression.startsWith(`{{`)) {
+                if (!(0, exports.isExpression)(expression)) {
                     continue;
                 }
                 const path = expression.replace(/^{+/g, ``).replace(/}+$/g, ``);

package/package.json

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

package/src/entities/events.ts

@@ -135,12 +135,15 @@ export type Trigger<Config extends EventConfig = {}> =
   | ImmediateTrigger<Config>
   | ScheduledTrigger<Config>;
 
-type StandardOutput<Config extends EventConfig> =
-  { output: ObjectOrArray<Config[`outputs`]>, flags: Partial<Record<Config[`flags`][`outputs`][number], true>> };
+type StandardOutputWithMemory<Config extends MemoryEventConfig> = {
+  output: ObjectOrArray<Config[`outputs`]>,
+  flags: Partial<Record<Config[`flags`][`outputs`][number], true>>,
+  memory?: Config[`memory`],
+};
 
-type MemoryOutput<Config extends MemoryEventConfig> = {
+type OnlyMemoryOutput<Config extends MemoryEventConfig> = {
   memory: Config[`memory`],
-} & (StandardOutput<Config> | {});
+};
 
 export type SyncAction<Config extends MemoryEventConfig> = CommonEvents<Config> & {
   type: `action`,
@@ -150,7 +153,7 @@ export type SyncAction<Config extends MemoryEventConfig> = CommonEvents<Config>
     execute: CoreFunction<{
       credentials: Config[`credentials`],
       inputs: { fields: Config[`fields`], flags: Partial<Record<Config[`flags`][`inputs`][number], true>>, memory?: Config[`memory`] } & SourcePreferences<Config>,
-      outputs: StandardOutput<Config> | MemoryOutput<Config>,
+      outputs: StandardOutputWithMemory<Config> | OnlyMemoryOutput<Config>,
     }>,
   },
 };
@@ -164,12 +167,12 @@ export type AsyncAction<Config extends MemoryEventConfig> = CommonEvents<Config>
     execute: CoreFunction<{
       credentials: Config[`credentials`],
       inputs: { fields: Config[`fields`], flags: Partial<Record<Config[`flags`][`inputs`][number], true>>, link: string, memory?: Config[`memory`] } & SourcePreferences<Config>,
-      outputs: { done: boolean, memory?: Config[`memory`] },
+      outputs: { done: boolean, memory?: Config[`memory`] } | StandardOutputWithMemory<Config>,
     }>,
     handle: CoreFunction<{
       credentials: Config[`credentials`],
       inputs: { fields: Config[`fields`], request: Request, memory?: Config[`memory`] } & SourcePreferences<Config>,
-      outputs: StandardOutput<Config>,
+      outputs: StandardOutputWithMemory<Config>,
     }>,
     fire?: CoreFunction<{
       credentials: Config[`credentials`],
@@ -346,7 +349,7 @@ export const triggerOutputSchema = () =>
 
 export const actionOutputSchema = () =>
   Joi.alternatives(
-    // standard output
+    // standard output + memory
     Joi.object({
       output: Joi.alternatives(
         Joi.array(),
@@ -355,15 +358,10 @@ export const actionOutputSchema = () =>
       flags: Joi.object()
         .pattern(Joi.string(), Joi.valid(true))
         .required(),
+      memory: Joi.object(),
     }),
-    // memory output
+    // only memory output
     Joi.object({
       memory: Joi.object().required(),
-      output: Joi.alternatives(
-        Joi.array(),
-        Joi.object(),
-      ),
-      flags: Joi.object()
-        .pattern(Joi.string(), Joi.valid(true)),
-    }).and(`output`, `flags`),
+    }),
   );

package/src/index.ts

@@ -4,6 +4,7 @@ export { Credentials, credentialsSchema, OAuthCredentials, oauthCredentialsSchem
 export { Action, actionOutputSchema, actionSchema, AsyncAction, Event, eventSchema, ImmediateTrigger, immediateTriggerSchema, Request, ScheduledTrigger, scheduledTriggerSchema, SyncAction, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
 export { Provider, providerSchema } from './entities/provider';
 export { Source } from './entities/source';
+export { hasExpression, isExpression, split } from './minified-utils/context';
 export { alter, Condition, extract, Field, fieldSchema, fieldsSchema, File, SelectFieldChoice, validate, ValidationResult } from './minified-utils/fields';
 export { DEFAULT_LOCALE, i18n, LocalizedField, LocalizedProperties, localizeFields, localizeGroup, localizeInputs, localizeOutputs, localizeProperties } from './minified-utils/locales';
 export { Properties } from './minified-utils/properties';

package/src/minified-utils/context.ts

@@ -1,6 +1,18 @@
 import _ from "lodash";
 import { Field } from "./fields";
 
+const IS_EXPRESSION_REGEX = /^{{2,3}[^}]+}{2,3}$/;
+export const isExpression = (value: any) =>
+  typeof value === `string` ? IS_EXPRESSION_REGEX.test(value) : false;
+
+const HAS_EXPRESSION_REGEX = /{{2,3}[^}]+}{2,3}/;
+export const hasExpression = (value: any) =>
+  typeof value === `string` ? HAS_EXPRESSION_REGEX.test(value) : false;
+
+const SPLIT_REGEX = /{{2,3}[^}]+}{2,3}|[^{}]+/g;
+export const split = (value: string) =>
+  typeof value === `string` ? Array.from(value.match(SPLIT_REGEX) || []) : [];
+
 class Context {
 
   public readonly resolve = (field: Field, source: any, data: Record<string, any>) => {
@@ -15,16 +27,16 @@ class Context {
       unresolved = source;
     } else { return source; }
 
-    if (!unresolved || !unresolved.includes(`{{`)) { return source; }
+    if (!unresolved || !hasExpression(unresolved)) { return source; }
 
     const clonedData = _.cloneDeep(data);
 
-
-    const parts = Array.from(unresolved.match(/{{[^}]+}}|[^{}]+/g) || []);
+    const parts = split(unresolved);
 
     let resolved: any = unresolved;
     for (const expression of parts) {
-      if (!expression.startsWith(`{{`)) { continue; }
+      if (!isExpression(expression)) { continue; }
+
       const path = expression.replace(/^{+/g, ``).replace(/}+$/g, ``);
       const get = _.get(clonedData, path);