@camstack/types 1.2.425 → 1.2.427

package/dist/index.js

@@ -62808,7 +62808,8 @@ var BATTERY_DEVICE_TYPES = [
 	require_err_msg.DeviceType.Switch,
 	require_err_msg.DeviceType.PetFeeder,
 	require_err_msg.DeviceType.Container,
-	require_err_msg.DeviceType.Thermostat
+	require_err_msg.DeviceType.Thermostat,
+	require_err_msg.DeviceType.EventEmitter
 ];
 /** Generic Customize target for the percentage reading (D936). */
 var batteryCustomize = {
@@ -71593,9 +71594,9 @@ var PowerMeterStatusSchema = zod.z.object({
 	/** Cumulative energy in kilowatt-hours since the meter was reset. */
 	kwhTotal: zod.z.number().optional().meta(require_sleep.readingMeta("energy", { label: "Energy" })),
 	/** Voltage in volts. */
-	volts: zod.z.number().optional().meta(require_sleep.readingMeta("voltage")),
+	volts: zod.z.number().optional().meta(require_sleep.readingMeta("voltage", { label: "Voltage" })),
 	/** Current in amperes. */
-	amps: zod.z.number().optional().meta(require_sleep.readingMeta("current")),
+	amps: zod.z.number().optional().meta(require_sleep.readingMeta("current", { label: "Current" })),
 	/** Apparent power in volt-amperes. */
 	va: zod.z.number().optional().meta(require_sleep.readingMeta("apparent-power")),
 	/** Power factor (0..1) if reported. */
@@ -71603,17 +71604,74 @@ var PowerMeterStatusSchema = zod.z.object({
 	/** Ms epoch when the slice was last updated. */
 	lastFetchedAt: zod.z.number()
 });
+/**
+* Loads that draw metered mains power (D951). The reading is a feature of the
+* device itself — a plug, a lamp, a fan, an air conditioner, a boiler, a
+* vacuum dock — not a separate sensor beside it. A `Sensor` stays: a clamp
+* meter or a standalone energy monitor IS the device. Cover, lock, valve,
+* camera and the like are left out: their draw is not what anyone meters.
+*/
+var POWER_METER_DEVICE_TYPES = [
+	require_err_msg.DeviceType.Sensor,
+	require_err_msg.DeviceType.Switch,
+	require_err_msg.DeviceType.Light,
+	require_err_msg.DeviceType.Fan,
+	require_err_msg.DeviceType.Climate,
+	require_err_msg.DeviceType.Thermostat,
+	require_err_msg.DeviceType.Humidifier,
+	require_err_msg.DeviceType.WaterHeater,
+	require_err_msg.DeviceType.MediaPlayer,
+	require_err_msg.DeviceType.Washer,
+	require_err_msg.DeviceType.Dryer,
+	require_err_msg.DeviceType.Dishwasher,
+	require_err_msg.DeviceType.Vacuum,
+	require_err_msg.DeviceType.LawnMower,
+	require_err_msg.DeviceType.PetFeeder
+];
+/** Everything but a bare `Sensor`: a sensor that takes its reading from another sensor adds nothing. */
+var POWER_METER_CUSTOMIZE_DEVICE_TYPES = POWER_METER_DEVICE_TYPES.filter((type) => type !== require_err_msg.DeviceType.Sensor);
+/** One scalar target per reading; each is sourced from a device of its own (D951). */
+function powerTarget(id, unit) {
+	return {
+		id,
+		cardinality: "scalar",
+		vocabulary: {
+			cap: "power-meter",
+			stateField: id
+		},
+		deviceTypes: POWER_METER_CUSTOMIZE_DEVICE_TYPES,
+		apply: "add",
+		path: id,
+		sources: [{
+			kind: "numeric",
+			requiredUnit: unit,
+			transforms: [{ kind: "identity" }]
+		}],
+		companions: [{
+			kind: "clock",
+			path: "lastFetchedAt",
+			when: "always"
+		}],
+		sourceReport: { status: "assignment-status" },
+		advancedExpression: true
+	};
+}
+/** "Power and energy" extension: watts, energy, voltage and current from other devices (D951). */
+var powerMeterCustomize = {
+	version: 1,
+	targets: [
+		powerTarget("watts", "W"),
+		powerTarget("kwhTotal", "kWh"),
+		powerTarget("volts", "V"),
+		powerTarget("amps", "A")
+	]
+};
 var powerMeterCapability = {
 	name: "power-meter",
 	scope: "device",
 	deviceNative: true,
 	mode: "singleton",
-	deviceTypes: [
-		require_err_msg.DeviceType.Sensor,
-		require_err_msg.DeviceType.Washer,
-		require_err_msg.DeviceType.Dryer,
-		require_err_msg.DeviceType.Dishwasher
-	],
+	deviceTypes: POWER_METER_DEVICE_TYPES,
 	methods: {},
 	status: {
 		schema: PowerMeterStatusSchema,
@@ -71670,7 +71728,8 @@ var powerMeterCapability = {
 	} },
 	/** Clock fields: written, but excluded from the compare that decides
 	*  whether persisting is worth a SQLite commit. */
-	volatileStateFields: ["lastFetchedAt"]
+	volatileStateFields: ["lastFetchedAt"],
+	customize: powerMeterCustomize
 };
 //#endregion
 //#region src/capabilities/presence.cap.ts
@@ -80443,7 +80502,7 @@ function convertUnitTargets(from) {
 //#region src/generated/customize-catalog.ts
 /**
 * Customize catalog, projected from every `*.cap.ts` `customize` block.
-* 5 caps. Field keys are `runtimeState` paths. No Zod.
+* 6 caps. Field keys are `runtimeState` paths. No Zod.
 */
 var CAP_CUSTOMIZE_CATALOG = {
 	"battery": {
@@ -80458,7 +80517,8 @@ var CAP_CUSTOMIZE_CATALOG = {
 				require_err_msg.DeviceType.Switch,
 				require_err_msg.DeviceType.PetFeeder,
 				require_err_msg.DeviceType.Container,
-				require_err_msg.DeviceType.Thermostat
+				require_err_msg.DeviceType.Thermostat,
+				require_err_msg.DeviceType.EventEmitter
 			],
 			apply: "add",
 			vocabularyCap: "battery",
@@ -80708,6 +80768,167 @@ var CAP_CUSTOMIZE_CATALOG = {
 			]
 		}]
 	},
+	"power-meter": {
+		version: 1,
+		targets: [
+			{
+				id: "watts",
+				cardinality: "scalar",
+				deviceTypes: [
+					require_err_msg.DeviceType.Switch,
+					require_err_msg.DeviceType.Light,
+					require_err_msg.DeviceType.Fan,
+					require_err_msg.DeviceType.Climate,
+					require_err_msg.DeviceType.Thermostat,
+					require_err_msg.DeviceType.Humidifier,
+					require_err_msg.DeviceType.WaterHeater,
+					require_err_msg.DeviceType.MediaPlayer,
+					require_err_msg.DeviceType.Washer,
+					require_err_msg.DeviceType.Dryer,
+					require_err_msg.DeviceType.Dishwasher,
+					require_err_msg.DeviceType.Vacuum,
+					require_err_msg.DeviceType.LawnMower,
+					require_err_msg.DeviceType.PetFeeder
+				],
+				apply: "add",
+				vocabularyCap: "power-meter",
+				vocabularyStateField: "watts",
+				sources: [{
+					kind: "numeric",
+					requiredUnit: "W",
+					transformKinds: ["identity"],
+					transforms: [{ kind: "identity" }]
+				}],
+				sourceReport: { status: "assignment-status" },
+				advancedExpression: true,
+				path: "watts",
+				valueKind: "number",
+				nullable: false,
+				companions: [{
+					kind: "clock",
+					path: "lastFetchedAt",
+					when: "always"
+				}]
+			},
+			{
+				id: "kwhTotal",
+				cardinality: "scalar",
+				deviceTypes: [
+					require_err_msg.DeviceType.Switch,
+					require_err_msg.DeviceType.Light,
+					require_err_msg.DeviceType.Fan,
+					require_err_msg.DeviceType.Climate,
+					require_err_msg.DeviceType.Thermostat,
+					require_err_msg.DeviceType.Humidifier,
+					require_err_msg.DeviceType.WaterHeater,
+					require_err_msg.DeviceType.MediaPlayer,
+					require_err_msg.DeviceType.Washer,
+					require_err_msg.DeviceType.Dryer,
+					require_err_msg.DeviceType.Dishwasher,
+					require_err_msg.DeviceType.Vacuum,
+					require_err_msg.DeviceType.LawnMower,
+					require_err_msg.DeviceType.PetFeeder
+				],
+				apply: "add",
+				vocabularyCap: "power-meter",
+				vocabularyStateField: "kwhTotal",
+				sources: [{
+					kind: "numeric",
+					requiredUnit: "kWh",
+					transformKinds: ["identity"],
+					transforms: [{ kind: "identity" }]
+				}],
+				sourceReport: { status: "assignment-status" },
+				advancedExpression: true,
+				path: "kwhTotal",
+				valueKind: "number",
+				nullable: false,
+				companions: [{
+					kind: "clock",
+					path: "lastFetchedAt",
+					when: "always"
+				}]
+			},
+			{
+				id: "volts",
+				cardinality: "scalar",
+				deviceTypes: [
+					require_err_msg.DeviceType.Switch,
+					require_err_msg.DeviceType.Light,
+					require_err_msg.DeviceType.Fan,
+					require_err_msg.DeviceType.Climate,
+					require_err_msg.DeviceType.Thermostat,
+					require_err_msg.DeviceType.Humidifier,
+					require_err_msg.DeviceType.WaterHeater,
+					require_err_msg.DeviceType.MediaPlayer,
+					require_err_msg.DeviceType.Washer,
+					require_err_msg.DeviceType.Dryer,
+					require_err_msg.DeviceType.Dishwasher,
+					require_err_msg.DeviceType.Vacuum,
+					require_err_msg.DeviceType.LawnMower,
+					require_err_msg.DeviceType.PetFeeder
+				],
+				apply: "add",
+				vocabularyCap: "power-meter",
+				vocabularyStateField: "volts",
+				sources: [{
+					kind: "numeric",
+					requiredUnit: "V",
+					transformKinds: ["identity"],
+					transforms: [{ kind: "identity" }]
+				}],
+				sourceReport: { status: "assignment-status" },
+				advancedExpression: true,
+				path: "volts",
+				valueKind: "number",
+				nullable: false,
+				companions: [{
+					kind: "clock",
+					path: "lastFetchedAt",
+					when: "always"
+				}]
+			},
+			{
+				id: "amps",
+				cardinality: "scalar",
+				deviceTypes: [
+					require_err_msg.DeviceType.Switch,
+					require_err_msg.DeviceType.Light,
+					require_err_msg.DeviceType.Fan,
+					require_err_msg.DeviceType.Climate,
+					require_err_msg.DeviceType.Thermostat,
+					require_err_msg.DeviceType.Humidifier,
+					require_err_msg.DeviceType.WaterHeater,
+					require_err_msg.DeviceType.MediaPlayer,
+					require_err_msg.DeviceType.Washer,
+					require_err_msg.DeviceType.Dryer,
+					require_err_msg.DeviceType.Dishwasher,
+					require_err_msg.DeviceType.Vacuum,
+					require_err_msg.DeviceType.LawnMower,
+					require_err_msg.DeviceType.PetFeeder
+				],
+				apply: "add",
+				vocabularyCap: "power-meter",
+				vocabularyStateField: "amps",
+				sources: [{
+					kind: "numeric",
+					requiredUnit: "A",
+					transformKinds: ["identity"],
+					transforms: [{ kind: "identity" }]
+				}],
+				sourceReport: { status: "assignment-status" },
+				advancedExpression: true,
+				path: "amps",
+				valueKind: "number",
+				nullable: false,
+				companions: [{
+					kind: "clock",
+					path: "lastFetchedAt",
+					when: "always"
+				}]
+			}
+		]
+	},
 	"running-state": {
 		version: 1,
 		targets: [{
@@ -80806,7 +81027,9 @@ var CAP_RUNTIME_FIELD_UNITS = {
 	"humidity-sensor": { percent: "%" },
 	"power-meter": {
 		watts: "W",
-		kwhTotal: "kWh"
+		kwhTotal: "kWh",
+		volts: "V",
+		amps: "A"
 	},
 	"temperature-sensor": { celsius: "°C" }
 };
@@ -80835,7 +81058,7 @@ function isLiteral(source, expr) {
 }
 //#endregion
 //#region src/composition/customize/event-compile.ts
-var catalog$4 = CAP_CUSTOMIZE_CATALOG;
+var catalog$5 = CAP_CUSTOMIZE_CATALOG;
 function compilePulseOverride(input) {
 	const target = catalogTarget$4(input.draft.cap, input.draft.targetId);
 	if (target === null || target.shape !== "pulse") return fail$2("target");
@@ -80967,7 +81190,7 @@ function sensorEntries(sources, device, modes) {
 	};
 }
 function catalogTarget$4(cap, targetId) {
-	const entry = catalog$4[cap];
+	const entry = catalog$5[cap];
 	if (entry === void 0) return null;
 	return entry.targets.find((target) => target.id === targetId) ?? null;
 }
@@ -81092,7 +81315,7 @@ function wrap$2(feature) {
 }
 //#endregion
 //#region src/composition/customize/scalar-compile.ts
-var catalog$3 = CAP_CUSTOMIZE_CATALOG;
+var catalog$4 = CAP_CUSTOMIZE_CATALOG;
 function compileScalarOverride(input) {
 	const target = catalogTarget$3(input.draft.cap, input.draft.targetId);
 	if (target === null || target.cardinality !== "scalar" || target.path === void 0) return fail$1("target");
@@ -81122,7 +81345,7 @@ function fail$1(reason) {
 	};
 }
 function catalogTarget$3(cap, targetId) {
-	const entry = catalog$3[cap];
+	const entry = catalog$4[cap];
 	if (entry === void 0) return null;
 	return entry.targets.find((target) => target.id === targetId) ?? null;
 }
@@ -81259,6 +81482,83 @@ function refOf$1(draft) {
 	};
 }
 //#endregion
+//#region src/composition/customize/scalar-merge.ts
+var catalog$3 = CAP_CUSTOMIZE_CATALOG;
+function scalarTargets(cap) {
+	return (catalog$3[cap]?.targets ?? []).filter((target) => target.cardinality === "scalar" && target.path !== void 0);
+}
+/** How many scalar targets the cap declares: above one, the cap's feature is shared. */
+function scalarTargetCount(cap) {
+	return scalarTargets(cap).length;
+}
+function valuePath(target) {
+	return target.path ?? target.id;
+}
+function ownedPaths(target) {
+	return [valuePath(target), ...(target.companions ?? []).map((companion) => companion.path)];
+}
+function find(cap, targetId) {
+	return scalarTargets(cap).find((target) => target.id === targetId) ?? null;
+}
+function without(fields, paths) {
+	return Object.fromEntries(Object.entries(fields).filter(([path]) => !paths.has(path)));
+}
+/**
+* The cap's feature with `compiled` (one target's own feature) merged in. A cap
+* with one scalar target is replaced whole, as before.
+*/
+function mergeScalarTarget(current, compiled, cap, targetId) {
+	const target = find(cap, targetId);
+	if (current === null || target === null || scalarTargetCount(cap) < 2) return compiled;
+	const kept = without(current.fields, new Set(ownedPaths(target)));
+	return {
+		...current,
+		...compiled,
+		fields: {
+			...kept,
+			...compiled.fields
+		}
+	};
+}
+/** The cap's feature without `targetId`'s paths; null when no target value is left. */
+function removeScalarTarget(current, cap, targetId) {
+	if (current === null) return null;
+	const target = find(cap, targetId);
+	if (target === null || scalarTargetCount(cap) < 2) return null;
+	const stillAssigned = scalarTargets(cap).filter((row) => row.id !== targetId).filter((row) => current.fields[valuePath(row)] !== void 0);
+	if (stillAssigned.length === 0) return null;
+	const needed = new Set(stillAssigned.flatMap((row) => ownedPaths(row)));
+	const drop = new Set(ownedPaths(target).filter((path) => !needed.has(path)));
+	return {
+		...current,
+		fields: without(current.fields, drop)
+	};
+}
+/**
+* The part of a stored feature one target owns — what a decode compares with
+* its recompiled feature. A cap with one target compares the whole feature.
+*/
+function ownedSlice(stored, cap, targetId) {
+	const target = find(cap, targetId);
+	if (target === null || scalarTargetCount(cap) < 2) return stored;
+	const owned = new Set(ownedPaths(target));
+	return {
+		...stored,
+		fields: Object.fromEntries(Object.entries(stored.fields).filter(([path]) => owned.has(path)))
+	};
+}
+/**
+* The stored feature as ONE target sees it: null when the cap's feature holds
+* only its neighbours' readings (no assignment of this target), else the whole
+* feature. A cap with one target sees what is stored.
+*/
+function targetFeature(stored, cap, targetId) {
+	if (stored === null) return null;
+	const target = find(cap, targetId);
+	if (target === null || scalarTargetCount(cap) < 2) return stored;
+	return stored.fields[valuePath(target)] === void 0 ? null : stored;
+}
+//#endregion
 //#region src/composition/customize/scalar-decode.ts
 var catalog$2 = CAP_CUSTOMIZE_CATALOG;
 function decodeScalarOverride(input) {
@@ -81369,7 +81669,7 @@ function reproduces$1(decoded, device, stored) {
 		sourceUnit: decoded.sourceUnit
 	});
 	if (!compiled.ok) return false;
-	return sameFeature$1(compiled.value, stored);
+	return sameFeature$1(compiled.value, ownedSlice(stored, decoded.draft.cap, decoded.draft.targetId));
 }
 function sameFeature$1(compiled, stored) {
 	return sameStored(wrap$1(withoutEnabled(compiled)), wrap$1(withoutEnabled(stored)));
@@ -119179,6 +119479,7 @@ exports.memoizePinnedFfmpeg = memoizePinnedFfmpeg;
 exports.mergeClipLabels = mergeClipLabels;
 exports.mergeKeyedArrayItem = mergeKeyedArrayItem;
 exports.mergeOverrides = mergeOverrides;
+exports.mergeScalarTarget = mergeScalarTarget;
 exports.mergeSecretStatePaths = require_sleep.mergeSecretStatePaths;
 exports.mergeSettingsBags = mergeSettingsBags;
 exports.mergeSourceInfo = mergeSourceInfo;
@@ -119245,6 +119546,7 @@ exports.optionalMethod = require_sleep.optionalMethod;
 exports.osdCapability = osdCapability;
 exports.osdManagerCapability = osdManagerCapability;
 exports.overlayClusterStepSettings = overlayClusterStepSettings;
+exports.ownedSlice = ownedSlice;
 exports.packagePickerItems = packagePickerItems;
 exports.paintHex = paintHex;
 exports.paletteEntryLabel = paletteEntryLabel;
@@ -119375,6 +119677,7 @@ exports.reducePoints = reducePoints;
 exports.reducerForActive = reducerForActive;
 exports.registerKnownSecret = require_sleep.registerKnownSecret;
 exports.remapCropDetections = remapCropDetections;
+exports.removeScalarTarget = removeScalarTarget;
 exports.renameAlarmProfile = renameAlarmProfile;
 exports.renderVocabPhrase = renderVocabPhrase;
 exports.replacedFieldKeys = replacedFieldKeys;
@@ -119463,6 +119766,7 @@ exports.runtimeStatePolicyFor = runtimeStatePolicyFor;
 exports.sameDoFamily = sameDoFamily;
 exports.sameHelperBody = sameHelperBody;
 exports.sameRead = sameRead;
+exports.scalarTargetCount = scalarTargetCount;
 exports.sceneMonitorCapability = sceneMonitorCapability;
 exports.scheduleForSendTimes = scheduleForSendTimes;
 exports.schemaDeclaresAnyField = require_sleep.schemaDeclaresAnyField;
@@ -119578,6 +119882,7 @@ exports.systemEventSummarySplitOf = systemEventSummarySplitOf;
 exports.systemFamilyOfKind = systemFamilyOfKind;
 exports.systemRuleKindOf = systemRuleKindOf;
 exports.tamperCapability = tamperCapability;
+exports.targetFeature = targetFeature;
 exports.taskLogEntrySchema = taskLogEntrySchema;
 exports.taskPhaseSchema = taskPhaseSchema;
 exports.taskTargetSchema = taskTargetSchema;