Merge pull request #609 from devforth/next

Next

Author: yaroslav8765

adminforth/commands/callTsProxy.js

@@ -8,6 +8,27 @@ import dotenv from "dotenv";
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
 
+function getLocalBinPath(currentDirectory) {
+  return path.join(currentDirectory, "node_modules", ".bin");
+}
+
+function getLocalBinExecutable(currentDirectory, command) {
+  const extension = process.platform === "win32" ? ".cmd" : "";
+  const executablePath = path.join(getLocalBinPath(currentDirectory), `${command}${extension}`);
+  return fs.existsSync(executablePath) ? executablePath : command;
+}
+
+function getEnvWithLocalBin(currentDirectory) {
+  const pathKey = process.platform === "win32" ? "Path" : "PATH";
+  const localBinPath = getLocalBinPath(currentDirectory);
+  const currentPath = process.env[pathKey] || "";
+
+  return {
+    ...process.env,
+    [pathKey]: [localBinPath, currentPath].filter(Boolean).join(path.delimiter),
+  };
+}
+
 export function callTsProxy(tsCode, silent=false) {
 
   const currentDirectory = process.cwd();
@@ -22,28 +43,37 @@ export function callTsProxy(tsCode, silent=false) {
 
   process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
   return new Promise((resolve, reject) => {
-    const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
-      env: process.env,
+    const child = spawn(getLocalBinExecutable(currentDirectory, "tsx"), [path.join(currentFileFolder, "proxy.ts")], {
+      env: getEnvWithLocalBin(currentDirectory),
     });
     let stderr = "";
-    let stdoutLogs = [];
+    let stdout = "";
 
     child.stdout.on("data", (data) => {
-      stdoutLogs.push(data.toString());
+      stdout += data.toString();
     });
 
     child.stderr.on("data", (data) => {
       stderr += data;
     });
 
+    child.on("error", (error) => {
+      reject(error);
+    });
+
     child.on("close", (code) => {
-      const tsProxyResult = stdoutLogs.find(log => log.includes('>>>>>>>'));
-      const preparedStdout = tsProxyResult.slice(tsProxyResult.indexOf('>>>>>>>') + 7, tsProxyResult.lastIndexOf('<<<<<<<'));
-      const preparedStdoutLogs = stdoutLogs.filter(log => !log.includes('>>>>>>>'));
+      const resultStart = stdout.indexOf('>>>>>>>');
+      const resultEnd = stdout.lastIndexOf('<<<<<<<');
+      if (resultStart === -1 || resultEnd === -1 || resultEnd < resultStart) {
+        reject(new Error(`Invalid JSON from tsproxy. stdout: ${stdout}, stderr: ${stderr}`));
+        return;
+      }
+      const preparedStdout = stdout.slice(resultStart + 7, resultEnd);
+      const preparedStdoutLogs = stdout.slice(0, resultStart);
       if (code === 0) {
         try {
-          for (const log of preparedStdoutLogs) {
-            console.log(log);
+          if (preparedStdoutLogs) {
+            process.stdout.write(preparedStdoutLogs);
           }
           const parsed = JSON.parse(preparedStdout);
           if (!silent) {

adminforth/commands/createApp/templates/package.json.hbs

@@ -32,8 +32,9 @@
     "typescript": "6.0.3",
     "tsx": "4.11.2",
     "@types/express": "^4.17.21",
-    "@types/node": "latest",
+    "@types/node": "latest"{{#if includePrismaMigrations}},
     "@prisma/client": "latest",
     "prisma": "^7.0.0"
+    {{/if}}
   }
-}
+}

adminforth/commands/createApp/utils.js

@@ -37,6 +37,8 @@ function detectAdminforthVersion() {
 }
 
 const adminforthVersion = detectAdminforthVersion();
+const SUPPORTED_DB_URL_SCHEMES = ['sqlite://', 'postgresql://', 'mongodb://', 'mysql://', 'clickhouse://'];
+const PRISMA_MIGRATION_DB_PROTOCOLS = ['sqlite', 'postgres', 'postgresql', 'mysql'];
 
 
 export function parseArgumentsIntoOptions(rawArgs) {
@@ -56,7 +58,6 @@ export function parseArgumentsIntoOptions(rawArgs) {
     appName: args['--app-name'],
     db: args['--db'],
     useNpm: args['--use-npm'],
-    includePrismaMigrations: args['--include-prisma-migrations'],
   };
 }
 
@@ -94,8 +95,19 @@ export async function promptForMissingOptions(options) {
     });
   }
 
-  if (!options.includePrismaMigrations) {
-    questions.push({
+  const answers = await inquirer.prompt(questions);
+  const resolvedOptions = {
+      ...options,
+      appName: options.appName || answers.appName,
+      db: options.db || answers.db,
+      useNpm: options.useNpm || answers.useNpm,
+  };
+
+  if (
+    resolvedOptions.includePrismaMigrations === undefined &&
+    isPrismaMigrationDbUrl(resolvedOptions.db)
+  ) {
+    const prismaAnswer = await inquirer.prompt([{
       type: 'select',
       name: 'includePrismaMigrations',
       message: 'Include Prisma migrations? >',
@@ -104,18 +116,13 @@ export async function promptForMissingOptions(options) {
         { name: 'No', value: false },
       ],
       default: true,
-    });
-
+    }]);
+    resolvedOptions.includePrismaMigrations = prismaAnswer.includePrismaMigrations;
+  } else {
+    resolvedOptions.includePrismaMigrations = Boolean(resolvedOptions.includePrismaMigrations);
   }
 
-  const answers = await inquirer.prompt(questions);
-  return {
-      ...options,
-      appName: options.appName || answers.appName,
-      db: options.db || answers.db,
-      useNpm: options.useNpm || answers.useNpm,
-      includePrismaMigrations: options.includePrismaMigrations || answers.includePrismaMigrations,
-  };
+  return resolvedOptions;
 }
 
 function checkNodeVersion(minRequiredVersion = 20) {
@@ -134,6 +141,15 @@ function parseConnectionString(dbUrl) {
   return new ConnectionString(dbUrl);
 }
 
+function isPrismaMigrationDbUrl(dbUrl) {
+  try {
+    const connectionString = parseConnectionString(dbUrl);
+    return PRISMA_MIGRATION_DB_PROTOCOLS.includes(connectionString.protocol);
+  } catch {
+    return false;
+  }
+}
+
 function detectDbProvider(protocol) {
   if (protocol.startsWith('sqlite')) {
     return 'sqlite';
@@ -143,25 +159,27 @@ function detectDbProvider(protocol) {
     return 'mongodb';
   } else if (protocol.startsWith('mysql')) {
     return 'mysql';
+  } else if (protocol.startsWith('clickhouse')) {
+    return 'clickhouse';
   }
 
-  const message = `Unknown database provider for ${protocol}. Only SQLite, PostgreSQL, and MongoDB are supported now.`;
+  const message = `Unknown database provider for ${protocol}. Supported database URL schemes: ${SUPPORTED_DB_URL_SCHEMES.join(', ')}.`;
   throw new Error(message);
 }
 
 function generateDbUrlForPrisma(connectionString) {
+  if (!PRISMA_MIGRATION_DB_PROTOCOLS.includes(connectionString.protocol))
+    return null;
   if (connectionString.protocol.startsWith('sqlite'))
     return `file:${connectionString.host}`;
-  if (connectionString.protocol.startsWith('mongodb'))
-    return null;
   return connectionString.toString();
 }
 
 function generateDbUrlForPrismaProd(connectionString) {
+  if (!PRISMA_MIGRATION_DB_PROTOCOLS.includes(connectionString.protocol))
+    return null;
   if (connectionString.protocol.startsWith('sqlite'))
     return `file:/code/db/${connectionString.host}`;
-  if (connectionString.protocol.startsWith('mongodb'))
-    return null;
   return connectionString.toString();
 }
 
@@ -400,7 +418,7 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
       data: { 
         appName,
         adminforthVersion: adminforthVersion,
-        includePrismaMigrations,
+        includePrismaMigrations: Boolean(resolvedPrismaDbUrl),
       },
     },
     {
@@ -425,7 +443,7 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
     )
   }
 
-  if (includePrismaMigrations) {
+  if (resolvedPrismaDbUrl) {
     templateTasks.push(
       {
         src: 'schema.prisma.hbs',
@@ -506,7 +524,7 @@ function generateFinalInstructionsPnpm(skipPrismaSetup, options) {
   ${chalk.dim('// Go to the project directory')}
   ${chalk.dim('$')}${chalk.cyan(` cd ${options.appName}`)}\n`;
 
-  if (options.includePrismaMigrations)
+  if (options.includePrismaMigrations && !skipPrismaSetup)
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.dim('$')}${chalk.cyan(' pnpm makemigration --name init && pnpm migrate:local')}\n`;
@@ -528,7 +546,7 @@ function generateFinalInstructionsNpm(skipPrismaSetup, options) {
   ${chalk.dim('// Go to the project directory')}
   ${chalk.dim('$')}${chalk.cyan(` cd ${options.appName}`)}\n`;
 
-  if (options.includePrismaMigrations)
+  if (options.includePrismaMigrations && !skipPrismaSetup)
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.dim('$')}${chalk.cyan(' npm run makemigration -- --name init && npm run migrate:local')}\n`;