sportident.js 1.3.0 → 1.3.1
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.
- package/SiCard/BaseSiCard.js +45 -8
- package/SiCard/BaseSiCard.js.map +1 -1
- package/SiCard/BaseSiCard.test.js +66 -64
- package/SiCard/BaseSiCard.test.js.map +1 -1
- package/SiCard/IRaceResultData.js +2 -1
- package/SiCard/ISiCard.js +2 -1
- package/SiCard/ISiCardExamples.js +2 -1
- package/SiCard/index.js +20 -2
- package/SiCard/index.js.map +1 -1
- package/SiCard/raceResultTools.js +52 -10
- package/SiCard/raceResultTools.js.map +1 -1
- package/SiCard/raceResultTools.test.js +51 -49
- package/SiCard/raceResultTools.test.js.map +1 -1
- package/SiCard/types/FCard.js +41 -4
- package/SiCard/types/FCard.js.map +1 -1
- package/SiCard/types/FCard.test.js +13 -11
- package/SiCard/types/FCard.test.js.map +1 -1
- package/SiCard/types/ModernSiCard.js +67 -25
- package/SiCard/types/ModernSiCard.js.map +1 -1
- package/SiCard/types/ModernSiCard.test.js +104 -69
- package/SiCard/types/ModernSiCard.test.js.map +1 -1
- package/SiCard/types/PCard.js +41 -4
- package/SiCard/types/PCard.js.map +1 -1
- package/SiCard/types/PCard.test.js +13 -11
- package/SiCard/types/PCard.test.js.map +1 -1
- package/SiCard/types/SIAC.js +8 -4
- package/SiCard/types/SIAC.js.map +1 -1
- package/SiCard/types/SIAC.test.js +73 -38
- package/SiCard/types/SIAC.test.js.map +1 -1
- package/SiCard/types/SiCard10.js +8 -4
- package/SiCard/types/SiCard10.js.map +1 -1
- package/SiCard/types/SiCard10.test.js +76 -41
- package/SiCard/types/SiCard10.test.js.map +1 -1
- package/SiCard/types/SiCard11.js +8 -4
- package/SiCard/types/SiCard11.js.map +1 -1
- package/SiCard/types/SiCard11.test.js +73 -38
- package/SiCard/types/SiCard11.test.js.map +1 -1
- package/SiCard/types/SiCard5.js +55 -16
- package/SiCard/types/SiCard5.js.map +1 -1
- package/SiCard/types/SiCard5.test.js +116 -81
- package/SiCard/types/SiCard5.test.js.map +1 -1
- package/SiCard/types/SiCard6.js +56 -17
- package/SiCard/types/SiCard6.js.map +1 -1
- package/SiCard/types/SiCard6.test.js +114 -79
- package/SiCard/types/SiCard6.test.js.map +1 -1
- package/SiCard/types/SiCard8.js +54 -16
- package/SiCard/types/SiCard8.js.map +1 -1
- package/SiCard/types/SiCard8.test.js +104 -69
- package/SiCard/types/SiCard8.test.js.map +1 -1
- package/SiCard/types/SiCard9.js +53 -15
- package/SiCard/types/SiCard9.js.map +1 -1
- package/SiCard/types/SiCard9.test.js +100 -65
- package/SiCard/types/SiCard9.test.js.map +1 -1
- package/SiCard/types/TCard.js +41 -4
- package/SiCard/types/TCard.js.map +1 -1
- package/SiCard/types/TCard.test.js +13 -11
- package/SiCard/types/TCard.test.js.map +1 -1
- package/SiCard/types/index.js +33 -15
- package/SiCard/types/index.js.map +1 -1
- package/SiCard/types/index.test.js +48 -13
- package/SiCard/types/index.test.js.map +1 -1
- package/SiCard/types/modernSiCardExamples.js +58 -21
- package/SiCard/types/modernSiCardExamples.js.map +1 -1
- package/SiCard/types/siCard5Examples.js +43 -6
- package/SiCard/types/siCard5Examples.js.map +1 -1
- package/SiCard/types/siCard6Examples.js +47 -10
- package/SiCard/types/siCard6Examples.js.map +1 -1
- package/SiCard/types/siCard8Examples.js +45 -8
- package/SiCard/types/siCard8Examples.js.map +1 -1
- package/SiCard/types/siCard9Examples.js +45 -8
- package/SiCard/types/siCard9Examples.js.map +1 -1
- package/SiDevice/ISiDevice.js +45 -6
- package/SiDevice/ISiDevice.js.map +1 -1
- package/SiDevice/ISiDeviceDriver.js +41 -3
- package/SiDevice/ISiDeviceDriver.js.map +1 -1
- package/SiDevice/SiDevice.js +57 -20
- package/SiDevice/SiDevice.js.map +1 -1
- package/SiDevice/SiDevice.test.js +138 -103
- package/SiDevice/SiDevice.test.js.map +1 -1
- package/SiDevice/WebSerialSiDeviceDriver.js +49 -11
- package/SiDevice/WebSerialSiDeviceDriver.js.map +1 -1
- package/SiDevice/WebUsbSiDeviceDriver.js +49 -11
- package/SiDevice/WebUsbSiDeviceDriver.js.map +1 -1
- package/SiDevice/index.js +5 -1
- package/SiDevice/index.js.map +1 -1
- package/SiDevice/testUtils/index.js +7 -2
- package/SiDevice/testUtils/index.js.map +1 -1
- package/SiDevice/testUtils/testISiDeviceDriver.js +47 -10
- package/SiDevice/testUtils/testISiDeviceDriver.js.map +1 -1
- package/SiDevice/testUtils/testISiDeviceDriverWithAutodetection.js +52 -15
- package/SiDevice/testUtils/testISiDeviceDriverWithAutodetection.js.map +1 -1
- package/SiStation/BaseSiStation.js +55 -18
- package/SiStation/BaseSiStation.js.map +1 -1
- package/SiStation/BaseSiStation.test.js +95 -60
- package/SiStation/BaseSiStation.test.js.map +1 -1
- package/SiStation/CoupledSiStation.js +53 -16
- package/SiStation/CoupledSiStation.js.map +1 -1
- package/SiStation/CoupledSiStation.test.js +62 -27
- package/SiStation/CoupledSiStation.test.js.map +1 -1
- package/SiStation/ISiMainStation.js +43 -4
- package/SiStation/ISiMainStation.js.map +1 -1
- package/SiStation/ISiSendTask.js +5 -2
- package/SiStation/ISiSendTask.js.map +1 -1
- package/SiStation/ISiStation.js +8 -5
- package/SiStation/ISiStation.js.map +1 -1
- package/SiStation/ISiTargetMultiplexer.js +45 -6
- package/SiStation/ISiTargetMultiplexer.js.map +1 -1
- package/SiStation/SiMainStation.js +56 -19
- package/SiStation/SiMainStation.js.map +1 -1
- package/SiStation/SiMainStation.test.js +123 -88
- package/SiStation/SiMainStation.test.js.map +1 -1
- package/SiStation/SiSendTask.js +48 -11
- package/SiStation/SiSendTask.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.js +83 -46
- package/SiStation/SiTargetMultiplexer.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.targeting.test.js +77 -42
- package/SiStation/SiTargetMultiplexer.targeting.test.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.test.js +236 -201
- package/SiStation/SiTargetMultiplexer.test.js.map +1 -1
- package/SiStation/index.js +13 -5
- package/SiStation/index.js.map +1 -1
- package/SiStation/siStationExamples.js +43 -6
- package/SiStation/siStationExamples.js.map +1 -1
- package/constants.js +7 -4
- package/constants.js.map +1 -1
- package/constants.test.js +47 -12
- package/constants.test.js.map +1 -1
- package/fakes/FakeSiCard/BaseFakeSiCard.js +5 -1
- package/fakes/FakeSiCard/BaseFakeSiCard.js.map +1 -1
- package/fakes/FakeSiCard/BaseFakeSiCard.test.js +41 -6
- package/fakes/FakeSiCard/BaseFakeSiCard.test.js.map +1 -1
- package/fakes/FakeSiCard/IFakeSiCard.js +2 -1
- package/fakes/FakeSiCard/index.js +20 -2
- package/fakes/FakeSiCard/index.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeModernSiCard.js +49 -12
- package/fakes/FakeSiCard/types/FakeModernSiCard.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeModernSiCard.test.js +60 -25
- package/fakes/FakeSiCard/types/FakeModernSiCard.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSIAC.js +12 -8
- package/fakes/FakeSiCard/types/FakeSIAC.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard10.js +12 -8
- package/fakes/FakeSiCard/types/FakeSiCard10.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard11.js +12 -8
- package/fakes/FakeSiCard/types/FakeSiCard11.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard5.js +49 -12
- package/fakes/FakeSiCard/types/FakeSiCard5.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard5.test.js +55 -20
- package/fakes/FakeSiCard/types/FakeSiCard5.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard6.js +49 -12
- package/fakes/FakeSiCard/types/FakeSiCard6.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard6.test.js +60 -25
- package/fakes/FakeSiCard/types/FakeSiCard6.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard8.js +11 -7
- package/fakes/FakeSiCard/types/FakeSiCard8.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard9.js +11 -7
- package/fakes/FakeSiCard/types/FakeSiCard9.js.map +1 -1
- package/fakes/FakeSiCard/types/index.js +17 -7
- package/fakes/FakeSiCard/types/index.js.map +1 -1
- package/fakes/FakeSiDeviceDriver.js +47 -10
- package/fakes/FakeSiDeviceDriver.js.map +1 -1
- package/fakes/FakeSiMainStation.js +66 -29
- package/fakes/FakeSiMainStation.js.map +1 -1
- package/fakes/FakeSiMainStation.test.js +78 -43
- package/fakes/FakeSiMainStation.test.js.map +1 -1
- package/fakes/IFakeSiMainStation.js +39 -2
- package/fakes/IFakeSiMainStation.js.map +1 -1
- package/fakes/index.js +20 -2
- package/fakes/index.js.map +1 -1
- package/index.js +46 -10
- package/index.js.map +1 -1
- package/package.json +2 -3
- package/siProtocol.js +82 -35
- package/siProtocol.js.map +1 -1
- package/siProtocol.test.js +345 -308
- package/siProtocol.test.js.map +1 -1
- package/storage/SiArray.js +8 -4
- package/storage/SiArray.js.map +1 -1
- package/storage/SiArray.test.js +58 -56
- package/storage/SiArray.test.js.map +1 -1
- package/storage/SiBool.js +9 -5
- package/storage/SiBool.js.map +1 -1
- package/storage/SiBool.test.js +65 -63
- package/storage/SiBool.test.js.map +1 -1
- package/storage/SiDataType.js +14 -9
- package/storage/SiDataType.js.map +1 -1
- package/storage/SiDataType.test.js +25 -23
- package/storage/SiDataType.test.js.map +1 -1
- package/storage/SiDict.js +8 -4
- package/storage/SiDict.js.map +1 -1
- package/storage/SiDict.test.js +54 -52
- package/storage/SiDict.test.js.map +1 -1
- package/storage/SiEnum.js +44 -7
- package/storage/SiEnum.js.map +1 -1
- package/storage/SiEnum.test.js +61 -59
- package/storage/SiEnum.test.js.map +1 -1
- package/storage/SiFieldValue.js +8 -4
- package/storage/SiFieldValue.js.map +1 -1
- package/storage/SiFieldValue.test.js +27 -25
- package/storage/SiFieldValue.test.js.map +1 -1
- package/storage/SiInt.js +9 -5
- package/storage/SiInt.js.map +1 -1
- package/storage/SiInt.test.js +65 -63
- package/storage/SiInt.test.js.map +1 -1
- package/storage/SiModified.js +9 -5
- package/storage/SiModified.js.map +1 -1
- package/storage/SiModified.test.js +77 -75
- package/storage/SiModified.test.js.map +1 -1
- package/storage/SiStorage.js +9 -4
- package/storage/SiStorage.js.map +1 -1
- package/storage/SiStorage.test.js +67 -32
- package/storage/SiStorage.test.js.map +1 -1
- package/storage/index.js +28 -11
- package/storage/index.js.map +1 -1
- package/storage/index.test.js +128 -93
- package/storage/index.test.js.map +1 -1
- package/storage/interfaces.js +41 -3
- package/storage/interfaces.js.map +1 -1
- package/storage/siStringEncoding.js +5 -1
- package/storage/siStringEncoding.js.map +1 -1
- package/testUtils.js +28 -16
- package/testUtils.js.map +1 -1
- package/testUtils.test.js +100 -65
- package/testUtils.test.js.map +1 -1
- package/utils/NumberRange.js +6 -2
- package/utils/NumberRange.js.map +1 -1
- package/utils/NumberRange.test.js +56 -54
- package/utils/NumberRange.test.js.map +1 -1
- package/utils/NumberRangeRegistry.js +42 -5
- package/utils/NumberRangeRegistry.js.map +1 -1
- package/utils/NumberRangeRegistry.test.js +37 -35
- package/utils/NumberRangeRegistry.test.js.map +1 -1
- package/utils/bytes.js +22 -11
- package/utils/bytes.js.map +1 -1
- package/utils/bytes.test.js +133 -98
- package/utils/bytes.test.js.map +1 -1
- package/utils/errors.js +11 -4
- package/utils/errors.js.map +1 -1
- package/utils/errors.test.js +51 -16
- package/utils/errors.test.js.map +1 -1
- package/utils/events.js +41 -3
- package/utils/events.js.map +1 -1
- package/utils/events.test.js +56 -21
- package/utils/events.test.js.map +1 -1
- package/utils/general.js +11 -4
- package/utils/general.js.map +1 -1
- package/utils/general.test.js +112 -77
- package/utils/general.test.js.map +1 -1
- package/utils/index.js +24 -8
- package/utils/index.js.map +1 -1
- package/utils/mixins.js +5 -1
- package/utils/mixins.js.map +1 -1
- package/utils/mixins.test.js +48 -13
- package/utils/mixins.test.js.map +1 -1
- package/utils/typed.js +4 -1
- package/utils/typed.js.map +1 -1
|
@@ -1,73 +1,108 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
const globals_1 = require("@jest/globals");
|
|
37
|
+
const constants_1 = require("../../constants");
|
|
38
|
+
const testUtils = __importStar(require("../../testUtils"));
|
|
39
|
+
const BaseSiCard_1 = require("../BaseSiCard");
|
|
40
|
+
const ModernSiCard_1 = require("./ModernSiCard");
|
|
41
|
+
const SiCard10_1 = require("./SiCard10");
|
|
42
|
+
(0, globals_1.describe)('SiCard10', () => {
|
|
43
|
+
(0, globals_1.test)('is registered', () => {
|
|
44
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(6999999)).not.toEqual(SiCard10_1.SiCard10);
|
|
45
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(7000000)).toEqual(SiCard10_1.SiCard10);
|
|
46
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(7999999)).toEqual(SiCard10_1.SiCard10);
|
|
47
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(8000000)).not.toEqual(SiCard10_1.SiCard10);
|
|
13
48
|
});
|
|
14
|
-
describe('typeSpecificInstanceFromMessage', () => {
|
|
15
|
-
test('works for valid message', () => {
|
|
16
|
-
const instance = SiCard10.typeSpecificInstanceFromMessage({
|
|
17
|
-
command: proto.cmd.SI8_DET,
|
|
18
|
-
parameters: [0x00, 0x00, ModernSiCardSeries.SiCard10, 0x77, 0x77, 0x77]
|
|
49
|
+
(0, globals_1.describe)('typeSpecificInstanceFromMessage', () => {
|
|
50
|
+
(0, globals_1.test)('works for valid message', () => {
|
|
51
|
+
const instance = SiCard10_1.SiCard10.typeSpecificInstanceFromMessage({
|
|
52
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
53
|
+
parameters: [0x00, 0x00, ModernSiCard_1.ModernSiCardSeries.SiCard10, 0x77, 0x77, 0x77]
|
|
19
54
|
});
|
|
20
55
|
if (instance === undefined) {
|
|
21
56
|
throw new Error('expect instance');
|
|
22
57
|
}
|
|
23
|
-
expect(instance instanceof SiCard10).toBe(true);
|
|
24
|
-
expect(instance.cardNumber).toBe(7829367);
|
|
58
|
+
(0, globals_1.expect)(instance instanceof SiCard10_1.SiCard10).toBe(true);
|
|
59
|
+
(0, globals_1.expect)(instance.cardNumber).toBe(7829367);
|
|
25
60
|
});
|
|
26
|
-
test('returns undefined when message has mode', () => {
|
|
27
|
-
expect(SiCard10.typeSpecificInstanceFromMessage({
|
|
28
|
-
mode: proto.NAK
|
|
61
|
+
(0, globals_1.test)('returns undefined when message has mode', () => {
|
|
62
|
+
(0, globals_1.expect)(SiCard10_1.SiCard10.typeSpecificInstanceFromMessage({
|
|
63
|
+
mode: constants_1.proto.NAK
|
|
29
64
|
})).toBe(undefined);
|
|
30
65
|
});
|
|
31
|
-
test('returns undefined when message has wrong command', () => {
|
|
32
|
-
expect(SiCard10.typeSpecificInstanceFromMessage({
|
|
33
|
-
command: testUtils.getRandomByteExcept([proto.cmd.SI8_DET]),
|
|
66
|
+
(0, globals_1.test)('returns undefined when message has wrong command', () => {
|
|
67
|
+
(0, globals_1.expect)(SiCard10_1.SiCard10.typeSpecificInstanceFromMessage({
|
|
68
|
+
command: testUtils.getRandomByteExcept([constants_1.proto.cmd.SI8_DET]),
|
|
34
69
|
parameters: []
|
|
35
70
|
})).toBe(undefined);
|
|
36
71
|
});
|
|
37
|
-
test('returns undefined when there are too few parameters', () => {
|
|
38
|
-
expect(SiCard10.typeSpecificInstanceFromMessage({
|
|
39
|
-
command: proto.cmd.SI8_DET,
|
|
72
|
+
(0, globals_1.test)('returns undefined when there are too few parameters', () => {
|
|
73
|
+
(0, globals_1.expect)(SiCard10_1.SiCard10.typeSpecificInstanceFromMessage({
|
|
74
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
40
75
|
parameters: []
|
|
41
76
|
})).toBe(undefined);
|
|
42
77
|
});
|
|
43
|
-
test('returns undefined when the series does not match', () => {
|
|
44
|
-
expect(SiCard10.typeSpecificInstanceFromMessage({
|
|
45
|
-
command: proto.cmd.SI8_DET,
|
|
46
|
-
parameters: [0x00, 0x00, testUtils.getRandomByteExcept([ModernSiCardSeries.SiCard10]), 0x22, 0x22, 0x22]
|
|
78
|
+
(0, globals_1.test)('returns undefined when the series does not match', () => {
|
|
79
|
+
(0, globals_1.expect)(SiCard10_1.SiCard10.typeSpecificInstanceFromMessage({
|
|
80
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
81
|
+
parameters: [0x00, 0x00, testUtils.getRandomByteExcept([ModernSiCard_1.ModernSiCardSeries.SiCard10]), 0x22, 0x22, 0x22]
|
|
47
82
|
})).toBe(undefined);
|
|
48
83
|
});
|
|
49
84
|
});
|
|
50
|
-
test('is modern', (done) => {
|
|
51
|
-
const mySiCard10 = new SiCard10(8500000);
|
|
85
|
+
(0, globals_1.test)('is modern', (done) => {
|
|
86
|
+
const mySiCard10 = new SiCard10_1.SiCard10(8500000);
|
|
52
87
|
mySiCard10.mainStation = {
|
|
53
88
|
sendMessage: (message, numResponses) => {
|
|
54
89
|
if (message.mode !== undefined) {
|
|
55
90
|
return Promise.reject(new Error('message mode is not undefined'));
|
|
56
91
|
}
|
|
57
92
|
const { command, parameters } = message;
|
|
58
|
-
expect(command).toBe(proto.cmd.GET_SI8);
|
|
59
|
-
expect(numResponses).toBe(1);
|
|
93
|
+
(0, globals_1.expect)(command).toBe(constants_1.proto.cmd.GET_SI8);
|
|
94
|
+
(0, globals_1.expect)(numResponses).toBe(1);
|
|
60
95
|
const pageNumberToGet = parameters[0];
|
|
61
96
|
const getPage = (pageNumber) => [...[0x00, 0x00, pageNumber], ...Array.from({ length: 128 }, (_, i) => i).map(() => 0)];
|
|
62
97
|
return Promise.resolve([getPage(pageNumberToGet)]);
|
|
63
98
|
}
|
|
64
99
|
};
|
|
65
100
|
mySiCard10.typeSpecificRead().then(() => {
|
|
66
|
-
expect(mySiCard10.raceResult.cardNumber).toBe(0);
|
|
67
|
-
expect(JSON.stringify(mySiCard10.raceResult.startTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
68
|
-
expect(JSON.stringify(mySiCard10.raceResult.finishTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
69
|
-
expect(mySiCard10.raceResult.punches).toEqual([]);
|
|
70
|
-
expect(mySiCard10.punchCount).toBe(0);
|
|
101
|
+
(0, globals_1.expect)(mySiCard10.raceResult.cardNumber).toBe(0);
|
|
102
|
+
(0, globals_1.expect)(JSON.stringify(mySiCard10.raceResult.startTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
103
|
+
(0, globals_1.expect)(JSON.stringify(mySiCard10.raceResult.finishTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
104
|
+
(0, globals_1.expect)(mySiCard10.raceResult.punches).toEqual([]);
|
|
105
|
+
(0, globals_1.expect)(mySiCard10.punchCount).toBe(0);
|
|
71
106
|
done();
|
|
72
107
|
});
|
|
73
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard10.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard10.test.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"SiCard10.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard10.test.ts"],"names":[],"mappings":"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"}
|
package/SiCard/types/SiCard11.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SiCard11 = void 0;
|
|
4
|
+
const ModernSiCard_1 = require("./ModernSiCard");
|
|
5
|
+
const BaseSiCard_1 = require("../BaseSiCard");
|
|
6
|
+
class SiCard11 extends ModernSiCard_1.ModernSiCard {
|
|
4
7
|
static typeSpecificInstanceFromMessage(message) {
|
|
5
8
|
const info = this.parseModernSiCardDetectionMessage(message);
|
|
6
9
|
if (info === undefined) {
|
|
@@ -14,5 +17,6 @@ export class SiCard11 extends ModernSiCard {
|
|
|
14
17
|
return new this(info.cardNumber);
|
|
15
18
|
}
|
|
16
19
|
}
|
|
17
|
-
|
|
20
|
+
exports.SiCard11 = SiCard11;
|
|
21
|
+
BaseSiCard_1.BaseSiCard.registerNumberRange(9000000, 10000000, SiCard11);
|
|
18
22
|
//# sourceMappingURL=SiCard11.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard11.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard11.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"SiCard11.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard11.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,8CAA2C;AAE3C,MAAa,QAAS,SAAQ,2BAAY;IACzC,MAAM,CAAC,+BAA+B,CAAC,OAA6B;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,yDAAyD;QACzD,uDAAuD;QACvD,IAAI,IAAI,CAAC,UAAU,GAAG,OAAO,IAAI,IAAI,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC9D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;CACD;AAbD,4BAaC;AACD,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC"}
|
|
@@ -1,72 +1,107 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
const globals_1 = require("@jest/globals");
|
|
37
|
+
const constants_1 = require("../../constants");
|
|
38
|
+
const testUtils = __importStar(require("../../testUtils"));
|
|
39
|
+
const BaseSiCard_1 = require("../BaseSiCard");
|
|
40
|
+
const SiCard11_1 = require("./SiCard11");
|
|
41
|
+
(0, globals_1.describe)('SiCard11', () => {
|
|
42
|
+
(0, globals_1.test)('is registered', () => {
|
|
43
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(8999999)).not.toEqual(SiCard11_1.SiCard11);
|
|
44
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(9000000)).toEqual(SiCard11_1.SiCard11);
|
|
45
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(9999999)).toEqual(SiCard11_1.SiCard11);
|
|
46
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(10000000)).not.toEqual(SiCard11_1.SiCard11);
|
|
12
47
|
});
|
|
13
|
-
describe('typeSpecificInstanceFromMessage', () => {
|
|
14
|
-
test('works for valid message', () => {
|
|
15
|
-
const instance = SiCard11.typeSpecificInstanceFromMessage({
|
|
16
|
-
command: proto.cmd.SI8_DET,
|
|
48
|
+
(0, globals_1.describe)('typeSpecificInstanceFromMessage', () => {
|
|
49
|
+
(0, globals_1.test)('works for valid message', () => {
|
|
50
|
+
const instance = SiCard11_1.SiCard11.typeSpecificInstanceFromMessage({
|
|
51
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
17
52
|
parameters: [0x00, 0x00, /* TODO: */ 0x00, 0x98, 0x76, 0x54]
|
|
18
53
|
});
|
|
19
54
|
if (instance === undefined) {
|
|
20
55
|
throw new Error('expect instance');
|
|
21
56
|
}
|
|
22
|
-
expect(instance instanceof SiCard11).toBe(true);
|
|
23
|
-
expect(instance.cardNumber).toBe(9991764);
|
|
57
|
+
(0, globals_1.expect)(instance instanceof SiCard11_1.SiCard11).toBe(true);
|
|
58
|
+
(0, globals_1.expect)(instance.cardNumber).toBe(9991764);
|
|
24
59
|
});
|
|
25
|
-
test('returns undefined when message has mode', () => {
|
|
26
|
-
expect(SiCard11.typeSpecificInstanceFromMessage({
|
|
27
|
-
mode: proto.NAK
|
|
60
|
+
(0, globals_1.test)('returns undefined when message has mode', () => {
|
|
61
|
+
(0, globals_1.expect)(SiCard11_1.SiCard11.typeSpecificInstanceFromMessage({
|
|
62
|
+
mode: constants_1.proto.NAK
|
|
28
63
|
})).toBe(undefined);
|
|
29
64
|
});
|
|
30
|
-
test('returns undefined when message has wrong command', () => {
|
|
31
|
-
expect(SiCard11.typeSpecificInstanceFromMessage({
|
|
32
|
-
command: testUtils.getRandomByteExcept([proto.cmd.SI8_DET]),
|
|
65
|
+
(0, globals_1.test)('returns undefined when message has wrong command', () => {
|
|
66
|
+
(0, globals_1.expect)(SiCard11_1.SiCard11.typeSpecificInstanceFromMessage({
|
|
67
|
+
command: testUtils.getRandomByteExcept([constants_1.proto.cmd.SI8_DET]),
|
|
33
68
|
parameters: []
|
|
34
69
|
})).toBe(undefined);
|
|
35
70
|
});
|
|
36
|
-
test('returns undefined when there are too few parameters', () => {
|
|
37
|
-
expect(SiCard11.typeSpecificInstanceFromMessage({
|
|
38
|
-
command: proto.cmd.SI8_DET,
|
|
71
|
+
(0, globals_1.test)('returns undefined when there are too few parameters', () => {
|
|
72
|
+
(0, globals_1.expect)(SiCard11_1.SiCard11.typeSpecificInstanceFromMessage({
|
|
73
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
39
74
|
parameters: []
|
|
40
75
|
})).toBe(undefined);
|
|
41
76
|
});
|
|
42
|
-
test('returns undefined when the card number does not match', () => {
|
|
43
|
-
expect(SiCard11.typeSpecificInstanceFromMessage({
|
|
44
|
-
command: proto.cmd.SI8_DET,
|
|
77
|
+
(0, globals_1.test)('returns undefined when the card number does not match', () => {
|
|
78
|
+
(0, globals_1.expect)(SiCard11_1.SiCard11.typeSpecificInstanceFromMessage({
|
|
79
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
45
80
|
parameters: [0x00, 0x00, /* TODO: */ 0x00, 0x22, 0x22, 0x22]
|
|
46
81
|
})).toBe(undefined);
|
|
47
82
|
});
|
|
48
83
|
});
|
|
49
|
-
test('is modern', (done) => {
|
|
50
|
-
const mySiCard11 = new SiCard11(8500000);
|
|
84
|
+
(0, globals_1.test)('is modern', (done) => {
|
|
85
|
+
const mySiCard11 = new SiCard11_1.SiCard11(8500000);
|
|
51
86
|
mySiCard11.mainStation = {
|
|
52
87
|
sendMessage: (message, numResponses) => {
|
|
53
88
|
if (message.mode !== undefined) {
|
|
54
89
|
return Promise.reject(new Error('message mode is not undefined'));
|
|
55
90
|
}
|
|
56
91
|
const { command, parameters } = message;
|
|
57
|
-
expect(command).toBe(proto.cmd.GET_SI8);
|
|
58
|
-
expect(numResponses).toBe(1);
|
|
92
|
+
(0, globals_1.expect)(command).toBe(constants_1.proto.cmd.GET_SI8);
|
|
93
|
+
(0, globals_1.expect)(numResponses).toBe(1);
|
|
59
94
|
const pageNumberToGet = parameters[0];
|
|
60
95
|
const getPage = (pageNumber) => [...[0x00, 0x00, pageNumber], ...Array.from({ length: 128 }, (_, i) => i).map(() => 0)];
|
|
61
96
|
return Promise.resolve([getPage(pageNumberToGet)]);
|
|
62
97
|
}
|
|
63
98
|
};
|
|
64
99
|
mySiCard11.typeSpecificRead().then(() => {
|
|
65
|
-
expect(mySiCard11.raceResult.cardNumber).toBe(0);
|
|
66
|
-
expect(JSON.stringify(mySiCard11.raceResult.startTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
67
|
-
expect(JSON.stringify(mySiCard11.raceResult.finishTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
68
|
-
expect(mySiCard11.raceResult.punches).toEqual([]);
|
|
69
|
-
expect(mySiCard11.punchCount).toBe(0);
|
|
100
|
+
(0, globals_1.expect)(mySiCard11.raceResult.cardNumber).toBe(0);
|
|
101
|
+
(0, globals_1.expect)(JSON.stringify(mySiCard11.raceResult.startTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
102
|
+
(0, globals_1.expect)(JSON.stringify(mySiCard11.raceResult.finishTime)).toBe(JSON.stringify({ "time": 0, "weekcounter": 0, "weekday": 0 }));
|
|
103
|
+
(0, globals_1.expect)(mySiCard11.raceResult.punches).toEqual([]);
|
|
104
|
+
(0, globals_1.expect)(mySiCard11.punchCount).toBe(0);
|
|
70
105
|
done();
|
|
71
106
|
});
|
|
72
107
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard11.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard11.test.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"SiCard11.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard11.test.ts"],"names":[],"mappings":"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"}
|
package/SiCard/types/SiCard5.js
CHANGED
|
@@ -1,17 +1,55 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.SiCard5 = exports.siCard5StorageDefinition = exports.siCard5StorageLocations = exports.cropPunches = exports.getPunchOffset = void 0;
|
|
37
|
+
const storage = __importStar(require("../../storage"));
|
|
38
|
+
const siProtocol = __importStar(require("../../siProtocol"));
|
|
39
|
+
const constants_1 = require("../../constants");
|
|
40
|
+
const BaseSiCard_1 = require("../BaseSiCard");
|
|
5
41
|
const bytesPerPage = 128;
|
|
6
42
|
const MAX_NUM_PUNCHES = 36;
|
|
7
|
-
|
|
8
|
-
|
|
43
|
+
const getPunchOffset = (i) => (i >= 30 ? 0x20 + (i - 30) * 16 : 0x20 + Math.floor(i / 5) + 1 + i * 3);
|
|
44
|
+
exports.getPunchOffset = getPunchOffset;
|
|
45
|
+
const cropPunches = (allPunches) => {
|
|
9
46
|
const isPunchEntryValid = (punch) => punch !== undefined && punch.code !== undefined && punch.code !== 0x00;
|
|
10
47
|
const firstInvalidIndex = allPunches.findIndex((punch) => !isPunchEntryValid(punch));
|
|
11
48
|
const punchesUntilInvalid = firstInvalidIndex === -1 ? allPunches : allPunches.slice(0, firstInvalidIndex);
|
|
12
49
|
return punchesUntilInvalid.filter(isPunchEntryValid);
|
|
13
50
|
};
|
|
14
|
-
|
|
51
|
+
exports.cropPunches = cropPunches;
|
|
52
|
+
exports.siCard5StorageLocations = {
|
|
15
53
|
cardNumber: new storage.SiModified(new storage.SiArray(3, (i) => new storage.SiInt([[[0x05, 0x04, 0x06][i]]])), (extractedValue) => siProtocol.arr2cardNumber(extractedValue)
|
|
16
54
|
// (cardNumber) => siProtocol.cardNumber2arr(cardNumber),
|
|
17
55
|
// (cardNumber) => `${cardNumber}`,
|
|
@@ -23,22 +61,22 @@ export const siCard5StorageLocations = {
|
|
|
23
61
|
checkTime: new siProtocol.SiTime([[0x1a], [0x19]]),
|
|
24
62
|
punchCount: new storage.SiModified(new storage.SiInt([[0x17]]), (extractedValue) => extractedValue - 1),
|
|
25
63
|
punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
|
|
26
|
-
code: new storage.SiInt([[getPunchOffset(i) + 0]]),
|
|
27
|
-
time: new siProtocol.SiTime(i >= 30 ? undefined : [[getPunchOffset(i) + 2], [getPunchOffset(i) + 1]])
|
|
28
|
-
})), (allPunches) => cropPunches(allPunches)),
|
|
64
|
+
code: new storage.SiInt([[(0, exports.getPunchOffset)(i) + 0]]),
|
|
65
|
+
time: new siProtocol.SiTime(i >= 30 ? undefined : [[(0, exports.getPunchOffset)(i) + 2], [(0, exports.getPunchOffset)(i) + 1]])
|
|
66
|
+
})), (allPunches) => (0, exports.cropPunches)(allPunches)),
|
|
29
67
|
cardHolder: new storage.SiDict({
|
|
30
68
|
countryCode: new storage.SiInt([[0x01]]),
|
|
31
69
|
clubCode: new storage.SiInt([[0x03], [0x02]])
|
|
32
70
|
}),
|
|
33
71
|
softwareVersion: new storage.SiInt([[0x1b]])
|
|
34
72
|
};
|
|
35
|
-
|
|
36
|
-
|
|
73
|
+
exports.siCard5StorageDefinition = storage.defineStorage(0x80, exports.siCard5StorageLocations);
|
|
74
|
+
class SiCard5 extends BaseSiCard_1.BaseSiCard {
|
|
37
75
|
static typeSpecificInstanceFromMessage(message) {
|
|
38
76
|
if (message.mode !== undefined) {
|
|
39
77
|
return undefined;
|
|
40
78
|
}
|
|
41
|
-
if (message.command !== proto.cmd.SI5_DET) {
|
|
79
|
+
if (message.command !== constants_1.proto.cmd.SI5_DET) {
|
|
42
80
|
return undefined;
|
|
43
81
|
}
|
|
44
82
|
if (message.parameters.length < 6) {
|
|
@@ -53,7 +91,7 @@ export class SiCard5 extends BaseSiCard {
|
|
|
53
91
|
}
|
|
54
92
|
constructor(cardNumber) {
|
|
55
93
|
super(cardNumber);
|
|
56
|
-
this.storage = siCard5StorageDefinition();
|
|
94
|
+
this.storage = (0, exports.siCard5StorageDefinition)();
|
|
57
95
|
}
|
|
58
96
|
typeSpecificRead() {
|
|
59
97
|
if (!this.mainStation) {
|
|
@@ -61,7 +99,7 @@ export class SiCard5 extends BaseSiCard {
|
|
|
61
99
|
}
|
|
62
100
|
return this.mainStation
|
|
63
101
|
.sendMessage({
|
|
64
|
-
command: proto.cmd.GET_SI5,
|
|
102
|
+
command: constants_1.proto.cmd.GET_SI5,
|
|
65
103
|
parameters: []
|
|
66
104
|
}, 1)
|
|
67
105
|
.then((data) => {
|
|
@@ -84,6 +122,7 @@ export class SiCard5 extends BaseSiCard {
|
|
|
84
122
|
});
|
|
85
123
|
}
|
|
86
124
|
}
|
|
125
|
+
exports.SiCard5 = SiCard5;
|
|
87
126
|
SiCard5.maxNumPunches = MAX_NUM_PUNCHES;
|
|
88
|
-
BaseSiCard.registerNumberRange(1000, 500000, SiCard5);
|
|
127
|
+
BaseSiCard_1.BaseSiCard.registerNumberRange(1000, 500000, SiCard5);
|
|
89
128
|
//# sourceMappingURL=SiCard5.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard5.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"SiCard5.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":"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"}
|