@omnifyjp/ts 5.9.1 → 5.9.3

package/dist/cli.js

@@ -29,7 +29,7 @@ import { Command } from 'commander';
 import { parse as parseYaml } from 'yaml';
 import { generateTypeScript } from './generator.js';
 import { generatePhp, derivePhpConfig } from './php/index.js';
-import { pruneOrphanServiceFiles } from './php/orphan-cleanup.js';
+import { pruneOrphanServiceFilesIfEnabled } from './php/orphan-cleanup.js';
 import { findSiblingWithSameBasename, findAppRootAncestor } from './php/sibling-skip.js';
 import { runPintFormat } from './php/pint-format.js';
 import { resolveInput, sniffInputKind } from './input-resolver.js';
@@ -315,7 +315,7 @@ program
         // pollutes Composer autoload. Prune base files automatically; warn
         // about editable `*Service.php` (may contain user code).
         const phpConfig = derivePhpConfig(laravelOverrides);
-        const cleanup = pruneOrphanServiceFiles(configDir, phpConfig, phpFiles);
+        const cleanup = pruneOrphanServiceFilesIfEnabled(configDir, phpConfig, phpFiles);
         if (cleanup.prunedBases.length > 0) {
             console.log(`  ${cleanup.prunedBases.length} orphan ServiceBase pruned (schema removed/renamed/opted-out)`);
             for (const p of cleanup.prunedBases) {

package/dist/php/model-generator.js

@@ -115,7 +115,7 @@ function generateBaseModel(name, schema, reader, config) {
     // the generated base model.
     const hasAuditLog = reader.isAuditLogEnabled(name);
     const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace, config, hasAuditLog);
-    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
+    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder, reader, config);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
     const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait, hasNestedSet, hasFiles, hasAuditLog);
@@ -409,8 +409,14 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     }
     return lines.join('\n') + '\n';
 }
-function buildDocProperties(properties, expandedProperties, propertyOrder) {
+function buildDocProperties(properties, expandedProperties, propertyOrder, reader, config) {
     const lines = [];
+    // Mirror buildCasts: EnumRef columns are cast to their generated enum class,
+    // so document them with that class (not `string`) — otherwise static analysis
+    // sees a string and rejects `$model->col->value` / enum comparisons.
+    const globalEnumNs = config
+        ? resolveGlobalEnumNamespace(config, config.models.namespace)
+        : '';
     for (const propName of propertyOrder) {
         const prop = properties[propName];
         if (!prop)
@@ -445,6 +451,16 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
         }
         const nullable = prop['nullable'] ?? false;
         const snakeName = toSnakeCase(propName);
+        // EnumRef → document the generated enum class (fully-qualified, matching the
+        // cast) only when the referenced enum schema exists; else fall through.
+        if (type === 'EnumRef') {
+            const enumName = prop['enum'];
+            if (typeof enumName === 'string' && reader.getSchema(enumName)?.kind === 'enum' && globalEnumNs) {
+                const enumType = `\\${globalEnumNs}\\${enumClassName(enumName)}`;
+                lines.push(` * @property ${nullable ? `${enumType}|null` : enumType} $${snakeName}`);
+                continue;
+            }
+        }
         const phpDocType = toPhpDocType(type, nullable);
         lines.push(` * @property ${phpDocType} $${snakeName}`);
     }

package/dist/php/orphan-cleanup.d.ts

@@ -26,6 +26,12 @@ export interface ServiceCleanupResult {
      *  preserved (may contain user code). Caller should print a warning. */
     warnedEditables: string[];
 }
+/**
+ * Apply service cleanup only while this target is managed by Omnify.
+ * A globally disabled service layer is a migration boundary: existing bases
+ * must remain available until the host application removes its inheritance.
+ */
+export declare function pruneOrphanServiceFilesIfEnabled(configDir: string, config: PhpConfig, generated: readonly GeneratedFile[]): ServiceCleanupResult;
 /**
  * Delete orphan `*ServiceBase.php` files; flag orphan editable services
  * for warning. Pure-ish: takes the generated file list (= source of

package/dist/php/orphan-cleanup.js

@@ -20,6 +20,17 @@
  */
 import { existsSync, readdirSync, statSync, unlinkSync } from 'node:fs';
 import { join, resolve, basename } from 'node:path';
+/**
+ * Apply service cleanup only while this target is managed by Omnify.
+ * A globally disabled service layer is a migration boundary: existing bases
+ * must remain available until the host application removes its inheritance.
+ */
+export function pruneOrphanServiceFilesIfEnabled(configDir, config, generated) {
+    if (!config.services.enabled) {
+        return { prunedBases: [], warnedEditables: [] };
+    }
+    return pruneOrphanServiceFiles(configDir, config, generated);
+}
 /**
  * Delete orphan `*ServiceBase.php` files; flag orphan editable services
  * for warning. Pure-ish: takes the generated file list (= source of

package/dist/php/service-generator.js

@@ -30,6 +30,8 @@ import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace
  *  - package-owned schemas (those get services in their owning package)
  */
 export function generateServices(reader, config) {
+    if (!config.services.enabled)
+        return [];
     const files = [];
     const candidates = collectServiceCandidates(reader);
     // Emit deprecation warnings once per schema for legacy service-block keys

package/dist/php/service-provider-generator.js

@@ -99,8 +99,9 @@ class OmnifyServiceProvider extends ServiceProvider
             $this->loadMigrationsFrom($connectionDir);
         }
 ${packageMigrationsBlock}
-        // Register morph map for polymorphic relationships
-        Relation::enforceMorphMap([
+        // Merge Omnify aliases without requiring every host-application model
+        // (Sanctum tokenables, media, notifications, etc.) to be listed here.
+        Relation::morphMap([
 ${morphMapContent}
         ]);
     }

package/dist/php/types.d.ts

@@ -87,6 +87,8 @@ export declare function resolveGlobalTraitNamespace(config: PhpConfig, legacyNam
  * working.
  */
 export interface LaravelPathOverride {
+    /** Disable generation for layers that support it (currently `service`). */
+    enable?: boolean;
     /** Path for BASE (auto-generated, regenerated) classes. */
     path?: string;
     /** Namespace for BASE (auto-generated) classes. */
@@ -303,7 +305,10 @@ export interface PhpConfig {
     };
     policies: BaseEditableLayer;
     controllers: BaseEditableLayer;
-    services: BaseEditableLayer;
+    services: BaseEditableLayer & {
+        /** False disables Laravel service emission and cleanup for this target. */
+        enabled: boolean;
+    };
     routes: {
         path: string;
     };

package/dist/php/types.js

@@ -359,7 +359,10 @@ export function derivePhpConfig(overrides) {
         },
         policies: policiesLayer,
         controllers: controllersLayer,
-        services: servicesLayer,
+        services: {
+            ...servicesLayer,
+            enabled: overrides?.service?.enable ?? true,
+        },
         routes: {
             path: routePath,
         },

package/dist/zod-generator.js

@@ -603,7 +603,7 @@ export function formatZodModelFile(schemaName) {
  * This file will NOT be overwritten by the generator.
  */
 
-import { z } from 'zod';
+import type { z } from 'zod';
 import type { ${schemaName} as ${schemaName}Base } from './base/${schemaName}';
 import {
   base${schemaName}Schemas,

package/package.json

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