@yumerijs/loader 2.2.1 → 3.0.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { Core, Logger, Context, fallback, I18n } from '@yumerijs/core';
+import { Core, Logger, Context, fallback, Schema, I18n, resolvePluginModule } from '@yumerijs/core';
 import * as fs from 'fs';
 import { promisify } from 'util';
 import { exec } from 'child_process';
@@ -146,7 +146,6 @@ export class PluginLoader {
                     this.logger.info(`Renderer "${rendererName}" is not registered. Attempting to auto-load...`);
                     try {
                         const rendererPackageMap = {
-                            'vue': '@yumerijs/vue-renderer',
                             'react': '@yumerijs/react-renderer',
                             'ejs': '@yumerijs/ejs-renderer'
                         };
@@ -171,20 +170,17 @@ export class PluginLoader {
                 return false;
             }
             this.plugins[pluginName] = pluginInstance;
-            const depend = pluginInstance.depend || [];
-            let injections = {};
-            for (const injection of depend) {
-                injections[injection] = this.core.getComponent(injection);
-            }
             // ### NEW CONFIG LOGIC ###
             const rawConfig = (this.config.plugins && this.config.plugins[pluginName]) || {};
-            const schema = pluginInstance.config; // The schema is exported as 'config'
+            const schema = pluginInstance.config || Schema.object({}); // The schema is exported as 'config'
             const finalConfig = fallback(schema, rawConfig);
             // Update the in-memory config with the fully resolved one
             this.config.plugins[pluginName] = finalConfig;
             // ### END NEW CONFIG LOGIC ###
-            const context = this.getContext(pluginName, injections);
-            context.renderer = this.core.renderers.get(pluginName);
+            const context = this.getContext(pluginName, {});
+            if (pluginInstance.render) {
+                context.renderer = this.core.renderers.get(pluginInstance.render || '');
+            }
             await this.core.plugin(pluginInstance, context, finalConfig);
             this.pluginStatus[pluginName] = "enabled" /* PluginStatus.ENABLED */;
             if (triggerPendingCheck) {
@@ -319,8 +315,10 @@ export class PluginLoader {
         this.pluginWatchers[pluginName] = watcher;
     }
     async loadModule(pluginName) {
-        const plugin = await import(pluginName);
-        return plugin.default || plugin;
+        const pluginModule = await import(pluginName);
+        const context = this.getContext(pluginName, {});
+        const rawConfig = (this.config.plugins && this.config.plugins[pluginName]) || {};
+        return resolvePluginModule(pluginModule, context, rawConfig);
     }
     async checkPluginDependencies(pluginPath) {
         return true;

package/dist/runtime/vueLoader.js

@@ -36,14 +36,14 @@ export function registerVueRuntimeLoader() {
                     source: descriptor.template.content,
                     ssr: true
                 });
-                code = `
-import { defineComponent } from 'vue';
-${templateResult.code}
-
-const __component__ = defineComponent({});
-__component__.ssrRender = ssrRender;
-
-export default __component__;
+                code = `
+import { defineComponent } from 'vue';
+${templateResult.code}
+
+const __component__ = defineComponent({});
+__component__.ssrRender = ssrRender;
+
+export default __component__;
 `;
             }
             else {
@@ -63,19 +63,19 @@ export default __component__;
                 sourcemap: 'inline',
                 sourcefile: filename
             });
-            const metadataCode = `
-const __yumeri_raw__ = module.exports && module.exports.__esModule ? module.exports.default : module.exports;
-const __yumeri_target__ = typeof __yumeri_raw__ === 'function' || (typeof __yumeri_raw__ === 'object' && __yumeri_raw__ !== null)
-  ? __yumeri_raw__
-  : null;
-if (__yumeri_target__) {
-  Object.defineProperty(__yumeri_target__, '__file', {
-    value: ${JSON.stringify(filename)},
-    enumerable: false,
-    configurable: true,
-    writable: true,
-  });
-}
+            const metadataCode = `
+const __yumeri_raw__ = module.exports && module.exports.__esModule ? module.exports.default : module.exports;
+const __yumeri_target__ = typeof __yumeri_raw__ === 'function' || (typeof __yumeri_raw__ === 'object' && __yumeri_raw__ !== null)
+  ? __yumeri_raw__
+  : null;
+if (__yumeri_target__) {
+  Object.defineProperty(__yumeri_target__, '__file', {
+    value: ${JSON.stringify(filename)},
+    enumerable: false,
+    configurable: true,
+    writable: true,
+  });
+}
 `;
             nodeModule._compile(`${transformed.code}\n${metadataCode}`, filename);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/loader",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,18 +29,18 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.10",
-    "@yumerijs/core": "^2.0.1",
+    "@yumerijs/core": "^3.0.0",
     "esbuild-register": "^3.6.0",
-    "typescript": "^5.8.2"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
     "@types/js-yaml": "^4.0.9",
     "@vue/compiler-sfc": "^3.5.25",
     "chokidar": "^4.0.3",
-    "esbuild": "^0.25.9",
+    "esbuild": "^0.28.1",
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@yumerijs/core": "^2.2.1"
+    "@yumerijs/core": "^3.0.0"
   }
-}
+}