@optolith/entity-descriptions 0.4.26 → 0.6.0

package/lib/entities/partial/units/timeSpan.js

@@ -1,5 +1,6 @@
 import { Reader } from "@elyukai/utils/reader";
 import { responsive } from "../responsiveText.js";
+import { MISSING_VALUE } from "../unknown.js";
 // prettier-ignore
 const timeSpanUnitTranslationKeys = {
     Seconds: [".input {$value :number} .input {$style :string} {{{$value} seconds}}", "{$value} seconds", ".input {$value :number} .input {$style :string} {{{$value} s}}", "{$value} s"],
@@ -19,7 +20,20 @@ const timeSpanUnitTranslationKeys = {
 /**
  * Returns the text for a time span unit.
  */
-export const formatTimeSpan = (translate, responsiveTextSize, unit, value, interval = false) => {
+export const formatTimeSpan = (translate, translateMap, format, responsiveTextSize, unit, value, interval = false) => {
+    if (typeof unit === "object" && unit.kind === "Custom") {
+        const translation = translateMap(unit.Custom.translations);
+        if (translation === undefined) {
+            return MISSING_VALUE;
+        }
+        return responsive(responsiveTextSize, () => format(typeof value === "number" ? translation.fullNumber : translation.full, {
+            value,
+            style: interval ? "interval" : "default",
+        }), () => format(typeof value === "number" ? translation.compressedNumber : translation.compressed, {
+            value,
+            style: interval ? "interval" : "default",
+        }));
+    }
     const [fullNumberKey, fullKey, compressedNumberKey, compressedKey] = timeSpanUnitTranslationKeys[typeof unit === "string" ? unit : unit.kind];
     return responsive(responsiveTextSize, () => translate(typeof value === "number" ? fullNumberKey : fullKey, {
         value,
@@ -32,11 +46,11 @@ export const formatTimeSpan = (translate, responsiveTextSize, unit, value, inter
 /**
  * Returns the text for a time span unit.
  */
-export const formatCombinedTimeSpan = (translate, responsiveTextSize, object, interval = false) => formatTimeSpan(translate, responsiveTextSize, object.unit, object.value, interval);
+export const formatCombinedTimeSpan = (translate, translateMap, format, responsiveTextSize, object, interval = false) => formatTimeSpan(translate, translateMap, format, responsiveTextSize, object.unit, object.value, interval);
 /**
  * Returns the text for a time span unit.
  */
-export const formatTimeSpanR = (unit, value, interval) => Reader.asks(({ translate, responsiveTextSize }) => formatTimeSpan(translate, responsiveTextSize, unit, value, interval));
+export const formatTimeSpanR = (unit, value, interval) => Reader.asks(({ translate, translateMap, format, responsiveTextSize }) => formatTimeSpan(translate, translateMap, format, responsiveTextSize, unit, value, interval));
 /**
  * Returns the text for a time span unit.
  */

package/lib/entities/poison.js

@@ -42,7 +42,7 @@ const renderLevel = (translate, translateMap, level) => {
             return assertExhaustive(level);
     }
 };
-const renderAddiction = (translate, translateMap, getInstanceById, addiction) => [
+const renderAddiction = (translate, translateMap, format, getInstanceById, addiction) => [
     ensureNonEmpty([
         mapNullable(renderChance(translate, translateMap, addiction), chance => chance +
             parensIf(addiction.check === undefined
@@ -60,7 +60,7 @@ const renderAddiction = (translate, translateMap, getInstanceById, addiction) =>
     ].filter(isNotNullish))?.join(", "),
     mapNullable(addiction.withdrawalPrevention, withdrawalPrevention => translate(".input {$value :number} {{{$value} applications every {$interval}}}", {
         value: withdrawalPrevention.amount,
-        interval: formatTimeSpan(translate, ResponsiveTextSize.Full, { kind: "Days" }, (() => {
+        interval: formatTimeSpan(translate, translateMap, format, ResponsiveTextSize.Full, { kind: "Days" }, (() => {
             switch (withdrawalPrevention.interval.kind) {
                 case "Constant":
                     return withdrawalPrevention.interval.Constant.value;
@@ -74,7 +74,7 @@ const renderAddiction = (translate, translateMap, getInstanceById, addiction) =>
 ]
     .filter(isNotNullish)
     .join("; ");
-const renderIntoxicantValues = (translate, translateMap, getInstanceById, intoxicant) => {
+const renderIntoxicantValues = (translate, translateMap, format, getInstanceById, intoxicant) => {
     const translation = translateMap(intoxicant.translations);
     return {
         ingestion: translation?.ingestion ?? MISSING_VALUE,
@@ -84,10 +84,10 @@ const renderIntoxicantValues = (translate, translateMap, getInstanceById, intoxi
         special: translation?.special,
         addiction: intoxicant.addiction === undefined
             ? undefined
-            : renderAddiction(translate, translateMap, getInstanceById, intoxicant.addiction),
+            : renderAddiction(translate, translateMap, format, getInstanceById, intoxicant.addiction),
     };
 };
-const renderSourceTypeBasedValues = (translate, translateMap, getInstanceById, sourceType) => {
+const renderSourceTypeBasedValues = (translate, translateMap, format, getInstanceById, sourceType) => {
     switch (sourceType.kind) {
         case "AnimalVenom":
             return {
@@ -112,7 +112,7 @@ const renderSourceTypeBasedValues = (translate, translateMap, getInstanceById, s
                     .join(", "),
                 ...(sourceType.AlchemicalPoison.intoxicant === undefined
                     ? undefined
-                    : renderIntoxicantValues(translate, translateMap, getInstanceById, sourceType.AlchemicalPoison.intoxicant)),
+                    : renderIntoxicantValues(translate, translateMap, format, getInstanceById, sourceType.AlchemicalPoison.intoxicant)),
                 typicalIngredients: translation?.typical_ingredients.join(", "),
                 priceOfIngedientsPerLevel: translate("{$cost} per level", {
                     cost: translate(".input {$value :number} {{{$value} silverthalers}}", {
@@ -144,7 +144,7 @@ const renderSourceTypeBasedValues = (translate, translateMap, getInstanceById, s
                 sourceType: translate("plant poison"),
                 ...(sourceType.PlantPoison.intoxicant === undefined
                     ? undefined
-                    : renderIntoxicantValues(translate, translateMap, getInstanceById, sourceType.PlantPoison.intoxicant)),
+                    : renderIntoxicantValues(translate, translateMap, format, getInstanceById, sourceType.PlantPoison.intoxicant)),
             };
         case "DemonicPoison": {
             const translation = translateMap(sourceType.DemonicPoison.translations);
@@ -241,13 +241,13 @@ const renderValueCost = (translate, translateMap, cost, value) => value === unde
  * Get a JSON representation of the rules text for a poison.
  */
 export const getPoisonEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getResolvedSelectOptionById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap, join: localeJoin, compare: localeCompare } = locale;
+    const { translate, translateMap, format, join: localeJoin, compare: localeCompare } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
     }
     const applicationType = renderApplicationType(translate, localeJoin, localeCompare, entry.application_type);
-    const { level, sourceType, ingestion, sideEffect, overdose, legality, special, addiction, typicalIngredients, priceOfIngedientsPerLevel, laboratory, brewingDifficulty, prerequisitesBrewingProcess, tradeSecret, note, } = renderSourceTypeBasedValues(translate, translateMap, getInstanceById, entry.source_type);
+    const { level, sourceType, ingestion, sideEffect, overdose, legality, special, addiction, typicalIngredients, priceOfIngedientsPerLevel, laboratory, brewingDifficulty, prerequisitesBrewingProcess, tradeSecret, note, } = renderSourceTypeBasedValues(translate, translateMap, format, getInstanceById, entry.source_type);
     return {
         title: translation.name,
         className: "poison",

package/lib/entities/profession.js

@@ -471,25 +471,27 @@ const renderRestrictedBlessings = (restrictedBlessings) => {
             return assertExhaustive(restrictedBlessings);
     }
 };
-const renderSingleBlessings = (traditions) => Reader.traverse(traditions, traditionId => getInstanceByIdR("BlessedTradition", traditionId).map(tradition => tradition
-    ? { restrictedBlessings: tradition.restricted_blessings, type: tradition.type }
-    : undefined)).thenW(restrictedBlessingsList => !isNotEmpty(restrictedBlessingsList)
+const renderSingleBlessings = (traditions) => Reader.traverse(traditions, traditionId => getInstanceByIdR("BlessedTradition", traditionId).map(tradition => tradition?.type))
+    .map(traditionTypes => traditionTypes.filter(isNotNullish))
+    .thenW(traditionTypes => !isNotEmpty(traditionTypes)
     ? Reader.of(undefined)
-    : restrictedBlessingsList.length === 1
+    : traditionTypes.length === 1
         ? (() => {
-            const [first] = restrictedBlessingsList;
-            const { restrictedBlessings, type } = first ?? {};
-            return type?.kind === "Shamanistic"
-                ? Reader.of(undefined)
-                : restrictedBlessings === undefined
-                    ? translateR("The Twelve Blessings")
-                    : translateR("The Twelve Blessings").thenW(base => renderRestrictedBlessings(restrictedBlessings).thenW(list => translateR("except for {$list :list type=conjunction}", {
-                        list,
-                    }).map(note => base + parensIf(note))));
+            const [first] = traditionTypes;
+            if (first.kind === "Shamanistic") {
+                return Reader.of(undefined);
+            }
+            const { restrictedBlessings } = first.Church;
+            return restrictedBlessings === undefined
+                ? translateR("The Twelve Blessings")
+                : translateR("The Twelve Blessings").thenW(base => renderRestrictedBlessings(restrictedBlessings).thenW(list => translateR("except for {$list :list type=conjunction}", {
+                    list,
+                }).map(note => base + parensIf(note))));
         })()
-        : restrictedBlessingsList.every(trad => trad?.type.kind === "Shamanistic")
+        : traditionTypes.every(trad => trad.kind === "Shamanistic")
             ? Reader.of(undefined)
-            : restrictedBlessingsList.some(trad => trad?.restrictedBlessings !== undefined || trad?.type.kind === "Shamanistic")
+            : traditionTypes.some(trad => (trad.kind === "Church" && trad.Church.restrictedBlessings !== undefined) ||
+                trad.kind === "Shamanistic")
                 ? translateR("The Twelve Blessings").map2(translateR("depends on selected tradition"), (base, note) => base + parensIf(note))
                 : translateR("The Twelve Blessings"));
 const renderBlessings = (traditions) => {

package/lib/entities/spell.js

@@ -14,7 +14,7 @@ import { renderEnhancements } from "./partial/enhancements.js";
 import { attributedCustomName, attributedName } from "./partial/markdown.js";
 import { printAnimistPowerPrerequisites, printGeodeRitualPrerequisites, } from "./partial/prerequisites/index.js";
 import { renderCastingTime, renderFastSkillNonModifiableCastingTime, renderSlowSkillNonModifiableCastingTime, } from "./partial/rated/activatable/castingTime.js";
-import { renderMagicalActionCost, renderModifiableOneTimeCost, renderNonModifiableOneTimeCost, renderNonModifiableSustainedCost, renderOneTimeCostMap, } from "./partial/rated/activatable/cost.js";
+import { renderMagicalActionCost, renderModifiableOneTimeCost, renderNonModifiableOneTimeCost, renderNonModifiableSustainedCost, renderStandaloneCostMap, } from "./partial/rated/activatable/cost.js";
 import { renderExpressionBasedDuration, renderMusicDuration, renderOneTimeDuration, renderSustainedDuration, } from "./partial/rated/activatable/duration.js";
 import { renderEffect } from "./partial/rated/activatable/effect.js";
 import { combineGeneratedTextWithStaticTranslation, renderFastPerformanceParameters, renderSlowOneTimePerformanceParameters, renderSlowPerformanceParameters, } from "./partial/rated/activatable/index.js";
@@ -57,7 +57,7 @@ const getTraditionNameForArcaneSpellworksById = (id, getInstanceById, translateM
  * Get a JSON representation of the rules text for a cantrip.
  */
 export const getCantripEntityDescription = createEntityDescriptionCreator(({ getInstanceById }, locale, { content: entry }) => {
-    const { translate, translateMap, compare: localeCompare } = locale;
+    const { translate, translateMap, format, compare: localeCompare } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -65,6 +65,7 @@ export const getCantripEntityDescription = createEntityDescriptionCreator(({ get
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         responsiveTextSize: ResponsiveTextSize.Full,
     };
@@ -128,7 +129,7 @@ export const getCantripEntityDescription = createEntityDescriptionCreator(({ get
  * Get a JSON representation of the rules text for a skill.
  */
 export const getSpellEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId, idMap }, locale, { content: entry, entity, id }, options) => {
-    const { translate, translateMap, compare: localeCompare } = locale;
+    const { translate, translateMap, format, compare: localeCompare } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -136,6 +137,7 @@ export const getSpellEntityDescription = createEntityDescriptionCreator(({ getIn
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         getChildInstancesForInstanceId,
         localeJoin: locale.join,
@@ -186,7 +188,7 @@ export const getSpellEntityDescription = createEntityDescriptionCreator(({ getIn
  * Get a JSON representation of the rules text for a ritual.
  */
 export const getRitualEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId, idMap }, locale, { content: entry, entity, id }, options) => {
-    const { translate, translateMap, compare: localeCompare } = locale;
+    const { translate, translateMap, format, compare: localeCompare } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -194,6 +196,7 @@ export const getRitualEntityDescription = createEntityDescriptionCreator(({ getI
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         getChildInstancesForInstanceId,
         localeJoin: locale.join,
@@ -244,7 +247,7 @@ export const getRitualEntityDescription = createEntityDescriptionCreator(({ getI
  * Get a JSON representation of the rules text for a curse.
  */
 export const getCurseEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -252,6 +255,7 @@ export const getCurseEntityDescription = createEntityDescriptionCreator(({ getIn
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -293,7 +297,7 @@ const renderMagicalActionSkill = (skill) => Reader.asks(({ translate, translateM
  * Get a JSON representation of the rules text for an Elven magical song.
  */
 export const getElvenMagicalSongEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -301,6 +305,7 @@ export const getElvenMagicalSongEntityDescription = createEntityDescriptionCreat
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         localeCompare: locale.compare,
@@ -332,7 +337,7 @@ export const getElvenMagicalSongEntityDescription = createEntityDescriptionCreat
  * Get a JSON representation of the rules text for a domination ritual.
  */
 export const getDominationRitualEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -340,6 +345,7 @@ export const getDominationRitualEntityDescription = createEntityDescriptionCreat
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         speed: Speed.Slow,
         energyUnit: "ArcaneEnergy",
@@ -381,7 +387,7 @@ const renderMusicTradition = (translate, translateMap, localeCompare, getInstanc
  * Get a JSON representation of the rules text for a magical dance.
  */
 export const getMagicalDanceEntityDescription = createEntityDescriptionCreator(({ getInstanceById }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -389,6 +395,7 @@ export const getMagicalDanceEntityDescription = createEntityDescriptionCreator((
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -421,7 +428,7 @@ export const getMagicalDanceEntityDescription = createEntityDescriptionCreator((
  * Get a JSON representation of the rules text for a magical melody.
  */
 export const getMagicalMelodyEntityDescription = createEntityDescriptionCreator(({ getInstanceById }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -429,6 +436,7 @@ export const getMagicalMelodyEntityDescription = createEntityDescriptionCreator(
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeCompare: locale.compare,
         localeJoin: locale.join,
@@ -495,7 +503,7 @@ const renderFamiliarsTrickPerformanceParameters = (params) => {
  * Get a JSON representation of the rules text for a familiar’s trick.
  */
 export const getFamiliarsTrickEntityDescription = createEntityDescriptionCreator(({ getInstanceById }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -503,6 +511,7 @@ export const getFamiliarsTrickEntityDescription = createEntityDescriptionCreator
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -584,7 +593,7 @@ const renderAnimistPowerImprovementCost = (improvementCost) => {
  * Get a JSON representation of the rules text for a animist power.
  */
 export const getAnimistPowerEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -592,6 +601,7 @@ export const getAnimistPowerEntityDescription = createEntityDescriptionCreator((
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -670,7 +680,7 @@ export const getAnimistPowerEntityDescription = createEntityDescriptionCreator((
  * Get a JSON representation of the rules text for a Goede ritual.
  */
 export const getGeodeRitualEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getResolvedSelectOptionById }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -678,6 +688,7 @@ export const getGeodeRitualEntityDescription = createEntityDescriptionCreator(({
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -728,7 +739,7 @@ export const getGeodeRitualEntityDescription = createEntityDescriptionCreator(({
  * Get a JSON representation of the rules text for a jester trick.
  */
 export const getJesterTrickEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -736,6 +747,7 @@ export const getJesterTrickEntityDescription = createEntityDescriptionCreator(({
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         energyUnit: "ArcaneEnergy",
@@ -781,7 +793,7 @@ export const getJesterTrickEntityDescription = createEntityDescriptionCreator(({
  * Get a JSON representation of the rules text for a goblin ritual.
  */
 export const getGoblinRitualEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -789,6 +801,7 @@ export const getGoblinRitualEntityDescription = createEntityDescriptionCreator((
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeJoin: locale.join,
         speed: Speed.Slow,
@@ -854,7 +867,7 @@ export const getGoblinRitualEntityDescription = createEntityDescriptionCreator((
  * Get a JSON representation of the rules text for a Zibilja ritual.
  */
 export const getZibiljaRitualEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, { content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -862,6 +875,7 @@ export const getZibiljaRitualEntityDescription = createEntityDescriptionCreator(
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeCompare: locale.compare,
         localeJoin: locale.join,
@@ -933,7 +947,7 @@ const renderBannzeichenCost = (options, cost) => {
         case "Disjunction":
             return Reader.sequence(cost.Disjunction.list.map(renderSingleEnergyCost)).thenW(text => localeJoinR(text, "disjunction"));
         case "Map":
-            return renderOneTimeCostMap(cost.Map);
+            return renderStandaloneCostMap(cost.Map);
         case "DerivedFromOption":
             return renderOptionDerivedEnergyCost(options, option => option.cost?.value);
         default:
@@ -974,7 +988,7 @@ const renderSplitMagicalRuneParameterTranslation = (parameter) => responsiveR(()
  * Get a JSON representation of the rules text for a Bannzeichen.
  */
 export const getBannzeichenEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId }, locale, { id, content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -982,6 +996,7 @@ export const getBannzeichenEntityDescription = createEntityDescriptionCreator(({
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeCompare: locale.compare,
         localeJoin: locale.join,
@@ -1046,7 +1061,7 @@ const renderMagicalRuneImprovementCost = (options, improvementCost) => {
  * Get a JSON representation of the rules text for a magical rune.
  */
 export const getMagicalRuneEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId, idMap }, locale, { id, content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -1054,6 +1069,7 @@ export const getMagicalRuneEntityDescription = createEntityDescriptionCreator(({
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         localeCompare: locale.compare,
         localeJoin: locale.join,

package/lib/helpers/enums.d.ts

@@ -1,3 +1,4 @@
+import type { AnyNonNullish } from "@elyukai/utils/nullable";
 /**
  * Creates an enum case object.
  */
@@ -5,7 +6,7 @@ export declare const Case: {
     <K extends string>(kind: K): {
         kind: K;
     };
-    <K extends string, T extends NonNullable<unknown> | null>(kind: K, value: T): {
+    <K extends string, T extends AnyNonNullish | null>(kind: K, value: T): {
         kind: K;
     } & { [Key in K]: T; };
 };

package/lib/helpers/enums.js

@@ -1,6 +1,4 @@
 /**
  * Creates an enum case object.
  */
-export const Case = ((kind, value) => (value === undefined
-    ? { kind }
-    : { kind, [kind]: value }));
+export const Case = ((kind, value) => (value === undefined ? { kind } : { kind, [kind]: value }));