element-vir 14.2.2 → 15.0.0

package/dist/declarative-element/declarative-element-init.d.ts

@@ -30,7 +30,7 @@ export type DeclarativeElementInit<TagName extends CustomElementTagName, Inputs
      * based on current instance state or inputs, or just false to indicate that the host class will
      * only be manually set.
      */
-    hostClasses?: HostClassesInitMap<TagName, HostClassKeys, FlattenObservablePropertyGetters<Inputs>, FlattenObservablePropertyGetters<StateInit>>;
+    hostClasses?: HostClassesInitMap<TagName, HostClassKeys, Inputs, FlattenObservablePropertyGetters<StateInit>>;
     /**
      * CSS Vars for the component. Keys of this object should be kebab-case and start with the
      * element's tag name.

package/dist/declarative-element/declarative-element.d.ts

@@ -1,6 +1,6 @@
 import { RequiredAndNotNullBy, RequiredBy } from '@augment-vir/common';
-import { AllowObservablePropertySetter } from 'element-vir';
 import { CSSResult, LitElement } from 'lit';
+import { Exact } from 'type-fest';
 import { WrappedMinimalDefinition } from '../template-transforms/minimal-element-definition';
 import { CustomElementTagName, DeclarativeElementInit } from './declarative-element-init';
 import { BaseCssPropertyName } from './properties/css-properties';
@@ -33,7 +33,7 @@ export declare abstract class DeclarativeElement<TagName extends CustomElementTa
     abstract render(): unknown;
     abstract readonly instanceState: FlattenObservablePropertyGetters<StateInit>;
     abstract readonly observablePropertyHandlerMap: ObservablePropertyHandlerMap<StateInit>;
-    abstract readonly instanceInputs: FlattenObservablePropertyGetters<Inputs>;
+    abstract readonly instanceInputs: Inputs;
     abstract assignInputs(inputs: {} extends Required<Inputs> ? never : Partial<Inputs>): void;
     abstract haveInputsBeenSet: boolean;
     abstract markInputsAsHavingBeenSet(): void;
@@ -41,7 +41,7 @@ export declare abstract class DeclarativeElement<TagName extends CustomElementTa
 }
 export interface StaticDeclarativeElementProperties<TagName extends CustomElementTagName, Inputs extends PropertyInitMapBase, StateInit extends PropertyInitMapBase, EventsInit extends EventsInitMap, HostClassKeys extends BaseCssPropertyName<TagName>, CssVarKeys extends BaseCssPropertyName<TagName>, RenderOutputGeneric> {
     /** Assign inputs to an element directly on its interpolated tag. */
-    readonly assign: <const SpecificInputs extends AllowObservablePropertySetter<Inputs, SpecificInputs>>(inputsObject: {} extends Required<Inputs> ? never : SpecificInputs) => WrappedMinimalDefinition;
+    readonly assign: <SpecificInputs extends Exact<Inputs, SpecificInputs>>(inputsObject: {} extends Required<Inputs> ? never : SpecificInputs) => WrappedMinimalDefinition;
     assignedInputs: Inputs | undefined;
     /** Pass through the render callback for direct unit testability */
     readonly renderCallback: RenderCallback<TagName, Inputs, StateInit, EventsInit, HostClassKeys, CssVarKeys, RenderOutputGeneric>;

package/dist/declarative-element/define-element-no-inputs.js

@@ -142,8 +142,8 @@ export function defineElementNoInputs(initInput) {
                 // this is set below in Object.defineProperties
                 this.definition = {};
                 this.observablePropertyHandlerMap = {};
-                this.instanceInputs = createElementUpdaterProxy(this, false);
-                this.instanceState = createElementUpdaterProxy(this, !initInput.options?.allowPolymorphicState);
+                this.instanceInputs = createElementUpdaterProxy(this, false, false);
+                this.instanceState = createElementUpdaterProxy(this, !initInput.options?.allowPolymorphicState, true);
                 const stateInitStatic = initInput.stateInitStatic ||
                     {};
                 getObjectTypedKeys(stateInitStatic).forEach((stateKey) => {

package/dist/declarative-element/directives/assign.directive.d.ts

@@ -1,6 +1,5 @@
 import { DirectiveResult } from 'lit/directive.js';
 import { PropertyInitMapBase } from '../properties/element-properties';
-import { AllowObservablePropertySetter } from '../properties/observable-property/observable-property-handler';
 export type ElementDefinitionWithInputsType<InputsType extends PropertyInitMapBase = PropertyInitMapBase> = {
     inputsType: InputsType;
 };
@@ -14,9 +13,7 @@ export type ElementDefinitionWithInputsType<InputsType extends PropertyInitMapBa
  *     should be
  *     html`<${MyElement.assign({value: 1})}>...`
  */
-export declare function assign<const SpecificDeclarativeElement extends ElementDefinitionWithInputsType, const SpecificInput extends {
-    [Prop in keyof SpecificDeclarativeElement['inputsType']]: unknown;
-}>(declarativeElement: SpecificDeclarativeElement, inputsObject: {} extends Required<SpecificDeclarativeElement['inputsType']> ? never : AllowObservablePropertySetter<SpecificDeclarativeElement['inputsType'], SpecificInput>): DirectiveResult;
+export declare function assign<const SpecificDeclarativeElement extends ElementDefinitionWithInputsType>(declarativeElement: SpecificDeclarativeElement, inputsObject: {} extends Required<SpecificDeclarativeElement['inputsType']> ? never : SpecificDeclarativeElement['inputsType']): DirectiveResult;
 /**
  * Assign an object matching an element's inputs to its inputs.
  *
@@ -27,6 +24,4 @@ export declare function assign<const SpecificDeclarativeElement extends ElementD
  *     should be
  *     html`<${MyElement.assign({value: 1})}>...`
  */
-export declare function assign<const SpecificDeclarativeElement extends ElementDefinitionWithInputsType, const SpecificInput extends {
-    [Prop in keyof SpecificDeclarativeElement['inputsType']]: unknown;
-}>(inputsObject: SpecificInput extends typeof HTMLElement ? never : SpecificInput): DirectiveResult;
+export declare function assign<const SpecificDeclarativeElement extends ElementDefinitionWithInputsType, const SpecificInput extends SpecificDeclarativeElement['inputsType']>(inputsObject: SpecificInput extends typeof HTMLElement ? never : SpecificInput): DirectiveResult;

package/dist/declarative-element/properties/element-updater-proxy.d.ts

@@ -1,3 +1,3 @@
 import { DeclarativeElement } from '../declarative-element';
 import { PropertyInitMapBase } from './element-properties';
-export declare function createElementUpdaterProxy<PropertyInitGeneric extends PropertyInitMapBase>(element: DeclarativeElement, verifyExists: boolean): PropertyInitGeneric;
+export declare function createElementUpdaterProxy<PropertyInitGeneric extends PropertyInitMapBase>(element: DeclarativeElement, verifyExists: boolean, unwrapObservables: boolean): PropertyInitGeneric;

package/dist/declarative-element/properties/element-updater-proxy.js

@@ -8,7 +8,7 @@ function assertValidPropertyName(propKey, element, elementTagName) {
         throw new Error(`Property '${String(propKey)}' does not exist on '${elementTagName.toLowerCase()}'.`);
     }
 }
-export function createElementUpdaterProxy(element, verifyExists) {
+export function createElementUpdaterProxy(element, verifyExists, unwrapObservables) {
     /**
      * Lit element updates state and inputs by setting them directly on the element, so we must do
      * that here. DeclarativeElement's types, however, do not expose this behavior, so we add that
@@ -45,11 +45,11 @@ export function createElementUpdaterProxy(element, verifyExists) {
                 target[propertyKey] = value;
                 elementAsProps[propertyKey] = value;
             }
-            if (isObservablePropertyHandlerCreator(newValue)) {
+            if (unwrapObservables && isObservablePropertyHandlerCreator(newValue)) {
                 newValue = newValue.init();
             }
             /** If we're using an existing observable property */
-            if (isObservablePropertyHandlerInstance(newValue)) {
+            if (unwrapObservables && isObservablePropertyHandlerInstance(newValue)) {
                 if (existingObservablePropertyHandler &&
                     newValue !== existingObservablePropertyHandler) {
                     newValue.addMultipleListeners(existingObservablePropertyHandler.getAllListeners());
@@ -64,7 +64,7 @@ export function createElementUpdaterProxy(element, verifyExists) {
                 element.observablePropertyHandlerMap[propertyKey] = newValue;
             }
             else {
-                if (existingObservablePropertyHandler) {
+                if (unwrapObservables && existingObservablePropertyHandler) {
                     existingObservablePropertyHandler.setValue(newValue);
                 }
                 else {

package/dist/declarative-element/render-callback.d.ts

@@ -14,6 +14,6 @@ export type RenderParams<TagName extends CustomElementTagName, Inputs extends Pr
     events: EventDescriptorMap<EventsInit>;
     host: DeclarativeElementHost<TagName, Inputs, StateInit, EventsInit, HostClassKeys, CssVarKeys>;
     dispatch: <EventTypeName extends keyof EventsInit>(event: TypedEvent<EventTypeName extends string ? EventTypeName : never, EventInitMapEventDetailExtractor<EventTypeName, EventsInit>> | Event) => boolean;
-    inputs: Readonly<FlattenObservablePropertyGetters<Inputs>>;
+    inputs: Readonly<Inputs>;
 };
 export declare function createRenderParams<TagName extends CustomElementTagName, Inputs extends PropertyInitMapBase, StateInit extends PropertyInitMapBase, EventsInit extends EventsInitMap, HostClassKeys extends BaseCssPropertyName<TagName>, CssVarKeys extends BaseCssPropertyName<TagName>, RenderOutput>(element: DeclarativeElement<TagName, Inputs, StateInit, EventsInit, HostClassKeys, CssVarKeys, RenderOutput>, eventsMap: EventDescriptorMap<EventsInit>): RenderParams<TagName, Inputs, StateInit, EventsInit, HostClassKeys, CssVarKeys>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-vir",
-    "version": "14.2.2",
+    "version": "15.0.0",
     "keywords": [
         "custom",
         "web",
@@ -41,7 +41,6 @@
     "dependencies": {
         "@augment-vir/browser": "^15.4.1",
         "@augment-vir/common": "^15.4.1",
-        "element-vir": "^14.2.1",
         "lit": "2.7.6",
         "lit-css-vars": "^2.0.3"
     },
@@ -78,7 +77,7 @@
         "type-fest": "^4.0.0",
         "typescript": "~5.1.6",
         "virmator": "^7.2.5",
-        "vite": "^4.4.5",
+        "vite": "^4.4.6",
         "vite-tsconfig-paths": "^4.2.0"
     },
     "overrides": {