Merge d17160b into 3ffb281

.github/workflows/deploy-go-pando-pr.yml

@@ -18,6 +18,8 @@ on:
       - 'apps/sr-frontend-e2e/**'
       - 'libs/sr-assets/**'
       - 'libs/sr-consts/**'
+      - 'libs/sr-data/**'
+      - 'libs/sr-db/**'
       - 'libs/sr-dm/**'
       - 'libs/sr-formula/**'
       - 'libs/sr-stats/**'

.github/workflows/deploy-go-wr-pr.yml

@@ -18,6 +18,8 @@ on:
       - 'apps/sr-frontend-e2e/**'
       - 'libs/sr-assets/**'
       - 'libs/sr-consts/**'
+      - 'libs/sr-data/**'
+      - 'libs/sr-db/**'
       - 'libs/sr-dm/**'
       - 'libs/sr-formula/**'
       - 'libs/sr-stats/**'

.github/workflows/deploy-sro-pr.yml

@@ -16,16 +16,21 @@ on:
       - 'apps/gi-frontend-e2e/**'
       - 'apps/frontend/**'
       - 'apps/frontend-e2e/**'
+      - 'libs/consts/**'
+      - 'libs/dm/**'
+      - 'libs/gi-art-scanner/**'
       - 'libs/gi-assets/**'
-      - 'libs/gi-consts/**'
       - 'libs/gi-dm-localization/**'
       - 'libs/gi-formula/**'
+      - 'libs/gi-formula-ui/**'
       - 'libs/gi-good/**'
       - 'libs/gi-localization/**'
       - 'libs/gi-stats/**'
       - 'libs/gi-svgicons/**'
-      - 'libs/gi-util/**'
       - 'libs/gi-ui/**'
+      - 'libs/gi-util/**'
+      - 'libs/silly-wisher/**'
+      - 'libs/silly-wisher-names/**'
     types: [opened, reopened, synchronize, labeled]
 
 jobs:

libs/sr-consts/src/index.ts

@@ -2,3 +2,4 @@ export * from './character'
 export * from './common'
 export * from './lightCone'
 export * from './relic'
+export * from './sro'

libs/sr-consts/src/sro.ts

@@ -0,0 +1,2 @@
+export const allHitModeKeys = ['hit', 'avgHit', 'critHit'] as const
+export type HitModeKey = (typeof allHitModeKeys)[number]

libs/sr-data/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

libs/sr-data/README.md

@@ -0,0 +1,3 @@
+# sr-data
+
+This library was generated with [Nx](https://nx.dev).

libs/sr-data/project.json

@@ -0,0 +1,16 @@
+{
+  "name": "sr-data",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/sr-data/src",
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/sr-data/**/*.ts"]
+      }
+    }
+  },
+  "tags": []
+}

libs/sr-db/src/ISRODatabase.ts → libs/sr-data/src/ISrDatabase.ts

@@ -2,8 +2,8 @@ import type { ICharacter } from './ICharacter'
 import type { ILightCone } from './ILightCone'
 import type { IRelic } from './IRelic'
 
-export type ISRODatabase = {
-  format: 'SRO'
+export type ISrDatabase = {
+  format: string
   source: string
   version: 1
   characters?: ICharacter[]

libs/sr-data/src/index.ts

@@ -0,0 +1,4 @@
+export * from './ICharacter'
+export * from './ILightCone'
+export * from './IRelic'
+export * from './ISRDatabase'

libs/sr-data/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}

libs/sr-data/tsconfig.lib.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}

libs/sr-db/README.md

@@ -1,7 +1,3 @@
 # sr-db
 
 This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test sr-db` to execute the unit tests via [Jest](https://jestjs.io).

libs/sr-db/project.json

@@ -10,14 +10,6 @@
       "options": {
         "lintFilePatterns": ["libs/sr-db/**/*.ts"]
       }
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "passWithNoTests": true,
-        "reportsDirectory": "../../coverage/libs/sr-db"
-      }
     }
   },
   "tags": []

libs/sr-db/src/ISroCharacter.ts

@@ -0,0 +1,30 @@
+import type {
+  RelicSlotKey,
+  CharacterKey,
+  HitModeKey,
+} from '@genshin-optimizer/sr-consts'
+import type { ICharacter } from '@genshin-optimizer/sr-data'
+
+export interface ISroCharacter extends ICharacter {
+  hitMode: HitModeKey
+  // conditional: IConditionalValues
+  // bonusStats: Partial<Record<InputPremodKey, number>>
+  // enemyOverride: Partial<
+  //   Record<
+  //     EleEnemyResKey | 'enemyLevel' | 'enemyDefRed_' | 'enemyDefIgn_',
+  //     number
+  //   >
+  // >
+  compareData: boolean
+  // customMultiTarget: CustomMultiTarget[]
+  team: [
+    teammate1: CharacterKey | '',
+    teammate2: CharacterKey | '',
+    teammate3: CharacterKey | ''
+  ]
+}
+
+export interface ICachedSroCharacter extends ISroCharacter {
+  equippedRelics: Record<RelicSlotKey, string>
+  equippedWeapon: string
+}

libs/sr-db/src/ISroDatabase.ts

@@ -0,0 +1,12 @@
+import { type ISrDatabase } from '@genshin-optimizer/sr-data'
+
+export const SroSource = 'Star Rail Optimizer' as const
+
+export interface ISroDatabase extends ISrDatabase {
+  format: 'Sro'
+  version: 1
+  dbVersion: number
+  source: typeof SroSource
+  // buildSettings?: Array<BuildSetting & { id: string }>
+  [sroSettingsKey: string]: unknown
+}

libs/sr-db/src/index.ts

@@ -1 +1,2 @@
-export * from './lib/sr-db'
+export * from './ISroCharacter'
+export * from './ISroDatabase'

libs/sr-db/tsconfig.json

@@ -14,9 +14,6 @@
   "references": [
     {
       "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
     }
   ]
 }

tsconfig.base.json

@@ -56,6 +56,7 @@
       ],
       "@genshin-optimizer/sr-assets": ["libs/sr-assets/src/index.ts"],
       "@genshin-optimizer/sr-consts": ["libs/sr-consts/src/index.ts"],
+      "@genshin-optimizer/sr-data": ["libs/sr-data/src/index.ts"],
       "@genshin-optimizer/sr-db": ["libs/sr-db/src/index.ts"],
       "@genshin-optimizer/sr-dm": ["libs/sr-dm/src/index.ts"],
       "@genshin-optimizer/sr-formula": ["libs/sr-formula/src/index.ts"],