@wato787/microcms-cli 0.1.1 → 0.1.2

package/dist/commands/gen-types/config.js

@@ -16,12 +16,16 @@ export function resolveConfig(options) {
     const serviceDomain = toStringValue(options.serviceDomain) ??
         toStringValue(process.env.MICROCMS_SERVICE_DOMAIN);
     if (!serviceDomain) {
-        throw new Error('MICROCMS_SERVICE_DOMAIN is required. You can also pass --service-domain.');
+        const envDir = process.env.__MICROCMS_CLI_ENV_DIR ?? process.cwd();
+        throw new Error('MICROCMS_SERVICE_DOMAIN is required. You can also pass --service-domain.\n' +
+            `(Searched for .env / .env.local in: ${envDir}. CWD: ${process.cwd()})`);
     }
     const apiKey = toStringValue(options.apiKey) ??
         toStringValue(process.env.MICROCMS_MANAGEMENT_API_KEY);
     if (!apiKey) {
-        throw new Error('MICROCMS_MANAGEMENT_API_KEY is required. You can also pass --api-key.');
+        const envDir = process.env.__MICROCMS_CLI_ENV_DIR ?? process.cwd();
+        throw new Error('MICROCMS_MANAGEMENT_API_KEY is required. You can also pass --api-key.\n' +
+            `(Searched for .env / .env.local in: ${envDir}. CWD: ${process.cwd()})`);
     }
     return { serviceDomain, apiKey };
 }

package/dist/index.js

@@ -1,15 +1,28 @@
 #!/usr/bin/env node
+import fs from 'node:fs';
 import path from 'node:path';
 import dotenv from 'dotenv';
-dotenv.config();
-dotenv.config({ path: path.resolve(process.cwd(), '.env.local') });
+function findEnvDir(dir) {
+    const parent = path.dirname(dir);
+    if (dir === parent)
+        return null;
+    const env = path.join(dir, '.env');
+    const envLocal = path.join(dir, '.env.local');
+    if (fs.existsSync(env) || fs.existsSync(envLocal))
+        return dir;
+    return findEnvDir(parent);
+}
+const envDir = findEnvDir(process.cwd()) ?? process.cwd();
+dotenv.config({ path: path.join(envDir, '.env') });
+dotenv.config({ path: path.join(envDir, '.env.local') });
+process.env.__MICROCMS_CLI_ENV_DIR = envDir;
 import { Command } from 'commander';
 import { genTypesCommand } from './commands/gen-types/index.js';
 const program = new Command();
 program
     .name('microcms-cli')
     .description('CLI for microCMS')
-    .version('0.1.1');
+    .version('0.1.2');
 program
     .command('gen-types [endpointId]')
     .description('Fetch API schema from microCMS Management API and generate TypeScript types')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wato787/microcms-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "AI-friendly CLI tool for microCMS, built with Bun",
   "license": "MIT",
   "main": "dist/index.js",