@memberjunction/codegen-lib 2.111.0 → 2.112.0

package/dist/Database/manage-metadata.js

@@ -29,31 +29,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManageMetadataBase = exports.ValidatorResult = void 0;
 const sql = __importStar(require("mssql"));
 const config_1 = require("../Config/config");
-const core_1 = require("@memberjunction/core");
+const global_1 = require("@memberjunction/global");
 const status_logging_1 = require("../Misc/status_logging");
 const sql_1 = require("./sql");
 const advanced_generation_1 = require("../Misc/advanced_generation");
-const global_1 = require("@memberjunction/global");
+const global_2 = require("@memberjunction/global");
 const uuid_1 = require("uuid");
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const sql_logging_1 = require("../Misc/sql_logging");
 const aiengine_1 = require("@memberjunction/aiengine");
 class ValidatorResult {
-    entityName = "";
+    entityName = '';
     fieldName;
-    sourceCheckConstraint = "";
-    functionText = "";
-    functionName = "";
-    functionDescription = "";
+    sourceCheckConstraint = '';
+    functionText = '';
+    functionName = '';
+    functionDescription = '';
     /**
      * The ID value in the Generated Codes entity that was created for this validator.
      */
-    generatedCodeId = "";
+    generatedCodeId = '';
     /**
      * The ID for the AI Model that was used to generate the code
      */
-    aiModelID = "";
+    aiModelID = '';
     wasGenerated = true;
     success = false;
 }
@@ -63,7 +63,7 @@ exports.ValidatorResult = ValidatorResult;
  * to properly register your subclass with a priority of 1+ to ensure it gets instantiated.
  */
 class ManageMetadataBase {
-    _sqlUtilityObject = global_1.MJGlobal.Instance.ClassFactory.CreateInstance(sql_1.SQLUtilityBase);
+    _sqlUtilityObject = global_2.MJGlobal.Instance.ClassFactory.CreateInstance(sql_1.SQLUtilityBase);
     get SQLUtilityObject() {
         return this._sqlUtilityObject;
     }
@@ -94,53 +94,51 @@ class ManageMetadataBase {
      * @returns
      */
     async manageMetadata(pool, currentUser) {
-        const md = new core_1.Metadata();
+        const md = new global_1.Metadata();
         const excludeSchemas = config_1.configInfo.excludeSchemas ? config_1.configInfo.excludeSchemas : [];
         let bSuccess = true;
         let start = new Date();
         (0, status_logging_1.logStatus)('   Creating new entities...');
-        if (!await this.createNewEntities(pool)) {
+        if (!(await this.createNewEntities(pool))) {
             (0, status_logging_1.logError)('   Error creating new entities');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`    > Created new entities in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Updating existing entities...');
-        if (!await this.updateExistingEntitiesFromSchema(pool, excludeSchemas)) {
+        if (!(await this.updateExistingEntitiesFromSchema(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('   Error updating existing entities');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`    > Updated existing entities in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Scanning for tables that were deleted where entity metadata still exists...');
-        if (!await this.checkAndRemoveMetadataForDeletedTables(pool, excludeSchemas)) {
+        if (!(await this.checkAndRemoveMetadataForDeletedTables(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('   Error removing metadata for tables that were removed');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`    > Removed metadata for deleted tables in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Recompiling base views...');
-        const sqlUtility = global_1.MJGlobal.Instance.ClassFactory.CreateInstance(sql_1.SQLUtilityBase);
+        const sqlUtility = global_2.MJGlobal.Instance.ClassFactory.CreateInstance(sql_1.SQLUtilityBase);
         const adminSchema = (0, config_1.getSettingValue)('mj_core_schema', '__mj');
-        const schemasToExclude = (0, config_1.getSettingValue)('recompile_mj_views', true)
-            ? excludeSchemas.filter((s) => s !== adminSchema)
-            : excludeSchemas;
-        if (!await sqlUtility.recompileAllBaseViews(pool, schemasToExclude, true, ManageMetadataBase._newEntityList /*exclude the newly created entities from the above step the first time we run as those views don't exist yet*/)) {
-            (0, status_logging_1.logMessage)('   Warning: Non-Fatal error recompiling base views', core_1.SeverityType.Warning, false);
+        const schemasToExclude = (0, config_1.getSettingValue)('recompile_mj_views', true) ? excludeSchemas.filter((s) => s !== adminSchema) : excludeSchemas;
+        if (!(await sqlUtility.recompileAllBaseViews(pool, schemasToExclude, true, ManageMetadataBase._newEntityList /*exclude the newly created entities from the above step the first time we run as those views don't exist yet*/))) {
+            (0, status_logging_1.logMessage)('   Warning: Non-Fatal error recompiling base views', global_1.SeverityType.Warning, false);
             // many times the former versions of base views will NOT succesfully recompile, so don't consider that scenario to be a
             // failure for this entire function
         }
         (0, status_logging_1.logStatus)(`    > Recompiled base views in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Managing entity fields...');
-        if (!await this.manageEntityFields(pool, excludeSchemas, false, false, currentUser)) {
+        if (!(await this.manageEntityFields(pool, excludeSchemas, false, false, currentUser))) {
             (0, status_logging_1.logError)('   Error managing entity fields');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`    > Managed entity fields in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Managing entity relationships...');
-        if (!await this.manageEntityRelationships(pool, excludeSchemas, md)) {
+        if (!(await this.manageEntityRelationships(pool, excludeSchemas, md))) {
             (0, status_logging_1.logError)('   Error managing entity relationships');
             bSuccess = false;
         }
@@ -201,23 +199,23 @@ class ManageMetadataBase {
             if (veFields && veFields.length > 0) {
                 // we have 1+ fields, now loop through them and process each one
                 // first though, remove any fields that are no longer in the view
-                const md = new core_1.Metadata();
+                const md = new global_1.Metadata();
                 const entity = md.EntityByName(virtualEntity.Name);
                 if (entity) {
                     const removeList = [];
-                    const fieldsToRemove = entity.Fields.filter(f => !veFields.find((vf) => vf.FieldName === f.Name));
+                    const fieldsToRemove = entity.Fields.filter((f) => !veFields.find((vf) => vf.FieldName === f.Name));
                     for (const f of fieldsToRemove) {
                         removeList.push(f.ID);
                     }
                     if (removeList.length > 0) {
-                        const sqlRemove = `DELETE FROM [${(0, config_1.mj_core_schema)()}].EntityField WHERE ID IN (${removeList.map(removeId => `'${removeId}'`).join(',')})`;
+                        const sqlRemove = `DELETE FROM [${(0, config_1.mj_core_schema)()}].EntityField WHERE ID IN (${removeList.map((removeId) => `'${removeId}'`).join(',')})`;
                         // this removes the fields that shouldn't be there anymore
                         await this.LogSQLAndExecute(pool, sqlRemove, `SQL text to remove fields from entity ${virtualEntity.Name}`);
                         bUpdated = true;
                     }
                     // check to see if any of the fields in the virtual entity have Pkey attribute set. If not, we will default to the first field
                     // as pkey and user can change this.
-                    const hasPkey = entity.Fields.find(f => f.IsPrimaryKey) !== undefined;
+                    const hasPkey = entity.Fields.find((f) => f.IsPrimaryKey) !== undefined;
                     // now create/update the fields that are in the view
                     for (let i = 0; i < veFields.length; i++) {
                         const vef = veFields[i];
@@ -232,7 +230,7 @@ class ManageMetadataBase {
             }
             if (bUpdated) {
                 // finally make sure we update the UpdatedAt field for the entity if we made changes to its fields
-                const sqlUpdate = `UPDATE [${(0, config_1.mj_core_schema)()}].Entity SET [${core_1.EntityInfo.UpdatedAtFieldName}]=GETUTCDATE() WHERE ID='${virtualEntity.ID}'`;
+                const sqlUpdate = `UPDATE [${(0, config_1.mj_core_schema)()}].Entity SET [${global_1.EntityInfo.UpdatedAtFieldName}]=GETUTCDATE() WHERE ID='${virtualEntity.ID}'`;
                 await this.LogSQLAndExecute(pool, sqlUpdate, `SQL text to update virtual entity updated date for ${virtualEntity.Name}`);
             }
             return { success: bSuccess, updatedEntity: bUpdated };
@@ -246,12 +244,12 @@ class ManageMetadataBase {
         // this protected checks to see if the field exists in the entity definition, and if not, adds it
         // if it exist it updates the entity field to match the view's data type and nullability attributes
         // first, get the entity definition
-        const md = new core_1.Metadata();
+        const md = new global_1.Metadata();
         const entity = md.EntityByName(virtualEntity.Name);
         let newEntityFieldUUID = null;
         let didUpdate = false;
         if (entity) {
-            const field = entity.Fields.find(f => f.Name.trim().toLowerCase() === veField.FieldName.trim().toLowerCase());
+            const field = entity.Fields.find((f) => f.Name.trim().toLowerCase() === veField.FieldName.trim().toLowerCase());
             if (field) {
                 // have a match, so the field exists in the entity definition, now check to see if it needs to be updated
                 if (makePrimaryKey ||
@@ -304,8 +302,8 @@ class ManageMetadataBase {
      */
     async manageEntityRelationships(pool, excludeSchemas, md, batchItems = 5) {
         let bResult = true;
-        bResult = bResult && await this.manageManyToManyEntityRelationships(pool, excludeSchemas, batchItems);
-        bResult = bResult && await this.manageOneToManyEntityRelationships(pool, excludeSchemas, md, batchItems);
+        bResult = bResult && (await this.manageManyToManyEntityRelationships(pool, excludeSchemas, batchItems));
+        bResult = bResult && (await this.manageOneToManyEntityRelationships(pool, excludeSchemas, md, batchItems));
         return bResult;
     }
     /**
@@ -335,7 +333,7 @@ class ManageMetadataBase {
                        WHERE
                              RelatedEntityID IS NOT NULL AND
                              IsVirtual = 0 AND
-                             EntityID NOT IN (SELECT ID FROM ${(0, config_1.mj_core_schema)()}.Entity WHERE SchemaName IN (${excludeSchemas.map(s => `'${s}'`).join(',')}))
+                             EntityID NOT IN (SELECT ID FROM ${(0, config_1.mj_core_schema)()}.Entity WHERE SchemaName IN (${excludeSchemas.map((s) => `'${s}'`).join(',')}))
                        ORDER BY RelatedEntityID`;
             const entityFieldsResult = await pool.request().query(sSQL);
             const entityFields = entityFieldsResult.recordset;
@@ -359,7 +357,7 @@ class ManageMetadataBase {
                     const relationships = allRelationships.filter((r) => r.EntityID === f.RelatedEntityID && r.RelatedEntityID === f.EntityID);
                     if (relationships && relationships.length === 0) {
                         // no relationship exists, so create it
-                        const e = md.Entities.find(e => e.ID === f.EntityID);
+                        const e = md.Entities.find((e) => e.ID === f.EntityID);
                         // calculate the sequence by getting the count of existing relationships for the entity and adding 1 and then increment the count for future inserts in this loop
                         const relCount = relationshipCountMap.get(f.EntityID) || 0;
                         const sequence = relCount + 1;
@@ -428,7 +426,7 @@ class ManageMetadataBase {
                     }
                 }
                 // if we get here we now need to refresh our metadata object
-                const md = new core_1.Metadata();
+                const md = new global_1.Metadata();
                 await md.Refresh();
             }
             return true;
@@ -488,15 +486,15 @@ class ManageMetadataBase {
         let bSuccess = true;
         const startTime = new Date();
         if (!skipCreatedAtUpdatedAtDeletedAtFieldValidation) {
-            if (!await this.ensureCreatedAtUpdatedAtFieldsExist(pool, excludeSchemas) ||
-                !await this.ensureDeletedAtFieldsExist(pool, excludeSchemas)) {
-                (0, status_logging_1.logError)(`Error ensuring ${core_1.EntityInfo.CreatedAtFieldName}, ${core_1.EntityInfo.UpdatedAtFieldName} and ${core_1.EntityInfo.DeletedAtFieldName} fields exist`);
+            if (!(await this.ensureCreatedAtUpdatedAtFieldsExist(pool, excludeSchemas)) ||
+                !(await this.ensureDeletedAtFieldsExist(pool, excludeSchemas))) {
+                (0, status_logging_1.logError)(`Error ensuring ${global_1.EntityInfo.CreatedAtFieldName}, ${global_1.EntityInfo.UpdatedAtFieldName} and ${global_1.EntityInfo.DeletedAtFieldName} fields exist`);
                 bSuccess = false;
             }
-            (0, status_logging_1.logStatus)(`      Ensured ${core_1.EntityInfo.CreatedAtFieldName}/${core_1.EntityInfo.UpdatedAtFieldName}/${core_1.EntityInfo.DeletedAtFieldName} fields exist in ${(new Date().getTime() - startTime.getTime()) / 1000} seconds`);
+            (0, status_logging_1.logStatus)(`      Ensured ${global_1.EntityInfo.CreatedAtFieldName}/${global_1.EntityInfo.UpdatedAtFieldName}/${global_1.EntityInfo.DeletedAtFieldName} fields exist in ${(new Date().getTime() - startTime.getTime()) / 1000} seconds`);
         }
         const step1StartTime = new Date();
-        if (!await this.deleteUnneededEntityFields(pool, excludeSchemas)) {
+        if (!(await this.deleteUnneededEntityFields(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('Error deleting unneeded entity fields');
             bSuccess = false;
         }
@@ -504,7 +502,8 @@ class ManageMetadataBase {
         // AN: 14-June-2025 - See note below about the new order of these steps, this must
         // happen before we update existing entity fields from schema.
         const step2StartTime = new Date();
-        if (!await this.createNewEntityFieldsFromSchema(pool)) { // has its own internal filtering for exclude schema/table so don't pass in
+        if (!(await this.createNewEntityFieldsFromSchema(pool))) {
+            // has its own internal filtering for exclude schema/table so don't pass in
             (0, status_logging_1.logError)('Error creating new entity fields from schema');
             bSuccess = false;
         }
@@ -514,19 +513,19 @@ class ManageMetadataBase {
         // with VERY HIGH sequence numbers (e.g. 100,000 above what they will be approx) and then
         // we align them properly in sequential order from 1+ via this method below.
         const step3StartTime = new Date();
-        if (!await this.updateExistingEntityFieldsFromSchema(pool, excludeSchemas)) {
+        if (!(await this.updateExistingEntityFieldsFromSchema(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('Error updating existing entity fields from schema');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`      Updated existing entity fields from schema in ${(new Date().getTime() - step3StartTime.getTime()) / 1000} seconds`);
         const step4StartTime = new Date();
-        if (!await this.setDefaultColumnWidthWhereNeeded(pool, excludeSchemas)) {
+        if (!(await this.setDefaultColumnWidthWhereNeeded(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('Error setting default column width where needed');
             bSuccess = false;
         }
         (0, status_logging_1.logStatus)(`      Set default column width where needed in ${(new Date().getTime() - step4StartTime.getTime()) / 1000} seconds`);
         const step5StartTime = new Date();
-        if (!await this.updateEntityFieldDisplayNameWhereNull(pool, excludeSchemas)) {
+        if (!(await this.updateEntityFieldDisplayNameWhereNull(pool, excludeSchemas))) {
             (0, status_logging_1.logError)('Error updating entity field display name where null');
             bSuccess = false;
         }
@@ -534,7 +533,7 @@ class ManageMetadataBase {
         if (!skipEntityFieldValues) {
             const step6StartTime = new Date();
             (0, status_logging_1.logStatus)(`      Starting to manage entity field values...`);
-            if (!await this.manageEntityFieldValuesAndValidatorFunctions(pool, excludeSchemas, currentUser, false)) {
+            if (!(await this.manageEntityFieldValuesAndValidatorFunctions(pool, excludeSchemas, currentUser, false))) {
                 (0, status_logging_1.logError)('Error managing entity field values');
                 bSuccess = false;
             }
@@ -555,7 +554,7 @@ class ManageMetadataBase {
                               WHERE
                                  VirtualEntity=0 AND
                                  DeleteType='Soft' AND
-                                 SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})`;
+                                 SchemaName NOT IN (${excludeSchemas.map((s) => `'${s}'`).join(',')})`;
             const entitiesResult = await pool.request().query(sqlEntities);
             const entities = entitiesResult.recordset;
             let overallResult = true;
@@ -566,14 +565,14 @@ class ManageMetadataBase {
                          FROM INFORMATION_SCHEMA.COLUMNS
                          WHERE
                          ${entities.map((e) => `(TABLE_SCHEMA='${e.SchemaName}' AND TABLE_NAME='${e.BaseTable}')`).join(' OR ')}
-                         AND COLUMN_NAME='${core_1.EntityInfo.DeletedAtFieldName}'`;
+                         AND COLUMN_NAME='${global_1.EntityInfo.DeletedAtFieldName}'`;
                 const resultResult = await pool.request().query(sql);
                 const result = resultResult.recordset;
                 for (const e of entities) {
                     const eResult = result.filter((r) => r.TABLE_NAME === e.BaseTable && r.TABLE_SCHEMA === e.SchemaName); // get just the fields for this entity
-                    const deletedAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === core_1.EntityInfo.DeletedAtFieldName.trim().toLowerCase());
+                    const deletedAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === global_1.EntityInfo.DeletedAtFieldName.trim().toLowerCase());
                     // now, if we have the fields, we need to check the default value and update if necessary
-                    const fieldResult = await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, core_1.EntityInfo.DeletedAtFieldName, deletedAt, true);
+                    const fieldResult = await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, global_1.EntityInfo.DeletedAtFieldName, deletedAt, true);
                     overallResult = overallResult && fieldResult;
                 }
             }
@@ -599,7 +598,7 @@ class ManageMetadataBase {
                               WHERE
                                  VirtualEntity = 0 AND
                                  TrackRecordChanges = 1 AND
-                                 SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})`;
+                                 SchemaName NOT IN (${excludeSchemas.map((s) => `'${s}'`).join(',')})`;
             const entitiesResult = await pool.request().query(sqlEntities);
             const entities = entitiesResult.recordset;
             let overallResult = true;
@@ -611,17 +610,17 @@ class ManageMetadataBase {
                                        FROM INFORMATION_SCHEMA.COLUMNS
                                        WHERE
                                           ${entities.map((e) => `(TABLE_SCHEMA='${e.SchemaName}' AND TABLE_NAME='${e.BaseTable}')`).join(' OR ')}
-                                       AND COLUMN_NAME IN ('${core_1.EntityInfo.CreatedAtFieldName}','${core_1.EntityInfo.UpdatedAtFieldName}')`;
+                                       AND COLUMN_NAME IN ('${global_1.EntityInfo.CreatedAtFieldName}','${global_1.EntityInfo.UpdatedAtFieldName}')`;
                 const resultResult = await pool.request().query(sqlCreatedUpdated);
                 const result = resultResult.recordset;
                 for (const e of entities) {
                     // result has both created at and updated at fields, so filter on the result for each and do what we need to based on that
                     const eResult = result.filter((r) => r.TABLE_NAME === e.BaseTable && r.TABLE_SCHEMA === e.SchemaName); // get just the fields for this entity
-                    const createdAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === core_1.EntityInfo.CreatedAtFieldName.trim().toLowerCase());
-                    const updatedAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === core_1.EntityInfo.UpdatedAtFieldName.trim().toLowerCase());
+                    const createdAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === global_1.EntityInfo.CreatedAtFieldName.trim().toLowerCase());
+                    const updatedAt = eResult.find((r) => r.COLUMN_NAME.trim().toLowerCase() === global_1.EntityInfo.UpdatedAtFieldName.trim().toLowerCase());
                     // now, if we have the fields, we need to check the default value and update if necessary
-                    const fieldResult = await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, core_1.EntityInfo.CreatedAtFieldName, createdAt, false) &&
-                        await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, core_1.EntityInfo.UpdatedAtFieldName, updatedAt, false);
+                    const fieldResult = (await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, global_1.EntityInfo.CreatedAtFieldName, createdAt, false)) &&
+                        (await this.ensureSpecialDateFieldExistsAndHasCorrectDefaultValue(pool, e, global_1.EntityInfo.UpdatedAtFieldName, updatedAt, false));
                     overallResult = overallResult && fieldResult;
                 }
             }
@@ -664,7 +663,7 @@ class ManageMetadataBase {
                     // field that is NOT NULL
                     if (!allowNull) {
                         const defaultValue = currentFieldData.COLUMN_DEFAULT;
-                        const realDefaultValue = (0, core_1.ExtractActualDefaultValue)(defaultValue);
+                        const realDefaultValue = (0, global_1.ExtractActualDefaultValue)(defaultValue);
                         if (!realDefaultValue || realDefaultValue.trim().toLowerCase() !== 'getutcdate()') {
                             await this.dropAndCreateDefaultConstraintForSpecialDateField(pool, entity, fieldName);
                         }
@@ -684,7 +683,7 @@ class ManageMetadataBase {
      */
     async createDefaultConstraintForSpecialDateField(pool, entity, fieldName) {
         try {
-            const sqlAddDefaultConstraint = `ALTER TABLE [${entity.SchemaName}].[${entity.BaseTable}] ADD CONSTRAINT DF_${entity.SchemaName}_${(0, core_1.CodeNameFromString)(entity.BaseTable)}_${fieldName} DEFAULT GETUTCDATE() FOR [${fieldName}]`;
+            const sqlAddDefaultConstraint = `ALTER TABLE [${entity.SchemaName}].[${entity.BaseTable}] ADD CONSTRAINT DF_${entity.SchemaName}_${(0, global_1.CodeNameFromString)(entity.BaseTable)}_${fieldName} DEFAULT GETUTCDATE() FOR [${fieldName}]`;
             await this.LogSQLAndExecute(pool, sqlAddDefaultConstraint, `SQL text to add default constraint for special date field ${fieldName} in entity ${entity.SchemaName}.${entity.BaseTable}`);
         }
         catch (e) {
@@ -754,9 +753,12 @@ class ManageMetadataBase {
             for (let e of ManageMetadataBase.newEntityList) {
                 const dataResult = await pool.request().query(`SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntities WHERE Name = '${e}'`);
                 const data = dataResult.recordset;
-                const fieldsResult = await pool.request().query(`SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntityFields WHERE EntityID='${data[0].ID}'`);
+                const fieldsResult = await pool
+                    .request()
+                    .query(`SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntityFields WHERE EntityID='${data[0].ID}'`);
                 const fields = fieldsResult.recordset;
-                const entityUserMessage = userMessage + `Entity Name: ${e},
+                const entityUserMessage = userMessage +
+                    `Entity Name: ${e},
                                                      Base Table: ${data[0].BaseTable},
                                                      Schema: ${data[0].SchemaName}.
                                                      Fields:
@@ -766,13 +768,13 @@ class ManageMetadataBase {
                     messages: [
                         {
                             role: 'system',
-                            content: systemPrompt
+                            content: systemPrompt,
                         },
                         {
                             role: 'user',
-                            content: entityUserMessage
-                        }
-                    ]
+                            content: entityUserMessage,
+                        },
+                    ],
                 });
                 if (result?.success) {
                     const resultText = result?.data.choices[0].message.content;
@@ -787,7 +789,10 @@ class ManageMetadataBase {
                         }
                     }
                     catch (e) {
-                        console.warn('   >>> Advanced Generation Error: LLM returned invalid result, skipping entity description for entity ' + e + '. Result from LLM: ' + resultText, e);
+                        console.warn('   >>> Advanced Generation Error: LLM returned invalid result, skipping entity description for entity ' +
+                            e +
+                            '. Result from LLM: ' +
+                            resultText, e);
                     }
                 }
                 else {
@@ -818,15 +823,15 @@ class ManageMetadataBase {
                         ef.DisplayName IS NULL AND
                         ef.DisplayName <> ef.Name AND
                         ef.Name <> \'ID\' AND
-                        e.SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})
+                        e.SchemaName NOT IN (${excludeSchemas.map((s) => `'${s}'`).join(',')})
                         `;
             const fieldsResult = await pool.request().query(sql);
             const fields = fieldsResult.recordset;
             if (fields && fields.length > 0)
                 for (const field of fields) {
-                    const sDisplayName = (0, global_1.stripTrailingChars)((0, global_1.convertCamelCaseToHaveSpaces)(field.Name), 'ID', true).trim();
+                    const sDisplayName = (0, global_2.stripTrailingChars)((0, global_2.convertCamelCaseToHaveSpaces)(field.Name), 'ID', true).trim();
                     if (sDisplayName.length > 0 && sDisplayName.toLowerCase().trim() !== field.Name.toLowerCase().trim()) {
-                        const sSQL = `UPDATE [${(0, config_1.mj_core_schema)()}].EntityField SET ${core_1.EntityInfo.UpdatedAtFieldName}=GETUTCDATE(), DisplayName = '${sDisplayName}' WHERE ID = '${field.ID}'`;
+                        const sSQL = `UPDATE [${(0, config_1.mj_core_schema)()}].EntityField SET ${global_1.EntityInfo.UpdatedAtFieldName}=GETUTCDATE(), DisplayName = '${sDisplayName}' WHERE ID = '${field.ID}'`;
                         await this.LogSQLAndExecute(pool, sSQL, `SQL text to update display name for field ${field.Name}`);
                     }
                 }
@@ -893,9 +898,9 @@ NumberedRows AS (
       sf.AllowsNull,
       sf.DefaultValue,
       sf.AutoIncrement,
-      IIF(sf.IsVirtual = 1, 0, IIF(sf.FieldName = '${core_1.EntityInfo.CreatedAtFieldName}' OR
-                                   sf.FieldName = '${core_1.EntityInfo.UpdatedAtFieldName}' OR
-                                   sf.FieldName = '${core_1.EntityInfo.DeletedAtFieldName}' OR
+      IIF(sf.IsVirtual = 1, 0, IIF(sf.FieldName = '${global_1.EntityInfo.CreatedAtFieldName}' OR
+                                   sf.FieldName = '${global_1.EntityInfo.UpdatedAtFieldName}' OR
+                                   sf.FieldName = '${global_1.EntityInfo.DeletedAtFieldName}' OR
                                    pk.ColumnName IS NOT NULL, 0, 1)) AllowUpdateAPI,
       sf.IsVirtual,
       e.RelationshipDefaultDisplayType,
@@ -980,34 +985,39 @@ NumberedRows AS (
      * @returns
      */
     getPendingEntityFieldINSERTSQL(newEntityFieldUUID, n) {
-        const bDefaultInView = (n.FieldName?.trim().toLowerCase() === 'id' ||
+        const bDefaultInView = n.FieldName?.trim().toLowerCase() === 'id' ||
             n.FieldName?.trim().toLowerCase() === 'name' ||
             n.Sequence <= config_1.configInfo.newEntityDefaults?.IncludeFirstNFieldsAsDefaultInView ||
-            n.IsNameField ? true : false);
+            n.IsNameField
+            ? true
+            : false;
         const escapedDescription = n.Description ? `'${n.Description.replace(/'/g, "''")}'` : 'NULL';
         let fieldDisplayName = '';
         switch (n.FieldName.trim().toLowerCase()) {
-            case core_1.EntityInfo.CreatedAtFieldName.trim().toLowerCase():
-                fieldDisplayName = "Created At";
+            case global_1.EntityInfo.CreatedAtFieldName.trim().toLowerCase():
+                fieldDisplayName = 'Created At';
                 break;
-            case core_1.EntityInfo.UpdatedAtFieldName.trim().toLowerCase():
-                fieldDisplayName = "Updated At";
+            case global_1.EntityInfo.UpdatedAtFieldName.trim().toLowerCase():
+                fieldDisplayName = 'Updated At';
                 break;
-            case core_1.EntityInfo.DeletedAtFieldName.trim().toLowerCase():
-                fieldDisplayName = "Deleted At";
+            case global_1.EntityInfo.DeletedAtFieldName.trim().toLowerCase():
+                fieldDisplayName = 'Deleted At';
                 break;
             default:
-                fieldDisplayName = (0, global_1.convertCamelCaseToHaveSpaces)(n.FieldName).trim();
+                fieldDisplayName = (0, global_2.convertCamelCaseToHaveSpaces)(n.FieldName).trim();
                 break;
         }
         const parsedDefaultValue = this.parseDefaultValue(n.DefaultValue);
-        const quotedDefaultValue = parsedDefaultValue?.trim().length === 0 ? 'NULL' :
-            (parsedDefaultValue?.trim().toLowerCase() === 'null' ? 'NULL' : `'${parsedDefaultValue}'`);
+        const quotedDefaultValue = parsedDefaultValue?.trim().length === 0
+            ? 'NULL'
+            : parsedDefaultValue?.trim().toLowerCase() === 'null'
+                ? 'NULL'
+                : `'${parsedDefaultValue}'`;
         // in the above we are setting quotedDefaultValue to NULL if the parsed default value is an empty string or the string 'NULL' (case insensitive)
         return `
       IF NOT EXISTS (
-         SELECT 1 FROM [${(0, config_1.mj_core_schema)()}].EntityField 
-         WHERE ID = '${newEntityFieldUUID}'  OR 
+         SELECT 1 FROM [${(0, config_1.mj_core_schema)()}].EntityField
+         WHERE ID = '${newEntityFieldUUID}'  OR
                (EntityID = '${n.EntityID}' AND Name = '${n.FieldName}')
          -- check to make sure we're not inserting a duplicate entity field metadata record
       )
@@ -1084,9 +1094,9 @@ NumberedRows AS (
                 sResult = sqlDefaultValue.substring(1, sqlDefaultValue.length - 1);
             else
                 sResult = sqlDefaultValue;
-            if (sResult.toUpperCase().startsWith('N\'') && sResult.endsWith('\''))
+            if (sResult.toUpperCase().startsWith("N'") && sResult.endsWith("'"))
                 sResult = sResult.substring(2, sResult.length - 1);
-            if (sResult.startsWith('\'') && sResult.endsWith('\''))
+            if (sResult.startsWith("'") && sResult.endsWith("'"))
                 sResult = sResult.substring(1, sResult.length - 1);
         }
         return sResult;
@@ -1220,7 +1230,7 @@ NumberedRows AS (
             // evaluate it to see if it is a simple series of OR statements or not, if it is a simple series of OR statements, we can parse the possible values
             // for the field and sync that up with the EntityFieldValue table. If it is not a simple series of OR statements, we will not be able to parse it and we'll
             // just ignore it.
-            const filter = excludeSchemas && excludeSchemas.length > 0 ? ` WHERE SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})` : '';
+            const filter = excludeSchemas && excludeSchemas.length > 0 ? ` WHERE SchemaName NOT IN (${excludeSchemas.map((s) => `'${s}'`).join(',')})` : '';
             const sSQL = `SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntityFieldsWithCheckConstraints${filter}`;
             const resultResult = await pool.request().query(sSQL);
             const result = resultResult.recordset;
@@ -1265,8 +1275,8 @@ NumberedRows AS (
                         // if we get here that means we don't have a simple condition in the check constraint that the RegEx could parse. If Advanced Generation is enabled, we will
                         // attempt to use an LLM to do things fancier now
                         if (config_1.configInfo.advancedGeneration?.enableAdvancedGeneration &&
-                            config_1.configInfo.advancedGeneration?.features.find(f => f.name === 'ParseCheckConstraints' && f.enabled)) {
-                            // the user has the feature turned on, let's generate a description of the constraint and then build a Validate function for the constraint 
+                            config_1.configInfo.advancedGeneration?.features.find((f) => f.name === 'ParseCheckConstraints' && f.enabled)) {
+                            // the user has the feature turned on, let's generate a description of the constraint and then build a Validate function for the constraint
                             // run this in parallel
                             generationPromises.push(this.runValidationGeneration(r, allEntityFields, !skipDBUpdate, currentUser));
                         }
@@ -1276,8 +1286,8 @@ NumberedRows AS (
             // now for the table level constraints run the process for advanced generation
             for (const r of tableLevelResults) {
                 if (config_1.configInfo.advancedGeneration?.enableAdvancedGeneration &&
-                    config_1.configInfo.advancedGeneration?.features.find(f => f.name === 'ParseCheckConstraints' && f.enabled)) {
-                    // the user has the feature turned on, let's generate a description of the constraint and then build a Validate function for the constraint 
+                    config_1.configInfo.advancedGeneration?.features.find((f) => f.name === 'ParseCheckConstraints' && f.enabled)) {
+                    // the user has the feature turned on, let's generate a description of the constraint and then build a Validate function for the constraint
                     // run this in parallel
                     generationPromises.push(this.runValidationGeneration(r, allEntityFields, !skipDBUpdate, currentUser));
                 }
@@ -1348,7 +1358,9 @@ NumberedRows AS (
             }
         }
         try {
-            if (generateNewCode && config_1.configInfo.advancedGeneration?.enableAdvancedGeneration && config_1.configInfo.advancedGeneration?.features.find(f => f.name === 'ParseCheckConstraints' && f.enabled)) {
+            if (generateNewCode &&
+                config_1.configInfo.advancedGeneration?.enableAdvancedGeneration &&
+                config_1.configInfo.advancedGeneration?.features.find((f) => f.name === 'ParseCheckConstraints' && f.enabled)) {
                 // feature is enabled, so let's call the LLM to generate a function for us
                 const ag = new advanced_generation_1.AdvancedGeneration();
                 const llm = ag.LLM;
@@ -1358,42 +1370,45 @@ NumberedRows AS (
                     return returnResult;
                 }
                 await aiengine_1.AIEngine.Instance.Config(false, currentUser); // make sure metadata loaded
-                const model = aiengine_1.AIEngine.Instance.Models.find(m => {
+                const model = aiengine_1.AIEngine.Instance.Models.find((m) => {
                     const modelMatch = m.APINameOrName.trim().toLowerCase() === ag.AIModel.trim().toLowerCase();
                     if (!modelMatch)
                         return false;
                     // Check if model has a vendor matching the specified vendor
-                    const hasVendor = aiengine_1.AIEngine.Instance.ModelVendors.some(mv => mv.ModelID === m.ID &&
-                        mv.Vendor.trim().toLowerCase() === ag.AIVendor.trim().toLowerCase() &&
-                        mv.Status === 'Active');
+                    const hasVendor = aiengine_1.AIEngine.Instance.ModelVendors.some((mv) => mv.ModelID === m.ID && mv.Vendor.trim().toLowerCase() === ag.AIVendor.trim().toLowerCase() && mv.Status === 'Active');
                     return hasVendor;
                 });
                 if (!model)
                     throw new Error(`   >>> Error generating validator function from check constraint. Unable to find AI Model with name ${ag.AIModel} and vendor ${ag.AIVendor}.`);
                 const prompt = ag.getPrompt('CheckConstraintParser');
-                const entityFieldListInfo = allEntityFields.filter(item => item.Entity.trim().toLowerCase() === data.EntityName.trim().toLowerCase()).map(item => `   * ${item.Name} - ${item.Type}${item.AllowsNull ? ' (nullable)' : ' (not null)'}`).join('\n');
-                const existingMethodNameBlock = generatedValidationFunctionName ? `Existing Method Name: ${generatedValidationFunctionName}\n Please reuse this SAME method name for the new generation` : '';
+                const entityFieldListInfo = allEntityFields
+                    .filter((item) => item.Entity.trim().toLowerCase() === data.EntityName.trim().toLowerCase())
+                    .map((item) => `   * ${item.Name} - ${item.Type}${item.AllowsNull ? ' (nullable)' : ' (not null)'}`)
+                    .join('\n');
+                const existingMethodNameBlock = generatedValidationFunctionName
+                    ? `Existing Method Name: ${generatedValidationFunctionName}\n Please reuse this SAME method name for the new generation`
+                    : '';
                 const markedUpSysPrompt = ag.fillTemplate(prompt.systemPrompt, {
                     ENTITY_FIELD_LIST: entityFieldListInfo,
-                    EXISTING_METHOD_NAME: existingMethodNameBlock
+                    EXISTING_METHOD_NAME: existingMethodNameBlock,
                 }); // prompt.systemPrompt.replace(/{{ENTITY_FIELD_LIST}}/g, entityFieldListInfo);
                 const result = await llm.ChatCompletion({
                     messages: [
                         {
                             role: 'system',
-                            content: markedUpSysPrompt
+                            content: markedUpSysPrompt,
                         },
                         {
                             role: 'user',
-                            content: `${constraintDefinition}`
-                        }
+                            content: `${constraintDefinition}`,
+                        },
                     ],
                     model: ag.AIModel,
-                    responseFormat: 'JSON'
+                    responseFormat: 'JSON',
                 });
                 if (result && result.success) {
                     const jsonResult = result.data.choices[0].message.content;
-                    const structuredResult = (0, global_1.SafeJSONParse)(jsonResult);
+                    const structuredResult = (0, global_2.SafeJSONParse)(jsonResult);
                     if (structuredResult?.Description && structuredResult?.Code && structuredResult?.MethodName) {
                         returnResult.functionText = structuredResult.Code;
                         returnResult.functionName = structuredResult.MethodName;
@@ -1429,7 +1444,7 @@ NumberedRows AS (
             await transaction.begin();
             try {
                 for (const ev of existingValues) {
-                    if (!possibleValues.find(v => v === ev.Value)) {
+                    if (!possibleValues.find((v) => v === ev.Value)) {
                         // delete the value from the database
                         const sSQLDelete = `DELETE FROM [${(0, config_1.mj_core_schema)()}].EntityFieldValue WHERE ID='${ev.ID}'`;
                         await this.LogSQLAndExecute(ds, sSQLDelete, `SQL text to delete entity field value ID ${ev.ID}`);
@@ -1533,18 +1548,21 @@ NumberedRows AS (
         if (config_1.configInfo.excludeTables) {
             for (let i = 0; i < config_1.configInfo.excludeTables.length; ++i) {
                 const t = config_1.configInfo.excludeTables[i];
-                sExcludeTables += (sExcludeTables.length > 0 ? ' AND ' : '') +
-                    (t.schema.indexOf('%') > -1 ? ` NOT ( ${fieldPrefix}SchemaName LIKE '${t.schema}'` :
-                        ` NOT ( ${fieldPrefix}SchemaName = '${t.schema}'`);
-                sExcludeTables += (t.table.indexOf('%') > -1 ? ` AND ${fieldPrefix}TableName LIKE '${t.table}') ` :
-                    ` AND ${fieldPrefix}TableName = '${t.table}') `);
+                sExcludeTables +=
+                    (sExcludeTables.length > 0 ? ' AND ' : '') +
+                        (t.schema.indexOf('%') > -1
+                            ? ` NOT ( ${fieldPrefix}SchemaName LIKE '${t.schema}'`
+                            : ` NOT ( ${fieldPrefix}SchemaName = '${t.schema}'`);
+                sExcludeTables +=
+                    t.table.indexOf('%') > -1 ? ` AND ${fieldPrefix}TableName LIKE '${t.table}') ` : ` AND ${fieldPrefix}TableName = '${t.table}') `;
             }
         }
         if (config_1.configInfo.excludeSchemas) {
             for (let i = 0; i < config_1.configInfo.excludeSchemas.length; ++i) {
                 const s = config_1.configInfo.excludeSchemas[i];
-                sExcludeSchemas += (sExcludeSchemas.length > 0 ? ' AND ' : '') +
-                    (s.indexOf('%') > -1 ? `${fieldPrefix}SchemaName NOT LIKE '${s}'` : `${fieldPrefix}SchemaName <> '${s}'`);
+                sExcludeSchemas +=
+                    (sExcludeSchemas.length > 0 ? ' AND ' : '') +
+                        (s.indexOf('%') > -1 ? `${fieldPrefix}SchemaName NOT LIKE '${s}'` : `${fieldPrefix}SchemaName <> '${s}'`);
             }
         }
         const sWhere = (sExcludeTables.length > 0 || sExcludeSchemas.length > 0 ? ` AND ` : '') +
@@ -1558,7 +1576,7 @@ NumberedRows AS (
             const newEntitiesResult = await pool.request().query(sSQL);
             const newEntities = newEntitiesResult.recordset;
             if (newEntities && newEntities.length > 0) {
-                const md = new core_1.Metadata();
+                const md = new global_1.Metadata();
                 const transaction = new sql.Transaction(pool);
                 await transaction.begin();
                 try {
@@ -1575,14 +1593,14 @@ NumberedRows AS (
                 }
                 if (ManageMetadataBase.newEntityList.length > 0) {
                     // only do this if we actually created new entities
-                    (0, core_1.LogStatus)(`   Done creating entities, refreshing metadata to reflect new entities...`);
+                    (0, global_1.LogStatus)(`   Done creating entities, refreshing metadata to reflect new entities...`);
                     await md.Refresh(); // refresh now since we've added some new entities
                 }
             }
             return true; // if we get here, we succeeded
         }
         catch (e) {
-            (0, core_1.LogError)(e);
+            (0, global_1.LogError)(e);
             return false;
         }
     }
@@ -1591,12 +1609,12 @@ NumberedRows AS (
         // criteria:
         // 1) entity has a field that is a primary key
         // validate all of these factors by getting the sql from SQL Server and check the result, if failure, shouldCreate=false and generate validation message, otherwise return empty validation message and true for shouldCreate.
-        const query = `EXEC ${core_1.Metadata.Provider.ConfigData.MJCoreSchemaName}.spGetPrimaryKeyForTable @TableName='${newEntity.TableName}', @SchemaName='${newEntity.SchemaName}'`;
+        const query = `EXEC ${global_1.Metadata.Provider.ConfigData.MJCoreSchemaName}.spGetPrimaryKeyForTable @TableName='${newEntity.TableName}', @SchemaName='${newEntity.SchemaName}'`;
         try {
             const resultResult = await ds.request().query(query);
             const result = resultResult.recordset;
             if (result.length === 0) {
-                return { shouldCreate: false, validationMessage: "No primary key found" };
+                return { shouldCreate: false, validationMessage: 'No primary key found' };
             }
             return { shouldCreate: true, validationMessage: '' };
         }
@@ -1647,13 +1665,13 @@ NumberedRows AS (
             messages: [
                 {
                     role: 'system',
-                    content: systemPrompt
+                    content: systemPrompt,
                 },
                 {
                     role: 'user',
-                    content: userMessage
-                }
-            ]
+                    content: userMessage,
+                },
+            ],
         });
         if (result?.success) {
             const resultText = result?.data.choices[0].message.content;
@@ -1668,7 +1686,8 @@ NumberedRows AS (
                 }
             }
             catch (e) {
-                console.warn('   >>> Advanced Generation Error: LLM returned invalid result, falling back to simple generated entity name. Result from LLM: ' + resultText, e);
+                console.warn('   >>> Advanced Generation Error: LLM returned invalid result, falling back to simple generated entity name. Result from LLM: ' +
+                    resultText, e);
                 return this.simpleNewEntityName(newEntity.SchemaName, newEntity.TableName);
             }
         }
@@ -1678,8 +1697,8 @@ NumberedRows AS (
         }
     }
     simpleNewEntityName(schemaName, tableName) {
-        const convertedTableName = (0, global_1.convertCamelCaseToHaveSpaces)(tableName);
-        const pluralName = (0, global_1.generatePluralName)(convertedTableName, { capitalizeFirstLetterOnly: true });
+        const convertedTableName = (0, global_2.convertCamelCaseToHaveSpaces)(tableName);
+        const pluralName = (0, global_2.generatePluralName)(convertedTableName, { capitalizeFirstLetterOnly: true });
         return this.markupEntityName(schemaName, pluralName);
     }
     /**
@@ -1699,7 +1718,7 @@ NumberedRows AS (
         }
     }
     getNewEntityNameRule(schemaName) {
-        const rule = config_1.configInfo.newEntityDefaults?.NameRulesBySchema?.find(r => {
+        const rule = config_1.configInfo.newEntityDefaults?.NameRulesBySchema?.find((r) => {
             let schemaNameToUse = r.SchemaName;
             if (schemaNameToUse?.trim().toLowerCase() === '${mj_core_schema}') {
                 // markup for this is to be replaced with the mj_core_schema() config
@@ -1720,13 +1739,13 @@ NumberedRows AS (
                 let newEntityName = await this.createNewEntityName(newEntity);
                 const newEntityDisplayName = this.createNewEntityDisplayName(newEntity, newEntityName);
                 let suffix = '';
-                const existingEntity = md.Entities.find(e => e.Name.toLowerCase() === newEntityName.toLowerCase());
-                const existingEntityInNewEntityList = ManageMetadataBase.newEntityList.find(e => e === newEntityName); // check the newly created entity list to make sure we didn't create the new entity name along the way in this RUN of CodeGen as it wouldn't yet be in our metadata above
+                const existingEntity = md.Entities.find((e) => e.Name.toLowerCase() === newEntityName.toLowerCase());
+                const existingEntityInNewEntityList = ManageMetadataBase.newEntityList.find((e) => e === newEntityName); // check the newly created entity list to make sure we didn't create the new entity name along the way in this RUN of CodeGen as it wouldn't yet be in our metadata above
                 if (existingEntity || existingEntityInNewEntityList) {
                     // the generated name is already in place, so we need another name
                     suffix = '__' + newEntity.SchemaName;
                     newEntityName = newEntityName + suffix;
-                    (0, core_1.LogError)(`   >>>> WARNING: Entity name already exists, so using ${newEntityName} instead. If you did not intend for this, please rename the ${newEntity.SchemaName}.${newEntity.TableName} table in the database.`);
+                    (0, global_1.LogError)(`   >>>> WARNING: Entity name already exists, so using ${newEntityName} instead. If you did not intend for this, please rename the ${newEntity.SchemaName}.${newEntity.TableName} table in the database.`);
                 }
                 const isNewSchema = await this.isSchemaNew(pool, newEntity.SchemaName);
                 const newEntityID = this.createNewUUID();
@@ -1750,7 +1769,7 @@ NumberedRows AS (
                             apps = [newAppID];
                         }
                         else {
-                            (0, core_1.LogError)(`   >>>> ERROR: Unable to create new application for schema ${newEntity.SchemaName}`);
+                            (0, global_1.LogError)(`   >>>> ERROR: Unable to create new application for schema ${newEntity.SchemaName}`);
                         }
                         await md.Refresh(); // refresh now since we've added a new application, not super efficient to do this for each new application but that won't happen super
                         // often so not a huge deal, would be more efficient do this in batch after all new apps are created but that would be an over optimization IMO
@@ -1776,14 +1795,15 @@ NumberedRows AS (
                 }
                 else {
                     // this is an error condition, we should have an application for this schema, if we don't, log an error, non fatal, but should be logged
-                    (0, core_1.LogError)(`   >>>> ERROR: Unable to add new entity ${newEntityName} to an application because an Application record for schema ${newEntity.SchemaName} does not exist.`);
+                    (0, global_1.LogError)(`   >>>> ERROR: Unable to add new entity ${newEntityName} to an application because an Application record for schema ${newEntity.SchemaName} does not exist.`);
                 }
                 // next up, we need to check if we're configured to add permissions for new entities, and if so, add them
-                if (config_1.configInfo.newEntityDefaults.PermissionDefaults && config_1.configInfo.newEntityDefaults.PermissionDefaults.AutoAddPermissionsForNewEntities) {
+                if (config_1.configInfo.newEntityDefaults.PermissionDefaults &&
+                    config_1.configInfo.newEntityDefaults.PermissionDefaults.AutoAddPermissionsForNewEntities) {
                     // we are asked to add permissions for new entities, so do that by looping through the permissions and adding them
                     const permissions = config_1.configInfo.newEntityDefaults.PermissionDefaults.Permissions;
                     for (const p of permissions) {
-                        const RoleID = md.Roles.find(r => r.Name.trim().toLowerCase() === p.RoleName.trim().toLowerCase())?.ID;
+                        const RoleID = md.Roles.find((r) => r.Name.trim().toLowerCase() === p.RoleName.trim().toLowerCase())?.ID;
                         if (RoleID) {
                             const sSQLInsertPermission = `INSERT INTO ${(0, config_1.mj_core_schema)()}.EntityPermission
                                                    (EntityID, RoleID, CanRead, CanCreate, CanUpdate, CanDelete) VALUES
@@ -1791,18 +1811,18 @@ NumberedRows AS (
                             await this.LogSQLAndExecute(pool, sSQLInsertPermission, `SQL generated to add new permission for entity ${newEntityName} for role ${p.RoleName}`);
                         }
                         else
-                            (0, core_1.LogError)(`   >>>> ERROR: Unable to find Role ID for role ${p.RoleName} to add permissions for new entity ${newEntityName}`);
+                            (0, global_1.LogError)(`   >>>> ERROR: Unable to find Role ID for role ${p.RoleName} to add permissions for new entity ${newEntityName}`);
                     }
                 }
-                (0, core_1.LogStatus)(`   Created new entity ${newEntityName} for table ${newEntity.SchemaName}.${newEntity.TableName}`);
+                (0, global_1.LogStatus)(`   Created new entity ${newEntityName} for table ${newEntity.SchemaName}.${newEntity.TableName}`);
             }
             else {
-                (0, core_1.LogStatus)(`   Skipping new entity ${newEntity.TableName} because it doesn't qualify to be created. Reason: ${validationMessage}`);
+                (0, global_1.LogStatus)(`   Skipping new entity ${newEntity.TableName} because it doesn't qualify to be created. Reason: ${validationMessage}`);
                 return;
             }
         }
         catch (e) {
-            (0, core_1.LogError)(`Failed to create new entity ${newEntity?.TableName}`);
+            (0, global_1.LogError)(`Failed to create new entity ${newEntity?.TableName}`);
         }
     }
     async isSchemaNew(pool, schemaName) {
@@ -1814,12 +1834,20 @@ NumberedRows AS (
     }
     async createNewApplication(pool, appID, appName, schemaName) {
         try {
-            const sSQL = "INSERT INTO [" + (0, config_1.mj_core_schema)() + "].Application (ID, Name, Description, SchemaAutoAddNewEntities) VALUES ('" + appID + "', '" + appName + "', 'Generated for schema', '" + schemaName + "')";
+            const sSQL = 'INSERT INTO [' +
+                (0, config_1.mj_core_schema)() +
+                "].Application (ID, Name, Description, SchemaAutoAddNewEntities) VALUES ('" +
+                appID +
+                "', '" +
+                appName +
+                "', 'Generated for schema', '" +
+                schemaName +
+                "')";
             await this.LogSQLAndExecute(pool, sSQL, `SQL generated to create new application ${appName}`);
             return appID; // if we get here, we successfully created the application, so return the ID
         }
         catch (e) {
-            (0, core_1.LogError)(`Failed to create new application ${appName} for schema ${schemaName}`, null, e);
+            (0, global_1.LogError)(`Failed to create new application ${appName} for schema ${schemaName}`, null, e);
             return null; // if we get here, we failed to create the application
         }
     }
@@ -1841,7 +1869,7 @@ NumberedRows AS (
         else {
             const apps = result.filter((a) => {
                 if (a.SchemaAutoAddNewEntities && a.SchemaAutoAddNewEntities.length > 0) {
-                    const schemas = a.SchemaAutoAddNewEntities.split(",");
+                    const schemas = a.SchemaAutoAddNewEntities.split(',');
                     if (schemas && schemas.length > 0) {
                         return schemas.find((s) => s.trim().toLowerCase() === schemaName.trim().toLowerCase());
                     }
@@ -1881,7 +1909,7 @@ NumberedRows AS (
          ${newEntityDescriptionEscaped ? newEntityDescriptionEscaped : 'NULL' /*if no description, then null*/},
          ${newEntitySuffix && newEntitySuffix.length > 0 ? `'${newEntitySuffix}'` : 'NULL'},
          '${newEntity.TableName}',
-         'vw${(0, global_1.generatePluralName)(newEntity.TableName, { capitalizeFirstLetterOnly: true }) + (newEntitySuffix && newEntitySuffix.length > 0 ? newEntitySuffix : '')}',
+         'vw${(0, global_2.generatePluralName)(newEntity.TableName, { capitalizeFirstLetterOnly: true }) + (newEntitySuffix && newEntitySuffix.length > 0 ? newEntitySuffix : '')}',
          '${newEntity.SchemaName}',
          1,
          ${newEntityDefaults.AllowUserSearchAPI === undefined ? 1 : newEntityDefaults.AllowUserSearchAPI ? 1 : 0}
@@ -1892,7 +1920,7 @@ NumberedRows AS (
          ${newEntityDefaults.AllowCreateAPI === undefined ? '' : ', ' + (newEntityDefaults.AllowCreateAPI ? '1' : '0')}
          ${newEntityDefaults.AllowUpdateAPI === undefined ? '' : ', ' + (newEntityDefaults.AllowUpdateAPI ? '1' : '0')}
          ${newEntityDefaults.AllowDeleteAPI === undefined ? '' : ', ' + (newEntityDefaults.AllowDeleteAPI ? '1' : '0')}
-         ${newEntityDefaults.UserViewMaxRows === undefined ? '' : ', ' + (newEntityDefaults.UserViewMaxRows)}
+         ${newEntityDefaults.UserViewMaxRows === undefined ? '' : ', ' + newEntityDefaults.UserViewMaxRows}
       )
    `;
         return sSQLInsert;