@siegesailor/terminal-sigma 1.4.1 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,20 +1,36 @@
1
1
  import React from "react";
2
- import { Box, Text, useAnimation } from "ink";
3
- import { composeScene, intervalOf, paletteOf, toSegments, } from "../pixel-art.js";
2
+ import { Box, Text } from "ink";
3
+ import { advance, composeScene, frameMilliseconds, paletteOf, startMotion, toSegments, } from "../pixel-art.js";
4
4
  import { spinnerFrames, usePalette } from "../theme.js";
5
- export default function Character({ name, level, levelNumber, activity, look, mood, badges, label, width, }) {
5
+ export default function Character({ name, level, levelNumber, activity, look, mood, label, width, }) {
6
6
  const palette = usePalette();
7
- const { frame } = useAnimation({ interval: intervalOf(activity) });
8
7
  // Border and padding take 4 columns; the rest is the stage it roams.
8
+ const stage = width - 4;
9
+ const [motion, step] = React.useReducer((state, wanted) => advance(state, wanted, stage), undefined, () => startMotion(activity, mood, stage));
10
+ // The timer reads what is wanted now, and the motion decides when to
11
+ // switch, so an animation finishes where it began before the next starts.
12
+ const wanted = React.useRef({ activity, mood });
13
+ React.useEffect(() => {
14
+ wanted.current = { activity, mood };
15
+ }, [activity, mood]);
16
+ React.useEffect(() => {
17
+ const timer = setInterval(() => {
18
+ step(wanted.current);
19
+ }, frameMilliseconds);
20
+ return () => {
21
+ clearInterval(timer);
22
+ };
23
+ }, []);
9
24
  const lines = toSegments(composeScene({
10
- activity,
11
- counter: frame,
25
+ activity: motion.activity,
26
+ counter: motion.tick,
27
+ anchor: motion.anchor,
12
28
  level: levelNumber,
13
29
  look,
14
- mood,
15
- badges,
16
- width: width - 4,
30
+ mood: motion.mood,
31
+ width: stage,
17
32
  }), paletteOf(palette));
33
+ const spinner = Math.floor(motion.tick / 2) % spinnerFrames.length;
18
34
  return (React.createElement(Box, { borderColor: palette.border, borderStyle: "round", flexDirection: "column", flexShrink: 0, paddingX: 1, width: width },
19
35
  React.createElement(Box, { gap: 1, justifyContent: "space-between" },
20
36
  React.createElement(Text, { bold: true, wrap: "truncate-end" }, name),
@@ -25,6 +41,6 @@ export default function Character({ name, level, levelNumber, activity, look, mo
25
41
  // eslint-disable-next-line react/no-array-index-key
26
42
  key: column, backgroundColor: segment.backgroundColor, color: segment.color }, segment.text))))))),
27
43
  React.createElement(Box, { marginTop: 1 },
28
- React.createElement(Text, { color: palette.accent, wrap: "truncate-end" }, `${spinnerFrames[frame % spinnerFrames.length] ?? "·"} ${label}`))));
44
+ React.createElement(Text, { color: palette.accent, wrap: "truncate-end" }, `${spinnerFrames[spinner] ?? "·"} ${label}`))));
29
45
  }
30
46
  //# sourceMappingURL=character.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"character.js","sourceRoot":"","sources":["../../source/components/character.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAE9C,OAAO,EAGN,YAAY,EACZ,UAAU,EAEV,SAAS,EACT,UAAU,GACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAcxD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EACjC,IAAI,EACJ,KAAK,EACL,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,KAAK,EACL,KAAK,GACW;IAChB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnE,qEAAqE;IACrE,MAAM,KAAK,GAAG,UAAU,CACvB,YAAY,CAAC;QACZ,QAAQ;QACR,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,WAAW;QAClB,IAAI;QACJ,IAAI;QACJ,MAAM;QACN,KAAK,EAAE,KAAK,GAAG,CAAC;KAChB,CAAC,EACF,SAAS,CAAC,OAAO,CAAC,CAClB,CAAC;IAEF,OAAO,CACN,oBAAC,GAAG,IACH,WAAW,EAAE,OAAO,CAAC,MAAM,EAC3B,WAAW,EAAC,OAAO,EACnB,aAAa,EAAC,QAAQ,EACtB,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,KAAK,EAAE,KAAK;QAEZ,oBAAC,GAAG,IAAC,GAAG,EAAE,CAAC,EAAE,cAAc,EAAC,eAAe;YAC1C,oBAAC,IAAI,IAAC,IAAI,QAAC,IAAI,EAAC,cAAc,IAC5B,IAAI,CACC;YACP,oBAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,IAAG,KAAK,CAAQ,CACtC;QACN,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAC,UAAU,IAChE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAGzB,oBAAC,GAAG,IAAC,GAAG,EAAE,GAAG,IACX,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAC9B,oBAAC,IAAI;QACJ,oDAAoD;;YAApD,oDAAoD;YACpD,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,OAAO,CAAC,eAAe,EACxC,KAAK,EAAE,OAAO,CAAC,KAAK,IAEnB,OAAO,CAAC,IAAI,CACP,CACP,CAAC,CACG,CACN,CAAC,CACG;QACN,oBAAC,GAAG,IAAC,SAAS,EAAE,CAAC;YAChB,oBAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAC,cAAc,IAC9C,GAAG,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE,CAC3D,CACF,CACD,CACN,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"character.js","sourceRoot":"","sources":["../../source/components/character.tsx"],"names":[],"mappings":"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"}
@@ -33,12 +33,17 @@ export default function Choice({ options, onSelect, onFocus, initialValue, isAct
33
33
  }, { isActive });
34
34
  return (React.createElement(Box, { flexDirection: "column" }, options.map((option, optionIndex) => {
35
35
  const isFocused = optionIndex === index;
36
- return (React.createElement(Box, { key: option.value, gap: 1 },
37
- React.createElement(Text, { color: palette.accent }, isFocused ? "❯" : " "),
38
- React.createElement(Text, { bold: isFocused, color: isFocused ? palette.accent : undefined }, isNumbered
39
- ? `${optionIndex + 1}. ${option.label}`
40
- : option.label),
41
- option.hint));
36
+ const heading = option.group && option.group !== options[optionIndex - 1]?.group
37
+ ? option.group
38
+ : undefined;
39
+ return (React.createElement(Box, { key: option.value, flexDirection: "column" },
40
+ heading ? (React.createElement(Text, { bold: true, color: palette.soft }, heading)) : null,
41
+ React.createElement(Box, { gap: 1 },
42
+ React.createElement(Text, { color: palette.accent }, isFocused ? "❯" : " "),
43
+ React.createElement(Text, { bold: isFocused, color: isFocused ? palette.accent : undefined }, isNumbered
44
+ ? `${optionIndex + 1}. ${option.label}`
45
+ : option.label),
46
+ option.hint)));
42
47
  })));
43
48
  }
44
49
  //# sourceMappingURL=choice.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"choice.js","sourceRoot":"","sources":["../../source/components/choice.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"choice.js","sourceRoot":"","sources":["../../source/components/choice.tsx"],"names":[],"mappings":"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"}
@@ -35,6 +35,7 @@ export default function EntryForm({ title, fields, messages, onSubmit, onValues,
35
35
  return;
36
36
  }
37
37
  if (field.kind === "number" &&
38
+ !(field.optional && !value.trim()) &&
38
39
  parseWholeNumber(value, field.minimum, field.maximum) === undefined) {
39
40
  setError(messages.form.wholeNumber(field.minimum, field.maximum));
40
41
  return;
@@ -46,9 +47,10 @@ export default function EntryForm({ title, fields, messages, onSubmit, onValues,
46
47
  };
47
48
  const shown = (done) => {
48
49
  const value = values[done.key] ?? "";
49
- return done.kind === "select"
50
- ? (done.options.find((option) => option.value === value)?.label ?? value)
51
- : value;
50
+ if (done.kind === "select") {
51
+ return (done.options.find((option) => option.value === value)?.label ?? value);
52
+ }
53
+ return value || "–";
52
54
  };
53
55
  const defaultOf = (current) => defaults[current.key] ?? current.defaultValue;
54
56
  const input = (current) => {
@@ -1 +1 @@
1
- {"version":3,"file":"entry-form.js","sourceRoot":"","sources":["../../source/components/entry-form.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entry-form.js","sourceRoot":"","sources":["../../source/components/entry-form.tsx"],"names":[],"mappings":"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"}
package/build/content.js CHANGED
@@ -4,15 +4,18 @@ import { formatNumber, genders, healthGoals, intensities, languages, messagesOf,
4
4
  import { dailyGoals, experienceOf, experiencePerLevel, todayOf, } from "./progress.js";
5
5
  import { quoteCategories, quoteIntervals, quoteModes, } from "./quotes.js";
6
6
  import { themeNames } from "./theme.js";
7
+ import { isNewer } from "./update.js";
7
8
  export const characterWidth = 36;
8
- export const menuListWidth = 24;
9
- // Header and footer take 5 rows. The pet's panel is 19 rows tall, Today 19
10
- // with its spacing or 16 compact, the menu 9, and Recent 7.
9
+ export const menuListWidth = 26;
10
+ // Header and footer take 5 rows. The character's panel is 25 rows tall,
11
+ // Today 19 with its spacing or 16 compact, the menu 15 with its 4 headings,
12
+ // and Recent 7.
11
13
  const chromeRows = 5;
12
- const characterRows = 19;
14
+ const characterRows = 25;
13
15
  const todayRows = 19;
14
16
  const compactTodayRows = 16;
15
- const menuRows = 9;
17
+ const menuRows = 15;
18
+ const compactMenuRows = 11;
16
19
  const recentRows = 7;
17
20
  // The description beside the menu list needs at least this many columns.
18
21
  const descriptionColumns = 36;
@@ -20,6 +23,9 @@ const descriptionColumns = 36;
20
23
  // space allows.
21
24
  export function layoutOf(columns, rows) {
22
25
  const isSplitAt = (panelWidth) => panelWidth >= menuListWidth + descriptionColumns;
26
+ // Short terminals drop the group headings to keep Recent in view.
27
+ const isMenuGrouped = rows >= chromeRows + menuRows + recentRows;
28
+ const listRows = isMenuGrouped ? menuRows : compactMenuRows;
23
29
  if (columns >= 120) {
24
30
  const todayWidth = Math.min(Math.max(Math.floor((columns - characterWidth) * 0.4), 40), 56);
25
31
  const panelWidth = columns - characterWidth - todayWidth;
@@ -27,8 +33,9 @@ export function layoutOf(columns, rows) {
27
33
  panelWidth,
28
34
  todayWidth,
29
35
  isMenuSplit: isSplitAt(panelWidth),
36
+ isMenuGrouped,
30
37
  showCharacter: true,
31
- showRecent: rows >= chromeRows + menuRows + recentRows,
38
+ showRecent: rows >= chromeRows + listRows + recentRows,
32
39
  showToday: true,
33
40
  isTodayCompact: rows < chromeRows + todayRows,
34
41
  todayBeside: true,
@@ -38,11 +45,12 @@ export function layoutOf(columns, rows) {
38
45
  if (columns >= 80) {
39
46
  const panelWidth = columns - characterWidth;
40
47
  const isMenuSplit = isSplitAt(panelWidth);
41
- const menuHeight = isMenuSplit ? menuRows : menuRows * 2;
48
+ const menuHeight = isMenuSplit ? listRows : listRows * 2;
42
49
  return {
43
50
  panelWidth,
44
51
  todayWidth: columns,
45
52
  isMenuSplit,
53
+ isMenuGrouped,
46
54
  showCharacter: true,
47
55
  showRecent: rows >= chromeRows + menuHeight + recentRows,
48
56
  showToday: rows >= chromeRows + characterRows + compactTodayRows,
@@ -52,12 +60,13 @@ export function layoutOf(columns, rows) {
52
60
  };
53
61
  }
54
62
  const isMenuSplit = isSplitAt(columns);
55
- const menuHeight = isMenuSplit ? menuRows : menuRows * 2;
63
+ const menuHeight = isMenuSplit ? listRows : listRows * 2;
56
64
  const aboveToday = chromeRows + menuHeight + recentRows + characterRows;
57
65
  return {
58
66
  panelWidth: columns,
59
67
  todayWidth: columns,
60
68
  isMenuSplit,
69
+ isMenuGrouped,
61
70
  showCharacter: rows >= aboveToday,
62
71
  showRecent: rows >= chromeRows + menuHeight + recentRows,
63
72
  showToday: rows >= aboveToday + compactTodayRows,
@@ -123,74 +132,127 @@ export function sectionsOf(language, palette, progress, now) {
123
132
  },
124
133
  ];
125
134
  }
126
- // Today's logs set the pet's mood: asleep until something is logged, happy
127
- // once the targets are met.
128
- export function petStateOf(progress, now) {
135
+ // Today's logs set the character's mood: dozing until something is logged,
136
+ // happy once the targets are met.
137
+ export function moodOf(progress, now) {
129
138
  const today = todayOf(progress, now);
130
139
  const targets = targetsOf(progress.profile);
131
- const badges = {
132
- meal: today.meals > 0,
133
- workout: today.workoutMinutes > 0,
134
- focus: today.focusSessions > 0,
135
- };
136
140
  const isMet = (today.protein >= targets.protein &&
137
141
  today.workoutMinutes >= targets.workoutMinutes) ||
138
142
  today.focusSessions >= dailyGoals.focusSessions;
139
- let mood = "content";
140
- if (!badges.meal && !badges.workout && !badges.focus) {
141
- mood = "sleepy";
142
- }
143
- else if (isMet) {
144
- mood = "happy";
143
+ if (today.meals === 0 &&
144
+ today.workoutMinutes === 0 &&
145
+ today.focusSessions === 0) {
146
+ return "sleepy";
145
147
  }
146
- return { mood, badges };
148
+ return isMet ? "happy" : "content";
147
149
  }
148
150
  export const menuOrder = [
149
- "quotes",
150
151
  "timer",
151
- "health",
152
- "logs",
152
+ "diet",
153
+ "workout",
154
+ "quotes",
153
155
  "profile",
154
156
  "theme",
155
157
  "language",
158
+ "logs",
159
+ "update",
156
160
  ];
161
+ // The headings the menu is grouped under; they only label, never open.
162
+ export const menuGroups = {
163
+ timer: "actions",
164
+ diet: "health",
165
+ workout: "health",
166
+ quotes: "settings",
167
+ profile: "settings",
168
+ theme: "settings",
169
+ language: "settings",
170
+ logs: "system",
171
+ update: "system",
172
+ };
157
173
  export function menuEntriesOf(messages, state) {
158
174
  const { profile } = state.progress;
159
- const proteinLeft = targetsOf(profile).protein - todayOf(state.progress, state.now).protein;
160
- let healthStatus = messages.signal.setUp;
161
- if (profile) {
162
- healthStatus =
163
- proteinLeft > 0
164
- ? messages.signal.proteinLeft(proteinLeft)
165
- : messages.signal.onTrack;
166
- }
175
+ const targets = targetsOf(profile);
176
+ const today = todayOf(state.progress, state.now);
177
+ const proteinLeft = targets.protein - today.protein;
178
+ const minutesLeft = targets.workoutMinutes - today.workoutMinutes;
167
179
  const statuses = {
168
180
  quotes: state.quotes.autoRefresh
169
181
  ? messages.signal.quotesAuto(messages.quotes.intervals(state.quotes.interval))
170
182
  : messages.signal.quotesManual,
171
183
  timer: state.timerSignal,
172
- health: healthStatus,
184
+ diet: proteinLeft > 0
185
+ ? messages.signal.proteinLeft(proteinLeft)
186
+ : messages.signal.onTrack,
187
+ workout: minutesLeft > 0
188
+ ? messages.signal.minutesLeft(minutesLeft)
189
+ : messages.signal.onTrack,
173
190
  logs: messages.signal.entries(state.logs),
174
191
  profile: profile?.name ?? messages.signal.setUp,
175
192
  theme: messages.themes.names[state.theme],
176
193
  language: messages.languageName,
194
+ update: state.newest && isNewer(state.newest, state.version)
195
+ ? messages.signal.updateAvailable(state.newest)
196
+ : messages.signal.version(state.version),
177
197
  };
178
198
  const descriptions = {
179
199
  quotes: messages.describe.quotes,
180
200
  timer: messages.describe.timer(state.focus, state.rest),
181
- health: messages.describe.health,
201
+ diet: messages.describe.diet,
202
+ workout: messages.describe.workout,
182
203
  logs: messages.describe.logs,
183
204
  profile: messages.describe.profile,
184
205
  theme: messages.describe.theme,
185
206
  language: messages.describe.language,
207
+ update: messages.describe.update,
186
208
  };
187
209
  return menuOrder.map((key) => ({
188
210
  key,
211
+ group: messages.groups[menuGroups[key]],
189
212
  label: messages.menu[key],
190
213
  status: statuses[key],
191
214
  description: descriptions[key],
192
215
  }));
193
216
  }
217
+ // The status line and the options of the Software Update view.
218
+ export function updateViewOf(messages, release, updater) {
219
+ const { update } = messages;
220
+ const newest = release.newest ?? updater.current;
221
+ const back = { label: update.back, value: "back" };
222
+ const check = { label: update.check, value: "check" };
223
+ const install = { label: update.install(newest), value: "install" };
224
+ switch (release.phase) {
225
+ case "checking": {
226
+ return { status: update.checking, options: [back] };
227
+ }
228
+ case "checkFailed": {
229
+ return {
230
+ status: update.checkFailed(release.error ?? ""),
231
+ options: [check, back],
232
+ };
233
+ }
234
+ case "installing": {
235
+ return { status: update.installing(newest), options: [] };
236
+ }
237
+ case "installed": {
238
+ return {
239
+ status: update.installed(newest),
240
+ options: [{ label: update.restart, value: "restart" }, back],
241
+ };
242
+ }
243
+ case "installFailed": {
244
+ return {
245
+ status: update.installFailed(release.error ?? ""),
246
+ options: [install, back],
247
+ };
248
+ }
249
+ case "ready": {
250
+ return isNewer(newest, updater.current)
251
+ ? { status: update.newest(newest), options: [install, back] }
252
+ : { status: update.upToDate(newest), options: [check, back] };
253
+ }
254
+ }
255
+ }
194
256
  const categoriesLabel = (messages, categories, empty) => categories.length === 0
195
257
  ? empty
196
258
  : categories
@@ -394,6 +456,15 @@ export const profileFieldsOf = (messages, profile, name) => [
394
456
  maximum: 300,
395
457
  defaultValue: profile ? String(profile.weight) : undefined,
396
458
  },
459
+ {
460
+ key: "bodyFat",
461
+ label: messages.form.bodyFat,
462
+ kind: "number",
463
+ minimum: 3,
464
+ maximum: 60,
465
+ optional: true,
466
+ defaultValue: profile?.bodyFat === undefined ? undefined : String(profile.bodyFat),
467
+ },
397
468
  {
398
469
  key: "gender",
399
470
  label: messages.form.gender,
@@ -1 +1 @@
1
- {"version":3,"file":"content.js","sourceRoot":"","sources":["../source/content.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content.js","sourceRoot":"","sources":["../source/content.ts"],"names":[],"mappings":"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"}
package/build/health.js CHANGED
@@ -48,8 +48,11 @@ export function targetsOf(profile) {
48
48
  if (!profile) {
49
49
  return defaultTargets;
50
50
  }
51
- const { weight, height, age, gender, workStyle, goal } = profile;
52
- const restingCalories = 10 * weight + 6.25 * height - 5 * age + genderConstant[gender];
51
+ const { weight, height, age, gender, workStyle, goal, bodyFat } = profile;
52
+ // Katch-McArdle from lean mass when body fat is known, else Mifflin-St Jeor.
53
+ const restingCalories = bodyFat === undefined
54
+ ? 10 * weight + 6.25 * height - 5 * age + genderConstant[gender]
55
+ : 370 + 21.6 * weight * (1 - bodyFat / 100);
53
56
  const calories = restingCalories * activityFactor[workStyle] + calorieShift[goal];
54
57
  const proteinRate = Math.min(proteinPerKilogram[goal] + proteinForWork[workStyle], 2.2);
55
58
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"health.js","sourceRoot":"","sources":["../source/health.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"health.js","sourceRoot":"","sources":["../source/health.ts"],"names":[],"mappings":"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"}