@donotdev/cli 0.0.19 → 0.0.21

package/dist/bin/commands/sync-secrets.js

@@ -6920,7 +6920,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6929,7 +6929,7 @@ var init_PathResolver = __esm({
         }
         try {
           return await safeExecuteAsync(async () => {
-            if (Buffer2.isBuffer(writeContent)) {
+            if (Buffer.isBuffer(writeContent)) {
               await fs.promises.writeFile(normalizedPath, writeContent);
             } else {
               await fs.promises.writeFile(normalizedPath, writeContent, "utf8");
@@ -6981,7 +6981,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6989,7 +6989,7 @@ var init_PathResolver = __esm({
           writeContent = String(content);
         }
         try {
-          if (Buffer2.isBuffer(writeContent)) {
+          if (Buffer.isBuffer(writeContent)) {
             fs.writeFileSync(normalizedPath, writeContent);
           } else {
             fs.writeFileSync(normalizedPath, writeContent, "utf8");
@@ -7716,7 +7716,7 @@ var init_pathResolver = __esm({
 });
 
 // packages/tooling/src/bundler/utils.ts
-import { Buffer as Buffer2 } from "node:buffer";
+import { Buffer } from "node:buffer";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { dirname as dirname3, resolve as resolve3 } from "node:path";
@@ -7733,7 +7733,7 @@ var init_utils = __esm({
       globalThis.require = require2;
       globalThis.__filename = __filename;
       globalThis.__dirname = __dirname;
-      globalThis.Buffer = Buffer2;
+      globalThis.Buffer = Buffer;
       globalThis.process = process;
       if (typeof global === "undefined") {
         globalThis.global = globalThis;
@@ -7768,9 +7768,39 @@ var init_cli_input = __esm({
   }
 });
 
+// packages/tooling/src/utils/secrets-resolver.ts
+function parseEnvFile(filePath) {
+  if (!pathExists(filePath)) return {};
+  const content = readSync(filePath, { format: "text" });
+  if (typeof content !== "string" || !content) return {};
+  const result = {};
+  for (const line of content.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx === -1) continue;
+    const key = trimmed.slice(0, eqIdx).trim();
+    let value = trimmed.slice(eqIdx + 1).trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    if (key && value) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+var init_secrets_resolver = __esm({
+  "packages/tooling/src/utils/secrets-resolver.ts"() {
+    "use strict";
+    init_utils();
+    init_pathResolver();
+  }
+});
+
 // packages/tooling/src/apps/sync-secrets.ts
 import { spawnSync } from "node:child_process";
-function parseEnvFile(filePath) {
+function parseEnvFile2(filePath) {
   if (!pathExists(filePath)) {
     throw new DoNotDevError(
       `Environment file not found: ${filePath}`,
@@ -7778,30 +7808,22 @@ function parseEnvFile(filePath) {
       { context: { filePath } }
     );
   }
-  const contentRaw = readSync(filePath, { format: "text" });
-  const content = typeof contentRaw === "string" ? contentRaw : null;
-  if (!content) {
-    throw new Error(`Failed to read secrets file: ${filePath}`);
+  const result = parseEnvFile(filePath);
+  if (Object.keys(result).length === 0) {
+    log.debug(`No key-value pairs found in ${filePath}`);
   }
-  const secrets = {};
-  content.split("\n").forEach((line, index) => {
-    const trimmedLine = line.trim();
-    if (!trimmedLine || trimmedLine.startsWith("#")) {
-      return;
-    }
-    const equalIndex = trimmedLine.indexOf("=");
-    if (equalIndex === -1) {
-      log.warn(`Invalid line format at line ${index + 1}: ${trimmedLine}`);
-      return;
-    }
-    const key = trimmedLine.substring(0, equalIndex).trim();
-    const value = trimmedLine.substring(equalIndex + 1).trim();
-    const cleanValue = value.replace(/^["']|["']$/g, "");
-    if (key && cleanValue) {
-      secrets[key] = cleanValue;
+  return result;
+}
+function parseSecretsWithFallback(envFilePath, projectRoot) {
+  const dndevSecretsPath = joinPath(projectRoot, ".dndev.secrets");
+  if (pathExists(dndevSecretsPath)) {
+    const secrets = parseEnvFile(dndevSecretsPath);
+    if (Object.keys(secrets).length > 0) {
+      log.info(`Reading secrets from: ${dndevSecretsPath}`);
+      return secrets;
     }
-  });
-  return secrets;
+  }
+  return parseEnvFile2(envFilePath);
 }
 function detectPlatform() {
   const currentDir = process.cwd();
@@ -8161,7 +8183,7 @@ function uploadServiceAccountToGitHub(appDir, repo, dryRun = false, staging = fa
   const contentRaw = readSync(filePath, { format: "text" });
   const content = typeof contentRaw === "string" ? contentRaw : null;
   if (!content) return;
-  const encoded = Buffer2.from(content).toString("base64");
+  const encoded = Buffer.from(content).toString("base64");
   setGitHubSecret(secretName, encoded, repo, dryRun);
 }
 async function main(options = {}) {
@@ -8248,7 +8270,7 @@ Examples:
         return 1;
       }
       log.info(`Syncing secrets to GitHub repository: ${repo}`);
-      const secrets2 = parseEnvFile(envFilePath);
+      const secrets2 = parseSecretsWithFallback(envFilePath, currentDir);
       const secretKeys2 = Object.keys(secrets2);
       if (secretKeys2.length === 0) {
         log.info("No secrets found in .env file");
@@ -8284,14 +8306,13 @@ Examples:
       return 0;
     }
     const platform = config.platform || detectPlatform();
-    log.info(`Reading secrets from: ${envFilePath}`);
     if (config.verbose) {
       log.debug(`Working directory: ${currentDir}`);
       log.debug(`Environment file: ${envFilePath}`);
       log.debug(`Platform: ${platform}`);
       log.debug(`Dry run mode: ${config.dryRun}`);
     }
-    const secrets = parseEnvFile(envFilePath);
+    const secrets = parseSecretsWithFallback(envFilePath, currentDir);
     const secretKeys = Object.keys(secrets);
     if (secretKeys.length === 0) {
       log.info("No secrets found in .env file");
@@ -8351,6 +8372,7 @@ var init_sync_secrets = __esm({
     init_cli_output();
     init_errors();
     init_pathResolver();
+    init_secrets_resolver();
   }
 });
 

package/dist/bin/commands/type-check.js

@@ -6712,7 +6712,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6721,7 +6721,7 @@ var init_PathResolver = __esm({
         }
         try {
           return await safeExecuteAsync(async () => {
-            if (Buffer2.isBuffer(writeContent)) {
+            if (Buffer.isBuffer(writeContent)) {
               await fs.promises.writeFile(normalizedPath, writeContent);
             } else {
               await fs.promises.writeFile(normalizedPath, writeContent, "utf8");
@@ -6773,7 +6773,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6781,7 +6781,7 @@ var init_PathResolver = __esm({
           writeContent = String(content);
         }
         try {
-          if (Buffer2.isBuffer(writeContent)) {
+          if (Buffer.isBuffer(writeContent)) {
             fs.writeFileSync(normalizedPath, writeContent);
           } else {
             fs.writeFileSync(normalizedPath, writeContent, "utf8");
@@ -7510,7 +7510,7 @@ function globSync(pattern, options = {}) {
   });
   return results.map((p) => pathResolverInstance.normalizePath(p));
 }
-var pathResolverInstance, getRepoRoot, normalizePath, pathExists, readSync, writeSync, removeSync, getDirname;
+var pathResolverInstance, getRepoRoot, normalizePath, pathExists, readSync, writeSync, removeSync, getDirname, joinPath;
 var init_pathResolver = __esm({
   "packages/tooling/src/utils/pathResolver.ts"() {
     "use strict";
@@ -7528,11 +7528,14 @@ var init_pathResolver = __esm({
     getDirname = (filePath) => {
       return normalizePath(dirname2(filePath));
     };
+    joinPath = (...pathSegments) => {
+      return normalizePath(...pathSegments);
+    };
   }
 });
 
 // packages/tooling/src/bundler/utils.ts
-import { Buffer as Buffer2 } from "node:buffer";
+import { Buffer } from "node:buffer";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { dirname as dirname3, resolve as resolve3 } from "node:path";
@@ -7549,7 +7552,7 @@ var init_utils = __esm({
       globalThis.require = require2;
       globalThis.__filename = __filename;
       globalThis.__dirname = __dirname;
-      globalThis.Buffer = Buffer2;
+      globalThis.Buffer = Buffer;
       globalThis.process = process;
       if (typeof global === "undefined") {
         globalThis.global = globalThis;
@@ -7959,7 +7962,7 @@ ${output}
         }
       }
       const logName2 = options.package ? `type-check-${options.package}.log` : `type-check-all.log`;
-      const logFilePath2 = normalizePath(repoRoot, logName2);
+      const logFilePath2 = joinPath(repoRoot, logName2);
       const logContent = [
         `DoNotDev Type Check - Errors`,
         `Generated: ${(/* @__PURE__ */ new Date()).toISOString()}`,
@@ -7983,7 +7986,7 @@ ${output}
       return 1;
     }
     const logName = options.package ? `type-check-${options.package}.log` : `type-check-all.log`;
-    const logFilePath = normalizePath(repoRoot, logName);
+    const logFilePath = joinPath(repoRoot, logName);
     if (pathExists(logFilePath, true)) {
       removeSync(logFilePath);
     }
@@ -8000,8 +8003,11 @@ ${output}
     displayDoNotDevError(doNotDevError);
     if (options.verbose && logEntries.length > 0) {
       const repoRoot = getRepoRoot();
+      if (!repoRoot) {
+        throw doNotDevError;
+      }
       const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-      const logFilePath = normalizePath(
+      const logFilePath = joinPath(
         repoRoot,
         `type-check-error-${timestamp}.log`
       );

package/dist/bin/commands/wai.js

@@ -6601,7 +6601,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6610,7 +6610,7 @@ var init_PathResolver = __esm({
         }
         try {
           return await safeExecuteAsync(async () => {
-            if (Buffer2.isBuffer(writeContent)) {
+            if (Buffer.isBuffer(writeContent)) {
               await fs.promises.writeFile(normalizedPath, writeContent);
             } else {
               await fs.promises.writeFile(normalizedPath, writeContent, "utf8");
@@ -6662,7 +6662,7 @@ var init_PathResolver = __esm({
         }
         const detectedFormat = this._detectFormat(filePath, format);
         let writeContent;
-        if (Buffer2.isBuffer(content)) {
+        if (Buffer.isBuffer(content)) {
           writeContent = content;
         } else if (detectedFormat === "json" && typeof content === "object") {
           writeContent = JSON.stringify(content, null, 2);
@@ -6670,7 +6670,7 @@ var init_PathResolver = __esm({
           writeContent = String(content);
         }
         try {
-          if (Buffer2.isBuffer(writeContent)) {
+          if (Buffer.isBuffer(writeContent)) {
             fs.writeFileSync(normalizedPath, writeContent);
           } else {
             fs.writeFileSync(normalizedPath, writeContent, "utf8");
@@ -7247,7 +7247,7 @@ var init_pathResolver = __esm({
 });
 
 // packages/tooling/src/bundler/utils.ts
-import { Buffer as Buffer2 } from "node:buffer";
+import { Buffer } from "node:buffer";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { dirname as dirname3, resolve as resolve3 } from "node:path";
@@ -7264,7 +7264,7 @@ var init_utils = __esm({
       globalThis.require = require2;
       globalThis.__filename = __filename;
       globalThis.__dirname = __dirname;
-      globalThis.Buffer = Buffer2;
+      globalThis.Buffer = Buffer;
       globalThis.process = process;
       if (typeof global === "undefined") {
         globalThis.global = globalThis;