Upstream formula- and pando-related changes

libs/gi-formula/src/calculator.ts

@@ -1,5 +1,6 @@
-import type { AnyOP, CalcResult } from '@genshin-optimizer/pando'
-import { calculation, Calculator as Base } from '@genshin-optimizer/pando'
+import type { AnyNode, CalcResult } from '@genshin-optimizer/pando'
+import { Calculator as Base, calculation } from '@genshin-optimizer/pando'
+import { assertUnreachable } from '@genshin-optimizer/util'
 import type { Tag } from './data/util'
 import { self } from './data/util'
 
@@ -14,21 +15,15 @@ export type CalcMeta = {
 
 export class Calculator extends Base<CalcMeta> {
   override computeCustom(val: any[], op: string): any {
-    if (op == 'res') {
-      const [preRes] = val as [number]
-      if (preRes >= 0.75) return 1 / (1 + 4 * preRes)
-      if (preRes >= 0) return 1 - preRes
-      return 1 - 0.5 * preRes
-    }
+    if (op == 'res') return res(val[0])
     return super.computeCustom(val, op)
   }
   override computeMeta(
-    op: Exclude<AnyOP, 'read'>,
-    tag: Tag | undefined,
-    val: any,
-    x: (CalcResult<any, CalcMeta> | undefined)[],
-    _br: CalcResult<any, CalcMeta>[],
-    ex: any
+    { op, ex }: AnyNode,
+    val: number | string,
+    x: (CalcResult<number | string, CalcMeta> | undefined)[],
+    _br: CalcResult<number | string, CalcMeta>[],
+    tag: Tag | undefined
   ): CalcMeta {
     const preConds = [
       tag?.qt === 'cond' ? [tag] : [],
@@ -40,6 +35,10 @@ export class Calculator extends Base<CalcMeta> {
       return { tag, op: 'const', ops: [], conds }
     }
 
+    if (op === 'read' && ex !== undefined) {
+      op = ex
+      ex = undefined
+    }
     switch (op) {
       case 'sum':
       case 'prod':
@@ -62,13 +61,15 @@ export class Calculator extends Base<CalcMeta> {
       }
 
       case 'const':
+      case 'vtag':
       case 'subscript':
         return constOverride()
       case 'match':
       case 'thres':
       case 'lookup':
         return { ...x.find((x) => x)!.meta, conds }
       case 'tag':
+      case 'read':
       case 'dtag': {
         const { tag: baseTag, op, ops } = x[0]!.meta
         return { tag: baseTag ?? tag, op, ops, conds }
@@ -80,7 +81,7 @@ export class Calculator extends Base<CalcMeta> {
         }
         return constOverride()
       default:
-        throw new Error('Should not reach this point')
+        assertUnreachable(op)
     }
   }
 
@@ -100,3 +101,8 @@ export class Calculator extends Base<CalcMeta> {
       .filter((x) => x.q)
   }
 }
+export function res(x: number): number {
+  if (x >= 0.75) return 1 / (1 + 4 * x)
+  if (x >= 0) return 1 - x
+  return 1 - 0.5 * x
+}

libs/gi-formula/src/data/artifact/NoblesseOblige.ts

@@ -1,5 +1,5 @@
 import type { ArtifactSetKey } from '@genshin-optimizer/consts'
-import { cmpEq, cmpGE } from '@genshin-optimizer/pando'
+import { cmpGE } from '@genshin-optimizer/pando'
 import {
   allBoolConditionals,
   allStacks,
@@ -18,6 +18,6 @@ export default registerArt(
   name,
   selfBuff.premod.dmg_.burst.add(cmpGE(count, 2, percent(0.2))),
 
-  canNO4.in.add(set4.ifOn(cmpGE(count, 4, 1))),
-  teamBuff.premod.atk_.add(cmpEq(canNO4.out, 1, percent(0.2)))
+  canNO4.add(set4.ifOn(cmpGE(count, 4, 1))),
+  teamBuff.premod.atk_.add(canNO4.apply(percent(0.2)))
 )

libs/gi-formula/src/data/artifact/index.ts

@@ -1,5 +1,5 @@
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import NoblesseOblige from './NoblesseOblige'
 
-const data: Data[] = [NoblesseOblige]
+const data: TagMapNodeEntries[] = [NoblesseOblige]
 export default data.flat()

libs/gi-formula/src/data/artifact/util.ts

@@ -1,20 +1,20 @@
 import type { ArtifactSetKey } from '@genshin-optimizer/consts'
 import type { NumNode } from '@genshin-optimizer/pando'
-import type { Data } from '../util'
+import type { TagMapNodeEntries, TagMapNodeEntry } from '../util'
 import { self, tag } from '../util'
 
 export function registerArt(
   src: ArtifactSetKey,
-  ...data: (Data | Data[number])[]
-): Data {
+  ...data: (TagMapNodeEntry | TagMapNodeEntries)[]
+): TagMapNodeEntries {
   /* Unlike character and weapon, artifact buff is all-or-nothing, so we can register every
    * buff as `src:art` and tag the formula as `src:src`. This means that `src:art`, which is
    * read on each `et:agg`, does not need to reread `src:src`. This greatly reduce `Read`
    * traffic due to the sheer numbers of `et:agg` calculations and `src:src` it would require
    * for each `src:art` read.
    */
 
-  function internal({ tag: oldTag, value }: Data[number]): Data[number] {
+  function internal({ tag: oldTag, value }: TagMapNodeEntry): TagMapNodeEntry {
     if (oldTag.src === src)
       // Special entries (usually stack count) that override `stack`
       return { tag: oldTag, value }
@@ -31,6 +31,6 @@ export function registerArt(
   )
 }
 
-export function artCount(name: ArtifactSetKey): NumNode {
-  return self.common.count.with('src', name)
+export function artCount(src: ArtifactSetKey): NumNode {
+  return self.common.count.src(src)
 }

libs/gi-formula/src/data/char/Nilou.ts

@@ -98,7 +98,7 @@ const {
 const { a1AfterSkill, a1AfterHit, c4AfterPirHit } = allBoolConditionals(
   info.key
 )
-const { c2Hydro, c2Dendro } = allConditionals(info.key, 'none')
+const { c2Hydro, c2Dendro } = allConditionals(info.key, 'unique')
 
 const onlyDendroHydroTeam = cmpGE(
   team.common.count.dendro,

libs/gi-formula/src/data/char/index.ts

@@ -1,7 +1,7 @@
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import Candace from './Candace'
 import Nahida from './Nahida'
 import Nilou from './Nilou'
 
-const data: Data[] = [Candace, Nahida, Nilou]
+const data: TagMapNodeEntries[] = [Candace, Nahida, Nilou]
 export default data.flat()

libs/gi-formula/src/data/char/util.ts

@@ -10,7 +10,7 @@ import { locCharKeyToCharKey } from '@genshin-optimizer/consts'
 import type { CharacterDataGen } from '@genshin-optimizer/gi-stats'
 import type { NumNode } from '@genshin-optimizer/pando'
 import { prod, subscript, sum } from '@genshin-optimizer/pando'
-import type { Data, FormulaArg, Stat } from '../util'
+import type { TagMapNodeEntries, FormulaArg, Stat } from '../util'
 import {
   addStatCurve,
   allStatics,
@@ -46,8 +46,8 @@ export function dmg(
   levelScaling: number[],
   move: Exclude<MoveKey, 'elemental'>,
   arg: { ele?: ElementWithPhyKey; baseMulti?: NumNode } & FormulaArg = {},
-  ...extra: Data
-): Data {
+  ...extra: TagMapNodeEntries
+): TagMapNodeEntries {
   let { ele } = arg
   if (!ele)
     switch (move) {
@@ -93,8 +93,8 @@ export function shield(
   flat: number[],
   talent: 'auto' | 'skill' | 'burst',
   arg: { ele?: ElementKey } & FormulaArg = {},
-  ...extra: Data
-): Data {
+  ...extra: TagMapNodeEntries
+): TagMapNodeEntries {
   const lvl = self.char[talent]
   return customShield(
     name,
@@ -114,8 +114,8 @@ export function fixedShield(
   percent: number | NumNode,
   flat: number | NumNode,
   arg: { ele?: ElementKey } & FormulaArg = {},
-  ...extra: Data
-): Data {
+  ...extra: TagMapNodeEntries
+): TagMapNodeEntries {
   return customShield(
     name,
     arg.ele,
@@ -128,8 +128,8 @@ export function fixedShield(
 export function entriesForChar(
   { ele, weaponType, region }: CharInfo,
   { lvlCurves, ascensionBonus }: CharacterDataGen
-): Data {
-  const specials = new Set(Object.keys(lvlCurves.map(({ key }) => key)))
+): TagMapNodeEntries {
+  const specials = new Set(lvlCurves.map(({ key }) => key))
   specials.delete('atk')
   specials.delete('def')
   specials.delete('hp')

libs/gi-formula/src/data/common/dmg.ts

@@ -6,7 +6,7 @@ import {
   sum,
   sumfrac,
 } from '@genshin-optimizer/pando'
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import {
   enemy,
   enemyDebuff,
@@ -24,7 +24,7 @@ export const infusionPrio = {
 const infusionTable = priorityTable(infusionPrio),
   preRes = enemy.common.preRes
 
-const data: Data = [
+const data: TagMapNodeEntries = [
   enemyDebuff.common.postRes.add(custom('res', preRes)),
   enemyDebuff.common.inDmg.add(
     prod(

libs/gi-formula/src/data/common/index.ts

@@ -1,23 +1,19 @@
 import { allElementKeys } from '@genshin-optimizer/consts'
 import { max, min, prod, subscript, sum } from '@genshin-optimizer/pando'
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import { allStatics, percent, reader, self, selfBuff, team } from '../util'
 import dmg from './dmg'
 import prep from './prep'
 import reaction from './reaction'
 import { allStats } from '@genshin-optimizer/gi-stats'
 
-const data: Data = [
+const data: TagMapNodeEntries = [
   ...dmg,
   ...prep,
   ...reaction,
 
-  reader
-    .withTag({ src: 'iso', et: 'self' })
-    .reread(reader.withTag({ src: 'custom' })),
-  reader
-    .withTag({ src: 'agg', et: 'self' })
-    .reread(reader.withTag({ src: 'custom' })),
+  reader.withTag({ src: 'iso', et: 'self' }).reread(reader.src('custom')),
+  reader.withTag({ src: 'agg', et: 'self' }).reread(reader.src('custom')),
 
   // Final <= Premod <= Base
   reader

libs/gi-formula/src/data/common/prep.ts

@@ -1,10 +1,10 @@
 import { cmpEq, dynTag, lookup, prod, sum } from '@genshin-optimizer/pando'
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import { enemy, percent, self, selfBuff, tagVal } from '../util'
 
 const { ele, amp, cata } = self.prep
 
-const data: Data = [
+const data: TagMapNodeEntries = [
   // Formulas
   // If any `prep` nodes are available, put them in `dynTag` or note them here
   selfBuff.formula.dmg.add(

libs/gi-formula/src/data/common/reaction.ts

@@ -16,7 +16,7 @@ import {
   sum,
   sumfrac,
 } from '@genshin-optimizer/pando'
-import type { Data } from '../util'
+import type { TagMapNodeEntries } from '../util'
 import { percent, self, selfBuff, tag } from '../util'
 
 const transLvlMultis = [
@@ -312,7 +312,7 @@ function trigger(
       trigger(ele, trans, immediateFromEle)
 }
 
-const data: Data = [
+const data: TagMapNodeEntries = [
   selfBuff.reaction.ampBase.add(eleMasMulti(25 / 9, 1400)),
   selfBuff.reaction.ampMulti.melt.cryo.add(prod(1.5, ampBase)),
   selfBuff.reaction.ampMulti.melt.pyro.add(prod(2.0, ampBase)),

libs/gi-formula/src/data/index.ts

@@ -5,19 +5,26 @@ import {
 import artifact from './artifact'
 import character from './char'
 import common from './common'
-import type { Data } from './util'
-import { fixedTags, queries, queryTypes, usedNames } from './util'
+import type { TagMapNodeEntries } from './util'
+import { fixedTags, queryTypes, usedNames, usedQ } from './util'
 import weapon from './weapon'
 
-const data: Data = [...common, ...artifact, ...character, ...weapon]
-const tags = [
-  { category: 'qt', values: [...queryTypes] },
-  { category: 'q', values: ['_', ...queries] },
-  undefined,
-  ...Object.entries(fixedTags).map(([k, v]) => ({ category: k, values: v })),
-  { category: 'name', values: [...usedNames] },
+const entries: TagMapNodeEntries = [
+  ...common,
+  ...artifact,
+  ...character,
+  ...weapon,
 ]
-const keys = compileTagMapKeys(tags) // TODO: Find optimum tag order
-const values = compileTagMapValues(keys, data)
+const keys = compileTagMapKeys([
+  { category: 'qt', values: queryTypes },
+  { category: 'q', values: usedQ },
+  undefined,
+  ...Object.entries(fixedTags).map(([k, v]) => ({
+    category: k,
+    values: new Set(v),
+  })),
+  { category: 'name', values: usedNames },
+]) // TODO: Find optimum tag order
+const values = compileTagMapValues(keys, entries)
 
-export { keys, values, data }
+export { entries, keys, values }

libs/gi-formula/src/data/util/index.ts

@@ -1,8 +1,17 @@
-import type { AnyNode, ReRead } from '@genshin-optimizer/pando'
+import type {
+  AnyNode,
+  ReRead,
+  TagMapEntries,
+  TagMapEntry,
+} from '@genshin-optimizer/pando'
 import type { Tag } from './read'
 
 export * from './listing'
 export * from './read'
 export * from './sheet'
 export * from './tag'
-export type Data = { tag: Tag; value: AnyNode | ReRead }[]
+
+/** See `TagMapEntry` */
+export type TagMapNodeEntry = TagMapEntry<AnyNode | ReRead, Tag>
+/** See `TagMapEntries` */
+export type TagMapNodeEntries = TagMapEntries<AnyNode | ReRead, Tag>

libs/gi-formula/src/data/util/listing.ts

@@ -47,6 +47,7 @@ export const srcs = [
   ...allWeaponKeys,
   ...allArtifactSetKeys,
   'art',
+  'dyn',
   'enemy',
   'custom',
 ] as const