@tolgamorf/env2op-cli 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgamorf/env2op-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Convert .env files to 1Password Secure Notes and generate templates for op inject/run",
   "type": "module",
   "main": "src/index.ts",

package/src/commands/convert.ts

@@ -11,7 +11,7 @@ import {
     vaultExists,
 } from "../core/onepassword";
 import { generateTemplateContent, generateUsageInstructions, writeTemplate } from "../core/template-generator";
-import type { ConvertOptions } from "../core/types";
+import type { ConvertOptions, CreateItemResult } from "../core/types";
 import { Env2OpError } from "../utils/errors";
 import { logger } from "../utils/logger";
 
@@ -41,6 +41,8 @@ export async function runConvert(options: ConvertOptions): Promise<void> {
         }
 
         // Step 2: Create 1Password Secure Note
+        let itemResult: CreateItemResult | null = null;
+
         if (dryRun) {
             logger.warn("Would create Secure Note");
             logger.keyValue("Vault", vault);
@@ -70,7 +72,9 @@ export async function runConvert(options: ConvertOptions): Promise<void> {
             // Check if vault exists
             const vaultFound = await vaultExists(vault);
 
-            if (!vaultFound) {
+            if (vaultFound) {
+                logger.success(`Vault "${vault}" found`);
+            } else {
                 if (yes) {
                     // Auto-create vault
                     logger.warn(`Vault "${vault}" not found, creating...`);
@@ -122,14 +126,14 @@ export async function runConvert(options: ConvertOptions): Promise<void> {
             spinner.start("Creating 1Password Secure Note...");
 
             try {
-                const result = await createSecureNote({
+                itemResult = await createSecureNote({
                     vault,
                     title: itemName,
                     fields: variables,
                     secret,
                 });
 
-                spinner.stop(`Created "${result.title}" in vault "${result.vault}"`);
+                spinner.stop(`Created "${itemResult.title}" in vault "${itemResult.vault}"`);
             } catch (error) {
                 spinner.stop("Failed to create Secure Note");
                 throw error;
@@ -139,19 +143,20 @@ export async function runConvert(options: ConvertOptions): Promise<void> {
         // Step 3: Generate template file
         const templateFileName = `${basename(envFile)}.tpl`;
         const templatePath = join(dirname(envFile), templateFileName);
-        const templateContent = generateTemplateContent(
-            {
-                vault,
-                itemTitle: itemName,
-                variables,
-                lines,
-            },
-            templateFileName,
-        );
 
         if (dryRun) {
             logger.warn(`Would generate template: ${templatePath}`);
-        } else {
+        } else if (itemResult) {
+            const templateContent = generateTemplateContent(
+                {
+                    vaultId: itemResult.vaultId,
+                    itemId: itemResult.id,
+                    variables,
+                    lines,
+                    fieldIds: itemResult.fieldIds,
+                },
+                templateFileName,
+            );
             writeTemplate(templateContent, templatePath);
             logger.success(`Generated template: ${templatePath}`);
         }

package/src/core/onepassword.ts

@@ -76,10 +76,22 @@ export async function createSecureNote(options: CreateItemOptions): Promise<Crea
         // Execute op command
         const result = await $`op ${args}`.json();
 
+        // Extract field IDs mapped by label
+        const fieldIds: Record<string, string> = {};
+        if (Array.isArray(result.fields)) {
+            for (const field of result.fields) {
+                if (field.label && field.id) {
+                    fieldIds[field.label] = field.id;
+                }
+            }
+        }
+
         return {
             id: result.id,
             title: result.title,
             vault: result.vault?.name ?? vault,
+            vaultId: result.vault?.id ?? "",
+            fieldIds,
         };
     } catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/src/core/template-generator.ts

@@ -12,7 +12,7 @@ import type { TemplateOptions } from "./types";
  * - `op run --env-file template.tpl -- command`
  */
 export function generateTemplateContent(options: TemplateOptions, templateFileName: string): string {
-    const { vault, itemTitle, lines: envLines } = options;
+    const { vaultId, itemId, lines: envLines, fieldIds } = options;
 
     const outputLines: string[] = [
         `# Generated by env2op v${pkg.version}`,
@@ -32,9 +32,11 @@ export function generateTemplateContent(options: TemplateOptions, templateFileNa
             case "comment":
                 outputLines.push(line.content);
                 break;
-            case "variable":
-                outputLines.push(`${line.key}=op://${vault}/${itemTitle}/${line.key}`);
+            case "variable": {
+                const fieldId = fieldIds[line.key] ?? line.key;
+                outputLines.push(`${line.key}=op://${vaultId}/${itemId}/${fieldId}`);
                 break;
+            }
         }
     }
 

package/src/core/types.ts

@@ -56,6 +56,10 @@ export interface CreateItemResult {
     title: string;
     /** Vault name */
     vault: string;
+    /** Vault ID */
+    vaultId: string;
+    /** Field IDs mapped by field label */
+    fieldIds: Record<string, string>;
 }
 
 /**
@@ -80,12 +84,14 @@ export interface ConvertOptions {
  * Options for template generation
  */
 export interface TemplateOptions {
-    /** Vault name */
-    vault: string;
-    /** Item title in 1Password */
-    itemTitle: string;
+    /** Vault ID */
+    vaultId: string;
+    /** Item ID in 1Password */
+    itemId: string;
     /** Variables to include */
     variables: EnvVariable[];
     /** All lines preserving structure */
     lines: EnvLine[];
+    /** Field IDs mapped by field label */
+    fieldIds: Record<string, string>;
 }