io.appium.settings 7.0.7 → 7.0.9

package/lib/commands/{utf7.js → utf7.ts}

@@ -2,86 +2,21 @@
  * The code below has been adopted from https://www.npmjs.com/package/utf7
  */
 
-/**
- * @param {number} length
- * @returns {Buffer}
- */
-function allocateAsciiBuffer(length) {
-  return Buffer.alloc(length, 'ascii');
-}
-
-/**
- * @param {string} str
- * @returns {string}
- */
-function _encode(str) {
-  const b = allocateAsciiBuffer(str.length * 2);
-  for (let i = 0, bi = 0; i < str.length; i++) {
-    // Note that we can't simply convert a UTF-8 string to Base64 because
-    // UTF-8 uses a different encoding. In modified UTF-7, all characters
-    // are represented by their two byte Unicode ID.
-    const c = str.charCodeAt(i);
-    // Upper 8 bits shifted into lower 8 bits so that they fit into 1 byte.
-    b[bi++] = c >> 8;
-    // Lower 8 bits. Cut off the upper 8 bits so that they fit into 1 byte.
-    b[bi++] = c & 0xFF;
-  }
-  // Modified Base64 uses , instead of / and omits trailing =.
-  return b.toString('base64').replace(/=+$/, '');
-}
-
-/**
- * @param {string} str
- * @returns {Buffer}
- */
-function allocateBase64Buffer(str) {
-  return Buffer.from(str, 'base64');
-}
-
-/**
- * @param {string} str
- * @returns {string}
- */
-function _decode(str) {
-  const b = allocateBase64Buffer(str);
-  const r = [];
-  for (let i = 0; i < b.length;) {
-    // Calculate charcode from two adjacent bytes.
-    r.push(String.fromCharCode(b[i++] << 8 | b[i++]));
-  }
-  return r.join('');
-}
-
-/**
- * Escape RegEx from http://simonwillison.net/2006/Jan/20/escape/
- *
- * @param {string} chars
- * @returns {string}
- */
-function escape(chars) {
-  return chars.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-}
-
 // Character classes defined by RFC 2152.
 const setD = 'A-Za-z0-9' + escape(`'(),-./:?`);
 const setO = escape(`!"#$%&*;<=>@[]^_'{|}`);
 const setW = escape(` \r\n\t`);
 
 // Stores compiled regexes for various replacement pattern.
-/** @type {Record<string, RegExp>} */
-const regexes = {};
+const regexes: Record<string, RegExp> = {};
 const regexAll = new RegExp(`[^${setW}${setD}${setO}]+`, 'g');
 
-export const imap = {};
-
 /**
  * RFC 2152 UTF-7 encoding.
  *
- * @param {string} str
- * @param {string?} mask
- * @returns {string}
+ * @param mask Optional mask characters to exclude from encoding
  */
-export const encode = function encode(str, mask = null) {
+export const encode = function encode(str: string, mask: string | null = null): string {
   // Generate a RegExp object from the string of mask characters.
   if (!mask) {
     mask = '';
@@ -99,11 +34,10 @@ export const encode = function encode(str, mask = null) {
 
 /**
  * RFC 2152 UTF-7 encoding with all optionals.
- *
- * @param {string} str
- * @returns {string}
+ * Encodes all non-ASCII characters, including those that would normally
+ * be represented directly in standard UTF-7 encoding.
  */
-export function encodeAll(str) {
+export function encodeAll(str: string): string {
   // We replace subsequent disallowed chars with their escape sequence.
   return str.replace(regexAll, (chunk) =>
     // + is represented by an empty sequence +-, otherwise call encode().
@@ -111,44 +45,91 @@ export function encodeAll(str) {
   );
 }
 
-/**
- * RFC 3501, section 5.1.3 UTF-7 encoding.
- *
- * @param {string} str
- * @returns {string}
- */
-imap.encode = function encode(str) {
-  // All printable ASCII chars except for & must be represented by themselves.
-  // We replace subsequent non-representable chars with their escape sequence.
-  return str.replace(/&/g, '&-').replace(/[^\x20-\x7e]+/g, (chunk) => {
-    // & is represented by an empty sequence &-, otherwise call encode().
-    chunk = (chunk === '&' ? '' : _encode(chunk)).replace(/\//g, ',');
-    return `&${chunk}-`;
-  });
-};
-
 /**
  * RFC 2152 UTF-7 decoding.
- *
- * @param {string} str
- * @returns {string}
  */
-export const decode = function decode(str) {
+export const decode = function decode(str: string): string {
   return str.replace(/\+([A-Za-z0-9/]*)-?/gi, (_, chunk) =>
     // &- represents &.
     chunk === '' ? '+' : _decode(chunk)
   );
 };
 
+export const imap = {
+  /**
+   * RFC 3501, section 5.1.3 UTF-7 encoding.
+   */
+  encode(str: string): string {
+    // All printable ASCII chars except for & must be represented by themselves.
+    // We replace subsequent non-representable chars with their escape sequence.
+    return str.replace(/&/g, '&-').replace(/[^\x20-\x7e]+/g, (chunk) => {
+      // & is represented by an empty sequence &-, otherwise call encode().
+      chunk = (chunk === '&' ? '' : _encode(chunk)).replace(/\//g, ',');
+      return `&${chunk}-`;
+    });
+  },
+
+  /**
+   * RFC 3501, section 5.1.3 UTF-7 decoding.
+   */
+  decode(str: string): string {
+    return str.replace(/&([^-]*)-/g, (_, chunk) =>
+      // &- represents &.
+      chunk === '' ? '&' : _decode(chunk.replace(/,/g, '/'))
+    );
+  },
+};
+
 /**
- * RFC 3501, section 5.1.3 UTF-7 decoding.
- *
- * @param {string} str
- * @returns {string}
+ * Allocates an ASCII buffer of the specified length.
  */
-imap.decode = function decode(str) {
-  return str.replace(/&([^-]*)-/g, (_, chunk) =>
-    // &- represents &.
-    chunk === '' ? '&' : _decode(chunk.replace(/,/g, '/'))
-  );
-};
+function allocateAsciiBuffer(length: number): Buffer {
+  return Buffer.alloc(length, 'ascii');
+}
+
+/**
+ * Encodes a string using modified UTF-7 encoding.
+ */
+function _encode(str: string): string {
+  const b = allocateAsciiBuffer(str.length * 2);
+  for (let i = 0, bi = 0; i < str.length; i++) {
+    // Note that we can't simply convert a UTF-8 string to Base64 because
+    // UTF-8 uses a different encoding. In modified UTF-7, all characters
+    // are represented by their two byte Unicode ID.
+    const c = str.charCodeAt(i);
+    // Upper 8 bits shifted into lower 8 bits so that they fit into 1 byte.
+    b[bi++] = c >> 8;
+    // Lower 8 bits. Cut off the upper 8 bits so that they fit into 1 byte.
+    b[bi++] = c & 0xFF;
+  }
+  // Modified Base64 uses , instead of / and omits trailing =.
+  return b.toString('base64').replace(/=+$/, '');
+}
+
+/**
+ * Allocates a buffer from a base64 string.
+ */
+function allocateBase64Buffer(str: string): Buffer {
+  return Buffer.from(str, 'base64');
+}
+
+/**
+ * Decodes a string using modified UTF-7 encoding.
+ */
+function _decode(str: string): string {
+  const b = allocateBase64Buffer(str);
+  const r: string[] = [];
+  for (let i = 0; i < b.length;) {
+    // Calculate charcode from two adjacent bytes.
+    r.push(String.fromCharCode(b[i++] << 8 | b[i++]));
+  }
+  return r.join('');
+}
+
+/**
+ * Escapes special regex characters.
+ * From http://simonwillison.net/2006/Jan/20/escape/
+ */
+function escape(chars: string): string {
+  return chars.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.appium.settings",
-  "version": "7.0.7",
+  "version": "7.0.9",
   "description": "App for dealing with Android settings",
   "main": "./build/lib/index.js",
   "types": "./build/lib/index.d.ts",
@@ -50,7 +50,7 @@
     "bluebird": "^3.5.1",
     "lodash": "^4.2.1",
     "semver": "^7.5.4",
-    "teen_process": "^3.0.0"
+    "teen_process": "^4.0.4"
   },
   "devDependencies": {
     "@appium/eslint-config-appium-ts": "^2.0.0-rc.1",
@@ -65,7 +65,6 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.0.0",
     "@types/sinon": "^21.0.0",
-    "@types/teen_process": "^2.0.2",
     "appium-adb": "^14.0.0",
     "chai": "^6.0.0",
     "chai-as-promised": "^8.0.0",