Skip to content

Commit 84442ea

Browse files
committed
fix: export the type of the compat options in TypeScript
1 parent a4d73b9 commit 84442ea

File tree

7 files changed

+85
-101
lines changed

7 files changed

+85
-101
lines changed

src/compat.ts

Lines changed: 9 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import {EventEmitter} from "events"
77
import * as zmq from "."
88
import {FullError} from "./errors"
9+
import * as longOptions from "./compat/long-options"
10+
import * as pollStates from "./compat/poll-states"
11+
import * as sendOptions from "./compat/send-options"
912

1013
type AnySocket =
1114
| zmq.Pair
@@ -22,99 +25,6 @@ type AnySocket =
2225
| zmq.Stream
2326

2427
let count = 1
25-
const types = {
26-
ZMQ_PAIR: 0,
27-
ZMQ_PUB: 1,
28-
ZMQ_SUB: 2,
29-
ZMQ_REQ: 3,
30-
ZMQ_REP: 4,
31-
ZMQ_DEALER: 5,
32-
ZMQ_XREQ: 5,
33-
ZMQ_ROUTER: 6,
34-
ZMQ_XREP: 6,
35-
ZMQ_PULL: 7,
36-
ZMQ_PUSH: 8,
37-
ZMQ_XPUB: 9,
38-
ZMQ_XSUB: 10,
39-
ZMQ_STREAM: 11,
40-
}
41-
42-
const longOptions = {
43-
ZMQ_AFFINITY: 4,
44-
ZMQ_IDENTITY: 5,
45-
ZMQ_SUBSCRIBE: 6,
46-
ZMQ_UNSUBSCRIBE: 7,
47-
ZMQ_RATE: 8,
48-
ZMQ_RECOVERY_IVL: 9,
49-
ZMQ_RECOVERY_IVL_MSEC: 9,
50-
ZMQ_SNDBUF: 11,
51-
ZMQ_RCVBUF: 12,
52-
ZMQ_RCVMORE: 13,
53-
ZMQ_FD: 14,
54-
ZMQ_EVENTS: 15,
55-
ZMQ_TYPE: 16,
56-
ZMQ_LINGER: 17,
57-
ZMQ_RECONNECT_IVL: 18,
58-
ZMQ_BACKLOG: 19,
59-
ZMQ_RECONNECT_IVL_MAX: 21,
60-
ZMQ_MAXMSGSIZE: 22,
61-
ZMQ_SNDHWM: 23,
62-
ZMQ_RCVHWM: 24,
63-
ZMQ_MULTICAST_HOPS: 25,
64-
ZMQ_RCVTIMEO: 27,
65-
ZMQ_SNDTIMEO: 28,
66-
ZMQ_IPV4ONLY: 31,
67-
ZMQ_LAST_ENDPOINT: 32,
68-
ZMQ_ROUTER_MANDATORY: 33,
69-
ZMQ_TCP_KEEPALIVE: 34,
70-
ZMQ_TCP_KEEPALIVE_CNT: 35,
71-
ZMQ_TCP_KEEPALIVE_IDLE: 36,
72-
ZMQ_TCP_KEEPALIVE_INTVL: 37,
73-
ZMQ_TCP_ACCEPT_FILTER: 38,
74-
ZMQ_DELAY_ATTACH_ON_CONNECT: 39,
75-
ZMQ_XPUB_VERBOSE: 40,
76-
ZMQ_ROUTER_RAW: 41,
77-
ZMQ_IPV6: 42,
78-
ZMQ_MECHANISM: 43,
79-
ZMQ_PLAIN_SERVER: 44,
80-
ZMQ_PLAIN_USERNAME: 45,
81-
ZMQ_PLAIN_PASSWORD: 46,
82-
ZMQ_CURVE_SERVER: 47,
83-
ZMQ_CURVE_PUBLICKEY: 48,
84-
ZMQ_CURVE_SECRETKEY: 49,
85-
ZMQ_CURVE_SERVERKEY: 50,
86-
ZMQ_ZAP_DOMAIN: 55,
87-
ZMQ_HEARTBEAT_IVL: 75,
88-
ZMQ_HEARTBEAT_TTL: 76,
89-
ZMQ_HEARTBEAT_TIMEOUT: 77,
90-
ZMQ_CONNECT_TIMEOUT: 79,
91-
ZMQ_IO_THREADS: 1,
92-
ZMQ_MAX_SOCKETS: 2,
93-
ZMQ_ROUTER_HANDOVER: 56,
94-
}
95-
96-
const pollStates = {
97-
ZMQ_POLLIN: 1,
98-
ZMQ_POLLOUT: 2,
99-
ZMQ_POLLERR: 4,
100-
}
101-
102-
const sendOptions = {
103-
ZMQ_SNDMORE: 2,
104-
}
105-
106-
const capabilities = {
107-
ZMQ_CAN_MONITOR: 1,
108-
ZMQ_CAN_DISCONNECT: 1,
109-
ZMQ_CAN_UNBIND: 1,
110-
ZMQ_CAN_SET_CTX: 1,
111-
}
112-
113-
const socketStates = {
114-
STATE_READY: 0,
115-
STATE_BUSY: 1,
116-
STATE_CLOSED: 2,
117-
}
11828

11929
const shortOptions = {
12030
_fd: longOptions.ZMQ_FD,
@@ -909,11 +819,9 @@ export {
909819
shortOptions as options,
910820
}
911821

912-
/* Unfortunately there is no easy way to include these in the resulting
913-
TS definitions. */
914-
Object.assign(module.exports, longOptions)
915-
Object.assign(module.exports, types)
916-
Object.assign(module.exports, pollStates)
917-
Object.assign(module.exports, sendOptions)
918-
Object.assign(module.exports, socketStates)
919-
Object.assign(module.exports, capabilities)
822+
export * from "./compat/long-options"
823+
export * from "./compat/types"
824+
export * from "./compat/poll-states"
825+
export * from "./compat/send-options"
826+
export * from "./compat/capabilities"
827+
export * from "./compat/socket-states"

src/compat/capabilities.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const ZMQ_CAN_MONITOR = 1
2+
export const ZMQ_CAN_DISCONNECT = 1
3+
export const ZMQ_CAN_UNBIND = 1
4+
export const ZMQ_CAN_SET_CTX = 1

src/compat/long-options.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
export const ZMQ_AFFINITY = 4
2+
export const ZMQ_IDENTITY = 5
3+
export const ZMQ_SUBSCRIBE = 6
4+
export const ZMQ_UNSUBSCRIBE = 7
5+
export const ZMQ_RATE = 8
6+
export const ZMQ_RECOVERY_IVL = 9
7+
export const ZMQ_RECOVERY_IVL_MSEC = 9
8+
export const ZMQ_SNDBUF = 11
9+
export const ZMQ_RCVBUF = 12
10+
export const ZMQ_RCVMORE = 13
11+
export const ZMQ_FD = 14
12+
export const ZMQ_EVENTS = 15
13+
export const ZMQ_TYPE = 16
14+
export const ZMQ_LINGER = 17
15+
export const ZMQ_RECONNECT_IVL = 18
16+
export const ZMQ_BACKLOG = 19
17+
export const ZMQ_RECONNECT_IVL_MAX = 21
18+
export const ZMQ_MAXMSGSIZE = 22
19+
export const ZMQ_SNDHWM = 23
20+
export const ZMQ_RCVHWM = 24
21+
export const ZMQ_MULTICAST_HOPS = 25
22+
export const ZMQ_RCVTIMEO = 27
23+
export const ZMQ_SNDTIMEO = 28
24+
export const ZMQ_IPV4ONLY = 31
25+
export const ZMQ_LAST_ENDPOINT = 32
26+
export const ZMQ_ROUTER_MANDATORY = 33
27+
export const ZMQ_TCP_KEEPALIVE = 34
28+
export const ZMQ_TCP_KEEPALIVE_CNT = 35
29+
export const ZMQ_TCP_KEEPALIVE_IDLE = 36
30+
export const ZMQ_TCP_KEEPALIVE_INTVL = 37
31+
export const ZMQ_TCP_ACCEPT_FILTER = 38
32+
export const ZMQ_DELAY_ATTACH_ON_CONNECT = 39
33+
export const ZMQ_XPUB_VERBOSE = 40
34+
export const ZMQ_ROUTER_RAW = 41
35+
export const ZMQ_IPV6 = 42
36+
export const ZMQ_MECHANISM = 43
37+
export const ZMQ_PLAIN_SERVER = 44
38+
export const ZMQ_PLAIN_USERNAME = 45
39+
export const ZMQ_PLAIN_PASSWORD = 46
40+
export const ZMQ_CURVE_SERVER = 47
41+
export const ZMQ_CURVE_PUBLICKEY = 48
42+
export const ZMQ_CURVE_SECRETKEY = 49
43+
export const ZMQ_CURVE_SERVERKEY = 50
44+
export const ZMQ_ZAP_DOMAIN = 55
45+
export const ZMQ_HEARTBEAT_IVL = 75
46+
export const ZMQ_HEARTBEAT_TTL = 76
47+
export const ZMQ_HEARTBEAT_TIMEOUT = 77
48+
export const ZMQ_CONNECT_TIMEOUT = 79
49+
export const ZMQ_IO_THREADS = 1
50+
export const ZMQ_MAX_SOCKETS = 2
51+
export const ZMQ_ROUTER_HANDOVER = 56

src/compat/poll-states.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const ZMQ_POLLIN = 1
2+
export const ZMQ_POLLOUT = 2
3+
export const ZMQ_POLLERR = 4

src/compat/send-options.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const ZMQ_SNDMORE = 2

src/compat/socket-states.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const STATE_READY = 0
2+
export const STATE_BUSY = 1
3+
export const STATE_CLOSED = 2

src/compat/types.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export const ZMQ_PAIR = 0
2+
export const ZMQ_PUB = 1
3+
export const ZMQ_SUB = 2
4+
export const ZMQ_REQ = 3
5+
export const ZMQ_REP = 4
6+
export const ZMQ_DEALER = 5
7+
export const ZMQ_XREQ = 5
8+
export const ZMQ_ROUTER = 6
9+
export const ZMQ_XREP = 6
10+
export const ZMQ_PULL = 7
11+
export const ZMQ_PUSH = 8
12+
export const ZMQ_XPUB = 9
13+
export const ZMQ_XSUB = 10
14+
export const ZMQ_STREAM = 11

0 commit comments

Comments
 (0)