@beseif-solutions/prow-core 0.4.0 → 0.4.2

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 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, SyncAction, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
+export { Credentials, OAuthCredentials, SessionCredentials, StaticCredentials, credentialsSchema, oauthCredentialsSchema, sessionCredentialsSchema, staticCredentialsSchema } from './entities/credentials';
+export { Action, AsyncAction, Event, ImmediateTrigger, Request, ScheduledTrigger, SyncAction, Trigger, actionOutputSchema, actionSchema, eventSchema, immediateTriggerSchema, scheduledTriggerSchema, syncActionSchema, triggerOutputSchema, triggerSchema } from './entities/events';
 export { Provider, providerSchema } from './entities/provider';
 export { Source } from './entities/source';
-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 { hasExpression, isExpression, split } from './minified-utils/context';
+export { Condition, Field, File, SelectFieldChoice, ValidationResult, alter, extract, fieldSchema, fieldsSchema, validate } from './minified-utils/fields';
+export { DEFAULT_LOCALE, LocalizedField, LocalizedProperties, i18n, localizeFields, localizeGroup, localizeInputs, localizeOutputs, localizeProperties } from './minified-utils/locales';
 export { Properties } from './minified-utils/properties';
 export { Protocol } from './minified-utils/protocol';

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/dist/minified-utils/fields.d.ts

@@ -11,7 +11,6 @@ type Common = {
     required?: boolean;
     as_password?: boolean;
     show?: boolean;
-    show_label?: boolean;
     t?: string;
 } & ({
     as_array?: false;
@@ -20,7 +19,7 @@ type Common = {
     array_min?: number;
     array_max?: number;
     array_length?: number;
-});
+}) & Record<`experimental_${string}`, any>;
 export type Field<Extend = Record<never, never>> = Common & InputField<Extend>;
 type InputField<Extend = Record<never, never>> = (AnyInputField<Extend> | StringInputField<Extend> | NumberInputField<Extend> | BooleanInputField<Extend> | DateTimeInputField<Extend> | DateInputField<Extend> | TimeInputField<Extend> | DictInputField<Extend> | FileInputField<Extend>) & Extend;
 type Any = string | number | boolean | Any[] | {
@@ -102,6 +101,7 @@ type SelectField<Values = string | number | boolean | File, Extend = Record<neve
 export type SelectFieldChoice<Values = string | number | boolean | File, Extend = Record<never, never>> = {
     key: string;
     value: Values;
+    group?: string;
 } & Extend;
 type CustomDisplayTextField = {
     format: `textarea` | `rich-text` | `markdown`;

package/dist/minified-utils/fields.js

@@ -20,7 +20,6 @@ const commonFieldSchema = () => joi_1.default.object({
     required: joi_1.default.bool(),
     as_password: joi_1.default.bool(),
     show: joi_1.default.bool(),
-    show_label: joi_1.default.bool().default(true),
     t: joi_1.default.string(),
     as_array: joi_1.default.bool(),
     array_min: joi_1.default.when(`as_array`, {
@@ -38,7 +37,8 @@ const commonFieldSchema = () => joi_1.default.object({
         then: joi_1.default.number(),
         otherwise: joi_1.default.forbidden(),
     }),
-});
+}).concat(joi_1.default.object()
+    .pattern(joi_1.default.string().regex(/^experimental_/), joi_1.default.any()));
 const types = [`any`, `string`, `number`, `boolean`, `date`, `datetime`, `time`, `dict`, `file`];
 const inputFieldBaseSchema = () => joi_1.default.object({
     type: joi_1.default.string().required()
@@ -49,6 +49,7 @@ const inputFieldBaseSchema = () => joi_1.default.object({
 const choiceSchema = (type) => joi_1.default.object({
     key: joi_1.default.string().required(),
     value: type.required(),
+    group: joi_1.default.string(),
 }).unknown();
 const choicesSchema = (type) => joi_1.default.alternatives(joi_1.default.string(), joi_1.default.array().min(1)
     .items(choiceSchema(type)));
@@ -185,7 +186,8 @@ const fileReplacer = (field) => ({
         },
     ],
     default: field.default,
-    ...lodash_1.default.pick(field, [`altered_by`, `disabled`, `required`, `as_password`, `show`, `show_label`, `as_array`, `array_min`, `array_max`, `array_length`]),
+    ...lodash_1.default.pick(field, [`altered_by`, `disabled`, `required`, `as_password`, `show`, `as_array`, `array_min`, `array_max`, `array_length`]),
+    ...Object.assign({}, ...Object.entries(field).map(([k, v]) => k.startsWith(`experimental_`) ? { [k]: v } : {})),
 });
 const fileInputFieldSchema = () => joi_1.default.object({
     default: defaultSchema(fileSchema()),

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

@@ -7,6 +7,7 @@ import { Source } from '../entities/source';
 export type LocalizedField = {
     label: string;
     help: string;
+    ui?: Record<string, any>;
 };
 export type LocalizedProperties = {
     name: string;

package/dist/minified-utils/locales.js

@@ -98,6 +98,7 @@ const localizeField = (t, element, field, recursive = {}) => {
     const root = field.t || recursive.t || `${element}.fields`;
     field.label = t(`${root}.${key}.label`, { fallback: true });
     field.help = t(`${root}.${key}.help`);
+    field.ui = t(`${root}.${key}.ui`, { fallback: true, optional: true });
     if (field.type === `dict` && field.items) {
         field.items = field.items.map((f) => localizeField(t, element, f, { parent: `${key}.items`, t: field.t }));
     }
@@ -106,6 +107,7 @@ const localizeField = (t, element, field, recursive = {}) => {
             ...fc,
             label: t(`${root}.${key}.choices.${fc.key}.label`, { fallback: true }),
             help: t(`${root}.${key}.choices.${fc.key}.help`),
+            ...fc.group && { group: t(`${root}.${key}.groups.${fc.group}`, { fallback: true }) },
         }));
     }
     return field;

package/package.json

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

package/src/entities/events.ts

@@ -322,8 +322,6 @@ export const asyncActionSchema = () =>
       .min(1)
       .required(),
     functions: Joi.object({
-      // mount: Joi.function(),
-      // unmount: Joi.function(),
       execute: Joi.function().required(),
       handle: Joi.function().required(),
       fire: Joi.function(),

package/src/index.ts

@@ -1,10 +1,11 @@
 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, SyncAction, syncActionSchema, Trigger, triggerOutputSchema, triggerSchema } from './entities/events';
+export { Credentials, OAuthCredentials, SessionCredentials, StaticCredentials, credentialsSchema, oauthCredentialsSchema, sessionCredentialsSchema, staticCredentialsSchema } from './entities/credentials';
+export { Action, AsyncAction, Event, ImmediateTrigger, Request, ScheduledTrigger, SyncAction, Trigger, actionOutputSchema, actionSchema, eventSchema, immediateTriggerSchema, scheduledTriggerSchema, syncActionSchema, triggerOutputSchema, triggerSchema } from './entities/events';
 export { Provider, providerSchema } from './entities/provider';
 export { Source } from './entities/source';
-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 { hasExpression, isExpression, split } from './minified-utils/context';
+export { Condition, Field, File, SelectFieldChoice, ValidationResult, alter, extract, fieldSchema, fieldsSchema, validate } from './minified-utils/fields';
+export { DEFAULT_LOCALE, LocalizedField, LocalizedProperties, i18n, localizeFields, localizeGroup, localizeInputs, localizeOutputs, localizeProperties } from './minified-utils/locales';
 export { Properties } from './minified-utils/properties';
 export { Protocol } from './minified-utils/protocol';

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);
 

package/src/minified-utils/fields.ts

@@ -16,7 +16,6 @@ type Common = {
   required?: boolean,
   as_password?: boolean,
   show?: boolean,
-  show_label?: boolean,
   t?: string,
 } & ({
   as_array?: false,
@@ -25,7 +24,10 @@ type Common = {
   array_min?: number,
   array_max?: number,
   array_length?: number,
-});
+})
+  // experimental properties for custom front features
+  & Record<`experimental_${string}`, any>
+  ;
 
 export type Field<Extend = Record<never, never>> = Common & InputField<Extend>;
 
@@ -154,6 +156,7 @@ type SelectField<Values = string | number | boolean | File, Extend = Record<neve
 export type SelectFieldChoice<Values = string | number | boolean | File, Extend = Record<never, never>> = {
   key: string,
   value: Values,
+  group?: string,
 } & Extend;
 
 /* custom display configuration */
@@ -194,7 +197,6 @@ const commonFieldSchema = () =>
     required: Joi.bool(),
     as_password: Joi.bool(),
     show: Joi.bool(),
-    show_label: Joi.bool().default(true),
     t: Joi.string(),
     as_array: Joi.bool(),
     array_min: Joi.when(`as_array`, {
@@ -212,7 +214,8 @@ const commonFieldSchema = () =>
       then: Joi.number(),
       otherwise: Joi.forbidden(),
     }),
-  });
+  }).concat(Joi.object() // experimental properties for custom front features
+    .pattern(Joi.string().regex(/^experimental_/), Joi.any()));
 
 const types = [`any`, `string`, `number`, `boolean`, `date`, `datetime`, `time`, `dict`, `file`];
 
@@ -229,6 +232,7 @@ const choiceSchema = (type: Joi.Schema) =>
   Joi.object({
     key: Joi.string().required(),
     value: type.required(),
+    group: Joi.string(),
   }).unknown();
 
 const choicesSchema = (type: Joi.Schema) =>
@@ -398,7 +402,8 @@ const fileReplacer = (field: Common & FileInputField): Field => ({
     },
   ],
   default: field.default,
-  ..._.pick(field, [`altered_by`, `disabled`, `required`, `as_password`, `show`, `show_label`, `as_array`, `array_min`, `array_max`, `array_length`]),
+  ..._.pick(field, [`altered_by`, `disabled`, `required`, `as_password`, `show`, `as_array`, `array_min`, `array_max`, `array_length`]),
+  ...Object.assign({}, ...Object.entries(field).map(([k, v]) => k.startsWith(`experimental_`) ? { [k]: v } : {})),
 }) as Field;
 
 const fileInputFieldSchema = () =>

package/src/minified-utils/locales.ts

@@ -11,6 +11,7 @@ import { Source } from '../entities/source';
 export type LocalizedField = {
   label: string,
   help: string,
+  ui?: Record<string, any>,
 };
 
 export type LocalizedProperties = {
@@ -142,6 +143,7 @@ const localizeField = (
 
   field.label = t(`${root}.${key}.label`, { fallback: true });
   field.help = t(`${root}.${key}.help`);
+  field.ui = t(`${root}.${key}.ui`, { fallback: true, optional: true });
 
   if (field.type === `dict` && field.items) {
     field.items = field.items.map((f) => localizeField(t, element, f, { parent: `${key}.items`, t: field.t }));
@@ -150,6 +152,7 @@ const localizeField = (
       ...fc,
       label: t(`${root}.${key}.choices.${fc.key}.label`, { fallback: true }),
       help: t(`${root}.${key}.choices.${fc.key}.help`),
+      ...fc.group && { group: t(`${root}.${key}.groups.${fc.group}`, { fallback: true }) },
     }));
   }