refactor: cached and reloaded file-index

src/components/stores/yarnStore.ts

@@ -5,6 +5,7 @@ import {loadElementSrc, resolvePath} from "../utils/path";
 import {createStore} from "solid-js/store";
 import {RunnerOptions} from "../../yarn-spinner/runtime/runner";
 import {getTtrpgFunctions} from "./ttrpgRunner";
+import { getIndexedData } from "../../data-loader/file-index";
 
 type YarnSpinnerStore = {
     dialogueHistory: (RuntimeResult | OptionsResult['options'][0])[],
@@ -43,8 +44,8 @@ export function createYarnStore(element: HTMLElement, props: {start: string}){
                 startAt: props.start,
             });
             const {commands, functions} = getTtrpgFunctions(runner);
-            runner.registerFunctions(functions);
             runner.registerCommands(commands);
+            runner.registerFunctions(functions);
             return runner;
         } catch (error) {
             console.error('Failed to initialize YarnRunner:', error);
@@ -77,7 +78,7 @@ export function createYarnStore(element: HTMLElement, props: {start: string}){
     const processRunnerOutput = () => {
         const runner = store.runnerInstance;
         if(!runner)return;
-        
+
         const result = runner.currentResult;
         if (!result) return;
 
@@ -100,7 +101,7 @@ export function createYarnStore(element: HTMLElement, props: {start: string}){
         });
         processRunnerOutput();
     };
-    
+
     return {
         store,
         advance,
@@ -108,22 +109,8 @@ export function createYarnStore(element: HTMLElement, props: {start: string}){
     }
 }
 
-// 缓存已加载的 yarn 文件内容
-const yarnCache = new Map<string, string>();
-
-// 加载 yarn 文件内容
-async function loadYarnFile(path: string): Promise<string> {
-    if (yarnCache.has(path)) {
-        return yarnCache.get(path)!;
-    }
-    const response = await fetch(path);
-    const content = await response.text();
-    yarnCache.set(path, content);
-    return content;
-}
-
 // 加载多个 yarn 文件并拼接
 async function loadYarnFiles(paths: string[]): Promise<string> {
-    const contents = await Promise.all(paths.map(path => loadYarnFile(path)));
+    const contents = await Promise.all(paths.map(path => getIndexedData(path)));
     return contents.join('\n');
 }

src/components/utils/csv-loader.ts

@@ -1,10 +1,6 @@
 import { parse } from 'csv-parse/browser/esm/sync';
 import yaml from 'js-yaml';
-
-/**
- * 全局缓存已加载的 CSV 内容
- */
-const csvCache = new Map<string, Record<string, string>[]>();
+import { getIndexedData } from '../../data-loader/file-index';
 
 /**
  * 解析 front matter
@@ -19,7 +15,7 @@ function parseFrontMatter(content: string): { frontmatter?: JSONObject; remainin
 
   // 分割内容
   const parts = content.split(/(?:^|\n)---\s*\n/);
-  
+
   // 至少需要三个部分：空字符串、front matter、剩余内容
   if (parts.length < 3) {
     return { remainingContent: content };
@@ -29,10 +25,10 @@ function parseFrontMatter(content: string): { frontmatter?: JSONObject; remainin
     // 解析 YAML front matter
     const frontmatterStr = parts[1].trim();
     const frontmatter = yaml.load(frontmatterStr) as JSONObject;
-    
+
     // 剩余内容是第三部分及之后的所有内容
     const remainingContent = parts.slice(2).join('---\n').trimStart();
-    
+
     return { frontmatter, remainingContent };
   } catch (error) {
     console.warn('Failed to parse front matter:', error);
@@ -45,16 +41,12 @@ function parseFrontMatter(content: string): { frontmatter?: JSONObject; remainin
  * @template T 返回数据的类型，默认为 Record<string, string>
  */
 export async function loadCSV<T = Record<string, string>>(path: string): Promise<CSV<T>> {
-  if (csvCache.has(path)) {
-    return csvCache.get(path)! as CSV<T>;
-  }
+  // 尝试从索引获取
+  const content = await getIndexedData(path);
 
-  const response = await fetch(path);
-  const content = await response.text();
-  
   // 解析 front matter
   const { frontmatter, remainingContent } = parseFrontMatter(content);
-  
+
   const records = parse(remainingContent, {
     columns: true,
     comment: '#',
@@ -72,8 +64,6 @@ export async function loadCSV<T = Record<string, string>>(path: string): Promise
     }
   }
   csvResult.sourcePath = path;
-  
-  csvCache.set(path, result);
   return csvResult;
 }
 
@@ -100,4 +90,4 @@ export function processVariables<T extends JSONObject> (body: string, currentRow
   }
 
   return body?.replace(/\{\{(\w+)\}\}/g, (_, key) => `${replaceProp(key)}`) || '';
-}
+}