@omnifyjp/ts 7.2.1 → 7.3.0

package/dist/php/openapi-generator.js

@@ -427,7 +427,7 @@ export function buildControllerMethodAttributes(config, schema, modelName, schem
         parameters: [
             new OA\\Parameter(name: 'search', in: 'query', required: false, schema: new OA\\Schema(type: 'string')),
             new OA\\Parameter(name: 'sort', in: 'query', required: false, schema: new OA\\Schema(type: 'string')),
-            new OA\\Parameter(name: 'per_page', in: 'query', required: false, schema: new OA\\Schema(type: 'integer', default: ${schema.options?.api?.perPage ?? 15})),
+            new OA\\Parameter(name: 'per_page', in: 'query', required: false, schema: new OA\\Schema(type: 'integer', default: ${schema.options?.api?.perPage ?? 15}, minimum: 1, maximum: ${schema.options?.api?.maxPerPage ?? 100})),
             new OA\\Parameter(name: 'page', in: 'query', required: false, schema: new OA\\Schema(type: 'integer')),
         ],
         responses: [

package/dist/php/request-generator.js

@@ -68,6 +68,7 @@ function generateBaseRequest(name, schema, reader, config, action) {
     const isUpdate = action === 'Update';
     const rulesLines = [];
     const attributeKeys = [];
+    const translatableRules = [];
     for (const propName of propertyOrder) {
         const prop = properties[propName];
         if (!prop)
@@ -183,19 +184,26 @@ function generateBaseRequest(name, schema, reader, config, action) {
             : formatRules(rules);
         rulesLines.push(`            '${snakeName}' => ${formattedRules},`);
         attributeKeys.push(snakeName);
-        // Translatable: add locale-nested rules (Astrotomic expects {locale}.{field})
+        // Translatable: collect locale-nested rules (Astrotomic expects {locale}.{field}).
+        // Emitted after the loop so each `<locale>` array key appears ONCE no
+        // matter how many translatable fields the schema has (#281: per-field
+        // emission produced duplicate array keys, PHPStan array.duplicateKey).
         const isTranslatable = prop['translatable'] ?? false;
         if (isTranslatable) {
-            const locales = reader.getLocales();
             // Build nullable version of the same rules
             const localeRules = rules.map(r => {
                 if (r === 'required')
                     return 'nullable';
                 return r;
             });
-            for (const locale of locales) {
-                rulesLines.push(`            '${locale}' => ['nullable', 'array'],`);
-                rulesLines.push(`            '${locale}.${snakeName}' => ${formatRules(localeRules)},`);
+            translatableRules.push({ snakeName, rules: formatRules(localeRules) });
+        }
+    }
+    if (translatableRules.length > 0) {
+        for (const locale of reader.getLocales()) {
+            rulesLines.push(`            '${locale}' => ['nullable', 'array'],`);
+            for (const t of translatableRules) {
+                rulesLines.push(`            '${locale}.${t.snakeName}' => ${t.rules},`);
             }
         }
     }

package/dist/php/resource-generator.js

@@ -6,6 +6,43 @@ import { resolveTimestamps } from './timestamps.js';
 import { isHiddenByDefault, toResourceExpression } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace, resolveBaseClass, resolveEditableClass, nestByGroup, nestEditableByGroup } from './types.js';
 import { createClassImporter, renderUseBlock } from './php-style.js';
+/**
+ * Instance members that make `$this-><name>` inside a JsonResource NOT a plain
+ * read of the model's attribute/relation (#281):
+ *  - JsonResource's own public properties — `$this->with` / `$this->additional`
+ *    / `$this->resource` read the resource object itself, not the model.
+ *  - Eloquent Model's protected properties (Model + HasAttributes,
+ *    HasRelationships, HasEvents, HidesAttributes, GuardsAttributes). Runtime
+ *    reaches the attribute through __get, but via `@mixin Model` PHPStan sees a
+ *    protected property (`property.protected`) — e.g. a `relations` association
+ *    produced `Resource::collection($this->relations)`.
+ * For these, emit `$this->resource-><name>`, which always goes through the
+ * model's __get. Model's PUBLIC properties (exists, timestamps, incrementing, …)
+ * are not listed: they shadow the attribute on the model itself, so no
+ * resource-side spelling can reach it.
+ */
+const RESOURCE_RESERVED_MEMBERS = new Set([
+    // JsonResource
+    'resource', 'with', 'additional',
+    // Illuminate\Database\Eloquent\Model (protected)
+    'connection', 'table', 'primaryKey', 'keyType', 'withCount', 'perPage', 'escapeWhenCastingToString',
+    // Concerns\HasAttributes
+    'attributes', 'original', 'changes', 'previous', 'casts', 'classCastCache', 'attributeCastCache', 'dateFormat', 'appends',
+    // Concerns\HasRelationships
+    'relations', 'touches',
+    // Concerns\HasEvents
+    'dispatchesEvents', 'observables',
+    // Concerns\HidesAttributes / GuardsAttributes
+    'hidden', 'visible', 'fillable', 'guarded',
+]);
+/** `$this-><name>` for a model attribute/relation, collision-safe (#281). */
+function modelMember(name) {
+    return RESOURCE_RESERVED_MEMBERS.has(name) ? `$this->resource->${name}` : `$this->${name}`;
+}
+/** Rewrite a `$this-><name>…` expression from toResourceExpression() collision-safe (#281). */
+function safeResourceExpression(name, expr) {
+    return RESOURCE_RESERVED_MEMBERS.has(name) ? expr.replace(`$this->${name}`, modelMember(name)) : expr;
+}
 /** Generate Resource classes for all project-owned visible object schemas.
  *
  * Issue #101 v5.8.23 emitted ONLY the base — but child resources embed a
@@ -111,7 +148,7 @@ function generateBaseResource(name, schema, reader, config) {
             for (const col of expandedProperties[propName].columns ?? []) {
                 const colName = col.name ?? '';
                 const colType = col.type ?? 'String';
-                const expr = toResourceExpression(colName, colType);
+                const expr = safeResourceExpression(colName, toResourceExpression(colName, colType));
                 fields.push(`            '${colName}' => ${expr},`);
             }
             const sourceType = expandedProperties[propName].sourceType ?? '';
@@ -128,7 +165,7 @@ function generateBaseResource(name, schema, reader, config) {
             continue;
         }
         const snakeName = toSnakeCase(propName);
-        const expr = toResourceExpression(snakeName, type);
+        const expr = safeResourceExpression(snakeName, toResourceExpression(snakeName, type));
         fields.push(`            '${snakeName}' => ${expr},`);
     }
     // Include translations for translatable models
@@ -331,7 +368,7 @@ function addAssociationFields(schemaName, propName, prop, fields, resourceNamesp
         }
         if (relation === 'ManyToOne') {
             const snakeName = toFkColumnName(propName);
-            fields.push(`            '${snakeName}' => $this->${snakeName},`);
+            fields.push(`            '${snakeName}' => ${modelMember(snakeName)},`);
         }
         fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}'),`);
         return;
@@ -340,18 +377,18 @@ function addAssociationFields(schemaName, propName, prop, fields, resourceNamesp
     switch (relation) {
         case 'ManyToOne': {
             const snakeName = toFkColumnName(propName);
-            fields.push(`            '${snakeName}' => $this->${snakeName},`);
-            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => new ${importer.ref(`${targetResNs}\\${targetResource}`)}($this->${methodName})),`);
+            fields.push(`            '${snakeName}' => ${modelMember(snakeName)},`);
+            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => new ${importer.ref(`${targetResNs}\\${targetResource}`)}(${modelMember(methodName)})),`);
             break;
         }
         case 'OneToMany':
         case 'ManyToMany':
         case 'MorphMany':
-            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => ${importer.ref(`${targetResNs}\\${targetResource}`)}::collection($this->${methodName})),`);
+            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => ${importer.ref(`${targetResNs}\\${targetResource}`)}::collection(${modelMember(methodName)})),`);
             break;
         case 'OneToOne':
         case 'MorphOne':
-            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => new ${importer.ref(`${targetResNs}\\${targetResource}`)}($this->${methodName})),`);
+            fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}', fn () => new ${importer.ref(`${targetResNs}\\${targetResource}`)}(${modelMember(methodName)})),`);
             break;
         case 'MorphTo':
             fields.push(`            '${methodName}' => $this->whenLoaded('${methodName}'),`);

package/dist/php/schema-reader.d.ts

@@ -58,6 +58,11 @@ export declare class SchemaReader {
         readonly defaultLocale: string;
         readonly fallbackLocale: string;
         readonly enforceLanguageFk?: boolean;
+        readonly translatable?: {
+            readonly toArrayAlwaysLoadsTranslations?: boolean;
+            readonly useFallback?: boolean;
+            readonly usePropertyFallback?: boolean;
+        };
     };
     getLocales(): string[];
     getDefaultLocale(): string;

package/dist/php/service-generator.js

@@ -473,7 +473,10 @@ function generateBaseService(name, schema, reader, config) {
     const svcRaw = options.service;
     const svc = (svcRaw && typeof svcRaw === 'object') ? svcRaw : {};
     const hasSoftDelete = options.softDelete ?? false;
-    const perPage = api.perPage ?? 25;
+    // #280: per_page is clamped to [1, maxPerPage] inside list(). A default
+    // above the ceiling is pulled down to it.
+    const maxPerPage = api.maxPerPage ?? 100;
+    const perPage = Math.min(api.perPage ?? 25, maxPerPage);
     // #81: lookup fields come from property-level `lookupable: true`.
     // Legacy `options.service.lookupFields` still honoured (deprecation warning
     // fired earlier). Always emit lookup() — it's a free method on every
@@ -561,7 +564,7 @@ function generateBaseService(name, schema, reader, config) {
     // Allowed sort columns whitelist (#75.2: prevent SQL injection via sort filter)
     const allowedSortColumns = buildAllowedSortColumns(searchableFields, filterableFields, sortableFields, defaultSort, hasSoftDelete);
     // list() method
-    sections.push(buildListMethod(modelName, searchableFields, filterableFields, sortableFields, hasSoftDelete, eagerLoad, eagerCount, defaultSort, perPage, allowedSortColumns, translationCtx, reader));
+    sections.push(buildListMethod(modelName, searchableFields, filterableFields, sortableFields, hasSoftDelete, eagerLoad, eagerCount, defaultSort, perPage, maxPerPage, allowedSortColumns, translationCtx, reader));
     // findById() method
     sections.push(buildFindByIdMethod(modelName, eagerLoad, eagerCount, hasSoftDelete));
     // ── Create section ────────────────────────────────────────────────────────
@@ -1086,7 +1089,7 @@ function buildAllowedSortColumns(searchableFields, filterableFields, sortableFie
         set.add(defaultCol);
     return Array.from(set).sort();
 }
-function buildListMethod(modelName, searchableFields, filterableFields, sortableFields, hasSoftDelete, eagerLoad, eagerCount, defaultSort, perPage, allowedSortColumns, tx, reader) {
+function buildListMethod(modelName, searchableFields, filterableFields, sortableFields, hasSoftDelete, eagerLoad, eagerCount, defaultSort, perPage, maxPerPage, allowedSortColumns, tx, reader) {
     const lines = [];
     // #77 follow-up: strict multi-line array-shape enumerating every filter
     // key explicitly (no catch-all). Sort union includes -prefixed DESC variants.
@@ -1151,9 +1154,14 @@ ${listExample}
     // Sort
     lines.push('');
     lines.push(buildSortSection(sortableFields, defaultSort, allowedSortColumns, tx));
-    // Paginate
+    // Paginate — #280: clamp both ends. A negative per_page would otherwise
+    // disable LIMIT (whole-table dump) and a huge one is unbounded.
     lines.push(`
-        return $query->paginate($filters['per_page'] ?? ${perPage});
+        $perPage = filter_var($filters['per_page'] ?? null, FILTER_VALIDATE_INT);
+        $perPage = $perPage === false || $perPage === null ? ${perPage} : $perPage;
+        $perPage = max(1, min($perPage, ${maxPerPage}));
+
+        return $query->paginate($perPage);
     }`);
     return lines.join('\n');
 }

package/dist/php/translatable-config-generator.d.ts

@@ -20,4 +20,4 @@
  */
 import type { SchemaReader } from './schema-reader.js';
 import type { GeneratedFile, PhpConfig } from './types.js';
-export declare function generateTranslatableConfig(reader: SchemaReader, _config: PhpConfig): GeneratedFile[];
+export declare function generateTranslatableConfig(reader: SchemaReader, config: PhpConfig): GeneratedFile[];

package/dist/php/translatable-config-generator.js

@@ -19,7 +19,8 @@
  * or extend it via Laravel's config merging.
  */
 import { baseFile } from './types.js';
-export function generateTranslatableConfig(reader, _config) {
+import { translationModelNamespace } from './translation-model-generator.js';
+export function generateTranslatableConfig(reader, config) {
     // Only emit when at least one schema has translatable fields — otherwise
     // the file would just be dead weight in projects that don't use i18n.
     const objectSchemas = reader.getProjectObjectSchemas();
@@ -43,6 +44,14 @@ export function generateTranslatableConfig(reader, _config) {
     // `fallbackLocale` if set, otherwise fall back to the same defaultLocale.
     const fallbackLocale = reader.getLocale()?.fallbackLocale ?? defaultLocale;
     const localesPhp = locales.map(l => `        '${l}',`).join('\n');
+    // #281: options from omnify.yaml `locale.translatable.*`; absent = true
+    // (the values this file has always shipped with).
+    const opts = reader.getLocale()?.translatable ?? {};
+    const phpBool = (v) => ((v ?? true) ? 'true' : 'false');
+    // #281: must match where translation-model-generator writes the
+    // `{Model}Translation` classes — `null` made Astrotomic look next to the
+    // parent model (e.g. App\Models\IssueTranslation) and fail.
+    const translationNamespace = translationModelNamespace(config).replace(/\\/g, '\\\\');
     const content = `<?php
 
 /**
@@ -104,14 +113,14 @@ ${localesPhp}
     | which would surface as blank dropdown labels in multi-locale projects.
     |
     */
-    'use_fallback' => true,
+    'use_fallback' => ${phpBool(opts.useFallback)},
 
     /*
     |--------------------------------------------------------------------------
     | Use property fallback
     |--------------------------------------------------------------------------
     */
-    'use_property_fallback' => true,
+    'use_property_fallback' => ${phpBool(opts.usePropertyFallback)},
 
     /*
     |--------------------------------------------------------------------------
@@ -125,7 +134,7 @@ ${localesPhp}
     | Translation model namespace
     |--------------------------------------------------------------------------
     */
-    'translation_model_namespace' => null,
+    'translation_model_namespace' => '${translationNamespace}',
 
     /*
     |--------------------------------------------------------------------------
@@ -150,7 +159,7 @@ ${localesPhp}
     | Keeps paginator results self-contained for JSON API responses.
     |
     */
-    'to_array_always_loads_translations' => true,
+    'to_array_always_loads_translations' => ${phpBool(opts.toArrayAlwaysLoadsTranslations)},
 
     /*
     |--------------------------------------------------------------------------

package/dist/php/translation-model-generator.d.ts

@@ -11,3 +11,9 @@ import { SchemaReader } from './schema-reader.js';
 import type { GeneratedFile, PhpConfig } from './types.js';
 /** Generate translation model files for all project schemas with translatable fields. */
 export declare function generateTranslationModels(reader: SchemaReader, config: PhpConfig): GeneratedFile[];
+/**
+ * Namespace of the editable `{Model}Translation` classes. Also emitted as
+ * Astrotomic's `translation_model_namespace` in config/translatable.php so
+ * the trait resolves the classes this generator writes (#281).
+ */
+export declare function translationModelNamespace(config: PhpConfig): string;

package/dist/php/translation-model-generator.js

@@ -161,6 +161,16 @@ ${fillableLines}
         : `${config.models.basePath}/Translation/${baseClassName}.php`;
     return baseFile(filePath, content);
 }
+/**
+ * Namespace of the editable `{Model}Translation` classes. Also emitted as
+ * Astrotomic's `translation_model_namespace` in config/translatable.php so
+ * the trait resolves the classes this generator writes (#281).
+ */
+export function translationModelNamespace(config) {
+    return config.structure === 'modular'
+        ? config.models.namespace
+        : `${config.models.userEditableNamespace}\\Translation`;
+}
 function generateTranslationUserModel(name, config) {
     const modelName = toPascalCase(name);
     // Issue #98 v5.8.2: editable translation stub also lives under
@@ -171,9 +181,7 @@ function generateTranslationUserModel(name, config) {
     // the FILE LOCATION, not the base namespace — otherwise PSR-4 fails
     // at runtime. Use `userEditableNamespace` (resolved from the config
     // override) instead of the base `models.namespace`.
-    const modelNamespace = config.structure === 'modular'
-        ? config.models.namespace
-        : `${config.models.userEditableNamespace}\\Translation`;
+    const modelNamespace = translationModelNamespace(config);
     const baseNamespace = config.structure === 'modular'
         ? resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace)
         : `${config.models.baseNamespace}\\Translation`;

package/dist/types.d.ts

@@ -62,6 +62,12 @@ export interface SchemasJson {
         readonly defaultLocale: string;
         readonly fallbackLocale: string;
         readonly enforceLanguageFk?: boolean;
+        /** `locale.translatable.*` from omnify.yaml — config/translatable.php options (#281). */
+        readonly translatable?: {
+            readonly toArrayAlwaysLoadsTranslations?: boolean;
+            readonly useFallback?: boolean;
+            readonly usePropertyFallback?: boolean;
+        };
     };
     readonly customTypes: {
         readonly compound: Record<string, CompoundTypeDefinition>;
@@ -142,6 +148,8 @@ export interface ApiOptions {
     readonly restore?: boolean;
     readonly middleware?: readonly string[];
     readonly perPage?: number;
+    /** Upper bound for `per_page` in the generated list() (#280). Default 100. */
+    readonly maxPerPage?: number;
 }
 /**
  * Service layer codegen options — controls BaseService generation. Issue #57.

package/package.json

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