@api-client/core 0.5.16 → 0.5.17

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.
Files changed (5) hide show
  1. package/build/src/lib/parsers/UriTemplate.d.ts +13 -0
  2. package/build/src/lib/parsers/UriTemplate.js +24 -3
  3. package/build/src/lib/parsers/UriTemplate.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/lib/parsers/UriTemplate.ts +25 -4
package/build/src/lib/parsers/UriTemplate.d.ts CHANGED
@@ -81,6 +81,19 @@ export declare class UriTemplate {
81
81
  * Parses the template into action tokens.
82
82
  */
83
83
  parse(): void;
84
+ /**
85
+ * Creates a Data object with the passed map.
86
+ *
87
+ * @param map The map with values.
88
+ */
89
+ protected static getData(map: Record<string, any>): Data;
90
+ /**
91
+ * Can be used by a child class to manipulate string parts that are not template expressions
92
+ *
93
+ * @param part The string part
94
+ * @returns The processed part.
95
+ */
96
+ protected static expandString(part: string): string;
84
97
  protected static expand(expression: IPart, data: Data, opts?: IUriTemplateOptions): string;
85
98
  /**
86
99
  * Expands a named variable.
package/build/src/lib/parsers/UriTemplate.js CHANGED
@@ -200,10 +200,14 @@ export class UriTemplate {
200
200
  if (!this.parts || !this.parts.length) {
201
201
  this.parse();
202
202
  }
203
- const data = new Data(map);
203
+ const data = UriTemplate.getData(map);
204
204
  for (const part of this.parts) {
205
- const item = typeof part === 'string' ? part : UriTemplate.expand(part, data, opts);
206
- result += item;
205
+ if (typeof part === 'string') {
206
+ result += UriTemplate.expandString(part);
207
+ }
208
+ else {
209
+ result += UriTemplate.expand(part, data, opts);
210
+ }
207
211
  }
208
212
  return result;
209
213
  }
@@ -274,6 +278,23 @@ export class UriTemplate {
274
278
  }
275
279
  this.parts = parts;
276
280
  }
281
+ /**
282
+ * Creates a Data object with the passed map.
283
+ *
284
+ * @param map The map with values.
285
+ */
286
+ static getData(map) {
287
+ return new Data(map);
288
+ }
289
+ /**
290
+ * Can be used by a child class to manipulate string parts that are not template expressions
291
+ *
292
+ * @param part The string part
293
+ * @returns The processed part.
294
+ */
295
+ static expandString(part) {
296
+ return part;
297
+ }
277
298
  static expand(expression, data, opts = {}) {
278
299
  const options = operators[expression.operator];
279
300
  const type = options.named ? 'Named' : 'Unnamed';
package/build/src/lib/parsers/UriTemplate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UriTemplate.js","sourceRoot":"","sources":["../../../../src/lib/parsers/UriTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;AAE7C;;GAEG;AACH,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAE/D;;GAEG;AACH,MAAM,gBAAgB,GAAG,wCAAwC,CAAC;AAElE;;GAEG;AACH,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AAEhD;;GAEG;AACH,MAAM,eAAe,GAAG,eAAe,CAAC;AAExC,IAAK,QASJ;AATD,WAAK,QAAQ;IACX,iBAAiB;IACjB,qCAAG,CAAA;IACH,SAAS;IACT,2CAAM,CAAA;IACN,SAAS;IACT,2CAAM,CAAA;IACN,QAAQ;IACR,yCAAK,CAAA;AACP,CAAC,EATI,QAAQ,KAAR,QAAQ,QASZ;AAkBD,MAAM,IAAI;IAEW;IADnB,KAAK,CAAwB;IAC7B,YAAmB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;QAC1C,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,MAAM,CAAC,GAAU;YACf,IAAI,EAAE,QAAQ,CAAC,GAAG;YAClB,GAAG,EAAE,EAAE;YACP,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,EAAE;SACnB,CAAC;QAEF,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;YACjC,mCAAmC;YACnC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEpB,IAAI,KAAU,CAAC;QACf,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;aAAM,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE;YAC1C,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;SACxB;aAAM;YACL,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;QAED,gEAAgE;QAChE,6DAA6D;QAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;YACzC,yDAAyD;YACzD,OAAO,CAAC,CAAC;SACV;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClB,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE;oBACjC,0BAA0B;oBAC1B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;iBAC3B;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;gBAChB,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;aACzB;SACF;aAAM,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,iBAAiB,EAAE;YAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/B,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE;oBACjC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;iBACnB;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;gBAChB,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;aAC1B;SACF;aAAM;YACL,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxC;QAED,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAiCD,MAAM,SAAS,GAA8B;IAC3C,0BAA0B;IAC1B,EAAE,EAAE;QACF,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,KAAK;QACZ,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,cAAc;KACvB;IACD,6BAA6B;IAC7B,GAAG,EAAE;QACH,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,KAAK;QACZ,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,gBAAgB;KACzB;IACD,uCAAuC;IACvC,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,KAAK;QACZ,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,gBAAgB;KACzB;IACD,4CAA4C;IAC5C,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,KAAK;QACZ,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,cAAc;KACvB;IACD,gCAAgC;IAChC,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,KAAK;QACZ,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,cAAc;KACvB;IACD,0DAA0D;IAC1D,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,cAAc;KACvB;IACD,oDAAoD;IACpD,2CAA2C;IAC3C,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,oBAAoB,EAAE,IAAI;QAC1B,MAAM,EAAE,cAAc;KACvB;IACD,gDAAgD;IAChD,oCAAoC;IACpC,GAAG,EAAE;QACH,MAAM,EAAE,GAAG;QACX,SAAS,EAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,oBAAoB,EAAE,IAAI;QAC1B,MAAM,EAAE,cAAc;KACvB;IAED,wEAAwE;IACxE,oEAAoE;CACrE,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,WAAW;IAqBA;IApBtB,KAAK,CAAsB;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,GAAW;QACxB,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SACxB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,YAAsB,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;IAAI,CAAC;IAE7C;;;;;;OAMG;IACH,MAAM,CAAC,GAAwB,EAAE,OAA4B,EAAE;QAC7D,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrC,IAAI,CAAC,KAAK,EAAE,CAAC;SACd;QACD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAM,EAAE;YAC9B,MAAM,IAAI,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACpF,MAAM,IAAI,IAAI,CAAC;SAChB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,KAAK;QACH,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,MAAM,KAAK,GAAuB,EAAE,CAAC;QACrC,IAAI,GAAG,GAAG,CAAC,CAAC;QAEZ,SAAS,YAAY,CAAC,OAAe;YACnC,IAAI,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;aACjD;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,kBAAkB,CAAC,SAAS,GAAG,CAAC,CAAC;QAEjC,iDAAiD;QACjD,OAAO,IAAI,EAAE;YACX,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnD,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,wBAAwB;gBACxB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpD,MAAM;aACP;iBAAM;gBACL,uBAAuB;gBACvB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClE,GAAG,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aACvC;YACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACtE;iBAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACvD;YAED,sBAAsB;YACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAgB,EAAE,CAAC;YAE7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC/C,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACnD,IAAI,MAAM,KAAK,IAAI,EAAE;oBACnB,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBACxE;qBAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE;oBACjD,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,CAAC,CAAC,CAAC,UAAU,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC5E;gBAED,IAAI,CAAC,CAAC,CAAC,GAAG;oBACR,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;oBACf,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;oBACpB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS;iBAC7D,CAAC;aACH;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aAClE;YACD,KAAK,CAAC,IAAI,CAAC;gBACT,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;gBACrB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;gBACnB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACjB,2CAA2C;YAC3C,mCAAmC;YACnC,oDAAoD;YACpD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;SACtC;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAES,MAAM,CAAC,MAAM,CAAC,UAAiB,EAAE,IAAU,EAAE,OAA4B,EAAE;QACnF,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACjD,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;gBAClD,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;aAC5E;YACD,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE;gBACjD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBAClC,SAAQ;aACT;YACD,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;gBACjB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,EAAE;oBAC3B,2EAA2E;oBAC3E,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACjB;gBACD,SAAS;aACV;YACD,IAAI,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gBAClD,MAAM,IAAI,KAAK,CAAC,mEAAmE,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;aACtG;YACD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CACtC,CAAC,EACD,OAAO,EACP,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,IAAI,GAAG,EAC5C,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,IAAI,CACd,CAAC,CAAC;SACJ;QAED,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,OAAO,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACxD;QACD,gDAAgD;QAChD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACO,MAAM,CAAC,WAAW,CAAC,CAAQ,EAAE,OAAkB,EAAE,OAAgB,EAAE,SAAiB,EAAE,MAAe,EAAE,IAAa;QAC5H,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;QACjD,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAClC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAK,CAAC,CAAC;QAExE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC;YACX,IAAI,MAAM,EAAE;gBACV,0DAA0D;gBAC1D,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC3D,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;oBAC9B,6CAA6C;oBAC7C,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;iBAC3D;aACF;iBAAM,IAAI,OAAO,EAAE;gBAClB,eAAe;gBACf,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;gBACtC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;oBAC9B,sCAAsC;oBACtC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;oBACrC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;iBACjC;qBAAM;oBACL,sBAAsB;oBACtB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;iBACrC;aACF;iBAAM;gBACL,0DAA0D;gBAC1D,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;oBAC9B,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC;iBAC9B;aACF;YAED,IAAI,MAAM,EAAE;gBACV,MAAM,IAAI,SAAS,CAAC;aACrB;YAED,IAAI,CAAC,OAAO,EAAE;gBACZ,IAAI,CAAC,KAAK,EAAE;oBACV,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,IAAK,CAAC,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBACnF;gBACD,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;oBAC9B,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC;iBACvB;gBACD,MAAM,IAAI,MAAM,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAI,KAAK,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;aACxE;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACO,MAAM,CAAC,aAAa,CAAC,CAAQ,EAAE,OAAkB,EAAE,OAAgB,EAAE,SAAiB,EAAE,MAAe;QAC/G,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;QACjD,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAElC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC5B,IAAI,MAAc,CAAC;YACnB,IAAI,MAAM,EAAE;gBACV,0DAA0D;gBAC1D,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;aAC5D;iBAAM,IAAI,OAAO,EAAE;gBAClB,yBAAyB;gBACzB,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;gBACtC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;oBACb,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,SAAS;oBACrE,MAAM;iBACP,CAAC,CAAC;aACJ;iBAAM;gBACL,yCAAyC;gBACzC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC;aAC/B;YAED,IAAI,MAAM,EAAE;gBACV,sDAAsD;gBACtD,MAAM,IAAI,SAAS,CAAC;aACrB;YAED,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE;gBAC9B,IAAI,KAAK,CAAC;gBACV,IAAI,MAAM,EAAE;oBACV,4CAA4C;oBAC5C,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;iBAC3D;qBAAM;oBACL,iDAAiD;oBACjD,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC7B;gBAED,MAAM,IAAI,KAAK,CAAC;gBAChB,IAAI,OAAO,EAAE;oBACX,mDAAmD;oBACnD,MAAM,IAAI,CAAC,oBAAoB,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBACvD;qBAAM;oBACL,sDAAsD;oBACtD,MAAM,IAAI,GAAG,CAAC;iBACf;aACF;YAED,MAAM,IAAI,MAAM,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
1
+ {"version":3,"file":"UriTemplate.js","sourceRoot":"","sources":["../../../../src/lib/parsers/UriTemplate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@api-client/core",
3
3
  "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
4
- "version": "0.5.16",
4
+ "version": "0.5.17",
5
5
  "license": "Apache-2.0",
6
6
  "main": "build/index.js",
7
7
  "module": "build/index.js",
package/src/lib/parsers/UriTemplate.ts CHANGED
@@ -255,11 +255,13 @@ export class UriTemplate {
255
255
  if (!this.parts || !this.parts.length) {
256
256
  this.parse();
257
257
  }
258
- const data = new Data(map);
259
-
258
+ const data = UriTemplate.getData(map);
260
259
  for (const part of this.parts!) {
261
- const item = typeof part === 'string' ? part : UriTemplate.expand(part, data, opts);
262
- result += item;
260
+ if (typeof part === 'string') {
261
+ result += UriTemplate.expandString(part);
262
+ } else {
263
+ result += UriTemplate.expand(part, data, opts);
264
+ }
263
265
  }
264
266
  return result;
265
267
  }
@@ -338,6 +340,25 @@ export class UriTemplate {
338
340
  this.parts = parts;
339
341
  }
340
342
 
343
+ /**
344
+ * Creates a Data object with the passed map.
345
+ *
346
+ * @param map The map with values.
347
+ */
348
+ protected static getData(map: Record<string, any>): Data {
349
+ return new Data(map);
350
+ }
351
+
352
+ /**
353
+ * Can be used by a child class to manipulate string parts that are not template expressions
354
+ *
355
+ * @param part The string part
356
+ * @returns The processed part.
357
+ */
358
+ protected static expandString(part: string): string {
359
+ return part;
360
+ }
361
+
341
362
  protected static expand(expression: IPart, data: Data, opts: IUriTemplateOptions = {}): string {
342
363
  const options = operators[expression.operator];
343
364
  const type = options.named ? 'Named' : 'Unnamed';