@omnifyjp/ts 6.7.2 → 6.7.4

package/dist/php/request-generator.js

@@ -2,7 +2,7 @@
  * Port of RequestGenerator.php — generates Store/Update request classes.
  */
 import { toPascalCase, toSnakeCase, toCamelCase, toFkColumnName } from './naming-helper.js';
-import { toStoreRules, toUpdateRules, formatRules, hasRuleObject } from './type-mapper.js';
+import { toStoreRules, toUpdateRules, formatRules } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 /**
  * Resolve the Laravel validation rule type ('integer', 'uuid', or 'string') for
@@ -57,7 +57,6 @@ function generateBaseRequest(name, schema, reader, config, action) {
     const tableName = reader.getTableName(name);
     const modelRouteParam = toCamelCase(name);
     const isUpdate = action === 'Update';
-    let needsRuleImport = false;
     const rulesLines = [];
     const attributeKeys = [];
     for (const propName of propertyOrder) {
@@ -95,8 +94,6 @@ function generateBaseRequest(name, schema, reader, config, action) {
                 const rules = isUpdate
                     ? toUpdateRules(colProp, tableName, modelRouteParam)
                     : toStoreRules(colProp, tableName);
-                if (hasRuleObject(rules))
-                    needsRuleImport = true;
                 rulesLines.push(`            '${colName}' => ${formatRules(rules)},`);
                 attributeKeys.push(colName);
             }
@@ -161,8 +158,6 @@ function generateBaseRequest(name, schema, reader, config, action) {
         const rules = isUpdate
             ? toUpdateRules(prop, tableName, modelRouteParam)
             : toStoreRules(prop, tableName);
-        if (hasRuleObject(rules))
-            needsRuleImport = true;
         rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
         attributeKeys.push(snakeName);
         // Translatable: add locale-nested rules (Astrotomic expects {locale}.{field})
@@ -184,6 +179,7 @@ function generateBaseRequest(name, schema, reader, config, action) {
     const rulesContent = rulesLines.join('\n');
     const localesClass = `${modelLocalesNamespace}\\${modelName}Locales`;
     const attributeKeysList = attributeKeys.map(k => `            '${k}',`).join('\n');
+    const needsRuleImport = rulesContent.includes('Rule::');
     const ruleImport = needsRuleImport ? '\nuse Illuminate\\Validation\\Rule;' : '';
     const content = `<?php
 

package/dist/php/type-mapper.d.ts

@@ -27,6 +27,4 @@ export declare function isHiddenByDefault(type: string): boolean;
 export declare function needsCast(type: string): boolean;
 /** Get the resource output expression for a property. */
 export declare function toResourceExpression(fieldName: string, type: string): string;
-/** Check if a rules array contains a Rule:: object. */
-export declare function hasRuleObject(rules: Rule[]): boolean;
 export {};

package/dist/php/type-mapper.js

@@ -351,7 +351,3 @@ export function toResourceExpression(fieldName, type) {
         default: return `$this->${fieldName}`;
     }
 }
-/** Check if a rules array contains a Rule:: object. */
-export function hasRuleObject(rules) {
-    return rules.some(r => Array.isArray(r) && ['rule_in', 'rule_unique_ignore'].includes(r[0]));
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "6.7.2",
+  "version": "6.7.4",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",