ttpg-darrell 1.1.55 → 1.1.57

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.
@@ -22,7 +22,8 @@ export declare class TriggerableMulticastDelegate<T extends (...args: Array<any>
22
22
  /**
23
23
  * Call every function in the trigger set.
24
24
  *
25
- * Call every function even if one throws, raise gathered errors at end.
25
+ * Call every function even if one throws, send gathered errors at end directly to error handler;
26
+ * does not throw/stop processing.
26
27
  *
27
28
  * @param args
28
29
  */
@@ -38,7 +38,8 @@ class TriggerableMulticastDelegate {
38
38
  /**
39
39
  * Call every function in the trigger set.
40
40
  *
41
- * Call every function even if one throws, raise gathered errors at end.
41
+ * Call every function even if one throws, send gathered errors at end directly to error handler;
42
+ * does not throw/stop processing.
42
43
  *
43
44
  * @param args
44
45
  */
@@ -49,7 +50,17 @@ class TriggerableMulticastDelegate {
49
50
  fn(...args);
50
51
  });
51
52
  }
52
- error_batcher_1.ErrorBatcher.runMaybeThrowAtEnd(runnables);
53
+ try {
54
+ error_batcher_1.ErrorBatcher.runMaybeThrowAtEnd(runnables);
55
+ }
56
+ catch (errorUnknownType) {
57
+ if (errorUnknownType instanceof Error &&
58
+ errorUnknownType.stack &&
59
+ globalThis.$uncaughtException) {
60
+ // Stack already includes name/message.
61
+ globalThis.$uncaughtException(errorUnknownType.stack);
62
+ }
63
+ }
53
64
  }
54
65
  }
55
66
  exports.TriggerableMulticastDelegate = TriggerableMulticastDelegate;
@@ -1 +1 @@
1
- {"version":3,"file":"triggerable-multicast-delegate.js","sourceRoot":"","sources":["../../../../../src/lib/event/triggerable-multicast-delegate/triggerable-multicast-delegate.ts"],"names":[],"mappings":";;;AAAA,qEAAiE;AAEjE;;GAEG;AACH,MAAa,4BAA4B;IAAzC;QAIqB,eAAU,GAAa,EAAE,CAAC;IA+C/C,CAAC;IA7CG;;;;OAIG;IACH,GAAG,CAAC,EAAK;QACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAK;QACR,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,GAAG,IAAmB;QAC1B,MAAM,SAAS,GAAgC,EAAE,CAAC;QAClD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,4BAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;CACJ;AAnDD,oEAmDC"}
1
+ {"version":3,"file":"triggerable-multicast-delegate.js","sourceRoot":"","sources":["../../../../../src/lib/event/triggerable-multicast-delegate/triggerable-multicast-delegate.ts"],"names":[],"mappings":";;;AAAA,qEAAiE;AAEjE;;GAEG;AACH,MAAa,4BAA4B;IAAzC;QAIqB,eAAU,GAAa,EAAE,CAAC;IA2D/C,CAAC;IAzDG;;;;OAIG;IACH,GAAG,CAAC,EAAK;QACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAK;QACR,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,IAAmB;QAC1B,MAAM,SAAS,GAAgC,EAAE,CAAC;QAClD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,CAAC;YACD,4BAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,gBAAyB,EAAE,CAAC;YACjC,IACI,gBAAgB,YAAY,KAAK;gBACjC,gBAAgB,CAAC,KAAK;gBACtB,UAAU,CAAC,kBAAkB,EAC/B,CAAC;gBACC,uCAAuC;gBACvC,UAAU,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AA/DD,oEA+DC"}
@@ -55,21 +55,22 @@ class NSID {
55
55
  return extra.split("|");
56
56
  }
57
57
  static getWithExtra(input) {
58
- let metadata = "";
58
+ let metadata = input.getTemplateMetadata();
59
59
  if (input instanceof api_1.Card) {
60
60
  if (input.getStackSize() === 1) {
61
61
  // Singleton card: use the card metadata.
62
- metadata = input.getCardDetails().metadata;
62
+ // Image shaped tokens are also "cards", only look for
63
+ // per-card metadata if the card details is set.
64
+ const cardMetadata = input.getCardDetails().metadata;
65
+ if (cardMetadata.length > 0) {
66
+ metadata = cardMetadata;
67
+ }
63
68
  }
64
69
  else {
65
70
  // Deck: do not attempt to extract more here.
66
71
  metadata = exports.DECK_NSID;
67
72
  }
68
73
  }
69
- else if (input instanceof api_1.StaticObject) {
70
- // Non-card table or game object. Use template metadata.
71
- metadata = input.getTemplateMetadata();
72
- }
73
74
  return metadata;
74
75
  }
75
76
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"nsid.js","sourceRoot":"","sources":["../../../../src/lib/nsid/nsid.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nsid.js","sourceRoot":"","sources":["../../../../src/lib/nsid/nsid.ts"],"names":[],"mappings":"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"}
@@ -22,7 +22,8 @@ export declare class TriggerableMulticastDelegate<T extends (...args: Array<any>
22
22
  /**
23
23
  * Call every function in the trigger set.
24
24
  *
25
- * Call every function even if one throws, raise gathered errors at end.
25
+ * Call every function even if one throws, send gathered errors at end directly to error handler;
26
+ * does not throw/stop processing.
26
27
  *
27
28
  * @param args
28
29
  */
@@ -35,7 +35,8 @@ export class TriggerableMulticastDelegate {
35
35
  /**
36
36
  * Call every function in the trigger set.
37
37
  *
38
- * Call every function even if one throws, raise gathered errors at end.
38
+ * Call every function even if one throws, send gathered errors at end directly to error handler;
39
+ * does not throw/stop processing.
39
40
  *
40
41
  * @param args
41
42
  */
@@ -46,7 +47,17 @@ export class TriggerableMulticastDelegate {
46
47
  fn(...args);
47
48
  });
48
49
  }
49
- ErrorBatcher.runMaybeThrowAtEnd(runnables);
50
+ try {
51
+ ErrorBatcher.runMaybeThrowAtEnd(runnables);
52
+ }
53
+ catch (errorUnknownType) {
54
+ if (errorUnknownType instanceof Error &&
55
+ errorUnknownType.stack &&
56
+ globalThis.$uncaughtException) {
57
+ // Stack already includes name/message.
58
+ globalThis.$uncaughtException(errorUnknownType.stack);
59
+ }
60
+ }
50
61
  }
51
62
  }
52
63
  //# sourceMappingURL=triggerable-multicast-delegate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"triggerable-multicast-delegate.js","sourceRoot":"","sources":["../../../../../src/lib/event/triggerable-multicast-delegate/triggerable-multicast-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE;;GAEG;AACH,MAAM,OAAO,4BAA4B;IAAzC;QAIqB,eAAU,GAAa,EAAE,CAAC;IA+C/C,CAAC;IA7CG;;;;OAIG;IACH,GAAG,CAAC,EAAK;QACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAK;QACR,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,GAAG,IAAmB;QAC1B,MAAM,SAAS,GAAgC,EAAE,CAAC;QAClD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;CACJ"}
1
+ {"version":3,"file":"triggerable-multicast-delegate.js","sourceRoot":"","sources":["../../../../../src/lib/event/triggerable-multicast-delegate/triggerable-multicast-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE;;GAEG;AACH,MAAM,OAAO,4BAA4B;IAAzC;QAIqB,eAAU,GAAa,EAAE,CAAC;IA2D/C,CAAC;IAzDG;;;;OAIG;IACH,GAAG,CAAC,EAAK;QACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAK;QACR,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,IAAmB;QAC1B,MAAM,SAAS,GAAgC,EAAE,CAAC;QAClD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,CAAC;YACD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,gBAAyB,EAAE,CAAC;YACjC,IACI,gBAAgB,YAAY,KAAK;gBACjC,gBAAgB,CAAC,KAAK;gBACtB,UAAU,CAAC,kBAAkB,EAC/B,CAAC;gBACC,uCAAuC;gBACvC,UAAU,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}
@@ -1,4 +1,4 @@
1
- import { Card, StaticObject } from "@tabletop-playground/api";
1
+ import { Card } from "@tabletop-playground/api";
2
2
  export const DECK_NSID = "deck:?/?";
3
3
  /**
4
4
  * Object metadata field uses a simple "type:source/name|extra" string.
@@ -52,21 +52,22 @@ export class NSID {
52
52
  return extra.split("|");
53
53
  }
54
54
  static getWithExtra(input) {
55
- let metadata = "";
55
+ let metadata = input.getTemplateMetadata();
56
56
  if (input instanceof Card) {
57
57
  if (input.getStackSize() === 1) {
58
58
  // Singleton card: use the card metadata.
59
- metadata = input.getCardDetails().metadata;
59
+ // Image shaped tokens are also "cards", only look for
60
+ // per-card metadata if the card details is set.
61
+ const cardMetadata = input.getCardDetails().metadata;
62
+ if (cardMetadata.length > 0) {
63
+ metadata = cardMetadata;
64
+ }
60
65
  }
61
66
  else {
62
67
  // Deck: do not attempt to extract more here.
63
68
  metadata = DECK_NSID;
64
69
  }
65
70
  }
66
- else if (input instanceof StaticObject) {
67
- // Non-card table or game object. Use template metadata.
68
- metadata = input.getTemplateMetadata();
69
- }
70
71
  return metadata;
71
72
  }
72
73
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"nsid.js","sourceRoot":"","sources":["../../../../src/lib/nsid/nsid.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nsid.js","sourceRoot":"","sources":["../../../../src/lib/nsid/nsid.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ttpg-darrell",
3
- "version": "1.1.55",
3
+ "version": "1.1.57",
4
4
  "description": "TTPG TypeScript library",
5
5
  "main": "./build/cjs/index.js",
6
6
  "module": "./build/esm/index.js",