@omnifyjp/ts 6.0.5 → 6.0.7

package/dist/interface-generator.d.ts

@@ -17,7 +17,6 @@ export declare function toSnakeCase(str: string): string;
  * unconditionally produced `table_session_id_id` (issue #149).
  */
 export declare function toFkColumnName(propertyName: string): string;
-/** Gets TypeScript type for a property. */
 export declare function getPropertyType(property: PropertyDefinition, allSchemas: Record<string, SchemaDefinition>): string;
 /**
  * Convert a property to TSProperty array.

package/dist/interface-generator.js

@@ -63,12 +63,29 @@ function getIdType(options) {
     return 'BigInt';
 }
 /** Gets TypeScript type for a property. */
+/**
+ * The interface name to write for a relation target, or `unknown` when the
+ * target lives outside the generated schema set (external `targetNamespace`
+ * models). Imports are collected from the same schema set, so anything absent
+ * here would be referenced without ever being imported.
+ */
+function resolveTargetName(target, allSchemas) {
+    if (!target || !(target in allSchemas)) {
+        return 'unknown';
+    }
+    return target;
+}
 export function getPropertyType(property, allSchemas) {
     if (property.type === 'File') {
         return property.multiple ? 'OmnifyFile[]' : 'OmnifyFile | null';
     }
     if (property.type === 'Association') {
-        const targetName = property.target ?? 'unknown';
+        // A target outside the schema set (an external model reached through
+        // `targetNamespace`, e.g. the app's own User) has no generated interface
+        // and therefore no import. Naming it anyway emits `user?: User` against an
+        // identifier nothing declares — TS2304 in every consumer. `unknown` is the
+        // honest type for a shape this generator cannot see.
+        const targetName = resolveTargetName(property.target, allSchemas);
         switch (property.relation) {
             case 'OneToOne':
             case 'ManyToOne':
@@ -78,7 +95,9 @@ export function getPropertyType(property, allSchemas) {
                 return `${targetName}[]`;
             case 'MorphTo':
                 if (property.targets && property.targets.length > 0) {
-                    return property.targets.join(' | ');
+                    return property.targets
+                        .map(target => resolveTargetName(target, allSchemas))
+                        .join(' | ');
                 }
                 return 'unknown';
             case 'MorphOne':
@@ -162,7 +181,9 @@ export function propertyToTSProperties(propertyName, property, schema, allSchema
     // Handle Association: MorphTo — creates _type, _id, and relation properties
     if (property.type === 'Association' && property.relation === 'MorphTo' && property.targets && property.targets.length > 0) {
         const targetUnion = property.targets.map(t => `'${t}'`).join(' | ');
-        const relationUnion = property.targets.join(' | ');
+        const relationUnion = property.targets
+            .map(target => resolveTargetName(target, allSchemas))
+            .join(' | ');
         return [
             {
                 name: `${propertyName}_type`,
@@ -186,7 +207,7 @@ export function propertyToTSProperties(propertyName, property, schema, allSchema
     }
     // Handle Association: ManyToOne / OneToOne (owning side) — creates FK _id and relation
     if (property.type === 'Association' && (property.relation === 'ManyToOne' || property.relation === 'OneToOne') && !property.mappedBy) {
-        const targetName = property.target ?? 'unknown';
+        const targetName = resolveTargetName(property.target, allSchemas);
         // Determine FK type from target schema
         let fkType = 'number';
         const targetSchema = property.target ? allSchemas[property.target] : undefined;

package/dist/php/model-generator.js

@@ -393,8 +393,15 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
         // not under per-module `Modules/File/Traits/`. The import statement
         // here must match, otherwise generated models crash with
         // `Trait "App\Omnify\Modules\File\Traits\HasFiles" not found`.
+        //
+        // The legacy fallback must use the GLOBAL `config.models.baseNamespace`,
+        // exactly like the writer in file-trait-generator.ts and like the audit
+        // trait below. The per-model `baseNamespace` argument carries the group
+        // (e.g. ...\Base\Space), which yielded `Base\Space\Traits\HasFiles`
+        // — a namespace nothing ever writes — so every model holding a File
+        // property fataled on load outside the modular structure.
         const fileTraitsNs = config
-            ? resolveGlobalTraitNamespace(config, baseNamespace + '\\Traits')
+            ? resolveGlobalTraitNamespace(config, config.models.baseNamespace + '\\Traits')
             : (traitsNamespace || baseNamespace + '\\Traits');
         lines.push(`use ${fileTraitsNs}\\HasFiles;`);
         if (modelNamespace) {

package/package.json

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