@mcma/core 0.14.4 → 0.14.7

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

@@ -4,12 +4,13 @@ exports.JobAssignment = void 0;
 const job_base_1 = require("./job-base");
 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 {
     constructor(properties) {
         super("JobAssignment", properties);
-        this.checkProperty("jobId", "url");
-        this.checkProperty("tracker", "object", false);
-        this.checkProperty("notificationEndpoint", "object", false);
+        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);
         }

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

@@ -4,13 +4,14 @@ exports.JobBase = void 0;
 const job_parameter_bag_1 = require("./job-parameter-bag");
 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 {
     constructor(type, properties) {
         super(type, properties);
-        this.checkProperty("status", "string", false);
-        this.checkProperty("error", "object", false);
-        this.checkProperty("jobOutput", "object", false);
-        this.checkProperty("progress", "number", false);
+        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);
         }

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobExecution = void 0;
 const job_base_1 = require("./job-base");
+const utils_1 = require("../utils");
 class JobExecution extends job_base_1.JobBase {
     constructor(properties) {
         super("JobExecution", properties);
-        this.checkProperty("jobAssignmentId", "url", false);
-        this.checkProperty("actualDuration", "number", false);
-        this.actualStartDate = this.ensureValidDateOrUndefined(this.actualStartDate);
-        this.actualEndDate = this.ensureValidDateOrUndefined(this.actualEndDate);
+        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.d.ts

@@ -7,6 +7,4 @@ export declare class JobParameterBag extends McmaObject implements JobParameterB
     constructor(properties?: {
         [key: string]: any;
     });
-    get<T>(key: string): T;
-    set<T>(key: string, value: T): this;
 }

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

@@ -6,12 +6,5 @@ class JobParameterBag extends mcma_object_1.McmaObject {
     constructor(properties) {
         super("JobParameterBag", properties);
     }
-    get(key) {
-        return this[key];
-    }
-    set(key, value) {
-        this[key] = value;
-        return this;
-    }
 }
 exports.JobParameterBag = JobParameterBag;

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

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobParameter = void 0;
 const mcma_object_1 = require("./mcma-object");
+const utils_1 = require("../utils");
 class JobParameter extends mcma_object_1.McmaObject {
     constructor(properties) {
         super("JobParameter", properties);
-        this.checkProperty("parameterName", "string");
-        this.checkProperty("parameterType", "string");
+        utils_1.Utils.checkProperty(this, "parameterName", "string");
+        utils_1.Utils.checkProperty(this, "parameterType", "string");
     }
 }
 exports.JobParameter = JobParameter;

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

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobProfile = void 0;
 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 {
     constructor(properties) {
         super("JobProfile", properties);
-        this.checkProperty("name", "string", true);
-        this.checkProperty("inputParameters", "Array", false);
-        this.checkProperty("outputParameters", "Array", false);
-        this.checkProperty("optionalInputParameters", "Array", false);
+        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));
         }

package/dist/lib/model/jobs/job.js

@@ -5,17 +5,18 @@ const job_base_1 = require("../job-base");
 const job_parameter_bag_1 = require("../job-parameter-bag");
 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 {
     constructor(type, properties) {
         super(type, properties);
-        this.checkProperty("parentId", "string", false);
-        this.checkProperty("jobProfileId", "url", true);
-        this.checkProperty("jobInput", "object", false);
-        this.checkProperty("timeout", "number", false);
-        this.checkProperty("tracker", "object", false);
-        this.checkProperty("notificationEndpoint", "object", false);
+        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 = this.ensureValidDateOrUndefined(this.deadline);
+        this.deadline = utils_1.Utils.ensureValidDateOrUndefined(this.deadline);
         if (typeof this.notificationEndpoint === "object") {
             this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(this.notificationEndpoint);
         }

package/dist/lib/model/locator.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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);
-        this.checkProperty("url", "string", true);
+        utils_1.Utils.checkProperty(this, "url", "string", true);
     }
 }
 exports.Locator = Locator;

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

@@ -4,6 +4,4 @@ export interface McmaObjectProperties {
 export declare class McmaObject implements McmaObjectProperties {
     ["@type"]: string;
     constructor(type: string, properties?: McmaObjectProperties);
-    protected checkProperty(propertyName: string, expectedType: string, required?: boolean): void;
-    protected ensureValidDateOrUndefined(maybeDate: any): Date;
 }

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McmaObject = void 0;
-const mcma_exception_1 = require("../mcma-exception");
-const utils_1 = require("../utils");
 class McmaObject {
     constructor(type, properties) {
         if (properties) {
@@ -10,45 +8,5 @@ class McmaObject {
         }
         this["@type"] = type;
     }
-    checkProperty(propertyName, expectedType, required) {
-        const propertyValue = this[propertyName];
-        const propertyType = typeof propertyValue;
-        if (propertyValue === undefined || propertyValue === null) {
-            if (required) {
-                throw new mcma_exception_1.McmaException("Resource of type '" + this["@type"] + "' requires property '" + propertyName + "' to be defined", null, this);
-            }
-            return;
-        }
-        if (expectedType === "url") {
-            if (propertyType !== "string" || !utils_1.Utils.isValidUrl(propertyValue)) {
-                throw new mcma_exception_1.McmaException("Resource of type '" + this["@type"] + "' requires property '" + propertyName + "' to have a valid URL", null, this);
-            }
-        }
-        else if (expectedType === "Array") {
-            if (!Array.isArray(propertyValue)) {
-                throw new mcma_exception_1.McmaException("Resource of type '" + this["@type"] + "' requires property '" + propertyName + "' to have type Array", null, this);
-            }
-        }
-        else if (expectedType === "object") {
-            if (propertyType !== "object" || Array.isArray(propertyValue)) {
-                throw new mcma_exception_1.McmaException("Resource of type '" + this["@type"] + "' requires property '" + propertyName + "' to have type object", null, this);
-            }
-        }
-        else {
-            if (expectedType !== propertyType) {
-                throw new mcma_exception_1.McmaException("Resource of type '" + this["@type"] + "' requires property '" + propertyName + "' to have type " + expectedType, null, this);
-            }
-        }
-    }
-    ensureValidDateOrUndefined(maybeDate) {
-        if (maybeDate === undefined || maybeDate === null) {
-            return undefined;
-        }
-        const date = new Date(maybeDate);
-        if (isNaN(date.getTime())) {
-            return undefined;
-        }
-        return date;
-    }
 }
 exports.McmaObject = McmaObject;

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

@@ -17,6 +17,4 @@ export declare abstract class McmaResource extends McmaObject implements McmaRes
         [key: string]: any;
     };
     protected constructor(type: string, properties: McmaResourceProperties);
-    onCreate: (id: string) => void;
-    onUpsert: (id: string) => void;
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McmaResource = exports.onResourceUpsert = exports.onResourceCreate = void 0;
 const mcma_object_1 = require("./mcma-object");
+const utils_1 = require("../utils");
 function onResourceCreate(resource, id) {
     resource.id = id;
     resource.dateModified = resource.dateCreated = new Date();
@@ -18,10 +19,8 @@ exports.onResourceUpsert = onResourceUpsert;
 class McmaResource extends mcma_object_1.McmaObject {
     constructor(type, properties) {
         super(type, properties);
-        this.onCreate = (id) => onResourceCreate(this, id);
-        this.onUpsert = (id) => onResourceUpsert(this, id);
-        this.dateCreated = this.ensureValidDateOrUndefined(this.dateCreated);
-        this.dateModified = this.ensureValidDateOrUndefined(this.dateModified);
+        this.dateCreated = utils_1.Utils.ensureValidDateOrUndefined(this.dateCreated);
+        this.dateModified = utils_1.Utils.ensureValidDateOrUndefined(this.dateModified);
     }
 }
 exports.McmaResource = McmaResource;

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McmaTracker = void 0;
 const mcma_object_1 = require("./mcma-object");
+const utils_1 = require("../utils");
 class McmaTracker extends mcma_object_1.McmaObject {
     constructor(properties) {
         super("McmaTracker", properties);
-        this.checkProperty("id", "string", true);
-        this.checkProperty("label", "string", true);
-        this.checkProperty("custom", "object", false);
+        utils_1.Utils.checkProperty(this, "id", "string", true);
+        utils_1.Utils.checkProperty(this, "label", "string", true);
+        utils_1.Utils.checkProperty(this, "custom", "object", false);
     }
 }
 exports.McmaTracker = McmaTracker;

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

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

package/dist/lib/model/notification.js

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

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProblemDetail = void 0;
 const mcma_object_1 = require("./mcma-object");
+const utils_1 = require("../utils");
 class ProblemDetail extends mcma_object_1.McmaObject {
     constructor(properties) {
         super("ProblemDetail", properties);
-        this.checkProperty("type", "string", true);
-        this.checkProperty("title", "string", true);
-        this.checkProperty("detail", "string", false);
-        this.checkProperty("instance", "string", false);
+        utils_1.Utils.checkProperty(this, "type", "string", true);
+        utils_1.Utils.checkProperty(this, "title", "string", true);
+        utils_1.Utils.checkProperty(this, "detail", "string", false);
+        utils_1.Utils.checkProperty(this, "instance", "string", false);
     }
 }
 exports.ProblemDetail = ProblemDetail;

package/dist/lib/model/resource-endpoint.d.ts

@@ -3,12 +3,10 @@ export interface ResourceEndpointProperties extends McmaObjectProperties {
     resourceType: string;
     httpEndpoint: string;
     authType?: string;
-    authContext?: any;
 }
 export declare class ResourceEndpoint extends McmaObject implements ResourceEndpointProperties {
     resourceType: string;
     httpEndpoint: string;
     authType?: string;
-    authContext?: any;
     constructor(properties: ResourceEndpointProperties);
 }

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceEndpoint = void 0;
 const mcma_object_1 = require("./mcma-object");
+const utils_1 = require("../utils");
 class ResourceEndpoint extends mcma_object_1.McmaObject {
     constructor(properties) {
         super("ResourceEndpoint", properties);
-        this.checkProperty("resourceType", "string", true);
-        this.checkProperty("httpEndpoint", "url", true);
-        this.checkProperty("authType", "string", false);
+        utils_1.Utils.checkProperty(this, "resourceType", "string", true);
+        utils_1.Utils.checkProperty(this, "httpEndpoint", "url", true);
+        utils_1.Utils.checkProperty(this, "authType", "string", false);
     }
 }
 exports.ResourceEndpoint = ResourceEndpoint;

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

@@ -4,7 +4,6 @@ export interface ServiceProperties extends McmaResourceProperties {
     name: string;
     resources: ResourceEndpointProperties[];
     authType?: string;
-    authContext?: any;
     jobType?: string;
     jobProfileIds?: string[];
 }
@@ -12,7 +11,6 @@ export declare class Service extends McmaResource implements ServiceProperties {
     name: string;
     resources: ResourceEndpoint[];
     authType?: string;
-    authContext?: any;
     jobType?: string;
     jobProfileIds?: string[];
     constructor(properties: ServiceProperties);

package/dist/lib/model/service.js

@@ -3,27 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = void 0;
 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 {
     constructor(properties) {
         super("Service", properties);
-        this.checkProperty("name", "string", true);
-        this.checkProperty("resources", "Array", true);
-        this.checkProperty("authType", "string", false);
-        this.checkProperty("jobType", "string", false);
-        this.checkProperty("jobProfileIds", "Array", false);
-        if (properties.authContext) {
-            if (typeof properties.authContext === "string") {
-                try {
-                    this.authContext = JSON.parse(properties.authContext);
-                }
-                catch {
-                    this.authContext = properties.authContext;
-                }
-            }
-            else {
-                this.authContext = properties.authContext;
-            }
-        }
+        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]);
         }

package/dist/lib/utils.d.ts

@@ -5,6 +5,8 @@ declare function fromBase64(base64Text: string): string;
 declare function sleep(timeout: number): Promise<void>;
 declare function isValidDateString(value: any): boolean;
 declare function reviver(this: any, key: string, value: any): any;
+declare function ensureValidDateOrUndefined(maybeDate: any): Date | undefined;
+declare function checkProperty(object: any, propertyName: string, expectedType: string, required?: boolean): void;
 export declare const Utils: {
     isValidUrl: typeof isValidUrl;
     getTypeName: typeof getTypeName;
@@ -13,5 +15,7 @@ export declare const Utils: {
     sleep: typeof sleep;
     isValidDateString: typeof isValidDateString;
     reviver: typeof reviver;
+    ensureValidDateOrUndefined: typeof ensureValidDateOrUndefined;
+    checkProperty: typeof checkProperty;
 };
 export {};

package/dist/lib/utils.js

@@ -60,6 +60,46 @@ function reviver(key, value) {
     }
     return value;
 }
+function ensureValidDateOrUndefined(maybeDate) {
+    if (maybeDate === undefined || maybeDate === null) {
+        return undefined;
+    }
+    const date = new Date(maybeDate);
+    if (isNaN(date.getTime())) {
+        return undefined;
+    }
+    return date;
+}
+function checkProperty(object, propertyName, expectedType, required) {
+    const propertyValue = object[propertyName];
+    const propertyType = typeof propertyValue;
+    if (propertyValue === undefined || propertyValue === null) {
+        if (required) {
+            throw new mcma_exception_1.McmaException("Resource of type '" + object["@type"] + "' requires property '" + propertyName + "' to be defined", null, object);
+        }
+        return;
+    }
+    if (expectedType === "url") {
+        if (propertyType !== "string" || !exports.Utils.isValidUrl(propertyValue)) {
+            throw new mcma_exception_1.McmaException("Resource of type '" + object["@type"] + "' requires property '" + propertyName + "' to have a valid URL", null, object);
+        }
+    }
+    else if (expectedType === "Array") {
+        if (!Array.isArray(propertyValue)) {
+            throw new mcma_exception_1.McmaException("Resource of type '" + object["@type"] + "' requires property '" + propertyName + "' to have type Array", null, object);
+        }
+    }
+    else if (expectedType === "object") {
+        if (propertyType !== "object" || Array.isArray(propertyValue)) {
+            throw new mcma_exception_1.McmaException("Resource of type '" + object["@type"] + "' requires property '" + propertyName + "' to have type object", null, object);
+        }
+    }
+    else {
+        if (expectedType !== propertyType) {
+            throw new mcma_exception_1.McmaException("Resource of type '" + object["@type"] + "' requires property '" + propertyName + "' to have type " + expectedType, null, object);
+        }
+    }
+}
 exports.Utils = {
     isValidUrl,
     getTypeName,
@@ -68,4 +108,6 @@ exports.Utils = {
     sleep,
     isValidDateString,
     reviver,
+    ensureValidDateOrUndefined,
+    checkProperty,
 };

package/package.json

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