@beseif-solutions/prow-core 0.3.15 → 0.4.0

package/dist/entities/credentials.d.ts

@@ -35,7 +35,7 @@ export type OAuthCredentials<Config extends CredentialsConfig = {}> = CommonCred
             inputs: {
                 redirect: string;
                 code: string;
-            };
+            } & Record<string, any>;
             outputs: {
                 username?: string;
                 credentials: Config[`credentials`];

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/package.json

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

package/src/entities/credentials.ts

@@ -33,7 +33,7 @@ export type OAuthCredentials<Config extends CredentialsConfig = {}> = CommonCred
     }>,
     connect: CoreFunction<{
       credentials: undefined,
-      inputs: { redirect: string, code: string },
+      inputs: { redirect: string, code: string } & Record<string, any>,
       outputs: {
         username?: string,
         credentials: Config[`credentials`],

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`),
+    }),
   );