attlaz-client 1.4.23 → 1.4.26

package/dist/Http/HttpClientRequest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClientRequest = void 0;
 const Utils_1 = require("../Utils");
+const JsonSerializable_1 = require("../Model/JsonSerializable");
 class HttpClientRequest {
     constructor(url, method = HttpClientRequest.GET) {
         this.headers = {};
@@ -23,7 +24,7 @@ class HttpClientRequest {
     }
     setJsonBody(data) {
         this.setJsonHeader();
-        this.body = JSON.stringify(data);
+        this.body = JsonSerializable_1.JsonSerializable.stringify(data);
     }
     getFullUrl() {
         let result = this.urlObj.href;

package/dist/Http/OAuthClient.js

@@ -6,6 +6,7 @@ const HttpClient_1 = require("./HttpClient");
 const HttpClientRequest_1 = require("./HttpClientRequest");
 const Utils_1 = require("../Utils");
 const ClientOAuth2 = require("client-oauth2");
+const JsonSerializable_1 = require("../Model/JsonSerializable");
 class OAuthClient {
     constructor(options) {
         this.debug = false;
@@ -139,7 +140,7 @@ class OAuthClient {
         let requestData = new HttpClientRequest_1.HttpClientRequest(url, method);
         if ((method === 'POST' || method === 'DELETE' || method === 'PUT') && parameters !== null && parameters !== undefined) {
             if (typeof parameters === 'object') {
-                parameters = JSON.stringify(parameters);
+                parameters = JsonSerializable_1.JsonSerializable.stringify(parameters);
             }
             else if (typeof parameters === 'string') {
             }

package/dist/Model/DataValueCollection.d.ts

@@ -1,8 +1,9 @@
-import { DataValueValue } from './DataValue';
-export declare class DataValueCollection {
-    private values;
+import { DataValue, DataValueValue } from './DataValue';
+import { JsonSerializable } from './JsonSerializable';
+export declare class DataValueCollection extends JsonSerializable implements Iterable<DataValue> {
+    private _values;
     get length(): number;
-    static fromObject(rawTags: {
+    static fromObject(rawValues: {
         key: string;
         value: DataValueValue;
     }[]): DataValueCollection;
@@ -10,4 +11,6 @@ export declare class DataValueCollection {
     get(key: string): DataValueValue | null;
     unset(key: string): void;
     serialize(): string | null;
+    [Symbol.iterator](): Iterator<DataValue>;
+    jsonSerialize(): any;
 }

package/dist/Model/DataValueCollection.js

@@ -3,35 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataValueCollection = void 0;
 const DataValue_1 = require("./DataValue");
 const Utils_1 = require("../Utils");
-class DataValueCollection {
+const JsonSerializable_1 = require("./JsonSerializable");
+class DataValueCollection extends JsonSerializable_1.JsonSerializable {
     constructor() {
-        this.values = [];
+        super(...arguments);
+        this._values = [];
     }
     get length() {
-        return this.values.length;
+        return this._values.length;
     }
-    static fromObject(rawTags) {
-        if (Utils_1.Utils.isNullOrUndefined(rawTags)) {
+    static fromObject(rawValues) {
+        if (Utils_1.Utils.isNullOrUndefined(rawValues)) {
             return new DataValueCollection();
         }
         const result = new DataValueCollection();
-        for (const rawTag of rawTags) {
+        for (const rawValue of rawValues) {
             // TODO: validate rawTag
-            result.set(rawTag.key, rawTag.value);
+            result.set(rawValue.key, rawValue.value);
         }
         return result;
     }
     set(key, value) {
-        const existingIndex = this.values.findIndex((tag) => {
+        const existingIndex = this._values.findIndex((tag) => {
             return tag.key === key;
         });
         if (existingIndex !== -1) {
-            this.values.splice(existingIndex);
+            this._values.splice(existingIndex);
         }
-        this.values.push(new DataValue_1.DataValue(key, value));
+        this._values.push(new DataValue_1.DataValue(key, value));
     }
     get(key) {
-        for (const tag of this.values) {
+        for (const tag of this._values) {
             if (tag.key === key) {
                 return tag.value;
             }
@@ -39,15 +41,21 @@ class DataValueCollection {
         return null;
     }
     unset(key) {
-        this.values = this.values.filter((tag) => {
+        this._values = this._values.filter((tag) => {
             return tag.key !== key;
         });
     }
     serialize() {
-        if (this.values.length === 0) {
+        if (this._values.length === 0) {
             return null;
         }
-        return JSON.stringify(this.values);
+        return JSON.stringify(this._values);
+    }
+    [Symbol.iterator]() {
+        return this._values.values();
+    }
+    jsonSerialize() {
+        return this._values;
     }
 }
 exports.DataValueCollection = DataValueCollection;

package/dist/Model/JsonSerializable.d.ts

@@ -0,0 +1,4 @@
+export declare abstract class JsonSerializable {
+    static stringify(object: any): string;
+    abstract jsonSerialize(): any;
+}

package/dist/Model/JsonSerializable.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonSerializable = void 0;
+class JsonSerializable {
+    static stringify(object) {
+        const replacer = (key, value) => {
+            // Filtering out properties
+            if (value instanceof JsonSerializable && 'jsonSerialize' in value) {
+                return value.jsonSerialize();
+            }
+            return value;
+        };
+        return JSON.stringify(object, replacer);
+    }
+}
+exports.JsonSerializable = JsonSerializable;

package/dist/Model/Log/Log.d.ts

@@ -3,15 +3,15 @@ import { LogStreamId } from './LogStreamId';
 import { LogStatus } from './LogStatus';
 import { DataValueCollection } from '../DataValueCollection';
 export declare class Log {
-    id: string;
+    id: string | null;
     readonly logStream: LogStreamId;
     readonly date: Date;
     readonly level: LogLevel;
-    message: string;
+    readonly message: string;
     context: object;
     status: LogStatus;
     tags: DataValueCollection;
     _version: string;
-    constructor(logStream: LogStreamId, level: LogLevel, date: Date);
+    constructor(logStream: LogStreamId, message: string, level: LogLevel, date: Date);
     static parse(rawLog: any): Log;
 }

package/dist/Model/Log/Log.js

@@ -6,9 +6,11 @@ const LogStreamId_1 = require("./LogStreamId");
 const LogStatus_1 = require("./LogStatus");
 const DataValueCollection_1 = require("../DataValueCollection");
 class Log {
-    constructor(logStream, level, date) {
+    constructor(logStream, message, level, date) {
+        this.id = null;
         this.status = LogStatus_1.LogStatus.Normal;
         this.logStream = logStream;
+        this.message = message;
         this.level = level;
         this.date = date;
         this.tags = new DataValueCollection_1.DataValueCollection();
@@ -17,9 +19,8 @@ class Log {
         const date = new Date(rawLog.date);
         const level = LogLevel_1.LogLevel.fromString(rawLog.level);
         const logStream = new LogStreamId_1.LogStreamId(rawLog.logStream.id);
-        let log = new Log(logStream, level, date);
+        let log = new Log(logStream, rawLog.message, level, date);
         log.id = rawLog.id;
-        log.message = rawLog.message;
         log.context = rawLog.context;
         if (rawLog.status !== null && rawLog.status !== undefined && rawLog.status !== '') {
             log.status = LogStatus_1.LogStatus.fromString(rawLog.status);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.4.23",
+  "version": "1.4.26",
   "description": "Javascript Client to access Attlaz API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",