@microsoft/power-apps-cli 0.6.0 → 0.6.4

package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/CodeGen/modelServiceGenerator.js

@@ -878,10 +878,15 @@ var ModelServiceGenerator = /** @class */ (function () {
         var requiredFields = this.getRequiredFields(definition);
         var propertiesNode = this.getPropertiesNode(definition);
         // Generate optionset enums first (before the interface)
-        var enumLines = this.generateOptionsetEnums(modelName, propertiesNode, padding);
-        if (enumLines.length > 0) {
-            lines.push.apply(lines, __spreadArray([], __read(enumLines), false));
-            lines.push(''); // Add blank line between enums and interface
+        // BUT only for top-level interfaces (addInterfaceName === true)
+        // Nested inline objects should not generate enums to avoid exporting them mid-interface
+        if (addInterfaceName) {
+            // Collect all enums including from nested objects
+            var allEnumLines = this.collectAllEnums(modelName, propertiesNode, padding);
+            if (allEnumLines.length > 0) {
+                lines.push.apply(lines, __spreadArray([], __read(allEnumLines), false));
+                lines.push(''); // Add blank line between enums and interface
+            }
         }
         this.addInterfaceDeclarationWithPadding(lines, modelName, addInterfaceName, padding);
         try {
@@ -909,6 +914,55 @@ var ModelServiceGenerator = /** @class */ (function () {
         this.closeInterfaceDeclarationWithPadding(lines, padding);
         return lines.join('\n');
     };
+    /**
+     * Recursively collects all enum declarations from properties, including nested objects.
+     * This ensures enums are hoisted to the top level and not exported mid-interface.
+     */
+    ModelServiceGenerator.collectAllEnums = function (modelName, propertiesNode, padding) {
+        var e_10, _b;
+        var enumLines = [];
+        try {
+            for (var _c = __values(Object.entries(propertiesNode)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), propName = _e[0], propValue = _e[1];
+                var propValueAsObject = typeof propValue === 'object' && propValue !== null && !Array.isArray(propValue)
+                    ? propValue
+                    : undefined;
+                if (!propValueAsObject) {
+                    continue;
+                }
+                // Check if this property has optionset data
+                if (this.hasOptionsetData(propValueAsObject)) {
+                    var enumName = this.generateOptionsetEnumName(modelName, propName);
+                    var enumDeclaration = this.generateOptionsetConstDeclaration(enumName, propValueAsObject, padding);
+                    enumLines.push(enumDeclaration);
+                }
+                // Recursively collect enums from nested objects
+                if (propValueAsObject.properties && typeof propValueAsObject.properties === 'object') {
+                    var nestedEnums = this.collectAllEnums(modelName, propValueAsObject.properties, padding);
+                    enumLines.push.apply(enumLines, __spreadArray([], __read(nestedEnums), false));
+                }
+                // Recursively collect enums from array items
+                if (propValueAsObject.type === 'array' &&
+                    propValueAsObject.items &&
+                    typeof propValueAsObject.items === 'object' &&
+                    !Array.isArray(propValueAsObject.items)) {
+                    var itemsObj = propValueAsObject.items;
+                    if (itemsObj.properties && typeof itemsObj.properties === 'object') {
+                        var itemEnums = this.collectAllEnums(modelName, itemsObj.properties, padding);
+                        enumLines.push.apply(enumLines, __spreadArray([], __read(itemEnums), false));
+                    }
+                }
+            }
+        }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+            }
+            finally { if (e_10) throw e_10.error; }
+        }
+        return enumLines;
+    };
     /**
      * Checks if a property has optionset data (enum and x-ms-enum-values)
      */
@@ -930,7 +984,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * @returns An array of const object declaration strings.
      */
     ModelServiceGenerator.generateOptionsetEnums = function (modelName, propertiesNode, padding) {
-        var e_10, _b;
+        var e_11, _b;
         var enumLines = [];
         try {
             for (var _c = __values(Object.entries(propertiesNode)), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -946,60 +1000,80 @@ var ModelServiceGenerator = /** @class */ (function () {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         return enumLines;
     };
+    /**
+     * Formats an enum label as a quoted string literal, escaping single quotes.
+     * Returns an empty string literal for empty labels.
+     */
+    ModelServiceGenerator.formatEnumLabel = function (label) {
+        if (!label || (typeof label === 'string' && label.trim() === '')) {
+            return "''"; // Placeholder for empty labels
+        }
+        else {
+            // Escape single quotes in the label to prevent breaking the string literal
+            var escapedLabel = label.replace(/'/g, "\\'");
+            return "'".concat(escapedLabel, "'");
+        }
+    };
     /**
      * Generates const object declaration for an optionset property.
      * Creates a const object with typed properties that is compatible with erasableSyntaxOnly.
      * Also generates a corresponding type alias for type safety.
      */
     ModelServiceGenerator.generateOptionsetConstDeclaration = function (enumName, propValue, padding) {
-        // Check for x-ms-enum-values format
-        var enumNumericValues = propValue['x-ms-enum-values'];
+        var _this = this;
+        // Check for x-ms-enum-values format (array of objects or numbers)
+        var enumValues = propValue['x-ms-enum-values'];
         var enumLabels = propValue.enum;
         var lines = [];
         enumName = (0, codeGenUtils_1.convertToValidIdentifier)(enumName);
-        if (enumNumericValues && Array.isArray(enumNumericValues) && enumLabels && Array.isArray(enumLabels)) {
-            // This is the path for dataverse where option sets have numeric values and display labels
-            // Generate const object with numeric keys
-            lines.push("".concat(padding, "export const ").concat(enumName, " = {"));
-            // Handle the format where enum contains display names and x-ms-enum-values contains numeric values
-            for (var i = 0; i < enumLabels.length; i++) {
-                var displayName = enumLabels[i]; // e.g., "Preferred Customer"
-                var numericValue = enumNumericValues[i]; // e.g., 1
-                // Use the display name directly as the string value
-                var sanitizedLabel = void 0;
-                if (!displayName || (typeof displayName === 'string' && displayName.trim() === '')) {
-                    // Generate a placeholder name for empty labels
-                    sanitizedLabel = "EmptyOption".concat(i);
-                }
-                else {
-                    sanitizedLabel = (0, nameUtility_1.sanitizeName)(displayName);
+        // Check if x-ms-enum-values exists and is an array
+        if (enumValues && Array.isArray(enumValues) && enumLabels && Array.isArray(enumLabels)) {
+            // Check if x-ms-enum-values contains objects with numeric values (Dataverse format)
+            var hasObjectFormat = enumValues.length > 0 && typeof enumValues[0] === 'object' && enumValues[0] !== null;
+            if (hasObjectFormat) {
+                // This is the Swagger format where x-ms-enum-values contains objects like {displayName, value}
+                // Just use the enum array for string union type
+                var labelStrings = enumLabels.map(function (label) { return _this.formatEnumLabel(label); });
+                lines.push("".concat(padding, "export type ").concat(enumName, " = ").concat(labelStrings.join('|'), ";"));
+            }
+            else {
+                // This is the Dataverse format where x-ms-enum-values contains numeric values
+                var enumNumericValues = enumValues;
+                // Generate const object with numeric keys
+                lines.push("".concat(padding, "export const ").concat(enumName, " = {"));
+                // Handle the format where enum contains display names and x-ms-enum-values contains numeric values
+                for (var i = 0; i < enumLabels.length; i++) {
+                    var displayName = enumLabels[i]; // e.g., "Preferred Customer"
+                    var numericValue = enumNumericValues[i]; // e.g., 1
+                    // Use the display name directly as the string value
+                    var sanitizedLabel = void 0;
+                    if (!displayName || (typeof displayName === 'string' && displayName.trim() === '')) {
+                        // Generate a placeholder name for empty labels
+                        sanitizedLabel = "EmptyOption".concat(i);
+                    }
+                    else {
+                        sanitizedLabel = (0, nameUtility_1.sanitizeName)(displayName);
+                    }
+                    var comma = i < enumLabels.length - 1 ? ',' : '';
+                    lines.push("".concat(padding, "  ").concat(numericValue, ": '").concat(sanitizedLabel, "'").concat(comma));
                 }
-                var comma = i < enumLabels.length - 1 ? ',' : '';
-                lines.push("".concat(padding, "  ").concat(numericValue, ": '").concat(sanitizedLabel, "'").concat(comma));
+                lines.push("".concat(padding, "} as const;"));
+                // Generate type alias for the numeric values
+                lines.push("".concat(padding, "export type ").concat(enumName, " = keyof typeof ").concat(enumName, ";"));
             }
-            lines.push("".concat(padding, "} as const;"));
-            // Generate type alias for the numeric values
-            lines.push("".concat(padding, "export type ").concat(enumName, " = keyof typeof ").concat(enumName, ";"));
         }
         else {
-            // This is the path for swaggers where option sets have display labels only
-            var labelStrings = enumLabels.map(function (label) {
-                if (!label || (typeof label === 'string' && label.trim() === '')) {
-                    return "''"; // Placeholder for empty labels
-                }
-                else {
-                    return "'".concat(label, "'");
-                }
-            });
+            // This is the path for swaggers where only enum array exists (no x-ms-enum-values)
+            var labelStrings = enumLabels.map(function (label) { return _this.formatEnumLabel(label); });
             lines.push("".concat(padding, "export type ").concat(enumName, " = ").concat(labelStrings.join('|'), ";"));
         }
         return lines.join('\n');
@@ -1389,7 +1463,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * It returns an object containing the parameters list and parameters properties.
      */
     ModelServiceGenerator.collectParameters = function (operationObject, modelName, imports, parameterTypes) {
-        var e_11, _b;
+        var e_12, _b;
         var parametersList = [];
         var parametersProps = [];
         if ('parameters' in operationObject && Array.isArray(operationObject.parameters)) {
@@ -1404,12 +1478,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                     parametersProps = result[1];
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (orderedParams_1_1 && !orderedParams_1_1.done && (_b = orderedParams_1.return)) _b.call(orderedParams_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_12) throw e_12.error; }
             }
         }
         return { parametersList: parametersList, parametersProps: parametersProps };
@@ -1999,7 +2073,7 @@ var ModelServiceGenerator = /** @class */ (function () {
     ModelServiceGenerator.handleDataverseSchema = function (modelName, dataSourceName, schema, outputDir, vfs) {
         return __awaiter(this, void 0, void 0, function () {
             var schemaObject, schemaProperty, itemsNode, primaryKey, properties, _b, _c, _d, propName, propValue, prop, _e, baseInterface, extendedInterface, hasLookupColumns, combinedModelCode, serviceCode;
-            var e_12, _f;
+            var e_13, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -2027,12 +2101,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                                     }
                                 }
                             }
-                            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                            catch (e_13_1) { e_13 = { error: e_13_1 }; }
                             finally {
                                 try {
                                     if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
                                 }
-                                finally { if (e_12) throw e_12.error; }
+                                finally { if (e_13) throw e_13.error; }
                             }
                         }
                         _e = this.generateDataverseInterfaces(modelName, itemsNode), baseInterface = _e.baseInterface, extendedInterface = _e.extendedInterface;
@@ -2122,7 +2196,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * Adds the SharePoint service class definition to the generated code.
      */
     ModelServiceGenerator.addSharepointServiceClassDefinition = function (lines, modelName, dataSourceName, schemaJson, primaryKey, hasReferenceEntities) {
-        var e_13, _b;
+        var e_14, _b;
         this.addServiceClassHeader(lines, modelName, dataSourceName, true);
         // Add CRUD methods
         var methods = [];
@@ -2138,12 +2212,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                 lines.push.apply(lines, __spreadArray([], __read(method), false));
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (methods_1_1 && !methods_1_1.done && (_b = methods_1.return)) _b.call(methods_1);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         // Add SharePoint-specific methods
         this.addGetMethodForReferenceEntities(lines, modelName, dataSourceName, schemaJson);
@@ -2275,7 +2349,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * The addSPModelInterfaceDeclaration method generates the TypeScript interface declaration for the model particular to Sharepoint.
      */
     ModelServiceGenerator.addSPModelInterfaceDeclaration = function (lines, modelName, propertiesNode, requiredFields, primaryKeyObj, schemaJson) {
-        var e_14, _b;
+        var e_15, _b;
         var result = this.addSPReferencedEntityModelInterfaceDeclaration(schemaJson, lines);
         var referenceEntitiesObjectMapping = result.mapping;
         // lines are already updated by the method above
@@ -2326,12 +2400,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                 this.addPropertyDeclaration(baseInterfaceLines, propName, propertiesNode[propName], requiredFields, primaryKeyObj);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         baseInterfaceLines.push('}');
         baseInterfaceLines.push('');
@@ -2422,7 +2496,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * The addModelInterfaceDeclaration method generates the TypeScript interface declaration for the model.
      */
     ModelServiceGenerator.addModelInterfaceDeclaration = function (lines, modelName, propertiesNode, requiredFields, primaryKey) {
-        var e_15, _b;
+        var e_16, _b;
         lines.push("export interface ".concat((0, codeGenUtils_1.convertToValidIdentifier)(modelName), " {"));
         primaryKey.value = '';
         try {
@@ -2432,12 +2506,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                 this.addPropertyDeclaration(lines, propName, propertiesNode[propName], requiredFields, primaryKey);
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         lines.push('}');
         lines.push('');
@@ -2584,7 +2658,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * It includes create, update, delete, get, and getAll methods.
      */
     ModelServiceGenerator.addServiceMethods = function (lines, modelName, dataSourceName, primaryKey, isADataverseEntity) {
-        var e_16, _b;
+        var e_17, _b;
         var methods = [];
         methods.push(this.generateCreateMethod(modelName, primaryKey));
         methods.push(this.generateUpdateMethod(modelName, primaryKey));
@@ -2601,12 +2675,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                 lines.push.apply(lines, __spreadArray([], __read(method), false));
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (methods_2_1 && !methods_2_1.done && (_b = methods_2.return)) _b.call(methods_2);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_17) throw e_17.error; }
         }
     };
     /*
@@ -2614,7 +2688,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * Uses base interface for Create/Update and extended interface for Get/GetAll operations.
      */
     ModelServiceGenerator.addDataverseServiceMethods = function (lines, modelName, dataSourceName, primaryKey, hasLookupColumns) {
-        var e_17, _b;
+        var e_18, _b;
         var methods = [];
         methods.push(this.generateDataverseCreateMethod(modelName, primaryKey, hasLookupColumns));
         methods.push(this.generateDataverseUpdateMethod(modelName, primaryKey, hasLookupColumns));
@@ -2629,12 +2703,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                 lines.push.apply(lines, __spreadArray([], __read(method), false));
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (methods_3_1 && !methods_3_1.done && (_b = methods_3.return)) _b.call(methods_3);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_18) throw e_18.error; }
         }
     };
     /*
@@ -2917,7 +2991,7 @@ var ModelServiceGenerator = /** @class */ (function () {
     ModelServiceGenerator.generateIndexFile = function (outputDir, vfs) {
         return __awaiter(this, void 0, void 0, function () {
             var indexPath, lines, modelsDir, modelFiles, modelFiles_1, modelFiles_1_1, file, fileName, servicesDir, serviceFiles, serviceFiles_1, serviceFiles_1_1, file, fileName;
-            var e_18, _b, e_19, _c;
+            var e_19, _b, e_20, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2941,12 +3015,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                                     lines.push("export * as ".concat(fileName, " from './models/").concat(fileName, "';"));
                                 }
                             }
-                            catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                            catch (e_19_1) { e_19 = { error: e_19_1 }; }
                             finally {
                                 try {
                                     if (modelFiles_1_1 && !modelFiles_1_1.done && (_b = modelFiles_1.return)) _b.call(modelFiles_1);
                                 }
-                                finally { if (e_18) throw e_18.error; }
+                                finally { if (e_19) throw e_19.error; }
                             }
                             lines.push('');
                         }
@@ -2968,12 +3042,12 @@ var ModelServiceGenerator = /** @class */ (function () {
                                     lines.push("export * from './services/".concat(fileName, "';"));
                                 }
                             }
-                            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                            catch (e_20_1) { e_20 = { error: e_20_1 }; }
                             finally {
                                 try {
                                     if (serviceFiles_1_1 && !serviceFiles_1_1.done && (_c = serviceFiles_1.return)) _c.call(serviceFiles_1);
                                 }
-                                finally { if (e_19) throw e_19.error; }
+                                finally { if (e_20) throw e_20.error; }
                             }
                             lines.push('');
                         }