[pull] master from DefinitelyTyped:master

types/oracledb/index.d.ts

@@ -2071,7 +2071,7 @@ declare namespace OracleDB {
          *
          * For advanced queue SUBSCR_NAMESPACE_AQ subscriptions, regId is undefined.
          */
-        regId?: string | undefined;
+        regId?: number | undefined;
     }
 
     /**

types/oracledb/oracledb-tests.ts

@@ -476,6 +476,7 @@ const version4Tests = async () => {
         },
     });
 
+    expectType<number | undefined>(sub.regId);
     console.log(sub.regId);
 
     const queue = await connection.getQueue("test", {

types/ssh2/index.d.ts

@@ -1487,6 +1487,8 @@ export interface Session extends ServerChannel {
 }
 
 export interface PseudoTtyInfo {
+    /** The terminal type requested by the client for the pseudo-TTY (e.g. `"vt100"`). */
+    term: string;
     /** The number of columns for the pseudo-TTY. */
     cols: number;
     /** The number of rows for the pseudo-TTY. */

types/ssh2/ssh2-tests.ts

@@ -407,6 +407,16 @@ new ssh2.Server({
                 stream.exit(0);
                 stream.end();
             });
+            session.once("pty", (accept, reject, info) => {
+                info.term; // $ExpectType string
+                info.cols; // $ExpectType number
+                info.rows; // $ExpectType number
+                info.width; // $ExpectType number
+                info.height; // $ExpectType number
+                info.modes; // $ExpectType TerminalModes
+                info.modes.VINTR; // $ExpectType number | undefined
+                accept?.();
+            });
         });
     }).on("end", () => {
         console.log("Client disconnected");