@yahoo/uds-create-config 5.34.0 → 5.34.2

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

@@ -861,12 +861,18 @@ type StoredContractProps<Props> = { [Key in keyof Props]: Props[Key] extends {
 } ? Omit<Props[Key], 'value'> & {
   value: { [Value in Values[number]]: Record<never, never> };
 } : Props[Key] };
+/** Match the linked-body hook: a different prop type replaces the complete declaration. */
+type OverlayContractProps<Base, Delta> = Omit<Base, keyof Delta> & { [Key in keyof Delta]: Key extends keyof Base ? Base[Key] extends {
+  type: infer Type;
+} ? Delta[Key] extends {
+  type: Type;
+} ? OverlayContract<Base[Key], Delta[Key]> : Delta[Key] : Delta[Key] : Delta[Key] };
 type ResolvedLayers<Contract, Delta> = Delta extends {
   readonly layers: infer Layers;
 } ? Layers extends LayerMap ? OverlayContract<ContractLayers<Contract>, Layers> : ContractLayers<Contract> : ContractLayers<Contract>;
 type ResolvedProps<Contract, Delta> = Delta extends {
   readonly props: infer Props;
-} ? Props extends PropMap ? OverlayContract<StoredContractProps<ContractProps<Contract>>, StoredContractProps<Props>> : ContractProps<Contract> : ContractProps<Contract>;
+} ? Props extends PropMap ? OverlayContractProps<StoredContractProps<ContractProps<Contract>>, StoredContractProps<Props>> : ContractProps<Contract> : ContractProps<Contract>;
 type ResolvedDefaults<Contract, Delta> = Delta extends {
   readonly defaultProps: infer Defaults;
 } ? OverlayContract<Contract extends {

package/dist/entities/system/Component.js

@@ -12,10 +12,10 @@ import { translateLinkedStyleBags } from "./linked-style-values.js";
 import { listedIn } from "../../framework/utils/enumerated.js";
 import { valueSchemaOf } from "../../framework/value-domain.js";
 import { Package } from "./Package.js";
-import { bindPreviewGlyphs, glyphLeafOf } from "./glyph-identity.js";
+import { bindPreviewGlyphs, glyphMemberRefIn } from "./glyph-identity.js";
 import { Style, addBagKeyIssues, anatomyPropValue, bagNameEdges, bagRewriteName, bindBagTokens, collectBag, isPlainRecord, openBag, styleValue } from "./style-bag.js";
 import { storedPreview } from "../../framework/preview-store.js";
-import { glyphPropsOf, propOwner, propValueDomain, refListOf, resolveComponentProps, stylePropNumberUnit, stylePropValueLeaves, validateComponentProps } from "../../framework/projections.js";
+import { glyphPropsOf, glyphPropsOfBody, propOwner, propValueDomain, refListOf, resolveComponentProps, stylePropNumberUnit, stylePropValueLeaves, validateComponentProps } from "../../framework/projections.js";
 import { carriesContent, intoName, isValueSlot, renderBoundProp, routedPropIn, routesContent } from "../../framework/prop-surface.js";
 import { slotAnatomyPropOf, slotTargetsOf, withoutTruthyTerm } from "../../framework/render-spec.js";
 import { listSlots, namedSlots, slotHostedBy, slotOf, slotsFor } from "../../spec/slot.js";
@@ -664,7 +664,7 @@ function canonicalWhen(when) {
 function styleBagValue({ config, declaration, name = "<prop>", glyphLibraries }) {
 	const domain = valueSchemaOf(declaration, config);
 	const bound = declaration?.value;
-	if (glyphLibraries && glyphLibraries.length > 0) return z.union([glyphLeafOf({
+	if (glyphLibraries && glyphLibraries.length > 0) return z.union([glyphMemberRefIn({
 		config,
 		libraries: glyphLibraries
 	}), domain]);
@@ -1131,6 +1131,10 @@ const Preview = defineSubEntity({
 			config,
 			owner: body,
 			build: () => {
+				const glyphProps = glyphPropsOfBody({
+					config,
+					body
+				});
 				const when = {};
 				for (const [name, decl] of Object.entries(body.props ?? {})) when[name] = conditionValue(name, decl, config).optional();
 				for (const [name, decl] of Object.entries(body.states ?? {})) when[name] = stateConditionValue(decl).optional();
@@ -1138,7 +1142,8 @@ const Preview = defineSubEntity({
 					when: z.strictObject(when, { error: previewShapeError }).nullable().default(null),
 					props: z.record(z.string(), z.unknown()).transform((props) => bindPreviewGlyphs({
 						config,
-						props
+						props,
+						glyphProps
 					}))
 				}, { error: previewShapeError });
 			}
@@ -1833,11 +1838,23 @@ const componentBags = (data) => {
 };
 const ComponentEntity = defineEntity({
 	kind: "component",
-	rebaseLinkedBody: (args) => translateLinkedStyleBags({
-		...args,
-		bags: componentBags,
-		owner: args.path
-	}),
+	rebaseLinkedBody: (args) => {
+		const body = translateLinkedStyleBags({
+			...args,
+			bags: componentBags,
+			owner: args.path
+		});
+		if (!isPlainObject(body.props) || !isPlainObject(args.extend.props)) return body;
+		const props = { ...body.props };
+		for (const [name, next] of Object.entries(args.extend.props)) {
+			const previous = props[name];
+			if (isPlainObject(previous) && isPlainObject(next) && typeof next.type === "string" && next.type !== previous.type) delete props[name];
+		}
+		return {
+			...body,
+			props
+		};
+	},
 	prepareLinkedBody: ({ body, config }) => {
 		if (!isPlainObject(body.props)) return body;
 		const layers = isPlainObject(body.layers) ? body.layers : void 0;

package/dist/entities/system/glyph-identity.js

@@ -175,16 +175,30 @@ function glyphOfLibrary({ library, module, leaves }) {
 }
 /**
 * The glyph form for a key that reaches a library through a forward (`icon` → `icon/name`): the
-* component or its `package:` ref, answered as the bare member name. The forwarded key stores the
-* leaf rather than a member ref, and the emitter and the renderer resolve it through the same
-* libraries (`glyphPropsOf`), taking the first that holds it. Each library's arm refuses by cause,
-* so a glyph of a library the key does not reach says so.
+* component, its `package:` ref, the member's name a surface writes, or the member ref a stored
+* config already holds, answered as the member ref `icon:<library>/<name>`. The ref names its library, so a key reaching several resolves
+* without a lookup. Each library's arm refuses by cause, so a glyph of a library the key does not
+* reach says so.
 */
-function glyphLeafOf({ config, libraries }) {
-	const arms = libraries.map((library) => glyphOfLibrary(libraryGlyphFacts({
-		config,
-		target: `icon:${library}`
-	})));
+function glyphMemberRefIn({ config, libraries }) {
+	const arms = libraries.map((library) => {
+		const facts = libraryGlyphFacts({
+			config,
+			target: `icon:${library}`
+		});
+		const toRef = (name) => ({ __ref: `icon:${library}/${name}` });
+		const memberOfRef = (value) => {
+			if (!isRef(value) || kindOf(value) !== "icon") return void 0;
+			const path = pathOf(value);
+			const name = path.slice(library.length + 1);
+			return path.startsWith(`${library}/`) && facts.leaves.includes(name) ? name : void 0;
+		};
+		return z.union([
+			z.custom((value) => memberOfRef(value) !== void 0).transform((value) => toRef(memberOfRef(value))),
+			z.string().refine((name) => facts.leaves.includes(name)).transform(toRef),
+			glyphOfLibrary(facts).transform((name) => toRef(name))
+		]);
+	});
 	if (arms.length === 1) return arms[0];
 	return z.union(arms);
 }
@@ -204,9 +218,11 @@ function glyphMemberRefOf(config, identity) {
 * way `defaultProps` are. Once an owner is known, this pass binds each such ref to
 * `icon:<library>/<name>` through the library whose package ships it, at the top level and inside a
 * stored element's props, which is the spelling the build writes when it reads `.preview()` from
-* source. A `package:` ref no library claims is another package's export and stays as written.
+* source. A member's name written under one of the owner's glyph props (`glyphProps`) binds through
+* the first of that prop's libraries holding it. A `package:` ref no library claims is another
+* package's export and stays as written.
 */
-function bindPreviewGlyphs({ config, props }) {
+function bindPreviewGlyphs({ config, props, glyphProps = {} }) {
 	const bind = (value) => {
 		if (typeof value !== "object" || value === null) return value;
 		if (Array.isArray(value)) return value.map(bind);
@@ -216,7 +232,14 @@ function bindPreviewGlyphs({ config, props }) {
 		for (const [key, member] of Object.entries(value)) out[key] = bind(member);
 		return out;
 	};
-	return bind(props);
+	const out = bind(props);
+	for (const [prop, libraries] of Object.entries(glyphProps)) {
+		const name = out[prop];
+		if (typeof name !== "string") continue;
+		const library = libraries.find((path) => memberLeaves(config, `icon:${path}`).includes(name));
+		if (library) out[prop] = { __ref: `icon:${library}/${name}` };
+	}
+	return out;
 }
 //#endregion
-export { bindPreviewGlyphs, glyphIdentityOf, glyphLeafOf, glyphMembersOf, glyphOfLibrary, glyphPackageRef, glyphPackageRefOf, isComponentType, libraryGlyphFacts, recordGlyphIdentities };
+export { bindPreviewGlyphs, glyphIdentityOf, glyphMemberRefIn, glyphMembersOf, glyphOfLibrary, glyphPackageRef, glyphPackageRefOf, isComponentType, libraryGlyphFacts, recordGlyphIdentities };

package/dist/entities/system/style-bag.js

@@ -3,7 +3,7 @@ import { composedValueSchemas } from "./composed-values.js";
 import { defineSubEntity } from "../../framework/defineSubEntity.js";
 import { isCssProperty, kebabCase } from "../../css/values.js";
 import { valueSchemaOf } from "../../framework/value-domain.js";
-import { glyphLeafOf, glyphPackageRef } from "./glyph-identity.js";
+import { glyphMemberRefIn, glyphPackageRef } from "./glyph-identity.js";
 import { glyphPropsOfBody, isCustomPropertyKey, refListOf, stylePropTokenPath } from "../../framework/projections.js";
 import { z } from "zod";
 //#region src/entities/system/style-bag.ts
@@ -59,7 +59,7 @@ const Style = defineSubEntity({
 				config,
 				body: parent
 			})[key];
-			if (libraries && libraries.length > 0) return z.union([glyphLeafOf({
+			if (libraries && libraries.length > 0) return z.union([glyphMemberRefIn({
 				config,
 				libraries
 			}), styleValue]);