@memberjunction/codegen-lib 1.0.6 → 1.0.7-next.0

package/dist/graphql_server_codegen.js

@@ -1,575 +1,596 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEntitySpecificServerFileHeader = exports.generateAllEntitiesServerFileHeader = exports.generateServerEntityString = exports.generateGraphQLServerCode = void 0;
+exports.GraphQLServerGeneratorBase = void 0;
 const core_1 = require("@memberjunction/core");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const logging_1 = require("./logging");
 const config_1 = require("./config");
 const util_1 = require("./util");
-function generateGraphQLServerCode(entities, outputDirectory, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema) {
-    let sRet = '';
-    try {
-        sRet = generateAllEntitiesServerFileHeader(entities, generatedEntitiesImportLibrary);
-        for (let i = 0; i < entities.length; ++i) {
-            sRet += generateServerEntityString(entities[i], false, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema);
+const global_1 = require("@memberjunction/global");
+/**
+ * This class is responsible for generating the GraphQL Server resolvers and types for the entities, you can sub-class this class to extend/modify the logic, make sure to use @memberjunction/global RegisterClass decorator
+ * so that your class is used.
+ */
+let GraphQLServerGeneratorBase = class GraphQLServerGeneratorBase {
+    constructor() {
+        this._graphQLTypeSuffix = '_';
+    }
+    generateGraphQLServerCode(entities, outputDirectory, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema) {
+        let sRet = '';
+        try {
+            sRet = this.generateAllEntitiesServerFileHeader(entities, generatedEntitiesImportLibrary);
+            for (let i = 0; i < entities.length; ++i) {
+                sRet += this.generateServerEntityString(entities[i], false, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema);
+            }
+            (0, util_1.makeDir)(outputDirectory);
+            fs_1.default.writeFileSync(path_1.default.join(outputDirectory, 'generated.ts'), sRet);
+            return true;
+        }
+        catch (err) {
+            (0, logging_1.logError)(err);
+            return false;
         }
-        (0, util_1.makeDir)(outputDirectory);
-        fs_1.default.writeFileSync(path_1.default.join(outputDirectory, 'generated.ts'), sRet);
-        return true;
     }
-    catch (err) {
-        (0, logging_1.logError)(err);
-        return false;
+    /**
+     * The suffix to append to the GraphQL Type name, default is an underscore, override this property in your sub-class to change the suffix
+     */
+    get GraphQLTypeSuffix() {
+        return this._graphQLTypeSuffix;
     }
-}
-exports.generateGraphQLServerCode = generateGraphQLServerCode;
-const _graphQLTypeSuffix = '_';
-function generateServerEntityString(entity, includeFileHeader, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema) {
-    let sEntityOutput = '';
-    try {
-        const md = new core_1.Metadata();
-        const fields = entity.Fields;
-        const serverGraphQLTypeName = entity.ClassName + _graphQLTypeSuffix;
-        if (includeFileHeader)
-            sEntityOutput = generateEntitySpecificServerFileHeader(entity, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema);
-        sEntityOutput += generateServerEntityHeader(entity, serverGraphQLTypeName);
-        // now generate the fields by looping through the fields collection from the database
-        for (let j = 0; j < fields.length; ++j) {
-            sEntityOutput += generateServerField(fields[j]);
-        }
-        for (let j = 0; j < entity.RelatedEntities.length; ++j) {
-            const r = entity.RelatedEntities[j];
-            const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
-            // only include the relationship if we are IncludeInAPI for the related entity
-            if (re.IncludeInAPI) {
-                if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
-                    // only include the relationship if either we are NOT excluding related entities external to the schema
-                    // or if the related entity is in the same schema as the current entity
-                    sEntityOutput += generateServerRelationship(md, entity.RelatedEntities[j]);
+    generateServerEntityString(entity, includeFileHeader, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema) {
+        let sEntityOutput = '';
+        try {
+            const md = new core_1.Metadata();
+            const fields = entity.Fields;
+            const serverGraphQLTypeName = entity.ClassName + this.GraphQLTypeSuffix;
+            if (includeFileHeader)
+                sEntityOutput = this.generateEntitySpecificServerFileHeader(entity, generatedEntitiesImportLibrary, excludeRelatedEntitiesExternalToSchema);
+            sEntityOutput += this.generateServerEntityHeader(entity, serverGraphQLTypeName);
+            // now generate the fields by looping through the fields collection from the database
+            for (let j = 0; j < fields.length; ++j) {
+                sEntityOutput += this.generateServerField(fields[j]);
+            }
+            for (let j = 0; j < entity.RelatedEntities.length; ++j) {
+                const r = entity.RelatedEntities[j];
+                const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
+                // only include the relationship if we are IncludeInAPI for the related entity
+                if (re.IncludeInAPI) {
+                    if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
+                        // only include the relationship if either we are NOT excluding related entities external to the schema
+                        // or if the related entity is in the same schema as the current entity
+                        sEntityOutput += this.generateServerRelationship(md, entity.RelatedEntities[j]);
+                    }
+                }
+                else {
+                    sEntityOutput += `// Relationship to ${r.RelatedEntity} is not included in the API because it is not marked as IncludeInAPI\n`;
                 }
             }
-            else {
-                sEntityOutput += `// Relationship to ${r.RelatedEntity} is not included in the API because it is not marked as IncludeInAPI\n`;
+            // finally, close it up with the footer
+            sEntityOutput += this.generateServerEntityFooter(entity);
+            sEntityOutput += this.generateServerGraphQLResolver(entity, serverGraphQLTypeName, excludeRelatedEntitiesExternalToSchema);
+        }
+        catch (err) {
+            (0, logging_1.logError)(err);
+        }
+        finally {
+            return sEntityOutput;
+        }
+    }
+    generateAllEntitiesServerFileHeader(entities, importLibrary) {
+        let sRet = `/********************************************************************************
+* ALL ENTITIES - TypeGraphQL Type Class Definition - AUTO GENERATED FILE
+* Generated Entities and Resolvers for Server
+* 
+* GENERATED: ${new Date().toLocaleString()}
+* 
+*   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
+*   >>> YOUR CHANGES WILL BE OVERWRITTEN
+*   >>> THE NEXT TIME THIS FILE IS GENERATED
+* 
+**********************************************************************************/
+import { Arg, Ctx, Int, Query, Resolver, Field, Float, ObjectType, FieldResolver, Root, InputType, Mutation, 
+            PubSub, PubSubEngine, ResolverBase, RunViewByIDInput, RunViewByNameInput, RunDynamicViewInput } from '@memberjunction/server';
+import { Metadata, EntityPermissionType } from '@memberjunction/core'
+import { AppContext } from '@memberjunction/server';
+
+import { MaxLength } from 'class-validator';
+import { DataSource } from 'typeorm';
+${importLibrary.trim().toLowerCase() === '@memberjunction/core-entities' ? `import { mj_core_schema } from '../config';\n` : ''}
+import * as mj_core_schema_server_object_types from '@memberjunction/server'
+
+import { ${entities.map(e => `${e.ClassName}Entity`).join(', ')} } from '${importLibrary}';
+    `;
+        return sRet;
+    }
+    generateEntitySpecificServerFileHeader(entity, importLibrary, excludeRelatedEntitiesExternalToSchema) {
+        const md = new core_1.Metadata();
+        let sRet = `/********************************************************************************
+* ${entity.Name} TypeORM/TypeGraphQL Type Class Definition - AUTO GENERATED FILE
+* 
+* GENERATED: ${new Date().toLocaleString()}
+* 
+*   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
+*   >>> YOUR CHANGES WILL BE OVERWRITTEN
+*   >>> THE NEXT TIME THIS FILE IS GENERATED
+* 
+**********************************************************************************/
+import { MaxLength } from 'class-validator';
+import { Field, ${entity._floatCount > 0 ? 'Float, ' : ''}Int, ObjectType } from '@memberjunction/server';
+import { ${`${entity.ClassName}Entity`} } from '${importLibrary}';
+    `;
+        for (let i = 0; i < entity.RelatedEntities.length; ++i) {
+            const r = entity.RelatedEntities[i];
+            const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
+            if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
+                // we only include entities that are in the same schema as the current entity
+                // OR if we are not excluding related entities external to the schema
+                const tableName = entity.RelatedEntities[i].RelatedEntityBaseTableCodeName;
+                sRet += `\nimport ${tableName} from './${tableName}';`;
             }
         }
-        // finally, close it up with the footer
-        sEntityOutput += generateServerEntityFooter(entity);
-        sEntityOutput += generateServerGraphQLResolver(entity, serverGraphQLTypeName, excludeRelatedEntitiesExternalToSchema);
+        return sRet;
     }
-    catch (err) {
-        (0, logging_1.logError)(err);
+    generateServerEntityHeader(entity, serverGraphQLTypeName) {
+        let sDescription = entity.Description?.trim().length > 0 ? entity.Description : '';
+        if (sDescription.includes("'"))
+            sDescription = sDescription.replace(/'/g, "\\'");
+        return `
+
+//****************************************************************************
+// ENTITY CLASS for ${entity.Name}
+//****************************************************************************
+@ObjectType(${sDescription.length > 0 ? `{ description: '${sDescription}' }` : ''})
+export class ${serverGraphQLTypeName} {`;
     }
-    finally {
-        return sEntityOutput;
+    generateServerEntityFooter(entity) {
+        if (!entity)
+            (0, logging_1.logError)("entity parameter must be passed in to generateServerEntityFooter()");
+        return `\n}`;
     }
-}
-exports.generateServerEntityString = generateServerEntityString;
-function generateAllEntitiesServerFileHeader(entities, importLibrary) {
-    let sRet = `/********************************************************************************
-* ALL ENTITIES - TypeGraphQL Type Class Definition - AUTO GENERATED FILE
-* Generated Entities and Resolvers for Server
-* 
-* GENERATED: ${new Date().toLocaleString()}
-* 
-*   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
-*   >>> YOUR CHANGES WILL BE OVERWRITTEN
-*   >>> THE NEXT TIME THIS FILE IS GENERATED
-* 
-**********************************************************************************/
-import { Arg, Ctx, Int, Query, Resolver, Field, Float, ObjectType, FieldResolver, Root, InputType, Mutation, 
-         PubSub, PubSubEngine, ResolverBase, RunViewByIDInput, RunViewByNameInput, RunDynamicViewInput } from '@memberjunction/server';
-import { Metadata, EntityPermissionType } from '@memberjunction/core'
-import { AppContext } from '@memberjunction/server';
-
-import { MaxLength } from 'class-validator';
-import { DataSource } from 'typeorm';
-${importLibrary.trim().toLowerCase() === '@memberjunction/core-entities' ? `import { mj_core_schema } from '../config';\n` : ''}
-import * as mj_core_schema_server_object_types from '@memberjunction/server'
-
-import { ${entities.map(e => `${e.ClassName}Entity`).join(', ')} } from '${importLibrary}';
-`;
-    return sRet;
-}
-exports.generateAllEntitiesServerFileHeader = generateAllEntitiesServerFileHeader;
-function generateEntitySpecificServerFileHeader(entity, importLibrary, excludeRelatedEntitiesExternalToSchema) {
-    const md = new core_1.Metadata();
-    let sRet = `/********************************************************************************
-* ${entity.Name} TypeORM/TypeGraphQL Type Class Definition - AUTO GENERATED FILE
-* 
-* GENERATED: ${new Date().toLocaleString()}
-* 
-*   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
-*   >>> YOUR CHANGES WILL BE OVERWRITTEN
-*   >>> THE NEXT TIME THIS FILE IS GENERATED
-* 
-**********************************************************************************/
-import { MaxLength } from 'class-validator';
-import { Field, ${entity._floatCount > 0 ? 'Float, ' : ''}Int, ObjectType } from '@memberjunction/server';
-import { ${`${entity.ClassName}Entity`} } from '${importLibrary}';
-`;
-    for (let i = 0; i < entity.RelatedEntities.length; ++i) {
-        const r = entity.RelatedEntities[i];
-        const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
-        if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
-            // we only include entities that are in the same schema as the current entity
-            // OR if we are not excluding related entities external to the schema
-            const tableName = entity.RelatedEntities[i].RelatedEntityBaseTableCodeName;
-            sRet += `\nimport ${tableName} from './${tableName}';`;
+    generateServerField(fieldInfo) {
+        const fieldString = this.getTypeGraphQLFieldString(fieldInfo);
+        let fieldOptions = '';
+        if (fieldInfo.AllowsNull)
+            fieldOptions += 'nullable: true';
+        if (fieldInfo.Description !== null && fieldInfo.Description.trim().length > 0)
+            fieldOptions += (fieldOptions.length > 0 ? ', ' : '') + `description: '${fieldInfo.Description.replace(/'/g, "\\'")}'`;
+        return `  
+    @Field(${fieldString}${fieldOptions.length > 0 ? (fieldString == '' ? '' : ', ') + `{${fieldOptions}}` : ''}) ${fieldInfo.Length > 0 && fieldString == '' /*string*/ ? '\n    @MaxLength(' + fieldInfo.Length + ')' : ''}
+    ${fieldInfo.CodeName}${fieldInfo.AllowsNull ? '?' : ''}: ${(0, core_1.TypeScriptTypeFromSQLType)(fieldInfo.Type)};
+        `;
+    }
+    getTypeGraphQLFieldString(fieldInfo) {
+        switch (fieldInfo.Type.toLowerCase()) {
+            case 'text':
+            case 'char':
+            case 'varchar':
+            case 'ntext':
+            case 'nchar':
+            case 'nvarchar':
+            case 'uniqueidentifier': //treat this as a string
+                return '';
+            case 'datetime':
+            case 'datetimeoffset':
+            case 'date':
+            case 'time':
+                return '';
+            case 'bit':
+                return "() => Boolean";
+            case 'decimal':
+            case 'numeric':
+            case 'float':
+            case 'real':
+            case 'money':
+            case 'smallmoney':
+                fieldInfo.IsFloat = true; // used by calling functions to determine if we need to import Float
+                return '() => Float';
+            default:
+                return '() => Int';
         }
     }
-    return sRet;
-}
-exports.generateEntitySpecificServerFileHeader = generateEntitySpecificServerFileHeader;
-function generateServerEntityHeader(entity, serverGraphQLTypeName) {
-    let sDescription = entity.Description?.trim().length > 0 ? entity.Description : '';
-    if (sDescription.includes("'"))
-        sDescription = sDescription.replace(/'/g, "\\'");
-    return `
-
-//****************************************************************************
-// ENTITY CLASS for ${entity.Name}
-//****************************************************************************
-@ObjectType(${sDescription.length > 0 ? `{ description: '${sDescription}' }` : ''})
-export class ${serverGraphQLTypeName} {`;
-}
-function generateServerEntityFooter(entity) {
-    if (!entity)
-        (0, logging_1.logError)("entity parameter must be passed in to generateServerEntityFooter()");
-    return `\n}`;
-}
-function generateServerField(fieldInfo) {
-    const fieldString = getTypeGraphQLFieldString(fieldInfo);
-    let fieldOptions = '';
-    if (fieldInfo.AllowsNull)
-        fieldOptions += 'nullable: true';
-    if (fieldInfo.Description !== null && fieldInfo.Description.trim().length > 0)
-        fieldOptions += (fieldOptions.length > 0 ? ', ' : '') + `description: '${fieldInfo.Description.replace(/'/g, "\\'")}'`;
-    return `  
-    @Field(${fieldString}${fieldOptions.length > 0 ? (fieldString == '' ? '' : ', ') + `{${fieldOptions}}` : ''}) ${fieldInfo.Length > 0 && fieldString == '' /*string*/ ? '\n    @MaxLength(' + fieldInfo.Length + ')' : ''}
-    ${fieldInfo.CodeName}${fieldInfo.AllowsNull ? '?' : ''}: ${(0, core_1.TypeScriptTypeFromSQLType)(fieldInfo.Type)};
+    generateServerRelationship(md, r) {
+        const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
+        const classPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
+        const relatedClassName = classPackagePrefix + r.RelatedEntityBaseTableCodeName;
+        if (r.Type.toLowerCase().trim() == 'one to many') {
+            return `
+    @Field(() => [${relatedClassName + this.GraphQLTypeSuffix}])
+    ${r.RelatedEntityCodeName}Array: ${relatedClassName + this.GraphQLTypeSuffix}[]; // Link to ${r.RelatedEntityCodeName}
     `;
-}
-function getTypeGraphQLFieldString(fieldInfo) {
-    switch (fieldInfo.Type.toLowerCase()) {
-        case 'text':
-        case 'char':
-        case 'varchar':
-        case 'ntext':
-        case 'nchar':
-        case 'nvarchar':
-        case 'uniqueidentifier': //treat this as a string
-            return '';
-        case 'datetime':
-        case 'datetimeoffset':
-        case 'date':
-        case 'time':
-            return '';
-        case 'bit':
-            return "() => Boolean";
-        case 'decimal':
-        case 'numeric':
-        case 'float':
-        case 'real':
-        case 'money':
-        case 'smallmoney':
-            fieldInfo.IsFloat = true; // used by calling functions to determine if we need to import Float
-            return '() => Float';
-        default:
-            return '() => Int';
+        }
+        else { // many to many
+            return `
+    @Field(() => [${relatedClassName + this.GraphQLTypeSuffix}])
+    ${r.RelatedEntityCodeName}Array: ${relatedClassName + this.GraphQLTypeSuffix}[]; // Link to ${r.RelatedEntity}
+    `;
+        }
     }
+    generateServerGraphQLResolver(entity, serverGraphQLTypeName, excludeRelatedEntitiesExternalToSchema) {
+        const md = new core_1.Metadata();
+        let sRet = '';
+        // we only generate resolvers for entities that have a primary key field
+        if (entity.PrimaryKeys.length > 0) {
+            // first add in the base resolver query to lookup by ID for all entities
+            const auditAccessCode = entity.AuditRecordAccess ? `
+        this.createRecordAccessAuditLogRecord(userPayload, '${entity.Name}', ${entity.PrimaryKey.Name})` : '';
+            sRet = `
+//****************************************************************************
+// RESOLVER for ${entity.Name}
+//****************************************************************************
+@ObjectType()
+export class Run${entity.BaseTableCodeName}ViewResult {
+    @Field(() => [${serverGraphQLTypeName}])
+    Results: ${serverGraphQLTypeName}[];
+
+    @Field(() => Int, {nullable: true})
+    UserViewRunID?: number;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
 }
-function generateServerRelationship(md, r) {
-    const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
-    const classPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
-    const relatedClassName = classPackagePrefix + r.RelatedEntityBaseTableCodeName;
-    if (r.Type.toLowerCase().trim() == 'one to many') {
-        return `
-    @Field(() => [${relatedClassName + _graphQLTypeSuffix}])
-    ${r.RelatedEntityCodeName}Array: ${relatedClassName + _graphQLTypeSuffix}[]; // Link to ${r.RelatedEntityCodeName}
-`;
-    }
-    else { // many to many
-        return `
-    @Field(() => [${relatedClassName + _graphQLTypeSuffix}])
-    ${r.RelatedEntityCodeName}Array: ${relatedClassName + _graphQLTypeSuffix}[]; // Link to ${r.RelatedEntity}
-`;
+
+@Resolver(${serverGraphQLTypeName})
+export class ${entity.BaseTableCodeName}Resolver${entity.CustomResolverAPI ? 'Base' : ''} extends ResolverBase {
+    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
+    async Run${entity.BaseTableCodeName}ViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        return super.RunViewByIDGeneric(input, dataSource, userPayload, pubSub);
     }
-}
-function generateServerGraphQLResolver(entity, serverGraphQLTypeName, excludeRelatedEntitiesExternalToSchema) {
-    const md = new core_1.Metadata();
-    let sRet = '';
-    // we only generate resolvers for entities that have a primary key field
-    if (entity.PrimaryKeys.length > 0) {
-        // first add in the base resolver query to lookup by ID for all entities
-        const auditAccessCode = entity.AuditRecordAccess ? `
-        this.createRecordAccessAuditLogRecord(userPayload, '${entity.Name}', ${entity.PrimaryKey.Name})` : '';
-        sRet = `
-//****************************************************************************
-// RESOLVER for ${entity.Name}
-//****************************************************************************
-@ObjectType()
-export class Run${entity.BaseTableCodeName}ViewResult {
-    @Field(() => [${serverGraphQLTypeName}])
-    Results: ${serverGraphQLTypeName}[];
-
-    @Field(() => Int, {nullable: true})
-    UserViewRunID?: number;
-
-    @Field(() => Int, {nullable: true})
-    RowCount: number;
-
-    @Field(() => Int, {nullable: true})
-    TotalRowCount: number;
-
-    @Field(() => Int, {nullable: true})
-    ExecutionTime: number;
-
-    @Field({nullable: true})
-    ErrorMessage?: string;
-
-    @Field(() => Boolean, {nullable: false})
-    Success: boolean;
-}
-
-@Resolver(${serverGraphQLTypeName})
-export class ${entity.BaseTableCodeName}Resolver${entity.CustomResolverAPI ? 'Base' : ''} extends ResolverBase {
-    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
-    async Run${entity.BaseTableCodeName}ViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        return super.RunViewByIDGeneric(input, dataSource, userPayload, pubSub);
-    }
-
-    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
-    async Run${entity.BaseTableCodeName}ViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        return super.RunViewByNameGeneric(input, dataSource, userPayload, pubSub);
-    }
-
-    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
-    async Run${entity.BaseTableCodeName}DynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        input.EntityName = '${entity.Name}';
-        return super.RunDynamicViewGeneric(input, dataSource, userPayload, pubSub);
+
+    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
+    async Run${entity.BaseTableCodeName}ViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        return super.RunViewByNameGeneric(input, dataSource, userPayload, pubSub);
+    }
+
+    @Query(() => Run${entity.BaseTableCodeName}ViewResult)
+    async Run${entity.BaseTableCodeName}DynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        input.EntityName = '${entity.Name}';
+        return super.RunDynamicViewGeneric(input, dataSource, userPayload, pubSub);
     }`;
-        let graphQLPKEYArgs = '';
-        let whereClause = '';
-        for (let i = 0; i < entity.PrimaryKeys.length; i++) {
-            const pk = entity.PrimaryKeys[i];
-            const idQuotes = pk.NeedsQuotes ? "'" : '';
-            graphQLPKEYArgs += (graphQLPKEYArgs.length > 0 ? ', ' : '');
-            graphQLPKEYArgs += `@Arg('${pk.CodeName}', () => ${pk.GraphQLType}) `;
-            graphQLPKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
-            whereClause += (whereClause.length > 0 ? ' AND ' : '');
-            whereClause += `[${pk.CodeName}]=${idQuotes}\${${pk.CodeName}}${idQuotes}`;
-        }
-        sRet += `
-    @Query(() => ${serverGraphQLTypeName}, { nullable: true })
-    async ${entity.BaseTableCodeName}(${graphQLPKEYArgs}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<${serverGraphQLTypeName} | null> {
-        this.CheckUserReadPermissions('${entity.Name}', userPayload);
-        const sSQL = \`SELECT * FROM [${schemaName(entity)}].[${entity.BaseView}] WHERE ${whereClause} \` + this.getRowLevelSecurityWhereClause('${entity.Name}', userPayload, EntityPermissionType.Read, 'AND');${auditAccessCode}
-        const result = this.MapFieldNamesToCodeNames('${entity.Name}', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}))
-        return result;
-    }
-`;
-        if (entity.AllowAllRowsAPI) {
-            // this entity allows a query to return all rows, so include that type of query next
-            sRet += `
-    @Query(() => [${serverGraphQLTypeName}])
-    async All${entity.CodeName}(@Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('${entity.Name}', userPayload);
-        const sSQL = \`SELECT * FROM [${schemaName(entity)}].[${entity.BaseView}]\` + this.getRowLevelSecurityWhereClause('${entity.Name}', userPayload, EntityPermissionType.Read, ' WHERE');
-        const result = this.ArrayMapFieldNamesToCodeNames('${entity.Name}', await dataSource.query(sSQL));
-        return result;
-    }
-`;
-        }
-        // now, generate the FieldResolvers for each of the one-to-many relationships
-        for (let i = 0; i < entity.RelatedEntities.length; i++) {
-            const r = entity.RelatedEntities[i];
-            const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
-            // only include the relationship if we are IncludeInAPI for the related entity
-            if (re.IncludeInAPI) {
-                if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
-                    // only include the relationship if either we are NOT excluding related entities external to the schema
-                    // or if the related entity is in the same schema as the current entity
-                    if (r.Type.toLowerCase().trim() == 'many to many')
-                        sRet += generateManyToManyFieldResolver(entity, r);
-                    else
-                        sRet += generateOneToManyFieldResolver(entity, r);
+            let graphQLPKEYArgs = '';
+            let whereClause = '';
+            for (let i = 0; i < entity.PrimaryKeys.length; i++) {
+                const pk = entity.PrimaryKeys[i];
+                const idQuotes = pk.NeedsQuotes ? "'" : '';
+                graphQLPKEYArgs += (graphQLPKEYArgs.length > 0 ? ', ' : '');
+                graphQLPKEYArgs += `@Arg('${pk.CodeName}', () => ${pk.GraphQLType}) `;
+                graphQLPKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
+                whereClause += (whereClause.length > 0 ? ' AND ' : '');
+                whereClause += `[${pk.CodeName}]=${idQuotes}\${${pk.CodeName}}${idQuotes}`;
+            }
+            sRet += `
+    @Query(() => ${serverGraphQLTypeName}, { nullable: true })
+    async ${entity.BaseTableCodeName}(${graphQLPKEYArgs}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<${serverGraphQLTypeName} | null> {
+        this.CheckUserReadPermissions('${entity.Name}', userPayload);
+        const sSQL = \`SELECT * FROM [${this.schemaName(entity)}].[${entity.BaseView}] WHERE ${whereClause} \` + this.getRowLevelSecurityWhereClause('${entity.Name}', userPayload, EntityPermissionType.Read, 'AND');${auditAccessCode}
+        const result = this.MapFieldNamesToCodeNames('${entity.Name}', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}))
+        return result;
+    }
+    `;
+            if (entity.AllowAllRowsAPI) {
+                // this entity allows a query to return all rows, so include that type of query next
+                sRet += `
+    @Query(() => [${serverGraphQLTypeName}])
+    async All${entity.CodeName}(@Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('${entity.Name}', userPayload);
+        const sSQL = \`SELECT * FROM [${this.schemaName(entity)}].[${entity.BaseView}]\` + this.getRowLevelSecurityWhereClause('${entity.Name}', userPayload, EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('${entity.Name}', await dataSource.query(sSQL));
+        return result;
+    }
+    `;
+            }
+            // now, generate the FieldResolvers for each of the one-to-many relationships
+            for (let i = 0; i < entity.RelatedEntities.length; i++) {
+                const r = entity.RelatedEntities[i];
+                const re = md.Entities.find(e => e.Name.toLowerCase() === r.RelatedEntity.toLowerCase());
+                // only include the relationship if we are IncludeInAPI for the related entity
+                if (re.IncludeInAPI) {
+                    if (!excludeRelatedEntitiesExternalToSchema || re.SchemaName === entity.SchemaName) {
+                        // only include the relationship if either we are NOT excluding related entities external to the schema
+                        // or if the related entity is in the same schema as the current entity
+                        if (r.Type.toLowerCase().trim() == 'many to many')
+                            sRet += this.generateManyToManyFieldResolver(entity, r);
+                        else
+                            sRet += this.generateOneToManyFieldResolver(entity, r);
+                    }
+                }
+                else {
+                    sRet += `// Relationship to ${r.RelatedEntity} is not included in the API because it is not marked as IncludeInAPI\n`;
                 }
             }
-            else {
-                sRet += `// Relationship to ${r.RelatedEntity} is not included in the API because it is not marked as IncludeInAPI\n`;
+            // now do the mutations
+            const sInputType = this.generateServerGraphQLInputType(entity);
+            if (sInputType !== '') {
+                // only generate mutations if we have input type, because otherwsie we don't need em
+                sRet += this.generateServerGraphQLMutations(entity, serverGraphQLTypeName);
+            }
+            sRet += `\n}`;
+            if (sInputType !== '') {
+                sRet = sInputType + sRet; // put the input type before the resolver as the decorators have to be evaluated ahead of their use in the resolver
             }
         }
-        // now do the mutations
-        const sInputType = generateServerGraphQLInputType(entity);
-        if (sInputType !== '') {
-            // only generate mutations if we have input type, because otherwsie we don't need em
-            sRet += generateServerGraphQLMutations(entity, serverGraphQLTypeName);
-        }
-        sRet += `\n}`;
-        if (sInputType !== '') {
-            sRet = sInputType + sRet; // put the input type before the resolver as the decorators have to be evaluated ahead of their use in the resolver
+        return sRet;
+    }
+    schemaName(entity) {
+        if (entity.SchemaName === config_1.mjCoreSchema) {
+            return '${Metadata.Provider.ConfigData.MJCoreSchemaName}';
         }
+        else
+            return entity.SchemaName; // put the actual schema name in
     }
-    return sRet;
-}
-function schemaName(entity) {
-    if (entity.SchemaName === config_1.mjCoreSchema) {
-        return '${Metadata.Provider.ConfigData.MJCoreSchemaName}';
+    generateServerGraphQLInputType(entity) {
+        let sRet = '';
+        if (entity.AllowCreateAPI)
+            sRet += this.generateServerGraphQLInputTypeInner(entity, false, 'Create');
+        if (entity.AllowUpdateAPI)
+            sRet += this.generateServerGraphQLInputTypeInner(entity, true, 'Update');
+        return sRet;
     }
-    else
-        return entity.SchemaName; // put the actual schema name in
-}
-function generateServerGraphQLInputType(entity) {
-    let sRet = '';
-    if (entity.AllowCreateAPI)
-        sRet += generateServerGraphQLInputTypeInner(entity, false, 'Create');
-    if (entity.AllowUpdateAPI)
-        sRet += generateServerGraphQLInputTypeInner(entity, true, 'Update');
-    return sRet;
-}
-function generateServerGraphQLInputTypeInner(entity, isUpdate, classPrefix) {
-    let sRet = '';
-    sRet += `\n        
-//****************************************************************************
-// INPUT TYPE for ${entity.Name}   
-//****************************************************************************
-@InputType()
+    generateServerGraphQLInputTypeInner(entity, isUpdate, classPrefix) {
+        let sRet = '';
+        sRet += `\n        
+//****************************************************************************
+// INPUT TYPE for ${entity.Name}   
+//****************************************************************************
+@InputType()
 export class ${classPrefix}${entity.BaseTableCodeName}Input {`;
-    for (let i = 0; i < entity.Fields.length; i++) {
-        const f = entity.Fields[i];
-        const sTypeGraphQLString = getTypeGraphQLFieldString(f);
-        const sNull = f.AllowsNull ? '{ nullable: true }' : '';
-        const sFullTypeGraphQLString = sTypeGraphQLString + (sNull === '' || sTypeGraphQLString === '' ? '' : ', ') + sNull;
-        // always include ID becuase it is used for UPDATES
-        const includePrimaryKey = isUpdate || (!f.AutoIncrement && f.Type !== 'uniqueidentifier'); // include primary key for updates and also for creates if it is not an autoincrement field or a uniqueidentifier
-        if ((includePrimaryKey && f.IsPrimaryKey) || (!f.IsPrimaryKey && !f.IsVirtual && f.AllowUpdateAPI && f.Type.trim().toLowerCase() !== 'uniqueidentifier')) {
-            sRet += `
-    @Field(${sFullTypeGraphQLString})
-    ${f.CodeName}: ${(0, core_1.TypeScriptTypeFromSQLType)(f.Type)};
-`;
+        for (let i = 0; i < entity.Fields.length; i++) {
+            const f = entity.Fields[i];
+            const sTypeGraphQLString = this.getTypeGraphQLFieldString(f);
+            const sNull = f.AllowsNull ? '{ nullable: true }' : '';
+            const sFullTypeGraphQLString = sTypeGraphQLString + (sNull === '' || sTypeGraphQLString === '' ? '' : ', ') + sNull;
+            // always include ID becuase it is used for UPDATES
+            const includePrimaryKey = isUpdate || (!f.AutoIncrement && f.Type !== 'uniqueidentifier'); // include primary key for updates and also for creates if it is not an autoincrement field or a uniqueidentifier
+            if ((includePrimaryKey && f.IsPrimaryKey) || (!f.IsPrimaryKey && !f.IsVirtual && f.AllowUpdateAPI && f.Type.trim().toLowerCase() !== 'uniqueidentifier')) {
+                sRet += `
+    @Field(${sFullTypeGraphQLString})
+    ${f.CodeName}: ${(0, core_1.TypeScriptTypeFromSQLType)(f.Type)};
+    `;
+            }
         }
-    }
-    sRet += `}
-`;
-    return sRet;
-}
-function generateServerGraphQLMutations(entity, serverGraphQLTypeName) {
-    let sRet = '';
-    // MUTATIONS
-    // First, determine if the entity has either Create/Edit allowed, if either, we need to generate a InputType
-    if (entity.AllowCreateAPI && !entity.VirtualEntity) {
-        // generate a create mutation
-        sRet += `
-    @Mutation(() => ${serverGraphQLTypeName})
-    async Create${entity.BaseTableCodeName}(
-        @Arg('input', () => Create${entity.BaseTableCodeName}Input) input: Create${entity.BaseTableCodeName}Input,
-        @Ctx() { dataSource, userPayload }: AppContext, 
-        @PubSub() pubSub: PubSubEngine
-    ) {
-        if (await this.BeforeCreate(dataSource, input)) { // fire event and proceed if it wasn't cancelled
-            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
-            await entityObject.NewRecord();
-            entityObject.SetMany(input);
-            if (await entityObject.Save()) {
-                // save worked, fire the AfterCreate event and then return all the data
-                await this.AfterCreate(dataSource, input); // fire event
-                return entityObject.GetAll();
-            }
-            else 
-                // save failed, return null
-                return null;
-        }
-        else    
-            return null;
-    }
-
-    // Before/After CREATE Event Hooks for Sub-Classes to Override
-    protected async BeforeCreate(dataSource: DataSource, input: Create${entity.BaseTableCodeName}Input): Promise<boolean> {
-        return true;
-    }
-    protected async AfterCreate(dataSource: DataSource, input: Create${entity.BaseTableCodeName}Input) {
-    }
+        sRet += `}
     `;
+        return sRet;
+    }
+    generateServerGraphQLMutations(entity, serverGraphQLTypeName) {
+        let sRet = '';
+        // MUTATIONS
+        // First, determine if the entity has either Create/Edit allowed, if either, we need to generate a InputType
+        if (entity.AllowCreateAPI && !entity.VirtualEntity) {
+            // generate a create mutation
+            sRet += `
+    @Mutation(() => ${serverGraphQLTypeName})
+    async Create${entity.BaseTableCodeName}(
+        @Arg('input', () => Create${entity.BaseTableCodeName}Input) input: Create${entity.BaseTableCodeName}Input,
+        @Ctx() { dataSource, userPayload }: AppContext, 
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        if (await this.BeforeCreate(dataSource, input)) { // fire event and proceed if it wasn't cancelled
+            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
+            await entityObject.NewRecord();
+            entityObject.SetMany(input);
+            if (await entityObject.Save()) {
+                // save worked, fire the AfterCreate event and then return all the data
+                await this.AfterCreate(dataSource, input); // fire event
+                return entityObject.GetAll();
+            }
+            else 
+                // save failed, return null
+                return null;
+        }
+        else    
+            return null;
+    }
+
+    // Before/After CREATE Event Hooks for Sub-Classes to Override
+    protected async BeforeCreate(dataSource: DataSource, input: Create${entity.BaseTableCodeName}Input): Promise<boolean> {
+        return true;
     }
-    if (entity.AllowUpdateAPI && !entity.VirtualEntity) {
-        // generate an edit mutation
-        const loadParamString = entity.PrimaryKeys.map(f => `input.${f.CodeName}`).join(', ');
-        sRet += `
-    @Mutation(() => ${serverGraphQLTypeName})
-    async Update${entity.BaseTableCodeName}(
-        @Arg('input', () => Update${entity.BaseTableCodeName}Input) input: Update${entity.BaseTableCodeName}Input,
-        @Ctx() { dataSource, userPayload }: AppContext,
-        @PubSub() pubSub: PubSubEngine
-    ) {
-        if (await this.BeforeUpdate(dataSource, input)) { // fire event and proceed if it wasn't cancelled
-            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
+    protected async AfterCreate(dataSource: DataSource, input: Create${entity.BaseTableCodeName}Input) {
+    }
+        `;
+        }
+        if (entity.AllowUpdateAPI && !entity.VirtualEntity) {
+            // generate an edit mutation
+            const loadParamString = entity.PrimaryKeys.map(f => `input.${f.CodeName}`).join(', ');
+            sRet += `
+    @Mutation(() => ${serverGraphQLTypeName})
+    async Update${entity.BaseTableCodeName}(
+        @Arg('input', () => Update${entity.BaseTableCodeName}Input) input: Update${entity.BaseTableCodeName}Input,
+        @Ctx() { dataSource, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        if (await this.BeforeUpdate(dataSource, input)) { // fire event and proceed if it wasn't cancelled
+            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
             ${entity.TrackRecordChanges ? `await entityObject.Load(${loadParamString}) // Track Changes is turned on, so we need to get the latest data from DB first before we save` :
-            `entityObject.LoadFromData(input) // using the input instead of loading from DB because TrackChanges is turned off for ${entity.Name}`}
-            ${entity.TrackRecordChanges ? 'entityObject.SetMany(input);' : ''}
-            if (await entityObject.Save(${entity.TrackRecordChanges ? '' : '{ IgnoreDirtyState: true /*flag used because of LoadFromData() call above*/ }'})) {
-                // save worked, fire afterevent and return all the data
-                await this.AfterUpdate(dataSource, input); // fire event
-                return entityObject.GetAll();
-            }
-            else
-                return null; // save failed, return null
-        }
-        else
-            return null;
-    }
-
-    // Before/After UPDATE Event Hooks for Sub-Classes to Override
-    protected async BeforeUpdate(dataSource: DataSource, input: Update${entity.BaseTableCodeName}Input): Promise<boolean> {
-        const i = input, d = dataSource; // prevent error
-        return true;
-    }
-    protected async AfterUpdate(dataSource: DataSource, input: Update${entity.BaseTableCodeName}Input) {
-        const i = input, d = dataSource; // prevent error
-    }
-`;
-    }
-    if (entity.AllowDeleteAPI && !entity.VirtualEntity) {
-        let graphQLPKEYArgs = '';
-        let simplePKEYArgs = '';
-        let pkeys = '';
-        let whereClause = '';
-        for (let i = 0; i < entity.PrimaryKeys.length; i++) {
-            const pk = entity.PrimaryKeys[i];
-            const idQuotes = pk.NeedsQuotes ? "'" : '';
-            graphQLPKEYArgs += (graphQLPKEYArgs.length > 0 ? ', ' : '');
-            graphQLPKEYArgs += `@Arg('${pk.CodeName}', () => ${pk.GraphQLType}) `;
-            graphQLPKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
-            simplePKEYArgs += (simplePKEYArgs.length > 0 ? ', ' : '');
-            simplePKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
-            pkeys += (pkeys.length > 0 ? ', ' : '');
-            pkeys += `${pk.CodeName}`;
-            whereClause += (whereClause.length > 0 ? ' AND ' : '');
-            whereClause += `[${pk.CodeName}]=${idQuotes}\${${pk.CodeName}}${idQuotes}`;
+                `entityObject.LoadFromData(input) // using the input instead of loading from DB because TrackChanges is turned off for ${entity.Name}`}
+            ${entity.TrackRecordChanges ? 'entityObject.SetMany(input);' : ''}
+            if (await entityObject.Save(${entity.TrackRecordChanges ? '' : '{ IgnoreDirtyState: true /*flag used because of LoadFromData() call above*/ }'})) {
+                // save worked, fire afterevent and return all the data
+                await this.AfterUpdate(dataSource, input); // fire event
+                return entityObject.GetAll();
+            }
+            else
+                return null; // save failed, return null
         }
-        sRet += `
-    @Mutation(() => ${serverGraphQLTypeName})
-    async Delete${entity.BaseTableCodeName}(${graphQLPKEYArgs}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        if (await this.BeforeDelete(dataSource, ${pkeys})) { // fire event and proceed if it wasn't cancelled
-            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
-            await entityObject.Load(${pkeys});
-            const returnValue = entityObject.GetAll(); // grab the values before we delete so we can return last state before delete if we are successful.
-            if (await entityObject.Delete()) {
-                await this.AfterDelete(dataSource, ${pkeys}); // fire event
-                return returnValue;
-            }
-            else 
-                return null; // delete failed, this will cause an exception
-        }
-        else
-            return null; // BeforeDelete canceled the operation, this will cause an exception
-    }
-
-    // Before/After UPDATE Event Hooks for Sub-Classes to Override
-    protected async BeforeDelete(dataSource: DataSource, ${simplePKEYArgs}): Promise<boolean> {
-        const i = ${entity.PrimaryKey.Name}, d = dataSource; // prevent error;
-        return true;
-    }
-    protected async AfterDelete(dataSource: DataSource, ${simplePKEYArgs}) {
-        const i = ${entity.PrimaryKey.Name}, d = dataSource; // prevent error
-    }
-`;
-    }
-    return sRet;
-}
-// function generateSPParams(entity: EntityInfo, isUpdate: boolean): string {
-//     let sRet: string = '',bFirst: boolean = true;
-//     for (let i = 0; i < entity.Fields.length; i++) {
-//         const f = entity.Fields[i];
-//         if (!f.IsVirtual) {
-//             switch (f.Name.toLowerCase()) {
-//                 case 'id':
-//                     if (isUpdate) {
-//                         sRet += generateSingleSPParam(f, bFirst);
-//                         bFirst = false;
-//                     }
-//                     break;
-//                 case 'createdat':
-//                 case 'updatedat':
-//                     // do nothing
-//                     break;
-//                 default:
-//                     if (f.Type.trim().toLowerCase() !== 'uniqueidentifier') {
-//                         // DO NOT INCLUDE UNIQUEIDENTIFIER FIELDS
-//                         // FOR CREATE/UPDATE, THEY ARE GENERATED BY THE DB
-//                         sRet += generateSingleSPParam(f, bFirst);
-//                         bFirst = false;
-//                     }
-//                     break;
-//             }    
-//         }
-//     }
-//     return sRet;
-// }
-// function generateSingleSPParam(f: EntityFieldInfo, isFirst: boolean): string {
-//     let sRet: string = '';
-//     let quotes: string = '';
-//     switch  ( TypeScriptTypeFromSQLType(f.Type).toLowerCase() ) {
-//         case 'string':
-//         case 'date':
-//             quotes = "'";
-//             break;
-//         default:
-//             break;
-//     }
-//     if (!isFirst) 
-//         sRet += ',\n                ';
-//     sRet += `@${f.Name}=\${this.packageSPParam(input.${f.Name},"${quotes}")}`
-//     return sRet;
-// }
-function generateOneToManyFieldResolver(entity, r) {
-    // let keyFieldTS: string = 'number';
-    // if (r.EntityKeyField) { 
-    //     const keyField = entity.Fields.find(f => f.Name.toLowerCase() == r.EntityKeyField.toLowerCase())
-    //     keyFieldTS = keyField ? TypeScriptTypeFromSQLType(keyField.Type)  : 'int';    
-    // }
-    const md = new core_1.Metadata();
-    const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
-    const instanceName = entity.BaseTableCodeName.toLowerCase() + _graphQLTypeSuffix;
-    const filterFieldName = !r.EntityKeyField ? entity.PrimaryKey.Name : r.EntityKeyField;
-    const filterField = entity.Fields.find(f => f.Name.toLowerCase() == filterFieldName.toLowerCase());
-    if (!filterField)
-        throw new Error(`Field ${filterFieldName} not found in entity ${entity.Name} - check the relationship ${r.ID} and the EntityKeyField property`);
-    const quotes = filterField.NeedsQuotes ? "'" : '';
-    const serverPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
-    const serverClassName = serverPackagePrefix + r.RelatedEntityBaseTableCodeName + _graphQLTypeSuffix;
-    return `  
-    @FieldResolver(() => [${serverClassName}])
-    async ${r.RelatedEntityCodeName}Array(@Root() ${instanceName}: ${entity.BaseTableCodeName + _graphQLTypeSuffix}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('${r.RelatedEntity}', userPayload);
-        const sSQL = \`SELECT * FROM [${schemaName(re)}].[${r.RelatedEntityBaseView}]\ WHERE [${r.RelatedEntityJoinField}]=${quotes}\${${instanceName}.${filterFieldName}}${quotes} \` + this.getRowLevelSecurityWhereClause('${r.RelatedEntity}', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('${r.RelatedEntity}', await dataSource.query(sSQL));
-        return result;
-    }
+        else
+            return null;
+    }
+
+    // Before/After UPDATE Event Hooks for Sub-Classes to Override
+    protected async BeforeUpdate(dataSource: DataSource, input: Update${entity.BaseTableCodeName}Input): Promise<boolean> {
+        const i = input, d = dataSource; // prevent error
+        return true;
+    }
+    protected async AfterUpdate(dataSource: DataSource, input: Update${entity.BaseTableCodeName}Input) {
+        const i = input, d = dataSource; // prevent error
+    }
     `;
-}
-function generateManyToManyFieldResolver(entity, r) {
-    const md = new core_1.Metadata();
-    const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
-    const instanceName = entity.BaseTableCodeName.toLowerCase() + _graphQLTypeSuffix;
-    const filterFieldName = !r.EntityKeyField ? entity.PrimaryKey.Name : r.EntityKeyField;
-    const filterField = entity.Fields.find(f => f.Name.toLowerCase() == filterFieldName.toLowerCase());
-    if (!filterField)
-        throw new Error(`Field ${filterFieldName} not found in entity ${entity.Name} - check the relationship ${r.ID} and the EntityKeyField property`);
-    const quotes = filterField.NeedsQuotes ? "'" : '';
-    const serverPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
-    const serverClassName = serverPackagePrefix + r.RelatedEntityBaseTableCodeName + _graphQLTypeSuffix;
-    return `
-    @FieldResolver(() => [${serverClassName}])
-    async ${r.RelatedEntityCodeName}Array(@Root() ${instanceName}: ${entity.BaseTableCodeName + _graphQLTypeSuffix}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('${r.RelatedEntity}', userPayload);
-        const sSQL = \`SELECT * FROM [${schemaName(re)}].[${r.RelatedEntityBaseView}]\ WHERE [${re.PrimaryKey.Name}] IN (SELECT [${r.JoinEntityInverseJoinField}] FROM [${schemaName(re)}].[${r.JoinView}] WHERE [${r.JoinEntityJoinField}]=${quotes}\${${instanceName}.${filterFieldName}}${quotes}) \` + this.getRowLevelSecurityWhereClause('${r.RelatedEntity}', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('${r.RelatedEntity}', await dataSource.query(sSQL));
-        return result;
-    }
+        }
+        if (entity.AllowDeleteAPI && !entity.VirtualEntity) {
+            let graphQLPKEYArgs = '';
+            let simplePKEYArgs = '';
+            let pkeys = '';
+            let whereClause = '';
+            for (let i = 0; i < entity.PrimaryKeys.length; i++) {
+                const pk = entity.PrimaryKeys[i];
+                const idQuotes = pk.NeedsQuotes ? "'" : '';
+                graphQLPKEYArgs += (graphQLPKEYArgs.length > 0 ? ', ' : '');
+                graphQLPKEYArgs += `@Arg('${pk.CodeName}', () => ${pk.GraphQLType}) `;
+                graphQLPKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
+                simplePKEYArgs += (simplePKEYArgs.length > 0 ? ', ' : '');
+                simplePKEYArgs += `${pk.CodeName}: ${pk.TSType}`;
+                pkeys += (pkeys.length > 0 ? ', ' : '');
+                pkeys += `${pk.CodeName}`;
+                whereClause += (whereClause.length > 0 ? ' AND ' : '');
+                whereClause += `[${pk.CodeName}]=${idQuotes}\${${pk.CodeName}}${idQuotes}`;
+            }
+            sRet += `
+    @Mutation(() => ${serverGraphQLTypeName})
+    async Delete${entity.BaseTableCodeName}(${graphQLPKEYArgs}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        if (await this.BeforeDelete(dataSource, ${pkeys})) { // fire event and proceed if it wasn't cancelled
+            const entityObject = <${`${entity.ClassName}Entity`}>await new Metadata().GetEntityObject('${entity.Name}', this.GetUserFromPayload(userPayload));
+            await entityObject.Load(${pkeys});
+            const returnValue = entityObject.GetAll(); // grab the values before we delete so we can return last state before delete if we are successful.
+            if (await entityObject.Delete()) {
+                await this.AfterDelete(dataSource, ${pkeys}); // fire event
+                return returnValue;
+            }
+            else 
+                return null; // delete failed, this will cause an exception
+        }
+        else
+            return null; // BeforeDelete canceled the operation, this will cause an exception
+    }
+
+    // Before/After UPDATE Event Hooks for Sub-Classes to Override
+    protected async BeforeDelete(dataSource: DataSource, ${simplePKEYArgs}): Promise<boolean> {
+        const i = ${entity.PrimaryKey.Name}, d = dataSource; // prevent error;
+        return true;
+    }
+    protected async AfterDelete(dataSource: DataSource, ${simplePKEYArgs}) {
+        const i = ${entity.PrimaryKey.Name}, d = dataSource; // prevent error
+    }
     `;
-}
+        }
+        return sRet;
+    }
+    // function generateSPParams(entity: EntityInfo, isUpdate: boolean): string {
+    //     let sRet: string = '',bFirst: boolean = true;
+    //     for (let i = 0; i < entity.Fields.length; i++) {
+    //         const f = entity.Fields[i];
+    //         if (!f.IsVirtual) {
+    //             switch (f.Name.toLowerCase()) {
+    //                 case 'id':
+    //                     if (isUpdate) {
+    //                         sRet += generateSingleSPParam(f, bFirst);
+    //                         bFirst = false;
+    //                     }
+    //                     break;
+    //                 case 'createdat':
+    //                 case 'updatedat':
+    //                     // do nothing
+    //                     break;
+    //                 default:
+    //                     if (f.Type.trim().toLowerCase() !== 'uniqueidentifier') {
+    //                         // DO NOT INCLUDE UNIQUEIDENTIFIER FIELDS
+    //                         // FOR CREATE/UPDATE, THEY ARE GENERATED BY THE DB
+    //                         sRet += generateSingleSPParam(f, bFirst);
+    //                         bFirst = false;
+    //                     }
+    //                     break;
+    //             }    
+    //         }
+    //     }
+    //     return sRet;
+    // }
+    // function generateSingleSPParam(f: EntityFieldInfo, isFirst: boolean): string {
+    //     let sRet: string = '';
+    //     let quotes: string = '';
+    //     switch  ( TypeScriptTypeFromSQLType(f.Type).toLowerCase() ) {
+    //         case 'string':
+    //         case 'date':
+    //             quotes = "'";
+    //             break;
+    //         default:
+    //             break;
+    //     }
+    //     if (!isFirst) 
+    //         sRet += ',\n                ';
+    //     sRet += `@${f.Name}=\${this.packageSPParam(input.${f.Name},"${quotes}")}`
+    //     return sRet;
+    // }
+    generateOneToManyFieldResolver(entity, r) {
+        // let keyFieldTS: string = 'number';
+        // if (r.EntityKeyField) { 
+        //     const keyField = entity.Fields.find(f => f.Name.toLowerCase() == r.EntityKeyField.toLowerCase())
+        //     keyFieldTS = keyField ? TypeScriptTypeFromSQLType(keyField.Type)  : 'int';    
+        // }
+        const md = new core_1.Metadata();
+        const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
+        const instanceName = entity.BaseTableCodeName.toLowerCase() + this.GraphQLTypeSuffix;
+        const filterFieldName = !r.EntityKeyField ? entity.PrimaryKey.Name : r.EntityKeyField;
+        const filterField = entity.Fields.find(f => f.Name.toLowerCase() == filterFieldName.toLowerCase());
+        if (!filterField)
+            throw new Error(`Field ${filterFieldName} not found in entity ${entity.Name} - check the relationship ${r.ID} and the EntityKeyField property`);
+        const quotes = filterField.NeedsQuotes ? "'" : '';
+        const serverPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
+        const serverClassName = serverPackagePrefix + r.RelatedEntityBaseTableCodeName + this.GraphQLTypeSuffix;
+        return `  
+    @FieldResolver(() => [${serverClassName}])
+    async ${r.RelatedEntityCodeName}Array(@Root() ${instanceName}: ${entity.BaseTableCodeName + this.GraphQLTypeSuffix}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('${r.RelatedEntity}', userPayload);
+        const sSQL = \`SELECT * FROM [${this.schemaName(re)}].[${r.RelatedEntityBaseView}]\ WHERE [${r.RelatedEntityJoinField}]=${quotes}\${${instanceName}.${filterFieldName}}${quotes} \` + this.getRowLevelSecurityWhereClause('${r.RelatedEntity}', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('${r.RelatedEntity}', await dataSource.query(sSQL));
+        return result;
+    }
+        `;
+    }
+    generateManyToManyFieldResolver(entity, r) {
+        const md = new core_1.Metadata();
+        const re = md.Entities.find(e => e.Name.toLowerCase() == r.RelatedEntity.toLowerCase());
+        const instanceName = entity.BaseTableCodeName.toLowerCase() + this.GraphQLTypeSuffix;
+        const filterFieldName = !r.EntityKeyField ? entity.PrimaryKey.Name : r.EntityKeyField;
+        const filterField = entity.Fields.find(f => f.Name.toLowerCase() == filterFieldName.toLowerCase());
+        if (!filterField)
+            throw new Error(`Field ${filterFieldName} not found in entity ${entity.Name} - check the relationship ${r.ID} and the EntityKeyField property`);
+        const quotes = filterField.NeedsQuotes ? "'" : '';
+        const serverPackagePrefix = re.SchemaName === config_1.mjCoreSchema ? 'mj_core_schema_server_object_types.' : '';
+        const serverClassName = serverPackagePrefix + r.RelatedEntityBaseTableCodeName + this.GraphQLTypeSuffix;
+        return `
+    @FieldResolver(() => [${serverClassName}])
+    async ${r.RelatedEntityCodeName}Array(@Root() ${instanceName}: ${entity.BaseTableCodeName + this.GraphQLTypeSuffix}, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('${r.RelatedEntity}', userPayload);
+        const sSQL = \`SELECT * FROM [${this.schemaName(re)}].[${r.RelatedEntityBaseView}]\ WHERE [${re.PrimaryKey.Name}] IN (SELECT [${r.JoinEntityInverseJoinField}] FROM [${this.schemaName(re)}].[${r.JoinView}] WHERE [${r.JoinEntityJoinField}]=${quotes}\${${instanceName}.${filterFieldName}}${quotes}) \` + this.getRowLevelSecurityWhereClause('${r.RelatedEntity}', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('${r.RelatedEntity}', await dataSource.query(sSQL));
+        return result;
+    }
+        `;
+    }
+};
+exports.GraphQLServerGeneratorBase = GraphQLServerGeneratorBase;
+exports.GraphQLServerGeneratorBase = GraphQLServerGeneratorBase = __decorate([
+    (0, global_1.RegisterClass)(GraphQLServerGeneratorBase)
+], GraphQLServerGeneratorBase);
 //# sourceMappingURL=graphql_server_codegen.js.map