feat(core): move plugins sorting to the extension builder

Author: d3m1d0v

src/core/ExtensionBuilder.test.ts

@@ -74,6 +74,25 @@ describe('ExtensionBuilder', () => {
         expect(plugins.length).toBe(2);
     });
 
+    it('should sort plugins by priority', () => {
+        const plugin0 = new Plugin({});
+        const plugin1 = new Plugin({});
+        const plugin2 = new Plugin({});
+        const plugin3 = new Plugin({});
+        const plugins = new ExtensionBuilder()
+            .addPlugin(() => plugin3, ExtensionBuilder.PluginPriority.VeryLow)
+            .addPlugin(() => plugin1)
+            .addPlugin(() => plugin0, ExtensionBuilder.PluginPriority.VeryHigh)
+            .addPlugin(() => plugin2)
+            .build()
+            .plugins({} as ExtensionDeps);
+
+        expect(plugins.indexOf(plugin0)).toBe(0);
+        expect(plugins.indexOf(plugin1)).toBe(1);
+        expect(plugins.indexOf(plugin2)).toBe(2);
+        expect(plugins.indexOf(plugin3)).toBe(3);
+    });
+
     it('should add actions', () => {
         const actions = new ExtensionBuilder()
             .addAction('action1', () => ({

src/core/ExtensionBuilder.ts

@@ -146,17 +146,14 @@ export class ExtensionBuilder {
                 return map;
             },
             plugins: (deps) => {
-                // TODO: sort plugins here after WIKI-16660
-                return plugins.reduce<{plugin: Plugin; priority: number}[]>(
-                    (acc, {cb, priority}) => {
+                return plugins
+                    .sort((a, b) => b.priority - a.priority)
+                    .reduce<Plugin[]>((acc, {cb}) => {
                         const res = cb(deps);
-                        if (Array.isArray(res))
-                            acc.push(...res.map((plugin) => ({plugin, priority})));
-                        else acc.push({plugin: res, priority});
+                        if (Array.isArray(res)) acc.push(...res);
+                        else acc.push(res);
                         return acc;
-                    },
-                    [],
-                );
+                    }, []);
             },
             actions: (deps) =>
                 actions.reduce((obj, [name, cb]) => {

src/core/ExtensionsManager.ts

@@ -124,13 +124,9 @@ export class ExtensionsManager {
     }
 
     private createDerived() {
-        const plugins: {plugin: Plugin; priority: number}[] = [];
-        plugins.push(...this.#spec.plugins(this.#deps));
+        this.#plugins = this.#spec.plugins(this.#deps);
         Object.assign(this.#actions, this.#spec.actions(this.#deps));
 
-        // TODO: move sorting to ExtensionBuilder after WIKI-16660
-        this.#plugins = plugins.sort((a, b) => b.priority - a.priority).map((item) => item.plugin);
-
         for (const [name, view] of this.#nodeViewCreators) {
             this.#nodeViews[name] = view(this.#deps);
         }

src/core/types/extension.ts

@@ -17,7 +17,7 @@ export type ExtensionSpec = {
     configureMd(md: MarkdownIt): MarkdownIt;
     nodes(): OrderedMap<YENodeSpec>;
     marks(): OrderedMap<YEMarkSpec>;
-    plugins(deps: ExtensionDeps): {plugin: Plugin; priority: number}[];
+    plugins(deps: ExtensionDeps): Plugin[];
     actions(deps: ExtensionDeps): Record<string, ActionSpec>;
 };