@tolgamorf/env2op-cli 0.2.2 → 0.2.3

package/dist/index.d.ts

@@ -212,11 +212,14 @@ declare const errors: {
 	envFileEmpty: (path: string) => Env2OpError;
 	opCliNotInstalled: () => Env2OpError;
 	opNotSignedIn: () => Env2OpError;
+	opSigninFailed: () => Env2OpError;
 	vaultNotFound: (vault: string) => Env2OpError;
 	vaultCreateFailed: (message: string) => Env2OpError;
 	itemExists: (title: string, vault: string) => Env2OpError;
 	itemCreateFailed: (message: string) => Env2OpError;
 	itemEditFailed: (message: string) => Env2OpError;
 	parseError: (line: number, message: string) => Env2OpError;
+	templateNotFound: (path: string) => Env2OpError;
+	injectFailed: (message: string) => Env2OpError;
 };
 export { writeTemplate, vaultExists, validateParseResult, signIn, parseEnvFile, itemExists2 as itemExists, generateUsageInstructions, generateTemplateContent, errors, editSecureNote, createVault, createSecureNote, checkSignedIn, checkOpCli, TemplateOptions, ParseResult, ErrorCodes, EnvVariable, EnvLine, Env2OpError, CreateItemResult, CreateItemOptions, ConvertOptions };

package/dist/index.js

@@ -1,3 +1,89 @@
+import { createRequire } from "node:module";
+var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+
+// package.json
+var require_package = __commonJS((exports, module) => {
+  module.exports = {
+    name: "@tolgamorf/env2op-cli",
+    version: "0.2.3",
+    description: "Convert .env files to 1Password Secure Notes and generate templates for op inject/run",
+    type: "module",
+    main: "dist/index.js",
+    module: "dist/index.js",
+    types: "dist/index.d.ts",
+    exports: {
+      ".": {
+        import: "./dist/index.js",
+        types: "./dist/index.d.ts"
+      }
+    },
+    bin: {
+      env2op: "dist/cli.js",
+      op2env: "dist/op2env-cli.js"
+    },
+    files: [
+      "dist",
+      "LICENSE",
+      "README.md"
+    ],
+    scripts: {
+      dev: "bun run src/cli.ts",
+      build: "bunup",
+      test: "bun test",
+      "test:watch": "bun test --watch",
+      "test:coverage": "bun test --coverage",
+      typecheck: "tsc --noEmit",
+      lint: "bunx biome check .",
+      "lint:fix": "bunx biome check . --write",
+      format: "bunx biome format --write .",
+      "format:check": "bunx biome format .",
+      prepublishOnly: "bun run build",
+      release: "bun run scripts/release.ts"
+    },
+    keywords: [
+      "env",
+      "1password",
+      "op",
+      "cli",
+      "secrets",
+      "environment-variables",
+      "dotenv",
+      "secure-notes",
+      "bun",
+      "op-inject",
+      "op-run",
+      "template"
+    ],
+    author: {
+      name: "Tolga O.",
+      url: "https://github.com/tolgamorf"
+    },
+    license: "MIT",
+    repository: {
+      type: "git",
+      url: "git+https://github.com/tolgamorf/env2op-cli.git"
+    },
+    bugs: {
+      url: "https://github.com/tolgamorf/env2op-cli/issues"
+    },
+    homepage: "https://github.com/tolgamorf/env2op-cli#readme",
+    engines: {
+      node: ">=18.0.0"
+    },
+    dependencies: {
+      "@clack/prompts": "^0.11.0",
+      picocolors: "^1.1.1"
+    },
+    devDependencies: {
+      "@biomejs/biome": "^2.3.10",
+      "@tsconfig/bun": "^1.0.10",
+      "@types/bun": "^1.3.5",
+      bunup: "^0.16.17",
+      typescript: "^5.9.3"
+    }
+  };
+});
+
 // src/core/env-parser.ts
 import { readFile } from "node:fs/promises";
 
@@ -32,16 +118,21 @@ var errors = {
   envFileEmpty: (path) => new Env2OpError(`No valid environment variables found in ${path}`, ErrorCodes.ENV_FILE_EMPTY, "Ensure the file contains KEY=value pairs"),
   opCliNotInstalled: () => new Env2OpError("1Password CLI (op) is not installed", ErrorCodes.OP_CLI_NOT_INSTALLED, "Install it from https://1password.com/downloads/command-line/"),
   opNotSignedIn: () => new Env2OpError("Not signed in to 1Password CLI", ErrorCodes.OP_NOT_SIGNED_IN, 'Run "op signin" to authenticate'),
+  opSigninFailed: () => new Env2OpError("Failed to sign in to 1Password CLI", ErrorCodes.OP_SIGNIN_FAILED, 'Try running "op signin" manually'),
   vaultNotFound: (vault) => new Env2OpError(`Vault not found: ${vault}`, ErrorCodes.VAULT_NOT_FOUND, 'Run "op vault list" to see available vaults'),
   vaultCreateFailed: (message) => new Env2OpError(`Failed to create vault: ${message}`, ErrorCodes.VAULT_CREATE_FAILED),
   itemExists: (title, vault) => new Env2OpError(`Item "${title}" already exists in vault "${vault}"`, ErrorCodes.ITEM_EXISTS, "Use default behavior (overwrites) or choose a different item name"),
   itemCreateFailed: (message) => new Env2OpError(`Failed to create 1Password item: ${message}`, ErrorCodes.ITEM_CREATE_FAILED),
   itemEditFailed: (message) => new Env2OpError(`Failed to edit 1Password item: ${message}`, ErrorCodes.ITEM_EDIT_FAILED),
-  parseError: (line, message) => new Env2OpError(`Parse error at line ${line}: ${message}`, ErrorCodes.PARSE_ERROR)
+  parseError: (line, message) => new Env2OpError(`Parse error at line ${line}: ${message}`, ErrorCodes.PARSE_ERROR),
+  templateNotFound: (path) => new Env2OpError(`Template file not found: ${path}`, ErrorCodes.TEMPLATE_NOT_FOUND, "Ensure the file exists and the path is correct"),
+  injectFailed: (message) => new Env2OpError("Failed to pull secrets from 1Password", ErrorCodes.INJECT_FAILED, message)
 };
 
+// src/core/constants.ts
+var HEADER_SEPARATOR = `# ${"=".repeat(75)}`;
+
 // src/core/env-parser.ts
-var HEADER_SEPARATOR = "# ===========================================================================";
 function stripHeaders(content) {
   const lines = content.split(`
 `);
@@ -151,16 +242,8 @@ function quoteArg(arg) {
   }
   return arg;
 }
-async function exec(command, args = [], options = {}) {
-  const { verbose = false } = options;
-  const fullCommand = `${command} ${args.map(quoteArg).join(" ")}`;
-  if (verbose) {
-    console.log(pc.dim(`$ ${fullCommand}`));
-  }
+function collectOutput(proc, verbose) {
   return new Promise((resolve) => {
-    const proc = spawn(command, args, {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
     const stdoutChunks = [];
     const stderrChunks = [];
     proc.stdout?.on("data", (data) => {
@@ -194,48 +277,29 @@ async function exec(command, args = [], options = {}) {
     });
   });
 }
+async function exec(command, args = [], options = {}) {
+  const { verbose = false } = options;
+  const fullCommand = `${command} ${args.map(quoteArg).join(" ")}`;
+  if (verbose) {
+    console.log(pc.dim(`$ ${fullCommand}`));
+  }
+  const proc = spawn(command, args, {
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  return collectOutput(proc, verbose);
+}
 async function execWithStdin(command, args = [], options) {
   const { stdin: stdinContent, verbose = false } = options;
   if (verbose) {
     const fullCommand = `${command} ${args.map(quoteArg).join(" ")}`;
     console.log(pc.dim(`$ echo '...' | ${fullCommand}`));
   }
-  return new Promise((resolve) => {
-    const proc = spawn(command, args, {
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    const stdoutChunks = [];
-    const stderrChunks = [];
-    proc.stdin?.write(stdinContent);
-    proc.stdin?.end();
-    proc.stdout?.on("data", (data) => {
-      const text = Buffer.isBuffer(data) ? data.toString() : String(data);
-      stdoutChunks.push(text);
-      if (verbose)
-        process.stdout.write(text);
-    });
-    proc.stderr?.on("data", (data) => {
-      const text = Buffer.isBuffer(data) ? data.toString() : String(data);
-      stderrChunks.push(text);
-      if (verbose)
-        process.stderr.write(text);
-    });
-    proc.on("close", (code) => {
-      resolve({
-        stdout: stdoutChunks.join(""),
-        stderr: stderrChunks.join(""),
-        exitCode: code ?? 1
-      });
-    });
-    proc.on("error", (err) => {
-      stderrChunks.push(err.message);
-      resolve({
-        stdout: stdoutChunks.join(""),
-        stderr: stderrChunks.join(""),
-        exitCode: 1
-      });
-    });
+  const proc = spawn(command, args, {
+    stdio: ["pipe", "pipe", "pipe"]
   });
+  proc.stdin?.write(stdinContent);
+  proc.stdin?.end();
+  return collectOutput(proc, verbose);
 }
 
 // src/core/onepassword.ts
@@ -357,90 +421,25 @@ async function editSecureNote(options) {
   }
 }
 // src/core/template-generator.ts
-import { writeFileSync } from "node:fs";
-// package.json
-var package_default = {
-  name: "@tolgamorf/env2op-cli",
-  version: "0.2.2",
-  description: "Convert .env files to 1Password Secure Notes and generate templates for op inject/run",
-  type: "module",
-  main: "dist/index.js",
-  module: "dist/index.js",
-  types: "dist/index.d.ts",
-  exports: {
-    ".": {
-      import: "./dist/index.js",
-      types: "./dist/index.d.ts"
-    }
-  },
-  bin: {
-    env2op: "dist/cli.js",
-    op2env: "dist/op2env-cli.js"
-  },
-  files: [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
-  scripts: {
-    dev: "bun run src/cli.ts",
-    build: "bunup",
-    test: "bun test",
-    "test:watch": "bun test --watch",
-    "test:coverage": "bun test --coverage",
-    typecheck: "tsc --noEmit",
-    lint: "bunx biome check .",
-    "lint:fix": "bunx biome check . --write",
-    format: "bunx biome format --write .",
-    "format:check": "bunx biome format .",
-    prepublishOnly: "bun run build",
-    release: "bun run scripts/release.ts"
-  },
-  keywords: [
-    "env",
-    "1password",
-    "op",
-    "cli",
-    "secrets",
-    "environment-variables",
-    "dotenv",
-    "secure-notes",
-    "bun",
-    "op-inject",
-    "op-run",
-    "template"
-  ],
-  author: {
-    name: "Tolga O.",
-    url: "https://github.com/tolgamorf"
-  },
-  license: "MIT",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/tolgamorf/env2op-cli.git"
-  },
-  bugs: {
-    url: "https://github.com/tolgamorf/env2op-cli/issues"
-  },
-  homepage: "https://github.com/tolgamorf/env2op-cli#readme",
-  engines: {
-    node: ">=18.0.0"
-  },
-  dependencies: {
-    "@clack/prompts": "^0.11.0",
-    picocolors: "^1.1.1"
-  },
-  devDependencies: {
-    "@biomejs/biome": "^2.3.10",
-    "@tsconfig/bun": "^1.0.10",
-    "@types/bun": "^1.3.5",
-    bunup: "^0.16.17",
-    typescript: "^5.9.3"
+import { writeFileSync as writeFileSync2 } from "node:fs";
+
+// src/lib/update.ts
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+var CACHE_DIR = join(homedir(), ".env2op");
+var CACHE_FILE = join(CACHE_DIR, "update-check.json");
+var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
+function getCliVersion() {
+  try {
+    const pkg = require_package();
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
   }
-};
+}
 
 // src/core/template-generator.ts
-var SEPARATOR = "# ===========================================================================";
 function deriveEnvFileName(templateFileName) {
   if (templateFileName.endsWith(".tpl")) {
     return templateFileName.slice(0, -4);
@@ -453,7 +452,7 @@ function formatTimestamp() {
 function generateTemplateHeader(templateFileName) {
   const envFileName = deriveEnvFileName(templateFileName);
   return [
-    SEPARATOR,
+    HEADER_SEPARATOR,
     `#  ${templateFileName} — 1Password Secret References`,
     "#",
     "#  This template contains references to secrets stored in 1Password.",
@@ -466,9 +465,9 @@ function generateTemplateHeader(templateFileName) {
     `#    op run --env-file ${templateFileName} -- npm start`,
     "#",
     `#  Pushed: ${formatTimestamp()}`,
-    `#  Generated by env2op v${package_default.version}`,
+    `#  Generated by env2op v${getCliVersion()}`,
     "#  https://github.com/tolgamorf/env2op-cli",
-    SEPARATOR,
+    HEADER_SEPARATOR,
     ""
   ];
 }
@@ -495,7 +494,7 @@ function generateTemplateContent(options, templateFileName) {
 `;
 }
 function writeTemplate(content, outputPath) {
-  writeFileSync(outputPath, content, "utf-8");
+  writeFileSync2(outputPath, content, "utf-8");
 }
 function generateUsageInstructions(templatePath) {
   return ["Usage:", `  op2env ${templatePath}`, `  op run --env-file ${templatePath} -- npm start`].join(`