chore: Replace AppState singleton to an instance.

Author: devbean

main.js

@@ -135,7 +135,7 @@ export abstract class AbstractWordPressClient implements WordPressClient {
       auth,
       postParams
     });
-    const html = AppState.getInstance().markdownParser.render(postParams.content);
+    const html = AppState.markdownParser.render(postParams.content);
     const result = await this.publish(
       postParams.title ?? 'A post from Obsidian!',
       html,

src/abstract-wp-client.ts

@@ -1,57 +1,27 @@
 import { Events } from 'obsidian';
 import MarkdownIt from 'markdown-it';
 import { MarkdownItImagePluginInstance } from './markdown-it-image-plugin';
-import { isEmpty, trim } from 'lodash-es';
+import { MarkdownItPlugin } from './types';
 
-
-export class AppState {
-  private static instance: AppState;
+class AppStore {
 
   markdownParser = new MarkdownIt()
     .use(MarkdownItImagePluginInstance.plugin);
 
   events = new Events();
 
-  /**
-   * Code verifier between classes.
-   */
   codeVerifier: string | undefined;
 
-  private constructor() {
-    this.markdownParser.renderer.rules.image = (tokens, idx) => {
-      const token = tokens[idx];
-      const srcIndex = token.attrIndex('src');
-      const src = token.attrs ?  token.attrs[srcIndex][1] : '';
-      const altText = token.content;
-
-      const [ alt, size] = altText.split('|');
-      let width;
-      let height;
-      if (!isEmpty(size)) {
-        const sepIndex = size.indexOf('x'); // width x height
-        if (sepIndex > 0) {
-          width = trim(size.substring(0, sepIndex));
-          height = trim(size.substring(sepIndex + 1));
-        } else {
-          width = trim(size);
-        }
-      }
-      if (width) {
-        if (height) {
-          return `<img src="${src}" width="${width}" height="${height}" alt="${alt}">`;
-        }
-        return `<img src="${src}" width="${width}" alt="${alt}">`;
-      } else {
-        return `<img src="${src}" alt="${alt}">`;
-      }
-    };
-  }
+  #markdownPlugins = new Map<string, MarkdownItPlugin>();
 
-  static getInstance(): AppState {
-    if (!AppState.instance) {
-      AppState.instance = new AppState();
-    }
-    return AppState.instance;
+  registerMarkdownItPlugin(name: string, plugin: MarkdownItPlugin): void {
+    this.#markdownPlugins.set(name, plugin);
   }
 
+  getMarkdownItPlugin(name: string): MarkdownItPlugin | undefined {
+    return this.#markdownPlugins.get(name);
+  }
 }
+
+export const AppState = new AppStore();
+

src/app-state.ts

@@ -97,7 +97,7 @@ export default class WordpressPlugin extends Plugin {
       }
     }
 
-    AppState.getInstance().markdownParser.set({
+    AppState.markdownParser.set({
       html: this.#settings?.enableHtml ?? false
     });
   }
@@ -152,15 +152,15 @@ export default class WordpressPlugin extends Plugin {
               error: e.error,
               desc: e.error_description.replace(/\+/g,' ')
             }));
-            AppState.getInstance().events.trigger(EventType.OAUTH2_TOKEN_GOT, undefined);
+            AppState.events.trigger(EventType.OAUTH2_TOKEN_GOT, undefined);
           } else if (e.code) {
             const token = await OAuth2Client.getWpOAuth2Client(this).getToken({
               code: e.code,
               redirectUri: WP_OAUTH2_REDIRECT_URI,
-              codeVerifier: AppState.getInstance().codeVerifier
+              codeVerifier: AppState.codeVerifier
             });
             console.log(token);
-            AppState.getInstance().events.trigger(EventType.OAUTH2_TOKEN_GOT, token);
+            AppState.events.trigger(EventType.OAUTH2_TOKEN_GOT, token);
           }
         }
       }

src/main.ts

@@ -1,6 +1,10 @@
 import { SafeAny } from './utils';
 import { isArray, isString } from 'lodash-es';
 
+export interface MarkdownItPlugin {
+  updateOptions: <OptionType> (option: OptionType) => void;
+}
+
 export type MatterData = { [p: string]: SafeAny };
 
 export interface Media {

src/types.ts

@@ -30,7 +30,7 @@ export function isPromiseFulfilledResult<T>(obj: SafeAny): obj is PromiseFulfill
 }
 
 export function setupMarkdownParser(settings: WordpressPluginSettings): void {
-  AppState.getInstance().markdownParser.use(MarkdownItMathJax3Plugin, {
+  AppState.markdownParser.use(MarkdownItMathJax3Plugin, {
     outputType: settings.mathJaxOutputType
   });
 }

src/utils.ts

@@ -62,7 +62,7 @@ class WpProfileModal extends AbstractModal {
     super(plugin);
 
     this.profileData = Object.assign({}, profile);
-    this.tokenGotRef = AppState.getInstance().events.on(EventType.OAUTH2_TOKEN_GOT, async token => {
+    this.tokenGotRef = AppState.events.on(EventType.OAUTH2_TOKEN_GOT, async token => {
       this.profileData.wpComOAuth2Token = token;
       if (atIndex >= 0) {
         // if token is undefined, just remove it
@@ -270,19 +270,19 @@ class WpProfileModal extends AbstractModal {
 
   onClose() {
     if (this.tokenGotRef) {
-      AppState.getInstance().events.offref(this.tokenGotRef);
+      AppState.events.offref(this.tokenGotRef);
     }
     const { contentEl } = this;
     contentEl.empty();
   }
 
   private async refreshWpComToken(): Promise<void> {
-    AppState.getInstance().codeVerifier = generateCodeVerifier();
+    AppState.codeVerifier = generateCodeVerifier();
     await OAuth2Client.getWpOAuth2Client(this.plugin).getAuthorizeCode({
       redirectUri: WP_OAUTH2_REDIRECT_URI,
       scope: [ 'posts', 'taxonomy', 'media', 'sites' ],
       blog: this.profileData.endpoint,
-      codeVerifier: AppState.getInstance().codeVerifier
+      codeVerifier: AppState.codeVerifier
     });
   }