@mcma/core 0.15.0 → 0.16.0

package/dist/lib/config-variables.js

@@ -3,9 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigVariables = void 0;
 const mcma_exception_1 = require("./mcma-exception");
 class ConfigVariables {
+    static instance;
+    static getInstance() {
+        if (!this.instance) {
+            this.instance = new ConfigVariables();
+        }
+        return this.instance;
+    }
+    _keys;
+    _vars;
     constructor(variables) {
         if (!variables) {
-            variables = process === null || process === void 0 ? void 0 : process.env;
+            variables = process?.env;
         }
         this._keys = variables ? Object.keys(variables) : [];
         this._vars = {};
@@ -13,12 +22,6 @@ class ConfigVariables {
             this._vars[key.toUpperCase()] = variables[key];
         }
     }
-    static getInstance() {
-        if (!this.instance) {
-            this.instance = new ConfigVariables();
-        }
-        return this.instance;
-    }
     keys() {
         return this._keys;
     }

package/dist/lib/logging/console-logger-provider.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLoggerProvider = void 0;
 const console_logger_1 = require("./console-logger");
 class ConsoleLoggerProvider {
+    source;
     constructor(source) {
         this.source = source;
     }

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

@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogEvent = void 0;
 const util = require("util");
 class LogEvent {
+    type;
+    level;
+    source;
+    requestId;
+    timestamp;
+    message;
+    tracker;
     constructor(type, level, source, requestId, timestamp, message, tracker) {
         this.type = type;
         this.level = level;
@@ -13,7 +20,6 @@ class LogEvent {
         this.tracker = tracker;
     }
     flatten() {
-        var _a, _b, _c, _d, _e;
         let message = this.message;
         if (message instanceof Error) {
             if (this.message.stack) {
@@ -30,13 +36,13 @@ class LogEvent {
             requestId: this.requestId,
             timestamp: this.timestamp,
             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,
+            trackerId: this.tracker?.id,
+            trackerLabel: this.tracker?.label,
         };
-        if ((_c = this.tracker) === null || _c === void 0 ? void 0 : _c.custom) {
-            for (const key of Object.keys((_d = this.tracker) === null || _d === void 0 ? void 0 : _d.custom)) {
+        if (this.tracker?.custom) {
+            for (const key of Object.keys(this.tracker?.custom)) {
                 const trackerCustomKey = key.substring(0, 1).toUpperCase() + key.substring(1);
-                const trackerCustomValue = (_e = this.tracker) === null || _e === void 0 ? void 0 : _e.custom[key];
+                const trackerCustomValue = this.tracker?.custom[key];
                 switch (trackerCustomKey) {
                     case "Id":
                     case "Label":

package/dist/lib/logging/logger.js

@@ -21,9 +21,12 @@ var LogType;
     LogType["Debug"] = "DEBUG";
 })(LogType = exports.LogType || (exports.LogType = {}));
 class Logger {
+    _source;
+    _requestId;
+    _tracker;
     constructor(source, requestId, tracker) {
         this._source = source;
-        this._requestId = requestId !== null && requestId !== void 0 ? requestId : (0, uuid_1.v4)();
+        this._requestId = requestId ?? (0, uuid_1.v4)();
         this._tracker = tracker;
     }
     get source() {
@@ -35,6 +38,7 @@ class Logger {
     get tracker() {
         return this._tracker;
     }
+    static System;
     buildLogEvent(level, type, message, ...optionalParams) {
         if (optionalParams.length) {
             if (typeof message === "string") {

package/dist/lib/mcma-exception.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McmaException = void 0;
 class McmaException extends Error {
+    message;
+    cause;
+    context;
+    originalStack;
     constructor(message, cause, context) {
         super(message);
         this.message = message;
@@ -13,7 +17,6 @@ class McmaException extends Error {
         this.stack = this.toString(true);
     }
     toString(includeDetails = false) {
-        var _a;
         let ret = "";
         let c = this;
         while (c) {
@@ -24,7 +27,7 @@ class McmaException extends Error {
                 ret += c.stack;
             }
             else {
-                ret += "Error: " + ((_a = c.message) !== null && _a !== void 0 ? _a : c);
+                ret += "Error: " + (c.message ?? c);
             }
             if (includeDetails && c.context) {
                 ret += "\nContext:\n" + JSON.stringify(c.context, null, 2);

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

@@ -6,17 +6,21 @@ const mcma_tracker_1 = require("./mcma-tracker");
 const notification_endpoint_1 = require("./notification-endpoint");
 const utils_1 = require("../utils");
 class JobAssignment extends job_base_1.JobBase {
+    jobId;
+    tracker;
+    notificationEndpoint;
     constructor(properties) {
         super("JobAssignment", properties);
+        this.jobId = properties.jobId;
+        if (typeof properties.tracker === "object") {
+            this.tracker = new mcma_tracker_1.McmaTracker(properties.tracker);
+        }
+        if (typeof properties.notificationEndpoint === "object") {
+            this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(properties.notificationEndpoint);
+        }
         utils_1.Utils.checkProperty(this, "jobId", "url");
         utils_1.Utils.checkProperty(this, "tracker", "object", false);
         utils_1.Utils.checkProperty(this, "notificationEndpoint", "object", false);
-        if (typeof this.notificationEndpoint === "object") {
-            this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(this.notificationEndpoint);
-        }
-        if (typeof this.tracker === "object") {
-            this.tracker = new mcma_tracker_1.McmaTracker(this.tracker);
-        }
     }
 }
 exports.JobAssignment = JobAssignment;

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

@@ -6,16 +6,22 @@ const mcma_resource_1 = require("./mcma-resource");
 const problem_detail_1 = require("./problem-detail");
 const utils_1 = require("../utils");
 class JobBase extends mcma_resource_1.McmaResource {
+    status;
+    error;
+    jobOutput;
+    progress;
     constructor(type, properties) {
         super(type, properties);
+        this.status = properties.status;
+        if (typeof properties.error === "object") {
+            this.error = new problem_detail_1.ProblemDetail(properties.error);
+        }
+        this.jobOutput = new job_parameter_bag_1.JobParameterBag(properties.jobOutput);
+        this.progress = properties.progress;
         utils_1.Utils.checkProperty(this, "status", "string", false);
         utils_1.Utils.checkProperty(this, "error", "object", false);
         utils_1.Utils.checkProperty(this, "jobOutput", "object", false);
         utils_1.Utils.checkProperty(this, "progress", "number", false);
-        if (typeof this.error === "object") {
-            this.error = new problem_detail_1.ProblemDetail(this.error);
-        }
-        this.jobOutput = new job_parameter_bag_1.JobParameterBag(properties.jobOutput);
     }
 }
 exports.JobBase = JobBase;

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

@@ -4,12 +4,18 @@ exports.JobExecution = void 0;
 const job_base_1 = require("./job-base");
 const utils_1 = require("../utils");
 class JobExecution extends job_base_1.JobBase {
+    jobAssignmentId;
+    actualStartDate;
+    actualEndDate;
+    actualDuration;
     constructor(properties) {
         super("JobExecution", properties);
+        this.jobAssignmentId = properties.jobAssignmentId;
+        this.actualStartDate = utils_1.Utils.ensureValidDateOrUndefined(properties.actualStartDate);
+        this.actualEndDate = utils_1.Utils.ensureValidDateOrUndefined(properties.actualEndDate);
+        this.actualDuration = properties.actualDuration;
         utils_1.Utils.checkProperty(this, "jobAssignmentId", "url", false);
         utils_1.Utils.checkProperty(this, "actualDuration", "number", false);
-        this.actualStartDate = utils_1.Utils.ensureValidDateOrUndefined(this.actualStartDate);
-        this.actualEndDate = utils_1.Utils.ensureValidDateOrUndefined(this.actualEndDate);
     }
 }
 exports.JobExecution = JobExecution;

package/dist/lib/model/job-parameter-bag.js

@@ -4,7 +4,9 @@ exports.JobParameterBag = void 0;
 const mcma_object_1 = require("./mcma-object");
 class JobParameterBag extends mcma_object_1.McmaObject {
     constructor(properties) {
-        super("JobParameterBag", properties);
+        super("JobParameterBag");
+        Object.assign(this, properties);
+        this["@type"] = "JobParameterBag";
     }
 }
 exports.JobParameterBag = JobParameterBag;

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

@@ -4,8 +4,12 @@ exports.JobParameter = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class JobParameter extends mcma_object_1.McmaObject {
+    parameterName;
+    parameterType;
     constructor(properties) {
-        super("JobParameter", properties);
+        super("JobParameter");
+        this.parameterName = properties.parameterName;
+        this.parameterType = properties.parameterType;
         utils_1.Utils.checkProperty(this, "parameterName", "string");
         utils_1.Utils.checkProperty(this, "parameterType", "string");
     }

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

@@ -5,21 +5,20 @@ const mcma_resource_1 = require("./mcma-resource");
 const job_parameter_1 = require("./job-parameter");
 const utils_1 = require("../utils");
 class JobProfile extends mcma_resource_1.McmaResource {
+    name;
+    inputParameters;
+    outputParameters;
+    optionalInputParameters;
     constructor(properties) {
         super("JobProfile", properties);
+        this.name = properties.name;
+        this.inputParameters = properties.inputParameters?.map(p => new job_parameter_1.JobParameter(p));
+        this.optionalInputParameters = properties.optionalInputParameters?.map(p => new job_parameter_1.JobParameter(p));
+        this.outputParameters = properties.outputParameters?.map(p => new job_parameter_1.JobParameter(p));
         utils_1.Utils.checkProperty(this, "name", "string", true);
         utils_1.Utils.checkProperty(this, "inputParameters", "Array", false);
         utils_1.Utils.checkProperty(this, "outputParameters", "Array", false);
         utils_1.Utils.checkProperty(this, "optionalInputParameters", "Array", 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.js

@@ -7,22 +7,32 @@ const mcma_tracker_1 = require("../mcma-tracker");
 const notification_endpoint_1 = require("../notification-endpoint");
 const utils_1 = require("../../utils");
 class Job extends job_base_1.JobBase {
+    parentId;
+    jobProfileId;
+    jobInput;
+    timeout;
+    deadline;
+    tracker;
+    notificationEndpoint;
     constructor(type, properties) {
         super(type, properties);
+        this.parentId = properties.parentId;
+        this.jobProfileId = properties.jobProfileId;
+        this.jobInput = new job_parameter_bag_1.JobParameterBag(properties.jobInput);
+        this.timeout = properties.timeout;
+        this.deadline = utils_1.Utils.ensureValidDateOrUndefined(properties.deadline);
+        if (typeof properties.tracker === "object") {
+            this.tracker = new mcma_tracker_1.McmaTracker(properties.tracker);
+        }
+        if (typeof properties.notificationEndpoint === "object") {
+            this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(properties.notificationEndpoint);
+        }
         utils_1.Utils.checkProperty(this, "parentId", "string", false);
         utils_1.Utils.checkProperty(this, "jobProfileId", "url", true);
         utils_1.Utils.checkProperty(this, "jobInput", "object", false);
         utils_1.Utils.checkProperty(this, "timeout", "number", false);
         utils_1.Utils.checkProperty(this, "tracker", "object", false);
         utils_1.Utils.checkProperty(this, "notificationEndpoint", "object", false);
-        this.jobInput = new job_parameter_bag_1.JobParameterBag(properties.jobInput);
-        this.deadline = utils_1.Utils.ensureValidDateOrUndefined(this.deadline);
-        if (typeof this.notificationEndpoint === "object") {
-            this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(this.notificationEndpoint);
-        }
-        if (typeof this.tracker === "object") {
-            this.tracker = new mcma_tracker_1.McmaTracker(this.tracker);
-        }
     }
 }
 exports.Job = Job;

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

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

package/dist/lib/model/locator.js

@@ -4,8 +4,14 @@ exports.Locator = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class Locator extends mcma_object_1.McmaObject {
-    constructor(type, properties) {
-        super(type, properties);
+    url;
+    constructor(typeOrProperties, properties) {
+        if (!properties && typeof typeOrProperties !== "string") {
+            properties = typeOrProperties;
+            typeOrProperties = "Locator";
+        }
+        super(typeOrProperties);
+        this.url = properties.url;
         utils_1.Utils.checkProperty(this, "url", "string", true);
     }
 }

package/dist/lib/model/mcma-object.d.ts

@@ -3,5 +3,5 @@ export interface McmaObjectProperties {
 }
 export declare class McmaObject implements McmaObjectProperties {
     ["@type"]: string;
-    constructor(type: string, properties?: McmaObjectProperties);
+    constructor(type: string);
 }

package/dist/lib/model/mcma-object.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McmaObject = void 0;
 class McmaObject {
-    constructor(type, properties) {
-        if (properties) {
-            Object.assign(this, properties);
-        }
+    ["@type"];
+    constructor(type) {
         this["@type"] = type;
     }
 }

package/dist/lib/model/mcma-resource-type.d.ts

@@ -3,4 +3,4 @@ export interface McmaResourceConstructor<T extends McmaResource> {
     new (...args: any[]): T;
     name: string;
 }
-export declare type McmaResourceType<T extends McmaResource> = string | McmaResourceConstructor<T>;
+export type McmaResourceType<T extends McmaResource> = string | McmaResourceConstructor<T>;

package/dist/lib/model/mcma-resource.js

@@ -17,10 +17,18 @@ function onResourceUpsert(resource, id) {
 }
 exports.onResourceUpsert = onResourceUpsert;
 class McmaResource extends mcma_object_1.McmaObject {
+    id;
+    dateCreated;
+    dateModified;
+    custom;
     constructor(type, properties) {
-        super(type, properties);
-        this.dateCreated = utils_1.Utils.ensureValidDateOrUndefined(this.dateCreated);
-        this.dateModified = utils_1.Utils.ensureValidDateOrUndefined(this.dateModified);
+        super(type);
+        this.id = properties.id;
+        this.dateCreated = utils_1.Utils.ensureValidDateOrUndefined(properties.dateCreated);
+        this.dateModified = utils_1.Utils.ensureValidDateOrUndefined(properties.dateModified);
+        if (typeof properties.custom === "object" && Object.keys(properties.custom).length > 0) {
+            this.custom = Object.assign({}, properties.custom);
+        }
     }
 }
 exports.McmaResource = McmaResource;

package/dist/lib/model/mcma-tracker.js

@@ -4,8 +4,16 @@ exports.McmaTracker = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class McmaTracker extends mcma_object_1.McmaObject {
+    id;
+    label;
+    custom;
     constructor(properties) {
-        super("McmaTracker", properties);
+        super("McmaTracker");
+        this.id = properties.id;
+        this.label = properties.label;
+        if (typeof properties.custom === "object" && Object.keys(properties.custom).length > 0) {
+            this.custom = Object.assign({}, properties.custom);
+        }
         utils_1.Utils.checkProperty(this, "id", "string", true);
         utils_1.Utils.checkProperty(this, "label", "string", true);
         utils_1.Utils.checkProperty(this, "custom", "object", false);

package/dist/lib/model/notification-endpoint.js

@@ -4,8 +4,10 @@ exports.NotificationEndpoint = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class NotificationEndpoint extends mcma_object_1.McmaObject {
+    httpEndpoint;
     constructor(properties) {
-        super("NotificationEndpoint", properties);
+        super("NotificationEndpoint");
+        this.httpEndpoint = properties.httpEndpoint;
         utils_1.Utils.checkProperty(this, "httpEndpoint", "url", true);
     }
 }

package/dist/lib/model/notification.js

@@ -4,8 +4,12 @@ exports.Notification = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class Notification extends mcma_object_1.McmaObject {
+    source;
+    content;
     constructor(properties) {
-        super("Notification", properties);
+        super("Notification");
+        this.source = properties.source;
+        this.content = properties.content;
         utils_1.Utils.checkProperty(this, "source", "string", false);
         utils_1.Utils.checkProperty(this, "content", "object", true);
     }

package/dist/lib/model/problem-detail.d.ts

@@ -12,5 +12,5 @@ export declare class ProblemDetail extends McmaObject implements ProblemDetailPr
     detail?: string;
     instance?: string;
     [key: string]: any;
-    constructor(properties?: ProblemDetailProperties);
+    constructor(properties: ProblemDetailProperties);
 }

package/dist/lib/model/problem-detail.js

@@ -4,8 +4,17 @@ exports.ProblemDetail = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class ProblemDetail extends mcma_object_1.McmaObject {
+    type;
+    title;
+    detail;
+    instance;
     constructor(properties) {
-        super("ProblemDetail", properties);
+        super("ProblemDetail");
+        this.type = properties.type;
+        this.title = properties.title;
+        this.detail = properties.detail;
+        this.instance = properties.instance;
+        Object.assign(this, properties);
         utils_1.Utils.checkProperty(this, "type", "string", true);
         utils_1.Utils.checkProperty(this, "title", "string", true);
         utils_1.Utils.checkProperty(this, "detail", "string", false);

package/dist/lib/model/resource-endpoint.js

@@ -4,8 +4,14 @@ exports.ResourceEndpoint = void 0;
 const mcma_object_1 = require("./mcma-object");
 const utils_1 = require("../utils");
 class ResourceEndpoint extends mcma_object_1.McmaObject {
+    resourceType;
+    httpEndpoint;
+    authType;
     constructor(properties) {
-        super("ResourceEndpoint", properties);
+        super("ResourceEndpoint");
+        this.resourceType = properties.resourceType;
+        this.httpEndpoint = properties.httpEndpoint;
+        this.authType = properties.authType;
         utils_1.Utils.checkProperty(this, "resourceType", "string", true);
         utils_1.Utils.checkProperty(this, "httpEndpoint", "url", true);
         utils_1.Utils.checkProperty(this, "authType", "string", false);

package/dist/lib/model/service.js

@@ -5,16 +5,25 @@ const mcma_resource_1 = require("./mcma-resource");
 const resource_endpoint_1 = require("./resource-endpoint");
 const utils_1 = require("../utils");
 class Service extends mcma_resource_1.McmaResource {
+    name;
+    resources;
+    authType;
+    jobType;
+    jobProfileIds;
     constructor(properties) {
         super("Service", properties);
+        this.name = properties.name;
+        this.resources = properties.resources?.map(re => new resource_endpoint_1.ResourceEndpoint(re));
+        this.authType = properties.authType;
+        this.jobType = properties.jobType;
+        if (Array.isArray(properties.jobProfileIds)) {
+            this.jobProfileIds = [...properties.jobProfileIds];
+        }
         utils_1.Utils.checkProperty(this, "name", "string", true);
         utils_1.Utils.checkProperty(this, "resources", "Array", true);
         utils_1.Utils.checkProperty(this, "authType", "string", false);
         utils_1.Utils.checkProperty(this, "jobType", "string", false);
         utils_1.Utils.checkProperty(this, "jobProfileIds", "Array", false);
-        for (let i = 0; i < this.resources.length; i++) {
-            this.resources[i] = new resource_endpoint_1.ResourceEndpoint(this.resources[i]);
-        }
     }
 }
 exports.Service = Service;

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@mcma/core",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "description": "Node module with type definitions and helper utils for the EBU MCMA framework",
     "engines": {
-        "node": "^16.0.0"
+        "node": "^18.0.0"
     },
     "type": "commonjs",
     "main": "dist/index.js",
@@ -29,11 +29,11 @@
     },
     "homepage": "https://github.com/ebu/mcma-libraries/mcma-core-nodejs#readme",
     "dependencies": {
-        "uuid": "^7.0.3"
+        "uuid": "^9.0.0"
     },
     "devDependencies": {
-        "@types/node": "^16.11.60",
-        "@types/uuid": "^7.0.4",
+        "@types/node": "^18.15.10",
+        "@types/uuid": "^9.0.1",
         "jasmine": "^3.4.0"
     }
 }