@microsoft/power-apps-cli 0.5.3 → 0.5.7

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

@@ -5,8 +5,8 @@ var _a;
 import * as path from 'path';
 import { ParameterPropertyInfo } from '../Common/parameterPropertyInfo';
 import { getVfs } from '../VfsManager';
-import { convertToValidIdentifier, getAllJsonFiles } from './codeGenUtils';
-import { sanitizeName, sanitizeSqlName } from './nameUtility';
+import { convertToValidIdentifier, getAllJsonFiles, isDataverseEntity, isSharepointSchema, isSqlStoredProcedure, } from './codeGenUtils';
+import { extractModelName, formatPropertyName, getServiceName, isValidPropertyName, normalizePropertyName, sanitizeName, } from './nameUtility';
 /**
  * TypeScript type constants
  */
@@ -103,10 +103,10 @@ export class ModelServiceGenerator {
         if (this.isSwaggerSchema(schema)) {
             await this.handleSwaggerSchema(modelName, dataSourceName, schema, processedOutputDir, vfs);
         }
-        else if (this.isSqlStoredProcedure(schema)) {
+        else if (isSqlStoredProcedure(schema)) {
             await this.handleSqlStoredProcedure(modelName, dataSourceName, schema, schemaJson, processedOutputDir, vfs);
         }
-        else if (this.isSharepointSchema(schema)) {
+        else if (isSharepointSchema(schema)) {
             await this.handleSharepointSchema(modelName, dataSourceName, schema, schemaJson, processedOutputDir, vfs);
         }
         else {
@@ -118,7 +118,7 @@ export class ModelServiceGenerator {
      */
     static async getModelNameFromSchema(schemaPath, vfs) {
         const schema = await this.loadSchemaFromFile(schemaPath, vfs, false);
-        const { modelName } = this.extractModelName(schema, schemaPath, vfs);
+        const { modelName } = extractModelName(schema, schemaPath, vfs);
         return modelName;
     }
     /**
@@ -132,7 +132,9 @@ export class ModelServiceGenerator {
         if (typeof schema !== 'object' || schema === null || Array.isArray(schema)) {
             throw new Error('Schema must be a valid JSON object');
         }
-        const { modelName, dataSourceName } = this.extractModelName(schema, schemaPath, vfs);
+        // model name is used for the generated TypeScript interface and file names
+        // dataSourceName is the logical name of the datasource ex:entity set name for Dataverse
+        const { modelName, dataSourceName } = extractModelName(schema, schemaPath, vfs);
         return {
             schema: schema,
             schemaJson,
@@ -179,128 +181,6 @@ export class ModelServiceGenerator {
             !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.
-     */
-    static extractModelName(schema, schemaPath, vfs) {
-        if (!schema) {
-            throw new Error('Schema cannot be null.');
-        }
-        // Check if this is a Dataverse entity schema
-        if (this.isDataverseEntity(schema)) {
-            const entitySetName = this.getDataverseEntitySetName(schema);
-            if (entitySetName) {
-                const modelName = this.capitalizeForFileName(sanitizeName(entitySetName));
-                return { modelName, dataSourceName: entitySetName === null || entitySetName === void 0 ? void 0 : entitySetName.trim() };
-            }
-        }
-        const nameNode = this.getNameNode(schema);
-        let modelName;
-        let 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 = sanitizeSqlName(nameNode);
-            dataSourceName = this.getParentFolderName(schemaPath, vfs);
-        }
-        else {
-            modelName = /[\\/](sql)[\\/]/i.test(schemaPath) ? sanitizeSqlName(nameNode) : sanitizeName(nameNode);
-            dataSourceName = modelName;
-        }
-        modelName = this.capitalizeForFileName(sanitizeName(modelName));
-        return { modelName, dataSourceName };
-    }
-    /**
-     * The getNameNode method retrieves the name node from the schema.
-     */
-    static getNameNode(schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            const 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.
-     */
-    static isSharedName(nameNode) {
-        return nameNode.toLowerCase().startsWith('shared_');
-    }
-    /**
-     * The getDisplayName method retrieves the display name from the schema.
-     */
-    static getDisplayName(schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            const properties = schema.properties;
-            if (typeof properties === 'object' && properties !== null && !Array.isArray(properties)) {
-                const 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.
-     */
-    static getSharedDataSourceName(nameNode) {
-        return sanitizeName(nameNode.replace(/^shared_/i, '')).toLowerCase();
-    }
-    /**
-     * The isGuid method checks if the name node is a GUID.
-     */
-    static isGuid(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.
-     */
-    static isDataverseEntity(schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            const schemaObject = schema;
-            // Check if this has the Dataverse schema structure with schema.items
-            if (typeof schemaObject.schema === 'object' && schemaObject.schema !== null) {
-                const schemaProperty = schemaObject.schema;
-                if (typeof schemaProperty.items === 'object' && schemaProperty.items !== null) {
-                    const items = schemaProperty.items;
-                    return items['x-ms-dataverse-entity'] === true;
-                }
-            }
-        }
-        return false;
-    }
-    /**
-     * The getDataverseEntitySetName method retrieves the entity set name from a Dataverse schema.
-     */
-    static getDataverseEntitySetName(schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            const schemaObject = schema;
-            if (typeof schemaObject.schema === 'object' && schemaObject.schema !== null) {
-                const schemaProperty = schemaObject.schema;
-                if (typeof schemaProperty.items === 'object' && schemaProperty.items !== null) {
-                    const items = schemaProperty.items;
-                    const 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.
      */
@@ -336,42 +216,6 @@ export class ModelServiceGenerator {
     static generateLookupValuePropertyName(lookupPropertyName) {
         return `_${lookupPropertyName}_value`;
     }
-    /**
-     * The getTitle method retrieves the title from the schema.
-     */
-    static getTitle(schema) {
-        if (schema !== null && typeof schema === 'object' && !Array.isArray(schema)) {
-            const 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.
-     */
-    static getParentFolderName(schemaPath, vfs) {
-        const directoryName = vfs.dirname(schemaPath);
-        if (!directoryName) {
-            throw new Error('The schemaPath does not have a valid directory.');
-        }
-        const 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
-     */
-    static capitalizeForFileName(name) {
-        if (!name) {
-            return name;
-        }
-        return name.charAt(0).toUpperCase() + name.slice(1);
-    }
     /**
      * The addCopyrightNotice method adds a copyright notice to the generated files.
      */
@@ -437,14 +281,14 @@ export class ModelServiceGenerator {
                     // Ensure schemaName is a string before passing to generateODataBindPropertyName
                     const schemaNameStr = typeof schemaName === 'string' ? schemaName : propName;
                     const odataBindProp = this.generateODataBindPropertyName(schemaNameStr);
-                    const formattedPropName = this.formatPropertyName(odataBindProp);
+                    const formattedPropName = formatPropertyName(odataBindProp);
                     const optionalMark = requiredFields.has(propName) ? '' : '?';
                     lines.push(`  ${formattedPropName}${optionalMark}: string;`);
                 }
                 continue;
             }
-            let formattedPropName = this.formatPropertyName(convertToValidIdentifier(propName));
-            formattedPropName = this.normalizePropertyName(formattedPropName);
+            let formattedPropName = formatPropertyName(convertToValidIdentifier(propName));
+            formattedPropName = normalizePropertyName(formattedPropName);
             const tsType = this.determineTypeScriptType(originalModelName, propValueAsObject, '', propName);
             const optionalMark = requiredFields.has(propName) ? '' : '?';
             this.addPropertyComment(lines, propValueAsObject, '');
@@ -475,8 +319,8 @@ export class ModelServiceGenerator {
             if (lookupColumns.has(propName)) {
                 continue;
             }
-            let formattedPropName = this.formatPropertyName(convertToValidIdentifier(propName));
-            formattedPropName = this.normalizePropertyName(formattedPropName);
+            let formattedPropName = formatPropertyName(convertToValidIdentifier(propName));
+            formattedPropName = normalizePropertyName(formattedPropName);
             const tsType = this.determineTypeScriptType(modelName, propValueAsObject, '', propName);
             const optionalMark = requiredFields.has(propName) ? '' : '?';
             this.addPropertyComment(lines, propValueAsObject, '');
@@ -486,10 +330,10 @@ export class ModelServiceGenerator {
         const lookupPropNames = Array.from(lookupColumns.keys());
         for (const lookupPropName of lookupPropNames) {
             // Add the lookup object property
-            lines.push(`  ${this.formatPropertyName(convertToValidIdentifier(lookupPropName))}?: object;`);
+            lines.push(`  ${formatPropertyName(convertToValidIdentifier(lookupPropName))}?: object;`);
             // Add the lookup value property (_propname_value)
             const valuePropName = this.generateLookupValuePropertyName(lookupPropName);
-            const formattedValuePropName = this.formatPropertyName(valuePropName);
+            const formattedValuePropName = formatPropertyName(valuePropName);
             lines.push(`  ${formattedValuePropName}?: string;`);
         }
         lines.push('}');
@@ -614,11 +458,13 @@ export class ModelServiceGenerator {
      */
     static generateModelFromSchema(modelName, definition) {
         modelName = convertToValidIdentifier(this.simplifyGenericInterfaceName(modelName));
-        // Start with copyright notice
         const 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)) {
             const tsType = this.mapJsonTypeToTypeScript(definition.type);
             lines.push(`export type ${modelName} = ${tsType};`);
             return lines.join('\n');
@@ -629,7 +475,18 @@ export class ModelServiceGenerator {
             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
+        const isArrayType = definition.type === 'array' && itemsNode;
+        if (isArrayType) {
+            // For array types, generate an interface for the item type and a type alias for the array
+            const itemInterfaceName = `${modelName}Item`;
+            const itemModelCode = this.generatePropertyLines(itemInterfaceName, itemsNode);
+            lines.push(itemModelCode);
+            lines.push('');
+            lines.push(`export type ${modelName} = ${itemInterfaceName}[];`);
+            return lines.join('\n');
+        }
+        // If itemsNode exists but not an array type, pass that; otherwise, pass the full definition
         const modelCode = itemsNode
             ? this.generatePropertyLines(modelName, itemsNode)
             : this.generatePropertyLines(modelName, definition);
@@ -691,9 +548,9 @@ export class ModelServiceGenerator {
         }
         this.addInterfaceDeclarationWithPadding(lines, modelName, addInterfaceName, padding);
         for (const [propName, propValue] of Object.entries(propertiesNode)) {
-            let formattedPropName = this.formatPropertyName(convertToValidIdentifier(propName));
+            let formattedPropName = formatPropertyName(convertToValidIdentifier(propName));
             // Normalize specific property names (e.g., "resultsets" => "ResultSets")
-            formattedPropName = this.normalizePropertyName(formattedPropName);
+            formattedPropName = normalizePropertyName(formattedPropName);
             const propValueAsObject = typeof propValue === 'object' && propValue !== null && !Array.isArray(propValue)
                 ? propValue
                 : undefined;
@@ -705,13 +562,6 @@ export class ModelServiceGenerator {
         this.closeInterfaceDeclarationWithPadding(lines, padding);
         return lines.join('\n');
     }
-    /**
-     * The normalizePropertyName method standardizes specific property names.
-     * For example, it converts "resultsets" to "ResultSets".
-     */
-    static normalizePropertyName(propertyName) {
-        return propertyName.toLowerCase() === 'resultsets' ? 'ResultSets' : propertyName;
-    }
     /**
      * Checks if a property has optionset data (enum and x-ms-enum-values)
      */
@@ -723,7 +573,7 @@ export class ModelServiceGenerator {
      * Generates the enum name for an optionset property
      */
     static generateOptionsetEnumName(modelName, propName) {
-        const formattedPropName = this.formatPropertyName(propName);
+        const formattedPropName = formatPropertyName(propName);
         return `${modelName}${formattedPropName}`;
     }
     /**
@@ -882,11 +732,12 @@ export class ModelServiceGenerator {
     /*
      * 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).
      */
     static extractReferencedType(refValue) {
         const parts = refValue.split('/');
         const typeName = parts[parts.length - 1];
-        return this.normalizeGenericTypeName(typeName);
+        return convertToValidIdentifier(this.normalizeGenericTypeName(typeName));
     }
     /*
      * The mapDataverseTypeToTypeScript method maps Dataverse types to TypeScript types.
@@ -1002,17 +853,6 @@ export class ModelServiceGenerator {
                 return TypeScriptTypes.UNKNOWN;
         }
     }
-    /*
-     * The formatPropertyName method formats the property name.
-     * Skips formatting if the property name already starts and ends with quotes.
-     */
-    static formatPropertyName(propName) {
-        // Skip if already quoted
-        if (propName.startsWith('"') && propName.endsWith('"')) {
-            return propName;
-        }
-        return this.isValidPropertyName(propName) ? propName : `"${propName}"`;
-    }
     /*
      * The addPropertyComment method adds a comment for the property.
      */
@@ -1528,7 +1368,7 @@ export class ModelServiceGenerator {
      * and operation ID as parameters.
      */
     static addMethodWithoutParameters(operations, operationFuncName, outputModel, operationId, modelName) {
-        operations.push(`  public static async ${operationFuncName}(): Promise<IOperationResult<${outputModel}>> {`, `    const result = await ${modelName}Service.client.executeAsync<void, ${outputModel}>(`, `      {`, `        connectorOperation: {`, `          tableName: ${this.getServiceName(modelName)},`, `          operationName: '${operationId}',`, `        },`, `      });`, `    return result;`, `  }`);
+        operations.push(`  public static async ${operationFuncName}(): Promise<IOperationResult<${outputModel}>> {`, `    const result = await ${modelName}Service.client.executeAsync<void, ${outputModel}>(`, `      {`, `        connectorOperation: {`, `          tableName: ${getServiceName(modelName)},`, `          operationName: '${operationId}',`, `        },`, `      });`, `    return result;`, `  }`);
     }
     /*
      * The addMethodWithParameters method generates a method with parameters for the service class.
@@ -1536,7 +1376,7 @@ export class ModelServiceGenerator {
      * parameter object, output model, data source name, and operation ID as parameters.
      */
     static addMethodWithParameters(operations, operationFuncName, parameterSignature, parametersType, parameterObject, outputModel, operationId, modelName) {
-        operations.push(`  public static async ${operationFuncName}(${parameterSignature}): Promise<IOperationResult<${outputModel}>> {`, `    const params: ${parametersType} = { ${parameterObject} };`, `    const result = await ${modelName}Service.client.executeAsync<${parametersType}, ${outputModel}>(`, `      {`, `        connectorOperation: {`, `          tableName: ${this.getServiceName(modelName)},`, `          operationName: '${operationId}',`, `          parameters: params`, `        },`, `      });`, `    return result;`, `  }`);
+        operations.push(`  public static async ${operationFuncName}(${parameterSignature}): Promise<IOperationResult<${outputModel}>> {`, `    const params: ${parametersType} = { ${parameterObject} };`, `    const result = await ${modelName}Service.client.executeAsync<${parametersType}, ${outputModel}>(`, `      {`, `        connectorOperation: {`, `          tableName: ${getServiceName(modelName)},`, `          operationName: '${operationId}',`, `          parameters: params`, `        },`, `      });`, `    return result;`, `  }`);
     }
     /*
      * The handleSqlStoredProcedure method handles the SQL stored procedure generation.
@@ -1720,46 +1560,13 @@ export class ModelServiceGenerator {
         const serviceFilePath = vfs.join(outputDir, this.SERVICES_FOLDER, `${modelName}Service.ts`);
         await this.writeToFile(serviceFilePath, [serviceCode], vfs);
     }
-    /*
-     * The isSqlStoredProcedure method checks if the schema is a SQL stored procedure.
-     * It returns true if the schema contains a "procedureresultschema" node.
-     */
-    static isSqlStoredProcedure(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)) {
-            const schemaObj = schema;
-            const schemaNode = schemaObj.schema;
-            if (typeof schemaNode === 'object' && schemaNode !== null && !Array.isArray(schemaNode)) {
-                const 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.
-     */
-    static isSharepointSchema(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)) {
-            const 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.
      */
     static async handleStandardSchema(modelName, dataSourceName, schema, schemaJson, outputDir, vfs) {
         // Check if this is a Dataverse entity schema (has nested schema.items structure)
-        if (this.isDataverseEntity(schema)) {
+        if (isDataverseEntity(schema)) {
             await this.handleDataverseSchema(modelName, dataSourceName, schema, outputDir, vfs);
         }
         else {
@@ -1882,7 +1689,7 @@ export class ModelServiceGenerator {
      */
     static addGetMethodForReferenceEntitiesCore(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 ${modelName}Service.client.executeAsync<{search: string}, unknown>(`, `      {`, `        connectorOperation: {`, `          tableName: ${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 ${modelName}Service.client.executeAsync<{search: string}, unknown>(`, `      {`, `        connectorOperation: {`, `          tableName: ${getServiceName(modelName)},`, `          operationName: 'Get' + referencedEntityKeyNormalized,`, `          parameters: params`, `        }`, `      });`, `    return result;`, `  }`, ``);
     }
     /*
      * The ensureCommonModelFileExists method checks if the CommonModels.ts file exists in the specified output directory.
@@ -1995,7 +1802,7 @@ export class ModelServiceGenerator {
         // lines.push(`export interface ${modelName} {`);
         for (const propName of Object.keys(propertiesNode)) {
             let propNameNormalized = propName;
-            if (!this.isValidPropertyName(propName)) {
+            if (!isValidPropertyName(propName)) {
                 propNameNormalized = `"${propName}"`; // Enclose invalid property names in double quotes
             }
             const isRequired = requiredFields.has(propName);
@@ -2153,32 +1960,22 @@ export class ModelServiceGenerator {
             primaryKey.value = propName;
         }
         // Check if the property name is valid
-        if (!this.isValidPropertyName(propName)) {
+        if (!isValidPropertyName(propName)) {
             propName = `"${propName}"`; // Enclose invalid property names in double quotes
         }
         const isRequired = requiredFields.has(propertyName);
         const optionalMark = isRequired ? '' : '?';
         lines.push(`  ${propName}${optionalMark}: ${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.
-     */
-    static isValidPropertyName(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.
      */
-    static generateTypeScriptService(modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    static generateTypeScriptService(modelName, dataSourceName, primaryKey, isADataverseEntity) {
         const 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');
     }
     /*
@@ -2195,10 +1992,10 @@ export class ModelServiceGenerator {
     /*
      * The addStandardServiceImports method adds the necessary imports for the service class.
      */
-    static addStandardServiceImports(lines, modelName, isDataverseEntity, additionalLine = true) {
+    static addStandardServiceImports(lines, modelName, isADataverseEntity, additionalLine = true) {
         const imports = [...this.collectStandardImports('crud')];
         imports.push(`import type { IGetOptions, IGetAllOptions } from '${this.RELATIVE_MODEL_PATH}/CommonModels';`, `import type { ${modelName} } from '${this.RELATIVE_MODEL_PATH}/${modelName}Model';`);
-        if (isDataverseEntity) {
+        if (isADataverseEntity) {
             imports.push("import type { GetEntityMetadataOptions, EntityMetadata } from '@microsoft/power-apps/data/metadata/dataverse';");
         }
         lines.push(...imports.sort());
@@ -2251,9 +2048,9 @@ export class ModelServiceGenerator {
      * 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.
      */
-    static addServiceClassDefinition(lines, modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    static addServiceClassDefinition(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('');
     }
@@ -2270,14 +2067,14 @@ export class ModelServiceGenerator {
      * The addServiceMethods method generates the CRUD methods for the service class.
      * It includes create, update, delete, get, and getAll methods.
      */
-    static addServiceMethods(lines, modelName, dataSourceName, primaryKey, isDataverseEntity) {
+    static addServiceMethods(lines, modelName, dataSourceName, primaryKey, isADataverseEntity) {
         const methods = [];
         methods.push(this.generateCreateMethod(modelName, primaryKey));
         methods.push(this.generateUpdateMethod(modelName, primaryKey));
         methods.push(this.generateDeleteMethod(modelName));
         methods.push(this.generateGetMethod(modelName));
         methods.push(this.generateGetAllMethod(modelName));
-        if (isDataverseEntity) {
+        if (isADataverseEntity) {
             methods.push(this.generateGetMetadataMethod(modelName));
         }
         for (const method of methods) {
@@ -2310,7 +2107,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async create(record: ${datatypeForCreate}): Promise<IOperationResult<${modelName}>> {`,
             `    const result = await ${modelName}Service.client.createRecordAsync<${datatypeForCreate}, ${modelName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      record`,
             `    );`,
             `    return result;`,
@@ -2325,7 +2122,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async update(id: string, changedFields: ${datatypeForUpdate}): Promise<IOperationResult<${modelName}>> {`,
             `    const result = await ${modelName}Service.client.updateRecordAsync<${datatypeForUpdate}, ${modelName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      changedFields`,
             `    );`,
@@ -2340,7 +2137,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async delete(id: string): Promise<void> {`,
             `    await ${modelName}Service.client.deleteRecordAsync(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString());`,
             `  }`,
         ];
@@ -2352,7 +2149,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<${modelName}>> {`,
             `    const result = await ${modelName}Service.client.retrieveRecordAsync<${modelName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      options`,
             `    );`,
@@ -2367,7 +2164,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<${modelName}[]>> {`,
             `    const result = await ${modelName}Service.client.retrieveMultipleRecordsAsync<${modelName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      options`,
             `    );`,
             `    return result;`,
@@ -2383,7 +2180,7 @@ export class ModelServiceGenerator {
             `      dataverseRequest: {`,
             `        action: "getEntityMetadata",`,
             `        parameters: {`,
-            `          tableName: ${this.getServiceName(modelName)},`,
+            `          tableName: ${getServiceName(modelName)},`,
             `          options: options as GetEntityMetadataOptions,`,
             `        },`,
             `      },`,
@@ -2408,7 +2205,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async create(record: ${datatypeForCreate}): Promise<IOperationResult<${returnType}>> {`,
             `    const result = await ${modelName}Service.client.createRecordAsync<${datatypeForCreate}, ${returnType}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      record`,
             `    );`,
             `    return result;`,
@@ -2432,7 +2229,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async update(id: string, changedFields: ${datatypeForUpdate}): Promise<IOperationResult<${returnType}>> {`,
             `    const result = await ${modelName}Service.client.updateRecordAsync<${datatypeForUpdate}, ${returnType}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      changedFields`,
             `    );`,
@@ -2447,7 +2244,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async delete(id: string): Promise<void> {`,
             `    await ${modelName}Service.client.deleteRecordAsync(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString());`,
             `  }`,
         ];
@@ -2466,7 +2263,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<${returnType}>> {`,
             `    const result = await ${modelName}Service.client.retrieveRecordAsync<${returnType}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      options`,
             `    );`,
@@ -2482,7 +2279,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<${returnType}[]>> {`,
             `    const result = await ${modelName}Service.client.retrieveMultipleRecordsAsync<${returnType}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      options`,
             `    );`,
             `    return result;`,
@@ -2499,7 +2296,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async create(record: ${datatypeForCreate}): Promise<IOperationResult<${extendedInterfaceName}>> {`,
             `    const result = await ${modelName}Service.client.createRecordAsync<${datatypeForCreate}, ${extendedInterfaceName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      record`,
             `    );`,
             `    return result;`,
@@ -2516,7 +2313,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async update(id: string, changedFields: ${datatypeForUpdate}): Promise<IOperationResult<${extendedInterfaceName}>> {`,
             `    const result = await ${modelName}Service.client.updateRecordAsync<${datatypeForUpdate}, ${extendedInterfaceName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      changedFields`,
             `    );`,
@@ -2532,7 +2329,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async get(id: string, options?: IGetOptions): Promise<IOperationResult<${extendedInterfaceName}>> {`,
             `    const result = await ${modelName}Service.client.retrieveRecordAsync<${extendedInterfaceName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      id.toString(),`,
             `      options`,
             `    );`,
@@ -2548,7 +2345,7 @@ export class ModelServiceGenerator {
         return [
             `  public static async getAll(options?: IGetAllOptions): Promise<IOperationResult<${extendedInterfaceName}[]>> {`,
             `    const result = await ${modelName}Service.client.retrieveMultipleRecordsAsync<${extendedInterfaceName}>(`,
-            `      ${this.getServiceName(modelName)},`,
+            `      ${getServiceName(modelName)},`,
             `      options`,
             `    );`,
             `    return result;`,
@@ -2568,7 +2365,7 @@ export class ModelServiceGenerator {
             `      dataverseRequest: {`,
             `        action: "getEntityMetadata",`,
             `        parameters: {`,
-            `          tableName: ${this.getServiceName(modelName)},`,
+            `          tableName: ${getServiceName(modelName)},`,
             `          options: options as GetEntityMetadataOptions,`,
             `        },`,
             `      },`,
@@ -2576,15 +2373,6 @@ export class ModelServiceGenerator {
             `  }`,
         ];
     }
-    /*
-     * The getServiceName method generates a service name by appending "Service" to the given model name.
-     */
-    static getServiceName(modelName) {
-        if (!modelName || !modelName.trim()) {
-            throw new Error('Model name cannot be null or empty.');
-        }
-        return `${modelName}Service.dataSourceName`;
-    }
     /**
      * The generateIndexFile method creates an index.ts file that exports all models and services.
      */