@vira-ui/cli 1.0.2 → 1.1.1

package/dist/index.js

@@ -91,7 +91,7 @@ const program = new commander_1.Command();
 program
     .name("vira")
     .description("ViraJS CLI - Create projects and generate code")
-    .version("1.0.1");
+    .version("1.1.1");
 const SUPPORTED_TEMPLATES = ["frontend", "fullstack", "kanban"];
 /**
  * Инициализация проекта в текущей директории
@@ -283,15 +283,6 @@ make
     await generateGoHandler(name, options.dir);
     console.log(chalk_1.default.green(`✓ handler ${name} created in ${options.dir}`));
 });
-make
-    .command("model")
-    .description("Create Go model struct")
-    .argument("<name>", "Model name (e.g. User)")
-    .option("-d, --dir <directory>", "Target directory", path.join("backend", "internal", "models"))
-    .action(async (name, options) => {
-    await generateGoModel(name, options.dir);
-    console.log(chalk_1.default.green(`✓ model ${name} created in ${options.dir}`));
-});
 make
     .command("migration")
     .description("Create SQL migration (up/down)")
@@ -310,6 +301,16 @@ make
     await generateEventHandler(name, options.dir);
     console.log(chalk_1.default.green(`✓ event handler ${name} created in ${options.dir}`));
 });
+make
+    .command("model")
+    .description("Create a Go model struct")
+    .argument("<name>", "Model name (e.g. Client)")
+    .option("-d, --dir <directory>", "Target directory", path.join("backend", "internal", "models"))
+    .option("-f, --fields <fields>", "Comma-separated field definitions (e.g. 'name:string,email:string,phone:string')")
+    .action(async (name, options) => {
+    await generateGoModel(name, options.dir, options.fields || undefined);
+    console.log(chalk_1.default.green(`✓ Go model ${name} created in ${options.dir}`));
+});
 make
     .command("crud")
     .description("Create CRUD handlers for a resource")
@@ -1184,7 +1185,7 @@ export function ${name}Page() {
 /**
  * Генерация модели
  */
-async function generateModel(name, dir) {
+async function generateModel(name, dir, fields) {
     const modelPath = path.join(process.cwd(), dir, "models", `${name}.ts`);
     await fs.ensureDir(path.dirname(modelPath));
     const modelCode = `import { defineModel } from '@vira-ui/core';
@@ -1521,21 +1522,42 @@ func ${handlerName}(w http.ResponseWriter, r *http.Request) {
 /**
  * Go model scaffold
  */
-async function generateGoModel(name, dir) {
+async function generateGoModel(name, dir, fields) {
     const modelName = capitalize(name);
     const targetDir = path.join(process.cwd(), dir);
     await fs.ensureDir(targetDir);
+    // Парсим поля если указаны
+    let fieldsCode = "";
+    if (fields) {
+        const fieldList = fields.split(",").map(f => f.trim());
+        fieldsCode = fieldList.map(field => {
+            const [fieldName, fieldType] = field.split(":").map(s => s.trim());
+            const goType = mapTypeScriptToGo(fieldType || "string");
+            return `  ${capitalize(fieldName)} ${goType} \`db:"${fieldName.toLowerCase()}" json:"${fieldName.toLowerCase()}"\``;
+        }).join("\n");
+        // Добавляем стандартные поля если их нет
+        if (!fieldList.some(f => f.toLowerCase().includes("id"))) {
+            fieldsCode = `  ID        string    \`db:"id" json:"id"\`
+${fieldsCode}
+  CreatedAt time.Time \`db:"created_at" json:"created_at"\`
+  UpdatedAt time.Time \`db:"updated_at" json:"updated_at"\``;
+        }
+    }
+    else {
+        // Дефолтные поля для типичной модели
+        fieldsCode = `  ID        string    \`db:"id" json:"id"\`
+  CreatedAt time.Time \`db:"created_at" json:"created_at"\`
+  UpdatedAt time.Time \`db:"updated_at" json:"updated_at"\``;
+    }
     const modelCode = `package models
 
 import "time"
 
 type ${modelName} struct {
-  ID        string    \`db:"id"\`
-  CreatedAt time.Time \`db:"created_at"\`
-  UpdatedAt time.Time \`db:"updated_at"\`
+${fieldsCode}
 }
 `;
-    await fs.writeFile(path.join(targetDir, `${modelName}.go`), modelCode);
+    await fs.writeFile(path.join(targetDir, `${modelName.toLowerCase()}.go`), modelCode);
 }
 /**
  * SQL migration scaffold (timestamped up/down)
@@ -1583,6 +1605,19 @@ function capitalize(value) {
         return value;
     return value.charAt(0).toUpperCase() + value.slice(1);
 }
+/**
+ * Маппинг TypeScript типов в Go типы
+ */
+function mapTypeScriptToGo(tsType) {
+    const mapping = {
+        "string": "string",
+        "number": "int",
+        "boolean": "bool",
+        "Date": "time.Time",
+        "date": "time.Time",
+    };
+    return mapping[tsType.toLowerCase()] || "string";
+}
 function toPascal(value) {
     return value
         .split(/[^a-zA-Z0-9]+/)
@@ -1599,6 +1634,21 @@ async function generateCRUDHandler(name, dir, modelName) {
     const model = modelName || capitalize(name);
     const targetDir = path.join(process.cwd(), dir);
     await fs.ensureDir(targetDir);
+    // Попытка определить модуль из go.mod
+    let modulePath = "your-project/backend";
+    try {
+        const goModPath = path.join(process.cwd(), dir, "..", "..", "go.mod");
+        if (await fs.pathExists(goModPath)) {
+            const goModContent = await fs.readFile(goModPath, "utf8");
+            const moduleMatch = goModContent.match(/^module\\s+(.+)$/m);
+            if (moduleMatch) {
+                modulePath = moduleMatch[1];
+            }
+        }
+    }
+    catch (e) {
+        // Игнорируем ошибки, используем дефолтный путь
+    }
     const handlerCode = `package handlers
 
 import (
@@ -1609,6 +1659,8 @@ import (
   "github.com/gorilla/mux"
   "github.com/go-playground/validator/v10"
   "github.com/google/uuid"
+  
+  "${modulePath}/internal/models"
 )
 
 var validate = validator.New()
@@ -1622,7 +1674,7 @@ type PaginationParams struct {
 
 // 🎯 Production-ready: List response with pagination
 type ${handlerName}ListResponse struct {
-  Items  []${model} \`json:"items"\`
+  Items  []models.${model} \`json:"items"\`
   Total  int        \`json:"total"\`
   Limit  int        \`json:"limit"\`
   Offset int        \`json:"offset"\`
@@ -1635,8 +1687,8 @@ type ${handlerName}Event struct {
   Type      string    \`json:"type"\` // created, updated, deleted
   EntityID  string    \`json:"entity_id"\`
   UserID    string    \`json:"user_id,omitempty"\`
-  OldValue  *${model} \`json:"old_value,omitempty"\`
-  NewValue  *${model} \`json:"new_value,omitempty"\`
+  OldValue  *models.${model} \`json:"old_value,omitempty"\`
+  NewValue  *models.${model} \`json:"new_value,omitempty"\`
   Timestamp time.Time \`json:"timestamp"\`
 }
 
@@ -1685,7 +1737,7 @@ func List${handlerName}(w http.ResponseWriter, r *http.Request) {
   // }
   
   response := ${handlerName}ListResponse{
-    Items:   []${model}{},
+    Items:   []models.${model}{},
     Total:   0,
     Limit:   limit,
     Offset:  offset,
@@ -1719,7 +1771,7 @@ func Get${handlerName}(w http.ResponseWriter, r *http.Request) {
   //   return
   // }
   
-  item := ${model}{ID: id}
+  item := models.${model}{ID: id}
   
   // 🎯 Production-ready: Cache detail (TTL 5min)
   // redis.Set(cacheKey, item, 5*time.Minute)
@@ -1729,7 +1781,7 @@ func Get${handlerName}(w http.ResponseWriter, r *http.Request) {
 
 // Create${handlerName} handles POST /${safeName}
 func Create${handlerName}(w http.ResponseWriter, r *http.Request) {
-  var input ${model}
+  var input models.${model}
   
   if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
     http.Error(w, "Invalid JSON", http.StatusBadRequest)
@@ -1787,7 +1839,7 @@ func Update${handlerName}(w http.ResponseWriter, r *http.Request) {
   vars := mux.Vars(r)
   id := vars["id"]
   
-  var input ${model}
+  var input models.${model}
   if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
     http.Error(w, "Invalid JSON", http.StatusBadRequest)
     return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vira-ui/cli",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "CLI tool for ViraJS project generation",
   "author": "Vira Team",
   "license": "MIT",