fix borked global memory

Author: mProjectsCode

packages/core/src/metadata/InternalMetadataSources.ts

@@ -24,7 +24,7 @@ export class InternalMetadataSource extends FilePathMetadataSource<FilePathMetad
 		return {
 			data: {},
 			storagePath: storagePath,
-			...this.manager.getDefaultCacheItem(),
+			...this.manager.constructDefaultCacheItem(),
 		};
 	}
 
@@ -51,7 +51,7 @@ export class TestMetadataSource extends FilePathMetadataSource<FilePathMetadataC
 		return {
 			data: this.readExternal(storagePath),
 			storagePath: storagePath,
-			...this.manager.getDefaultCacheItem(),
+			...this.manager.constructDefaultCacheItem(),
 		};
 	}
 
@@ -72,7 +72,7 @@ export class GlobalMetadataSource implements IMetadataSource<GlobalMetadataCache
 
 		this.cache = {
 			data: {},
-			...this.manager.getDefaultCacheItem(),
+			...this.manager.constructDefaultCacheItem(),
 		};
 	}
 
@@ -103,7 +103,7 @@ export class GlobalMetadataSource implements IMetadataSource<GlobalMetadataCache
 	}
 
 	public getCacheItemForStoragePath(_storagePath: string): GlobalMetadataCacheItem | undefined {
-		return undefined;
+		return this.cache;
 	}
 
 	public getCacheItems(): GlobalMetadataCacheItem[] {
@@ -155,6 +155,10 @@ export class GlobalMetadataSource implements IMetadataSource<GlobalMetadataCache
 	public readEntireCacheItem(cacheItem: GlobalMetadataCacheItem): Metadata {
 		return cacheItem.data;
 	}
+
+	public usesStoragePath(): boolean {
+		return false;
+	}
 }
 
 export class ScopeMetadataSource implements IMetadataSource<IMetadataCacheItem> {
@@ -259,4 +263,8 @@ export class ScopeMetadataSource implements IMetadataSource<IMetadataCacheItem>
 			cause: `source 'scope' should have no cache items or subscriptions`,
 		});
 	}
+
+	public usesStoragePath(): boolean {
+		return false;
+	}
 }

packages/core/src/metadata/MetadataManager.ts

@@ -558,6 +558,10 @@ export class MetadataManager {
 	 */
 	public deleteCachesForStoragePath(storagePath: string): void {
 		for (const source of this.sources.values()) {
+			if (!source.usesStoragePath()) {
+				continue;
+			}
+
 			const cacheItem = source.getCacheItemForStoragePath(storagePath);
 			if (cacheItem === undefined) {
 				continue;
@@ -567,7 +571,7 @@ export class MetadataManager {
 		}
 	}
 
-	public getDefaultCacheItem(): IMetadataCacheItem {
+	public constructDefaultCacheItem(): IMetadataCacheItem {
 		return {
 			subscriptions: [],
 			externalWriteLock: 0,

packages/core/src/metadata/MetadataSource.ts

@@ -140,6 +140,8 @@ export interface IMetadataSource<T extends IMetadataCacheItem> {
 	 * @returns The entire data of the cache item.
 	 */
 	readEntireCacheItem(cacheItem: T): Metadata;
+
+	usesStoragePath(): boolean;
 }
 
 export abstract class FilePathMetadataSource<T extends FilePathMetadataCacheItem> implements IMetadataSource<T> {
@@ -283,4 +285,8 @@ export abstract class FilePathMetadataSource<T extends FilePathMetadataCacheItem
 	readEntireCacheItem(cacheItem: T): Metadata {
 		return cacheItem.data;
 	}
+
+	usesStoragePath(): boolean {
+		return true;
+	}
 }

packages/obsidian/src/ObsMetadataSource.ts

@@ -60,7 +60,7 @@ export class ObsMetadataSource extends FilePathMetadataSource<ObsMetadataCacheIt
 			data: structuredClone(frontmatter) ?? {},
 			storagePath: storagePath,
 			file: file,
-			...this.manager.getDefaultCacheItem(),
+			...this.manager.constructDefaultCacheItem(),
 		};
 	}
 

packages/publish/src/PublishMetadataSource.ts

@@ -27,7 +27,7 @@ export class PublishMetadataSource extends FilePathMetadataSource<FilePathMetada
 		return {
 			data: structuredClone(frontmatter) ?? {},
 			storagePath: storagePath,
-			...this.manager.getDefaultCacheItem(),
+			...this.manager.constructDefaultCacheItem(),
 		};
 	}
 

tests/__mocks__/TestFileAPI.ts

@@ -32,7 +32,10 @@ export class TestFileAPI extends FileAPI<TestComponents> {
 	}
 
 	public create(folderPath: string, fileName: string, extension: string, open?: boolean): Promise<string> {
-		const filePath = `${folderPath}/${fileName}.${extension}`;
+		let filePath = `${folderPath}/${fileName}.${extension}`;
+		if (filePath.startsWith('/')) {
+			filePath = filePath.slice(1);
+		}
 		this.fileSystem.writeFile(filePath, '');
 		return Promise.resolve(filePath);
 	}

tests/api.test.ts

@@ -262,4 +262,92 @@ action:
 			expect(callback).toHaveBeenLastCalledWith(1);
 		});
 	});
+
+	describe('update metadata interactions', () => {
+		beforeEach(() => {
+			plugin.file.create('', 'test', 'md');
+		});
+
+		test.each(['foo', 'memory^foo', 'globalMemory^foo'])('view field created after', async value => {
+			const bindTarget = plugin.api.parseBindTarget(value, 'test.md');
+
+			plugin.api.setMetadata(bindTarget, 123);
+
+			expect(plugin.api.getMetadata(bindTarget)).toBe(123);
+
+			const viewField = plugin.api.createViewFieldMountable('test.md', {
+				declaration: `VIEW[{${value}}]`,
+				renderChildType: RenderChildType.INLINE,
+			});
+
+			viewField.mount(document.body);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			expect(viewField.viewField?.getTargetEl()?.textContent).toBe('123');
+		});
+
+		test.each(['foo', 'memory^foo', 'globalMemory^foo'])('input field created after', async value => {
+			const bindTarget = plugin.api.parseBindTarget(value, 'test.md');
+
+			plugin.api.setMetadata(bindTarget, 123);
+
+			expect(plugin.api.getMetadata(bindTarget)).toBe(123);
+
+			const inputField = plugin.api.createInputFieldMountable('test.md', {
+				declaration: `INPUT[number:${value}]`,
+				renderChildType: RenderChildType.INLINE,
+			});
+
+			inputField.mount(document.body);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			expect(inputField.inputField?.getValue()).toBe(123);
+		});
+
+		test.each(['foo', 'memory^foo', 'globalMemory^foo'])('view field created before', async value => {
+			const bindTarget = plugin.api.parseBindTarget(value, 'test.md');
+
+			const viewField = plugin.api.createViewFieldMountable('test.md', {
+				declaration: `VIEW[{${value}}]`,
+				renderChildType: RenderChildType.INLINE,
+			});
+
+			viewField.mount(document.body);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			plugin.api.setMetadata(bindTarget, 123);
+
+			expect(plugin.api.getMetadata(bindTarget)).toBe(123);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			expect(viewField.viewField?.getTargetEl()?.textContent).toBe('123');
+		});
+
+		test.each(['foo', 'memory^foo', 'globalMemory^foo'])('input field created before', async value => {
+			const bindTarget = plugin.api.parseBindTarget(value, 'test.md');
+
+			const inputField = plugin.api.createInputFieldMountable('test.md', {
+				declaration: `INPUT[number:${value}]`,
+				renderChildType: RenderChildType.INLINE,
+			});
+
+			inputField.mount(document.body);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			plugin.api.setMetadata(bindTarget, 123);
+
+			expect(plugin.api.getMetadata(bindTarget)).toBe(123);
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+
+			console.log(plugin.metadataManager.getSource('globalMemory'));
+
+			expect(inputField.inputField?.getValue()).toBe(123);
+		});
+	});
 });