@dava96/osrs-wiki-bucket-builder 1.0.6 → 1.0.8

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.
@@ -215,6 +215,11 @@ export declare class BucketQueryBuilder<TMain extends BucketName, TJoinMap exten
215
215
  * Convenience method that sets `limit(1)`.
216
216
  */
217
217
  first(): this;
218
+ /**
219
+ * Escapes a string for safe inclusion in a Lua single-quoted string literal.
220
+ * Backslashes are escaped first (to avoid double-escaping), then single quotes.
221
+ */
222
+ private escapeLuaString;
218
223
  /**
219
224
  * Resolves a dotted field reference (`alias.fieldName`) to its real bucket name.
220
225
  * Returns the field unchanged if the alias is not recognised.
@@ -1 +1 @@
1
- {"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../src/query-builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../src/query-builder.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,8 @@ import { BUCKET_FIELDS } from './generated/definitions.js';
2
2
  import { Bucket, QUERY_DEFAULTS, } from './types.js';
3
3
  /** Base URL for the OSRS Wiki Bucket API. */
4
4
  const BUCKET_API_BASE = 'https://oldschool.runescape.wiki/api.php';
5
+ /** Meta fields auto-injected into every select to match BucketMetaFields typing. */
6
+ const META_FIELDS = ['page_name', 'page_name_sub'];
5
7
  /**
6
8
  * A type-safe query builder for OSRS Wiki Buckets.
7
9
  *
@@ -286,6 +288,13 @@ export class BucketQueryBuilder {
286
288
  this.limit(1);
287
289
  return this;
288
290
  }
291
+ /**
292
+ * Escapes a string for safe inclusion in a Lua single-quoted string literal.
293
+ * Backslashes are escaped first (to avoid double-escaping), then single quotes.
294
+ */
295
+ escapeLuaString(value) {
296
+ return value.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
297
+ }
289
298
  /**
290
299
  * Resolves a dotted field reference (`alias.fieldName`) to its real bucket name.
291
300
  * Returns the field unchanged if the alias is not recognised.
@@ -360,6 +369,12 @@ export class BucketQueryBuilder {
360
369
  for (const s of this.selections) {
361
370
  finalSelectors.push(...this.expandField(s));
362
371
  }
372
+ for (const meta of META_FIELDS) {
373
+ const quoted = `'${meta}'`;
374
+ if (!finalSelectors.includes(quoted)) {
375
+ finalSelectors.push(quoted);
376
+ }
377
+ }
363
378
  if (finalSelectors.length > 0) {
364
379
  const unique = Array.from(new Set(finalSelectors));
365
380
  sql += `.select(${unique.join(', ')})`;
@@ -415,7 +430,7 @@ export class BucketQueryBuilder {
415
430
  if (typeof valRaw === 'object' && valRaw !== null && '_type' in valRaw && valRaw._type === 'NULL') {
416
431
  return `{ '${field}', bucket.Null() }`;
417
432
  }
418
- const val = typeof valRaw === 'string' ? `'${valRaw}'` : valRaw;
433
+ const val = typeof valRaw === 'string' ? `'${this.escapeLuaString(valRaw)}'` : valRaw;
419
434
  return `{ '${field}', ${val} }`;
420
435
  }
421
436
  if (cond.length === 3) {
@@ -423,7 +438,7 @@ export class BucketQueryBuilder {
423
438
  if (typeof valRaw === 'object' && valRaw !== null && '_type' in valRaw) {
424
439
  return `{ '${field}', '${cond[1]}', ${this.formatCondition(valRaw)} }`;
425
440
  }
426
- const val = typeof valRaw === 'string' ? `'${valRaw}'` : valRaw;
441
+ const val = typeof valRaw === 'string' ? `'${this.escapeLuaString(valRaw)}'` : valRaw;
427
442
  return `{ '${field}', '${cond[1]}', ${val} }`;
428
443
  }
429
444
  }
@@ -1 +1 @@
1
- {"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../src/query-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EACH,MAAM,EACN,cAAc,GAMjB,MAAM,YAAY,CAAC;AAEpB,6CAA6C;AAC7C,MAAM,eAAe,GAAG,0CAA0C,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAO,kBAAkB;IAcV,UAAU,CAAQ;IAC3B,KAAK,GAAkF,EAAE,CAAC;IAC1F,UAAU,GAAa,EAAE,CAAC;IAC1B,YAAY,GAAsB,EAAE,CAAC;IACrC,UAAU,GAAW,cAAc,CAAC,KAAK,CAAC;IAC1C,WAAW,GAAW,cAAc,CAAC,MAAM,CAAC;IAC5C,YAAY,GAA0D,EAAE,CAAC;IACzE,QAAQ,GAA2B,EAAE,CAAC;IAE9C,YAAY,MAAa;QACrB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACnC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CACF,GAAG,MAAW;QASd,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QAChC,OAAO,IAON,CAAC;IACN,CAAC;IAuDD,IAAI,CACA,YAAwB,EACxB,kBAA0B,EAC1B,mBAA2B,EAC3B,gBAAyB;QAEzB,IAAI,KAAyB,CAAC;QAC9B,IAAI,WAAmB,CAAC;QACxB,IAAI,WAAmB,CAAC;QAExB,IAAI,gBAAgB,EAAE,CAAC;YACnB,KAAK,GAAG,kBAAkB,CAAC;YAC3B,WAAW,GAAG,mBAAmB,CAAC;YAClC,WAAW,GAAG,gBAAgB,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,WAAW,GAAG,kBAAkB,CAAC;YACjC,WAAW,GAAG,mBAAmB,CAAC;QACtC,CAAC;QAED,MAAM,SAAS,GAA2E;YACtF,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,WAAW;SACxB,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACR,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE3B,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;QAC/C,CAAC;QAED,OAAO,IAAiG,CAAC;IAC7G,CAAC;IA0BD,KAAK,CAAC,GAAG,IAAmF;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;oBAC5D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,GAA4B,CAAC,CAAC,CAAC;gBAC9E,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAgB,CAAC,CAAC,CAAC;gBACxE,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAwC,CAAC;gBAC3D,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;oBAC5D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAa,EAAE,GAA4B,CAAC,CAAC,CAAC;gBACnG,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,CAAC,CAAa,EAAE,GAAkB,CAAC,CAAC,CAAC;gBACzF,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAyB,EAAE,CAAC,CAAC;YAClE,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAyB,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,KAAkC,EAAE,KAAkB;QAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,KAAkC;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,KAAkC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,KAAkC,EAAE,KAAiC;QAC9E,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,SAAkB,EAAE,QAA+B;QACpD,IAAI,SAAS,EAAE,CAAC;YACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,KAAkC,EAAE,MAAqB;QAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAoB,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAa;QACf,IAAI,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC;QAC3C,CAAC;aAAM,IAAI,KAAK,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,gBAAgB,cAAc,CAAC,SAAS,aAAa,CAAC,CAAC;YAClF,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC;QAC/C,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAc;QACjB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,IAAY,EAAE,OAAe;QAClC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK;QACD,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAA2C,IAAI,CAAC,UAAU,CAAC,CAAC;QAChG,KAAK,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,KAAK,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;QACxC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACnE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,KAAK,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAA4B,KAAiB,EAAE,SAA2B;QAC7E,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,aAAa,GAAG,KAAK,CAAC;YAE1B,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChC,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;wBACd,aAAa,GAAG,IAAI,CAAC;wBACrB,MAAM;oBACV,CAAC;oBACD,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAChC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;4BAChC,aAAa,GAAG,IAAI,CAAC;4BACrB,MAAM;wBACV,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YAED,IAAI,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE,CAAC;gBACjC,OAAO,CAAC,IAAI,CACR,2BAA2B,KAAK,8DAA8D,CACjG,CAAC;YACN,CAAC;QACL,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACK,YAAY,CAAC,KAAa;QAC9B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACvC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACxB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,KAAa;QAC7B,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAChB,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACxD,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACnD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACzB,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,MAAoB,CAAC,IAAI,EAAE,CAAC;gBACjE,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7E,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;gBACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;gBAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAExC,IAAI,CAAC,UAAU,EAAE,CAAC;oBACd,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;gBAC1B,CAAC;gBAED,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;oBACnB,MAAM,MAAM,GAAG,aAAa,CAAC,UAAwB,CAAC,IAAI,EAAE,CAAC;oBAC7D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,UAAU,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC7D,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,IAAI,UAAU,IAAI,QAAQ,GAAG,CAAC,CAAC;gBAC3C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,QAAQ;QACJ,IAAI,GAAG,GAAG,WAAW,IAAI,CAAC,UAAU,IAAI,CAAC;QAEzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAE9C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;YACtC,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,SAAS,GAAG,GAAG,CAAC,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;YAC3C,CAAC;YAED,GAAG,IAAI,UAAU,CAAC,CAAC,MAAM,OAAO,GAAG,OAAO,SAAS,IAAI,CAAC;QAC5D,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,cAAc,GAAa,EAAE,CAAC;YACpC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC;YACD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;gBACnD,GAAG,IAAI,WAAW,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3C,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC7C,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;oBACrB,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxE,CAAC;gBACD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACtB,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC;YAC1B,CAAC;QACL,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzC,GAAG,IAAI,aAAa,KAAK,OAAO,CAAC,CAAC,SAAS,IAAI,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;YAC3C,GAAG,IAAI,UAAU,IAAI,CAAC,UAAU,GAAG,CAAC;QACxC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;YAC7C,GAAG,IAAI,WAAW,IAAI,CAAC,WAAW,GAAG,CAAC;QAC1C,CAAC;QAED,GAAG,IAAI,QAAQ,CAAC;QAChB,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,IAAqB;QACzC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACtE,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC9C,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpF,OAAO,UAAU,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,GAAG,CAAC;YACpE,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACvB,OAAO,cAAc,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAU,CAAC,GAAG,CAAC;YAClE,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;gBACxB,OAAO,eAAe,CAAC;YAC3B,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;oBAChG,OAAO,MAAM,KAAK,oBAAoB,CAAC;gBAC3C,CAAC;gBACD,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;gBAChE,OAAO,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;YACpC,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;oBACrE,OAAO,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC3E,CAAC;gBACD,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;gBAChE,OAAO,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;YAClD,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,GAAG,CAAC,UAAmC,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;QAC/C,OAAO,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACxD,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,OAAO,GAAG,eAAe,oCAAoC,YAAY,EAAE,CAAC;IAChF,CAAC;CACJ;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,MAAM,CAAuB,MAAS;IAClD,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../src/query-builder.ts"],"names":[],"mappings":"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"}
@@ -10,10 +10,11 @@
10
10
  */
11
11
  import type { BucketRegistry, BucketName } from './generated/definitions.js';
12
12
  /**
13
- * Meta-fields that the Wiki Bucket API injects into every response row.
13
+ * Meta-fields that the query builder auto-injects into every select.
14
14
  *
15
- * These are not part of any bucket's schema but are always present in
16
- * the JSON response. `page_name` identifies the source wiki page and
15
+ * These are not part of any bucket's schema. The query builder automatically
16
+ * includes them in every generated Lua query so they are always returned in
17
+ * the response. `page_name` identifies the source wiki page and
17
18
  * `page_name_sub` identifies the subpage or version variant.
18
19
  *
19
20
  * @example
@@ -46,7 +47,7 @@ export interface BucketMetaFields {
46
47
  * // ValidField = 'item_name' | 'weight' | ... | 'ex.id' | 'ex.name' | ... | '*' | 'ex.*'
47
48
  * ```
48
49
  */
49
- export type ValidField<TMain extends BucketName, TJoinMap extends Record<string, BucketName>> = (keyof BucketRegistry[TMain] & string) | JoinedFields<TJoinMap> | '*' | JoinedWildcards<TJoinMap>;
50
+ export type ValidField<TMain extends BucketName, TJoinMap extends Record<string, BucketName>> = (keyof BucketRegistry[TMain] & string) | JoinedFields<TJoinMap> | keyof BucketMetaFields | '*' | JoinedWildcards<TJoinMap>;
50
51
  /**
51
52
  * Generates dot-prefixed field names for all joined buckets.
52
53
  * E.g. if TJoinMap = { ex: 'exchange' }, produces `'ex.id' | 'ex.name' | ...`
@@ -1 +1 @@
1
- {"version":3,"file":"response-types.d.ts","sourceRoot":"","sources":["../src/response-types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"response-types.d.ts","sourceRoot":"","sources":["../src/response-types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dava96/osrs-wiki-bucket-builder",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "type": "module",
package/readme.md CHANGED
@@ -549,7 +549,7 @@ const query = bucket('infobox_item')
549
549
  | `BucketResponse<T>` | Response wrapper class |
550
550
  | `BucketResponse.from()` | Creates a typed response from a query builder |
551
551
  | `InferBucketResult<T>` | Extracts the inferred row type from a query |
552
- | `BucketMetaFields` | The `page_name` and `page_name_sub` fields present on every row |
552
+ | `BucketMetaFields` | The `page_name` and `page_name_sub` fields auto-injected into every query |
553
553
  | `Operator` | Valid comparison operators |
554
554
  | `ScalarValue` | `string \| number \| boolean` |
555
555