lit-ui-router 1.16.2 → 1.16.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.
Files changed (96) hide show
  1. package/dist/context.d.ts.map +1 -1
  2. package/dist/context.js +3 -3
  3. package/dist/context.js.map +1 -1
  4. package/dist/core.d.ts.map +1 -1
  5. package/dist/core.js +4 -4
  6. package/dist/core.js.map +1 -1
  7. package/dist/custom-elements.json +13 -2
  8. package/dist/dev-warn.d.ts.map +1 -1
  9. package/dist/dev-warn.js +2 -1
  10. package/dist/dev-warn.js.map +1 -1
  11. package/dist/development/context.js +3 -3
  12. package/dist/development/context.js.map +1 -1
  13. package/dist/development/core.js +4 -4
  14. package/dist/development/core.js.map +1 -1
  15. package/dist/development/dev-warn.js +2 -1
  16. package/dist/development/dev-warn.js.map +1 -1
  17. package/dist/development/pure.js.map +1 -1
  18. package/dist/development/routed-element.js.map +1 -1
  19. package/dist/development/router-subscription.js +2 -1
  20. package/dist/development/router-subscription.js.map +1 -1
  21. package/dist/development/sref-active.js +37 -23
  22. package/dist/development/sref-active.js.map +1 -1
  23. package/dist/development/sref-href.js +13 -2
  24. package/dist/development/sref-href.js.map +1 -1
  25. package/dist/development/sref-internals.js +6 -4
  26. package/dist/development/sref-internals.js.map +1 -1
  27. package/dist/development/sref-status-controller.js +2 -2
  28. package/dist/development/sref-status-controller.js.map +1 -1
  29. package/dist/development/sref-status.js +6 -5
  30. package/dist/development/sref-status.js.map +1 -1
  31. package/dist/development/transition-controller.js.map +1 -1
  32. package/dist/development/ui-router.js.map +1 -1
  33. package/dist/development/ui-sref-active.js +40 -17
  34. package/dist/development/ui-sref-active.js.map +1 -1
  35. package/dist/development/ui-sref.js +14 -2
  36. package/dist/development/ui-sref.js.map +1 -1
  37. package/dist/development/ui-view.js +5 -6
  38. package/dist/development/ui-view.js.map +1 -1
  39. package/dist/interface.d.ts.map +1 -1
  40. package/dist/pure.d.ts.map +1 -1
  41. package/dist/pure.js.map +1 -1
  42. package/dist/routed-element.js.map +1 -1
  43. package/dist/router-subscription.d.ts.map +1 -1
  44. package/dist/router-subscription.js +2 -1
  45. package/dist/router-subscription.js.map +1 -1
  46. package/dist/sref-active.d.ts +18 -9
  47. package/dist/sref-active.d.ts.map +1 -1
  48. package/dist/sref-active.js +37 -23
  49. package/dist/sref-active.js.map +1 -1
  50. package/dist/sref-href.d.ts +4 -0
  51. package/dist/sref-href.d.ts.map +1 -1
  52. package/dist/sref-href.js +13 -2
  53. package/dist/sref-href.js.map +1 -1
  54. package/dist/sref-internals.d.ts +8 -1
  55. package/dist/sref-internals.d.ts.map +1 -1
  56. package/dist/sref-internals.js +6 -4
  57. package/dist/sref-internals.js.map +1 -1
  58. package/dist/sref-status-controller.d.ts.map +1 -1
  59. package/dist/sref-status-controller.js +2 -2
  60. package/dist/sref-status-controller.js.map +1 -1
  61. package/dist/sref-status.d.ts.map +1 -1
  62. package/dist/sref-status.js +6 -5
  63. package/dist/sref-status.js.map +1 -1
  64. package/dist/transition-controller.d.ts.map +1 -1
  65. package/dist/transition-controller.js.map +1 -1
  66. package/dist/ui-router.d.ts.map +1 -1
  67. package/dist/ui-router.js.map +1 -1
  68. package/dist/ui-sref-active.d.ts +7 -0
  69. package/dist/ui-sref-active.d.ts.map +1 -1
  70. package/dist/ui-sref-active.js +40 -17
  71. package/dist/ui-sref-active.js.map +1 -1
  72. package/dist/ui-sref.d.ts +4 -0
  73. package/dist/ui-sref.d.ts.map +1 -1
  74. package/dist/ui-sref.js +14 -2
  75. package/dist/ui-sref.js.map +1 -1
  76. package/dist/ui-view.d.ts.map +1 -1
  77. package/dist/ui-view.js +5 -6
  78. package/dist/ui-view.js.map +1 -1
  79. package/package.json +1 -1
  80. package/src/context.ts +21 -4
  81. package/src/core.ts +16 -4
  82. package/src/dev-warn.ts +6 -1
  83. package/src/interface.ts +6 -1
  84. package/src/pure.ts +9 -0
  85. package/src/routed-element.ts +2 -0
  86. package/src/router-subscription.ts +20 -1
  87. package/src/sref-active.ts +109 -30
  88. package/src/sref-href.ts +39 -2
  89. package/src/sref-internals.ts +40 -3
  90. package/src/sref-status-controller.ts +18 -2
  91. package/src/sref-status.ts +10 -9
  92. package/src/transition-controller.ts +12 -6
  93. package/src/ui-router.ts +6 -0
  94. package/src/ui-sref-active.ts +94 -38
  95. package/src/ui-sref.ts +43 -3
  96. package/src/ui-view.ts +82 -28
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","mappings":";;;;AAKA,cAAc,gBAAgB;AAE9B,cAAc,mBAAmB;;;;;;;;;AAUjC,YAAY;CAAQ;CAAS;IAAa,UAAU;;CAElD,aAAa;AACf;;;;;;AAOA,YAAY,iBAAiB;;;;;;AAO7B,YAAY,YAAY,UAAU,kBAChC,UAAU,cAAc,gBAAgB,aAAa;;;;;;;AAQvD,YAAY,gBAAgB,cAC1B,OAAO,WACP;;;;;;;AASF,iBAAiB,eAAe,UAAU,gBAAgB;;UAE/C,SAAS;;UAET,UAAU,gBAAgB,YAAY;;UAEtC;AACX;;;;;;AAOA,OAAO,cAAM,yBAA0B;;;;;;;AAQvC,iBAAiB,iBAAiB;;UAEvB,MAAM;AACjB;;;;;;;;AASA,YAAY,gBAAgB,QAAQ,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BtD,OAAO,cAAM,eAAe;;;;;;;;;AAY5B,OAAO,cAAM,oBAAoB,UAAU,wBACjC,iBACG,eAAe,GAC5B;;CAEE,SAAS,SAAS;;CAElB,SAAS,UAAU,gBAAgB,YAAY;;CAE/C,SAAS;;;;;;CAOT,YACE,SAAS,GACT,UAAU,gBAAgB,YAAY,KACtC;AAOJ;;;;;;;AAQA,OAAO,cAAM,kCAAkC,oBAAoB,eAAe;;;;;CAKhF,YAAY,UAAU,gBAAgB,cAAc;AAGtD;;;;;;;;;;;AAYA,OAAO,cAAM,mBAAmB,UAAU,gBACxC,OAAO,OACP,KAAK,MACF,SAAS,QAAQ,eAAe;;;;;;;;;AAoBrC,OAAO,cAAM,yBACX,OAAO,UACJ,SAAS,QAAQ,eAAe;;;;;;;;AAYrC,iBAAiB,sBAAsB,UAAU,gBAAgB;;;;;;CAM/D;;;;;CAKA,WAAW,gBAAgB,YAAY;AACzC;;;;;;;AAQA,YAAY,uBAAuB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;AAyBzD,OAAO,cAAM,iBAAiB,UAAU,gBACtC,QAAQ,aACR,KAAK,GACL,UAAU,sBAAsB,OAC7B,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDjB,OAAO,cAAM,gBACX,QAAQ,aACR,UAAU,yBACP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CL,OAAO,cAAM,iBAAiB,UAAU,gBACtC,MAAM,aACN,KAAK,GACL,OAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4CrB,OAAO,cAAM,gBACX,MAAM,aACN,QAAQ;;;;;;;AAUV,iBAAiB,uBAAuB;;UAE7B,MAAM;AACjB;;;;;;;AAQA,iBAAiB,qBAAqB,YAAY;;UAEvC;;UAEA,UAAU;AACrB;;;;;;;;AASA,YAAY,sBAAsB,QAAQ,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BlE,OAAO,cAAM,qBAAqB;;;;;;;;AAclC,OAAO,cAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDpC,OAAO,cAAM,iBAAiB,GAAG,QAAQ,UAAU,WAAW,MAAM","names":[],"ignoreList":[],"sources":["../src/context.ts"]}
1
+ {"version":3,"file":"context.d.ts","mappings":";;;;AAKA,cAAc,gBAAgB;AAE9B,cAAc,mBAAmB;;;;;;;;;AAUjC,YAAY;CAAQ;CAAS;IAAa,UAAU;;CAElD,aAAa;AACf;;;;;;AAOA,YAAY,iBAAiB;;;;;;AAO7B,YAAY,YAAY,UAAU,kBAChC,UAAU,cAAc,gBAAgB,aAAa;;;;;;;AAQvD,YAAY,gBAAgB,cAC1B,OAAO,WACP;;;;;;;AASF,iBAAiB,eAAe,UAAU,gBAAgB;;UAE/C,SAAS;;UAET,UAAU,gBAAgB,YAAY;;UAEtC;AACX;;;;;;AAOA,OAAO,cAAM,yBAA0B;;;;;;;AAQvC,iBAAiB,iBAAiB;;UAEvB,MAAM;AACjB;;;;;;;;AASA,YAAY,gBAAgB,QAAQ,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BtD,OAAO,cAAM,eAAe;;;;;;;;;AAY5B,OAAO,cAAM,oBAAoB,UAAU,wBACjC,iBACG,eAAe,GAC5B;;CAEE,SAAS,SAAS;;CAElB,SAAS,UAAU,gBAAgB,YAAY;;CAE/C,SAAS;;;;;;CAOT,YACE,SAAS,GACT,UAAU,gBAAgB,YAAY,KACtC;AAOJ;;;;;;;AAQA,OAAO,cAAM,kCAAkC,oBAAoB,eAAe;;;;;CAKhF,YAAY,UAAU,gBAAgB,cAAc;AAGtD;;;;;;;;;;;AAYA,OAAO,cAAM,mBAAmB,UAAU,gBACxC,OAAO,OACP,KAAK,MACF,SAAS,QAAQ,eAAe;;;;;;;;;AAqBrC,OAAO,cAAM,yBACX,OAAO,UACJ,SAAS,QAAQ,eAAe;;;;;;;;AAYrC,iBAAiB,sBAAsB,UAAU,gBAAgB;;;;;;CAM/D;;;;;CAKA,WAAW,gBAAgB,YAAY;AACzC;;;;;;;AAQA,YAAY,uBAAuB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;AAyBzD,OAAO,cAAM,iBAAiB,UAAU,gBACtC,QAAQ,aACR,KAAK,GACL,UAAU,sBAAsB,OAC7B,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDjB,OAAO,cAAM,gBACX,QAAQ,aACR,UAAU,yBACP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CL,OAAO,cAAM,iBAAiB,UAAU,gBACtC,MAAM,aACN,KAAK,GACL,OAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CrB,OAAO,cAAM,gBACX,MAAM,aACN,QAAQ;;;;;;;AAUV,iBAAiB,uBAAuB;;UAE7B,MAAM;AACjB;;;;;;;AAQA,iBAAiB,qBAAqB,YAAY;;UAEvC;;UAEA,UAAU;AACrB;;;;;;;;AASA,YAAY,sBAAsB,QAAQ,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgClE,OAAO,cAAM,qBAAqB;;;;;;;;AAclC,OAAO,cAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDpC,OAAO,cAAM,iBAAiB,GAAG,QAAQ,UAAU,WAAW,MAAM","names":[],"ignoreList":[],"sources":["../src/context.ts"]}
package/dist/context.js CHANGED
@@ -17,8 +17,7 @@ export class RouterContextRequestEvent extends ContextRequestEvent {
17
17
  }
18
18
  }
19
19
  export const isContextRequest = (event, key) => {
20
- const request = event;
21
- return event.type === contextRequestEventName && request.context === key && typeof request.callback === "function";
20
+ return event.type === contextRequestEventName && "context" in event && event.context === key && "callback" in event && typeof event.callback === "function";
22
21
  };
23
22
  export const isRouterContextRequest = (event) => isContextRequest(event, routerContext);
24
23
  export const requestContext = (target, key, options = {}) => {
@@ -47,6 +46,7 @@ export const provideRouter = (root, router) => provideContext(root, routerContex
47
46
  export const parentUiViewContext = Object.freeze({ name: "lit-ui-router/context#parent-ui-view" });
48
47
  let scoped;
49
48
  export const getScopedRouter = () => scoped;
49
+ const isThenable = (value) => (typeof value === "object" || typeof value === "function") && value !== null && "then" in value && typeof value.then === "function";
50
50
  export const withRouterSync = (router, run) => {
51
51
  const previous = scoped;
52
52
  scoped = router;
@@ -56,7 +56,7 @@ export const withRouterSync = (router, run) => {
56
56
  } finally {
57
57
  scoped = previous;
58
58
  }
59
- if (typeof result?.then === "function") throw new TypeError("withRouterSync() is synchronous: `run` returned a thenable, and the router slot is already restored by the time it settles. Consume the render inside `run` — collectResultSync(render(template)) — or read the router before awaiting.");
59
+ if (isThenable(result)) throw new TypeError("withRouterSync() is synchronous: `run` returned a thenable, and the router slot is already restored by the time it settles. Consume the render inside `run` — collectResultSync(render(template)) — or read the router before awaiting.");
60
60
  return result;
61
61
  };
62
62
  //# sourceMappingURL=context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","mappings":"AAoEA,OAAO,MAAM,0BAA0B;AA+CvC,OAAO,MAAM,gBAA+B,OAAO,OAAO,EACxD,MAAM,+BACR,CAAC;AAUD,OAAO,MAAM,4BACH,MAEV;CAaE,YACE,SACA,UACA,WACA;EACA,MAAM,yBAAyB;GAAE,SAAS;GAAM,UAAU;EAAK,CAAC;EAChE,KAAK,UAAU;EACf,KAAK,WAAW;EAChB,KAAK,YAAY;CACnB;AACF;AAQA,OAAO,MAAM,kCAAkC,oBAAmC;CAKhF,YAAY,UAAwC,WAAqB;EACvE,MAAM,eAAe,UAAU,SAAS;CAC1C;AACF;AAYA,OAAO,MAAM,oBAIX,OACA,QACuC;CACvC,MAAM,UAAU;CAChB,OACE,MAAM,SAAS,2BACf,QAAQ,YAAY,OACpB,OAAO,QAAQ,aAAa;AAEhC;AAUA,OAAO,MAAM,0BAGX,UAEA,iBAAiB,OAAO,aAAa;AAsDvC,OAAO,MAAM,kBAKX,QACA,KACA,UAAoC,CAAC,MACN;CAC/B,IAAI;CACJ,IAAI,WAAW;CACf,OAAO,cACL,IAAI,oBACF,MACC,OAAO,gBAAgB;EACtB,IAAI,CAAC,UAAU;GACb,WAAW;GACX,SAAS;EACX;EACA,QAAQ,WAAW,OAAO,WAAW;CACvC,GACA,QAAQ,SACV,CACF;CACA,OAAO;AACT;AA2BA,OAAO,MAAM,iBAIX,QACA,UAAgC,CAAC,MACL,eAAe,QAAQ,eAAe,OAAO;AAwC3E,OAAO,MAAM,kBAKX,MACA,KACA,UACiB;CACjB,MAAM,YAAY,UAAuB;EACvC,IAAI,CAAC,iBAAiB,OAAO,GAAG,GAAG;EACnC,MAAM,yBAAyB;EAC/B,MAAM,SAAS,OAAO,MAAM,kBAAkB,CAAC,IAAI,MAAS;CAC9D;CACA,KAAK,iBAAiB,yBAAyB,QAAQ;CACvD,aAAa,KAAK,oBAAoB,yBAAyB,QAAQ;AACzE;AA+BA,OAAO,MAAM,iBAGM,MAAmB,WACpC,eAAe,MAAM,eAAe,MAAM;AAgE5C,OAAO,MAAM,sBAA2C,OAAO,OAAO,EACpE,MAAM,uCACR,CAAC;AAGD,IAAI;AASJ,OAAO,MAAM,wBAEI;AAgDjB,OAAO,MAAM,kBACX,QACA,QACM;CACN,MAAM,WAAW;CACjB,SAAS;CACT,IAAI;CACJ,IAAI;EACF,SAAS,IAAI;CACf,UAAU;EACR,SAAS;CACX;CACA,IAAI,OAAQ,QAA2C,SAAS,YAC9D,MAAM,IAAI,UACR,yOACF;CAEF,OAAO;AACT","names":[],"ignoreList":[],"sources":["../src/context.ts"]}
1
+ {"version":3,"file":"context.js","mappings":"AAoEA,OAAO,MAAM,0BAA0B;AAgDvC,OAAO,MAAM,gBAA+B,OAAO,OAAO,EACxD,MAAM,+BACR,CAAC;AAUD,OAAO,MAAM,4BACH,MAEV;CAaE,YACE,SACA,UACA,WACA;EACA,MAAM,yBAAyB;GAAE,SAAS;GAAM,UAAU;EAAK,CAAC;EAChE,KAAK,UAAU;EACf,KAAK,WAAW;EAChB,KAAK,YAAY;CACnB;AACF;AAQA,OAAO,MAAM,kCAAkC,oBAAmC;CAKhF,YAAY,UAAwC,WAAqB;EACvE,MAAM,eAAe,UAAU,SAAS;CAC1C;AACF;AAYA,OAAO,MAAM,oBAIX,OACA,QACuC;CACvC,OACE,MAAM,SAAS,2BACf,aAAa,SACb,MAAM,YAAY,OAClB,cAAc,SACd,OAAO,MAAM,aAAa;AAE9B;AAUA,OAAO,MAAM,0BAGX,UAEA,iBAAiB,OAAO,aAAa;AAsDvC,OAAO,MAAM,kBAKX,QACA,KACA,UAAoC,CAAC,MACN;CAC/B,IAAI;CACJ,IAAI,WAAW;CACf,OAAO,cACL,IAAI,oBACF,MACC,OAAO,gBAAgB;EACtB,IAAI,CAAC,UAAU;GACb,WAAW;GACX,SAAS;EACX;EAEA,QAAQ,WAAW,OAAO,WAAW;CACvC,GACA,QAAQ,SACV,CACF;CAEA,OAAO;AACT;AA2BA,OAAO,MAAM,iBAIX,QACA,UAAgC,CAAC,MACL,eAAe,QAAQ,eAAe,OAAO;AAwC3E,OAAO,MAAM,kBAKX,MACA,KACA,UACiB;CACjB,MAAM,YAAY,UAAuB;EACvC,IAAI,CAAC,iBAAiB,OAAO,GAAG,GAAG;EACnC,MAAM,yBAAyB;EAC/B,MAAM,SAAS,OAAO,MAAM,kBAAkB,CAAC,IAAI,MAAS;CAC9D;CAEA,KAAK,iBAAiB,yBAAyB,QAAQ;CAEvD,aAAa,KAAK,oBAAoB,yBAAyB,QAAQ;AACzE;AA+BA,OAAO,MAAM,iBAGM,MAAmB,WACpC,eAAe,MAAM,eAAe,MAAM;AAiE5C,OAAO,MAAM,sBAA2C,OAAO,OAAO,EACpE,MAAM,uCACR,CAAC;AAGD,IAAI;AASJ,OAAO,MAAM,wBAEI;AAGjB,MAAM,cAAiB,WACpB,OAAO,UAAU,YAAY,OAAO,UAAU,eAC/C,UAAU,QACV,UAAU,SACV,OAAO,MAAM,SAAS;AAgDxB,OAAO,MAAM,kBACX,QACA,QACM;CACN,MAAM,WAAW;CACjB,SAAS;CACT,IAAI;CAEJ,IAAI;EACF,SAAS,IAAI;CACf,UAAU;EACR,SAAS;CACX;CAEA,IAAI,WAAW,MAAM,GACnB,MAAM,IAAI,UACR,yOACF;CAGF,OAAO;AACT","names":[],"ignoreList":[],"sources":["../src/context.ts"]}
@@ -1 +1 @@
1
- {"version":3,"file":"core.d.ts","mappings":"AAAA,SAGE,UAIA,aACA,UACA,YAEA,wBACK;AAGP,SACE,kBACA,oBACA,4BACA,8BACA,2BACA,2BACK;;;;;;;;;AA4BP,OAAO,cAAM,yBAAyB,WAAW;CAY7C,MAAa;CACb,UAAiB;;CAXnB;;CAEA;;;;;;CAOA,YACE,AAAO,MAAM,YACb,AAAO,UAAU;;;;;CAOnB,QAAQ;AAGV;;;;;;;;;;;;;AAcA,OAAO,iBAAS,6BACd,UAAU,sBAAsB,qBAEhC,QAAQ,mBAAmB,KAC1B,UAAU,2BAA2B,KAAK,0BAA0B;;;;;;;;AAWvE,OAAO,iBAAS,mBACd,UAAU,sBAAsB,qBAChC,sBAAsB,aAAa,iBAAiB;;;;;;;;;;;;;;AAiBtD,OAAO,iBAAS,gBACd,UAAU,sBAAsB,qBAChC,OAAO,cAAc,eAAe,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsGnE,OAAO,cAAM,oBAAoB,SAAS;;;;;;;;;CASxC;;CASA,QAAQ;;;;;;;;;;;;;;;;;CAkBR;AAUF","names":[],"ignoreList":[],"sources":["../src/core.ts"]}
1
+ {"version":3,"file":"core.d.ts","mappings":"AAAA,SAGE,UAIA,aACA,UACA,YAEA,wBACK;AAGP,SACE,kBACA,oBACA,4BACA,8BACA,2BACA,2BACK;;;;;;;;;AA6BP,OAAO,cAAM,yBAAyB,WAAW;CAY7C,MAAa;CACb,UAAiB;;CAXnB;;CAEA;;;;;;CAOA,YACE,AAAO,MAAM,YACb,AAAO,UAAU;;;;;CAOnB,QAAQ;AAGV;;;;;;;;;;;;;AAcA,OAAO,iBAAS,6BACd,UAAU,sBAAsB,qBAEhC,QAAQ,mBAAmB,KAC1B,UAAU,2BAA2B,KAAK,0BAA0B;;;;;;;;AAWvE,OAAO,iBAAS,mBACd,UAAU,sBAAsB,qBAChC,sBAAsB,aAAa,iBAAiB;;;;;;;;;;;;;;AAsBtD,OAAO,iBAAS,gBACd,UAAU,sBAAsB,qBAChC,OAAO,cAAc,eAAe,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2GnE,OAAO,cAAM,oBAAoB,SAAS;;;;;;;;;CASxC;;CASA,QAAQ;;;;;;;;;;;;;;;;;CAkBR;AAWF","names":[],"ignoreList":[],"sources":["../src/core.ts"]}
package/dist/core.js CHANGED
@@ -18,10 +18,10 @@ export function isLitViewDeclarationTemplate(config) {
18
18
  return isFunction(config);
19
19
  }
20
20
  export function isRoutedLitElement(component) {
21
- return component?.prototype instanceof LitElement;
21
+ return (typeof component === "object" || typeof component === "function") && component !== null && "prototype" in component && component.prototype instanceof LitElement;
22
22
  }
23
23
  export function litViewsBuilder(state) {
24
- const views = {}, viewsObject = state.views || { $default: pick(state, ["component"]) };
24
+ const views = new Map(), viewsObject = state.views || { $default: pick(state, ["component"]) };
25
25
  forEachValue(viewsObject, function(config, name) {
26
26
  let normalizedConfig;
27
27
  name = name || "$default";
@@ -35,9 +35,9 @@ export function litViewsBuilder(state) {
35
35
  normalizedConfig.$uiViewName = normalizedTarget.uiViewName;
36
36
  normalizedConfig.$uiViewContextAnchor = normalizedTarget.uiViewContextAnchor;
37
37
  if (isRoutedLitElement(normalizedConfig.component) && normalizedConfig.component.sticky) normalizedConfig.component = routedLitElementRenderer(normalizedConfig.component);
38
- views[name] = viewsObject[name] = normalizedConfig;
38
+ views.set(name, viewsObject[name] = normalizedConfig);
39
39
  });
40
- return views;
40
+ return Object.fromEntries(views);
41
41
  }
42
42
  const viewConfigFactory = (path, config) => new LitViewConfig(path, config);
43
43
  export class UIRouterLit extends UIRouter {
package/dist/core.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","mappings":"AAAA,SACE,SACA,YAEA,MACA,gBAGA,UAEA,mBAEK;AACP,SAAS,kBAAkB;AAU3B,SAAS,gCAAgC;AAQzC,MAAM,eAAe;AASrB,IAAI,sBAAsB;AAU1B,OAAO,MAAM,cAAoC;CAW/C,YACE,MACA,UACA;EAFO;EACA;aAXK;gBAEL;CAUN;CAMH,OAAsB;EACpB,OAAO,QAAQ,QAAQ,IAAI;CAC7B;AACF;AAcA,OAAO,SAAS,6BAGd,QACwE;CACxE,OAAO,WAAW,MAAM;AAC1B;AASA,OAAO,SAAS,mBAEd,WAAuD;CACvD,OAAQ,WAAsC,qBAAqB;AACrE;AAeA,OAAO,SAAS,gBAEd,OAAqE;CACrE,MAAM,QAAyD,CAAC,GAC9D,cAAc,MAAM,SAAS,EAC3B,UAAU,KAAK,OAAO,CAAC,WAAW,CAAC,EACrC;CAEF,aACE,aACA,SAAU,QAA+B,MAAc;EACrD,IAAI;EACJ,OAAO,QAAQ;EACf,IAAI,6BAAgC,MAAM,GACxC,mBAAmB,EAAE,WAAW,OAAO;OAEvC,mBAAmB;EAErB,IAAI,OAAO,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG;EAEtD,iBAAiB,QAAQ;EACzB,iBAAiB,WAAW;EAC5B,iBAAiB,QAAQ;EAEzB,MAAM,mBAAmB,YAAY,sBACnC,iBAAiB,UACjB,iBAAiB,KACnB;EACA,iBAAiB,cAAc,iBAAiB;EAChD,iBAAiB,uBACf,iBAAiB;EAKnB,IACE,mBAAsB,iBAAiB,SAAS,KAChD,iBAAiB,UAAU,QAE3B,iBAAiB,YAAY,yBAC3B,iBAAiB,SACnB;EAGF,MAAM,QAAQ,YAAY,QAAQ;CACpC,CACF;CACA,OAAO;AACT;AAMA,MAAM,qBAAqB,MAAkB,WAC3C,IAAI,cAAc,MAAM,MAAM;AAiDhC,OAAO,MAAM,oBAAoB,SAAS;CASxC,cAAc;EACZ,MAAM;iBAQU;EAPhB,KAAK,OAAuB,cAAc;EAE1C,KAAK,YAAY,WAAW,mBAAmB,OAAO,iBAAiB;EACvE,KAAK,cAAc,UAAU,SAAS,eAAe;CACvD;CAqBA,QAAc;EACZ,IAAI,KAAK,SACP,MAAM,IAAI,MAAM,+BAA+B;EAGjD,KAAK,kBAAkB,KAAK;EAC5B,KAAK,WAAW,OAAO;EACvB,KAAK,WAAW,KAAK;EACrB,KAAK,UAAU;CACjB;AACF","names":[],"ignoreList":[],"sources":["../src/core.ts"]}
1
+ {"version":3,"file":"core.js","mappings":"AAAA,SACE,SACA,YAEA,MACA,gBAGA,UAEA,mBAEK;AACP,SAAS,kBAAkB;AAU3B,SAAS,gCAAgC;AASzC,MAAM,eAAe;AASrB,IAAI,sBAAsB;AAU1B,OAAO,MAAM,cAAoC;CAW/C,YACE,MACA,UACA;EAFO;EACA;aAXK;gBAEL;CAUN;CAMH,OAAsB;EACpB,OAAO,QAAQ,QAAQ,IAAI;CAC7B;AACF;AAcA,OAAO,SAAS,6BAGd,QACwE;CACxE,OAAO,WAAW,MAAM;AAC1B;AASA,OAAO,SAAS,mBAEd,WAAuD;CACvD,QACG,OAAO,cAAc,YAAY,OAAO,cAAc,eACvD,cAAc,QACd,eAAe,aACf,UAAU,qBAAqB;AAEnC;AAeA,OAAO,SAAS,gBAEd,OAAqE;CACrE,MAAM,QAAQ,IAAI,IAA6C,GAC7D,cAAc,MAAM,SAAS,EAC3B,UAAU,KAAK,OAAO,CAAC,WAAW,CAAC,EACrC;CAEF,aAEE,aACA,SAAU,QAA+B,MAAc;EACrD,IAAI;EACJ,OAAO,QAAQ;EAEf,IAAI,6BAAgC,MAAM,GACxC,mBAAmB,EAAE,WAAW,OAAO;OAEvC,mBAAmB;EAGrB,IAAI,OAAO,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG;EAEtD,iBAAiB,QAAQ;EACzB,iBAAiB,WAAW;EAC5B,iBAAiB,QAAQ;EAEzB,MAAM,mBAAmB,YAAY,sBACnC,iBAAiB,UACjB,iBAAiB,KACnB;EAEA,iBAAiB,cAAc,iBAAiB;EAChD,iBAAiB,uBACf,iBAAiB;EAKnB,IACE,mBAAsB,iBAAiB,SAAS,KAChD,iBAAiB,UAAU,QAE3B,iBAAiB,YAAY,yBAC3B,iBAAiB,SACnB;EAGF,MAAM,IAAI,MAAO,YAAY,QAAQ,gBAAiB;CACxD,CACF;CAEA,OAAO,OAAO,YAAY,KAAK;AACjC;AAMA,MAAM,qBAAqB,MAAkB,WAC3C,IAAI,cAAc,MAAM,MAAM;AAiDhC,OAAO,MAAM,oBAAoB,SAAS;CASxC,cAAc;EACZ,MAAM;iBAQU;EAPhB,KAAK,OAAuB,cAAc;EAE1C,KAAK,YAAY,WAAW,mBAAmB,OAAO,iBAAiB;EACvE,KAAK,cAAc,UAAU,SAAS,eAAe;CACvD;CAqBA,QAAc;EACZ,IAAI,KAAK,SACP,MAAM,IAAI,MAAM,+BAA+B;EAIjD,KAAK,kBAAkB,KAAK;EAC5B,KAAK,WAAW,OAAO;EACvB,KAAK,WAAW,KAAK;EACrB,KAAK,UAAU;CACjB;AACF","names":[],"ignoreList":[],"sources":["../src/core.ts"]}
@@ -424,14 +424,25 @@
424
424
  "kind": "variable",
425
425
  "name": "router"
426
426
  },
427
+ {
428
+ "kind": "variable",
429
+ "name": "name"
430
+ },
431
+ {
432
+ "kind": "variable",
433
+ "name": "creationContext"
434
+ },
435
+ {
436
+ "kind": "variable",
437
+ "name": "fqn"
438
+ },
427
439
  {
428
440
  "kind": "variable",
429
441
  "name": "resolves"
430
442
  },
431
443
  {
432
444
  "kind": "variable",
433
- "name": "transition",
434
- "default": "injector.get(Transition)"
445
+ "name": "transition"
435
446
  }
436
447
  ],
437
448
  "exports": [
@@ -1 +1 @@
1
- {"version":3,"file":"dev-warn.d.ts","mappings":";;;;;;;;AAUA,OAAO,iBAAS;;;;;;;;;;;;;;;;AA6BhB,OAAO,iBAAS,kBACd,SAAS,SACT,iBACA;;;;;;;;;;AAwBF,OAAO,iBAAS,kBAAkB,SAAS","names":[],"ignoreList":[],"sources":["../src/dev-warn.ts"]}
1
+ {"version":3,"file":"dev-warn.d.ts","mappings":";;;;;;;;AAYA,OAAO,iBAAS;;;;;;;;;;;;;;;;AA6BhB,OAAO,iBAAS,kBACd,SAAS,SACT,iBACA;;;;;;;;;;AA0BF,OAAO,iBAAS,kBAAkB,SAAS","names":[],"ignoreList":[],"sources":["../src/dev-warn.ts"]}
package/dist/dev-warn.js CHANGED
@@ -1,6 +1,7 @@
1
+ import { isFunction } from "@uirouter/core";
1
2
  import { UIRouterLitElement } from "./ui-router.js";
2
3
  export function inLitDevMode() {
3
- return typeof UIRouterLitElement.enableWarning === "function";
4
+ return isFunction(UIRouterLitElement.enableWarning);
4
5
  }
5
6
  export function warnMissingRouter(element, subject, consequence) {}
6
7
  export function warnRouterSwapped(element) {}
@@ -1 +1 @@
1
- {"version":3,"file":"dev-warn.js","mappings":"AAAA,SAAS,0BAA0B;AAUnC,OAAO,SAAS,eAAwB;CACtC,OAAO,OAAO,mBAAmB,kBAAkB;AACrD;AA2BA,OAAO,SAAS,kBACd,SACA,SACA,aACM,CAYR;AAWA,OAAO,SAAS,kBAAkB,SAAwB,CAU1D","names":[],"ignoreList":[],"sources":["../src/dev-warn.ts"]}
1
+ {"version":3,"file":"dev-warn.js","mappings":"AAAA,SAAS,kBAAkB;AAE3B,SAAS,0BAA0B;AAUnC,OAAO,SAAS,eAAwB;CACtC,OAAO,WAAW,mBAAmB,aAAa;AACpD;AA2BA,OAAO,SAAS,kBACd,SACA,SACA,aACM,CAcR;AAWA,OAAO,SAAS,kBAAkB,SAAwB,CAW1D","names":[],"ignoreList":[],"sources":["../src/dev-warn.ts"]}
@@ -17,8 +17,7 @@ export class RouterContextRequestEvent extends ContextRequestEvent {
17
17
  }
18
18
  }
19
19
  export const isContextRequest = (event, key) => {
20
- const request = event;
21
- return event.type === contextRequestEventName && request.context === key && typeof request.callback === "function";
20
+ return event.type === contextRequestEventName && "context" in event && event.context === key && "callback" in event && typeof event.callback === "function";
22
21
  };
23
22
  export const isRouterContextRequest = (event) => isContextRequest(event, routerContext);
24
23
  export const requestContext = (target, key, options = {}) => {
@@ -47,6 +46,7 @@ export const provideRouter = (root, router) => provideContext(root, routerContex
47
46
  export const parentUiViewContext = Object.freeze({ name: "lit-ui-router/context#parent-ui-view" });
48
47
  let scoped;
49
48
  export const getScopedRouter = () => scoped;
49
+ const isThenable = (value) => (typeof value === "object" || typeof value === "function") && value !== null && "then" in value && typeof value.then === "function";
50
50
  export const withRouterSync = (router, run) => {
51
51
  const previous = scoped;
52
52
  scoped = router;
@@ -56,7 +56,7 @@ export const withRouterSync = (router, run) => {
56
56
  } finally {
57
57
  scoped = previous;
58
58
  }
59
- if (typeof result?.then === "function") throw new TypeError("withRouterSync() is synchronous: `run` returned a thenable, and the router slot is already restored by the time it settles. Consume the render inside `run` — collectResultSync(render(template)) — or read the router before awaiting.");
59
+ if (isThenable(result)) throw new TypeError("withRouterSync() is synchronous: `run` returned a thenable, and the router slot is already restored by the time it settles. Consume the render inside `run` — collectResultSync(render(template)) — or read the router before awaiting.");
60
60
  return result;
61
61
  };
62
62
  //# sourceMappingURL=context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","mappings":"AAoEA,OAAO,MAAM,0BAA0B;AA+CvC,OAAO,MAAM,gBAA+B,OAAO,OAAO,EACxD,MAAM,+BACR,CAAC;AAUD,OAAO,MAAM,4BACH,MAEV;CAaE,YACE,SACA,UACA,WACA;EACA,MAAM,yBAAyB;GAAE,SAAS;GAAM,UAAU;EAAK,CAAC;EAChE,KAAK,UAAU;EACf,KAAK,WAAW;EAChB,KAAK,YAAY;CACnB;AACF;AAQA,OAAO,MAAM,kCAAkC,oBAAmC;CAKhF,YAAY,UAAwC,WAAqB;EACvE,MAAM,eAAe,UAAU,SAAS;CAC1C;AACF;AAYA,OAAO,MAAM,oBAIX,OACA,QACuC;CACvC,MAAM,UAAU;CAChB,OACE,MAAM,SAAS,2BACf,QAAQ,YAAY,OACpB,OAAO,QAAQ,aAAa;AAEhC;AAUA,OAAO,MAAM,0BAGX,UAEA,iBAAiB,OAAO,aAAa;AAsDvC,OAAO,MAAM,kBAKX,QACA,KACA,UAAoC,CAAC,MACN;CAC/B,IAAI;CACJ,IAAI,WAAW;CACf,OAAO,cACL,IAAI,oBACF,MACC,OAAO,gBAAgB;EACtB,IAAI,CAAC,UAAU;GACb,WAAW;GACX,SAAS;EACX;EACA,QAAQ,WAAW,OAAO,WAAW;CACvC,GACA,QAAQ,SACV,CACF;CACA,OAAO;AACT;AA2BA,OAAO,MAAM,iBAIX,QACA,UAAgC,CAAC,MACL,eAAe,QAAQ,eAAe,OAAO;AAwC3E,OAAO,MAAM,kBAKX,MACA,KACA,UACiB;CACjB,MAAM,YAAY,UAAuB;EACvC,IAAI,CAAC,iBAAiB,OAAO,GAAG,GAAG;EACnC,MAAM,yBAAyB;EAC/B,MAAM,SAAS,OAAO,MAAM,kBAAkB,CAAC,IAAI,MAAS;CAC9D;CACA,KAAK,iBAAiB,yBAAyB,QAAQ;CACvD,aAAa,KAAK,oBAAoB,yBAAyB,QAAQ;AACzE;AA+BA,OAAO,MAAM,iBAGM,MAAmB,WACpC,eAAe,MAAM,eAAe,MAAM;AAgE5C,OAAO,MAAM,sBAA2C,OAAO,OAAO,EACpE,MAAM,uCACR,CAAC;AAGD,IAAI;AASJ,OAAO,MAAM,wBAEI;AAgDjB,OAAO,MAAM,kBACX,QACA,QACM;CACN,MAAM,WAAW;CACjB,SAAS;CACT,IAAI;CACJ,IAAI;EACF,SAAS,IAAI;CACf,UAAU;EACR,SAAS;CACX;CACA,IAAI,OAAQ,QAA2C,SAAS,YAC9D,MAAM,IAAI,UACR,yOACF;CAEF,OAAO;AACT","names":[],"ignoreList":[],"sources":["../../src/context.ts"]}
1
+ {"version":3,"file":"context.js","mappings":"AAoEA,OAAO,MAAM,0BAA0B;AAgDvC,OAAO,MAAM,gBAA+B,OAAO,OAAO,EACxD,MAAM,+BACR,CAAC;AAUD,OAAO,MAAM,4BACH,MAEV;CAaE,YACE,SACA,UACA,WACA;EACA,MAAM,yBAAyB;GAAE,SAAS;GAAM,UAAU;EAAK,CAAC;EAChE,KAAK,UAAU;EACf,KAAK,WAAW;EAChB,KAAK,YAAY;CACnB;AACF;AAQA,OAAO,MAAM,kCAAkC,oBAAmC;CAKhF,YAAY,UAAwC,WAAqB;EACvE,MAAM,eAAe,UAAU,SAAS;CAC1C;AACF;AAYA,OAAO,MAAM,oBAIX,OACA,QACuC;CACvC,OACE,MAAM,SAAS,2BACf,aAAa,SACb,MAAM,YAAY,OAClB,cAAc,SACd,OAAO,MAAM,aAAa;AAE9B;AAUA,OAAO,MAAM,0BAGX,UAEA,iBAAiB,OAAO,aAAa;AAsDvC,OAAO,MAAM,kBAKX,QACA,KACA,UAAoC,CAAC,MACN;CAC/B,IAAI;CACJ,IAAI,WAAW;CACf,OAAO,cACL,IAAI,oBACF,MACC,OAAO,gBAAgB;EACtB,IAAI,CAAC,UAAU;GACb,WAAW;GACX,SAAS;EACX;EAEA,QAAQ,WAAW,OAAO,WAAW;CACvC,GACA,QAAQ,SACV,CACF;CAEA,OAAO;AACT;AA2BA,OAAO,MAAM,iBAIX,QACA,UAAgC,CAAC,MACL,eAAe,QAAQ,eAAe,OAAO;AAwC3E,OAAO,MAAM,kBAKX,MACA,KACA,UACiB;CACjB,MAAM,YAAY,UAAuB;EACvC,IAAI,CAAC,iBAAiB,OAAO,GAAG,GAAG;EACnC,MAAM,yBAAyB;EAC/B,MAAM,SAAS,OAAO,MAAM,kBAAkB,CAAC,IAAI,MAAS;CAC9D;CAEA,KAAK,iBAAiB,yBAAyB,QAAQ;CAEvD,aAAa,KAAK,oBAAoB,yBAAyB,QAAQ;AACzE;AA+BA,OAAO,MAAM,iBAGM,MAAmB,WACpC,eAAe,MAAM,eAAe,MAAM;AAiE5C,OAAO,MAAM,sBAA2C,OAAO,OAAO,EACpE,MAAM,uCACR,CAAC;AAGD,IAAI;AASJ,OAAO,MAAM,wBAEI;AAGjB,MAAM,cAAiB,WACpB,OAAO,UAAU,YAAY,OAAO,UAAU,eAC/C,UAAU,QACV,UAAU,SACV,OAAO,MAAM,SAAS;AAgDxB,OAAO,MAAM,kBACX,QACA,QACM;CACN,MAAM,WAAW;CACjB,SAAS;CACT,IAAI;CAEJ,IAAI;EACF,SAAS,IAAI;CACf,UAAU;EACR,SAAS;CACX;CAEA,IAAI,WAAW,MAAM,GACnB,MAAM,IAAI,UACR,yOACF;CAGF,OAAO;AACT","names":[],"ignoreList":[],"sources":["../../src/context.ts"]}
@@ -18,10 +18,10 @@ export function isLitViewDeclarationTemplate(config) {
18
18
  return isFunction(config);
19
19
  }
20
20
  export function isRoutedLitElement(component) {
21
- return component?.prototype instanceof LitElement;
21
+ return (typeof component === "object" || typeof component === "function") && component !== null && "prototype" in component && component.prototype instanceof LitElement;
22
22
  }
23
23
  export function litViewsBuilder(state) {
24
- const views = {}, viewsObject = state.views || { $default: pick(state, ["component"]) };
24
+ const views = new Map(), viewsObject = state.views || { $default: pick(state, ["component"]) };
25
25
  forEachValue(viewsObject, function(config, name) {
26
26
  let normalizedConfig;
27
27
  name = name || "$default";
@@ -35,9 +35,9 @@ export function litViewsBuilder(state) {
35
35
  normalizedConfig.$uiViewName = normalizedTarget.uiViewName;
36
36
  normalizedConfig.$uiViewContextAnchor = normalizedTarget.uiViewContextAnchor;
37
37
  if (isRoutedLitElement(normalizedConfig.component) && normalizedConfig.component.sticky) normalizedConfig.component = routedLitElementRenderer(normalizedConfig.component);
38
- views[name] = viewsObject[name] = normalizedConfig;
38
+ views.set(name, viewsObject[name] = normalizedConfig);
39
39
  });
40
- return views;
40
+ return Object.fromEntries(views);
41
41
  }
42
42
  const viewConfigFactory = (path, config) => new LitViewConfig(path, config);
43
43
  export class UIRouterLit extends UIRouter {
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","mappings":"AAAA,SACE,SACA,YAEA,MACA,gBAGA,UAEA,mBAEK;AACP,SAAS,kBAAkB;AAU3B,SAAS,gCAAgC;AAQzC,MAAM,eAAe;AASrB,IAAI,sBAAsB;AAU1B,OAAO,MAAM,cAAoC;CAW/C,YACE,MACA,UACA;EAFO;EACA;aAXK;gBAEL;CAUN;CAMH,OAAsB;EACpB,OAAO,QAAQ,QAAQ,IAAI;CAC7B;AACF;AAcA,OAAO,SAAS,6BAGd,QACwE;CACxE,OAAO,WAAW,MAAM;AAC1B;AASA,OAAO,SAAS,mBAEd,WAAuD;CACvD,OAAQ,WAAsC,qBAAqB;AACrE;AAeA,OAAO,SAAS,gBAEd,OAAqE;CACrE,MAAM,QAAyD,CAAC,GAC9D,cAAc,MAAM,SAAS,EAC3B,UAAU,KAAK,OAAO,CAAC,WAAW,CAAC,EACrC;CAEF,aACE,aACA,SAAU,QAA+B,MAAc;EACrD,IAAI;EACJ,OAAO,QAAQ;EACf,IAAI,6BAAgC,MAAM,GACxC,mBAAmB,EAAE,WAAW,OAAO;OAEvC,mBAAmB;EAErB,IAAI,OAAO,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG;EAEtD,iBAAiB,QAAQ;EACzB,iBAAiB,WAAW;EAC5B,iBAAiB,QAAQ;EAEzB,MAAM,mBAAmB,YAAY,sBACnC,iBAAiB,UACjB,iBAAiB,KACnB;EACA,iBAAiB,cAAc,iBAAiB;EAChD,iBAAiB,uBACf,iBAAiB;EAKnB,IACE,mBAAsB,iBAAiB,SAAS,KAChD,iBAAiB,UAAU,QAE3B,iBAAiB,YAAY,yBAC3B,iBAAiB,SACnB;EAGF,MAAM,QAAQ,YAAY,QAAQ;CACpC,CACF;CACA,OAAO;AACT;AAMA,MAAM,qBAAqB,MAAkB,WAC3C,IAAI,cAAc,MAAM,MAAM;AAiDhC,OAAO,MAAM,oBAAoB,SAAS;CASxC,cAAc;EACZ,MAAM;iBAQU;EAPhB,KAAK,OAAuB,cAAc;EAE1C,KAAK,YAAY,WAAW,mBAAmB,OAAO,iBAAiB;EACvE,KAAK,cAAc,UAAU,SAAS,eAAe;CACvD;CAqBA,QAAc;EACZ,IAAI,KAAK,SACP,MAAM,IAAI,MAAM,+BAA+B;EAGjD,KAAK,kBAAkB,KAAK;EAC5B,KAAK,WAAW,OAAO;EACvB,KAAK,WAAW,KAAK;EACrB,KAAK,UAAU;CACjB;AACF","names":[],"ignoreList":[],"sources":["../../src/core.ts"]}
1
+ {"version":3,"file":"core.js","mappings":"AAAA,SACE,SACA,YAEA,MACA,gBAGA,UAEA,mBAEK;AACP,SAAS,kBAAkB;AAU3B,SAAS,gCAAgC;AASzC,MAAM,eAAe;AASrB,IAAI,sBAAsB;AAU1B,OAAO,MAAM,cAAoC;CAW/C,YACE,MACA,UACA;EAFO;EACA;aAXK;gBAEL;CAUN;CAMH,OAAsB;EACpB,OAAO,QAAQ,QAAQ,IAAI;CAC7B;AACF;AAcA,OAAO,SAAS,6BAGd,QACwE;CACxE,OAAO,WAAW,MAAM;AAC1B;AASA,OAAO,SAAS,mBAEd,WAAuD;CACvD,QACG,OAAO,cAAc,YAAY,OAAO,cAAc,eACvD,cAAc,QACd,eAAe,aACf,UAAU,qBAAqB;AAEnC;AAeA,OAAO,SAAS,gBAEd,OAAqE;CACrE,MAAM,QAAQ,IAAI,IAA6C,GAC7D,cAAc,MAAM,SAAS,EAC3B,UAAU,KAAK,OAAO,CAAC,WAAW,CAAC,EACrC;CAEF,aAEE,aACA,SAAU,QAA+B,MAAc;EACrD,IAAI;EACJ,OAAO,QAAQ;EAEf,IAAI,6BAAgC,MAAM,GACxC,mBAAmB,EAAE,WAAW,OAAO;OAEvC,mBAAmB;EAGrB,IAAI,OAAO,KAAK,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG;EAEtD,iBAAiB,QAAQ;EACzB,iBAAiB,WAAW;EAC5B,iBAAiB,QAAQ;EAEzB,MAAM,mBAAmB,YAAY,sBACnC,iBAAiB,UACjB,iBAAiB,KACnB;EAEA,iBAAiB,cAAc,iBAAiB;EAChD,iBAAiB,uBACf,iBAAiB;EAKnB,IACE,mBAAsB,iBAAiB,SAAS,KAChD,iBAAiB,UAAU,QAE3B,iBAAiB,YAAY,yBAC3B,iBAAiB,SACnB;EAGF,MAAM,IAAI,MAAO,YAAY,QAAQ,gBAAiB;CACxD,CACF;CAEA,OAAO,OAAO,YAAY,KAAK;AACjC;AAMA,MAAM,qBAAqB,MAAkB,WAC3C,IAAI,cAAc,MAAM,MAAM;AAiDhC,OAAO,MAAM,oBAAoB,SAAS;CASxC,cAAc;EACZ,MAAM;iBAQU;EAPhB,KAAK,OAAuB,cAAc;EAE1C,KAAK,YAAY,WAAW,mBAAmB,OAAO,iBAAiB;EACvE,KAAK,cAAc,UAAU,SAAS,eAAe;CACvD;CAqBA,QAAc;EACZ,IAAI,KAAK,SACP,MAAM,IAAI,MAAM,+BAA+B;EAIjD,KAAK,kBAAkB,KAAK;EAC5B,KAAK,WAAW,OAAO;EACvB,KAAK,WAAW,KAAK;EACrB,KAAK,UAAU;CACjB;AACF","names":[],"ignoreList":[],"sources":["../../src/core.ts"]}
@@ -1,6 +1,7 @@
1
+ import { isFunction } from "@uirouter/core";
1
2
  import { UIRouterLitElement } from "./ui-router.js";
2
3
  export function inLitDevMode() {
3
- return typeof UIRouterLitElement.enableWarning === "function";
4
+ return isFunction(UIRouterLitElement.enableWarning);
4
5
  }
5
6
  const warnedMissingRouter = new WeakSet();
6
7
  export function warnMissingRouter(element, subject, consequence) {
@@ -1 +1 @@
1
- {"version":3,"file":"dev-warn.js","mappings":"AAAA,SAAS,0BAA0B;AAUnC,OAAO,SAAS,eAAwB;CACtC,OAAO,OAAO,mBAAmB,kBAAkB;AACrD;AAUA,MAAM,sBAAsB,IAAI,QAAiB;AAiBjD,OAAO,SAAS,kBACd,SACA,SACA,aACM;CAGN,IAAI,CAAC,aAAa,KAAK,oBAAoB,IAAI,OAAO,GACpD;CAEF,oBAAoB,IAAI,OAAO;CAC/B,QAAQ,KACN,kBAAkB,QAAQ,wCAAwC,YAAY,mEAE9E,OACF;AACF;AAWA,OAAO,SAAS,kBAAkB,SAAwB;CAGxD,IAAI,CAAC,aAAa,GAAG;CACrB,QAAQ,KACN,4PAGA,OACF;AACF","names":[],"ignoreList":[],"sources":["../../src/dev-warn.ts"]}
1
+ {"version":3,"file":"dev-warn.js","mappings":"AAAA,SAAS,kBAAkB;AAE3B,SAAS,0BAA0B;AAUnC,OAAO,SAAS,eAAwB;CACtC,OAAO,WAAW,mBAAmB,aAAa;AACpD;AAUA,MAAM,sBAAsB,IAAI,QAAiB;AAiBjD,OAAO,SAAS,kBACd,SACA,SACA,aACM;CAIN,IAAI,CAAC,aAAa,KAAK,oBAAoB,IAAI,OAAO,GACpD;CAGF,oBAAoB,IAAI,OAAO;CAC/B,QAAQ,KACN,kBAAkB,QAAQ,wCAAwC,YAAY,mEAE9E,OACF;AACF;AAWA,OAAO,SAAS,kBAAkB,SAAwB;CAIxD,IAAI,CAAC,aAAa,GAAG;CACrB,QAAQ,KACN,4PAGA,OACF;AACF","names":[],"ignoreList":[],"sources":["../../src/dev-warn.ts"]}
@@ -1 +1 @@
1
- {"version":3,"file":"pure.js","mappings":"AAEA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc","names":[],"ignoreList":[],"sources":["../../src/pure.ts"]}
1
+ {"version":3,"file":"pure.js","mappings":"AAGA,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc;AAEd,cAAc","names":[],"ignoreList":[],"sources":["../../src/pure.ts"]}
@@ -1 +1 @@
1
- {"version":3,"file":"routed-element.js","mappings":"AAAA,SAAS,YAAY;AAiBrB,OAAO,SAAS,yBAEd,WAAsD;CACtD,IAAI;CACJ,QAAQ,UAAkC;EACxC,YAAY,IAAI,UAAU,KAAK;EAC/B,QAAQ,eAAe;EACvB,OAAO,IAAI,GAAG;CAChB;AACF","names":[],"ignoreList":[],"sources":["../../src/routed-element.ts"]}
1
+ {"version":3,"file":"routed-element.js","mappings":"AAAA,SAAS,YAAY;AAiBrB,OAAO,SAAS,yBAEd,WAAsD;CACtD,IAAI;CAEJ,QAAQ,UAAkC;EACxC,YAAY,IAAI,UAAU,KAAK;EAC/B,QAAQ,eAAe;EAEvB,OAAO,IAAI,GAAG;CAChB;AACF","names":[],"ignoreList":[],"sources":["../../src/routed-element.ts"]}
@@ -1,3 +1,4 @@
1
+ import { isFunction } from "@uirouter/core";
1
2
  import { isRouterContextRequest, requestRouter } from "./context.js";
2
3
  import { uiRouterContextEventName } from "./events.js";
3
4
  export const noUnsubscribe = () => {};
@@ -30,7 +31,7 @@ export class RouterSubscribers {
30
31
  }
31
32
  const reportFailures = (failures) => {
32
33
  if (!failures.length) return;
33
- if (typeof globalThis.reportError === "function") {
34
+ if (isFunction(globalThis.reportError)) {
34
35
  failures.forEach((failure) => globalThis.reportError(failure));
35
36
  return;
36
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"router-subscription.js","mappings":"AACA,SAAS,wBAAwB,qBAAqB;AAEtD,SAAS,gCAAgC;AAIzC,OAAO,MAAM,sBAA4B,CAAC;AAQ1C,OAAO,MAAM,kBAAkB;;iBACF,IAAI,IAAmC;;CAOlE,OACE,OACA,QACA,aACM;EACN,IAAI,CAAC,UAAU,CAAC,uBAAuB,KAAK,GAC1C;EAGF,MAAM,yBAAyB;EAC/B,MAAM,EAAE,UAAU,cAAc;EAChC,IAAI,CAAC,WACH,OAAO,SAAS,MAAM;EAExB,IAAI,CAAC,aACH,OAAO,SAAS,QAAQ,aAAa;EAEvC,MAAM,WAAW,SAAsB,SAAS,MAAM,aAAa;EACnE,KAAK,QAAQ,IAAI,OAAO;EACxB,SAAS,cAAc,KAAK,QAAQ,OAAO,OAAO,CAAC;CACrD;CAQA,QAAQ,QAA2B;EACjC,MAAM,WAAsB,CAAC;EAC7B,KAAK,MAAM,WAAW,CAAC,GAAG,KAAK,OAAO,GAAG;GAEvC,IAAI,CAAC,KAAK,QAAQ,OAAO,OAAO,GAC9B;GAEF,IAAI;IACF,QAAQ,MAAM;GAChB,SAAS,QAAQ;IACf,SAAS,KAAK,MAAM;GACtB;EACF;EACA,eAAe,QAAQ;CACzB;AACF;AAOA,MAAM,kBAAkB,aAA8B;CACpD,IAAI,CAAC,SAAS,QACZ;CAEF,IAAI,OAAO,WAAW,gBAAgB,YAAY;EAChD,SAAS,SAAS,YAAY,WAAW,YAAY,OAAO,CAAC;EAC7D;CACF;CACA,MAAM,SAAS,WAAW,IACtB,SAAS,KACT,IAAI,eAAe,UAAU,kCAAkC;AACrE;AAsBA,OAAO,MAAM,mBACX,QACA,eACuB;CACvB,IAAI,UAAU;CACd,IAAI;CACJ,MAAM,SAAS,cAAc,QAAQ;EACnC,WAAW;EACX,WAAW,OAAO,YAAY;GAC5B,cAAc,YAAY,gBAAgB,SAAY;GACtD,IAAI,CAAC,SACH,WAAW,KAAK;EAEpB;CACF,CAAC;CACD,UAAU;CACV,IAAI,QACF,OAAO;EAAE;EAAQ;CAAY;CAE/B,MAAM,QAA8B,IAAI,YACtC,0BACA;EAAE,SAAS;EAAM,UAAU;EAAM,QAAQ,CAAC;CAAE,CAC9C;CACA,OAAO,cAAc,KAAK;CAC1B,OAAO;EAAE,QAAQ,MAAM,OAAO;EAAU,aAAa;CAAU;AACjE","names":[],"ignoreList":[],"sources":["../../src/router-subscription.ts"]}
1
+ {"version":3,"file":"router-subscription.js","mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAS,wBAAwB,qBAAqB;AAEtD,SAAS,gCAAgC;AAIzC,OAAO,MAAM,sBAA4B,CAAC;AAQ1C,OAAO,MAAM,kBAAkB;;iBACF,IAAI,IAAmC;;CAOlE,OACE,OACA,QACA,aACM;EACN,IAAI,CAAC,UAAU,CAAC,uBAAuB,KAAK,GAC1C;EAIF,MAAM,yBAAyB;EAC/B,MAAM,EAAE,UAAU,cAAc;EAEhC,IAAI,CAAC,WACH,OAAO,SAAS,MAAM;EAGxB,IAAI,CAAC,aACH,OAAO,SAAS,QAAQ,aAAa;EAGvC,MAAM,WAAW,SAAsB,SAAS,MAAM,aAAa;EACnE,KAAK,QAAQ,IAAI,OAAO;EACxB,SAAS,cAAc,KAAK,QAAQ,OAAO,OAAO,CAAC;CACrD;CAQA,QAAQ,QAA2B;EACjC,MAAM,WAAsB,CAAC;EAE7B,KAAK,MAAM,WAAW,CAAC,GAAG,KAAK,OAAO,GAAG;GAEvC,IAAI,CAAC,KAAK,QAAQ,OAAO,OAAO,GAC9B;GAGF,IAAI;IACF,QAAQ,MAAM;GAChB,SAAS,QAAQ;IACf,SAAS,KAAK,MAAM;GACtB;EACF;EAEA,eAAe,QAAQ;CACzB;AACF;AAOA,MAAM,kBAAkB,aAA8B;CACpD,IAAI,CAAC,SAAS,QACZ;CAGF,IAAI,WAAW,WAAW,WAAW,GAAG;EACtC,SAAS,SAAS,YAAY,WAAW,YAAY,OAAO,CAAC;EAE7D;CACF;CAEA,MAAM,SAAS,WAAW,IACtB,SAAS,KACT,IAAI,eAAe,UAAU,kCAAkC;AACrE;AAsBA,OAAO,MAAM,mBACX,QACA,eACuB;CACvB,IAAI,UAAU;CACd,IAAI;CAEJ,MAAM,SAAS,cAAc,QAAQ;EACnC,WAAW;EACX,WAAW,OAAO,YAAY;GAC5B,cAAc,YAAY,gBAAgB,SAAY;GAEtD,IAAI,CAAC,SACH,WAAW,KAAK;EAEpB;CACF,CAAC;CAED,UAAU;CAEV,IAAI,QACF,OAAO;EAAE;EAAQ;CAAY;CAG/B,MAAM,QAA8B,IAAI,YACtC,0BACA;EAAE,SAAS;EAAM,UAAU;EAAM,QAAQ,CAAC;CAAE,CAC9C;CAEA,OAAO,cAAc,KAAK;CAE1B,OAAO;EAAE,QAAQ,MAAM,OAAO;EAAU,aAAa;CAAU;AACjE","names":[],"ignoreList":[],"sources":["../../src/router-subscription.ts"]}
@@ -3,8 +3,8 @@ import { directive, PartType } from "lit/directive.js";
3
3
  import { AsyncDirective } from "lit/async-directive.js";
4
4
  import { getScopedRouter } from "./context.js";
5
5
  import { warnMissingRouter } from "./dev-warn.js";
6
+ import { subscribeRouter } from "./router-subscription.js";
6
7
  import { resolveAriaCurrent, SrefTargets } from "./sref-status.js";
7
- import { UIRouterLitElement } from "./ui-router.js";
8
8
  import { UI_SREF_TARGET_EVENT, UI_SREF_TARGET_REMOVED_EVENT } from "./ui-sref.js";
9
9
  import { UiView } from "./ui-view.js";
10
10
  export class SrefStatusDirective extends AsyncDirective {
@@ -16,7 +16,16 @@ export class SrefStatusDirective extends AsyncDirective {
16
16
  this.targets = new SrefTargets();
17
17
  this._firstUpdated = false;
18
18
  this._deregister = [];
19
+ this._routerDeregister = [];
19
20
  this._connection = 0;
21
+ this.onRouterReplaced = (router) => {
22
+ this.unwatch();
23
+ this.uiRouter = router;
24
+ this.targets.router = router;
25
+ this.targets.rebuild();
26
+ this.watch(router);
27
+ this.refresh();
28
+ };
20
29
  this.onUiSrefTargetEvent = (event) => {
21
30
  this.targets.onLink(event);
22
31
  this.refresh();
@@ -74,7 +83,9 @@ export class SrefStatusDirective extends AsyncDirective {
74
83
  firstUpdated() {
75
84
  if (this._firstUpdated || !this.isConnected) return;
76
85
  const element = this.element;
77
- this.uiRouter = UIRouterLitElement.seekRouter(element);
86
+ const { router, unsubscribe } = subscribeRouter(element, this.onRouterReplaced);
87
+ this.uiRouter = router;
88
+ if (unsubscribe) this._deregister.push(unsubscribe);
78
89
  this.parentView = UiView.seekParentView(element);
79
90
  this.targets.router = this.uiRouter;
80
91
  this.targets.relative = this.parentView?.viewContext?.name;
@@ -85,19 +96,26 @@ export class SrefStatusDirective extends AsyncDirective {
85
96
  element.removeEventListener(UI_SREF_TARGET_EVENT, this.onUiSrefTargetEvent);
86
97
  element.removeEventListener(UI_SREF_TARGET_REMOVED_EVENT, this.onUiSrefTargetRemovedEvent);
87
98
  });
88
- const router = this.uiRouter;
89
- if (router) this._deregister.push(router.transitionService.onStart({}, this.onTransitionStart, { priority: -Infinity }), router.stateRegistry.onStatesChanged(this.onStatesChanged));
99
+ if (router) this.watch(router);
90
100
  else warnMissingRouter(element, `<${element.localName} ${this.attributeName}=\${${this.directiveName}(...)}>`, "will never be marked active");
91
101
  this._firstUpdated = true;
92
102
  this.refresh();
93
103
  }
104
+ watch(router) {
105
+ this._routerDeregister.push(router.transitionService.onStart({}, this.onTransitionStart, { priority: -Infinity }), router.stateRegistry.onStatesChanged(this.onStatesChanged));
106
+ }
107
+ unwatch() {
108
+ this._connection++;
109
+ this._routerDeregister.forEach((deregister) => deregister());
110
+ this._routerDeregister = [];
111
+ }
94
112
  refresh(event) {
95
113
  this.status = this.targets.status(event);
96
114
  const value = this.commit();
97
115
  if (value !== noChange && this.isConnected) this.setValue(value);
98
116
  }
99
117
  disconnected() {
100
- this._connection++;
118
+ this.unwatch();
101
119
  this._deregister.forEach((deregister) => deregister());
102
120
  this._deregister = [];
103
121
  this._firstUpdated = false;
@@ -115,17 +133,16 @@ export class SrefActiveClassDirective extends SrefStatusDirective {
115
133
  if (name !== "class" || (strings?.length ?? 0) > 2) throw new Error("`srefActiveClass()` can only be used in the `class` attribute and must be the only expression in it");
116
134
  }
117
135
  classInfo({ activeClasses = [], exactClasses = [], classes = {} }) {
118
- const info = {};
136
+ const info = new Map();
119
137
  const { active = false, exact = false } = this.status ?? {};
120
- for (const name in classes) info[name] = !!classes[name];
121
- for (const name of activeClasses) info[name] = info[name] || active;
122
- for (const name of exactClasses) info[name] = info[name] || exact;
138
+ for (const name in classes) info.set(name, !!classes[name]);
139
+ for (const name of activeClasses) info.set(name, info.get(name) || active);
140
+ for (const name of exactClasses) info.set(name, info.get(name) || exact);
123
141
  return info;
124
142
  }
125
143
  render(params) {
126
144
  if (!this.getScopedStatus(params)) return noChange;
127
- const info = this.classInfo(params);
128
- return " " + Object.keys(info).filter((name) => info[name]).join(" ") + " ";
145
+ return " " + [...this.classInfo(params)].flatMap(([name, applies]) => applies ? [name] : []).join(" ") + " ";
129
146
  }
130
147
  update(part, args) {
131
148
  if (this._staticClasses === void 0 && part.strings !== void 0) this._staticClasses = new Set(part.strings.join(" ").split(/\s/).filter((s) => s !== ""));
@@ -137,24 +154,21 @@ export class SrefActiveClassDirective extends SrefStatusDirective {
137
154
  const value = this.render(this.params);
138
155
  if (value === noChange) return value;
139
156
  this._previousClasses = new Set();
140
- for (const name in info) if (info[name] && !this._staticClasses?.has(name)) this._previousClasses.add(name);
157
+ for (const [name, applies] of info) if (applies && !this._staticClasses?.has(name)) this._previousClasses.add(name);
141
158
  return value;
142
159
  }
143
160
  const { classList } = this.element;
144
- for (const name of this._previousClasses) if (!(name in info)) {
161
+ for (const name of this._previousClasses) if (!info.has(name)) {
145
162
  classList.remove(name);
146
163
  this._previousClasses.delete(name);
147
164
  }
148
- for (const name in info) {
149
- const value = info[name];
150
- if (value !== this._previousClasses.has(name) && !this._staticClasses?.has(name)) {
151
- if (value) {
152
- classList.add(name);
153
- this._previousClasses.add(name);
154
- } else {
155
- classList.remove(name);
156
- this._previousClasses.delete(name);
157
- }
165
+ for (const [name, value] of info) if (value !== this._previousClasses.has(name) && !this._staticClasses?.has(name)) {
166
+ if (value) {
167
+ classList.add(name);
168
+ this._previousClasses.add(name);
169
+ } else {
170
+ classList.remove(name);
171
+ this._previousClasses.delete(name);
158
172
  }
159
173
  }
160
174
  return noChange;
@@ -1 +1 @@
1
- {"version":3,"file":"sref-active.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-active.ts"]}
1
+ {"version":3,"file":"sref-active.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-active.ts"]}
@@ -3,7 +3,7 @@ import { directive, PartType } from "lit/directive.js";
3
3
  import { AsyncDirective } from "lit/async-directive.js";
4
4
  import { getScopedRouter } from "./context.js";
5
5
  import { warnMissingRouter } from "./dev-warn.js";
6
- import { UIRouterLitElement } from "./ui-router.js";
6
+ import { subscribeRouter } from "./router-subscription.js";
7
7
  import { clickBelongsToBrowser, sameTarget, srefTransitionOptions, uiSrefTargetEvent, uiSrefTargetRemovedEvent } from "./sref-internals.js";
8
8
  import { UiView } from "./ui-view.js";
9
9
  export class SrefHrefDirective extends AsyncDirective {
@@ -18,6 +18,13 @@ export class SrefHrefDirective extends AsyncDirective {
18
18
  this.targetState = null;
19
19
  this._seekedRouter = false;
20
20
  this._firstUpdated = false;
21
+ this.onRouterReplaced = (router) => {
22
+ this._unsubscribeRouter = void 0;
23
+ this.unsubscribe?.();
24
+ this.uiRouter = router;
25
+ this.unsubscribe = router.stateRegistry.onStatesChanged(this.doRender);
26
+ this.doRender();
27
+ };
21
28
  this.doRender = () => {
22
29
  const value = this.render(this.state, this.params, this.options);
23
30
  if (value !== noChange && this.isConnected) this.setValue(value);
@@ -67,7 +74,9 @@ export class SrefHrefDirective extends AsyncDirective {
67
74
  firstUpdated() {
68
75
  if (this._firstUpdated || !this.isConnected) return;
69
76
  const element = this.element;
70
- this.uiRouter = UIRouterLitElement.seekRouter(element);
77
+ const { router, unsubscribe } = subscribeRouter(element, this.onRouterReplaced);
78
+ this.uiRouter = router;
79
+ this._unsubscribeRouter = unsubscribe;
71
80
  this._seekedRouter = true;
72
81
  this.parentView = UiView.seekParentView(element);
73
82
  element.addEventListener("click", this.onClick);
@@ -86,6 +95,8 @@ export class SrefHrefDirective extends AsyncDirective {
86
95
  this.targetState = null;
87
96
  this.unsubscribe?.();
88
97
  this.unsubscribe = void 0;
98
+ this._unsubscribeRouter?.();
99
+ this._unsubscribeRouter = void 0;
89
100
  this._firstUpdated = false;
90
101
  }
91
102
  reconnected() {
@@ -1 +1 @@
1
- {"version":3,"file":"sref-href.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-href.ts"]}
1
+ {"version":3,"file":"sref-href.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-href.ts"]}
@@ -1,4 +1,6 @@
1
- import { anyTrueR, equals, extend, isNumber, Param, PathUtils, tail, unnestR } from "@uirouter/core";
1
+ import { anyTrueR, equals, isNumber, Param, PathUtils, tail, unnestR } from "@uirouter/core";
2
+ const isAriaCurrentValues = (value) => typeof value === "object";
3
+ export const toAriaCurrentValues = (ariaCurrentValue) => isAriaCurrentValues(ariaCurrentValue) ? ariaCurrentValue : { exact: ariaCurrentValue };
2
4
  export const UI_SREF_TARGET_EVENT = "uiSrefTarget";
3
5
  export function uiSrefTargetEvent(targetState) {
4
6
  return new CustomEvent(UI_SREF_TARGET_EVENT, {
@@ -23,12 +25,12 @@ export function sameTarget(a, b) {
23
25
  return !!a && a.$state() === b.$state() && paramsEqual(a.params(), b.params());
24
26
  }
25
27
  export function srefTransitionOptions(parentView, opts = {}) {
26
- const defaultOpts = {
28
+ return {
27
29
  relative: parentView?.viewContext?.name,
28
30
  inherit: true,
29
- source: "sref"
31
+ source: "sref",
32
+ ...opts
30
33
  };
31
- return extend(defaultOpts, opts || {});
32
34
  }
33
35
  export function isNativeLink(element) {
34
36
  const tag = element.localName;
@@ -1 +1 @@
1
- {"version":3,"file":"sref-internals.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-internals.ts"]}
1
+ {"version":3,"file":"sref-internals.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-internals.ts"]}
@@ -4,7 +4,7 @@ import { subscribeRouter } from "./router-subscription.js";
4
4
  import { resolveAriaCurrent, SrefTargets } from "./sref-status.js";
5
5
  import { UI_SREF_TARGET_EVENT, UI_SREF_TARGET_REMOVED_EVENT } from "./ui-sref.js";
6
6
  import { UiView } from "./ui-view.js";
7
- const sameShape = (a, b) => a === b || !!a && !!b && a.active === b.active && a.exact === b.exact && a.entering === b.entering && a.exiting === b.exiting && a.targetStates.length === b.targetStates.length && a.targetStates.every((target, i) => target === b.targetStates[i]);
7
+ const rendersSame = (a, b) => a === b || !!a && !!b && a.active === b.active && a.exact === b.exact && a.entering === b.entering && a.exiting === b.exiting && a.targetStates.length === b.targetStates.length && a.targetStates.every((target, i) => target === b.targetStates[i]);
8
8
  export class SrefStatusController {
9
9
  constructor(host, options = {}) {
10
10
  this.targets = new SrefTargets();
@@ -129,7 +129,7 @@ export class SrefStatusController {
129
129
  this._status = this.targets.status(event);
130
130
  const first = !this.computed;
131
131
  this.computed = true;
132
- return first || !sameShape(before, this._status);
132
+ return first || !rendersSame(before, this._status);
133
133
  }
134
134
  }
135
135
  //# sourceMappingURL=sref-status-controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sref-status-controller.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-status-controller.ts"]}
1
+ {"version":3,"file":"sref-status-controller.js","mappings":"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","names":[],"ignoreList":[],"sources":["../../src/sref-status-controller.ts"]}
@@ -1,6 +1,5 @@
1
- import { extend } from "@uirouter/core";
2
1
  import { nothing } from "lit";
3
- import { mergeSrefStatus, srefEventLink, srefStatus } from "./sref-internals.js";
2
+ import { mergeSrefStatus, srefEventLink, srefStatus, toAriaCurrentValues } from "./sref-internals.js";
4
3
  export class SrefTargets {
5
4
  constructor() {
6
5
  this.params = {};
@@ -8,8 +7,10 @@ export class SrefTargets {
8
7
  this.links = new Map();
9
8
  }
10
9
  options() {
11
- const defaultOpts = { relative: this.relative };
12
- return extend(defaultOpts, this.params.options || {});
10
+ return {
11
+ relative: this.relative,
12
+ ...this.params.options
13
+ };
13
14
  }
14
15
  setExplicit() {
15
16
  const { state, params = {} } = this.params;
@@ -37,7 +38,7 @@ export class SrefTargets {
37
38
  }
38
39
  }
39
40
  export function resolveAriaCurrent(status, value = "page") {
40
- const values = typeof value === "object" ? value : { exact: value };
41
+ const values = toAriaCurrentValues(value);
41
42
  return (status.exact ? values.exact ?? "page" : status.active ? values.active ?? false : false) || nothing;
42
43
  }
43
44
  //# sourceMappingURL=sref-status.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sref-status.js","mappings":"AAAA,SACE,cAIK;AACP,SAAS,eAAe;AAGxB,SACE,iBACA,eACA,kBAEK;AAkBP,OAAO,MAAM,YAAY;;gBAKI,CAAC;kBAMW;eAGd,IAAI,IAA0B;;CAGvD,UAA6B;EAC3B,MAAM,cAAiC,EAAE,UAAU,KAAK,SAAS;EACjE,OAAO,OAAO,aAAa,KAAK,OAAO,WAAW,CAAC,CAAC;CACtD;CAGA,cAAoB;EAClB,MAAM,EAAE,OAAO,SAAS,CAAC,MAAM,KAAK;EACpC,KAAK,WACH,SAAS,KAAK,SACV,KAAK,OAAO,aAAa,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAC7D;CACR;CAGA,OAAO,OAAgC;EACrC,KAAK,MAAM,IAAI,cAAc,KAAK,GAAG,MAAM,OAAO,WAAW;CAC/D;CAGA,cAAc,OAAuB;EACnC,OAAO,KAAK,MAAM,OAAO,cAAc,KAAK,CAAC;CAC/C;CAMA,UAAgB;EACd,KAAK,YAAY;EACjB,MAAM,SAAS,KAAK,OAAQ;EAC5B,KAAK,MAAM,CAAC,SAAS,WAAW,KAAK,OACnC,KAAK,MAAM,IACT,SACA,OAAO,OAAO,OAAO,WAAW,GAAG,OAAO,OAAO,GAAG,OAAO,QAAQ,CAAC,CACtE;CAEJ;CAGA,OAAsB;EACpB,KAAK,MAAM,WAAW,KAAK,MAAM,KAAK,GACpC,IAAI,CAAC,QAAQ,aACX,KAAK,MAAM,OAAO,OAAO;EAG7B,OAAO,KAAK,WAAW,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,KAAK,MAAM,OAAO,CAAC;CAClE;CAGA,OAAO,OAA0C;EAC/C,MAAM,SAAS,KAAK;EACpB,MAAM,UAAU,KAAK,KAAK;EAC1B,OAAO,UAAU,QAAQ,SACrB,QACG,KAAK,WAAW,WAAW,QAAQ,OAAO,MAAM,CAAC,CAAC,CAClD,OAAO,eAAe,IACzB;CACN;AACF;AASA,OAAO,SAAS,mBACd,QACA,QAA8C,QACX;CACnC,MAAM,SACJ,OAAO,UAAU,WAAW,QAAQ,EAAE,OAAO,MAAM;CAMrD,QALiB,OAAO,QACnB,OAAO,SAAS,SACjB,OAAO,SACJ,OAAO,UAAU,QAClB,UACa;AACrB","names":[],"ignoreList":[],"sources":["../../src/sref-status.ts"]}
1
+ {"version":3,"file":"sref-status.js","mappings":"AACA,SAAS,eAAe;AAGxB,SACE,iBACA,eACA,YACA,2BAEK;AAkBP,OAAO,MAAM,YAAY;;gBAKI,CAAC;kBAMW;eAGd,IAAI,IAA0B;;CAGvD,UAA6B;EAG3B,OAAO;GAFkC,UAAU,KAAK;GAE/B,GAAG,KAAK,OAAO;EAAQ;CAClD;CAGA,cAAoB;EAClB,MAAM,EAAE,OAAO,SAAS,CAAC,MAAM,KAAK;EACpC,KAAK,WACH,SAAS,KAAK,SACV,KAAK,OAAO,aAAa,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAC7D;CACR;CAGA,OAAO,OAAgC;EACrC,KAAK,MAAM,IAAI,cAAc,KAAK,GAAG,MAAM,OAAO,WAAW;CAC/D;CAGA,cAAc,OAAuB;EACnC,OAAO,KAAK,MAAM,OAAO,cAAc,KAAK,CAAC;CAC/C;CAMA,UAAgB;EACd,KAAK,YAAY;EACjB,MAAM,SAAS,KAAK,OAAQ;EAE5B,KAAK,MAAM,CAAC,SAAS,WAAW,KAAK,OACnC,KAAK,MAAM,IACT,SACA,OAAO,OAAO,OAAO,WAAW,GAAG,OAAO,OAAO,GAAG,OAAO,QAAQ,CAAC,CACtE;CAEJ;CAGA,OAAsB;EACpB,KAAK,MAAM,WAAW,KAAK,MAAM,KAAK,GACpC,IAAI,CAAC,QAAQ,aACX,KAAK,MAAM,OAAO,OAAO;EAI7B,OAAO,KAAK,WAAW,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,KAAK,MAAM,OAAO,CAAC;CAClE;CAGA,OAAO,OAA0C;EAC/C,MAAM,SAAS,KAAK;EACpB,MAAM,UAAU,KAAK,KAAK;EAE1B,OAAO,UAAU,QAAQ,SACrB,QACG,KAAK,WAAW,WAAW,QAAQ,OAAO,MAAM,CAAC,CAAC,CAClD,OAAO,eAAe,IACzB;CACN;AACF;AASA,OAAO,SAAS,mBACd,QACA,QAA8C,QACX;CACnC,MAAM,SAAS,oBAAoB,KAAK;CAQxC,QANiB,OAAO,QACnB,OAAO,SAAS,SACjB,OAAO,SACJ,OAAO,UAAU,QAClB,UAEa;AACrB","names":[],"ignoreList":[],"sources":["../../src/sref-status.ts"]}