prisma-laravel-migrate 3.1.15 → 3.1.17

package/dist/cli/cli.js

@@ -1176,11 +1176,11 @@ function safeUnlink(p) {
   } catch {
   }
 }
-async function loadSharedConfig(schemaDir) {
+async function loadSharedConfig(schemaDir, type) {
   const envOverride = process.env.PRISMA_LARAVEL_CFG;
   const defaultPath = path13.join(schemaDir, "prisma-laravel.config.js");
   const cfgPath = envOverride ? path13.resolve(envOverride) : defaultPath;
-  console.log("Loading shared config from - " + cfgPath);
+  console.log("Loading shared config for " + type + " from - " + cfgPath);
   try {
     await fs.accessSync(cfgPath);
     const mod = await loadConfig(cfgPath);
@@ -1196,7 +1196,7 @@ async function generateLaravelSchema(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
   const schemaDir = path13.dirname(generator.sourceFilePath ?? path13.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const shared = await loadSharedConfig(schemaDir, "migrations");
   let groups = [];
   const loadGroups = async (p) => {
     const abs = path13.resolve(process.cwd(), p);
@@ -2256,10 +2256,9 @@ function buildModelContent(model) {
 // src/generator/modeler/index.ts
 async function generateLaravelModels(options) {
   const { dmmf, generator } = options;
-  generator.sourceFilePath;
   const raw = generator.config ?? {};
-  const schemaDir = path13.dirname(path13.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path13.dirname(generator.sourceFilePath ?? path13.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path13.resolve(process.cwd(), raw["groups"]);
@@ -3184,8 +3183,8 @@ function hasModelSpecificTsStub(model, cfg) {
 async function generateTypesFromPrisma(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
-  const schemaDir = path13.dirname(options.schemaPath);
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path13.dirname(generator.sourceFilePath ?? path13.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "typescript");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path13.resolve(process.cwd(), raw["groups"]);
@@ -3235,6 +3234,7 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier

package/dist/cli/migrator.index.js

@@ -1145,11 +1145,11 @@ async function loadConfig2(configPath) {
 }
 
 // src/utils/loadSharedCfg.ts
-async function loadSharedConfig(schemaDir) {
+async function loadSharedConfig(schemaDir, type) {
   const envOverride = process.env.PRISMA_LARAVEL_CFG;
   const defaultPath = path7.join(schemaDir, "prisma-laravel.config.js");
   const cfgPath = envOverride ? path7.resolve(envOverride) : defaultPath;
-  console.log("Loading shared config from - " + cfgPath);
+  console.log("Loading shared config for " + type + " from - " + cfgPath);
   try {
     await fs2.accessSync(cfgPath);
     const mod = await loadConfig2(cfgPath);
@@ -1165,7 +1165,7 @@ async function generateLaravelSchema(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
   const schemaDir = path7.dirname(generator.sourceFilePath ?? path7.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const shared = await loadSharedConfig(schemaDir, "migrations");
   let groups = [];
   const loadGroups = async (p) => {
     const abs = path7.resolve(process.cwd(), p);
@@ -1279,7 +1279,7 @@ generatorHandler({
     if (!migrationsOutput && options.sourceFilePath) {
       try {
         const schemaDir = path7.dirname(options.sourceFilePath);
-        const shared = await loadSharedConfig(schemaDir);
+        const shared = await loadSharedConfig(schemaDir, "models");
         migrationsOutput = shared?.migrate?.outputDir ?? shared?.output?.migrations ?? void 0;
       } catch {
       }

package/dist/cli/models.index.js

@@ -1179,11 +1179,11 @@ async function loadConfig2(configPath) {
 }
 
 // src/utils/loadSharedCfg.ts
-async function loadSharedConfig(schemaDir) {
+async function loadSharedConfig(schemaDir, type) {
   const envOverride = process.env.PRISMA_LARAVEL_CFG;
   const defaultPath = path7.join(schemaDir, "prisma-laravel.config.js");
   const cfgPath = envOverride ? path7.resolve(envOverride) : defaultPath;
-  console.log("Loading shared config from - " + cfgPath);
+  console.log("Loading shared config for " + type + " from - " + cfgPath);
   try {
     await fs.accessSync(cfgPath);
     const mod = await loadConfig2(cfgPath);
@@ -1262,10 +1262,9 @@ function buildModelContent(model) {
 // src/generator/modeler/index.ts
 async function generateLaravelModels(options) {
   const { dmmf, generator } = options;
-  generator.sourceFilePath;
   const raw = generator.config ?? {};
-  const schemaDir = path7.dirname(path7.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path7.dirname(generator.sourceFilePath ?? path7.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path7.resolve(process.cwd(), raw["groups"]);
@@ -1356,7 +1355,7 @@ generatorHandler({
     if (options.sourceFilePath) {
       try {
         const schemaDir = path7.dirname(options.sourceFilePath);
-        const shared = await loadSharedConfig(schemaDir);
+        const shared = await loadSharedConfig(schemaDir, "models");
         if (!modelOutput) {
           modelOutput = shared?.modeler?.outputDir ?? shared?.output?.models ?? void 0;
         }

package/dist/cli/ts.index.js

@@ -68,11 +68,11 @@ async function loadConfig(configPath) {
 }
 
 // src/utils/loadSharedCfg.ts
-async function loadSharedConfig(schemaDir) {
+async function loadSharedConfig(schemaDir, type) {
   const envOverride = process.env.PRISMA_LARAVEL_CFG;
   const defaultPath = path7.join(schemaDir, "prisma-laravel.config.js");
   const cfgPath = envOverride ? path7.resolve(envOverride) : defaultPath;
-  console.log("Loading shared config from - " + cfgPath);
+  console.log("Loading shared config for " + type + " from - " + cfgPath);
   try {
     await fs.accessSync(cfgPath);
     const mod = await loadConfig(cfgPath);
@@ -167,6 +167,10 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+function addToConfig(key, value) {
+  global._config = global._config ?? {};
+  global._config[key] = value;
+}
 function getConfig(key, property) {
   const cfg = global._config ?? {};
   const section = cfg[key];
@@ -1633,8 +1637,8 @@ function hasModelSpecificTsStub(model, cfg) {
 async function generateTypesFromPrisma(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
-  const schemaDir = path7.dirname(options.schemaPath);
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path7.dirname(generator.sourceFilePath ?? path7.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "typescript");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path7.resolve(process.cwd(), raw["groups"]);
@@ -1684,6 +1688,7 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier
@@ -1771,7 +1776,7 @@ generatorHandler({
     if (!defaultOutput && options.sourceFilePath) {
       try {
         const schemaDir = path7.dirname(options.sourceFilePath);
-        const shared = await loadSharedConfig(schemaDir);
+        const shared = await loadSharedConfig(schemaDir, "typescript");
         if (shared && shared.ts) {
           defaultOutput = shared.ts.outputDir;
         }

package/dist/index.js

@@ -1298,11 +1298,11 @@ async function loadConfig2(configPath) {
 }
 
 // src/utils/loadSharedCfg.ts
-async function loadSharedConfig(schemaDir) {
+async function loadSharedConfig(schemaDir, type) {
   const envOverride = process.env.PRISMA_LARAVEL_CFG;
   const defaultPath = path9.join(schemaDir, "prisma-laravel.config.js");
   const cfgPath = envOverride ? path9.resolve(envOverride) : defaultPath;
-  console.log("Loading shared config from - " + cfgPath);
+  console.log("Loading shared config for " + type + " from - " + cfgPath);
   try {
     await fs2.accessSync(cfgPath);
     const mod = await loadConfig2(cfgPath);
@@ -1318,7 +1318,7 @@ async function generateLaravelSchema(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
   const schemaDir = path9.dirname(generator.sourceFilePath ?? path9.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const shared = await loadSharedConfig(schemaDir, "migrations");
   let groups = [];
   const loadGroups = async (p) => {
     const abs = path9.resolve(process.cwd(), p);
@@ -2251,10 +2251,9 @@ var PrismaToLaravelModelGenerator = class {
 // src/generator/modeler/index.ts
 async function generateLaravelModels(options) {
   const { dmmf, generator } = options;
-  generator.sourceFilePath;
   const raw = generator.config ?? {};
-  const schemaDir = path9.dirname(path9.resolve(options.schemaPath));
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path9.dirname(generator.sourceFilePath ?? path9.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path9.resolve(process.cwd(), raw["groups"]);
@@ -3179,8 +3178,8 @@ function hasModelSpecificTsStub(model, cfg) {
 async function generateTypesFromPrisma(options) {
   const { dmmf, generator } = options;
   const raw = generator.config ?? {};
-  const schemaDir = path9.dirname(options.schemaPath);
-  const shared = await loadSharedConfig(schemaDir);
+  const schemaDir = path9.dirname(generator.sourceFilePath ?? path9.resolve(options.schemaPath));
+  const shared = await loadSharedConfig(schemaDir, "typescript");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path9.resolve(process.cwd(), raw["groups"]);
@@ -3230,6 +3229,7 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-laravel-migrate",
-  "version": "3.1.15",
+  "version": "3.1.17",
   "description": "Generate laravel migrations and/or models using prisma files",
   "bin": {
     "prisma-laravel-migrations": "./dist/cli/migrator.index.js",
@@ -54,7 +54,8 @@
     "minimatch": "^10.0.3",
     "node-diff3": "^3.1.2",
     "pluralize": "^8.0.0",
-    "prettier": "^3.6.2"
+    "prettier": "^3.6.2",
+    "prisma-laravel-migrate": "^3.1.16"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",