@beseif-solutions/prow-core 0.2.1 → 0.2.3

package/dist/entities/events.d.ts

@@ -172,7 +172,7 @@ type MemoryOutput<Config extends MemoryEventConfig = {
 }> = {
     memory: Config[`memory`];
 } & (StandardOutput<Config> | {});
-export type Action<Config extends MemoryEventConfig = {
+export type SyncAction<Config extends MemoryEventConfig = {
     fields: Record<string, any>;
     memory: Record<string, any>;
 }> = CommonEvents<Config> & {
@@ -227,6 +227,7 @@ export type AsyncAction<Config extends SetupEventConfig = {
             inputs: {
                 fields: Config[`fields`];
                 flags: Partial<Record<Config[`flags`][`inputs`][number], true>>;
+                link: string;
                 setup?: Config[`setup`];
             };
             outputs: {
@@ -256,6 +257,9 @@ export type AsyncAction<Config extends SetupEventConfig = {
         }>;
     };
 };
+export type Action<Config extends EventConfig = {
+    fields: Record<string, any>;
+}> = SyncAction<Config> | AsyncAction<Config>;
 export type Event<Config extends EventConfig = {
     fields: Record<string, any>;
 }> = Action<Config> | Trigger<Config>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { Core, core } from './core';
 export { CoreFunction, idSchema } from './entities/commons';
 export { Credentials, credentialsSchema, OAuthCredentials, oauthCredentialsSchema, SessionCredentials, sessionCredentialsSchema, StaticCredentials, staticCredentialsSchema } from './entities/credentials';
-export { Action, actionOutputSchema, actionSchema, AsyncAction, Event, eventSchema, ImmediateTrigger, immediateTriggerSchema, Request, ScheduledTrigger, scheduledTriggerSchema, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
+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 { alter, extract, Field, fieldSchema, fieldsSchema, File, SelectFieldChoice, validate, ValidationResult } from './minified-utils/fields';

package/dist/minified-utils/fields.js

@@ -422,6 +422,9 @@ const recursive_schema = async (field, data, options) => {
             if (options.alter) {
                 delete newField.altered_by;
             }
+            if (typeof newField.show === `boolean` && !newField.show) {
+                return;
+            }
         }
         const alteredField = lodash_1.default.cloneDeep(newField);
         if (newField.type === `file`) {
@@ -467,11 +470,7 @@ const recursive_schema = async (field, data, options) => {
         if (!calculatedSchema) {
             throw new Error(`Could not resolve schema for field ${newField.key}`);
         }
-        if (typeof newField.show === `boolean` && !newField.show) {
-            lodash_1.default.unset(data, relativeKey);
-            return;
-        }
-        else if (newField.disabled) {
+        if (newField.disabled) {
             lodash_1.default.unset(data, relativeKey);
         }
         return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };

package/package.json

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

package/src/entities/events.ts

@@ -131,7 +131,7 @@ type MemoryOutput<Config extends MemoryEventConfig = { memory: Record<string, an
   memory: Config[`memory`],
 } & (StandardOutput<Config> | {});
 
-export type Action<Config extends MemoryEventConfig = { fields: Record<string, any>, memory: Record<string, any> }> = CommonEvents<Config> & {
+export type SyncAction<Config extends MemoryEventConfig = { fields: Record<string, any>, memory: Record<string, any> }> = CommonEvents<Config> & {
   type: `action`,
   inputs: [DefaultConnectableEvent<Config[`flags`][`inputs`][number]>, ...AdditionalConnectableEvent<Config[`flags`][`inputs`][number]>[]],
   outputs: [DefaultConnectableEvent<Config[`flags`][`outputs`][number]>, ...(AdditionalConnectableEvent<Config[`flags`][`outputs`][number]> | ErrorConnectableEvent<Config[`flags`][`outputs`][number]>)[]],
@@ -162,7 +162,7 @@ export type AsyncAction<Config extends SetupEventConfig = { fields: Record<strin
     }>,
     execute: CoreFunction<{
       credentials: Config[`credentials`],
-      inputs: { fields: Config[`fields`], flags: Partial<Record<Config[`flags`][`inputs`][number], true>>, setup?: Config[`setup`] },
+      inputs: { fields: Config[`fields`], flags: Partial<Record<Config[`flags`][`inputs`][number], true>>, link: string, setup?: Config[`setup`] },
       outputs: { done: boolean, setup?: Config[`setup`] },
     }>,
     handle: CoreFunction<{
@@ -177,6 +177,9 @@ export type AsyncAction<Config extends SetupEventConfig = { fields: Record<strin
     }>,
   },
 };
+export type Action<Config extends EventConfig = { fields: Record<string, any> }> =
+  | SyncAction<Config>
+  | AsyncAction<Config>;
 
 export type Event<Config extends EventConfig = { fields: Record<string, any> }> =
   | Action<Config>

package/src/index.ts

@@ -1,7 +1,7 @@
 export { Core, core } from './core';
 export { CoreFunction, idSchema } from './entities/commons';
 export { Credentials, credentialsSchema, OAuthCredentials, oauthCredentialsSchema, SessionCredentials, sessionCredentialsSchema, StaticCredentials, staticCredentialsSchema } from './entities/credentials';
-export { Action, actionOutputSchema, actionSchema, AsyncAction, Event, eventSchema, ImmediateTrigger, immediateTriggerSchema, Request, ScheduledTrigger, scheduledTriggerSchema, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
+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 { alter, extract, Field, fieldSchema, fieldsSchema, File, SelectFieldChoice, validate, ValidationResult } from './minified-utils/fields';

package/src/minified-utils/fields.ts

@@ -625,6 +625,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
       // remove altered_by only if it's not an array -> array alterations must be kept for front-end rendering
       if (options.alter) { delete newField.altered_by; }
+
+      if (typeof newField.show === `boolean` && !newField.show) { return; }
     }
 
     const alteredField: Field = _.cloneDeep(newField);
@@ -676,14 +678,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     if (!calculatedSchema) { throw new Error(`Could not resolve schema for field ${newField.key}`); }
 
-    if (typeof newField.show === `boolean` && !newField.show) {
-      // if the field is hidden, we don't need to validate it
-      _.unset(data, relativeKey);
-      return;
-    } else if (newField.disabled) {
-      // TODO: check this
-      _.unset(data, relativeKey);
-    }
+    // if disabled schema validation is done but the value is not set
+    if (newField.disabled) { _.unset(data, relativeKey); }
 
     return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };
   } catch (e) { throw e; }