@yahoo/uds-create-config 5.67.4 → 5.68.1

package/dist/entities/system/defineComponent.d.ts

@@ -907,15 +907,24 @@ type AuthoredComponent = ComponentBuilder<LayerMap, PropMap, unknown, unknown>;
  * The builder is read off `metadata()`'s return type, so a handle with statics on it (the Bridge's
  * `Menu.Item`) is matched as the bare builder and keeps its statics. Matched whole, a handle whose
  * statics are builders too passes TypeScript's complexity limit (TS2859) once a system's style props
- * are registered.
- *
- * OPEN: a static that is the component itself (`Menu.Content`) keeps the source's types.
+ * are registered. A static that is the component itself (`Menu.Content`) is the rebuilt handle too.
  */
 type LinkedHandle<Handle, Props extends PropMap = Record<never, never>, Layers extends Record<string, LayerElement> = Record<never, never>> = Handle extends {
   metadata(meta: never): infer Builder;
-} ? Builder extends ComponentBuilder<infer L extends LayerMap, infer P extends PropMap, infer E, infer D, infer F extends string, infer S extends StateMap> ? WithStatics<ComponentBuilder<Without<L, keyof Layers> & Layers extends infer Swapped extends LayerMap ? Swapped : L, CompactProps<Without<P, keyof Props> & Props>, E, D, F, S>, Omit<Handle, keyof Builder>> : Handle : Handle;
-/** A rebuilt handle with the source handle's statics beside it, when it has any. */
-type WithStatics<Rebuilt, Statics> = [keyof Statics] extends [never] ? Rebuilt : Rebuilt & Statics;
+} ? Builder extends ComponentBuilder<infer L extends LayerMap, infer P extends PropMap, infer E, infer D, infer F extends string, infer S extends StateMap> ? WithStatics<ComponentBuilder<Without<L, keyof Layers> & Layers extends infer Swapped extends LayerMap ? Swapped : L, CompactProps<Without<P, keyof Props> & Props>, E, D, F, S>, Builder, Omit<Handle, keyof Builder>> : Handle : Handle;
+/**
+ * A rebuilt handle with the source handle's statics beside it, when it has any. A static whose
+ * builder is the handle's own is the rebuilt handle, with that static's own statics beside it.
+ */
+type WithStatics<Rebuilt, Builder, Statics> = [keyof Statics] extends [never] ? Rebuilt : Rebuilt & { [K in keyof Statics]: IsBuilder<Statics[K], Builder> extends true ? Rebuilt & Omit<Statics[K], keyof Builder> : Statics[K] };
+/**
+ * Whether a static's builder is the handle's own. An identity check, which TypeScript answers at
+ * once when both are the same type: an assignability check would compare the two builders whole,
+ * as the TS2859 above did.
+ */
+type IsBuilder<Static, Builder> = Static extends {
+  metadata(meta: never): infer Own;
+} ? (<T>() => T extends Own ? 1 : 2) extends (<T>() => T extends Builder ? 1 : 2) ? true : false : false;
 interface DefineComponent {
   /** The one-layer form: the element IS the component. */
   <const El extends LayerElement>(element: El): ComponentBuilder<{