quidproquo-core 0.0.94 → 0.0.95

package/lib/actions/eventBus/EventBusSendMessageActionTypes.d.ts

@@ -1,9 +1,6 @@
-import { Action, ActionProcessor, ActionRequester } from '../../types/Action';
+import { Action, ActionProcessor, ActionRequester, CrossModuleMessage } from '../../types';
 import { EventBusActionType } from './EventBusActionType';
-export interface EventBusMessage<T = null> {
-    type: string;
-    payload: T;
-}
+export type EventBusMessage<T> = CrossModuleMessage<T>;
 export interface EventBusSendMessageActionPayload<T> {
     eventBusName: string;
     eventBusMessages: EventBusMessage<T>[];

package/lib/actions/queue/QueueSendMessageActionTypes.d.ts

@@ -1,9 +1,6 @@
-import { Action, ActionProcessor, ActionRequester } from '../../types/Action';
+import { Action, ActionProcessor, ActionRequester, CrossModuleMessage } from '../../types';
 import { QueueActionType } from './QueueActionType';
-export interface QueueMessage<T = null> {
-    type: string;
-    payload: T;
-}
+export type QueueMessage<T> = CrossModuleMessage<T>;
 export interface QueueSendMessageActionPayload<T> {
     queueName: string;
     queueMessages: QueueMessage<T>[];

package/lib/actions/userDirectory/UserDirectoryRefreshTokenActionRequester.d.ts

@@ -1,2 +1,2 @@
 import { UserDirectoryRefreshTokenActionRequester } from './UserDirectoryRefreshTokenActionTypes';
-export declare function askUserDirectoryRefreshToken(userDirectoryName: string, username: string, refreshToken: string): UserDirectoryRefreshTokenActionRequester;
+export declare function askUserDirectoryRefreshToken(userDirectoryName: string, refreshToken: string): UserDirectoryRefreshTokenActionRequester;

package/lib/actions/userDirectory/UserDirectoryRefreshTokenActionRequester.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askUserDirectoryRefreshToken = void 0;
 const UserDirectoryActionType_1 = require("./UserDirectoryActionType");
-function* askUserDirectoryRefreshToken(userDirectoryName, username, refreshToken) {
+function* askUserDirectoryRefreshToken(userDirectoryName, refreshToken) {
     return yield {
         type: UserDirectoryActionType_1.UserDirectoryActionType.RefreshToken,
         payload: {
             userDirectoryName,
-            username,
             refreshToken,
         },
     };

package/lib/actions/userDirectory/UserDirectoryRefreshTokenActionTypes.d.ts

@@ -2,7 +2,6 @@ import { Action, ActionProcessor, ActionRequester } from '../../types/Action';
 import { UserDirectoryActionType, AuthenticateUserResponse } from './UserDirectoryActionType';
 export interface UserDirectoryRefreshTokenActionPayload {
     userDirectoryName: string;
-    username: string;
     refreshToken: string;
 }
 export interface UserDirectoryRefreshTokenAction extends Action<UserDirectoryRefreshTokenActionPayload> {

package/lib/config/QPQConfig.d.ts

@@ -10,7 +10,8 @@ export declare enum QPQCoreConfigSettingType {
     eventBus = "@quidproquo-core/config/EventBus",
     userDirectory = "@quidproquo-core/config/UserDirectory",
     keyValueStore = "@quidproquo-core/config/KeyValueStore",
-    configValue = "@quidproquo-core/config/ConfigValue"
+    configValue = "@quidproquo-core/config/ConfigValue",
+    environmentSettings = "@quidproquo-core/config/EnvironmentSettings"
 }
 export interface QPQConfigSetting {
     configSettingType: string;
@@ -19,6 +20,5 @@ export interface QPQConfigSetting {
 export interface QPQConfigAdvancedSettings {
     deprecated?: boolean;
 }
-export type QPQConfigSettings = QPQConfigSetting[];
-export type QPQConfigItem = QPQConfigSetting | QPQConfigSettings;
+export type QPQConfigItem = QPQConfigSetting | QPQConfigItem[];
 export type QPQConfig = QPQConfigItem[];

package/lib/config/QPQConfig.js

@@ -15,4 +15,5 @@ var QPQCoreConfigSettingType;
     QPQCoreConfigSettingType["userDirectory"] = "@quidproquo-core/config/UserDirectory";
     QPQCoreConfigSettingType["keyValueStore"] = "@quidproquo-core/config/KeyValueStore";
     QPQCoreConfigSettingType["configValue"] = "@quidproquo-core/config/ConfigValue";
+    QPQCoreConfigSettingType["environmentSettings"] = "@quidproquo-core/config/EnvironmentSettings";
 })(QPQCoreConfigSettingType = exports.QPQCoreConfigSettingType || (exports.QPQCoreConfigSettingType = {}));

package/lib/config/settings/environmentSettings.d.ts

@@ -0,0 +1,6 @@
+import { QPQConfigSetting } from '../QPQConfig';
+export interface EnvironmentSettingsQPQConfigSetting extends QPQConfigSetting {
+    environment: string;
+    settings: QPQConfigSetting[];
+}
+export declare const defineEnvironmentSettings: (environment: string, settings: QPQConfigSetting[]) => EnvironmentSettingsQPQConfigSetting;

package/lib/config/settings/environmentSettings.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineEnvironmentSettings = void 0;
+const QPQConfig_1 = require("../QPQConfig");
+const defineEnvironmentSettings = (environment, settings) => ({
+    configSettingType: QPQConfig_1.QPQCoreConfigSettingType.environmentSettings,
+    uniqueKey: environment,
+    environment,
+    settings,
+});
+exports.defineEnvironmentSettings = defineEnvironmentSettings;

package/lib/config/settings/index.d.ts

@@ -3,6 +3,7 @@ export * from './actionProcessors';
 export * from './applicationModule';
 export * from './buildPath';
 export * from './configValue';
+export * from './environmentSettings';
 export * from './eventBus';
 export * from './keyValueStore';
 export * from './parameter';

package/lib/config/settings/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./actionProcessors"), exports);
 __exportStar(require("./applicationModule"), exports);
 __exportStar(require("./buildPath"), exports);
 __exportStar(require("./configValue"), exports);
+__exportStar(require("./environmentSettings"), exports);
 __exportStar(require("./eventBus"), exports);
 __exportStar(require("./keyValueStore"), exports);
 __exportStar(require("./parameter"), exports);

package/lib/qpqCoreUtils.d.ts

@@ -3,9 +3,11 @@ import { ApplicationModuleQPQConfigSetting, StorageDriveQPQConfigSetting, EventB
 import { EmailTemplates } from './config/settings/emailTemplates/types';
 /**
  * Flattens a QPQConfig array into a single array of QPQConfigSetting objects.
+ * If a QPQConfigItem has a configSettingType of QPQCoreConfigSettingType.environmentSettings,
+ * and its environment matches the current environment, its settings will be added to the flattened array.
  * @function
  * @param {QPQConfig} qpqConfig - The input QPQConfig array to be flattened.
- * @returns {QPQConfigSetting[]} - The flattened array of QPQConfigSetting objects.
+ * @returns {QPQConfigSetting[]} - The flattened array of QPQConfigSetting objects
  */
 export declare const flattenQpqConfig: (qpqConfig: QPQConfig) => QPQConfigSetting[];
 /**

package/lib/qpqCoreUtils.js

@@ -28,11 +28,14 @@ const path = __importStar(require("path"));
 const QPQConfig_1 = require("./config/QPQConfig");
 /**
  * Flattens a QPQConfig array into a single array of QPQConfigSetting objects.
+ * If a QPQConfigItem has a configSettingType of QPQCoreConfigSettingType.environmentSettings,
+ * and its environment matches the current environment, its settings will be added to the flattened array.
  * @function
  * @param {QPQConfig} qpqConfig - The input QPQConfig array to be flattened.
- * @returns {QPQConfigSetting[]} - The flattened array of QPQConfigSetting objects.
+ * @returns {QPQConfigSetting[]} - The flattened array of QPQConfigSetting objects
  */
 const flattenQpqConfig = (qpqConfig) => {
+    var environment = 'development';
     /**
      * A recursive helper function that flattens an array of QPQConfigItem objects.
      * @function
@@ -46,6 +49,17 @@ const flattenQpqConfig = (qpqConfig) => {
                 return flatten(item, acc);
             }
             else {
+                // If its a appName config item, update the environment variable
+                if (item.configSettingType === QPQConfig_1.QPQCoreConfigSettingType.appName) {
+                    environment = item.environment || 'development';
+                }
+                // Otherwise if its an environmentSettings config item, flatten out the child settings
+                else if (item.configSettingType === QPQConfig_1.QPQCoreConfigSettingType.environmentSettings) {
+                    const envSetting = item;
+                    const settings = envSetting.environment === environment ? envSetting.settings : [];
+                    return flatten(settings, acc);
+                }
+                // Otherwise its just a regular config item, add it to the list
                 return [...acc, item];
             }
         }, accumulator);

package/lib/qpqExecuteLog.js

@@ -21,7 +21,10 @@ const qpqExecuteLog = (storyResult, runtime) => __awaiter(void 0, void 0, void 0
         },
     });
     // Generate an empty story resolver
-    const resolveStory = (0, qpqRuntime_1.createRuntime)([(0, config_1.defineApplicationModule)('Debugger', storyResult.moduleName, 'development', __dirname)], {}, storyActionProcessor, () => new Date().toISOString(), () => __awaiter(void 0, void 0, void 0, function* () { }), () => '', storyResult.runtimeType);
+    const resolveStory = (0, qpqRuntime_1.createRuntime)([(0, config_1.defineApplicationModule)('Debugger', storyResult.moduleName, 'development', __dirname)], {
+        correlation: storyResult.fromCorrelation,
+        depth: 0,
+    }, storyActionProcessor, () => new Date().toISOString(), () => __awaiter(void 0, void 0, void 0, function* () { }), storyResult.correlation, storyResult.runtimeType);
     // Execute it with the initial input
     debugger;
     const result = yield resolveStory(runtime, storyResult.input);

package/lib/qpqRuntime.d.ts

@@ -1,4 +1,4 @@
 import { Action, ActionProcessorList } from './types/Action';
 import { StoryResult, StorySession, QpqRuntimeType } from './types/StorySession';
 import { QPQConfig } from './config';
-export declare const createRuntime: (qpqConfig: QPQConfig, session: StorySession, actionProcessors: ActionProcessorList, getTimeNow: () => string, logger: (res: StoryResult<any>) => Promise<void>, newGuid: () => string, runtimeType: QpqRuntimeType, initialTags?: string[]) => <TArgs extends any[]>(story: (...args: TArgs) => Generator<any, any, Action<any>>, args: TArgs) => Promise<StoryResult<any>>;
+export declare const createRuntime: (qpqConfig: QPQConfig, callerSession: StorySession, actionProcessors: ActionProcessorList, getTimeNow: () => string, logger: (res: StoryResult<any>) => Promise<void>, runtimeCorrelation: string, runtimeType: QpqRuntimeType, initialTags?: string[]) => <TArgs extends any[]>(story: (...args: TArgs) => Generator<any, any, Action<any>>, args: TArgs) => Promise<StoryResult<any>>;

package/lib/qpqRuntime.js

@@ -38,28 +38,33 @@ function processAction(action, actionProcessors, session, logger) {
         return yield processor(action.payload, session, actionProcessors, logger);
     });
 }
-const createRuntime = (qpqConfig, session, actionProcessors, getTimeNow, logger, newGuid, runtimeType, initialTags) => {
+const createRuntime = (qpqConfig, callerSession, actionProcessors, getTimeNow, logger, runtimeCorrelation, runtimeType, initialTags) => {
     function resolveStory(story, args) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const reader = story(...args);
             let action = null;
+            const storySession = {
+                correlation: runtimeCorrelation,
+                depth: callerSession.depth + 1,
+                accessToken: callerSession.accessToken,
+            };
             const response = {
                 input: args,
-                session: Object.assign({}, session),
+                session: storySession,
                 history: [],
                 startedAt: getTimeNow(),
                 tags: initialTags || [],
                 moduleName: (0, qpqCoreUtils_1.getApplicationModuleName)(qpqConfig),
-                correlation: newGuid(),
-                fromCorrelation: session.correlation,
+                correlation: storySession.correlation,
+                fromCorrelation: callerSession.correlation,
                 runtimeType: runtimeType,
             };
             try {
                 action = reader.next();
                 while (!action.done) {
                     const executionTime = getTimeNow();
-                    const actionResult = yield processAction(action.value, actionProcessors, session, logger);
+                    const actionResult = yield processAction(action.value, actionProcessors, storySession, logger);
                     const history = {
                         act: action.value,
                         res: actionResult,

package/lib/types/CrossModuleMessage.d.ts

@@ -0,0 +1,4 @@
+export interface CrossModuleMessage<T> {
+    type: string;
+    payload: T;
+}

package/lib/types/CrossModuleMessage.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/StorySession.d.ts

@@ -2,6 +2,8 @@ import { ErrorTypeEnum } from './ErrorTypeEnum';
 import { Action } from './Action';
 export interface StorySession {
     correlation?: string;
+    depth: number;
+    accessToken?: string;
 }
 export interface StoryError {
     errorType: ErrorTypeEnum;
@@ -18,7 +20,7 @@ export interface ActionHistory<T = any> {
 export declare enum QpqRuntimeType {
     API = "API",
     EXECUTE_STORY = "EXECUTE_STORY",
-    EVENT_BRIDGE_EVENT = "EVENT_BRIDGE_EVENT",
+    RECURRING_SCHEDULE = "RECURRING_SCHEDULE",
     QUEUE_EVENT = "QUEUE_EVENT",
     EVENT_SEO_OR = "EVENT_SEO_OR",
     SERVICE_FUNCTION_EXE = "SERVICE_FUNCTION_EXE"

package/lib/types/StorySession.js

@@ -5,7 +5,7 @@ var QpqRuntimeType;
 (function (QpqRuntimeType) {
     QpqRuntimeType["API"] = "API";
     QpqRuntimeType["EXECUTE_STORY"] = "EXECUTE_STORY";
-    QpqRuntimeType["EVENT_BRIDGE_EVENT"] = "EVENT_BRIDGE_EVENT";
+    QpqRuntimeType["RECURRING_SCHEDULE"] = "RECURRING_SCHEDULE";
     QpqRuntimeType["QUEUE_EVENT"] = "QUEUE_EVENT";
     QpqRuntimeType["EVENT_SEO_OR"] = "EVENT_SEO_OR";
     QpqRuntimeType["SERVICE_FUNCTION_EXE"] = "SERVICE_FUNCTION_EXE";

package/lib/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Action';
+export * from './CrossModuleMessage';
 export * from './StorySession';
 export * from './ErrorTypeEnum';
 export * from './ScheduledEvent';

package/lib/types/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Action"), exports);
+__exportStar(require("./CrossModuleMessage"), exports);
 __exportStar(require("./StorySession"), exports);
 __exportStar(require("./ErrorTypeEnum"), exports);
 __exportStar(require("./ScheduledEvent"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-core",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",