@microsoft/power-apps-cli 0.5.3 → 0.5.7

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

@@ -264,13 +264,13 @@ var ModelServiceGenerator = /** @class */ (function () {
                         _c.sent();
                         return [3 /*break*/, 9];
                     case 3:
-                        if (!this.isSqlStoredProcedure(schema)) return [3 /*break*/, 5];
+                        if (!(0, codeGenUtils_1.isSqlStoredProcedure)(schema)) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.handleSqlStoredProcedure(modelName, dataSourceName, schema, schemaJson, processedOutputDir, vfs)];
                     case 4:
                         _c.sent();
                         return [3 /*break*/, 9];
                     case 5:
-                        if (!this.isSharepointSchema(schema)) return [3 /*break*/, 7];
+                        if (!(0, codeGenUtils_1.isSharepointSchema)(schema)) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.handleSharepointSchema(modelName, dataSourceName, schema, schemaJson, processedOutputDir, vfs)];
                     case 6:
                         _c.sent();
@@ -295,7 +295,7 @@ var ModelServiceGenerator = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.loadSchemaFromFile(schemaPath, vfs, false)];
                     case 1:
                         schema = _b.sent();
-                        modelName = this.extractModelName(schema, schemaPath, vfs).modelName;
+                        modelName = (0, nameUtility_1.extractModelName)(schema, schemaPath, vfs).modelName;
                         return [2 /*return*/, modelName];
                 }
             });
@@ -320,7 +320,7 @@ var ModelServiceGenerator = /** @class */ (function () {
                         if (typeof schema !== 'object' || schema === null || Array.isArray(schema)) {
                             throw new Error('Schema must be a valid JSON object');
                         }
-                        _c = this.extractModelName(schema, schemaPath, vfs), modelName = _c.modelName, dataSourceName = _c.dataSourceName;
+                        _c = (0, nameUtility_1.extractModelName)(schema, schemaPath, vfs), modelName = _c.modelName, dataSourceName = _c.dataSourceName;
                         return [2 /*return*/, {
                                 schema: schema,
                                 schemaJson: schemaJson,
@@ -396,128 +396,6 @@ var ModelServiceGenerator = /** @class */ (function () {
             !Array.isArray(schema.properties) &&
             Object.prototype.hasOwnProperty.call(schema.properties, 'swagger'));
     };
-    /**
-     * The extractModelName method extracts the model name and data source name from the schema.
-     * Returns an object with modelName and dataSourceName.
-     */
-    ModelServiceGenerator.extractModelName = function (schema, schemaPath, vfs) {
-        if (!schema) {
-            throw new Error('Schema cannot be null.');
-        }
-        // Check if this is a Dataverse entity schema
-        if (this.isDataverseEntity(schema)) {
-            var entitySetName = this.getDataverseEntitySetName(schema);
-            if (entitySetName) {
-                var modelName_1 = this.capitalizeForFileName((0, nameUtility_1.sanitizeName)(entitySetName));
-                return { modelName: modelName_1, dataSourceName: entitySetName === null || entitySetName === void 0 ? void 0 : entitySetName.trim() };
-            }
-        }
-        var nameNode = this.getNameNode(schema);
-        var modelName;
-        var dataSourceName;
-        if (this.isSharedName(nameNode)) {
-            modelName = this.getDisplayName(schema);
-            dataSourceName = this.getSharedDataSourceName(nameNode);
-        }
-        else if (this.isGuid(nameNode)) {
-            modelName = this.getTitle(schema);
-            dataSourceName = modelName;
-        }
-        else if (this.isSqlStoredProcedure(schema)) {
-            modelName = (0, nameUtility_1.sanitizeSqlName)(nameNode);
-            dataSourceName = this.getParentFolderName(schemaPath, vfs);
-        }
-        else {
-            modelName = /[\\/](sql)[\\/]/i.test(schemaPath) ? (0, nameUtility_1.sanitizeSqlName)(nameNode) : (0, nameUtility_1.sanitizeName)(nameNode);
-            dataSourceName = modelName;
-        }
-        modelName = this.capitalizeForFileName((0, nameUtility_1.sanitizeName)(modelName));
-        return { modelName: modelName, dataSourceName: dataSourceName };
-    };
-    /**
-     * The getNameNode method retrieves the name node from the schema.
-     */
-    ModelServiceGenerator.getNameNode = function (schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var nameNode = schema.name;
-            if (typeof nameNode !== 'string' || !nameNode.trim()) {
-                throw new Error("No 'name' node found in schema");
-            }
-            return nameNode;
-        }
-        throw new Error('Schema must be a JSON object to extract name');
-    };
-    /**
-     * The isSharedName method checks if the name node is a shared name.
-     */
-    ModelServiceGenerator.isSharedName = function (nameNode) {
-        return nameNode.toLowerCase().startsWith('shared_');
-    };
-    /**
-     * The getDisplayName method retrieves the display name from the schema.
-     */
-    ModelServiceGenerator.getDisplayName = function (schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var properties = schema.properties;
-            if (typeof properties === 'object' && properties !== null && !Array.isArray(properties)) {
-                var displayName = properties.displayName;
-                if (typeof displayName !== 'string' || !displayName.trim()) {
-                    throw new Error("No 'displayName' found in schema properties");
-                }
-                return displayName;
-            }
-        }
-        throw new Error('Schema must be a JSON object with properties to extract displayName');
-    };
-    /**
-     * The getSharedDataSourceName method retrieves the shared data source name from the name node.
-     */
-    ModelServiceGenerator.getSharedDataSourceName = function (nameNode) {
-        return (0, nameUtility_1.sanitizeName)(nameNode.replace(/^shared_/i, '')).toLowerCase();
-    };
-    /**
-     * The isGuid method checks if the name node is a GUID.
-     */
-    ModelServiceGenerator.isGuid = function (nameNode) {
-        // GUID regex, C# Guid.TryParse equivalent
-        return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(nameNode);
-    };
-    /**
-     * The isDataverseEntity method checks if the schema represents a Dataverse entity.
-     */
-    ModelServiceGenerator.isDataverseEntity = function (schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var schemaObject = schema;
-            // Check if this has the Dataverse schema structure with schema.items
-            if (typeof schemaObject.schema === 'object' && schemaObject.schema !== null) {
-                var schemaProperty = schemaObject.schema;
-                if (typeof schemaProperty.items === 'object' && schemaProperty.items !== null) {
-                    var items = schemaProperty.items;
-                    return items['x-ms-dataverse-entity'] === true;
-                }
-            }
-        }
-        return false;
-    };
-    /**
-     * The getDataverseEntitySetName method retrieves the entity set name from a Dataverse schema.
-     */
-    ModelServiceGenerator.getDataverseEntitySetName = function (schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var schemaObject = schema;
-            if (typeof schemaObject.schema === 'object' && schemaObject.schema !== null) {
-                var schemaProperty = schemaObject.schema;
-                if (typeof schemaProperty.items === 'object' && schemaProperty.items !== null) {
-                    var items = schemaProperty.items;
-                    var entitySetName = items['x-ms-dataverse-entityset'];
-                    if (typeof entitySetName === 'string' && entitySetName.trim()) {
-                        return entitySetName;
-                    }
-                }
-            }
-        }
-        return null;
-    };
     /**
      * Checks if a property is a Dataverse lookup column.
      */
@@ -564,42 +442,6 @@ var ModelServiceGenerator = /** @class */ (function () {
     ModelServiceGenerator.generateLookupValuePropertyName = function (lookupPropertyName) {
         return "_".concat(lookupPropertyName, "_value");
     };
-    /**
-     * The getTitle method retrieves the title from the schema.
-     */
-    ModelServiceGenerator.getTitle = function (schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var title = schema.title;
-            if (typeof title !== 'string' || !title.trim()) {
-                throw new Error("No 'title' found in schema");
-            }
-            return title;
-        }
-        throw new Error('Schema must be a JSON object to extract title');
-    };
-    /**
-     * The getParentFolderName method retrieves the parent folder name from the schema path.
-     */
-    ModelServiceGenerator.getParentFolderName = function (schemaPath, vfs) {
-        var directoryName = vfs.dirname(schemaPath);
-        if (!directoryName) {
-            throw new Error('The schemaPath does not have a valid directory.');
-        }
-        var parentFolderName = vfs.basename(directoryName);
-        if (!parentFolderName) {
-            throw new Error('The directory does not have a valid parent folder name.');
-        }
-        return parentFolderName.toLowerCase();
-    };
-    /**
-     * Capitalizes the first letter of a string for file naming purposes only
-     */
-    ModelServiceGenerator.capitalizeForFileName = function (name) {
-        if (!name) {
-            return name;
-        }
-        return name.charAt(0).toUpperCase() + name.slice(1);
-    };
     /**
      * The addCopyrightNotice method adds a copyright notice to the generated files.
      */
@@ -668,14 +510,14 @@ var ModelServiceGenerator = /** @class */ (function () {
                         // Ensure schemaName is a string before passing to generateODataBindPropertyName
                         var schemaNameStr = typeof schemaName === 'string' ? schemaName : propName;
                         var odataBindProp = this.generateODataBindPropertyName(schemaNameStr);
-                        var formattedPropName_1 = this.formatPropertyName(odataBindProp);
+                        var formattedPropName_1 = (0, nameUtility_1.formatPropertyName)(odataBindProp);
                         var optionalMark_1 = requiredFields.has(propName) ? '' : '?';
                         lines.push("  ".concat(formattedPropName_1).concat(optionalMark_1, ": string;"));
                     }
                     continue;
                 }
-                var formattedPropName = this.formatPropertyName((0, codeGenUtils_1.convertToValidIdentifier)(propName));
-                formattedPropName = this.normalizePropertyName(formattedPropName);
+                var formattedPropName = (0, nameUtility_1.formatPropertyName)((0, codeGenUtils_1.convertToValidIdentifier)(propName));
+                formattedPropName = (0, nameUtility_1.normalizePropertyName)(formattedPropName);
                 var tsType = this.determineTypeScriptType(originalModelName, propValueAsObject, '', propName);
                 var optionalMark = requiredFields.has(propName) ? '' : '?';
                 this.addPropertyComment(lines, propValueAsObject, '');
@@ -717,8 +559,8 @@ var ModelServiceGenerator = /** @class */ (function () {
                 if (lookupColumns.has(propName)) {
                     continue;
                 }
-                var formattedPropName = this.formatPropertyName((0, codeGenUtils_1.convertToValidIdentifier)(propName));
-                formattedPropName = this.normalizePropertyName(formattedPropName);
+                var formattedPropName = (0, nameUtility_1.formatPropertyName)((0, codeGenUtils_1.convertToValidIdentifier)(propName));
+                formattedPropName = (0, nameUtility_1.normalizePropertyName)(formattedPropName);
                 var tsType = this.determineTypeScriptType(modelName, propValueAsObject, '', propName);
                 var optionalMark = requiredFields.has(propName) ? '' : '?';
                 this.addPropertyComment(lines, propValueAsObject, '');
@@ -738,10 +580,10 @@ var ModelServiceGenerator = /** @class */ (function () {
             for (var lookupPropNames_1 = __values(lookupPropNames), lookupPropNames_1_1 = lookupPropNames_1.next(); !lookupPropNames_1_1.done; lookupPropNames_1_1 = lookupPropNames_1.next()) {
                 var lookupPropName = lookupPropNames_1_1.value;
                 // Add the lookup object property
-                lines.push("  ".concat(this.formatPropertyName((0, codeGenUtils_1.convertToValidIdentifier)(lookupPropName)), "?: object;"));
+                lines.push("  ".concat((0, nameUtility_1.formatPropertyName)((0, codeGenUtils_1.convertToValidIdentifier)(lookupPropName)), "?: object;"));
                 // Add the lookup value property (_propname_value)
                 var valuePropName = this.generateLookupValuePropertyName(lookupPropName);
-                var formattedValuePropName = this.formatPropertyName(valuePropName);
+                var formattedValuePropName = (0, nameUtility_1.formatPropertyName)(valuePropName);
                 lines.push("  ".concat(formattedValuePropName, "?: string;"));
             }
         }
@@ -950,11 +792,13 @@ var ModelServiceGenerator = /** @class */ (function () {
      */
     ModelServiceGenerator.generateModelFromSchema = function (modelName, definition) {
         modelName = (0, codeGenUtils_1.convertToValidIdentifier)(this.simplifyGenericInterfaceName(modelName));
-        // Start with copyright notice
         var lines = [];
-        this.addCopyrightNotice(lines);
-        // If it's a simple type (e.g., string, number, boolean) and has no "properties", generate a type alias
-        if ('type' in definition && definition.type && !('properties' in definition)) {
+        // If it's a simple type (e.g., string, number, boolean) and has no "properties" or "items", generate a type alias
+        // Note: We exclude definitions with "items" because those are array types that need special handling
+        if ('type' in definition &&
+            definition.type &&
+            !('properties' in definition) &&
+            !('items' in definition)) {
             var tsType = this.mapJsonTypeToTypeScript(definition.type);
             lines.push("export type ".concat(modelName, " = ").concat(tsType, ";"));
             return lines.join('\n');
@@ -965,7 +809,18 @@ var ModelServiceGenerator = /** @class */ (function () {
             lines.push(this.generateTypeAliasForEmptyObject(modelName));
             return lines.join('\n');
         }
-        // If itemsNode exists, pass that; otherwise, pass the full definition
+        // Check if this is an array type definition
+        var isArrayType = definition.type === 'array' && itemsNode;
+        if (isArrayType) {
+            // For array types, generate an interface for the item type and a type alias for the array
+            var itemInterfaceName = "".concat(modelName, "Item");
+            var itemModelCode = this.generatePropertyLines(itemInterfaceName, itemsNode);
+            lines.push(itemModelCode);
+            lines.push('');
+            lines.push("export type ".concat(modelName, " = ").concat(itemInterfaceName, "[];"));
+            return lines.join('\n');
+        }
+        // If itemsNode exists but not an array type, pass that; otherwise, pass the full definition
         var modelCode = itemsNode
             ? this.generatePropertyLines(modelName, itemsNode)
             : this.generatePropertyLines(modelName, definition);
@@ -1032,9 +887,9 @@ var ModelServiceGenerator = /** @class */ (function () {
         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 formattedPropName = this.formatPropertyName((0, codeGenUtils_1.convertToValidIdentifier)(propName));
+                var formattedPropName = (0, nameUtility_1.formatPropertyName)((0, codeGenUtils_1.convertToValidIdentifier)(propName));
                 // Normalize specific property names (e.g., "resultsets" => "ResultSets")
-                formattedPropName = this.normalizePropertyName(formattedPropName);
+                formattedPropName = (0, nameUtility_1.normalizePropertyName)(formattedPropName);
                 var propValueAsObject = typeof propValue === 'object' && propValue !== null && !Array.isArray(propValue)
                     ? propValue
                     : undefined;
@@ -1054,13 +909,6 @@ var ModelServiceGenerator = /** @class */ (function () {
         this.closeInterfaceDeclarationWithPadding(lines, padding);
         return lines.join('\n');
     };
-    /**
-     * The normalizePropertyName method standardizes specific property names.
-     * For example, it converts "resultsets" to "ResultSets".
-     */
-    ModelServiceGenerator.normalizePropertyName = function (propertyName) {
-        return propertyName.toLowerCase() === 'resultsets' ? 'ResultSets' : propertyName;
-    };
     /**
      * Checks if a property has optionset data (enum and x-ms-enum-values)
      */
@@ -1072,7 +920,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * Generates the enum name for an optionset property
      */
     ModelServiceGenerator.generateOptionsetEnumName = function (modelName, propName) {
-        var formattedPropName = this.formatPropertyName(propName);
+        var formattedPropName = (0, nameUtility_1.formatPropertyName)(propName);
         return "".concat(modelName).concat(formattedPropName);
     };
     /**
@@ -1242,11 +1090,12 @@ var ModelServiceGenerator = /** @class */ (function () {
     /*
      * The extractReferencedType method extracts the referenced type from the ref value.
      * It splits the ref value by '/' and returns the last part as the type name.
+     * The result is converted to a valid TypeScript identifier (e.g., spaces become underscores).
      */
     ModelServiceGenerator.extractReferencedType = function (refValue) {
         var parts = refValue.split('/');
         var typeName = parts[parts.length - 1];
-        return this.normalizeGenericTypeName(typeName);
+        return (0, codeGenUtils_1.convertToValidIdentifier)(this.normalizeGenericTypeName(typeName));
     };
     /*
      * The mapDataverseTypeToTypeScript method maps Dataverse types to TypeScript types.
@@ -1362,17 +1211,6 @@ var ModelServiceGenerator = /** @class */ (function () {
                 return exports.TypeScriptTypes.UNKNOWN;
         }
     };
-    /*
-     * The formatPropertyName method formats the property name.
-     * Skips formatting if the property name already starts and ends with quotes.
-     */
-    ModelServiceGenerator.formatPropertyName = function (propName) {
-        // Skip if already quoted
-        if (propName.startsWith('"') && propName.endsWith('"')) {
-            return propName;
-        }
-        return this.isValidPropertyName(propName) ? propName : "\"".concat(propName, "\"");
-    };
     /*
      * The addPropertyComment method adds a comment for the property.
      */
@@ -1901,7 +1739,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * and operation ID as parameters.
      */
     ModelServiceGenerator.addMethodWithoutParameters = function (operations, operationFuncName, outputModel, operationId, modelName) {
-        operations.push("  public static async ".concat(operationFuncName, "(): Promise<IOperationResult<").concat(outputModel, ">> {"), "    const result = await ".concat(modelName, "Service.client.executeAsync<void, ").concat(outputModel, ">("), "      {", "        connectorOperation: {", "          tableName: ".concat(this.getServiceName(modelName), ","), "          operationName: '".concat(operationId, "',"), "        },", "      });", "    return result;", "  }");
+        operations.push("  public static async ".concat(operationFuncName, "(): Promise<IOperationResult<").concat(outputModel, ">> {"), "    const result = await ".concat(modelName, "Service.client.executeAsync<void, ").concat(outputModel, ">("), "      {", "        connectorOperation: {", "          tableName: ".concat((0, nameUtility_1.getServiceName)(modelName), ","), "          operationName: '".concat(operationId, "',"), "        },", "      });", "    return result;", "  }");
     };
     /*
      * The addMethodWithParameters method generates a method with parameters for the service class.
@@ -1909,7 +1747,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * parameter object, output model, data source name, and operation ID as parameters.
      */
     ModelServiceGenerator.addMethodWithParameters = function (operations, operationFuncName, parameterSignature, parametersType, parameterObject, outputModel, operationId, modelName) {
-        operations.push("  public static async ".concat(operationFuncName, "(").concat(parameterSignature, "): Promise<IOperationResult<").concat(outputModel, ">> {"), "    const params: ".concat(parametersType, " = { ").concat(parameterObject, " };"), "    const result = await ".concat(modelName, "Service.client.executeAsync<").concat(parametersType, ", ").concat(outputModel, ">("), "      {", "        connectorOperation: {", "          tableName: ".concat(this.getServiceName(modelName), ","), "          operationName: '".concat(operationId, "',"), "          parameters: params", "        },", "      });", "    return result;", "  }");
+        operations.push("  public static async ".concat(operationFuncName, "(").concat(parameterSignature, "): Promise<IOperationResult<").concat(outputModel, ">> {"), "    const params: ".concat(parametersType, " = { ").concat(parameterObject, " };"), "    const result = await ".concat(modelName, "Service.client.executeAsync<").concat(parametersType, ", ").concat(outputModel, ">("), "      {", "        connectorOperation: {", "          tableName: ".concat((0, nameUtility_1.getServiceName)(modelName), ","), "          operationName: '".concat(operationId, "',"), "          parameters: params", "        },", "      });", "    return result;", "  }");
     };
     /*
      * The handleSqlStoredProcedure method handles the SQL stored procedure generation.
@@ -2129,39 +1967,6 @@ var ModelServiceGenerator = /** @class */ (function () {
             });
         });
     };
-    /*
-     * The isSqlStoredProcedure method checks if the schema is a SQL stored procedure.
-     * It returns true if the schema contains a "procedureresultschema" node.
-     */
-    ModelServiceGenerator.isSqlStoredProcedure = function (schema) {
-        // Logic to identify SQL stored procedures
-        // Check if the "schema" node contains a "procedureresultschema" node
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var schemaObj = schema;
-            var schemaNode = schemaObj.schema;
-            if (typeof schemaNode === 'object' && schemaNode !== null && !Array.isArray(schemaNode)) {
-                var schemaNodeObj = schemaNode;
-                return !!schemaNodeObj.procedureresultschema;
-            }
-        }
-        return false;
-    };
-    /**
-     * The isSharepointSchema method checks if the schema is a SharePoint schema.
-     * It returns true if the schema contains SharePoint-specific indicators.
-     */
-    ModelServiceGenerator.isSharepointSchema = function (schema) {
-        // Logic to identify SharePoint schemas
-        // Check if the schema has SharePoint-specific properties or structure
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            var schemaObj = schema;
-            // Check for referencedEntities which is common in SharePoint schemas
-            if (schemaObj.referencedEntities && typeof schemaObj.referencedEntities === 'object') {
-                return true;
-            }
-        }
-        return false;
-    };
     /*
      * The handleStandardSchema method generates TypeScript models and services from any schema type.
      * It routes to the appropriate handler based on schema type.
@@ -2171,7 +1976,7 @@ var ModelServiceGenerator = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.isDataverseEntity(schema)) return [3 /*break*/, 2];
+                        if (!(0, codeGenUtils_1.isDataverseEntity)(schema)) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.handleDataverseSchema(modelName, dataSourceName, schema, outputDir, vfs)];
                     case 1:
                         _b.sent();
@@ -2365,7 +2170,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      */
     ModelServiceGenerator.addGetMethodForReferenceEntitiesCore = function (lines, modelName) {
         // Add method summary
-        lines.push("/**", "* Utility method to get possible values of a referenced entity by its name.", "*/", "  public static async getReferencedEntity(search: string, referencedEntityKeyNormalized: string): Promise<IOperationResult<unknown>> {", "    const params: {search: string} = { search };", "    const result = await ".concat(modelName, "Service.client.executeAsync<{search: string}, unknown>("), "      {", "        connectorOperation: {", "          tableName: ".concat(this.getServiceName(modelName), ","), "          operationName: 'Get' + referencedEntityKeyNormalized,", "          parameters: params", "        }", "      });", "    return result;", "  }", "");
+        lines.push("/**", "* Utility method to get possible values of a referenced entity by its name.", "*/", "  public static async getReferencedEntity(search: string, referencedEntityKeyNormalized: string): Promise<IOperationResult<unknown>> {", "    const params: {search: string} = { search };", "    const result = await ".concat(modelName, "Service.client.executeAsync<{search: string}, unknown>("), "      {", "        connectorOperation: {", "          tableName: ".concat((0, nameUtility_1.getServiceName)(modelName), ","), "          operationName: 'Get' + referencedEntityKeyNormalized,", "          parameters: params", "        }", "      });", "    return result;", "  }", "");
     };
     /*
      * The ensureCommonModelFileExists method checks if the CommonModels.ts file exists in the specified output directory.
@@ -2493,7 +2298,7 @@ var ModelServiceGenerator = /** @class */ (function () {
             for (var _c = __values(Object.keys(propertiesNode)), _d = _c.next(); !_d.done; _d = _c.next()) {
                 var propName = _d.value;
                 var propNameNormalized = propName;
-                if (!this.isValidPropertyName(propName)) {
+                if (!(0, nameUtility_1.isValidPropertyName)(propName)) {
                     propNameNormalized = "\"".concat(propName, "\""); // Enclose invalid property names in double quotes
                 }
                 var isRequired = requiredFields.has(propName);
@@ -2670,32 +2475,22 @@ var ModelServiceGenerator = /** @class */ (function () {
             primaryKey.value = propName;
         }
         // Check if the property name is valid
-        if (!this.isValidPropertyName(propName)) {
+        if (!(0, nameUtility_1.isValidPropertyName)(propName)) {
             propName = "\"".concat(propName, "\""); // Enclose invalid property names in double quotes
         }
         var isRequired = requiredFields.has(propertyName);
         var optionalMark = isRequired ? '' : '?';
         lines.push("  ".concat(propName).concat(optionalMark, ": ").concat(propType, ";"));
     };
-    /*
-     * The isValidPropertyName method checks if a property name is valid according to TypeScript rules.
-     * A valid property name must start with a letter, underscore, or dollar sign
-     * and can only contain letters, numbers, underscores, or dollar signs.
-     */
-    ModelServiceGenerator.isValidPropertyName = function (propName) {
-        // A valid property name must start with a letter, underscore, or dollar sign
-        // and can only contain letters, numbers, underscores, or dollar signs
-        return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(propName);
-    };
     /*
      * The generateTypeScriptService method generates a TypeScript service class for the model.
      * It includes methods for CRUD operations and uses the Power SDK for data access.
      */
-    ModelServiceGenerator.generateTypeScriptService = function (modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    ModelServiceGenerator.generateTypeScriptService = function (modelName, dataSourceName, primaryKey, isADataverseEntity) {
         var lines = [];
         this.addCopyrightNotice(lines);
-        this.addStandardServiceImports(lines, modelName, isDataverseEntity, false);
-        this.addServiceClassDefinition(lines, modelName, dataSourceName, primaryKey, isDataverseEntity);
+        this.addStandardServiceImports(lines, modelName, isADataverseEntity, false);
+        this.addServiceClassDefinition(lines, modelName, dataSourceName, primaryKey, isADataverseEntity);
         return lines.join('\n');
     };
     /*
@@ -2712,11 +2507,11 @@ var ModelServiceGenerator = /** @class */ (function () {
     /*
      * The addStandardServiceImports method adds the necessary imports for the service class.
      */
-    ModelServiceGenerator.addStandardServiceImports = function (lines, modelName, isDataverseEntity, additionalLine) {
+    ModelServiceGenerator.addStandardServiceImports = function (lines, modelName, isADataverseEntity, additionalLine) {
         if (additionalLine === void 0) { additionalLine = true; }
         var imports = __spreadArray([], __read(this.collectStandardImports('crud')), false);
         imports.push("import type { IGetOptions, IGetAllOptions } from '".concat(this.RELATIVE_MODEL_PATH, "/CommonModels';"), "import type { ".concat(modelName, " } from '").concat(this.RELATIVE_MODEL_PATH, "/").concat(modelName, "Model';"));
-        if (isDataverseEntity) {
+        if (isADataverseEntity) {
             imports.push("import type { GetEntityMetadataOptions, EntityMetadata } from '@microsoft/power-apps/data/metadata/dataverse';");
         }
         lines.push.apply(lines, __spreadArray([], __read(imports.sort()), false));
@@ -2769,9 +2564,9 @@ var ModelServiceGenerator = /** @class */ (function () {
      * The AddServiceClassDefinition method generates the service class definition.
      * It takes the lines to write to, model name, data source name, schema, and response model name as parameters.
      */
-    ModelServiceGenerator.addServiceClassDefinition = function (lines, modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    ModelServiceGenerator.addServiceClassDefinition = function (lines, modelName, dataSourceName, primaryKey, isADataverseEntity) {
         this.addServiceClassHeader(lines, modelName, dataSourceName, true);
-        this.addServiceMethods(lines, modelName, dataSourceName, primaryKey, isDataverseEntity);
+        this.addServiceMethods(lines, modelName, dataSourceName, primaryKey, isADataverseEntity);
         lines.push('}');
         lines.push('');
     };
@@ -2788,7 +2583,7 @@ var ModelServiceGenerator = /** @class */ (function () {
      * The addServiceMethods method generates the CRUD methods for the service class.
      * It includes create, update, delete, get, and getAll methods.
      */
-    ModelServiceGenerator.addServiceMethods = function (lines, modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    ModelServiceGenerator.addServiceMethods = function (lines, modelName, dataSourceName, primaryKey, isADataverseEntity) {
         var e_16, _b;
         var methods = [];
         methods.push(this.generateCreateMethod(modelName, primaryKey));
@@ -2796,7 +2591,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         methods.push(this.generateDeleteMethod(modelName));
         methods.push(this.generateGetMethod(modelName));
         methods.push(this.generateGetAllMethod(modelName));
-        if (isDataverseEntity) {
+        if (isADataverseEntity) {
             methods.push(this.generateGetMetadataMethod(modelName));
         }
         try {
@@ -2850,7 +2645,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async create(record: ".concat(datatypeForCreate, "): Promise<IOperationResult<").concat(modelName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.createRecordAsync<").concat(datatypeForCreate, ", ").concat(modelName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      record",
             "    );",
             "    return result;",
@@ -2865,7 +2660,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async update(id: string, changedFields: ".concat(datatypeForUpdate, "): Promise<IOperationResult<").concat(modelName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.updateRecordAsync<").concat(datatypeForUpdate, ", ").concat(modelName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      changedFields",
             "    );",
@@ -2880,7 +2675,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async delete(id: string): Promise<void> {",
             "    await ".concat(modelName, "Service.client.deleteRecordAsync("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString());",
             "  }",
         ];
@@ -2892,7 +2687,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<".concat(modelName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveRecordAsync<").concat(modelName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      options",
             "    );",
@@ -2907,7 +2702,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<".concat(modelName, "[]>> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveMultipleRecordsAsync<").concat(modelName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      options",
             "    );",
             "    return result;",
@@ -2923,7 +2718,7 @@ var ModelServiceGenerator = /** @class */ (function () {
             "      dataverseRequest: {",
             "        action: \"getEntityMetadata\",",
             "        parameters: {",
-            "          tableName: ".concat(this.getServiceName(modelName), ","),
+            "          tableName: ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "          options: options as GetEntityMetadataOptions,",
             "        },",
             "      },",
@@ -2948,7 +2743,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async create(record: ".concat(datatypeForCreate, "): Promise<IOperationResult<").concat(returnType, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.createRecordAsync<").concat(datatypeForCreate, ", ").concat(returnType, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      record",
             "    );",
             "    return result;",
@@ -2972,7 +2767,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async update(id: string, changedFields: ".concat(datatypeForUpdate, "): Promise<IOperationResult<").concat(returnType, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.updateRecordAsync<").concat(datatypeForUpdate, ", ").concat(returnType, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      changedFields",
             "    );",
@@ -2987,7 +2782,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async delete(id: string): Promise<void> {",
             "    await ".concat(modelName, "Service.client.deleteRecordAsync("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString());",
             "  }",
         ];
@@ -3006,7 +2801,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<".concat(returnType, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveRecordAsync<").concat(returnType, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      options",
             "    );",
@@ -3022,7 +2817,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<".concat(returnType, "[]>> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveMultipleRecordsAsync<").concat(returnType, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      options",
             "    );",
             "    return result;",
@@ -3039,7 +2834,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async create(record: ".concat(datatypeForCreate, "): Promise<IOperationResult<").concat(extendedInterfaceName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.createRecordAsync<").concat(datatypeForCreate, ", ").concat(extendedInterfaceName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      record",
             "    );",
             "    return result;",
@@ -3056,7 +2851,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async update(id: string, changedFields: ".concat(datatypeForUpdate, "): Promise<IOperationResult<").concat(extendedInterfaceName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.updateRecordAsync<").concat(datatypeForUpdate, ", ").concat(extendedInterfaceName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      changedFields",
             "    );",
@@ -3072,7 +2867,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<".concat(extendedInterfaceName, ">> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveRecordAsync<").concat(extendedInterfaceName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      id.toString(),",
             "      options",
             "    );",
@@ -3088,7 +2883,7 @@ var ModelServiceGenerator = /** @class */ (function () {
         return [
             "  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<".concat(extendedInterfaceName, "[]>> {"),
             "    const result = await ".concat(modelName, "Service.client.retrieveMultipleRecordsAsync<").concat(extendedInterfaceName, ">("),
-            "      ".concat(this.getServiceName(modelName), ","),
+            "      ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "      options",
             "    );",
             "    return result;",
@@ -3108,7 +2903,7 @@ var ModelServiceGenerator = /** @class */ (function () {
             "      dataverseRequest: {",
             "        action: \"getEntityMetadata\",",
             "        parameters: {",
-            "          tableName: ".concat(this.getServiceName(modelName), ","),
+            "          tableName: ".concat((0, nameUtility_1.getServiceName)(modelName), ","),
             "          options: options as GetEntityMetadataOptions,",
             "        },",
             "      },",
@@ -3116,15 +2911,6 @@ var ModelServiceGenerator = /** @class */ (function () {
             "  }",
         ];
     };
-    /*
-     * The getServiceName method generates a service name by appending "Service" to the given model name.
-     */
-    ModelServiceGenerator.getServiceName = function (modelName) {
-        if (!modelName || !modelName.trim()) {
-            throw new Error('Model name cannot be null or empty.');
-        }
-        return "".concat(modelName, "Service.dataSourceName");
-    };
     /**
      * The generateIndexFile method creates an index.ts file that exports all models and services.
      */