@famgia/omnify-laravel 0.0.82 → 0.0.84

package/dist/index.cjs

@@ -2215,12 +2215,14 @@ function generateModels(schemas, options) {
 function getModelPath(model) {
   return model.path;
 }
-function generateProviderRegistration(existingContent, laravelVersion) {
+function generateProviderRegistration(existingContent, laravelVersion, laravelRoot = "") {
   const providerClass = "App\\Providers\\OmnifyServiceProvider::class";
   const providerLine = `    ${providerClass},`;
+  const bootstrapPath = laravelRoot ? `${laravelRoot}/bootstrap/providers.php` : "bootstrap/providers.php";
+  const configPath = laravelRoot ? `${laravelRoot}/config/app.php` : "config/app.php";
   if (existingContent && existingContent.includes("OmnifyServiceProvider")) {
     return {
-      path: laravelVersion === "laravel11+" ? "bootstrap/providers.php" : "config/app.php",
+      path: laravelVersion === "laravel11+" ? bootstrapPath : configPath,
       content: existingContent,
       laravelVersion,
       alreadyRegistered: true
@@ -2240,14 +2242,14 @@ function generateProviderRegistration(existingContent, laravelVersion) {
         result.push(line);
       }
       return {
-        path: "bootstrap/providers.php",
+        path: bootstrapPath,
         content: result.join("\n"),
         laravelVersion,
         alreadyRegistered: false
       };
     } else {
       return {
-        path: "bootstrap/providers.php",
+        path: bootstrapPath,
         content: `<?php
 
 return [
@@ -2289,7 +2291,7 @@ ${providerLine}
           const lastNewline = beforeClose.lastIndexOf("\n");
           const content = existingContent.substring(0, lastNewline + 1) + providerLine + "\n" + existingContent.substring(lastNewline + 1);
           return {
-            path: "config/app.php",
+            path: configPath,
             content,
             laravelVersion,
             alreadyRegistered: false
@@ -3594,6 +3596,18 @@ function getResourcePath(resource) {
 }
 
 // src/plugin.ts
+function inferLaravelRoot(providersPath) {
+  const normalized = providersPath.replace(/\\/g, "/");
+  const match = normalized.match(/^(.*)\/app\/Providers\/?$/i);
+  if (match && match[1]) {
+    return match[1];
+  }
+  const baseMatch = normalized.match(/^(.*)\/app\/Providers\/OmnifyBase\/?$/i);
+  if (baseMatch && baseMatch[1]) {
+    return baseMatch[1];
+  }
+  return "";
+}
 function getExistingMigrationTables(migrationsDir) {
   const existingTables = /* @__PURE__ */ new Set();
   if (!(0, import_node_fs.existsSync)(migrationsDir)) {
@@ -3863,8 +3877,11 @@ function laravelPlugin(options) {
           schemaName: model.schemaName
         }
       }));
-      const bootstrapProvidersPath = (0, import_node_path.join)(ctx.cwd, "bootstrap/providers.php");
-      const configAppPath = (0, import_node_path.join)(ctx.cwd, "config/app.php");
+      const laravelRoot = inferLaravelRoot(resolved.providersPath);
+      const bootstrapProvidersRelPath = laravelRoot ? `${laravelRoot}/bootstrap/providers.php` : "bootstrap/providers.php";
+      const configAppRelPath = laravelRoot ? `${laravelRoot}/config/app.php` : "config/app.php";
+      const bootstrapProvidersPath = (0, import_node_path.join)(ctx.cwd, bootstrapProvidersRelPath);
+      const configAppPath = (0, import_node_path.join)(ctx.cwd, configAppRelPath);
       let existingContent = null;
       let laravelVersion;
       if ((0, import_node_fs.existsSync)(bootstrapProvidersPath)) {
@@ -3875,16 +3892,24 @@ function laravelPlugin(options) {
           existingContent = null;
         }
       } else if ((0, import_node_fs.existsSync)(configAppPath)) {
-        laravelVersion = "laravel10-";
         try {
-          existingContent = (0, import_node_fs.readFileSync)(configAppPath, "utf-8");
+          const configContent = (0, import_node_fs.readFileSync)(configAppPath, "utf-8");
+          if (/'providers'\s*=>\s*\[/.test(configContent)) {
+            laravelVersion = "laravel10-";
+            existingContent = configContent;
+          } else {
+            laravelVersion = "laravel11+";
+            existingContent = null;
+          }
         } catch {
+          laravelVersion = "laravel11+";
           existingContent = null;
         }
       } else {
         laravelVersion = "laravel11+";
+        existingContent = null;
       }
-      const registration = generateProviderRegistration(existingContent, laravelVersion);
+      const registration = generateProviderRegistration(existingContent, laravelVersion, laravelRoot);
       if (registration && !registration.alreadyRegistered) {
         outputs.push({
           path: registration.path,