fix: use lion/core types wherever possible

.changeset/fair-suns-melt.md

@@ -0,0 +1,28 @@
+---
+'@lion/accordion': patch
+'@lion/calendar': patch
+'@lion/checkbox-group': patch
+'@lion/collapsible': patch
+'@lion/core': patch
+'@lion/dialog': patch
+'@lion/form': patch
+'@lion/form-core': patch
+'@lion/helpers': patch
+'@lion/icon': patch
+'@lion/input-amount': patch
+'@lion/input-date': patch
+'@lion/input-datepicker': patch
+'@lion/input-email': patch
+'@lion/input-iban': patch
+'@lion/input-range': patch
+'@lion/input-stepper': patch
+'@lion/listbox': patch
+'@lion/pagination': patch
+'providence-analytics': patch
+'@lion/radio-group': patch
+'@lion/steps': patch
+'@lion/switch': patch
+'@lion/textarea': patch
+---
+
+Fix type imports to reuse lion where possible, in case Lit updates with new types that may break us.

packages/calendar/test/lion-calendar.test.js

@@ -10,7 +10,7 @@ import { CalendarObject, DayObject } from '../test-helpers.js';
 
 /**
  * @typedef {import('../src/LionCalendar').LionCalendar} LionCalendar
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionCalendar>} */ (_fixture);

packages/checkbox-group/test/lion-checkbox-group.test.js

@@ -5,7 +5,7 @@ import '../lion-checkbox.js';
 
 /**
  * @typedef {import('../src/LionCheckboxGroup').LionCheckboxGroup} LionCheckboxGroup
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionCheckboxGroup>} */ (_fixture);

packages/collapsible/test/lion-collapsible.test.js

@@ -5,7 +5,7 @@ import '../lion-collapsible.js';
 /**
 
  * @typedef {import('../src/LionCollapsible').LionCollapsible} LionCollapsible
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionCollapsible>} */ (_fixture);
 

packages/core/src/DelegateMixin.js

@@ -14,7 +14,7 @@ import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 /**
  * @type {DelegateMixin}
- * @param {import('@open-wc/dedupe-mixin').Constructor<import('lit-element').LitElement>} superclass
+ * @param {import('@open-wc/dedupe-mixin').Constructor<import('../index').LitElement>} superclass
  */
 const DelegateMixinImplementation = superclass =>
   // eslint-disable-next-line

packages/core/src/DisabledMixin.js

@@ -6,7 +6,7 @@ import { dedupeMixin } from '@open-wc/dedupe-mixin';
 
 /**
  * @type {DisabledMixin}
- * @param {import('@open-wc/dedupe-mixin').Constructor<import('lit-element').LitElement>} superclass
+ * @param {import('@open-wc/dedupe-mixin').Constructor<import('../index').LitElement>} superclass
  */
 const DisabledMixinImplementation = superclass =>
   // eslint-disable-next-line no-shadow

packages/core/src/DisabledWithTabIndexMixin.js

@@ -7,7 +7,7 @@ import { DisabledMixin } from './DisabledMixin.js';
 
 /**
  * @type {DisabledWithTabIndexMixin}
- * @param {import('@open-wc/dedupe-mixin').Constructor<import('lit-element').LitElement>} superclass
+ * @param {import('@open-wc/dedupe-mixin').Constructor<import('../index').LitElement>} superclass
  */
 const DisabledWithTabIndexMixinImplementation = superclass =>
   // eslint-disable-next-line no-shadow

packages/dialog/test/lion-dialog.test.js

@@ -5,7 +5,7 @@ import '../lion-dialog.js';
 /**
 
  * @typedef {import('../src/LionDialog').LionDialog} LionDialog
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionDialog>} */ (_fixture);
 

packages/form/test/lion-form.test.js

@@ -18,7 +18,7 @@ import '../lion-form.js';
 /**
 
  * @typedef {import('../src/LionForm').LionForm} LionForm
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionForm>} */ (_fixture);
 

packages/helpers/renderLitAsNode/src/renderLitAsNode.js

@@ -4,7 +4,7 @@ import { render } from '@lion/core';
  * Helper to render a lit TemplateResult as an offline-created DOM node
  * Make sure that the top-most element in the template has no siblings,
  * as they won't be taken into account. We only return firstElementChild.
- * @param {import('lit-html').TemplateResult} litHtmlTemplate
+ * @param {import('@lion/core').TemplateResult} litHtmlTemplate
  */
 export const renderLitAsNode = litHtmlTemplate => {
   const offlineRenderContainer = document.createElement('div');

packages/helpers/sb-action-logger/src/SbActionLogger.js

@@ -1,6 +1,6 @@
 import { css, html, LitElement, render } from '@lion/core';
 
-/** @typedef {import('lit-html').TemplateResult} TemplateResult */
+/** @typedef {import('@lion/core').TemplateResult} TemplateResult */
 
 export class SbActionLogger extends LitElement {
   static get properties() {

packages/helpers/sb-action-logger/test/sb-action-logger.test.js

@@ -3,7 +3,7 @@ import '../../sb-action-logger.js';
 
 /**
  * @typedef {import('../src/SbActionLogger').SbActionLogger} SbActionLogger
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<SbActionLogger>} */ (_fixture);
 

packages/icon/src/IconManager.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import('lit-html').TemplateResult} TemplateResult
- * @typedef {import('lit-html').nothing} nothing
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').nothing} nothing
  */
 
 export class IconManager {

packages/icon/test/lion-icon.test.js

@@ -8,7 +8,7 @@ import heartSvg from './heart.svg.js';
 /**
  * @typedef {(strings: TemplateStringsArray, ... expr: string[]) => string} TaggedTemplateLiteral
  * @typedef {import('../src/LionIcon').LionIcon} LionIcon
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionIcon>} */ (_fixture);
 

packages/input-date/test/lion-input-date.test.js

@@ -7,7 +7,7 @@ import '../lion-input-date.js';
 
 /**
  * @typedef {import('../src/LionInputDate').LionInputDate} LionInputDate
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionInputDate>} */ (_fixture);
 

packages/input-datepicker/test/lion-input-datepicker.test.js

@@ -10,7 +10,7 @@ import { LionInputDatepicker } from '../src/LionInputDatepicker.js';
 import { DatepickerInputObject } from '../test-helpers.js';
 
 /**
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionInputDatepicker>} */ (_fixture);

packages/input-email/test/lion-input-email.test.js

@@ -4,7 +4,7 @@ import '../lion-input-email.js';
 
 /**
  * @typedef {import('../src/LionInputEmail').LionInputEmail} LionInputEmail
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionInputEmail>} */ (_fixture);
 

packages/input-iban/test/lion-input-iban.test.js

@@ -9,7 +9,7 @@ import '../lion-input-iban.js';
 
 /**
  * @typedef {import('../src/LionInputIban').LionInputIban} LionInputIban
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionInputIban>} */ (_fixture);
 

packages/input-range/src/LionInputRange.js

@@ -4,7 +4,7 @@ import { LionInput } from '@lion/input';
 import { formatNumber, LocalizeMixin } from '@lion/localize';
 
 /**
- * @typedef {import('lit-element').CSSResult} CSSResult
+ * @typedef {import('@lion/core').CSSResult} CSSResult
  */
 
 /**

packages/input-range/test/lion-input-range.test.js

@@ -4,7 +4,7 @@ import '../lion-input-range.js';
 
 /**
  * @typedef {import('../src/LionInputRange').LionInputRange} LionInputRange
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionInputRange>} */ (_fixture);
 

packages/input-stepper/src/LionInputStepper.js

@@ -7,6 +7,7 @@ import { IsNumber, MinNumber, MaxNumber } from '@lion/form-core';
  *
  * @customElement lion-input-stepper
  */
+// @ts-expect-error false positive, lit-element already merges properties for you
 export class LionInputStepper extends LionInput {
   static get styles() {
     return [
@@ -256,7 +257,7 @@ export class LionInputStepper extends LionInput {
 
   /**
    * Get the decrementor button sign template
-   * @returns {String|import('lit-element').TemplateResult}
+   * @returns {String|import('@lion/core').TemplateResult}
    */
   // eslint-disable-next-line class-methods-use-this
   _decrementorSignTemplate() {
@@ -265,7 +266,7 @@ export class LionInputStepper extends LionInput {
 
   /**
    * Get the incrementor button sign template
-   * @returns {String|import('lit-element').TemplateResult}
+   * @returns {String|import('@lion/core').TemplateResult}
    */
   // eslint-disable-next-line class-methods-use-this
   _incrementorSignTemplate() {
@@ -274,7 +275,7 @@ export class LionInputStepper extends LionInput {
 
   /**
    * Get the increment button template
-   * @returns {import('lit-element').TemplateResult}
+   * @returns {import('@lion/core').TemplateResult}
    */
   _decrementorTemplate() {
     return html`
@@ -292,7 +293,7 @@ export class LionInputStepper extends LionInput {
 
   /**
    * Get the decrement button template
-   * @returns {import('lit-element').TemplateResult}
+   * @returns {import('@lion/core').TemplateResult}
    */
   _incrementorTemplate() {
     return html`

packages/input-stepper/test/lion-input-stepper.test.js

@@ -3,7 +3,7 @@ import '../lion-input-stepper.js';
 
 /**
  * @typedef {import('../src/LionInputStepper').LionInputStepper} LionInputStepper
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionInputStepper>} */ (_fixture);
 

packages/listbox/test-suites/ListboxMixin.suite.js

@@ -11,7 +11,7 @@ import '../lion-listbox.js';
  * @typedef {import('../src/LionListbox').LionListbox} LionListbox
  * @typedef {import('../src/LionOption').LionOption} LionOption
  * @typedef {import('@lion/select-rich').LionSelectInvoker} LionSelectInvoker
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionListbox>} */ (_fixture);

packages/pagination/src/LionPagination.js

@@ -2,7 +2,7 @@ import { LitElement, html, css } from '@lion/core';
 import { LocalizeMixin } from '@lion/localize';
 
 /**
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 /**

packages/pagination/test/lion-pagination.test.js

@@ -5,7 +5,7 @@ import '../lion-pagination.js';
 
 /**
  * @typedef {import('../src/LionPagination').LionPagination} LionPagination
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionPagination>} */ (_fixture);

packages/radio-group/test/lion-radio-group.test.js

@@ -6,7 +6,7 @@ import '../lion-radio.js';
 /**
  * @typedef {import('../src/LionRadioGroup').LionRadioGroup} LionRadioGroup
  * @typedef {import('../src/LionRadio').LionRadio} LionRadio
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionRadioGroup>} */ (_fixture);
 

packages/steps/test/lion-steps.test.js

@@ -6,7 +6,7 @@ import '../lion-steps.js';
 /**
  * @typedef {import('../src/LionSteps').LionSteps} LionSteps
  * @typedef {import('../src/LionStep').LionStep} LionStep
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  * @typedef {{[key: string]: ?}} UnknownData
  */
 

packages/switch/test/lion-switch-button.test.js

@@ -4,7 +4,7 @@ import '../lion-switch-button.js';
 
 /**
  * @typedef {import('../src/LionSwitchButton').LionSwitchButton} LionSwitchButton
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionSwitchButton>} */ (_fixture);

packages/switch/test/lion-switch.test.js

@@ -4,7 +4,7 @@ import '../lion-switch.js';
 
 /**
  * @typedef {import('../src/LionSwitch').LionSwitch} LionSwitch
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult) => Promise<LionSwitch>} */ (_fixture);

packages/textarea/test/lion-textarea.test.js

@@ -4,7 +4,7 @@ import '../lion-textarea.js';
 
 /**
  * @typedef {import('../src/LionTextarea').LionTextarea} LionTextarea
- * @typedef {import('lit-html').TemplateResult} TemplateResult
+ * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
 
 const fixture = /** @type {(arg: TemplateResult|string) => Promise<LionTextarea>} */ (_fixture);