@famgia/omnify-laravel 0.0.78 → 0.0.79

package/dist/index.js

@@ -24,7 +24,7 @@ import {
   schemaToBlueprint,
   toColumnName,
   toTableName
-} from "./chunk-FEHKJQMT.js";
+} from "./chunk-6QYGCK3D.js";
 export {
   formatColumnMethod,
   formatForeignKey,

package/dist/plugin.cjs

@@ -2497,6 +2497,608 @@ function getFactoryPath(factory) {
   return factory.path;
 }
 
+// src/request/generator.ts
+var import_omnify_types3 = require("@famgia/omnify-types");
+var DEFAULT_OPTIONS2 = {
+  baseRequestNamespace: "App\\Http\\Requests\\OmnifyBase",
+  requestNamespace: "App\\Http\\Requests",
+  baseRequestPath: "app/Http/Requests/OmnifyBase",
+  requestPath: "app/Http/Requests",
+  modelNamespace: "App\\Models",
+  customTypes: /* @__PURE__ */ new Map(),
+  locale: "en"
+};
+var SKIP_FIELDS = /* @__PURE__ */ new Set([
+  "id",
+  "created_at",
+  "updated_at",
+  "deleted_at",
+  "remember_token",
+  "email_verified_at"
+]);
+function resolveOptions3(options) {
+  return {
+    baseRequestNamespace: options?.baseRequestNamespace ?? DEFAULT_OPTIONS2.baseRequestNamespace,
+    requestNamespace: options?.requestNamespace ?? DEFAULT_OPTIONS2.requestNamespace,
+    baseRequestPath: options?.baseRequestPath ?? DEFAULT_OPTIONS2.baseRequestPath,
+    requestPath: options?.requestPath ?? DEFAULT_OPTIONS2.requestPath,
+    modelNamespace: options?.modelNamespace ?? DEFAULT_OPTIONS2.modelNamespace,
+    customTypes: options?.customTypes ?? /* @__PURE__ */ new Map(),
+    locale: options?.locale ?? DEFAULT_OPTIONS2.locale
+  };
+}
+function escapePhpString2(str) {
+  return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+function getDisplayName(displayName, locale, fallback) {
+  if (!displayName) return fallback;
+  if (typeof displayName === "string") return displayName;
+  if ((0, import_omnify_types3.isLocaleMap)(displayName)) {
+    return displayName[locale] ?? displayName["en"] ?? fallback;
+  }
+  return fallback;
+}
+function getModuleName(schema) {
+  if (schema.module) {
+    return schema.module;
+  }
+  return "";
+}
+function generateStoreRules(propName, propDef, schema, schemas, options) {
+  const rules = [];
+  const snakeName = toSnakeCase(propName);
+  const prop = propDef;
+  const tableName = schema.options?.tableName ?? pluralize(toSnakeCase(schema.name));
+  const isNullable2 = prop.nullable === true;
+  if (!isNullable2) {
+    rules.push("'required'");
+  } else {
+    rules.push("'nullable'");
+  }
+  switch (propDef.type) {
+    case "String":
+    case "Email":
+    case "Password":
+      rules.push("'string'");
+      const length = prop.length ?? 255;
+      rules.push(`'max:${length}'`);
+      if (propDef.type === "Email") {
+        rules.push("'email'");
+      }
+      break;
+    case "Text":
+    case "MediumText":
+    case "LongText":
+      rules.push("'string'");
+      break;
+    case "TinyInt":
+    case "Int":
+    case "BigInt":
+      rules.push("'integer'");
+      if (prop.min !== void 0) {
+        rules.push(`'min:${prop.min}'`);
+      }
+      if (prop.max !== void 0) {
+        rules.push(`'max:${prop.max}'`);
+      }
+      break;
+    case "Float":
+    case "Decimal":
+      rules.push("'numeric'");
+      if (prop.min !== void 0) {
+        rules.push(`'min:${prop.min}'`);
+      }
+      if (prop.max !== void 0) {
+        rules.push(`'max:${prop.max}'`);
+      }
+      break;
+    case "Boolean":
+      rules.push("'boolean'");
+      break;
+    case "Date":
+      rules.push("'date'");
+      break;
+    case "DateTime":
+    case "Timestamp":
+      rules.push("'date'");
+      break;
+    case "Json":
+      rules.push("'array'");
+      break;
+    case "Enum":
+    case "EnumRef":
+      rules.push("'string'");
+      if (prop.enum && Array.isArray(prop.enum)) {
+        const values = prop.enum.map((v) => `'${v}'`).join(", ");
+        rules.push(`Rule::in([${values}])`);
+      }
+      break;
+    case "Association":
+      const assoc = propDef;
+      if (assoc.relation === "ManyToOne" || assoc.relation === "OneToOne") {
+        if (assoc.target) {
+          const targetSchema = schemas[assoc.target];
+          const targetTable = targetSchema?.options?.tableName ?? pluralize(toSnakeCase(assoc.target));
+          rules.push("'integer'");
+          rules.push(`'exists:${targetTable},id'`);
+        }
+      }
+      break;
+  }
+  if (prop.unique === true) {
+    rules.push(`'unique:${tableName}'`);
+  }
+  return rules;
+}
+function generateUpdateRules(propName, propDef, schema, schemas, options) {
+  const rules = [];
+  const snakeName = toSnakeCase(propName);
+  const prop = propDef;
+  const tableName = schema.options?.tableName ?? pluralize(toSnakeCase(schema.name));
+  const modelVar = toSnakeCase(schema.name);
+  rules.push("'sometimes'");
+  switch (propDef.type) {
+    case "String":
+    case "Email":
+    case "Password":
+      rules.push("'string'");
+      const length = prop.length ?? 255;
+      rules.push(`'max:${length}'`);
+      if (propDef.type === "Email") {
+        rules.push("'email'");
+      }
+      break;
+    case "Text":
+    case "MediumText":
+    case "LongText":
+      rules.push("'string'");
+      break;
+    case "TinyInt":
+    case "Int":
+    case "BigInt":
+      rules.push("'integer'");
+      if (prop.min !== void 0) {
+        rules.push(`'min:${prop.min}'`);
+      }
+      if (prop.max !== void 0) {
+        rules.push(`'max:${prop.max}'`);
+      }
+      break;
+    case "Float":
+    case "Decimal":
+      rules.push("'numeric'");
+      if (prop.min !== void 0) {
+        rules.push(`'min:${prop.min}'`);
+      }
+      if (prop.max !== void 0) {
+        rules.push(`'max:${prop.max}'`);
+      }
+      break;
+    case "Boolean":
+      rules.push("'boolean'");
+      break;
+    case "Date":
+      rules.push("'date'");
+      break;
+    case "DateTime":
+    case "Timestamp":
+      rules.push("'date'");
+      break;
+    case "Json":
+      rules.push("'array'");
+      break;
+    case "Enum":
+    case "EnumRef":
+      rules.push("'string'");
+      if (prop.enum && Array.isArray(prop.enum)) {
+        const values = prop.enum.map((v) => `'${v}'`).join(", ");
+        rules.push(`Rule::in([${values}])`);
+      }
+      break;
+    case "Association":
+      const assoc = propDef;
+      if (assoc.relation === "ManyToOne" || assoc.relation === "OneToOne") {
+        if (assoc.target) {
+          const targetSchema = schemas[assoc.target];
+          const targetTable = targetSchema?.options?.tableName ?? pluralize(toSnakeCase(assoc.target));
+          rules.push("'integer'");
+          rules.push(`'exists:${targetTable},id'`);
+        }
+      }
+      break;
+  }
+  if (prop.unique === true) {
+    rules.push(`Rule::unique('${tableName}')->ignore($this->route('${modelVar}'))`);
+  }
+  return rules;
+}
+function expandCompoundTypeFields(propName, propDef, options) {
+  const typeDef = options.customTypes.get(propDef.type);
+  if (!typeDef || !typeDef.compound || !typeDef.expand) {
+    return [];
+  }
+  const snakeName = toSnakeCase(propName);
+  const prop = propDef;
+  const isNullable2 = prop.nullable === true;
+  const fields = [];
+  for (const field of typeDef.expand) {
+    const suffixSnake = toSnakeCase(field.suffix);
+    const fieldName = `${snakeName}_${suffixSnake}`;
+    const fieldOverride = prop.fields?.[field.suffix];
+    const fieldNullable = fieldOverride?.nullable ?? isNullable2;
+    const rules = [];
+    if (!fieldNullable) {
+      rules.push("'required'");
+    } else {
+      rules.push("'nullable'");
+    }
+    rules.push("'string'");
+    const fieldAny = field;
+    const length = fieldAny.laravel?.length ?? 255;
+    rules.push(`'max:${length}'`);
+    fields.push({ fieldName, rules });
+  }
+  return fields;
+}
+function generateStoreRequestBase(schema, schemas, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.baseRequestNamespace}${namespaceModule}`;
+  const properties = schema.properties ?? {};
+  const rulesLines = [];
+  const attributeLines = [];
+  const fieldList = [];
+  let needsRuleImport = false;
+  for (const [propName, propDef] of Object.entries(properties)) {
+    const snakeName = toSnakeCase(propName);
+    if (SKIP_FIELDS.has(snakeName)) continue;
+    if (propDef.type === "Association") {
+      const assoc = propDef;
+      if (assoc.relation !== "ManyToOne" && assoc.relation !== "OneToOne") {
+        continue;
+      }
+      const fkName = `${snakeName}_id`;
+      const rules2 = generateStoreRules(propName, propDef, schema, schemas, options);
+      if (rules2.some((r) => r.includes("Rule::"))) needsRuleImport = true;
+      rulesLines.push(`            '${fkName}' => [${rules2.join(", ")}],`);
+      fieldList.push(fkName);
+      const displayName2 = getDisplayName(propDef.displayName, options.locale, propName);
+      attributeLines.push(`            '${fkName}' => '${escapePhpString2(displayName2)}',`);
+      continue;
+    }
+    const expandedFields = expandCompoundTypeFields(propName, propDef, options);
+    if (expandedFields.length > 0) {
+      for (const field of expandedFields) {
+        rulesLines.push(`            '${field.fieldName}' => [${field.rules.join(", ")}],`);
+        fieldList.push(field.fieldName);
+        attributeLines.push(`            '${field.fieldName}' => '${escapePhpString2(field.fieldName)}',`);
+      }
+      continue;
+    }
+    const rules = generateStoreRules(propName, propDef, schema, schemas, options);
+    if (rules.some((r) => r.includes("Rule::"))) needsRuleImport = true;
+    rulesLines.push(`            '${snakeName}' => [${rules.join(", ")}],`);
+    fieldList.push(snakeName);
+    const displayName = getDisplayName(propDef.displayName, options.locale, propName);
+    attributeLines.push(`            '${snakeName}' => '${escapePhpString2(displayName)}',`);
+  }
+  const ruleImport = needsRuleImport ? "\nuse Illuminate\\Validation\\Rule;" : "";
+  const content = `<?php
+
+/**
+ * AUTO-GENERATED BY OMNIFY - DO NOT EDIT!
+ *
+ * This file is generated from Omnify schema: ${schema.name}
+ * Re-run \`npx omnify generate\` to update.
+ *
+ * @generated
+ */
+
+namespace ${namespace};
+
+use Illuminate\\Foundation\\Http\\FormRequest;${ruleImport}
+
+abstract class ${className}StoreRequestBase extends FormRequest
+{
+    /**
+     * Validation rules generated from Omnify schema.
+     *
+     * Generated fields: ${fieldList.join(", ")}
+     *
+     * @return array<string, array<int, mixed>>
+     */
+    protected function schemaRules(): array
+    {
+        return [
+${rulesLines.join("\n")}
+        ];
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    protected function schemaAttributes(): array
+    {
+        return [
+${attributeLines.join("\n")}
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.baseRequestPath}${modulePath}/${className}StoreRequestBase.php`,
+    content,
+    type: "store-base",
+    overwrite: true,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateUpdateRequestBase(schema, schemas, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.baseRequestNamespace}${namespaceModule}`;
+  const properties = schema.properties ?? {};
+  const rulesLines = [];
+  const attributeLines = [];
+  let needsRuleImport = false;
+  for (const [propName, propDef] of Object.entries(properties)) {
+    const snakeName = toSnakeCase(propName);
+    if (SKIP_FIELDS.has(snakeName)) continue;
+    if (propDef.type === "Association") {
+      const assoc = propDef;
+      if (assoc.relation !== "ManyToOne" && assoc.relation !== "OneToOne") {
+        continue;
+      }
+      const fkName = `${snakeName}_id`;
+      const rules2 = generateUpdateRules(propName, propDef, schema, schemas, options);
+      if (rules2.some((r) => r.includes("Rule::") || r.includes("Rule::"))) needsRuleImport = true;
+      rulesLines.push(`            '${fkName}' => [${rules2.join(", ")}],`);
+      const displayName2 = getDisplayName(propDef.displayName, options.locale, propName);
+      attributeLines.push(`            '${fkName}' => '${escapePhpString2(displayName2)}',`);
+      continue;
+    }
+    const expandedFields = expandCompoundTypeFields(propName, propDef, options);
+    if (expandedFields.length > 0) {
+      for (const field of expandedFields) {
+        const updateRules = field.rules.map((r) => r === "'required'" ? "'sometimes'" : r);
+        rulesLines.push(`            '${field.fieldName}' => [${updateRules.join(", ")}],`);
+        attributeLines.push(`            '${field.fieldName}' => '${escapePhpString2(field.fieldName)}',`);
+      }
+      continue;
+    }
+    const rules = generateUpdateRules(propName, propDef, schema, schemas, options);
+    if (rules.some((r) => r.includes("Rule::") || r.includes("Rule::"))) needsRuleImport = true;
+    rulesLines.push(`            '${snakeName}' => [${rules.join(", ")}],`);
+    const displayName = getDisplayName(propDef.displayName, options.locale, propName);
+    attributeLines.push(`            '${snakeName}' => '${escapePhpString2(displayName)}',`);
+  }
+  const ruleImport = needsRuleImport ? "\nuse Illuminate\\Validation\\Rule;" : "";
+  const content = `<?php
+
+/**
+ * AUTO-GENERATED BY OMNIFY - DO NOT EDIT!
+ *
+ * This file is generated from Omnify schema: ${schema.name}
+ * Re-run \`npx omnify generate\` to update.
+ *
+ * @generated
+ */
+
+namespace ${namespace};
+
+use Illuminate\\Foundation\\Http\\FormRequest;${ruleImport}
+
+abstract class ${className}UpdateRequestBase extends FormRequest
+{
+    /**
+     * Validation rules generated from Omnify schema.
+     * All fields use 'sometimes' for partial updates.
+     *
+     * @return array<string, array<int, mixed>>
+     */
+    protected function schemaRules(): array
+    {
+        return [
+${rulesLines.join("\n")}
+        ];
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    protected function schemaAttributes(): array
+    {
+        return [
+${attributeLines.join("\n")}
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.baseRequestPath}${modulePath}/${className}UpdateRequestBase.php`,
+    content,
+    type: "update-base",
+    overwrite: true,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateStoreRequest(schema, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.requestNamespace}${namespaceModule}`;
+  const baseNamespace = `${options.baseRequestNamespace}${namespaceModule}`;
+  const content = `<?php
+
+/**
+ * ${className} Store Request
+ *
+ * SAFE TO EDIT - This file is never overwritten by Omnify.
+ */
+
+namespace ${namespace};
+
+use ${baseNamespace}\\${className}StoreRequestBase;
+
+class ${className}StoreRequest extends ${className}StoreRequestBase
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<int, mixed>>
+     */
+    public function rules(): array
+    {
+        return array_merge($this->schemaRules(), [
+            // Custom/override rules here
+        ]);
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function attributes(): array
+    {
+        return array_merge($this->schemaAttributes(), [
+            // Custom attributes here
+        ]);
+    }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            // Custom messages here
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.requestPath}${modulePath}/${className}StoreRequest.php`,
+    content,
+    type: "store",
+    overwrite: false,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateUpdateRequest(schema, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.requestNamespace}${namespaceModule}`;
+  const baseNamespace = `${options.baseRequestNamespace}${namespaceModule}`;
+  const content = `<?php
+
+/**
+ * ${className} Update Request
+ *
+ * SAFE TO EDIT - This file is never overwritten by Omnify.
+ */
+
+namespace ${namespace};
+
+use ${baseNamespace}\\${className}UpdateRequestBase;
+
+class ${className}UpdateRequest extends ${className}UpdateRequestBase
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<int, mixed>>
+     */
+    public function rules(): array
+    {
+        return array_merge($this->schemaRules(), [
+            // Custom/override rules here
+        ]);
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function attributes(): array
+    {
+        return array_merge($this->schemaAttributes(), [
+            // Custom attributes here
+        ]);
+    }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            // Custom messages here
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.requestPath}${modulePath}/${className}UpdateRequest.php`,
+    content,
+    type: "update",
+    overwrite: false,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateRequests(schemas, options) {
+  const resolved = resolveOptions3(options);
+  const requests = [];
+  for (const schema of Object.values(schemas)) {
+    if (schema.kind === "enum") continue;
+    if (schema.options?.hidden === true) continue;
+    requests.push(generateStoreRequestBase(schema, schemas, resolved));
+    requests.push(generateUpdateRequestBase(schema, schemas, resolved));
+    requests.push(generateStoreRequest(schema, resolved));
+    requests.push(generateUpdateRequest(schema, resolved));
+  }
+  return requests;
+}
+function getRequestPath(request) {
+  return request.path;
+}
+
 // src/plugin.ts
 function getExistingMigrationTables(migrationsDir) {
   const existingTables = /* @__PURE__ */ new Set();
@@ -2581,10 +3183,34 @@ var LARAVEL_CONFIG_SCHEMA = {
       description: "Laravel database connection name (optional)",
       placeholder: "mysql",
       group: "options"
+    },
+    {
+      key: "requestsPath",
+      type: "path",
+      label: "Requests Path",
+      description: "Directory for user-editable FormRequest files",
+      default: "app/Http/Requests",
+      group: "output"
+    },
+    {
+      key: "baseRequestsPath",
+      type: "path",
+      label: "Base Requests Path",
+      description: "Directory for auto-generated base FormRequest files",
+      default: "app/Http/Requests/OmnifyBase",
+      group: "output"
+    },
+    {
+      key: "generateRequests",
+      type: "boolean",
+      label: "Generate Requests",
+      description: "Generate Laravel FormRequest classes for validation",
+      default: false,
+      group: "options"
     }
   ]
 };
-function resolveOptions3(options) {
+function resolveOptions4(options) {
   return {
     migrationsPath: options?.migrationsPath ?? "database/migrations/omnify",
     modelsPath: options?.modelsPath ?? "app/Models",
@@ -2597,11 +3223,16 @@ function resolveOptions3(options) {
     generateFactories: options?.generateFactories ?? true,
     fakerLocale: options?.fakerLocale ?? "en_US",
     connection: options?.connection,
-    timestamp: options?.timestamp
+    timestamp: options?.timestamp,
+    requestsPath: options?.requestsPath ?? "app/Http/Requests",
+    baseRequestsPath: options?.baseRequestsPath ?? "app/Http/Requests/OmnifyBase",
+    requestNamespace: options?.requestNamespace ?? "App\\Http\\Requests",
+    baseRequestNamespace: options?.baseRequestNamespace ?? "App\\Http\\Requests\\OmnifyBase",
+    generateRequests: options?.generateRequests ?? false
   };
 }
 function laravelPlugin(options) {
-  const resolved = resolveOptions3(options);
+  const resolved = resolveOptions4(options);
   const migrationGenerator = {
     name: "laravel-migrations",
     description: "Generate Laravel migration files",
@@ -2773,6 +3404,33 @@ function laravelPlugin(options) {
       }));
     }
   };
+  const requestGenerator = {
+    name: "laravel-requests",
+    description: "Generate Laravel FormRequest classes for validation",
+    generate: async (ctx) => {
+      const requestOptions = {
+        requestNamespace: resolved.requestNamespace,
+        baseRequestNamespace: resolved.baseRequestNamespace,
+        requestPath: resolved.requestsPath,
+        baseRequestPath: resolved.baseRequestsPath,
+        modelNamespace: resolved.modelNamespace,
+        customTypes: ctx.customTypes
+      };
+      const requests = generateRequests(ctx.schemas, requestOptions);
+      return requests.map((request) => ({
+        path: getRequestPath(request),
+        content: request.content,
+        type: "other",
+        // Skip writing user requests if they already exist
+        skipIfExists: !request.overwrite,
+        metadata: {
+          requestType: request.type,
+          schemaName: request.schemaName,
+          module: request.module
+        }
+      }));
+    }
+  };
   const generators = [migrationGenerator];
   if (resolved.generateModels) {
     generators.push(modelGenerator);
@@ -2780,6 +3438,9 @@ function laravelPlugin(options) {
   if (resolved.generateFactories) {
     generators.push(factoryGenerator);
   }
+  if (resolved.generateRequests) {
+    generators.push(requestGenerator);
+  }
   return {
     name: "@famgia/omnify-laravel",
     version: "0.0.14",