@mcma/core 0.13.27 → 0.14.1

package/dist/lib/logging/log-event.js

@@ -14,13 +14,22 @@ class LogEvent {
     }
     flatten() {
         var _a, _b, _c, _d, _e;
+        let message = this.message;
+        if (message instanceof Error) {
+            if (this.message.stack) {
+                message = this.message.stack;
+            }
+            else {
+                message = this.message.toString();
+            }
+        }
         const logEventEntry = {
             type: this.type,
             level: this.level,
             source: this.source,
             requestId: this.requestId,
             timestamp: this.timestamp,
-            message: this.message,
+            message,
             trackerId: (_a = this.tracker) === null || _a === void 0 ? void 0 : _a.id,
             trackerLabel: (_b = this.tracker) === null || _b === void 0 ? void 0 : _b.label,
         };

package/dist/lib/mcma-exception.d.ts

@@ -1,7 +1,8 @@
 export declare class McmaException extends Error {
     message: string;
-    cause?: McmaException;
+    cause?: Error;
     context?: any;
-    constructor(message: string, cause?: McmaException, context?: any);
-    toString(): string;
+    originalStack: string;
+    constructor(message: string, cause?: Error, context?: any);
+    toString(includeDetails?: boolean): string;
 }

package/dist/lib/mcma-exception.js

@@ -9,19 +9,24 @@ class McmaException extends Error {
         this.context = context;
         this.cause = cause;
         this.context = context;
+        this.originalStack = this.stack;
+        this.stack = this.toString(true);
     }
-    toString() {
+    toString(includeDetails = false) {
         var _a;
         let ret = "";
         let c = this;
         while (c) {
-            if (c.stack) {
+            if (includeDetails && c.originalStack) {
+                ret += c.originalStack;
+            }
+            else if (includeDetails && c.stack) {
                 ret += c.stack;
             }
             else {
                 ret += "Error: " + ((_a = c.message) !== null && _a !== void 0 ? _a : c);
             }
-            if (c.context) {
+            if (includeDetails && c.context) {
                 ret += "\nContext:\n" + JSON.stringify(c.context, null, 2);
             }
             c = c.cause;

package/dist/lib/model/job-base.d.ts

@@ -1,11 +1,11 @@
-import { JobParameterBag } from "./job-parameter-bag";
+import { JobParameterBag, JobParameterBagProperties } from "./job-parameter-bag";
 import { McmaResource, McmaResourceProperties } from "./mcma-resource";
 import { ProblemDetail, ProblemDetailProperties } from "./problem-detail";
 import { JobStatus } from "./job-status";
 export interface JobBaseProperties extends McmaResourceProperties {
     status?: JobStatus;
     error?: ProblemDetailProperties;
-    jobOutput?: JobParameterBag;
+    jobOutput?: JobParameterBagProperties;
     progress?: number;
 }
 export declare abstract class JobBase<T extends JobBaseProperties> extends McmaResource implements JobBaseProperties {

package/dist/lib/model/job-parameter-bag.d.ts

@@ -1,5 +1,8 @@
-import { McmaObject } from "./mcma-object";
-export declare class JobParameterBag extends McmaObject {
+import { McmaObject, McmaObjectProperties } from "./mcma-object";
+export interface JobParameterBagProperties extends McmaObjectProperties {
+    [key: string]: any;
+}
+export declare class JobParameterBag extends McmaObject implements JobParameterBagProperties {
     [key: string]: any;
     constructor(properties?: {
         [key: string]: any;

package/dist/lib/model/job-profile.d.ts

@@ -1,10 +1,10 @@
 import { McmaResource, McmaResourceProperties } from "./mcma-resource";
-import { JobParameter } from "./job-parameter";
+import { JobParameter, JobParameterProperties } from "./job-parameter";
 export interface JobProfileProperties extends McmaResourceProperties {
     name: string;
-    inputParameters?: JobParameter[];
-    outputParameters?: JobParameter[];
-    optionalInputParameters?: JobParameter[];
+    inputParameters?: JobParameterProperties[];
+    outputParameters?: JobParameterProperties[];
+    optionalInputParameters?: JobParameterProperties[];
 }
 export declare class JobProfile extends McmaResource implements JobProfileProperties {
     name: string;

package/dist/lib/model/job-profile.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobProfile = void 0;
 const mcma_resource_1 = require("./mcma-resource");
+const job_parameter_1 = require("./job-parameter");
 class JobProfile extends mcma_resource_1.McmaResource {
     constructor(properties) {
         super("JobProfile", properties);
@@ -9,7 +10,15 @@ class JobProfile extends mcma_resource_1.McmaResource {
         this.checkProperty("inputParameters", "Array", false);
         this.checkProperty("outputParameters", "Array", false);
         this.checkProperty("optionalInputParameters", "Array", false);
-        this.checkProperty("customProperties", "object", false);
+        if (Array.isArray(this.inputParameters)) {
+            this.inputParameters = this.inputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
+        if (Array.isArray(this.optionalInputParameters)) {
+            this.optionalInputParameters = this.optionalInputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
+        if (Array.isArray(this.outputParameters)) {
+            this.outputParameters = this.outputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
     }
 }
 exports.JobProfile = JobProfile;

package/dist/lib/model/jobs/job.d.ts

@@ -1,11 +1,11 @@
 import { JobBase, JobBaseProperties } from "../job-base";
-import { JobParameterBag } from "../job-parameter-bag";
+import { JobParameterBag, JobParameterBagProperties } from "../job-parameter-bag";
 import { McmaTracker, McmaTrackerProperties } from "../mcma-tracker";
 import { NotificationEndpoint, NotificationEndpointProperties } from "../notification-endpoint";
 export interface JobProperties extends JobBaseProperties {
     parentId?: string;
     jobProfileId: string;
-    jobInput?: JobParameterBag;
+    jobInput?: JobParameterBagProperties;
     timeout?: number;
     deadline?: Date | string;
     tracker?: McmaTrackerProperties;

package/dist/lib/model/locator.d.ts

@@ -1,6 +1,8 @@
 import { McmaObject, McmaObjectProperties } from "./mcma-object";
 export interface LocatorProperties extends McmaObjectProperties {
+    url: string;
 }
 export declare abstract class Locator extends McmaObject implements LocatorProperties {
+    url: string;
     protected constructor(type: string, properties?: LocatorProperties);
 }

package/dist/lib/model/locator.js

@@ -5,6 +5,7 @@ const mcma_object_1 = require("./mcma-object");
 class Locator extends mcma_object_1.McmaObject {
     constructor(type, properties) {
         super(type, properties);
+        this.checkProperty("url", "string", true);
     }
 }
 exports.Locator = Locator;

package/dist/lib/utils.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const mcma_exception_1 = require("./mcma-exception");
-const validUrl = new RegExp("^(https?:\\/\\/)?" + // protocol
-    "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
-    "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
-    "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
-    "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
-    "(\\#[-a-z\\d_]*)?$", "i" // fragment locator
-);
 function isValidUrl(url) {
-    return validUrl.test(url);
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
 }
 function getTypeName(type) {
     if (typeof type === "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mcma/core",
-    "version": "0.13.27",
+    "version": "0.14.1",
     "description": "Node module with type definitions and helper utils for the EBU MCMA framework",
     "engines": {
         "node": "^14.17.0"