@datocms/cma-client 3.3.3 → 3.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -130,7 +130,7 @@ var Client = /** @class */ (function () {
130
130
  });
131
131
  Client.prototype.request = function (options) {
132
132
  var _this = this;
133
- return (0, rest_client_utils_1.request)(__assign(__assign(__assign({}, this.config), options), { logFn: this.config.logFn || console.log, userAgent: '@datocms/cma-client v3.3.3', baseUrl: this.baseUrl, preCallStack: new Error().stack, extraHeaders: __assign(__assign(__assign({}, (this.config.extraHeaders || {})), (this.config.environment
133
+ return (0, rest_client_utils_1.request)(__assign(__assign(__assign({}, this.config), options), { logFn: this.config.logFn || console.log, userAgent: '@datocms/cma-client v3.3.4', baseUrl: this.baseUrl, preCallStack: new Error().stack, extraHeaders: __assign(__assign(__assign({}, (this.config.extraHeaders || {})), (this.config.environment
134
134
  ? { 'X-Environment': this.config.environment }
135
135
  : {})), { 'X-API-Version': '3' }), fetchJobResult: function (jobId) {
136
136
  return _this.jobResultsFetcher
@@ -28,6 +28,12 @@ function fromUrlSafeBase64toUint8Array(urlSafeBase64) {
28
28
  : new Uint8Array(Buffer.from(base64, 'base64'));
29
29
  }
30
30
  function isValidId(id) {
31
+ // For backward compatibility, first check to see if this is an older-style integer ID formerly used by Dato
32
+ if (/^\d+$/.test(id)) {
33
+ var intId = BigInt(id);
34
+ var maxDatoIntegerId = 281474976710655; // Max 6-byte/48-bit unsigned int
35
+ return intId <= maxDatoIntegerId;
36
+ }
31
37
  var bytes = fromUrlSafeBase64toUint8Array(id);
32
38
  // UUIDs are 16 bytes
33
39
  if (bytes.length !== 16) {
@@ -1 +1 @@
1
- {"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/idUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA0B;AAE1B,IAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAExC,SAAS,6BAA6B,CAAC,KAAiB;IACtD,IAAM,MAAM,GACV,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5C,oDAAoD;IACpD,OAAO,CACL,MAAM;QACJ,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,oBAAoB;SACnB,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CACpB,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CAAC,aAAqB;IAC1D,sDAAsD;IACtD,IAAM,MAAM,GAAG,aAAa;QAC1B,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;QACnB,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEtB,OAAO,OAAO,MAAM,KAAK,WAAW;QAClC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;QACvD,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,SAAS,CAAC,EAAU;IAClC,IAAM,KAAK,GAAG,6BAA6B,CAAC,EAAE,CAAC,CAAC;IAEhD,qBAAqB;IACrB,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,sDAAsD;IACtD,6BAA6B;IAE7B,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,OAAO,GAAG,GAAU,CAAC,KAAK,GAAU,EAAE;QACzC,OAAO,KAAK,CAAC;KACd;IAED,uDAAuD;IACvD,+CAA+C;IAE/C,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC;IAElC,gDAAgD;IAChD,IAAI,OAAO,KAAK,GAAG,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA7BD,8BA6BC;AAED,SAAgB,UAAU;IACxB,IAAM,KAAK,GAAG,IAAA,SAAE,EAAC,IAAI,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,oEAAoE;IACpE,EAAE;IACF,iEAAiE;IACjE,mEAAmE;IACnE,mCAAmC;IAEnC,6DAA6D;IAE7D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC;IAE5B,IAAM,MAAM,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,gCAgBC"}
1
+ {"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/idUtils.ts"],"names":[],"mappings":";;;AAAA,6BAA0B;AAE1B,IAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAExC,SAAS,6BAA6B,CAAC,KAAiB;IACtD,IAAM,MAAM,GACV,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5C,oDAAoD;IACpD,OAAO,CACL,MAAM;QACJ,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,oBAAoB;SACnB,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CACpB,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CAAC,aAAqB;IAC1D,sDAAsD;IACtD,IAAM,MAAM,GAAG,aAAa;QAC1B,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;QACnB,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEtB,OAAO,OAAO,MAAM,KAAK,WAAW;QAClC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;QACvD,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,SAAS,CAAC,EAAU;IAClC,4GAA4G;IAC5G,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACpB,IAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QACzB,IAAM,gBAAgB,GAAG,eAAe,CAAC,CAAC,iCAAiC;QAC3E,OAAO,KAAK,IAAI,gBAAgB,CAAC;KAClC;IAED,IAAM,KAAK,GAAG,6BAA6B,CAAC,EAAE,CAAC,CAAC;IAEhD,qBAAqB;IACrB,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,sDAAsD;IACtD,6BAA6B;IAE7B,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,OAAO,GAAG,GAAU,CAAC,KAAK,GAAU,EAAE;QACzC,OAAO,KAAK,CAAC;KACd;IAED,uDAAuD;IACvD,+CAA+C;IAE/C,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC;IAElC,gDAAgD;IAChD,IAAI,OAAO,KAAK,GAAG,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AApCD,8BAoCC;AAED,SAAgB,UAAU;IACxB,IAAM,KAAK,GAAG,IAAA,SAAE,EAAC,IAAI,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,oEAAoE;IACpE,EAAE;IACF,iEAAiE;IACjE,mEAAmE;IACnE,mCAAmC;IAEnC,6DAA6D;IAE7D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC;IAE5B,IAAM,MAAM,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,gCAgBC"}
@@ -104,7 +104,7 @@ var Client = /** @class */ (function () {
104
104
  });
105
105
  Client.prototype.request = function (options) {
106
106
  var _this = this;
107
- return request(__assign(__assign(__assign({}, this.config), options), { logFn: this.config.logFn || console.log, userAgent: '@datocms/cma-client v3.3.3', baseUrl: this.baseUrl, preCallStack: new Error().stack, extraHeaders: __assign(__assign(__assign({}, (this.config.extraHeaders || {})), (this.config.environment
107
+ return request(__assign(__assign(__assign({}, this.config), options), { logFn: this.config.logFn || console.log, userAgent: '@datocms/cma-client v3.3.4', baseUrl: this.baseUrl, preCallStack: new Error().stack, extraHeaders: __assign(__assign(__assign({}, (this.config.extraHeaders || {})), (this.config.environment
108
108
  ? { 'X-Environment': this.config.environment }
109
109
  : {})), { 'X-API-Version': '3' }), fetchJobResult: function (jobId) {
110
110
  return _this.jobResultsFetcher
@@ -25,6 +25,12 @@ function fromUrlSafeBase64toUint8Array(urlSafeBase64) {
25
25
  : new Uint8Array(Buffer.from(base64, 'base64'));
26
26
  }
27
27
  export function isValidId(id) {
28
+ // For backward compatibility, first check to see if this is an older-style integer ID formerly used by Dato
29
+ if (/^\d+$/.test(id)) {
30
+ var intId = BigInt(id);
31
+ var maxDatoIntegerId = 281474976710655; // Max 6-byte/48-bit unsigned int
32
+ return intId <= maxDatoIntegerId;
33
+ }
28
34
  var bytes = fromUrlSafeBase64toUint8Array(id);
29
35
  // UUIDs are 16 bytes
30
36
  if (bytes.length !== 16) {
@@ -1 +1 @@
1
- {"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/idUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAE1B,IAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAExC,SAAS,6BAA6B,CAAC,KAAiB;IACtD,IAAM,MAAM,GACV,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5C,oDAAoD;IACpD,OAAO,CACL,MAAM;QACJ,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,oBAAoB;SACnB,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CACpB,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CAAC,aAAqB;IAC1D,sDAAsD;IACtD,IAAM,MAAM,GAAG,aAAa;QAC1B,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;QACnB,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEtB,OAAO,OAAO,MAAM,KAAK,WAAW;QAClC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;QACvD,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EAAU;IAClC,IAAM,KAAK,GAAG,6BAA6B,CAAC,EAAE,CAAC,CAAC;IAEhD,qBAAqB;IACrB,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,sDAAsD;IACtD,6BAA6B;IAE7B,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,OAAO,GAAG,GAAU,CAAC,KAAK,GAAU,EAAE;QACzC,OAAO,KAAK,CAAC;KACd;IAED,uDAAuD;IACvD,+CAA+C;IAE/C,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC;IAElC,gDAAgD;IAChD,IAAI,OAAO,KAAK,GAAG,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,IAAM,KAAK,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,oEAAoE;IACpE,EAAE;IACF,iEAAiE;IACjE,mEAAmE;IACnE,mCAAmC;IAEnC,6DAA6D;IAE7D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC;IAE5B,IAAM,MAAM,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/idUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAE1B,IAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAExC,SAAS,6BAA6B,CAAC,KAAiB;IACtD,IAAM,MAAM,GACV,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5C,oDAAoD;IACpD,OAAO,CACL,MAAM;QACJ,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACpB,oBAAoB;SACnB,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CACpB,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CAAC,aAAqB;IAC1D,sDAAsD;IACtD,IAAM,MAAM,GAAG,aAAa;QAC1B,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;QACnB,mBAAmB;SAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEtB,OAAO,OAAO,MAAM,KAAK,WAAW;QAClC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC;QACvD,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EAAU;IAClC,4GAA4G;IAC5G,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACpB,IAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QACzB,IAAM,gBAAgB,GAAG,eAAe,CAAC,CAAC,iCAAiC;QAC3E,OAAO,KAAK,IAAI,gBAAgB,CAAC;KAClC;IAED,IAAM,KAAK,GAAG,6BAA6B,CAAC,EAAE,CAAC,CAAC;IAEhD,qBAAqB;IACrB,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,sDAAsD;IACtD,6BAA6B;IAE7B,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,OAAO,GAAG,GAAU,CAAC,KAAK,GAAU,EAAE;QACzC,OAAO,KAAK,CAAC;KACd;IAED,uDAAuD;IACvD,+CAA+C;IAE/C,IAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,CAAC;IAElC,gDAAgD;IAChD,IAAI,OAAO,KAAK,GAAG,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,IAAM,KAAK,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,oEAAoE;IACpE,EAAE;IACF,iEAAiE;IACjE,mEAAmE;IACnE,mCAAmC;IAEnC,6DAA6D;IAE7D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC;IAE5B,IAAM,MAAM,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC;AAChB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datocms/cma-client",
3
- "version": "3.3.3",
3
+ "version": "3.3.4",
4
4
  "description": "JS client for DatoCMS REST Content Management API",
5
5
  "keywords": ["datocms", "client"],
6
6
  "author": "Stefano Verna <s.verna@datocms.com>",
@@ -30,12 +30,12 @@
30
30
  "url": "https://github.com/datocms/js-rest-api-clients/issues"
31
31
  },
32
32
  "dependencies": {
33
- "@datocms/rest-client-utils": "^3.3.3",
33
+ "@datocms/rest-client-utils": "^3.3.4",
34
34
  "uuid": "^9.0.1"
35
35
  },
36
36
  "devDependencies": {
37
- "@datocms/dashboard-client": "^3.3.3",
37
+ "@datocms/dashboard-client": "^3.3.4",
38
38
  "@types/uuid": "^9.0.7"
39
39
  },
40
- "gitHead": "013171f1e33f61c464eaa9d7d8fae2d8fdabefb0"
40
+ "gitHead": "0fa5f212739ec6f27a717a1450f18deb12a2a482"
41
41
  }
@@ -145,7 +145,7 @@ export class Client {
145
145
  ...this.config,
146
146
  ...options,
147
147
  logFn: this.config.logFn || console.log,
148
- userAgent: '@datocms/cma-client v3.3.3',
148
+ userAgent: '@datocms/cma-client v3.3.4',
149
149
  baseUrl: this.baseUrl,
150
150
  preCallStack: new Error().stack,
151
151
  extraHeaders: {
package/src/idUtils.ts CHANGED
@@ -34,6 +34,13 @@ function fromUrlSafeBase64toUint8Array(urlSafeBase64: string): Uint8Array {
34
34
  }
35
35
 
36
36
  export function isValidId(id: string) {
37
+ // For backward compatibility, first check to see if this is an older-style integer ID formerly used by Dato
38
+ if (/^\d+$/.test(id)) {
39
+ const intId = BigInt(id);
40
+ const maxDatoIntegerId = 281474976710655; // Max 6-byte/48-bit unsigned int
41
+ return intId <= maxDatoIntegerId;
42
+ }
43
+
37
44
  const bytes = fromUrlSafeBase64toUint8Array(id);
38
45
 
39
46
  // UUIDs are 16 bytes