@omnifyjp/omnify 3.12.3 → 3.12.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "3.12.3",
+  "version": "3.12.5",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "3.12.3",
-    "@omnifyjp/omnify-darwin-x64": "3.12.3",
-    "@omnifyjp/omnify-linux-x64": "3.12.3",
-    "@omnifyjp/omnify-linux-arm64": "3.12.3",
-    "@omnifyjp/omnify-win32-x64": "3.12.3"
+    "@omnifyjp/omnify-darwin-arm64": "3.12.5",
+    "@omnifyjp/omnify-darwin-x64": "3.12.5",
+    "@omnifyjp/omnify-linux-x64": "3.12.5",
+    "@omnifyjp/omnify-linux-arm64": "3.12.5",
+    "@omnifyjp/omnify-win32-x64": "3.12.5"
   }
 }

package/ts-dist/enum-generator.js

@@ -208,12 +208,32 @@ export function formatTypeAlias(alias) {
 /** Extract inline enums from Enum/Select properties. */
 export function extractInlineEnums(schemas, options) {
     const results = [];
+    // Pre-compute the set of real `kind: enum` schema names so we can skip
+    // inline enums whose generated name (`{Schema}{Property}`) would collide.
+    // This happens when a project has e.g. both `kind: enum MenuStatus` and
+    // a `Menu.status: { type: Enum, enum: [...] }` inline declaration — the
+    // generator used to emit BOTH into index.ts, producing duplicate
+    // exports. The real enum schema is canonical; the inline duplicate is
+    // skipped so the user can clean it up by switching the property to
+    // `type: EnumRef, enum: MenuStatus`.
+    const realEnumNames = new Set();
+    for (const s of Object.values(schemas)) {
+        if (s.kind === 'enum')
+            realEnumNames.add(s.name);
+    }
     for (const schema of Object.values(schemas)) {
         if (schema.kind === 'enum' || !schema.properties)
             continue;
         for (const [propName, property] of Object.entries(schema.properties)) {
             if (property.type === 'Enum' && Array.isArray(property.enum) && property.enum.length > 0) {
                 const typeName = `${schema.name}${toPascalCase(propName)}`;
+                if (realEnumNames.has(typeName)) {
+                    // eslint-disable-next-line no-console
+                    console.warn(`[omnify-ts] Skipping inline enum ${schema.name}.${propName} — ` +
+                        `its generated name "${typeName}" collides with the real enum schema "${typeName}". ` +
+                        `Consider switching the property to \`type: EnumRef, enum: ${typeName}\` to remove the duplication.`);
+                    continue;
+                }
                 const displayName = resolveString(schema.displayName, options);
                 // Check if values have labels (i.e., are objects not strings)
                 const enumValues = property.enum;