@omnifyjp/ts 6.3.9 → 6.3.11

package/dist/php/resource-generator.js

@@ -102,7 +102,7 @@ function generateBaseResource(name, schema, reader, config) {
         if (isHiddenByDefault(type) || hidden)
             continue;
         if (type === 'Association') {
-            addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config, importer);
+            addAssociationFields(name, propName, prop, fields, resourceNamespace, modelNamespace, reader, config, importer);
             continue;
         }
         if (expandedProperties[propName]) {
@@ -258,7 +258,7 @@ class ${editable.className} extends ${baseAlias}
 `;
     return userFile(`${editable.path}/${editable.fileName}`, content);
 }
-function addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config, importer) {
+function addAssociationFields(schemaName, propName, prop, fields, resourceNamespace, modelNamespace, reader, config, importer) {
     const relation = prop['relation'] ?? '';
     const target = prop['target'] ?? '';
     const methodName = toCamelCase(propName);
@@ -309,6 +309,23 @@ function addAssociationFields(propName, prop, fields, resourceNamespace, modelNa
     // If target is a package schema without a resource namespace, or a model no
     // Resource is written for, use simple whenLoaded
     if ((!targetResNs || !targetHasResource) && relation !== 'MorphTo') {
+        // Say it. An unwrapped relation serializes the raw model instead of the
+        // shaped resource, so the endpoint's response changes shape — and the PHP
+        // still compiles, so the only way anyone noticed was an unexpected line in
+        // a diff (#187). A target that is not a schema at all is the ordinary case
+        // (an external model reached through `targetNamespace`) and stays quiet.
+        if (reader.getSchema(target)) {
+            console.warn(`[omnify-ts] ${schemaName}.${propName}: no Resource class for target `
+                + `'${target}', so it serializes as the raw model instead of `
+                + `${toPascalCase(target)}Resource. `
+                + (targetResNs
+                    ? `Cause: this codegen target writes no Resource for ${target} `
+                        + `(kind: extend, options.hidden, or an includeSchemas / `
+                        + `excludeSchemas filter that leaves it out).`
+                    : `Cause: package '${reader.getSchema(target)?.package}' declares no `
+                        + `codegen.laravel.resource.namespace, so its Resource class cannot `
+                        + `be named from here.`));
+        }
         if (relation === 'ManyToOne') {
             const snakeName = toFkColumnName(propName);
             fields.push(`            '${snakeName}' => $this->${snakeName},`);

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

@@ -18,6 +18,12 @@ export declare class SchemaReader {
         name: string;
         schema: SchemaDefinition;
     } | undefined;
+    /**
+     * Object schemas this run generates for. `referenceOnly` entries are left
+     * out: they are in the export solely so relation targets resolve (#187),
+     * and every generation loop reaches the set through this method.
+     * `getSchema()` deliberately still returns them.
+     */
     getObjectSchemas(): Record<string, SchemaDefinition>;
     getVisibleObjectSchemas(): Record<string, SchemaDefinition>;
     getEnumSchemas(): Record<string, SchemaDefinition>;

package/dist/php/schema-reader.js

@@ -37,11 +37,17 @@ export class SchemaReader {
         }
         return undefined;
     }
+    /**
+     * Object schemas this run generates for. `referenceOnly` entries are left
+     * out: they are in the export solely so relation targets resolve (#187),
+     * and every generation loop reaches the set through this method.
+     * `getSchema()` deliberately still returns them.
+     */
     getObjectSchemas() {
         const result = {};
         for (const [name, schema] of Object.entries(this.getSchemas())) {
             const kind = schema.kind ?? 'object';
-            if (kind !== 'enum' && kind !== 'partial') {
+            if (kind !== 'enum' && kind !== 'partial' && !schema.referenceOnly) {
                 result[name] = schema;
             }
         }

package/dist/types.d.ts

@@ -248,6 +248,14 @@ export interface SchemaDefinition {
      * run never saw them (#164).
      */
     readonly extendedProperties?: readonly string[];
+    /**
+     * Set by the Go side for a PACKAGE schema that this codegen target's
+     * include/exclude filter keeps out of the output but that relations still
+     * have to resolve against (#187). Generation loops skip it; `getSchema()`
+     * still returns it so a cross-package reference names the package's class
+     * instead of silently degrading.
+     */
+    readonly referenceOnly?: boolean;
     readonly values?: readonly EnumValueDefinition[];
     readonly pivotFor?: readonly string[];
     readonly policies?: readonly PolicyDefinition[];

package/package.json

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