@appium/support 7.0.5 → 7.0.6

package/build/lib/node.js

@@ -15,45 +15,17 @@ const teen_process_1 = require("teen_process");
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const uuid_1 = require("uuid");
-const ECMA_SIZES = Object.freeze({
-    STRING: 2,
-    BOOLEAN: 4,
-    NUMBER: 8,
-});
-/**
- * Internal utility to link global package to local context
- *
- * @param {string} packageName - name of the package to link
- * @throws {Error} If the command fails
- */
-async function linkGlobalPackage(packageName) {
-    try {
-        logger_1.default.debug(`Linking package '${packageName}'`);
-        const cmd = (0, system_1.isWindows)() ? 'npm.cmd' : 'npm';
-        await (0, teen_process_1.exec)(cmd, ['link', packageName], { timeout: 20000 });
-    }
-    catch (err) {
-        const msg = `Unable to load package '${packageName}', linking failed: ${err.message}`;
-        logger_1.default.debug(msg);
-        if (err.stderr) {
-            // log the stderr if there, but do not add to thrown error as it is
-            // _very_ verbose
-            logger_1.default.debug(err.stderr);
-        }
-        throw new Error(msg);
-    }
-}
+const OBJECTS_MAPPING = new WeakMap();
 /**
  * Utility function to extend node functionality, allowing us to require
  * modules that are installed globally. If the package cannot be required,
  * this will attempt to link the package and then re-require it
  *
- * @param {string} packageName - the name of the package to be required
- * @returns {Promise<unknown>} - the package object
+ * @param packageName - the name of the package to be required
+ * @returns The package object
  * @throws {Error} If the package is not found locally or globally
  */
 async function requirePackage(packageName) {
-    // first, get it in the normal way (see https://nodejs.org/api/modules.html#modules_all_together)
     try {
         logger_1.default.debug(`Loading local package '${packageName}'`);
         return require(packageName);
@@ -61,7 +33,6 @@ async function requirePackage(packageName) {
     catch (err) {
         logger_1.default.debug(`Failed to load local package '${packageName}': ${err.message}`);
     }
-    // second, get it from where it ought to be in the global node_modules
     try {
         const globalPackageName = node_path_1.default.resolve(process.env.npm_config_prefix ?? '', 'lib', 'node_modules', packageName);
         logger_1.default.debug(`Loading global package '${globalPackageName}'`);
@@ -70,7 +41,6 @@ async function requirePackage(packageName) {
     catch (err) {
         logger_1.default.debug(`Failed to load global package '${packageName}': ${err.message}`);
     }
-    // third, link the file and get locally
     try {
         await linkGlobalPackage(packageName);
         logger_1.default.debug(`Retrying load of linked package '${packageName}'`);
@@ -80,91 +50,30 @@ async function requirePackage(packageName) {
         throw logger_1.default.errorWithException(`Unable to load package '${packageName}': ${err.message}`);
     }
 }
-function extractAllProperties(obj) {
-    const stringProperties = [];
-    for (const prop in obj) {
-        stringProperties.push(prop);
-    }
-    if (lodash_1.default.isFunction(Object.getOwnPropertySymbols)) {
-        stringProperties.push(...Object.getOwnPropertySymbols(obj));
-    }
-    return stringProperties;
-}
-function _getSizeOfObject(seen, object) {
-    if (lodash_1.default.isNil(object)) {
-        return 0;
-    }
-    let bytes = 0;
-    const properties = extractAllProperties(object);
-    for (const key of properties) {
-        // Do not recalculate circular references
-        if (typeof object[key] === 'object' && !lodash_1.default.isNil(object[key])) {
-            if (seen.has(object[key])) {
-                continue;
-            }
-            seen.add(object[key]);
-        }
-        bytes += getCalculator(seen)(key);
-        try {
-            bytes += getCalculator(seen)(object[key]);
-        }
-        catch (ex) {
-            if (ex instanceof RangeError) {
-                // circular reference detected, final result might be incorrect
-                // let's be nice and not throw an exception
-                bytes = 0;
-            }
-        }
-    }
-    return bytes;
-}
-function getCalculator(seen) {
-    return function calculator(obj) {
-        if (lodash_1.default.isBuffer(obj)) {
-            return obj.length;
-        }
-        switch (typeof obj) {
-            case 'string':
-                return obj.length * ECMA_SIZES.STRING;
-            case 'boolean':
-                return ECMA_SIZES.BOOLEAN;
-            case 'number':
-                return ECMA_SIZES.NUMBER;
-            case 'symbol':
-                return lodash_1.default.isFunction(Symbol.keyFor) && Symbol.keyFor(obj)
-                    ? /** @type {string} */ (Symbol.keyFor(obj)).length * ECMA_SIZES.STRING
-                    : (obj.toString().length - 8) * ECMA_SIZES.STRING;
-            case 'object':
-                return lodash_1.default.isArray(obj)
-                    ? obj.map(getCalculator(seen)).reduce((acc, curr) => acc + curr, 0)
-                    : _getSizeOfObject(seen, obj);
-            default:
-                return 0;
-        }
-    };
-}
 /**
  * Calculate the in-depth size in memory of the provided object.
  * The original implementation is borrowed from https://github.com/miktam/sizeof.
  *
- * @param {*} obj An object whose size should be calculated
- * @returns {number} Object size in bytes.
+ * @param obj - An object whose size should be calculated
+ * @returns Object size in bytes.
  */
 function getObjectSize(obj) {
     return getCalculator(new WeakSet())(obj);
 }
-const OBJECTS_MAPPING = new WeakMap();
 /**
  * Calculates a unique object identifier
  *
- * @param {object} object Any valid ECMA object
- * @returns {string} A uuidV4 string that uniquely identifies given object
+ * @param object - Any valid ECMA object
+ * @returns A uuidV4 string that uniquely identifies given object
  */
 function getObjectId(object) {
-    if (!OBJECTS_MAPPING.has(object)) {
-        OBJECTS_MAPPING.set(object, (0, uuid_1.v4)());
+    const existing = OBJECTS_MAPPING.get(object);
+    if (existing !== undefined) {
+        return existing;
     }
-    return OBJECTS_MAPPING.get(object);
+    const id = (0, uuid_1.v4)();
+    OBJECTS_MAPPING.set(object, id);
+    return id;
 }
 /**
  * Perform deep freeze of the given object (e. g.
@@ -175,9 +84,8 @@ function getObjectId(object) {
  * ! This function changes the given object,
  * so it becomes immutable.
  *
- * @param {*} object Any valid ECMA object
- * @returns {*} The same object that was passed to the
- * function after it was made immutable.
+ * @param object - Any valid ECMA object
+ * @returns The same object that was passed after it was made immutable.
  */
 function deepFreeze(object) {
     let propNames;
@@ -199,10 +107,10 @@ function deepFreeze(object) {
  * Tries to synchronously detect the absolute path to the folder
  * where the given `moduleName` is located.
  *
- * @param {string} moduleName The name of the module as it is written in package.json
- * @param {string} filePath Full path to any of files that `moduleName` contains. Use
+ * @param moduleName - The name of the module as it is written in package.json
+ * @param filePath - Full path to any of files that `moduleName` contains. Use
  * `__filename` to find the root of the module where this helper is called.
- * @returns {string?} Full path to the module root
+ * @returns Full path to the module root, or null if not found
  */
 function getModuleRootSync(moduleName, filePath) {
     let currentDir = node_path_1.default.dirname(node_path_1.default.resolve(filePath));
@@ -215,10 +123,97 @@ function getModuleRootSync(moduleName, filePath) {
                 return currentDir;
             }
         }
-        catch { }
+        catch {
+            // ignore
+        }
         currentDir = node_path_1.default.dirname(currentDir);
         isAtFsRoot = currentDir.length <= node_path_1.default.dirname(currentDir).length;
     }
     return null;
 }
+// #region Private
+const ECMA_SIZES = Object.freeze({
+    STRING: 2,
+    BOOLEAN: 4,
+    NUMBER: 8,
+});
+async function linkGlobalPackage(packageName) {
+    try {
+        logger_1.default.debug(`Linking package '${packageName}'`);
+        const cmd = (0, system_1.isWindows)() ? 'npm.cmd' : 'npm';
+        await (0, teen_process_1.exec)(cmd, ['link', packageName], { timeout: 20000 });
+    }
+    catch (err) {
+        const e = err;
+        const msg = `Unable to load package '${packageName}', linking failed: ${e.message}`;
+        logger_1.default.debug(msg);
+        if (e.stderr) {
+            logger_1.default.debug(e.stderr);
+        }
+        throw new Error(msg);
+    }
+}
+function extractAllProperties(obj) {
+    const stringProperties = [];
+    for (const prop in obj) {
+        stringProperties.push(prop);
+    }
+    if (lodash_1.default.isFunction(Object.getOwnPropertySymbols)) {
+        stringProperties.push(...Object.getOwnPropertySymbols(obj));
+    }
+    return stringProperties;
+}
+function _getSizeOfObject(seen, object) {
+    if (lodash_1.default.isNil(object)) {
+        return 0;
+    }
+    let bytes = 0;
+    const properties = extractAllProperties(object);
+    const calc = getCalculator(seen);
+    for (const key of properties) {
+        const val = object[key];
+        if (typeof val === 'object' && !lodash_1.default.isNil(val)) {
+            if (seen.has(val)) {
+                continue;
+            }
+            seen.add(val);
+        }
+        bytes += calc(key);
+        try {
+            bytes += calc(val);
+        }
+        catch (ex) {
+            if (ex instanceof RangeError) {
+                bytes = 0;
+            }
+        }
+    }
+    return bytes;
+}
+function getCalculator(seen) {
+    return function calculator(obj) {
+        if (lodash_1.default.isBuffer(obj)) {
+            return obj.length;
+        }
+        switch (typeof obj) {
+            case 'string':
+                return obj.length * ECMA_SIZES.STRING;
+            case 'boolean':
+                return ECMA_SIZES.BOOLEAN;
+            case 'number':
+                return ECMA_SIZES.NUMBER;
+            case 'symbol':
+                return lodash_1.default.isFunction(Symbol.keyFor) && Symbol.keyFor(obj)
+                    ? Symbol.keyFor(obj).length * ECMA_SIZES.STRING
+                    : (obj.toString().length - 8) * ECMA_SIZES.STRING;
+            case 'object':
+                return lodash_1.default.isArray(obj)
+                    ? obj.map(getCalculator(seen)).reduce((acc, curr) => acc + curr, 0)
+                    : _getSizeOfObject(seen, obj);
+            default:
+                return 0;
+        }
+    };
+}
+// #endregion
 //# sourceMappingURL=node.js.map

package/build/lib/node.js.map

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

package/build/lib/npm.d.ts

@@ -1,126 +1,105 @@
+import type { PackageJson } from 'type-fest';
+import type { StringRecord } from '@appium/types';
+import type { TeenProcessExecOptions } from 'teen_process';
 /**
  * Relative path to directory containing any Appium internal files
  * XXX: this is duplicated in `appium/lib/constants.js`.
  */
-export const CACHE_DIR_RELATIVE_PATH: string;
+export declare const CACHE_DIR_RELATIVE_PATH: string;
 /**
  * Relative path to lockfile used when installing an extension via `appium`
  */
-export const INSTALL_LOCKFILE_RELATIVE_PATH: string;
+export declare const INSTALL_LOCKFILE_RELATIVE_PATH: string;
+/** Options for {@link NPM.exec} */
+export interface ExecOpts {
+    /** Current working directory */
+    cwd: string;
+    /** If true, supply `--json` flag to npm and resolve w/ parsed JSON */
+    json?: boolean;
+    /** Path to lockfile to use */
+    lockFile?: string;
+}
+/** Options for {@link NPM.installPackage} */
+export interface InstallPackageOpts {
+    /** Name of the package to install */
+    pkgName: string;
+    /** Whether to install from a local path or from npm */
+    installType?: 'local' | string;
+}
+/** Result of {@link NPM.installPackage} */
+export interface NpmInstallReceipt {
+    /** Path to installed package */
+    installPath: string;
+    /** Package data */
+    pkg: PackageJson;
+}
+export interface NpmExecResult {
+    stdout: string;
+    stderr: string;
+    code: number | null;
+    json?: unknown;
+}
 /**
  * XXX: This should probably be a singleton, but it isn't.  Maybe this module should just export functions?
  */
-export class NPM {
-    /**
-     * Returns path to "install" lockfile
-     * @private
-     * @param {string} cwd
-     */
-    private _getInstallLockfilePath;
+export declare class NPM {
     /**
      * Execute `npm` with given args.
      *
      * If the process exits with a nonzero code, the contents of `STDOUT` and `STDERR` will be in the
      * `message` of any rejected error.
-     * @param {string} cmd
-     * @param {string[]} args
-     * @param {ExecOpts} opts
-     * @param {Omit<TeenProcessExecOptions, 'cwd'>} [execOpts]
      */
-    exec(cmd: string, args: string[], opts: ExecOpts, execOpts?: Omit<TeenProcessExecOptions, "cwd">): Promise<import("teen_process").TeenProcessExecResult<string> & {
-        json?: any;
-    }>;
+    exec(cmd: string, args: string[], opts: ExecOpts, execOpts?: Omit<TeenProcessExecOptions, 'cwd'>): Promise<NpmExecResult>;
     /**
-     * @param {string} cwd
-     * @param {string} pkg
-     * @returns {Promise<string?>}
+     * Gets the latest published version of a package from npm registry.
+     *
+     * @param cwd - Current working directory for npm command
+     * @param pkg - Package name to query
+     * @returns Latest version string, or `null` if package not found (e.g. 404)
      */
     getLatestVersion(cwd: string, pkg: string): Promise<string | null>;
     /**
-     * @param {string} cwd
-     * @param {string} pkg
-     * @param {string} curVersion
-     * @returns {Promise<string?>}
+     * Gets the latest version of a package that is a safe upgrade from the current version
+     * (same major, no prereleases). Fetches versions from npm and delegates to
+     * {@link NPM.getLatestSafeUpgradeFromVersions}.
+     *
+     * @param cwd - Current working directory for npm command
+     * @param pkg - Package name to query
+     * @param curVersion - Current installed version
+     * @returns Latest safe upgrade version string, or `null` if none or package not found
      */
     getLatestSafeUpgradeVersion(cwd: string, pkg: string, curVersion: string): Promise<string | null>;
     /**
      * Runs `npm ls`, optionally for a particular package.
-     * @param {string} cwd
-     * @param {string} [pkg]
      */
-    list(cwd: string, pkg?: string): Promise<any>;
+    list(cwd: string, pkg?: string): Promise<unknown>;
     /**
      * Given a current version and a list of all versions for a package, return the version which is
      * the highest safely-upgradable version (meaning not crossing any major revision boundaries, and
      * not including any alpha/beta/rc versions)
-     *
-     * @param {string} curVersion - the current version of a package
-     * @param {Array<string>} allVersions - a list of version strings
-     *
-     * @return {string|null} - the highest safely-upgradable version, or null if there isn't one
      */
-    getLatestSafeUpgradeFromVersions(curVersion: string, allVersions: Array<string>): string | null;
+    getLatestSafeUpgradeFromVersions(curVersion: string, allVersions: string[]): string | null;
     /**
      * Installs a package w/ `npm`
-     * @param {string} cwd
-     * @param {string} installStr - as in "npm install <installStr>"
-     * @param {InstallPackageOpts} opts
-     * @returns {Promise<NpmInstallReceipt>}
      */
-    installPackage(cwd: string, installStr: string, { pkgName, installType }: InstallPackageOpts): Promise<NpmInstallReceipt>;
+    installPackage(cwd: string, installStr: string, opts: InstallPackageOpts): Promise<NpmInstallReceipt>;
     /**
-     * @param {string} cwd
-     * @param {string} pkg
+     * Uninstalls a package with `npm uninstall`.
+     *
+     * @param cwd - Current working directory (project root)
+     * @param pkg - Package name to uninstall
      */
     uninstallPackage(cwd: string, pkg: string): Promise<void>;
     /**
-     * @param {string} pkg Npm package spec to query
-     * @param {string[]} [entries=[]] Field names to be included into the
-     * resulting output. By default all fields are included.
-     * @returns {Promise<import('@appium/types').StringRecord>}
+     * Fetches package metadata from the npm registry via `npm info`.
+     *
+     * @param pkg - Npm package spec to query
+     * @param entries - Field names to be included into the resulting output. By default all fields are included.
+     * @returns Package metadata as a record of string values
      */
-    getPackageInfo(pkg: string, entries?: string[]): Promise<import("@appium/types").StringRecord>;
+    getPackageInfo(pkg: string, entries?: string[]): Promise<StringRecord>;
+    /** Returns path to "install" lockfile */
+    private _getInstallLockfilePath;
 }
-export const npm: NPM;
-/**
- * Options for {@link NPM.installPackage}
- */
-export type InstallPackageOpts = {
-    /**
-     * - the name of the package to install
-     */
-    pkgName: string;
-    /**
-     * - whether to install from a local path or from npm
-     */
-    installType?: import("type-fest", { with: { "resolution-mode": "import" } }).LiteralUnion<"local", string> | undefined;
-};
-/**
- * Options for {@link NPM.exec}
- */
-export type ExecOpts = {
-    /**
-     * - Current working directory
-     */
-    cwd: string;
-    /**
-     * - If `true`, supply `--json` flag to npm and resolve w/ parsed JSON
-     */
-    json?: boolean | undefined;
-    /**
-     * - Path to lockfile to use
-     */
-    lockFile?: string | undefined;
-};
-export type TeenProcessExecOptions = import("teen_process").TeenProcessExecOptions;
-export type NpmInstallReceipt = {
-    /**
-     * - Path to installed package
-     */
-    installPath: string;
-    /**
-     * - Package data
-     */
-    pkg: import("type-fest").PackageJson;
-};
+export declare const npm: NPM;
 //# sourceMappingURL=npm.d.ts.map

package/build/lib/npm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH,6CAAqF;AAErF;;GAEG;AACH,oDAAkG;AAElG;;GAEG;AACH;IACE;;;;OAIG;IACH,gCAEC;IAED;;;;;;;;;OASG;IACH,UALW,MAAM,QACN,MAAM,EAAE,QACR,QAAQ,aACR,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC;eA0B8B,GAAG;OAyB9E;IAED;;;;OAIG;IACH,sBAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAkB5B;IAED;;;;;OAKG;IACH,iCALW,MAAM,OACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,MAAM,OAAC,CAAC,CAiB5B;IAED;;;;OAIG;IACH,UAHW,MAAM,QACN,MAAM,gBAIhB;IAED;;;;;;;;;OASG;IACH,6CALW,MAAM,eACN,KAAK,CAAC,MAAM,CAAC,GAEZ,MAAM,GAAC,IAAI,CAmCtB;IAED;;;;;;OAMG;IACH,oBALW,MAAM,cACN,MAAM,4BACN,kBAAkB,GAChB,OAAO,CAAC,iBAAiB,CAAC,CAwDtC;IAED;;;OAGG;IACH,sBAHW,MAAM,OACN,MAAM,iBAOhB;IAED;;;;;OAKG;IACH,oBALW,MAAM,YACN,MAAM,EAAE,GAEN,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAOzD;CACF;AAED,sBAA6B;;;;;;;;aAKf,MAAM;;;;;;;;;;;;;SAON,MAAM;;;;;;;;;;qCAMP,OAAO,cAAc,EAAE,sBAAsB;;;;;iBAK5C,MAAM;;;;SACN,OAAO,WAAW,EAAE,WAAW"}
+{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../lib/npm.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAGhD,OAAO,KAAK,EAAY,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAMpE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,QAAgD,CAAC;AAErF;;GAEG;AACH,eAAO,MAAM,8BAA8B,QAAsD,CAAC;AAElG,mCAAmC;AACnC,MAAM,WAAW,QAAQ;IACvB,gCAAgC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6CAA6C;AAC7C,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAChC;AAED,2CAA2C;AAC3C,MAAM,WAAW,iBAAiB;IAChC,gCAAgC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB;IACnB,GAAG,EAAE,WAAW,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,qBAAa,GAAG;IACd;;;;;OAKG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,QAAQ,EACd,QAAQ,GAAE,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAM,GACjD,OAAO,CAAC,aAAa,CAAC;IAyCzB;;;;;;OAMG;IACG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAaxE;;;;;;;;;OASG;IACG,2BAA2B,CAC/B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBzB;;OAEG;IACG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvD;;;;OAIG;IACH,gCAAgC,CAC9B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,GAAG,IAAI;IAuBhB;;OAEG;IACG,cAAc,CAClB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,iBAAiB,CAAC;IAiD7B;;;;;OAKG;IACG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/D;;;;;;OAMG;IACG,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAQhF,yCAAyC;IACzC,OAAO,CAAC,uBAAuB;CAGhC;AAED,eAAO,MAAM,GAAG,KAAY,CAAC"}