fix: import schema and config sheet from files

Author: n1rna

internal/command/apply.go

@@ -2,18 +2,18 @@
 package command
 
 import (
-	"bufio"
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"runtime"
 	"strings"
 
 	"github.com/spf13/cobra"
 
+	"github.com/n1rna/ee-cli/internal/config"
 	"github.com/n1rna/ee-cli/internal/entities"
 	"github.com/n1rna/ee-cli/internal/output"
+	"github.com/n1rna/ee-cli/internal/parser"
 	"github.com/n1rna/ee-cli/internal/util"
 )
 
@@ -100,7 +100,7 @@ func (c *ApplyCommand) Run(cmd *cobra.Command, args []string) error {
 	var values map[string]string
 
 	// Detect if the argument is a file path or environment name
-	if c.isFilePath(envOrSheetName) {
+	if entities.IsFilePath(envOrSheetName) {
 		// Apply .env file directly
 		values, err = c.applyEnvFile(envOrSheetName)
 		if err != nil {
@@ -174,7 +174,10 @@ func (c *ApplyCommand) applyProjectEnvironment(
 ) (map[string]string, error) {
 	// Check if we're in a project context
 	if !context.IsInProject {
-		return nil, fmt.Errorf("no .ee file found - not in a project context")
+		return nil, fmt.Errorf(
+			"no %s file found - not in a project context",
+			config.ProjectConfigFileName,
+		)
 	}
 
 	// Validate that the environment exists
@@ -202,6 +205,23 @@ func (c *ApplyCommand) applyProjectEnvironment(
 	return values, nil
 }
 
+// applyEnvFile reads and parses a .env file using the parser.ParseFile function
+func (c *ApplyCommand) applyEnvFile(filePath string) (map[string]string, error) {
+	// Check if file exists
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		return nil, fmt.Errorf(".env file not found: %s", filePath)
+	}
+
+	// Use the parser to parse the .env file
+	p := parser.NewAnnotatedDotEnvParser()
+	values, _, err := p.ParseFile(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse .env file: %w", err)
+	}
+
+	return values, nil
+}
+
 // runCommandWithEnvironment runs a command with the specified environment variables
 func (c *ApplyCommand) runCommandWithEnvironment(
 	values map[string]string,
@@ -284,92 +304,3 @@ func (c *ApplyCommand) startShellWithEnvironment(
 
 	return nil
 }
-
-// isFilePath detects if the argument is a file path rather than an environment name
-// Returns true if the argument starts with '.', '/', '~', or contains a file extension
-func (c *ApplyCommand) isFilePath(arg string) bool {
-	// Check if it's a relative path starting with '.' or current directory
-	if strings.HasPrefix(arg, ".") {
-		return true
-	}
-
-	// Check if it's an absolute path starting with '/' or '~'
-	if strings.HasPrefix(arg, "/") || strings.HasPrefix(arg, "~") {
-		return true
-	}
-
-	// Check if it contains a file extension
-	if filepath.Ext(arg) != "" {
-		return true
-	}
-
-	// Check if the file actually exists
-	if _, err := os.Stat(arg); err == nil {
-		return true
-	}
-
-	return false
-}
-
-// applyEnvFile reads and parses a .env file
-func (c *ApplyCommand) applyEnvFile(filePath string) (map[string]string, error) {
-	// Check if file exists
-	if _, err := os.Stat(filePath); os.IsNotExist(err) {
-		return nil, fmt.Errorf(".env file not found: %s", filePath)
-	}
-
-	// Open file
-	file, err := os.Open(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open .env file: %w", err)
-	}
-	defer func() {
-		if err := file.Close(); err != nil {
-			// Log error but don't override the main error
-		}
-	}()
-
-	values := make(map[string]string)
-	scanner := bufio.NewScanner(file)
-	lineNum := 0
-
-	for scanner.Scan() {
-		lineNum++
-		line := strings.TrimSpace(scanner.Text())
-
-		// Skip empty lines and comments
-		if line == "" || strings.HasPrefix(line, "#") {
-			continue
-		}
-
-		// Parse KEY=VALUE format
-		parts := strings.SplitN(line, "=", 2)
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("invalid line %d in .env file: %s", lineNum, line)
-		}
-
-		key := strings.TrimSpace(parts[0])
-		value := strings.TrimSpace(parts[1])
-
-		// Remove surrounding quotes if present
-		if len(value) >= 2 {
-			if (strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"")) ||
-				(strings.HasPrefix(value, "'") && strings.HasSuffix(value, "'")) {
-				value = value[1 : len(value)-1]
-			}
-		}
-
-		// Validate key name
-		if key == "" {
-			return nil, fmt.Errorf("empty variable name on line %d", lineNum)
-		}
-
-		values[key] = value
-	}
-
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("error reading .env file: %w", err)
-	}
-
-	return values, nil
-}

internal/command/init.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/n1rna/ee-cli/internal/config"
 	"github.com/n1rna/ee-cli/internal/entities"
 	"github.com/n1rna/ee-cli/internal/output"
 	"github.com/n1rna/ee-cli/internal/parser"
@@ -51,12 +52,12 @@ Examples:
 	}
 
 	cmd.Flags().
-		String("schema", "", "Schema reference to use (local://schema-name or remote://path)")
-	cmd.Flags().String("remote", "", "Remote URL for synchronization")
+		StringP("schema", "s", "", "Schema reference to use (local://schema-name or remote://path)")
+	cmd.Flags().StringP("remote", "r", "", "Remote URL for synchronization")
 	cmd.Flags().
 		StringSlice("var", []string{}, "Add schema variable (format:name:type:title:required:default)")
-	cmd.Flags().Bool("force", false, "Overwrite existing .ee file")
-	cmd.Flags().Bool("quiet", false, "Suppress non-error output")
+	cmd.Flags().BoolP("force", "f", false, "Overwrite existing .ee file")
+	cmd.Flags().BoolP("quiet", "q", false, "Suppress non-error output")
 
 	return cmd
 }
@@ -88,9 +89,12 @@ func (c *InitCommand) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Check if .ee file already exists
-	eeFile := ".ee"
+	eeFile := config.ProjectConfigFileName
 	if _, err := os.Stat(eeFile); err == nil && !force {
-		return fmt.Errorf(".ee file already exists (use --force to overwrite)")
+		return fmt.Errorf(
+			"%s file already exists (use --force to overwrite)",
+			config.ProjectConfigFileName,
+		)
 	}
 
 	// Build schema configuration
@@ -117,7 +121,7 @@ func (c *InitCommand) Run(cmd *cobra.Command, args []string) error {
 	// Save .ee file
 	err = parser.SaveProjectConfig(projectConfig, eeFile)
 	if err != nil {
-		return fmt.Errorf("failed to save .ee file: %w", err)
+		return fmt.Errorf("failed to save %s file: %w", config.ProjectConfigFileName, err)
 	}
 
 	// Get entity manager from context for schema loading
@@ -133,7 +137,7 @@ func (c *InitCommand) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	printer.Success(fmt.Sprintf("✓ Initialized ee project: %s", projectName))
-	printer.Info("✓ Created .ee configuration file")
+	printer.Info(fmt.Sprintf("✓ Created %s configuration file", config.ProjectConfigFileName))
 	if len(projectConfig.Environments) > 0 {
 		printer.Info("✓ Created sample .env files for environments")
 	}

internal/command/schema.go

@@ -6,13 +6,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
 	"github.com/n1rna/ee-cli/internal/entities"
 	"github.com/n1rna/ee-cli/internal/output"
+	"github.com/n1rna/ee-cli/internal/parser"
 )
 
 type SchemaCommand struct {
@@ -69,7 +71,7 @@ Examples:
 		RunE: c.runCreate,
 	}
 
-	cmd.Flags().String("import", "", "Import schema definition from a YAML file")
+	cmd.Flags().String("import", "", "Import schema definition from a YAML, JSON, or dotenv file")
 	cmd.Flags().String("description", "", "Schema description")
 	cmd.Flags().
 		StringSlice("variable", []string{}, "Add variable in format 'name:type:title:required[:default]'")
@@ -379,22 +381,59 @@ func (c *SchemaCommand) importSchema(
 	name string,
 	filename string,
 ) error {
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return fmt.Errorf("failed to read import file: %w", err)
-	}
+	// Detect file format based on extension
+	ext := strings.ToLower(filepath.Ext(filename))
 
 	var schemaObj entities.Schema
-	if err := yaml.Unmarshal(data, &schemaObj); err != nil {
-		return fmt.Errorf("failed to parse schema file: %w", err)
+	var variables []entities.Variable
+	var description string
+	var extends []string
+
+	// If it's a .env file, use the dotenv parser to extract schema
+	if ext == ".env" || strings.Contains(strings.ToLower(filename), ".env") {
+		p := parser.NewAnnotatedDotEnvParser()
+		_, schema, err := p.ParseFile(filename)
+		if err != nil {
+			return fmt.Errorf("failed to parse .env file: %w", err)
+		}
+		variables = schema.Variables
+		description = schema.Description
+	} else {
+		// For other files, read and try YAML/JSON
+		data, err := os.ReadFile(filename)
+		if err != nil {
+			return fmt.Errorf("failed to read import file: %w", err)
+		}
+
+		// Try YAML first, then JSON, then dotenv as fallback
+		if err := yaml.Unmarshal(data, &schemaObj); err != nil {
+			if err := json.Unmarshal(data, &schemaObj); err != nil {
+				// Try parsing as dotenv file as fallback
+				p := parser.NewAnnotatedDotEnvParser()
+				_, schema, parseErr := p.ParseFile(filename)
+				if parseErr != nil {
+					return fmt.Errorf("file is neither valid YAML, JSON, nor dotenv format: %w", parseErr)
+				}
+				variables = schema.Variables
+				description = schema.Description
+			} else {
+				variables = schemaObj.Variables
+				description = schemaObj.Description
+				extends = schemaObj.Extends
+			}
+		} else {
+			variables = schemaObj.Variables
+			description = schemaObj.Description
+			extends = schemaObj.Extends
+		}
 	}
 
 	// Create schema using the manager
 	s, err := manager.Schemas.Create(
 		name,
-		schemaObj.Description,
-		schemaObj.Variables,
-		schemaObj.Extends,
+		description,
+		variables,
+		extends,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create schema: %w", err)
@@ -458,8 +497,6 @@ func (c *SchemaCommand) runDelete(cmd *cobra.Command, args []string) error {
 
 	schemaName := args[0]
 
-	// TODO: Add dependency checking - see if schema is in use by projects/config sheets
-
 	if err := manager.Schemas.Delete(schemaName); err != nil {
 		return fmt.Errorf("failed to delete schema: %w", err)
 	}

internal/command/sheet.go

@@ -6,12 +6,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
 	"github.com/n1rna/ee-cli/internal/entities"
 	"github.com/n1rna/ee-cli/internal/output"
+	"github.com/n1rna/ee-cli/internal/parser"
 )
 
 // SheetCommand handles the ee sheet command
@@ -226,6 +229,8 @@ func (c *SheetCommand) runCreate(cmd *cobra.Command, args []string) error {
 		schemaRef.Ref = "#/schemas/" + s.ID
 	}
 
+	// TODO: Add logic for guessing the schema of the sheet
+
 	// Create standalone config sheet
 	cs := entities.NewConfigSheet(sheetName, description, schemaRef, values)
 
@@ -245,17 +250,37 @@ func (c *SheetCommand) runCreate(cmd *cobra.Command, args []string) error {
 }
 
 func (c *SheetCommand) importValuesFromFile(filename string) (map[string]string, error) {
+	// Detect file format based on extension
+	ext := strings.ToLower(filepath.Ext(filename))
+
+	// If it's a .env file, use the dotenv parser
+	if ext == ".env" || strings.Contains(strings.ToLower(filename), ".env") {
+		p := parser.NewAnnotatedDotEnvParser()
+		values, _, err := p.ParseFile(filename)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse .env file: %w", err)
+		}
+		return values, nil
+	}
+
+	// For other files, read and try YAML/JSON
 	data, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file: %w", err)
 	}
 
 	values := make(map[string]string)
 
-	// Try YAML first, then JSON
+	// Try YAML first, then JSON, then dotenv as fallback
 	if err := yaml.Unmarshal(data, &values); err != nil {
 		if err := json.Unmarshal(data, &values); err != nil {
-			return nil, fmt.Errorf("file is neither valid YAML nor JSON")
+			// Try parsing as dotenv file as fallback
+			p := parser.NewAnnotatedDotEnvParser()
+			parsedValues, _, parseErr := p.ParseFile(filename)
+			if parseErr != nil {
+				return nil, fmt.Errorf("file is neither valid YAML, JSON, nor dotenv format")
+			}
+			return parsedValues, nil
 		}
 	}