@famgia/omnify-laravel 0.0.79 → 0.0.80

package/dist/index.js

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

package/dist/plugin.cjs

@@ -2624,6 +2624,33 @@ function generateStoreRules(propName, propDef, schema, schemas, options) {
         }
       }
       break;
+    default:
+      const customType = options.customTypes.get(propDef.type);
+      if (customType && !customType.compound) {
+        if (propDef.type === "JapanesePhone") {
+          rules.push("'string'");
+          rules.push("'max:15'");
+          rules.push("'regex:/^\\d{2,4}-\\d{2,4}-\\d{4}$/'");
+        } else if (propDef.type === "JapanesePostalCode") {
+          rules.push("'string'");
+          rules.push("'max:8'");
+          rules.push("'regex:/^\\d{3}-\\d{4}$/'");
+        } else {
+          const sqlType = customType.sql?.sqlType ?? "VARCHAR";
+          const sqlLength = customType.sql?.length ?? 255;
+          if (sqlType === "VARCHAR" || sqlType === "TEXT") {
+            rules.push("'string'");
+            if (sqlType === "VARCHAR") {
+              rules.push(`'max:${sqlLength}'`);
+            }
+          } else if (sqlType === "INT" || sqlType === "TINYINT" || sqlType === "BIGINT") {
+            rules.push("'integer'");
+          } else if (sqlType === "DECIMAL" || sqlType === "FLOAT") {
+            rules.push("'numeric'");
+          }
+        }
+      }
+      break;
   }
   if (prop.unique === true) {
     rules.push(`'unique:${tableName}'`);
@@ -2706,12 +2733,100 @@ function generateUpdateRules(propName, propDef, schema, schemas, options) {
         }
       }
       break;
+    default:
+      const customType = options.customTypes.get(propDef.type);
+      if (customType && !customType.compound) {
+        if (propDef.type === "JapanesePhone") {
+          rules.push("'string'");
+          rules.push("'max:15'");
+          rules.push("'regex:/^\\d{2,4}-\\d{2,4}-\\d{4}$/'");
+        } else if (propDef.type === "JapanesePostalCode") {
+          rules.push("'string'");
+          rules.push("'max:8'");
+          rules.push("'regex:/^\\d{3}-\\d{4}$/'");
+        } else {
+          const sqlType = customType.sql?.sqlType ?? "VARCHAR";
+          const sqlLength = customType.sql?.length ?? 255;
+          if (sqlType === "VARCHAR" || sqlType === "TEXT") {
+            rules.push("'string'");
+            if (sqlType === "VARCHAR") {
+              rules.push(`'max:${sqlLength}'`);
+            }
+          } else if (sqlType === "INT" || sqlType === "TINYINT" || sqlType === "BIGINT") {
+            rules.push("'integer'");
+          } else if (sqlType === "DECIMAL" || sqlType === "FLOAT") {
+            rules.push("'numeric'");
+          }
+        }
+      }
+      break;
   }
   if (prop.unique === true) {
     rules.push(`Rule::unique('${tableName}')->ignore($this->route('${modelVar}'))`);
   }
   return rules;
 }
+function getCompoundFieldRules(typeName, suffix, field, fieldOverride) {
+  const rules = [];
+  const sql = field.sql;
+  const length = fieldOverride?.length ?? sql?.length ?? 255;
+  switch (typeName) {
+    case "JapaneseName":
+      rules.push("'string'");
+      rules.push(`'max:${length}'`);
+      if (suffix === "KanaLastname" || suffix === "KanaFirstname") {
+        rules.push("'regex:/^[\\x{30A0}-\\x{30FF}\\x{3000}-\\x{303F}\\x{FF00}-\\x{FF9F}\\s]+$/u'");
+      }
+      break;
+    case "JapaneseAddress":
+      if (suffix === "PostalCode") {
+        rules.push("'string'");
+        rules.push("'max:8'");
+        rules.push("'regex:/^\\d{3}-\\d{4}$/'");
+      } else if (suffix === "PrefectureId") {
+        rules.push("'integer'");
+        rules.push("'between:1,47'");
+      } else {
+        rules.push("'string'");
+        rules.push(`'max:${length}'`);
+      }
+      break;
+    case "JapaneseBankAccount":
+      if (suffix === "BankCode") {
+        rules.push("'string'");
+        rules.push("'size:4'");
+        rules.push("'regex:/^\\d{4}$/'");
+      } else if (suffix === "BranchCode") {
+        rules.push("'string'");
+        rules.push("'size:3'");
+        rules.push("'regex:/^\\d{3}$/'");
+      } else if (suffix === "AccountType") {
+        rules.push("'string'");
+        rules.push("Rule::in(['1', '2', '4'])");
+      } else if (suffix === "AccountNumber") {
+        rules.push("'string'");
+        rules.push("'max:7'");
+        rules.push("'regex:/^\\d{1,7}$/'");
+      } else if (suffix === "AccountHolder") {
+        rules.push("'string'");
+        rules.push(`'max:${length}'`);
+        rules.push("'regex:/^[\\x{30A0}-\\x{30FF}\\x{3000}-\\x{303F}\\x{FF00}-\\x{FF9F}\\s]+$/u'");
+      }
+      break;
+    default:
+      if (sql?.sqlType === "TINYINT" || sql?.sqlType === "INT" || sql?.sqlType === "BIGINT") {
+        rules.push("'integer'");
+        if (sql?.unsigned) {
+          rules.push("'min:0'");
+        }
+      } else {
+        rules.push("'string'");
+        rules.push(`'max:${length}'`);
+      }
+      break;
+  }
+  return rules;
+}
 function expandCompoundTypeFields(propName, propDef, options) {
   const typeDef = options.customTypes.get(propDef.type);
   if (!typeDef || !typeDef.compound || !typeDef.expand) {
@@ -2725,18 +2840,18 @@ function expandCompoundTypeFields(propName, propDef, options) {
     const suffixSnake = toSnakeCase(field.suffix);
     const fieldName = `${snakeName}_${suffixSnake}`;
     const fieldOverride = prop.fields?.[field.suffix];
-    const fieldNullable = fieldOverride?.nullable ?? isNullable2;
+    const fieldDefNullable = field.sql?.nullable ?? false;
+    const fieldNullable = fieldOverride?.nullable ?? fieldDefNullable ?? 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 });
+    const typeRules = getCompoundFieldRules(propDef.type, field.suffix, field, fieldOverride);
+    rules.push(...typeRules);
+    const needsRuleImport = rules.some((r) => r.includes("Rule::"));
+    fields.push({ fieldName, rules, needsRuleImport });
   }
   return fields;
 }
@@ -2770,6 +2885,7 @@ function generateStoreRequestBase(schema, schemas, options) {
     const expandedFields = expandCompoundTypeFields(propName, propDef, options);
     if (expandedFields.length > 0) {
       for (const field of expandedFields) {
+        if (field.needsRuleImport) needsRuleImport = true;
         rulesLines.push(`            '${field.fieldName}' => [${field.rules.join(", ")}],`);
         fieldList.push(field.fieldName);
         attributeLines.push(`            '${field.fieldName}' => '${escapePhpString2(field.fieldName)}',`);
@@ -2866,6 +2982,7 @@ function generateUpdateRequestBase(schema, schemas, options) {
     const expandedFields = expandCompoundTypeFields(propName, propDef, options);
     if (expandedFields.length > 0) {
       for (const field of expandedFields) {
+        if (field.needsRuleImport) needsRuleImport = true;
         const updateRules = field.rules.map((r) => r === "'required'" ? "'sometimes'" : r);
         rulesLines.push(`            '${field.fieldName}' => [${updateRules.join(", ")}],`);
         attributeLines.push(`            '${field.fieldName}' => '${escapePhpString2(field.fieldName)}',`);
@@ -2873,7 +2990,7 @@ function generateUpdateRequestBase(schema, schemas, options) {
       continue;
     }
     const rules = generateUpdateRules(propName, propDef, schema, schemas, options);
-    if (rules.some((r) => r.includes("Rule::") || r.includes("Rule::"))) needsRuleImport = true;
+    if (rules.some((r) => r.includes("Rule::"))) needsRuleImport = true;
     rulesLines.push(`            '${snakeName}' => [${rules.join(", ")}],`);
     const displayName = getDisplayName(propDef.displayName, options.locale, propName);
     attributeLines.push(`            '${snakeName}' => '${escapePhpString2(displayName)}',`);
@@ -3099,6 +3216,230 @@ function getRequestPath(request) {
   return request.path;
 }
 
+// src/resource/generator.ts
+var import_omnify_types4 = require("@famgia/omnify-types");
+var DEFAULT_OPTIONS3 = {
+  baseResourceNamespace: "App\\Http\\Resources\\OmnifyBase",
+  resourceNamespace: "App\\Http\\Resources",
+  baseResourcePath: "app/Http/Resources/OmnifyBase",
+  resourcePath: "app/Http/Resources",
+  customTypes: /* @__PURE__ */ new Map(),
+  locale: "en"
+};
+var SKIP_FIELDS2 = /* @__PURE__ */ new Set([
+  "password",
+  "remember_token"
+]);
+function resolveOptions4(options) {
+  return {
+    baseResourceNamespace: options?.baseResourceNamespace ?? DEFAULT_OPTIONS3.baseResourceNamespace,
+    resourceNamespace: options?.resourceNamespace ?? DEFAULT_OPTIONS3.resourceNamespace,
+    baseResourcePath: options?.baseResourcePath ?? DEFAULT_OPTIONS3.baseResourcePath,
+    resourcePath: options?.resourcePath ?? DEFAULT_OPTIONS3.resourcePath,
+    customTypes: options?.customTypes ?? /* @__PURE__ */ new Map(),
+    locale: options?.locale ?? DEFAULT_OPTIONS3.locale
+  };
+}
+function getModuleName2(schema) {
+  if (schema.module) {
+    return schema.module;
+  }
+  return "";
+}
+function getPropertyOutput(propName, propDef, schemas, options) {
+  const snakeName = toSnakeCase(propName);
+  const lines = [];
+  if (SKIP_FIELDS2.has(snakeName)) {
+    return lines;
+  }
+  if (propDef.type === "Association") {
+    const assoc = propDef;
+    const targetClass = assoc.target ? toPascalCase(assoc.target) : "";
+    switch (assoc.relation) {
+      case "ManyToOne":
+      case "OneToOne":
+        lines.push(`            '${snakeName}_id' => $this->${snakeName}_id,`);
+        lines.push(`            '${snakeName}' => $this->whenLoaded('${toCamelCase(propName)}', fn() => new ${targetClass}Resource($this->${toCamelCase(propName)})),`);
+        break;
+      case "OneToMany":
+      case "ManyToMany":
+        lines.push(`            '${snakeName}' => $this->whenLoaded('${toCamelCase(propName)}', fn() => ${targetClass}Resource::collection($this->${toCamelCase(propName)})),`);
+        break;
+      case "MorphTo":
+        lines.push(`            '${snakeName}_type' => $this->${snakeName}_type,`);
+        lines.push(`            '${snakeName}_id' => $this->${snakeName}_id,`);
+        lines.push(`            '${snakeName}' => $this->whenLoaded('${toCamelCase(propName)}'),`);
+        break;
+      case "MorphOne":
+      case "MorphMany":
+        lines.push(`            '${snakeName}' => $this->whenLoaded('${toCamelCase(propName)}', fn() => ${targetClass}Resource::collection($this->${toCamelCase(propName)})),`);
+        break;
+    }
+    return lines;
+  }
+  const typeDef = options.customTypes.get(propDef.type);
+  if (typeDef?.compound && typeDef.expand) {
+    for (const field of typeDef.expand) {
+      const suffixSnake = toSnakeCase(field.suffix);
+      const fieldName = `${snakeName}_${suffixSnake}`;
+      lines.push(`            '${fieldName}' => $this->${fieldName},`);
+    }
+    if (typeDef.accessors) {
+      for (const accessor of typeDef.accessors) {
+        const accessorName = `${snakeName}_${toSnakeCase(accessor.name)}`;
+        lines.push(`            '${accessorName}' => $this->${accessorName},`);
+      }
+    }
+    return lines;
+  }
+  lines.push(`            '${snakeName}' => $this->${snakeName},`);
+  return lines;
+}
+function generateResourceBase(schema, schemas, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName2(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.baseResourceNamespace}${namespaceModule}`;
+  const properties = schema.properties ?? {};
+  const outputLines = [];
+  const imports = /* @__PURE__ */ new Set();
+  if (schema.options?.id !== false) {
+    outputLines.push(`            'id' => $this->id,`);
+  }
+  for (const [propName, propDef] of Object.entries(properties)) {
+    const lines = getPropertyOutput(propName, propDef, schemas, options);
+    outputLines.push(...lines);
+    if (propDef.type === "Association") {
+      const assoc = propDef;
+      if (assoc.target) {
+        const targetModule = getModuleName2(schemas[assoc.target] ?? schema);
+        const targetModuleNs = targetModule ? `\\${targetModule}` : "";
+        imports.add(`use ${options.resourceNamespace}${targetModuleNs}\\${toPascalCase(assoc.target)}Resource;`);
+      }
+    }
+  }
+  if (schema.options?.timestamps !== false) {
+    outputLines.push(`            'created_at' => $this->created_at?->toISOString(),`);
+    outputLines.push(`            'updated_at' => $this->updated_at?->toISOString(),`);
+  }
+  if (schema.options?.softDelete) {
+    outputLines.push(`            'deleted_at' => $this->deleted_at?->toISOString(),`);
+  }
+  const importLines = Array.from(imports).sort().join("\n");
+  const importBlock = importLines ? `
+${importLines}` : "";
+  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\\Http\\Request;
+use Illuminate\\Http\\Resources\\Json\\JsonResource;${importBlock}
+
+class ${className}ResourceBase extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    protected function schemaArray(Request $request): array
+    {
+        return [
+${outputLines.join("\n")}
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.baseResourcePath}${modulePath}/${className}ResourceBase.php`,
+    content,
+    type: "base",
+    overwrite: true,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateResource(schema, options) {
+  const className = toPascalCase(schema.name);
+  const module2 = getModuleName2(schema);
+  const namespaceModule = module2 ? `\\${module2}` : "";
+  const namespace = `${options.resourceNamespace}${namespaceModule}`;
+  const baseNamespace = `${options.baseResourceNamespace}${namespaceModule}`;
+  const content = `<?php
+
+/**
+ * ${className} Resource
+ *
+ * SAFE TO EDIT - This file is never overwritten by Omnify.
+ */
+
+namespace ${namespace};
+
+use Illuminate\\Http\\Request;
+use ${baseNamespace}\\${className}ResourceBase;
+
+class ${className}Resource extends ${className}ResourceBase
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return array_merge($this->schemaArray($request), [
+            // Custom fields here
+        ]);
+    }
+
+    /**
+     * Get additional data that should be returned with the resource array.
+     *
+     * @return array<string, mixed>
+     */
+    public function with(Request $request): array
+    {
+        return [
+            // Additional metadata here
+        ];
+    }
+}
+`;
+  const modulePath = module2 ? `/${module2}` : "";
+  return {
+    path: `${options.resourcePath}${modulePath}/${className}Resource.php`,
+    content,
+    type: "user",
+    overwrite: false,
+    schemaName: schema.name,
+    module: module2
+  };
+}
+function generateResources(schemas, options) {
+  const resolved = resolveOptions4(options);
+  const resources = [];
+  for (const schema of Object.values(schemas)) {
+    if (schema.kind === "enum") continue;
+    if (schema.options?.hidden === true) continue;
+    resources.push(generateResourceBase(schema, schemas, resolved));
+    resources.push(generateResource(schema, resolved));
+  }
+  return resources;
+}
+function getResourcePath(resource) {
+  return resource.path;
+}
+
 // src/plugin.ts
 function getExistingMigrationTables(migrationsDir) {
   const existingTables = /* @__PURE__ */ new Set();
@@ -3207,10 +3548,34 @@ var LARAVEL_CONFIG_SCHEMA = {
       description: "Generate Laravel FormRequest classes for validation",
       default: false,
       group: "options"
+    },
+    {
+      key: "resourcesPath",
+      type: "path",
+      label: "Resources Path",
+      description: "Directory for user-editable API Resource files",
+      default: "app/Http/Resources",
+      group: "output"
+    },
+    {
+      key: "baseResourcesPath",
+      type: "path",
+      label: "Base Resources Path",
+      description: "Directory for auto-generated base API Resource files",
+      default: "app/Http/Resources/OmnifyBase",
+      group: "output"
+    },
+    {
+      key: "generateResources",
+      type: "boolean",
+      label: "Generate Resources",
+      description: "Generate Laravel API Resource classes",
+      default: false,
+      group: "options"
     }
   ]
 };
-function resolveOptions4(options) {
+function resolveOptions5(options) {
   return {
     migrationsPath: options?.migrationsPath ?? "database/migrations/omnify",
     modelsPath: options?.modelsPath ?? "app/Models",
@@ -3228,11 +3593,16 @@ function resolveOptions4(options) {
     baseRequestsPath: options?.baseRequestsPath ?? "app/Http/Requests/OmnifyBase",
     requestNamespace: options?.requestNamespace ?? "App\\Http\\Requests",
     baseRequestNamespace: options?.baseRequestNamespace ?? "App\\Http\\Requests\\OmnifyBase",
-    generateRequests: options?.generateRequests ?? false
+    generateRequests: options?.generateRequests ?? false,
+    resourcesPath: options?.resourcesPath ?? "app/Http/Resources",
+    baseResourcesPath: options?.baseResourcesPath ?? "app/Http/Resources/OmnifyBase",
+    resourceNamespace: options?.resourceNamespace ?? "App\\Http\\Resources",
+    baseResourceNamespace: options?.baseResourceNamespace ?? "App\\Http\\Resources\\OmnifyBase",
+    generateResources: options?.generateResources ?? false
   };
 }
 function laravelPlugin(options) {
-  const resolved = resolveOptions4(options);
+  const resolved = resolveOptions5(options);
   const migrationGenerator = {
     name: "laravel-migrations",
     description: "Generate Laravel migration files",
@@ -3431,6 +3801,32 @@ function laravelPlugin(options) {
       }));
     }
   };
+  const resourceGenerator = {
+    name: "laravel-resources",
+    description: "Generate Laravel API Resource classes",
+    generate: async (ctx) => {
+      const resourceOptions = {
+        resourceNamespace: resolved.resourceNamespace,
+        baseResourceNamespace: resolved.baseResourceNamespace,
+        resourcePath: resolved.resourcesPath,
+        baseResourcePath: resolved.baseResourcesPath,
+        customTypes: ctx.customTypes
+      };
+      const resources = generateResources(ctx.schemas, resourceOptions);
+      return resources.map((resource) => ({
+        path: getResourcePath(resource),
+        content: resource.content,
+        type: "other",
+        // Skip writing user resources if they already exist
+        skipIfExists: !resource.overwrite,
+        metadata: {
+          resourceType: resource.type,
+          schemaName: resource.schemaName,
+          module: resource.module
+        }
+      }));
+    }
+  };
   const generators = [migrationGenerator];
   if (resolved.generateModels) {
     generators.push(modelGenerator);
@@ -3441,6 +3837,9 @@ function laravelPlugin(options) {
   if (resolved.generateRequests) {
     generators.push(requestGenerator);
   }
+  if (resolved.generateResources) {
+    generators.push(resourceGenerator);
+  }
   return {
     name: "@famgia/omnify-laravel",
     version: "0.0.14",