fix: migration always fails on new config (#1305)

organization · Dec 1, 2024 · a116848 · a116848
1 parent 24309c3
commit a116848
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/common/constants.ts b/common/constants.ts
@@ -1,3 +1,6 @@
+import packageJson from '../package.json';
+
+export const VERSION = packageJson.version;
 export const DEFAULT_STYLE = {
   font: 'Pretendard JP Variable',
   fontWeight: '400',
@@ -105,6 +108,9 @@ export const DEFAULT_CONFIG = {
     config: {},
   },
 
+  __internal__: {
+    version: VERSION,
+  },
 };
 
 export const PRESET_PREFIX = '__preset__';
diff --git a/src/config/index.ts b/src/config/index.ts
@@ -9,10 +9,9 @@ import { createMigrator, migrateTable } from './migration';
 
 import { State } from './state';
 
+import { VERSION } from '../../common/constants';
 import { ConfigSchema, GameListSchema, LyricMapperSchema, ThemeListSchema } from '../../common/schema';
 
-import packageJson from '../../package.json';
-
 let resolver: () => void = () => null;
 const init = {
   config: 0,
@@ -52,7 +51,7 @@ const tryMigration = () => {
   if (isLoaded) {
     const internalConfig = config.get()['__internal__'];
     const prevVersion = typeof internalConfig?.version === 'string' ? internalConfig.version : '0.0.0';
-    const nowVersion = packageJson.version;
+    const nowVersion = VERSION;
     console.log('[Alspotron] prepare for migration', prevVersion, '->', nowVersion);
 
     const migrator = createMigrator(migrateTable, prevVersion);

diff --git a/src/config/migration/runner.ts b/src/config/migration/runner.ts
@@ -19,7 +19,7 @@ export const createMigrator = (table: MigrateTable, prevVersion: string) => {
       const bMin = minVersion(b);
 
       if (!aMin || !bMin) return 0;
-      return lt(aMin, bMin) ? 1 : -1;
+      return lt(aMin, bMin) ? -1 : 1;
     })
     .map(([matcher, migrator]) => {
       if (clean(matcher) !== null) {
@@ -31,8 +31,7 @@ export const createMigrator = (table: MigrateTable, prevVersion: string) => {
         return migrator;
       }
     })
-    .filter(Boolean)
-    .reverse();
+    .filter(Boolean);
 
   return (initData: MigratorData) => {
     const result = { ...initData };