google-ads-api 13.0.0 → 14.1.0-beta-0

package/build/src/protos/index.d.ts

@@ -1,10 +1,10 @@
 import allProtos, { protos } from "google-ads-node";
-export declare const VERSION: "v13";
-export import common = protos.google.ads.googleads.v13.common;
-export import errors = protos.google.ads.googleads.v13.errors;
-export import resources = protos.google.ads.googleads.v13.resources;
-export import services = protos.google.ads.googleads.v13.services;
-export import internalEnums = protos.google.ads.googleads.v13.enums;
+export declare const VERSION: "v14";
+export import common = protos.google.ads.googleads.v14.common;
+export import errors = protos.google.ads.googleads.v14.errors;
+export import resources = protos.google.ads.googleads.v14.resources;
+export import services = protos.google.ads.googleads.v14.services;
+export import internalEnums = protos.google.ads.googleads.v14.enums;
 export { enums } from "./autogen/enums";
 export { fields } from "./autogen/fields";
 export { GoogleAdsServiceClient } from "google-ads-node";

package/build/src/protos/index.js

@@ -7,12 +7,12 @@ const version_1 = require("../version");
 exports.VERSION = version_1.googleAdsVersion;
 // -- Expose the googleads generated types --
 // The namespace path is shortened for ease of use
-exports.common = google_ads_node_1.protos.google.ads.googleads.v13.common;
-exports.errors = google_ads_node_1.protos.google.ads.googleads.v13.errors;
-exports.resources = google_ads_node_1.protos.google.ads.googleads.v13.resources;
-exports.services = google_ads_node_1.protos.google.ads.googleads.v13.services;
+exports.common = google_ads_node_1.protos.google.ads.googleads.v14.common;
+exports.errors = google_ads_node_1.protos.google.ads.googleads.v14.errors;
+exports.resources = google_ads_node_1.protos.google.ads.googleads.v14.resources;
+exports.services = google_ads_node_1.protos.google.ads.googleads.v14.services;
 // We compile enums ourselves, the Google ones should be used internally only
-exports.internalEnums = google_ads_node_1.protos.google.ads.googleads.v13.enums;
+exports.internalEnums = google_ads_node_1.protos.google.ads.googleads.v14.enums;
 var enums_1 = require("./autogen/enums");
 Object.defineProperty(exports, "enums", { enumerable: true, get: function () { return enums_1.enums; } });
 var fields_1 = require("./autogen/fields");

package/build/src/query.d.ts

@@ -44,18 +44,18 @@ export declare function validateConstraintKeyAndValue(key: ConstraintKey, op: Co
     val: ParsedConstraintValue;
 };
 export declare function convertNumericEnumToString(key: ConstraintKey, val: ParsedConstraintValue): ParsedConstraintValue;
-export declare function extractConstraintConditions(constraints: ReportOptions["constraints"]): ConstraintString[];
+export declare function extractConstraintConditions(constraints: Readonly<ReportOptions["constraints"]>): ConstraintString[];
 export declare function extractDateConstantConditions(dateConstant: ReportOptions["date_constant"]): ConstraintString[];
 export declare function extractDateConditions(fromDate: ReportOptions["from_date"], toDate: ReportOptions["to_date"]): ConstraintString[];
-export declare function buildWhereClause(constraints: ReportOptions["constraints"], dateConstant: ReportOptions["date_constant"], fromDate: ReportOptions["from_date"], toDate: ReportOptions["to_date"]): WhereClause;
+export declare function buildWhereClause(constraints: Readonly<ReportOptions["constraints"]>, dateConstant: Readonly<ReportOptions["date_constant"]>, fromDate: Readonly<ReportOptions["from_date"]>, toDate: Readonly<ReportOptions["to_date"]>): WhereClause;
 export declare function buildLimitClause(limit: ReportOptions["limit"]): LimitClause;
-export declare function buildParametersClause(parameters: ReportOptions["parameters"]): ParametersClause;
+export declare function buildParametersClause(parameters: Readonly<ReportOptions["parameters"]>): ParametersClause;
 export declare function completeOrderly(orderly: string, entity: ReportOptions["entity"]): string;
-export declare function buildOrderClauseOld(orderBy: ReportOptions["order_by"], sortOrder: ReportOptions["sort_order"], entity: ReportOptions["entity"]): OrderClause;
-export declare function buildOrderClauseNew(order: Required<ReportOptions["order"]>, entity: ReportOptions["entity"]): OrderClause;
-export declare function buildOrderClause(order: ReportOptions["order"], orderBy: ReportOptions["order_by"], sortOrder: ReportOptions["sort_order"], entity: ReportOptions["entity"]): OrderClause;
-export declare function buildRequestOptions(reportOptions: ReportOptions): RequestOptions;
-export declare function buildQuery(reportOptions: ReportOptions): {
+export declare function buildOrderClauseOld(orderBy: Readonly<ReportOptions["order_by"]>, sortOrder: Readonly<ReportOptions["sort_order"]>, entity: Readonly<ReportOptions["entity"]>): OrderClause;
+export declare function buildOrderClauseNew(order: Readonly<Required<ReportOptions["order"]>>, entity: Readonly<ReportOptions["entity"]>): OrderClause;
+export declare function buildOrderClause(order: Readonly<ReportOptions["order"]>, orderBy: Readonly<ReportOptions["order_by"]>, sortOrder: Readonly<ReportOptions["sort_order"]>, entity: Readonly<ReportOptions["entity"]>): OrderClause;
+export declare function buildRequestOptions(reportOptions: Readonly<ReportOptions>): RequestOptions;
+export declare function buildQuery(reportOptions: Readonly<ReportOptions>): {
     gaqlQuery: Query;
     requestOptions: RequestOptions;
 };

package/build/src/service.d.ts

@@ -12,7 +12,6 @@ export declare class Service {
     protected readonly clientOptions: ClientOptions;
     protected readonly customerOptions: CustomerOptions;
     protected readonly hooks: Hooks;
-    private serviceCache;
     constructor(clientOptions: ClientOptions, customerOptions: CustomerOptions, hooks?: Hooks);
     get credentials(): CustomerCredentials;
     protected get callHeaders(): CallHeaders;

package/build/src/service.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = exports.FAILURE_KEY = void 0;
 const google_gax_1 = require("google-gax");
@@ -6,8 +9,18 @@ const google_auth_library_1 = require("google-auth-library");
 const protos_1 = require("./protos");
 const utils_1 = require("./utils");
 const version_1 = require("./version");
+const ttlcache_1 = __importDefault(require("@isaacs/ttlcache"));
 // Make sure to update this version number when upgrading
 exports.FAILURE_KEY = `google.ads.googleads.${version_1.googleAdsVersion}.errors.googleadsfailure-bin`;
+// A global service cache to avoid re-initialising services
+const serviceCache = new ttlcache_1.default({
+    max: 1000,
+    ttl: 10 * 60 * 1000,
+    dispose: async (service) => {
+        // Close connections when services are removed from the cache
+        await service.close();
+    },
+});
 class Service {
     constructor(clientOptions, customerOptions, hooks) {
         this.clientOptions = clientOptions;
@@ -42,18 +55,20 @@ class Service {
         return credentials;
     }
     loadService(service) {
-        if (this.serviceCache[service]) {
-            return this.serviceCache[service];
+        const serviceCacheKey = `${service}_${this.customerOptions.refresh_token}`;
+        if (serviceCache.has(serviceCacheKey)) {
+            return serviceCache.get(serviceCacheKey);
         }
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const { [service]: protoService } = require("google-ads-node");
         if (typeof protoService === "undefined") {
             throw new Error(`Service "${service}" could not be found`);
         }
+        // Initialising services can take a few ms, so we cache when possible.
         const client = new protoService({
             sslCreds: this.getCredentials(),
         });
-        this.serviceCache[service] = client;
+        serviceCache.set(serviceCacheKey, client);
         return client;
     }
     getGoogleAdsError(error) {

package/build/src/version.d.ts

@@ -1 +1 @@
-export declare const googleAdsVersion = "v13";
+export declare const googleAdsVersion = "v14";

package/build/src/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.googleAdsVersion = void 0;
-exports.googleAdsVersion = "v13";
+exports.googleAdsVersion = "v14";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-ads-api",
-  "version": "13.0.0",
+  "version": "14.1.0-beta-0",
   "description": "Google Ads API Client Library for Node.js",
   "repository": "https://github.com/Opteo/google-ads-api",
   "main": "build/src/index.js",
@@ -17,9 +17,10 @@
   "author": "Opteo",
   "license": "MIT",
   "dependencies": {
-    "google-ads-node": "^11.0.0",
+    "@isaacs/ttlcache": "^1.2.2",
+    "google-ads-node": "^12.0.1",
     "google-auth-library": "^7.1.0",
-    "google-gax": "^3.6.0",
+    "google-gax": "^4.0.3",
     "long": "^4.0.0"
   },
   "devDependencies": {