@omnifyjp/ts 6.7.13 → 6.7.14

package/dist/php/enum-generator.js

@@ -32,6 +32,10 @@ function generateEnumClass(name, schema, config) {
     const values = (schema.values ?? []);
     const cases = values.map(v => buildCase(v));
     const labelsConst = buildLabelsConstant(values);
+    const allValuesHaveLabels = values.every((value) => typeof value.label === 'string' || Object.keys(value.label ?? {}).length > 0);
+    const labelThirdFallback = allValuesHaveLabels
+        ? '$labels[array_key_first($labels)]'
+        : '(array_values($labels)[0] ?? $this->value)';
     const content = `<?php
 
 namespace ${namespace};
@@ -59,12 +63,11 @@ ${labelsConst}
     public function label(?string $locale = null): string
     {
         $locale = $locale ?? app()->getLocale();
-        $labels = self::LABELS[$this->value] ?? [];
+        $labels = self::LABELS[$this->value];
 
         return $labels[$locale]
             ?? $labels[config('app.fallback_locale', 'en')]
-            ?? $labels[array_key_first($labels) ?? 'en']
-            ?? $this->value;
+            ?? ${labelThirdFallback};
     }
 
     /**

package/dist/php/model-generator.js

@@ -451,7 +451,7 @@ function generateUserModel(name, schema, reader, config, hasNestedSet = false) {
     if (hasNestedSet) {
         imports.push(`use ${nestedSetNamespace}\\NodeTrait;`);
     }
-    const traits = ['    use HasFactory;'];
+    const traits = [`    /** @use HasFactory<${modelName}Factory> */\n    use HasFactory;`];
     if (hasNestedSet) {
         traits.push('    use NodeTrait;');
     }
@@ -1054,6 +1054,7 @@ function buildInverseRelations(parentName, modelNamespace, reader, declaredMetho
             methods.push(`
     /**
      * Auto-generated inverse of ${childName}.${childPropName} (${relation}).
+     * @return ${returnType}<${fqcn}, $this>
      */
     public function ${methodName}(): ${returnType}
     {

package/dist/php/relation-builder.js

@@ -39,6 +39,11 @@ export function buildRelation(propName, property, modelNamespace, context) {
     }
     if (method === null)
         return null;
+    const type = getReturnType(relation);
+    const related = relation === 'MorphTo'
+        ? '\\Illuminate\\Database\\Eloquent\\Model'
+        : '\\' + modelNamespace + '\\' + target;
+    method = method.replace('     */', `     * @return ${type}<${related}, $this>\n     */`);
     return { method, imports };
 }
 /** Generate the table name Laravel's joiningTable() infers from model basenames. */

package/dist/php/request-generator.js

@@ -180,6 +180,58 @@ function generateBaseRequest(name, schema, reader, config, action) {
     const localesClass = `${modelLocalesNamespace}\\${modelName}Locales`;
     const attributeKeysList = attributeKeys.map(k => `            '${k}',`).join('\n');
     const needsRuleImport = rulesContent.includes('Rule::');
+    // WHICH KEYS THE LOCALES CLASS WILL ACTUALLY HOLD, which is not the same
+    // question as which keys exist. `locales-generator` skips every Association
+    // outright, while this generator pushes each ManyToOne's FK column into
+    // `attributeKeys` — so a schema whose properties are ALL associations gets a
+    // non-empty key list and an EMPTY PROPERTY_DISPLAY_NAMES, and the loop below
+    // then reads offsets off `array{}`: ten unfixable PHPStan errors per such schema.
+    //
+    // Measured twice. `PlanItem` hit it first and was dropped for an unrelated
+    // reason, which hid it; `PlanMembership` hit it again and could not be
+    // dropped, because a self-referential many-to-many is REFUSED as a pivot —
+    // omnify itself says "declare a regular `kind: object` schema with two
+    // ManyToOne associations". So it is a shape the generator prescribes and
+    // then cannot generate for.
+    //
+    // Fixing the LOCALES side instead — emitting association display names
+    // under their FK column — was tried and reverted: it is better semantically
+    // (a validation error would say 計画課題 rather than `plan_issue_id`) but it
+    // populates the constant for every schema in the repo, which makes PHPStan
+    // prove the `??` fallback chain dead and turns 0 errors into 317. Worth
+    // doing upstream, where the generated body can change with it. Not here.
+    const hasNamedAttributes = Object.values(properties).some((candidate) => (candidate?.type ?? 'String') !== 'Association');
+    const attributesBody = attributeKeys.length === 0 || !hasNamedAttributes
+        ? [
+            '    protected function schemaAttributes(): array',
+            '    {',
+            '        return [];',
+            '    }',
+        ].join('\n')
+        : [
+            '    protected function schemaAttributes(): array',
+            '    {',
+            "        $locale = app()->getLocale();",
+            "        $fallback = config('app.fallback_locale', 'en');",
+            `        $propertyNames = ${modelName}Locales::PROPERTY_DISPLAY_NAMES;`,
+            '        $attributes = [];',
+            '',
+            '        $keys = [',
+            attributeKeysList,
+            '        ];',
+            '',
+            '        foreach ($keys as $key) {',
+            '            $names = $propertyNames[$key] ?? [];',
+            "            $attributes[$key] = $names[$locale] ?? $names[$fallback] ?? $names[array_key_first($names) ?? 'en'] ?? $key;",
+            '        }',
+            '',
+            '        return $attributes;',
+            '    }',
+        ].join('\n');
+    // Only the non-empty body references the Locales class.
+    const localesImport = attributeKeys.length === 0 || !hasNamedAttributes
+        ? ''
+        : `\nuse ${localesClass};`;
     const ruleImport = needsRuleImport ? '\nuse Illuminate\\Validation\\Rule;' : '';
     const content = `<?php
 
@@ -192,8 +244,7 @@ namespace ${baseNamespace};
  * @generated by omnify
  */
 
-use Illuminate\\Foundation\\Http\\FormRequest;${ruleImport}
-use ${localesClass};
+use Illuminate\\Foundation\\Http\\FormRequest;${ruleImport}${localesImport}
 
 class ${modelName}${action}RequestBase extends FormRequest
 {
@@ -229,7 +280,7 @@ class ${modelName}${action}RequestBase extends FormRequest
     /**
      * Get the schema-defined validation rules.
      *
-     * @return array<string, array>
+     * @return array<string, array<mixed>>
      */
     protected function schemaRules(): array
     {
@@ -244,24 +295,7 @@ ${rulesContent}
      *
      * @return array<string, string>
      */
-    protected function schemaAttributes(): array
-    {
-        $locale = app()->getLocale();
-        $fallback = config('app.fallback_locale', 'en');
-        $propertyNames = ${modelName}Locales::PROPERTY_DISPLAY_NAMES;
-        $attributes = [];
-
-        $keys = [
-${attributeKeysList}
-        ];
-
-        foreach ($keys as $key) {
-            $names = $propertyNames[$key] ?? [];
-            $attributes[$key] = $names[$locale] ?? $names[$fallback] ?? $names[array_key_first($names) ?? 'en'] ?? $key;
-        }
-
-        return $attributes;
-    }
+${attributesBody}
 }
 `;
     // Issue #96 + #98 v5.8+: legacy honors flatBase + group-by-folder.

package/dist/php/resource-generator.js

@@ -165,6 +165,7 @@ namespace ${baseNamespace};
 
 ${useBlock}
 
+/** @mixin \\${modelNamespace}${schema.kind === 'pivot' ? '\\Pivot' : ''}\\${modelName} */
 class ${modelName}ResourceBase extends JsonResource
 {
     /**

package/dist/php/service-generator.js

@@ -554,7 +554,7 @@ function generateBaseService(name, schema, reader, config) {
     // ── Build class body ──────────────────────────────────────────────────────
     const sections = [];
     // Model property
-    sections.push(`    protected string $model = ${modelName}::class;`);
+    sections.push(`    /** @var class-string<${modelName}> */\n    protected string $model = ${modelName}::class;`);
     // ── Query section ─────────────────────────────────────────────────────────
     sections.push('');
     sections.push(buildSectionComment('Query'));
@@ -595,7 +595,7 @@ function generateBaseService(name, schema, reader, config) {
     // ── Eager Load Hooks (#81) ────────────────────────────────────────────────
     sections.push('');
     sections.push(buildSectionComment('Eager Load Hooks (#81)'));
-    sections.push(buildEagerLoadHooks());
+    sections.push(buildEagerLoadHooks(modelName));
     // ── Translatable helpers ──────────────────────────────────────────────────
     if (hasTranslatable) {
         sections.push('');
@@ -675,14 +675,14 @@ function buildSectionComment(title) {
  * config will be removed in a future major release per the #81
  * deprecation path.
  */
-function buildEagerLoadHooks() {
+function buildEagerLoadHooks(modelName) {
     return `
     /**
      * Override in the editable sibling service to eager-load relations
      * on the list() query. Default: no-op. Legacy schema-level eagerLoad
      * configuration still applies before this hook runs.
      *
-     * @param  \\Illuminate\\Database\\Eloquent\\Builder  $query
+     * @param  \\Illuminate\\Database\\Eloquent\\Builder<${modelName}>  $query
      */
     protected function applyListEagerLoads($query): void
     {
@@ -694,7 +694,7 @@ function buildEagerLoadHooks() {
      * Override in the editable sibling service to eager-load relations on
      * the findById() query. Default: no-op.
      *
-     * @param  \\Illuminate\\Database\\Eloquent\\Builder  $query
+     * @param  \\Illuminate\\Database\\Eloquent\\Builder<${modelName}>  $query
      */
     protected function applyFindByIdEagerLoads($query): void
     {
@@ -711,7 +711,7 @@ function buildEagerLoadHooks() {
      * the lookup() query. Default: no-op. Most lookup endpoints should
      * stay lean — eager loading defeats the point of a dropdown projection.
      *
-     * @param  \\Illuminate\\Database\\Eloquent\\Builder  $query
+     * @param  \\Illuminate\\Database\\Eloquent\\Builder<${modelName}>  $query
      */
     protected function applyLookupEagerLoads($query): void
     {
@@ -875,10 +875,7 @@ function buildListFilterShape(filterableFields, allowedSortColumns, hasSoftDelet
         lines.push(`     *     ${f.colName}?: ${phpType},`);
     }
     lines.push(`     *     search?: string,`);
-    const sortUnion = allowedSortColumns.length > 0
-        ? allowedSortColumns.flatMap(c => [`'${c}'`, `'-${c}'`]).join('|')
-        : 'string';
-    lines.push(`     *     sort?: ${sortUnion},`);
+    lines.push(`     *     sort?: string,`);
     lines.push(`     *     per_page?: int,`);
     if (hasSoftDelete) {
         lines.push(`     *     with_trashed?: bool,`);
@@ -1106,6 +1103,7 @@ function buildListMethod(modelName, searchableFields, filterableFields, sortable
      * @param array{
 ${filterShape}
      * } $filters
+     * @return LengthAwarePaginator<int, ${modelName}>
      *
 ${listExample}
      */
@@ -1188,11 +1186,15 @@ function resolvePhpFilterType(type) {
 }
 function buildFilterLine(f) {
     if (f.translatable) {
-        return `        $query->when(isset($filters['${f.colName}']), fn ($q) => $q->whereTranslation('${f.colName}', $filters['${f.colName}']));`;
+        return `        if (isset($filters['${f.colName}'])) {
+            $query->whereTranslation('${f.colName}', $filters['${f.colName}']);
+        }`;
     }
     switch (f.type) {
         case 'Boolean':
-            return `        $query->when(isset($filters['${f.colName}']), fn ($q) => $q->where('${f.colName}', $filters['${f.colName}']));`;
+            return `        if (isset($filters['${f.colName}'])) {
+            $query->where('${f.colName}', $filters['${f.colName}']);
+        }`;
         default:
             return `        $query->when($filters['${f.colName}'] ?? null, fn ($q, $v) => $q->where('${f.colName}', $v));`;
     }

package/dist/php/trait-generator.js

@@ -31,7 +31,7 @@ trait HasLocalizedDisplayName
     public static function displayName(?string $locale = null): string
     {
         $locale = $locale ?? app()->getLocale();
-        $displayNames = static::$localizedDisplayNames ?? [];
+        $displayNames = static::$localizedDisplayNames;
 
         return $displayNames[$locale]
             ?? $displayNames[config('app.fallback_locale', 'en')]
@@ -46,7 +46,7 @@ trait HasLocalizedDisplayName
      */
     public static function allDisplayNames(): array
     {
-        return static::$localizedDisplayNames ?? [];
+        return static::$localizedDisplayNames;
     }
 
     /**
@@ -88,7 +88,7 @@ trait HasLocalizedDisplayName
         $locale = $locale ?? app()->getLocale();
         $result = [];
 
-        foreach (static::$localizedPropertyDisplayNames ?? [] as $property => $displayNames) {
+        foreach (static::$localizedPropertyDisplayNames as $property => $displayNames) {
             $result[$property] = $displayNames[$locale]
                 ?? $displayNames[config('app.fallback_locale', 'en')]
                 ?? $displayNames[array_key_first($displayNames) ?? 'en']

package/dist/php/type-mapper.js

@@ -56,7 +56,7 @@ export function toPhpDocType(type, nullable = false) {
             phpType = 'mixed';
             break;
         case 'Json':
-            phpType = 'array';
+            phpType = 'array<array-key, mixed>';
             break;
         default:
             phpType = 'mixed';

package/package.json

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