improve load times and another attempt to fix the buton builder

mProjectsCode · mProjectsCode · commit 3fe22203e485 · 2024-10-29T11:05:23.000+01:00
diff --git a/automation/build/esbuild.config.ts b/automation/build/esbuild.config.ts
@@ -43,7 +43,6 @@ const build = await esbuild.build({
 	plugins: [
 		esbuildSvelte({
 			compilerOptions: { css: 'injected', dev: false },
-			preprocess: sveltePreprocess(),
 			filterWarnings: warning => {
 				// we don't want warnings from node modules that we can do nothing about
 				return !warning.filename?.includes('node_modules');
diff --git a/automation/build/esbuild.dev.config.ts b/automation/build/esbuild.dev.config.ts
@@ -54,7 +54,6 @@ const context = await esbuild.context({
 		}),
 		esbuildSvelte({
 			compilerOptions: { css: 'injected', dev: true },
-			preprocess: sveltePreprocess(),
 			filterWarnings: warning => {
 				// we don't want warnings from node modules that we can do nothing about
 				return !(
diff --git a/automation/build/esbuild.publish.config.ts b/automation/build/esbuild.publish.config.ts
@@ -55,7 +55,6 @@ esbuild
 		plugins: [
 			esbuildSvelte({
 				compilerOptions: { css: 'injected' },
-				preprocess: sveltePreprocess(),
 				filterWarnings: warning => {
 					// we don't want warnings from node modules that we can do nothing about
 					return !warning.filename?.includes('node_modules');
diff --git a/automation/build/esbuild.publish.dev.config.ts b/automation/build/esbuild.publish.dev.config.ts
@@ -56,7 +56,6 @@ const context = await esbuild
 		plugins: [
 			esbuildSvelte({
 				compilerOptions: { css: 'injected' },
-				preprocess: sveltePreprocess(),
 				filterWarnings: warning => {
 					// we don't want warnings from node modules that we can do nothing about
 					return !warning.filename?.includes('node_modules');
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
 		"itertools-ts": "^1.27.1",
 		"mathjs": "^13.2.0",
 		"moment": "^2.30.1",
-		"svelte": "5.1.1",
+		"svelte": "5.1.4",
 		"zod": "^3.23.8",
 		"zod-validation-error": "^3.4.0"
 	},
diff --git a/packages/core/src/fields/button/ButtonActionRunner.ts b/packages/core/src/fields/button/ButtonActionRunner.ts
@@ -92,15 +92,15 @@ export class ButtonActionRunner {
 	 */
 	createDefaultAction(type: ButtonActionType): ButtonAction {
 		if (type === ButtonActionType.COMMAND) {
-			return { type: ButtonActionType.COMMAND, command: '' } satisfies CommandButtonAction;
+			return { type: ButtonActionType.COMMAND, command: '' } satisfies Required<CommandButtonAction>;
 		} else if (type === ButtonActionType.OPEN) {
-			return { type: ButtonActionType.OPEN, link: '' } satisfies OpenButtonAction;
+			return { type: ButtonActionType.OPEN, link: '', newTab: true } satisfies Required<OpenButtonAction>;
 		} else if (type === ButtonActionType.JS) {
-			return { type: ButtonActionType.JS, file: '', args: {} } satisfies JSButtonAction;
+			return { type: ButtonActionType.JS, file: '', args: {} } satisfies Required<JSButtonAction>;
 		} else if (type === ButtonActionType.INPUT) {
-			return { type: ButtonActionType.INPUT, str: '' } satisfies InputButtonAction;
+			return { type: ButtonActionType.INPUT, str: '' } satisfies Required<InputButtonAction>;
 		} else if (type === ButtonActionType.SLEEP) {
-			return { type: ButtonActionType.SLEEP, ms: 0 } satisfies SleepButtonAction;
+			return { type: ButtonActionType.SLEEP, ms: 0 } satisfies Required<SleepButtonAction>;
 		} else if (type === ButtonActionType.TEMPLATER_CREATE_NOTE) {
 			return {
 				type: ButtonActionType.TEMPLATER_CREATE_NOTE,
@@ -109,51 +109,55 @@ export class ButtonActionRunner {
 				fileName: '',
 				openNote: true,
 				openIfAlreadyExists: false,
-			} satisfies TemplaterCreateNoteButtonAction;
+			} satisfies Required<TemplaterCreateNoteButtonAction>;
 		} else if (type === ButtonActionType.UPDATE_METADATA) {
 			return {
 				type: ButtonActionType.UPDATE_METADATA,
 				bindTarget: '',
 				evaluate: false,
 				value: '',
-			} satisfies UpdateMetadataButtonAction;
+			} satisfies Required<UpdateMetadataButtonAction>;
 		} else if (type === ButtonActionType.CREATE_NOTE) {
 			return {
 				type: ButtonActionType.CREATE_NOTE,
 				folderPath: '/',
 				fileName: 'Untitled',
 				openNote: true,
 				openIfAlreadyExists: false,
-			} satisfies CreateNoteButtonAction;
+			} satisfies Required<CreateNoteButtonAction>;
 		} else if (type === ButtonActionType.REPLACE_IN_NOTE) {
 			return {
 				type: ButtonActionType.REPLACE_IN_NOTE,
 				fromLine: 0,
 				toLine: 0,
 				replacement: 'Replacement text',
-			} satisfies ReplaceInNoteButtonAction;
+				templater: false,
+			} satisfies Required<ReplaceInNoteButtonAction>;
 		} else if (type === ButtonActionType.REPLACE_SELF) {
 			return {
 				type: ButtonActionType.REPLACE_SELF,
 				replacement: 'Replacement text',
-			} satisfies ReplaceSelfButtonAction;
+				templater: false,
+			} satisfies Required<ReplaceSelfButtonAction>;
 		} else if (type === ButtonActionType.REGEXP_REPLACE_IN_NOTE) {
 			return {
 				type: ButtonActionType.REGEXP_REPLACE_IN_NOTE,
 				regexp: '([A-Z])\\w+',
 				replacement: 'Replacement text',
-			} satisfies RegexpReplaceInNoteButtonAction;
+				regexpFlags: 'g',
+			} satisfies Required<RegexpReplaceInNoteButtonAction>;
 		} else if (type === ButtonActionType.INSERT_INTO_NOTE) {
 			return {
 				type: ButtonActionType.INSERT_INTO_NOTE,
 				line: 0,
 				value: 'Some text',
-			} satisfies InsertIntoNoteButtonAction;
+				templater: false,
+			} satisfies Required<InsertIntoNoteButtonAction>;
 		} else if (type === ButtonActionType.INLINE_JS) {
 			return {
 				type: ButtonActionType.INLINE_JS,
 				code: 'console.log("Hello world")',
-			} satisfies InlineJsButtonAction;
+			} satisfies Required<InlineJsButtonAction>;
 		}
 
 		expectType<never>(type);
diff --git a/packages/obsidian/src/main.ts b/packages/obsidian/src/main.ts
@@ -1,5 +1,5 @@
 import type { MarkdownPostProcessorContext, WorkspaceLeaf } from 'obsidian';
-import { loadPrism, Plugin, stringifyYaml } from 'obsidian';
+import { Plugin, stringifyYaml } from 'obsidian';
 import { RenderChildType } from 'packages/core/src/config/APIConfigs';
 import { EMBED_MAX_DEPTH } from 'packages/core/src/config/FieldConfigs';
 import type { IPlugin } from 'packages/core/src/IPlugin';
@@ -53,7 +53,8 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 	dependencyManager: DependencyManager;
 
 	async onload(): Promise<void> {
-		console.log(`meta-bind | Main >> load`);
+		console.log(`meta-bind | Main >> loading`);
+		console.time('meta-bind | Main >> load-time');
 
 		this.build = this.determineBuild();
 
@@ -112,8 +113,10 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 			);
 		}
 
+		console.timeEnd('meta-bind | Main >> load-time');
+		// TODO: not sure if this is still needed, but it adds 100+ms to the load time, so I disabled it for now
 		// we need to wait for prism to load first, otherwise prism will cause problems by highlighting things that it shouldn't
-		await loadPrism();
+		// await loadPrism();
 	}
 
 	onunload(): void {
@@ -339,7 +342,7 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 	}
 
 	async loadSettings(): Promise<void> {
-		console.log(`meta-bind | Main >> settings load`);
+		console.log(`meta-bind | Main >> loading settings`);
 
 		const loadedSettings = ((await this.loadData()) ?? {}) as MetaBindPluginSettings;
 
diff --git a/tests/__preload__/svelteLoader.ts b/tests/__preload__/svelteLoader.ts
@@ -6,7 +6,6 @@ plugin(
 	// @ts-ignore
 	esbuildSvelte({
 		compilerOptions: { css: 'injected', dev: true, generate: 'client', runes: true },
-		preprocess: sveltePreprocess(),
 		filterWarnings: warning => {
 			// we don't want warnings from node modules that we can do nothing about
 			return !warning.filename?.includes('node_modules');
