@omnifyjp/ts 6.7.9 → 6.7.11

package/dist/cli.js

@@ -251,7 +251,8 @@ program
         let phpOverwritten = 0;
         let phpSkipped = 0;
         let phpSkippedSibling = 0;
-        let phpShadowed = 0;
+        let phpShadowedOutOfSync = 0;
+        let phpShadowedAtRisk = 0;
         const skippedSiblingExamples = [];
         const writtenPaths = [];
         for (const file of phpFiles) {
@@ -271,9 +272,17 @@ program
                 // the base generates. #171 — a redeclared $fillable shadows the
                 // parent's, so every property added afterwards is stripped on mass
                 // assignment with no error anywhere.
-                for (const hint of evaluateShadowingConflicts(existing, file.conflicts ?? [])) {
-                    phpShadowed++;
-                    console.warn(`[omnify-ts] ${relative(configDir, filePath)}: ${hint}`);
+                const shadowResults = evaluateShadowingConflicts(existing, file.conflicts ?? []);
+                if (shadowResults.length > 0) {
+                    if (shadowResults.some((r) => r.drift === 'out-of-sync')) {
+                        phpShadowedOutOfSync++;
+                    }
+                    else {
+                        phpShadowedAtRisk++;
+                    }
+                    for (const result of shadowResults) {
+                        console.warn(`[omnify-ts] ${relative(configDir, filePath)}: ${result.message}`);
+                    }
                 }
                 continue;
             }
@@ -322,9 +331,15 @@ program
             console.log(`  ${phpCreated} files created (user-editable)`);
         if (phpSkipped > 0)
             console.log(`  ${phpSkipped} files skipped (already exist)`);
-        if (phpShadowed > 0) {
-            console.warn(`  ${phpShadowed} editable file(s) shadow a generated property — ` +
-                `schema changes will NOT reach them until that is fixed (see warnings above).`);
+        if (phpShadowedOutOfSync > 0 || phpShadowedAtRisk > 0) {
+            const summaryParts = [];
+            if (phpShadowedOutOfSync > 0) {
+                summaryParts.push(`${phpShadowedOutOfSync} editable file(s) already out of sync with the base`);
+            }
+            if (phpShadowedAtRisk > 0) {
+                summaryParts.push(`${phpShadowedAtRisk} shadow a generated property and will drift on the next schema change`);
+            }
+            console.warn(`  ${summaryParts.join(', ')} (see warnings above).`);
         }
         if (phpSkippedSibling > 0) {
             console.log(`  ${phpSkippedSibling} user-editable stub(s) skipped (project sibling with same name found in subfolder)`);

package/dist/php/shadowing-conflicts.d.ts

@@ -11,7 +11,13 @@ export declare function shadowingPropertyConflicts(baseClass: string, baseArrayV
  */
 export declare function parseRedeclaredStringArray(source: string, prop: string): string[] | null;
 export declare function formatShadowingDrift(baseValues: readonly string[], childValues: string[] | null): string;
+export type ShadowingDrift = 'out-of-sync' | 'extra-only' | 'in-sync' | 'unknown';
+export type ShadowingConflictResult = {
+    property: ShadowingEloquentProperty;
+    message: string;
+    drift: ShadowingDrift;
+};
 /**
  * Evaluate shadowing conflicts for a skipped user-editable model file.
  */
-export declare function evaluateShadowingConflicts(existingRaw: string, conflicts: readonly ShadowingPropertyConflict[]): string[];
+export declare function evaluateShadowingConflicts(existingRaw: string, conflicts: readonly ShadowingPropertyConflict[]): ShadowingConflictResult[];

package/dist/php/shadowing-conflicts.js

@@ -92,12 +92,31 @@ export function formatShadowingDrift(baseValues, childValues) {
     }
     return parts.join('; ') + '.';
 }
+function classifyShadowingDrift(baseValues, childValues) {
+    if (!baseValues || baseValues.length === 0) {
+        return 'unknown';
+    }
+    if (childValues === null) {
+        return 'unknown';
+    }
+    const baseSet = new Set(baseValues);
+    const childSet = new Set(childValues);
+    const missing = baseValues.filter((v) => !childSet.has(v));
+    const extra = childValues.filter((v) => !baseSet.has(v));
+    if (missing.length === 0 && extra.length === 0) {
+        return 'in-sync';
+    }
+    if (missing.length > 0) {
+        return 'out-of-sync';
+    }
+    return 'extra-only';
+}
 /**
  * Evaluate shadowing conflicts for a skipped user-editable model file.
  */
 export function evaluateShadowingConflicts(existingRaw, conflicts) {
     const stripped = stripPhpComments(existingRaw);
-    const warnings = [];
+    const results = [];
     for (const conflict of conflicts) {
         if (hasIntentionalShadowMarker(existingRaw, conflict.property)) {
             continue;
@@ -106,14 +125,18 @@ export function evaluateShadowingConflicts(existingRaw, conflicts) {
             continue;
         }
         let message = conflict.hint;
-        if (conflict.baseValues && conflict.baseValues.length > 0) {
-            const childValues = parseRedeclaredStringArray(existingRaw, conflict.property);
-            const drift = formatShadowingDrift(conflict.baseValues, childValues);
-            if (drift) {
-                message += ` ${drift}`;
+        const baseValues = conflict.baseValues && conflict.baseValues.length > 0 ? conflict.baseValues : undefined;
+        const childValues = baseValues
+            ? parseRedeclaredStringArray(existingRaw, conflict.property)
+            : null;
+        const drift = classifyShadowingDrift(baseValues, childValues);
+        if (baseValues) {
+            const driftText = formatShadowingDrift(baseValues, childValues);
+            if (driftText) {
+                message += ` ${driftText}`;
             }
         }
-        warnings.push(message);
+        results.push({ property: conflict.property, message, drift });
     }
-    return warnings;
+    return results;
 }

package/package.json

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