prisma-laravel-migrate 3.1.16 → 3.1.18

package/dist/cli/cli.js

@@ -328,12 +328,12 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+var config = {};
 function addToConfig(key, value) {
-  global._config = global._config ?? {};
-  global._config[key] = value;
+  config[key] = value;
 }
 function getConfig(key, property) {
-  const cfg = global._config ?? {};
+  const cfg = config;
   const section = cfg[key];
   return property ? section?.[property] : section;
 }
@@ -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);
@@ -2258,7 +2258,7 @@ async function generateLaravelModels(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, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path13.resolve(process.cwd(), raw["groups"]);
@@ -3183,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"]);
@@ -3234,6 +3234,8 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
+  addToConfig("model", { tablePrefix: cfg.tablePrefix, tableSuffix: cfg.tableSuffix });
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier
@@ -3348,7 +3350,7 @@ async function runGenerators(configPath, skipPrismaGenerate = false) {
     const { migCfg, modCfg, tsCfg } = await getLaravelGeneratorConfigs(datamodel);
     const sdk = dmf.default ?? dmf;
     const dmmf = await sdk.getDMMF({ datamodel });
-    const config = (conf) => {
+    const config2 = (conf) => {
       return {
         dmmf,
         // pass the models block config directly
@@ -3361,9 +3363,9 @@ async function runGenerators(configPath, skipPrismaGenerate = false) {
         version: ""
       };
     };
-    await generateLaravelSchema(config(migCfg));
-    await generateLaravelModels(config(modCfg));
-    await generateTypesFromPrisma(config(tsCfg));
+    await generateLaravelSchema(config2(migCfg));
+    await generateLaravelModels(config2(modCfg));
+    await generateTypesFromPrisma(config2(tsCfg));
   };
   if (skipPrismaGenerate) {
     await doRun();

package/dist/cli/migrator.index.js

@@ -240,12 +240,12 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+var config = {};
 function addToConfig(key, value) {
-  global._config = global._config ?? {};
-  global._config[key] = value;
+  config[key] = value;
 }
 function getConfig(key, property) {
-  const cfg = global._config ?? {};
+  const cfg = config;
   const section = cfg[key];
   return property ? section?.[property] : section;
 }
@@ -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

@@ -77,12 +77,12 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+var config = {};
 function addToConfig(key, value) {
-  global._config = global._config ?? {};
-  global._config[key] = value;
+  config[key] = value;
 }
 function getConfig(key, property) {
-  const cfg = global._config ?? {};
+  const cfg = config;
   const section = cfg[key];
   return property ? section?.[property] : section;
 }
@@ -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);
@@ -1264,7 +1264,7 @@ async function generateLaravelModels(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, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path7.resolve(process.cwd(), raw["groups"]);
@@ -1355,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,8 +167,12 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+var config = {};
+function addToConfig(key, value) {
+  config[key] = value;
+}
 function getConfig(key, property) {
-  const cfg = global._config ?? {};
+  const cfg = config;
   const section = cfg[key];
   return property ? section?.[property] : section;
 }
@@ -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,8 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
+  addToConfig("model", { tablePrefix: cfg.tablePrefix, tableSuffix: cfg.tableSuffix });
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier
@@ -1771,7 +1777,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

@@ -392,12 +392,12 @@ function decorate(name, opts) {
   const suf = opts.tableSuffix ?? "";
   return `${pre}${name}${suf}`.trim();
 }
+var config = {};
 function addToConfig(key, value) {
-  global._config = global._config ?? {};
-  global._config[key] = value;
+  config[key] = value;
 }
 function getConfig(key, property) {
-  const cfg = global._config ?? {};
+  const cfg = config;
   const section = cfg[key];
   return property ? section?.[property] : section;
 }
@@ -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);
@@ -2253,7 +2253,7 @@ async function generateLaravelModels(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, "models");
   let groups = [];
   if (raw["groups"]) {
     const groupsModulePath = path9.resolve(process.cwd(), raw["groups"]);
@@ -3178,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"]);
@@ -3229,6 +3229,8 @@ async function generateTypesFromPrisma(options) {
   if (!existsSync(tsOutDir)) {
     mkdirSync(tsOutDir, { recursive: true });
   }
+  addToConfig("typescript", cfg);
+  addToConfig("model", { tablePrefix: cfg.tablePrefix, tableSuffix: cfg.tableSuffix });
   global._config = global._config || {};
   global._config.ts = {
     prettier: !!cfg.prettier

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-laravel-migrate",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "description": "Generate laravel migrations and/or models using prisma files",
   "bin": {
     "prisma-laravel-migrations": "./dist/cli/migrator.index.js",