@postxl/schema 1.4.0 → 1.4.1

package/dist/field/discriminated-union.js

@@ -128,7 +128,7 @@ const fieldDiscriminatedUnionTransformer = ({ fieldInput, model, projectSchema }
         }
         const decodedField = decodedFieldResult.data;
         const transformedField = Fields.fieldTransformer(decodedField, model, projectSchema, ctx);
-        commonFields.set(transformedField.name, addDiscriminatedUnionParent(transformedField, fieldInput.name));
+        commonFields.set(transformedField.name, addDiscriminatedUnionParent(transformedField, fieldInput.name, fieldInput.excelName));
     }
     const members = new Map();
     for (const memberInput of fieldInput.members) {
@@ -153,7 +153,7 @@ const fieldDiscriminatedUnionTransformer = ({ fieldInput, model, projectSchema }
                 return zod_1.z.NEVER;
             }
             const transformedField = Fields.fieldTransformer(decodedField, model, projectSchema, ctx);
-            memberFields.set(transformedField.name, addDiscriminatedUnionParentMember(transformedField, fieldInput.name, discriminator));
+            memberFields.set(transformedField.name, addDiscriminatedUnionParentMember(transformedField, fieldInput.name, fieldInput.excelName, discriminator));
         }
         members.set(discriminator, {
             type: discriminator,
@@ -174,7 +174,7 @@ const fieldDiscriminatedUnionTransformer = ({ fieldInput, model, projectSchema }
     return result;
 };
 exports.fieldDiscriminatedUnionTransformer = fieldDiscriminatedUnionTransformer;
-function addDiscriminatedUnionParent(field, duFieldName) {
+function addDiscriminatedUnionParent(field, duFieldName, duExcelName) {
     const result = {
         ...field,
         discriminatedUnionFieldName: duFieldName,
@@ -183,10 +183,16 @@ function addDiscriminatedUnionParent(field, duFieldName) {
             databaseName: field.databaseName,
             newName: `${duFieldName}${(0, utils_1.toPascalCase)(field.name)}`,
         }),
+        excelName: ensureCustomExcelName({
+            name: field.name,
+            label: field.label,
+            excelName: field.excelName,
+            newName: `${duExcelName} ${field.excelName}`,
+        }),
     };
     return result;
 }
-function addDiscriminatedUnionParentMember(field, duFieldName, duMemberType) {
+function addDiscriminatedUnionParentMember(field, duFieldName, duExcelName, duMemberType) {
     const result = {
         ...field,
         discriminatedUnionFieldName: duFieldName,
@@ -196,9 +202,22 @@ function addDiscriminatedUnionParentMember(field, duFieldName, duMemberType) {
             databaseName: field.databaseName,
             newName: `${duFieldName}${(0, utils_1.toPascalCase)(duMemberType)}${(0, utils_1.toPascalCase)(field.name)}`,
         }),
+        excelName: ensureCustomExcelName({
+            name: field.name,
+            label: field.label,
+            excelName: field.excelName,
+            newName: `${duExcelName} ${(0, utils_1.toPascalCase)(duMemberType)} ${field.excelName}`,
+        }),
     };
     return result;
 }
+function ensureCustomExcelName({ excelName, name, label, newName, }) {
+    // If the user explicitly set a custom excelName (different from the defaults), keep it
+    if (excelName !== name && excelName !== label && excelName !== (0, utils_1.toHumanReadable)(name)) {
+        return excelName;
+    }
+    return Branded.toExcelColumnName(newName);
+}
 function ensureCustomDatabaseName({ databaseName, name, newName, }) {
     if (databaseName !== name && databaseName !== (0, utils_1.toSnakeCase)(name)) {
         return databaseName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/schema",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Decoders for PXL Schema definitions and validation for PXL code generation framework",
   "main": "./dist/index.js",
   "module": "./dist/index.js",