npm - @fintekkers/ledger-models - Versions diffs - 0.1.116 → 0.1.117 - Mend

@fintekkers/ledger-models 0.1.116 → 0.1.117

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

package/node/wrappers/models/security/identifier.test.ts ADDED Viewed

@@ -0,0 +1,65 @@
+import assert = require('assert');
+import { Identifier } from './identifier';
+import { IdentifierProto } from '../../../fintekkers/models/security/identifier/identifier_pb';
+import { IdentifierTypeProto } from '../../../fintekkers/models/security/identifier/identifier_type_pb';
+test('test Identifier.ISIN returns correct type name and toString', () => {
+    testIsinIdentifier();
+});
+test('test Identifier.CUSIP returns correct type name and toString', () => {
+    testCusipIdentifier();
+});
+test('test Identifier.EXCH_TICKER returns correct type name and toString', () => {
+    testExchTickerIdentifier();
+});
+test('test Identifier.UNKNOWN returns correct type name and toString', () => {
+    testUnknownIdentifier();
+});
+function testIsinIdentifier(): void {
+    const identifierProto = new IdentifierProto();
+    identifierProto.setIdentifierType(IdentifierTypeProto.ISIN);
+    identifierProto.setIdentifierValue('US0378331005');
+    const identifier = new Identifier(identifierProto);
+    assert(identifier.getIdentifierTypeName() === 'ISIN', 'Should return "ISIN"');
+    assert(identifier.getIdentifierValue() === 'US0378331005', 'Should return the identifier value');
+    assert(identifier.toString() === 'ISIN:US0378331005', 'Should return "ISIN:US0378331005"');
+}
+function testCusipIdentifier(): void {
+    const identifierProto = new IdentifierProto();
+    identifierProto.setIdentifierType(IdentifierTypeProto.CUSIP);
+    identifierProto.setIdentifierValue('037833100');
+    const identifier = new Identifier(identifierProto);
+    assert(identifier.getIdentifierTypeName() === 'CUSIP', 'Should return "CUSIP"');
+    assert(identifier.getIdentifierValue() === '037833100', 'Should return the identifier value');
+    assert(identifier.toString() === 'CUSIP:037833100', 'Should return "CUSIP:037833100"');
+}
+function testExchTickerIdentifier(): void {
+    const identifierProto = new IdentifierProto();
+    identifierProto.setIdentifierType(IdentifierTypeProto.EXCH_TICKER);
+    identifierProto.setIdentifierValue('AAPL');
+    const identifier = new Identifier(identifierProto);
+    assert(identifier.getIdentifierTypeName() === 'EXCH_TICKER', 'Should return "EXCH_TICKER"');
+    assert(identifier.getIdentifierValue() === 'AAPL', 'Should return the identifier value');
+    assert(identifier.toString() === 'EXCH_TICKER:AAPL', 'Should return "EXCH_TICKER:AAPL"');
+}
+function testUnknownIdentifier(): void {
+    const identifierProto = new IdentifierProto();
+    identifierProto.setIdentifierType(IdentifierTypeProto.UNKNOWN_IDENTIFIER_TYPE);
+    identifierProto.setIdentifierValue('UNKNOWN123');
+    const identifier = new Identifier(identifierProto);
+    assert(identifier.getIdentifierTypeName() === 'UNKNOWN_IDENTIFIER_TYPE', 'Should return "UNKNOWN_IDENTIFIER_TYPE"');
+    assert(identifier.getIdentifierValue() === 'UNKNOWN123', 'Should return the identifier value');
+    assert(identifier.toString() === 'UNKNOWN_IDENTIFIER_TYPE:UNKNOWN123', 'Should return "UNKNOWN_IDENTIFIER_TYPE:UNKNOWN123"');
+}

package/node/wrappers/models/security/identifier.ts ADDED Viewed

@@ -0,0 +1,58 @@
+import { IdentifierProto } from '../../../fintekkers/models/security/identifier/identifier_pb';
+import { IdentifierTypeProto } from '../../../fintekkers/models/security/identifier/identifier_type_pb';
+export class Identifier {
+    proto: IdentifierProto;
+    constructor(proto: IdentifierProto) {
+        this.proto = proto;
+    }
+    static identifierTypeEnumMap: Map<number, string>;
+    static {
+        Identifier.identifierTypeEnumMap = new Map<number, string>();
+        Object.keys(IdentifierTypeProto).forEach(key => {
+            Identifier.identifierTypeEnumMap.set(IdentifierTypeProto[key as keyof typeof IdentifierTypeProto], key);
+        });
+    }
+    /**
+     * Returns the identifier type name based on the enum value.
+     * NOTE that this method is not performant and should only be used for debugging purposes,
+     * or infrequently. If this is required for a high performance use case, please create a
+     * reverse map with the enum ID as the key and the enum descriptor as the value.
+     *
+     * @returns IdentifierType as a string (e.g., "ISIN", "CUSIP", "EXCH_TICKER")
+     */
+    getIdentifierTypeName(): string {
+        const identifierType = this.proto.getIdentifierType();
+        return Identifier.identifierTypeEnumMap.get(identifierType) ?? 'UNKNOWN_IDENTIFIER_TYPE';
+    }
+    /**
+     * Returns the identifier value (e.g., "US0378331005" for an ISIN)
+     */
+    getIdentifierValue(): string {
+        return this.proto.getIdentifierValue();
+    }
+    /**
+     * Returns the identifier type enum value
+     */
+    getIdentifierType(): IdentifierTypeProto {
+        return this.proto.getIdentifierType();
+    }
+    /**
+     * Returns a string representation in the format: "IDENTIFIER_TYPE:identifier_value"
+     * Example: "ISIN:US0378331005" or "CUSIP:037833100"
+     */
+    toString(): string {
+        const typeName = this.getIdentifierTypeName();
+        const value = this.getIdentifierValue();
+        return `${typeName}:${value}`;
+    }
+}

package/node/wrappers/models/security/term.test.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = require("assert");
 const term_1 = require("./term");
 const tenor_type_pb_1 = require("../../../fintekkers/models/security/tenor_type_pb");
+const tenor_pb_1 = require("../../../fintekkers/models/security/tenor_pb");
 test('test Tenor.UNKNOWN_TENOR has correct type', () => {
     testUnknownTenor();
 });
@@ -27,6 +28,11 @@ test('test Tenor.getTenor() returns correct period', () => {
 test('test Tenor.getTenorDescription() returns correct string', () => {
     testGetTenorDescription();
 });
+test('test Tenor toString', () => {
+    let tenorProto = new tenor_pb_1.TenorProto().setTenorType(tenor_type_pb_1.TenorTypeProto.TERM).setTermValue("2Y3M");
+    let tenor2 = new term_1.Tenor(tenorProto.getTenorType(), tenorProto.getTermValue());
+    expect(tenor2.toString()).toBe("TERM: 2Y3M");
+});
 test('test Tenor.toString() returns correct representation', () => {
     testToString();
 });

package/node/wrappers/models/security/term.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"term.test.js","sourceRoot":"","sources":["term.test.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"term.test.js","sourceRoot":"","sources":["term.test.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/security/term.test.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import assert = require('assert');
 import { Tenor, Period } from './term';
 import { TenorTypeProto } from '../../../fintekkers/models/security/tenor_type_pb';
+import { TenorProto } from '../../../fintekkers/models/security/tenor_pb';
 test('test Tenor.UNKNOWN_TENOR has correct type', () => {
     testUnknownTenor();
@@ -34,6 +35,12 @@ test('test Tenor.getTenorDescription() returns correct string', () => {
     testGetTenorDescription();
 });
+test('test Tenor toString', () => {
+    let tenorProto = new TenorProto().setTenorType(TenorTypeProto.TERM).setTermValue("2Y3M");
+    let tenor2 = new Tenor(tenorProto.getTenorType(), tenorProto.getTermValue());
+    expect(tenor2.toString()).toBe("TERM: 2Y3M");
+});
 test('test Tenor.toString() returns correct representation', () => {
     testToString();
 });

package/node/wrappers/models/utils/date.test.js CHANGED Viewed

@@ -35,6 +35,6 @@ test('test the date time', () => __awaiter(void 0, void 0, void 0, function* ()
     const pos = new position_1.Position(position);
     const timestampStr = pos.getFieldDisplay(field1);
     //Expect timestamp match
-    expect(timestampStr).toMatch(/^\d{4}\/(?:\d{1,2})(?:\/\d{1,2})?$/);
+    expect(timestampStr).toMatch(/^\d{4}\-(?:\d{1,2})(?:\-\d{1,2})?$/);
 }));
 //# sourceMappingURL=date.test.js.map

package/node/wrappers/models/utils/date.test.ts CHANGED Viewed

@@ -32,5 +32,5 @@ test('test the date time', async () => {
     const timestampStr = pos.getFieldDisplay(field1);
     //Expect timestamp match
-    expect(timestampStr).toMatch(/^\d{4}\/(?:\d{1,2})(?:\/\d{1,2})?$/);
+    expect(timestampStr).toMatch(/^\d{4}\-(?:\d{1,2})(?:\-\d{1,2})?$/);
 });

package/node/wrappers/models/utils/serialization.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { IdentifierProto } from "../../../fintekkers/models/security/identifier/identifier_pb";
 import { DecimalValueProto } from "../../../fintekkers/models/util/decimal_value_pb";
 import { LocalDateProto } from "../../../fintekkers/models/util/local_date_pb";
 import { LocalTimestampProto } from "../../../fintekkers/models/util/local_timestamp_pb";
@@ -6,7 +7,8 @@ import { ZonedDateTime } from "./datetime";
 import { ProtoEnum } from "./protoEnum";
 import { UUID } from "./uuid";
 import { StringValue } from 'google-protobuf/google/protobuf/wrappers_pb';
+import { Identifier } from "../security/identifier";
 export declare class ProtoSerializationUtil {
-    static serialize(obj: any): DecimalValueProto | LocalDateProto | LocalTimestampProto | UUIDProto | StringValue;
-    static deserialize(obj: any): string | number | ZonedDateTime | Date | UUID | ProtoEnum;
+    static serialize(obj: any): UUIDProto | LocalDateProto | LocalTimestampProto | DecimalValueProto | StringValue | IdentifierProto;
+    static deserialize(obj: any): UUID | Date | ZonedDateTime | Identifier | string | number | ProtoEnum;
 }

package/node/wrappers/models/utils/serialization.js CHANGED Viewed

@@ -10,6 +10,7 @@ const datetime_1 = require("./datetime");
 const protoEnum_1 = require("./protoEnum");
 const uuid_1 = require("./uuid");
 const wrappers_pb_1 = require("google-protobuf/google/protobuf/wrappers_pb");
+const identifier_1 = require("../security/identifier");
 class ProtoSerializationUtil {
     static serialize(obj) {
         if (obj instanceof uuid_1.UUID) {
@@ -30,6 +31,9 @@ class ProtoSerializationUtil {
         if (obj instanceof String) {
             return new wrappers_pb_1.StringValue().setValue(obj.toString());
         }
+        if (obj instanceof identifier_1.Identifier) {
+            return obj.proto;
+        }
         throw new Error(`Could not serialize object of type ${typeof obj}. Value: ${obj}`);
     }
     static deserialize(obj) {
@@ -45,7 +49,7 @@ class ProtoSerializationUtil {
             return new datetime_1.ZonedDateTime(obj);
         }
         if (obj instanceof identifier_pb_1.IdentifierProto) {
-            return obj.getIdentifierType() + ":" + obj.getIdentifierValue();
+            return new identifier_1.Identifier(obj);
         }
         if (obj instanceof decimal_value_pb_1.DecimalValueProto) {
             return parseFloat(obj.getArbitraryPrecisionValue());

package/node/wrappers/models/utils/serialization.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serialization.js","sourceRoot":"","sources":["serialization.ts"],"names":[],"mappings":";;;AACA,gGAA+F;AAC/F,uFAAqF;AACrF,iFAA+E;AAC/E,2FAAyF;AACzF,qEAAoE;AAEpE,yCAA2C;AAC3C,2CAAwC;AACxC,iCAA8B;AAC9B,6EAA0E;~~AAG1E~~,MAAa,sBAAsB;IACjC,MAAM,CAAC,SAAS,CAAC,GAAQ;QACvB,IAAI,GAAG,YAAY,WAAI,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;QACD,IAAI,GAAG,YAAY,IAAI,EAAE,CAAC;YACxB,OAAO,IAAI,8BAAc,EAAE;iBACxB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;iBAC1B,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;iBAC5B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,GAAG,YAAY,wBAAa,EAAE,CAAC;YACjC,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,oCAAiB,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,GAAG,YAAY,MAAM,EAAE,CAAC;YAC1B,OAAO,IAAI,yBAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAQ;QACzB,IAAI,GAAG,YAAY,mBAAS,EAAE,CAAC;YAC7B,OAAO,WAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,GAAG,YAAY,8BAAc,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,GAAG,YAAY,wCAAmB,EAAE,CAAC;YACvC,OAAO,IAAI,wBAAa,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,GAAG,YAAY,+BAAe,EAAE,CAAC;YACnC,OAAO,~~GAAG~~,CAAC,~~iBAAiB,EAAE,~~GAAG,~~GAAG,GAAG,GAAG,~~CAAC,~~kBAAkB,EAAE,~~CAAC;~~QAClE~~,CAAC;QACD,IAAI,GAAG,YAAY,oCAAiB,EAAE,CAAC;YACrC,OAAO,UAAU,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,GAAG,YAAY,yBAAW,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;QACD,IAAI,GAAG,KAAK,IAAI,IAAI,WAAW,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,WAAW,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YACzG,OAAO,IAAI,qBAAS,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,OAAO,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC;IACvF,CAAC;CACF;~~AAnDD~~,~~wDAmDC~~"}
1	+ {"version":3,"file":"serialization.js","sourceRoot":"","sources":["serialization.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/utils/serialization.ts CHANGED Viewed

@@ -10,9 +10,10 @@ import { ProtoEnum } from "./protoEnum";
 import { UUID } from "./uuid";
 import { StringValue } from 'google-protobuf/google/protobuf/wrappers_pb';
 import { Any } from 'google-protobuf/google/protobuf/any_pb';
+import { Identifier } from "../security/identifier";
 export class ProtoSerializationUtil {
-  static serialize(obj: any) { //}: UUIDProto | LocalDateProto | LocalTimestampProto | DecimalValueProto | StringValue {
+  static serialize(obj: any): UUIDProto | LocalDateProto | LocalTimestampProto | DecimalValueProto | StringValue | IdentifierProto { //}: UUIDProto | LocalDateProto | LocalTimestampProto | DecimalValueProto | StringValue {
     if (obj instanceof UUID) {
       return obj.toUUIDProto();
     }
@@ -31,11 +32,14 @@ export class ProtoSerializationUtil {
     if (obj instanceof String) {
       return new StringValue().setValue(obj.toString());
     }
+    if (obj instanceof Identifier) {
+      return obj.proto as IdentifierProto;
+    }
     throw new Error(`Could not serialize object of type ${typeof obj}. Value: ${obj}`);
   }
-  static deserialize(obj: any) { //}: UUID | Date | ZonedDateTime | number | string {
+  static deserialize(obj: any): UUID | Date | ZonedDateTime | Identifier | string | number | ProtoEnum { //}: UUID | Date | ZonedDateTime | number | string {
     if (obj instanceof UUIDProto) {
       return UUID.fromU8Array(obj.getRawUuid_asU8());
     }
@@ -48,7 +52,7 @@ export class ProtoSerializationUtil {
       return new ZonedDateTime(obj);
     }
     if (obj instanceof IdentifierProto) {
-      return obj.getIdentifierType() + ":" + obj.getIdentifierValue();
+      return new Identifier(obj);
     }
     if (obj instanceof DecimalValueProto) {
       return parseFloat(obj.getArbitraryPrecisionValue());

package/node/wrappers/models/utils/serialization.util.d.ts CHANGED Viewed

@@ -1,4 +1,7 @@
 import { Any } from 'google-protobuf/google/protobuf/any_pb';
-declare function pack(value: any): Any;
-declare function unpack(value: Any): any;
+import { ZonedDateTime } from './datetime';
+import { UUID } from './uuid';
+import { Identifier } from '../security/identifier';
+declare function pack(value: Date | ZonedDateTime | UUID | Identifier | string | number): Any;
+declare function unpack(value: Any): Date | ZonedDateTime | UUID | Identifier | string | number;
 export { pack, unpack };

package/node/wrappers/models/utils/serialization.util.js CHANGED Viewed

@@ -9,6 +9,8 @@ const datetime_1 = require("./datetime");
 const local_timestamp_pb_1 = require("../../../fintekkers/models/util/local_timestamp_pb");
 const uuid_1 = require("./uuid");
 const uuid_pb_1 = require("../../../fintekkers/models/util/uuid_pb");
+const identifier_1 = require("../security/identifier");
+const identifier_pb_1 = require("../../../fintekkers/models/security/identifier/identifier_pb");
 function pack(value) {
     if (typeof value === 'string') {
         return packStringIntoAny(value);
@@ -22,9 +24,14 @@ function pack(value) {
         return packTimestampIntoAny(localDateProto);
     }
     else if (value instanceof uuid_1.UUID) {
-        // const uuid: UUIDProto = ProtoSerializationUtil.serialize(value);
         return packIDIntoAny(value.toUUIDProto());
     }
+    else if (value instanceof identifier_1.Identifier) {
+        return packIdentifierProtoIntoAny(value.proto);
+    }
+    else if (value && typeof value === 'object' && 'proto' in value && value.proto instanceof identifier_pb_1.IdentifierProto) {
+        return packIdentifierProtoIntoAny(value.proto);
+    }
     else {
         throw new Error("Unrecognized type cannot be packed: " + typeof value);
     }
@@ -44,12 +51,28 @@ function unpack(value) {
     else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
         return unpackIDIntoAny(value);
     }
+    else if (typeUrl === 'type.googleapis.com/fintekkers.models.security.identifier.IdentifierProto') {
+        return unpackIdentifierProtoFromAny(value);
+    }
     else {
         console.log(value);
         throw new Error("Unrecognized Any type cannot be unpacked: " + typeUrl);
     }
 }
 exports.unpack = unpack;
+function unpackIdentifierProtoFromAny(anyMessage) {
+    const typeUrl = anyMessage.getTypeUrl();
+    if (typeUrl !== 'type.googleapis.com/fintekkers.models.security.identifier.IdentifierProto') {
+        throw new Error('Unexpected type URL for an identifier: ' + typeUrl);
+    }
+    const identifierProto = identifier_pb_1.IdentifierProto.deserializeBinary(anyMessage.getValue_asU8());
+    return serialization_1.ProtoSerializationUtil.deserialize(identifierProto);
+}
+function packIdentifierProtoIntoAny(input) {
+    const anyMessage = new any_pb_1.Any();
+    anyMessage.pack(input.serializeBinary(), 'fintekkers.models.security.identifier.IdentifierProto');
+    return anyMessage;
+}
 function packIDIntoAny(uuid) {
     const anyMessage = new any_pb_1.Any();
     anyMessage.pack(uuid.serializeBinary(), 'fintekkers.models.util.UUIDProto');

package/node/wrappers/models/utils/serialization.util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serialization.util.js","sourceRoot":"","sources":["serialization.util.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,6EAA0E;AAC1E,mDAAyD;AACzD,iFAA+E;AAC/E,yCAA2C;AAC3C,2FAAyF;AACzF,iCAA8B;AAC9B,qEAAoE;~~AAEpE~~,SAAS,IAAI,CAAC,~~KAAU~~;~~IACtB~~,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;SAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACjC,MAAM,cAAc,GAAmB,sCAAsB,CAAC,SAAS,CAAC,KAAK,CAAmB,CAAC;QACjG,OAAO,eAAe,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,KAAK,YAAY,wBAAa,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAwB,sCAAsB,CAAC,SAAS,CAAC,KAAK,CAAwB,CAAC;QAC3G,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,KAAK,YAAY,WAAI,EAAE,CAAC;QACjC,~~mEAAmE;QACnE,~~OAAO,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5C,CAAC;SAAM,CAAC;~~QACN~~,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,OAAO,KAAK,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;~~AAgGQ~~,oBAAI;~~AA9Fb~~,SAAS,MAAM,CAAC,KAAU;IACxB,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;IACnC,IAAI,OAAO,KAAK,iDAAiD,EAAE,CAAC;QAClE,OAAO,mBAAmB,CAAC,KAAK,~~CAAC~~,CAAC;~~IACpC~~,CAAC;SAAM,IAAI,OAAO,KAAK,2DAA2D,EAAE,CAAC;QACnF,OAAO,iBAAiB,CAAC,KAAK,~~CAAC~~,CAAC;~~IAClC~~,CAAC;SAAM,IAAI,OAAO,KAAK,gEAAgE,EAAE,CAAC;QACxF,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,OAAO,KAAK,sDAAsD,EAAE,CAAC;QAC9E,OAAO,eAAe,CAAC,KAAK,~~CAAC~~,CAAC;~~IAChC~~,CAAC;SAAM,CAAC;~~QACN~~,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,OAAO,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;~~AAgFc~~,wBAAM;~~AA7ErB~~,SAAS,aAAa,CAAC,IAAe;IACpC,MAAM,UAAU,GAAG,IAAI,YAAG,EAAE,CAAC;IAE7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,kCAAkC,CAAC,CAAC;IAC5E,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,eAAe,CAAC,UAAe;IACtC,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAExC,IAAI,OAAO,KAAK,sDAAsD,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,OAAO,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,SAAS,GAAc,mBAAS,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IACrF,OAAO,sCAAsB,CAAC,WAAW,CAAC,SAAS,~~CAAyB~~,CAAC;~~AAC/E~~,CAAC;AAED,SAAS,oBAAoB,CAAC,SAA8B;IAC1D,MAAM,UAAU,GAAG,IAAI,YAAG,EAAE,CAAC;IAE7B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,4CAA4C,CAAC,CAAC;IAC3F,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAe;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAExC,IAAI,OAAO,KAAK,gEAAgE,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,SAAS,GAAwB,wCAAmB,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IACzG,OAAO,sCAAsB,CAAC,WAAW,CAAC,SAAS,~~CAAmC~~,CAAC;~~AACzF~~,CAAC;AAED,SAAS,eAAe,CAAC,SAAyB;IAChD,MAAM,UAAU,GAAG,IAAI,YAAG,EAAE,CAAC;IAE7B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,uCAAuC,CAAC,CAAC;IACtF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAe;IACxC,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAExC,IAAI,OAAO,KAAK,2DAA2D,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,OAAO,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,SAAS,GAAmB,8BAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IAC/F,OAAO,sCAAsB,CAAC,WAAW,CAAC,SAAS,~~CAA8B~~,CAAC;~~AACpF~~,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,MAAM,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;IACtC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAElC,MAAM,UAAU,GAAG,IAAI,YAAG,EAAE,CAAC;IAC7B,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,EAAE,6BAA6B,CAAC,CAAC;IAE9E,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAe;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAExC,IAAI,OAAO,KAAK,iDAAiD,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,UAAU,GAAG,yBAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IAC7E,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;IAE1C,OAAO,WAAW,CAAC;AACrB,CAAC"}
1	+ {"version":3,"file":"serialization.util.js","sourceRoot":"","sources":["serialization.util.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/utils/serialization.util.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serialization.util.test.js","sourceRoot":"","sources":["serialization.util.test.ts"],"names":[],"mappings":";;AAEA,6DAAoD;AACpD,yCAA2C;AAE3C,iCAAkC;AAElC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;IACzC,UAAU,EAAE,CAAC;AACf,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACvC,QAAQ,EAAE,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC5C,aAAa,EAAE,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,SAAS,aAAa;IACpB,MAAM,GAAG,GAAG,wBAAa,CAAC,GAAG,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAQ,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAC;IACjC,MAAM,WAAW,GAAkB,IAAA,2BAAM,EAAC,SAAS,~~CAAC~~,CAAC;~~IAErD~~,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,WAAW,EAAE,EAAE,wBAAwB,CAAC,CAAC;IACrF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACjF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,WAAW,CAAC,cAAc,EAAE,EAAE,0BAA0B,CAAC,CAAC;AAC/F,CAAC;AAED,SAAS,QAAQ;IACf,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE9B,MAAM,UAAU,GAAQ,IAAA,yBAAI,EAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,YAAY,GAAS,IAAA,2BAAM,EAAC,UAAU,~~CAAC~~,CAAC;~~IAC9C~~,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,UAAU;IACjB,MAAM,UAAU,GAAG,OAAO,CAAC;IAE3B,MAAM,YAAY,GAAQ,IAAA,yBAAI,EAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,cAAc,GAAW,IAAA,2BAAM,EAAC,YAAY,~~CAAC~~,CAAC;~~IACpD~~,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,EAAE,iCAAiC,CAAC,CAAC;AAC9E,CAAC"}
1	+ {"version":3,"file":"serialization.util.test.js","sourceRoot":"","sources":["serialization.util.test.ts"],"names":[],"mappings":";;AAEA,6DAAoD;AACpD,yCAA2C;AAE3C,iCAAkC;AAElC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;IACzC,UAAU,EAAE,CAAC;AACf,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACvC,QAAQ,EAAE,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC5C,aAAa,EAAE,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,SAAS,aAAa;IACpB,MAAM,GAAG,GAAG,wBAAa,CAAC,GAAG,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAQ,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAC;IACjC,MAAM,WAAW,GAAkB,IAAA,2BAAM,EAAC,SAAS,CAAkB,CAAC;IAEtE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,WAAW,EAAE,EAAE,wBAAwB,CAAC,CAAC;IACrF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACjF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,WAAW,CAAC,cAAc,EAAE,EAAE,0BAA0B,CAAC,CAAC;AAC/F,CAAC;AAED,SAAS,QAAQ;IACf,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE9B,MAAM,UAAU,GAAQ,IAAA,yBAAI,EAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,YAAY,GAAS,IAAA,2BAAM,EAAC,UAAU,CAAS,CAAC;IACtD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,UAAU;IACjB,MAAM,UAAU,GAAG,OAAO,CAAC;IAE3B,MAAM,YAAY,GAAQ,IAAA,yBAAI,EAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,cAAc,GAAW,IAAA,2BAAM,EAAC,YAAY,CAAW,CAAC;IAC9D,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,EAAE,iCAAiC,CAAC,CAAC;AAC9E,CAAC"}

package/node/wrappers/models/utils/serialization.util.test.ts CHANGED Viewed

@@ -21,7 +21,7 @@ function testTimestamp() {
   const now = ZonedDateTime.now();
   const packedNow: Any = pack(now);
-  const unpackedNow: ZonedDateTime = unpack(packedNow);
+  const unpackedNow: ZonedDateTime = unpack(packedNow) as ZonedDateTime;
   assert.equal(now.getTimezone(), unpackedNow.getTimezone(), "Timezone doesn't match");
   assert.equal(now.getSeconds(), unpackedNow.getSeconds(), "Seconds do not match");
@@ -33,7 +33,7 @@ function testDate() {
   testDate.setHours(0, 0, 0, 0);
   const packedDate: Any = pack(testDate);
-  const unpackedDate: Date = unpack(packedDate);
+  const unpackedDate: Date = unpack(packedDate) as Date;
   assert.equal(unpackedDate.getTime(), testDate.getTime(), "Date packing/unpacking failed");
 }
@@ -41,7 +41,7 @@ function testString() {
   const testString = "Hello";
   const packedString: Any = pack(testString);
-  const unpackedString: String = unpack(packedString);
+  const unpackedString: String = unpack(packedString) as string;
   assert.equal(unpackedString, testString, "String packing/unpacking failed");
 }

package/node/wrappers/models/utils/serialization.util.ts CHANGED Viewed

@@ -6,8 +6,10 @@ import { ZonedDateTime } from './datetime';
 import { LocalTimestampProto } from '../../../fintekkers/models/util/local_timestamp_pb';
 import { UUID } from './uuid';
 import { UUIDProto } from '../../../fintekkers/models/util/uuid_pb';
+import { Identifier } from '../security/identifier';
+import { IdentifierProto } from '../../../fintekkers/models/security/identifier/identifier_pb';
-function pack(value: any) {
+function pack(value: Date | ZonedDateTime | UUID | Identifier | string | number) {
   if (typeof value === 'string') {
     return packStringIntoAny(value);
   } else if (value instanceof Date) {
@@ -17,29 +19,52 @@ function pack(value: any) {
     const localDateProto: LocalTimestampProto = ProtoSerializationUtil.serialize(value) as LocalTimestampProto;
     return packTimestampIntoAny(localDateProto);
   } else if (value instanceof UUID) {
-    // const uuid: UUIDProto = ProtoSerializationUtil.serialize(value);
     return packIDIntoAny(value.toUUIDProto());
-  } else {
+  } else if (value instanceof Identifier) {
+    return packIdentifierProtoIntoAny(value.proto as IdentifierProto);
+  } else if (value && typeof value === 'object' && 'proto' in value && (value as any).proto instanceof IdentifierProto) {
+    return packIdentifierProtoIntoAny((value as any).proto as IdentifierProto);
+  }
+  else {
     throw new Error("Unrecognized type cannot be packed: " + typeof value);
   }
 }
-function unpack(value: Any): any {
+function unpack(value: Any): Date | ZonedDateTime | UUID | Identifier | string | number {
   const typeUrl = value.getTypeUrl();
   if (typeUrl === 'type.googleapis.com/google.protobuf.StringValue') {
-    return unpackStringFromAny(value);
+    return unpackStringFromAny(value) as string;
   } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
-    return unpackDateFromAny(value);
+    return unpackDateFromAny(value) as Date;
   } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
     return unpackTimestampFromAny(value);
   } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
-    return unpackIDIntoAny(value);
-  } else {
+    return unpackIDIntoAny(value) as UUID;
+  } else if (typeUrl === 'type.googleapis.com/fintekkers.models.security.identifier.IdentifierProto') {
+    return unpackIdentifierProtoFromAny(value) as Identifier;
+  }
+  else {
     console.log(value);
     throw new Error("Unrecognized Any type cannot be unpacked: " + typeUrl);
   }
 }
+function unpackIdentifierProtoFromAny(anyMessage: Any): Identifier {
+  const typeUrl = anyMessage.getTypeUrl();
+  if (typeUrl !== 'type.googleapis.com/fintekkers.models.security.identifier.IdentifierProto') {
+    throw new Error('Unexpected type URL for an identifier: ' + typeUrl);
+  }
+  const identifierProto: IdentifierProto = IdentifierProto.deserializeBinary(anyMessage.getValue_asU8());
+  return ProtoSerializationUtil.deserialize(identifierProto) as unknown as Identifier;
+}
+function packIdentifierProtoIntoAny(input: IdentifierProto): Any {
+  const anyMessage = new Any();
+  anyMessage.pack(input.serializeBinary(), 'fintekkers.models.security.identifier.IdentifierProto');
+  return anyMessage;
+}
 function packIDIntoAny(uuid: UUIDProto): Any {
   const anyMessage = new Any();
@@ -48,7 +73,7 @@ function packIDIntoAny(uuid: UUIDProto): Any {
   return anyMessage;
 }
-function unpackIDIntoAny(anyMessage: Any): UUIDProto {
+function unpackIDIntoAny(anyMessage: Any): UUID {
   const typeUrl = anyMessage.getTypeUrl();
   if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
@@ -56,7 +81,7 @@ function unpackIDIntoAny(anyMessage: Any): UUIDProto {
   }
   const uuidProto: UUIDProto = UUIDProto.deserializeBinary(anyMessage.getValue_asU8());
-  return ProtoSerializationUtil.deserialize(uuidProto) as unknown as UUIDProto;
+  return ProtoSerializationUtil.deserialize(uuidProto) as unknown as UUID;
 }
 function packTimestampIntoAny(inputDate: LocalTimestampProto): Any {
@@ -66,7 +91,7 @@ function packTimestampIntoAny(inputDate: LocalTimestampProto): Any {
   return anyMessage;
 }
-function unpackTimestampFromAny(anyMessage: Any): LocalTimestampProto {
+function unpackTimestampFromAny(anyMessage: Any): ZonedDateTime {
   const typeUrl = anyMessage.getTypeUrl();
   if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
@@ -74,7 +99,7 @@ function unpackTimestampFromAny(anyMessage: Any): LocalTimestampProto {
   }
   const dateProto: LocalTimestampProto = LocalTimestampProto.deserializeBinary(anyMessage.getValue_asU8());
-  return ProtoSerializationUtil.deserialize(dateProto) as unknown as LocalTimestampProto;
+  return ProtoSerializationUtil.deserialize(dateProto) as unknown as ZonedDateTime;
 }
 function packDateIntoAny(inputDate: LocalDateProto): Any {
@@ -84,7 +109,7 @@ function packDateIntoAny(inputDate: LocalDateProto): Any {
   return anyMessage;
 }
-function unpackDateFromAny(anyMessage: Any): LocalDateProto {
+function unpackDateFromAny(anyMessage: Any): Date {
   const typeUrl = anyMessage.getTypeUrl();
   if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
@@ -92,7 +117,7 @@ function unpackDateFromAny(anyMessage: Any): LocalDateProto {
   }
   const dateProto: LocalDateProto = LocalDateProto.deserializeBinary(anyMessage.getValue_asU8());
-  return ProtoSerializationUtil.deserialize(dateProto) as unknown as LocalDateProto;
+  return ProtoSerializationUtil.deserialize(dateProto) as unknown as Date;
 }
 function packStringIntoAny(inputString: string): Any {

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@fintekkers/ledger-models",
   "todo": "Replace the version with build script version number",
-  "version": "0.1.116",
+  "version": "0.1.117",
   "description": "ledger model protos ",
   "authors": [
     "David Doherty",