From c7cc130f97c2a0f390ba0e07e3aa048395636817 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 6 Dec 2025 13:25:28 -0400 Subject: data: concise-retouch remaining toplevel property descriptors --- src/data/things/flash.js | 51 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) (limited to 'src/data/things/flash.js') diff --git a/src/data/things/flash.js b/src/data/things/flash.js index efa99f36..738df937 100644 --- a/src/data/things/flash.js +++ b/src/data/things/flash.js @@ -1,6 +1,6 @@ export const FLASH_DATA_FILE = 'flashes.yaml'; -import {input} from '#composite'; +import {input, V} from '#composite'; import {sortFlashesChronologically} from '#sort'; import Thing from '#thing'; import {anyOf, isColor, isContentString, isDirectory, isNumber, isString} @@ -21,7 +21,6 @@ import {withPropertyFromObject} from '#composite/data'; import { exposeConstant, exposeDependency, - exposeDependencyOrContinue, exposeUpdateValueOrContinue, } from '#composite/control-flow'; @@ -99,12 +98,8 @@ export class Flash extends Thing { validate: input.value(isColor), }), - withPropertyFromObject({ - object: 'act', - property: input.value('color'), - }), - - exposeDependency({dependency: '#act.color'}), + withPropertyFromObject('act', V('color')), + exposeDependency('#act.color'), ], date: simpleDate(), @@ -153,21 +148,13 @@ export class Flash extends Thing { // Expose only - isFlash: [ - exposeConstant({ - value: input.value(true), - }), - ], + isFlash: exposeConstant(V(true)), commentatorArtists: commentatorArtists(), side: [ - withPropertyFromObject({ - object: 'act', - property: input.value('side'), - }), - - exposeDependency({dependency: '#act.side'}), + withPropertyFromObject('act', V('side')), + exposeDependency('#act.side'), ], }); @@ -297,18 +284,8 @@ export class FlashAct extends Thing { validate: input.value(isContentString), }), - withPropertyFromObject({ - object: 'side', - property: input.value('listTerminology'), - }), - - exposeDependencyOrContinue({ - dependency: '#side.listTerminology', - }), - - exposeConstant({ - value: input.value(null), - }), + withPropertyFromObject('side', V('listTerminology')), + exposeDependency('#side.listTerminology'), ], flashes: thingList({ @@ -322,11 +299,7 @@ export class FlashAct extends Thing { // Expose only - isFlashAct: [ - exposeConstant({ - value: input.value(true), - }), - ], + isFlashAct: exposeConstant(V(true)), }); static [Thing.findSpecs] = { @@ -381,11 +354,7 @@ export class FlashSide extends Thing { // Expose only - isFlashSide: [ - exposeConstant({ - value: input.value(true), - }), - ], + isFlashSide: exposeConstant(V(true)), }); static [Thing.yamlDocumentSpec] = { -- cgit 1.3.0-6-gf8a5