fix: bump operation version to 3 and fix incorrect value of requirements.module

guansss · guansss · commit 1201a050f9dc · 2025-05-31T22:17:39.000+08:00
diff --git a/scripts/shared.ts b/scripts/shared.ts
@@ -167,12 +167,13 @@ export async function getOperators() {
 
       if (['TRAP'].includes(op.profession)) return []
 
-      const modules = equipsByOperatorId[id]
-        ?.sort((a, b) => a.charEquipOrder - b.charEquipOrder)
-        .map(({ typeName1, typeName2 }) => {
-          return typeName1 === 'ORIGINAL' ? '' : typeName2
-        })
-        .map((m) => (m === 'A' ? 'α' : m === 'D' ? 'Δ' : m))
+      const modules = uniq(
+        equipsByOperatorId[id]
+          ?.sort((a, b) => a.charEquipOrder - b.charEquipOrder)
+          .map(({ typeName1, typeName2 }) => {
+            return typeName1 === 'ORIGINAL' ? '' : typeName2
+          }),
+      )
       return [
         {
           id: id,
@@ -185,7 +186,7 @@ export async function getOperators() {
               ? 0
               : Number(op.rarity?.split('TIER_').join('') || 0),
           alt_name: op.appellation,
-          modules,
+          modules: modules.length > 0 ? modules : undefined,
         },
       ]
     }),
diff --git a/src/components/editor2/editor-state.ts b/src/components/editor2/editor-state.ts
@@ -26,7 +26,9 @@ export interface EditorState {
   metadata: EditorMetadata
 }
 
-const defaultOperation = operationLooseSchema.parse({ version: 2 })
+const defaultOperation = operationLooseSchema.parse({
+  version: CopilotDocV1.VERSION,
+})
 
 export const defaultEditorState: EditorState = {
   operation: toEditorOperation(defaultOperation),
diff --git a/src/components/editor2/operator/OperatorItem.tsx b/src/components/editor2/operator/OperatorItem.tsx
@@ -15,6 +15,7 @@ import {
   alternativeOperatorSkillUsages,
   getDefaultRequirements,
   getEliteIconUrl,
+  getModuleName,
   getSkillCount,
   getSkillUsageAltTitle,
   useLocalizedOperatorName,
@@ -429,31 +430,54 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
             <Select
               className="row-start-4"
               filterable={false}
-              items={info.modules}
+              items={[
+                CopilotDocV1.Module.Default,
+                ...info.modules
+                  .map((m) =>
+                    m
+                      ? (CopilotDocV1.Module[m] as
+                          | CopilotDocV1.Module
+                          | undefined)
+                      : CopilotDocV1.Module.Original,
+                  )
+                  .filter((m) => m !== undefined),
+              ]}
               itemRenderer={(
-                item,
-                { index, handleClick, handleFocus, modifiers },
+                value,
+                { handleClick, handleFocus, modifiers },
               ) => (
                 <MenuItem
                   roleStructure="listoption"
-                  key={item}
+                  key={value}
                   className={clsx(
                     'min-w-12 !rounded-none text-base font-serif font-bold text-center text-slate-600 dark:text-slate-300',
                     modifiers.active && Classes.ACTIVE,
                   )}
-                  text={item || <Icon icon="disable" />}
+                  text={
+                    value === CopilotDocV1.Module.Default ? (
+                      <Icon icon="disable" />
+                    ) : value === CopilotDocV1.Module.Original ? (
+                      <Icon icon="small-square" />
+                    ) : (
+                      getModuleName(value)
+                    )
+                  }
+                  title={t.components.editor2.OperatorItem.module_title({
+                    count: value,
+                    name: getModuleName(value),
+                  })}
                   onClick={handleClick}
                   onFocus={handleFocus}
-                  selected={index === requirements.module}
+                  selected={value === requirements.module}
                 />
               )}
-              onItemSelect={(item) => {
+              onItemSelect={(value) => {
                 edit(() => {
                   onChange?.({
                     ...operator,
                     requirements: {
                       ...operator.requirements,
-                      module: info.modules.indexOf(item),
+                      module: value,
                     },
                   })
                   return {
@@ -472,15 +496,28 @@ export const OperatorItem: FC<OperatorItemProps> = memo(
               <Button
                 small
                 minimal
-                title={t.components.editor2.OperatorItem.module}
+                title={
+                  t.components.editor2.OperatorItem.module +
+                  ': ' +
+                  t.components.editor2.OperatorItem.module_title({
+                    count: requirements.module,
+                    name: getModuleName(requirements.module),
+                  })
+                }
                 className={clsx(
                   'w-4 h-4 !p-0 flex items-center justify-center font-serif !font-bold !text-base !rounded-none !border-2 !border-current',
-                  requirements.module
+                  requirements.module !== CopilotDocV1.Module.Default
                     ? '!bg-purple-100 dark:!bg-purple-900 dark:!text-purple-200 !text-purple-800'
                     : '!bg-gray-300 dark:!bg-gray-600 opacity-15 dark:opacity-25 hover:opacity-30 dark:hover:opacity-50',
                 )}
               >
-                {info.modules[requirements.module]}
+                {requirements.module ===
+                CopilotDocV1.Module.Default ? null : requirements.module ===
+                  CopilotDocV1.Module.Original ? (
+                  <Icon icon="small-square" />
+                ) : (
+                  getModuleName(requirements.module)
+                )}
               </Button>
             </Select>
           )}
diff --git a/src/components/editor2/reconciliation.ts b/src/components/editor2/reconciliation.ts
@@ -3,6 +3,7 @@ import { atom } from 'jotai'
 import { defaults, uniqueId } from 'lodash-es'
 import { PartialDeep, SetOptional, SetRequired } from 'type-fest'
 
+import { migrateOperation } from '../../models/converter'
 import { CopilotDocV1 } from '../../models/copilot.schema'
 import { FavGroup, favGroupAtom } from '../../store/useFavGroups'
 import { FavOperator, favOperatorAtom } from '../../store/useFavOperators'
@@ -218,7 +219,9 @@ export function toEditorOperation(
   source: CopilotOperationLoose,
 ): EditorOperation {
   const camelCased = camelcaseKeys(source, { deep: true })
-  const operation = JSON.parse(JSON.stringify(camelCased)) as typeof camelCased
+  const operation = JSON.parse(
+    JSON.stringify(migrateOperation(camelCased as CopilotDocV1.Operation)),
+  ) as typeof camelCased
   const converted = {
     ...operation,
     actions: operation.actions.map((action, index) => {
@@ -227,7 +230,7 @@ export function toEditorOperation(
         postDelay,
         rearDelay,
         ...newAction
-      }: WithoutIdDeep<EditorAction> & (typeof camelCased)['actions'][number] =
+      }: WithoutIdDeep<EditorAction> & (typeof operation)['actions'][number] =
         action
       // intermediatePostDelay 等于当前动作的 preDelay
       if (preDelay !== undefined) {
@@ -301,7 +304,7 @@ export function toMaaOperation(
         group.opers.some((operator) => operator.requirements),
       )
     ) {
-      converted.version = 2
+      converted.version = CopilotDocV1.VERSION
     }
   }
 
diff --git a/src/components/editor2/validation/schema.ts b/src/components/editor2/validation/schema.ts
@@ -43,7 +43,7 @@ const operator_requirements = z.looseObject({
   elite: z.number().int().min(0).max(2).optional(),
   level: z.number().int().min(0).optional(),
   skill_level: z.number().int().min(0).max(10).optional(),
-  module: z.number().int().min(0).optional(),
+  module: z.number().int().optional(),
   potentiality: z.number().int().min(0).max(6).optional(),
 })
 
diff --git a/src/components/viewer/OperationViewer.tsx b/src/components/viewer/OperationViewer.tsx
@@ -54,6 +54,7 @@ import { Level } from '../../models/operation'
 import {
   OPERATORS,
   getEliteIconUrl,
+  getModuleName,
   getSkillCount,
   useLocalizedOperatorName,
   withDefaultRequirements,
@@ -359,12 +360,19 @@ const OperatorCard: FC<{
             fallback={displayName}
             sourceSize={96}
           />
-          {info?.modules && module !== 0 && (
+          {module !== CopilotDocV1.Module.Default && (
             <div
-              title={t.components.editor2.label.opers.requirements.module}
+              title={t.components.viewer.OperationViewer.module_title({
+                count: module,
+                name: getModuleName(module),
+              })}
               className="absolute -bottom-1 right-1 font-serif font-bold text-lg text-white [text-shadow:0_0_3px_#a855f7,0_0_5px_#a855f7]"
             >
-              {info.modules[module]}
+              {module === CopilotDocV1.Module.Original ? (
+                <Icon icon="small-square" />
+              ) : (
+                getModuleName(module)
+              )}
             </div>
           )}
         </div>
diff --git a/src/i18n/translations.json b/src/i18n/translations.json
@@ -828,6 +828,18 @@
           "cn": "模组",
           "en": "Module"
         },
+        "module_title": {
+          "cn": {
+            "-1": "不改变",
+            "0": "切换到初始模组",
+            "other": "切换到{{name}}模组"
+          },
+          "en": {
+            "-1": "Don't Change",
+            "0": "Switch to Original Module",
+            "other": "Switch to {{name}} Module"
+          }
+        },
         "skill_not_available": {
           "cn": "当前等级未解锁该技能",
           "en": "This skill is not available at the current level"
@@ -3016,6 +3028,16 @@
           "cn": "无干员",
           "en": "No Operator"
         },
+        "module_title": {
+          "cn": {
+            "0": "初始模组",
+            "other": "{{name}}模组"
+          },
+          "en": {
+            "0": "Original Module",
+            "other": "{{name}} Module"
+          }
+        },
         "action_sequence": {
           "cn": "动作序列",
           "en": "Action Sequence"
diff --git a/src/models/converter.ts b/src/models/converter.ts
@@ -1,16 +1,20 @@
 import camelcaseKeys from 'camelcase-keys'
 import { CopilotInfo } from 'maa-copilot-client'
 
-import type { CopilotDocV1 } from 'models/copilot.schema'
+import { CopilotDocV1 } from 'models/copilot.schema'
 
 import { i18n } from '../i18n/i18n'
+import { findOperatorByName } from './operator'
 
 export function toCopilotOperation(
   apiOperation: CopilotInfo,
 ): CopilotDocV1.Operation {
   try {
     const json = JSON.parse(apiOperation.content)
-    return camelcaseKeys(json, { deep: true })
+    const operation: CopilotDocV1.Operation = camelcaseKeys(json, {
+      deep: true,
+    })
+    return migrateOperation(operation)
   } catch (e) {
     console.error('Failed to parse operation', apiOperation, e)
   }
@@ -24,3 +28,38 @@ export function toCopilotOperation(
     stageName: '',
   }
 }
+
+export function migrateOperation(
+  operation: CopilotDocV1.Operation,
+): CopilotDocV1.Operation {
+  if (operation.version === 2) {
+    // in version 2, the module property is set to the index of the module in the modules array,
+    // we need to convert it using the correct CopilotDocV1.Module mapping
+    return {
+      ...operation,
+      version: CopilotDocV1.VERSION,
+      opers: operation.opers?.map((operator) => {
+        if (operator.requirements?.module === undefined) {
+          return operator
+        }
+        const modules = findOperatorByName(operator.name)?.modules
+        if (!modules) {
+          return operator
+        }
+        const actualModuleName = modules[operator.requirements.module]
+        const actualModule =
+          actualModuleName in CopilotDocV1.Module
+            ? (CopilotDocV1.Module[actualModuleName] as CopilotDocV1.Module)
+            : CopilotDocV1.Module.Default
+        return {
+          ...operator,
+          requirements: {
+            ...operator.requirements,
+            module: actualModule,
+          },
+        }
+      }),
+    }
+  }
+  return operation
+}
diff --git a/src/models/copilot.schema.json b/src/models/copilot.schema.json
@@ -127,10 +127,8 @@
         },
         "module": {
           "type": "integer",
-          "description": "Module requirement, optional, 0 by default",
-          "minimum": 0,
-          "maximum": 1,
-          "default": 0
+          "description": "Module requirement, optional, -1 by default",
+          "default": -1
         },
         "potentiality": {
           "type": "integer",
diff --git a/src/models/copilot.schema.ts b/src/models/copilot.schema.ts
@@ -5,6 +5,8 @@ import { OpDifficulty } from './operation'
  * https://maa.plus/docs/zh-cn/protocol/copilot-schema.html
  */
 export namespace CopilotDocV1 {
+  export const VERSION = 3
+
   export interface Operation {
     version?: number
     actions?: Action[]
@@ -164,8 +166,20 @@ export namespace CopilotDocV1 {
   export interface Requirements {
     elite?: number
     level?: number
-    module?: number
+    module?: Module
     potentiality?: number
     skillLevel?: number
   }
+
+  export enum Module {
+    /** 默认值，不做任何操作 */
+    Default = -1,
+    /** 切换为初始模组 */
+    Original = 0,
+    /** 切换为对应的模组 */
+    X = 1,
+    Y = 2,
+    A = 3,
+    D = 4,
+  }
 }
diff --git a/src/models/generated/operators.json b/src/models/generated/operators.json
diff --git a/src/models/operator.ts b/src/models/operator.ts

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ export interface EditorState {`
`26`	`26`	`metadata: EditorMetadata`
`27`	`27`	`}`
`28`	`28`
`29`		`-const defaultOperation = operationLooseSchema.parse({ version: 2 })`
	`29`	`+const defaultOperation = operationLooseSchema.parse({`
	`30`	`+ version: CopilotDocV1.VERSION,`
	`31`	`+})`
`30`	`32`
`31`	`33`	`export const defaultEditorState: EditorState = {`
`32`	`34`	`operation: toEditorOperation(defaultOperation),`