@memberjunction/codegen-lib 3.4.0 → 4.1.0

package/dist/Misc/advanced_generation.js

@@ -1,27 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdvancedGeneration = void 0;
-const config_1 = require("../Config/config");
-const core_1 = require("@memberjunction/core");
-const ai_prompts_1 = require("@memberjunction/ai-prompts");
-const ai_core_plus_1 = require("@memberjunction/ai-core-plus");
-const aiengine_1 = require("@memberjunction/aiengine");
+import { configInfo } from "../Config/config.js";
+import { LogError, LogStatus, Metadata } from "@memberjunction/core";
+import { AIPromptRunner } from "@memberjunction/ai-prompts";
+import { AIPromptParams } from "@memberjunction/ai-core-plus";
+import { AIEngine } from "@memberjunction/aiengine";
 /**
  * Enhanced Advanced Generation system using MJ's AI Prompts architecture.
  * All prompts are now stored in the database as AI Prompt entities with proper model configuration.
  */
-class AdvancedGeneration {
-    _metadata;
-    _promptRunner;
+export class AdvancedGeneration {
     constructor() {
-        this._metadata = new core_1.Metadata();
-        this._promptRunner = new ai_prompts_1.AIPromptRunner();
+        this._metadata = new Metadata();
+        this._promptRunner = new AIPromptRunner();
     }
     get enabled() {
-        return config_1.configInfo.advancedGeneration?.enableAdvancedGeneration ?? false;
+        return configInfo.advancedGeneration?.enableAdvancedGeneration ?? false;
     }
     features() {
-        return config_1.configInfo.advancedGeneration?.features;
+        return configInfo.advancedGeneration?.features;
     }
     getFeature(featureName) {
         return this.features()?.find(f => f.name === featureName);
@@ -34,7 +29,7 @@ class AdvancedGeneration {
      * Prompts include their model configuration via the MJ: AI Prompt Models relationship.
      */
     async getPromptEntity(promptName, contextUser) {
-        const prompt = aiengine_1.AIEngine.Instance.Prompts.find(p => p.Name.trim().toLowerCase() === promptName?.trim().toLowerCase());
+        const prompt = AIEngine.Instance.Prompts.find(p => p.Name.trim().toLowerCase() === promptName?.trim().toLowerCase());
         if (!prompt) {
             throw new Error(`Prompt '${promptName}' not found in database. Ensure the prompt metadata has been synced.`);
         }
@@ -50,7 +45,7 @@ class AdvancedGeneration {
             return result;
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Prompt execution failed: ${error}`);
+            LogError(`AdvancedGeneration:Prompt execution failed: ${error}`);
             throw error;
         }
     }
@@ -63,7 +58,7 @@ class AdvancedGeneration {
         }
         try {
             const prompt = await this.getPromptEntity('CodeGen: Smart Field Identification', contextUser);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = {
                 entityName: entity.Name,
@@ -89,12 +84,12 @@ class AdvancedGeneration {
                 return result.result;
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `Smart field identification failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:Smart field identification failed: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in identifyFields: ${error}`);
+            LogError(`AdvancedGeneration:Error in identifyFields: ${error}`);
             return null; // Graceful fallback
         }
     }
@@ -107,7 +102,7 @@ class AdvancedGeneration {
         }
         try {
             const prompt = await this.getPromptEntity('CodeGen: Transitive Join Intelligence', contextUser);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = {
                 sourceEntityName: sourceEntity.Name,
@@ -129,16 +124,16 @@ class AdvancedGeneration {
             params.contextUser = contextUser;
             const result = await this.executePrompt(params);
             if (result.success && result.result) {
-                (0, core_1.LogStatus)(`Transitive join analysis for ${sourceEntity.Name} → ${targetEntity.Name}: Junction=${result.result.isJunctionTable}`);
+                LogStatus(`Transitive join analysis for ${sourceEntity.Name} → ${targetEntity.Name}: Junction=${result.result.isJunctionTable}`);
                 return result.result;
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `Transitive join analysis failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:Transitive join analysis failed: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in analyzeTransitiveJoin: ${error}`);
+            LogError(`AdvancedGeneration:Error in analyzeTransitiveJoin: ${error}`);
             return null;
         }
     }
@@ -147,7 +142,7 @@ class AdvancedGeneration {
      * This looks at ALL fields that have categories assigned, not just locked ones,
      * so the LLM can see and reuse existing categories when categorizing new fields
      */
-    getExistingCategoryInfo(entity) {
+    getExistingFieldCategoryInfo(entity) {
         // Get ALL fields that have categories assigned (not just locked ones)
         // This ensures the LLM sees existing categories and reuses them
         const categorizedFields = entity.Fields.filter((f) => f.Category != null && f.Category.trim() !== '');
@@ -167,34 +162,8 @@ class AdvancedGeneration {
             }
             fieldsByCategory[field.Category].push(field.Name);
         }
-        // Load category info (icons and descriptions) from EntitySettings
-        let categoryInfo = null;
-        const infoSetting = entity.Settings?.find((s) => s.Name === 'FieldCategoryInfo');
-        if (infoSetting?.Value) {
-            try {
-                categoryInfo = JSON.parse(infoSetting.Value);
-            }
-            catch (e) {
-                // Invalid JSON, ignore
-            }
-        }
-        // Fallback: check for legacy FieldCategoryIcons format and convert
-        if (!categoryInfo) {
-            const iconSetting = entity.Settings?.find((s) => s.Name === 'FieldCategoryIcons');
-            if (iconSetting?.Value) {
-                try {
-                    const icons = JSON.parse(iconSetting.Value);
-                    // Convert legacy format to new format
-                    categoryInfo = {};
-                    for (const [category, icon] of Object.entries(icons)) {
-                        categoryInfo[category] = { icon, description: '' };
-                    }
-                }
-                catch (e) {
-                    // Invalid JSON, ignore
-                }
-            }
-        }
+        // Use the typed FieldCategories property (auto-populated from EntitySettings with legacy fallback)
+        const categoryInfo = entity.FieldCategories ?? null;
         return { categories, fieldsByCategory, categoryInfo };
     }
     /**
@@ -229,8 +198,11 @@ class AdvancedGeneration {
         try {
             const prompt = await this.getPromptEntity('CodeGen: Form Layout Generation', contextUser);
             // Extract existing category information
-            const existingInfo = this.getExistingCategoryInfo(entity);
+            const existingInfo = this.getExistingFieldCategoryInfo(entity);
             const hasExistingCategories = existingInfo.categories.length > 0;
+            // IS-A parent chain context (provided by manage-metadata for child entities)
+            const parentChain = entity.ParentChain || [];
+            const isChildEntity = entity.IsChildEntity === true && parentChain.length > 0;
             // Map fields with FK flag for statistics calculation
             const mappedFields = entity.Fields.map((f) => ({
                 Name: f.Name,
@@ -244,11 +216,14 @@ class AdvancedGeneration {
                 ExistingCategory: f.Category || null,
                 // HasExistingCategory=true means locked (don't update), false means can update
                 HasExistingCategory: !f.AutoUpdateCategory && f.Category != null,
-                IsNewField: f.AutoUpdateCategory === true && !f.Category
+                IsNewField: f.AutoUpdateCategory === true && !f.Category,
+                // IS-A inheritance: which parent entity this field was inherited from (null if own field)
+                InheritedFromEntityName: f.InheritedFromEntityName || null,
+                InheritedFromEntityID: f.InheritedFromEntityID || null
             }));
             // Calculate FK statistics for entity importance analysis
             const fkStats = this.calculateFkStatistics(mappedFields);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = {
                 entityName: entity.Name,
@@ -266,18 +241,21 @@ class AdvancedGeneration {
                 fieldsByCategory: existingInfo.fieldsByCategory,
                 hasExistingCategories: hasExistingCategories,
                 // Pass existing category info (icons + descriptions) so LLM can reference them
-                existingCategoryInfo: existingInfo.categoryInfo || {},
+                existingFieldCategoryInfo: existingInfo.categoryInfo || {},
                 // Flag to tell LLM whether to bother with entityImportance
-                isExistingEntity: !isNewEntity
+                isExistingEntity: !isNewEntity,
+                // IS-A entity inheritance context
+                isChildEntity,
+                parentChain
             };
             params.contextUser = contextUser;
             const result = await this.executePrompt(params);
             if (result.success && result.result) {
                 // Merge category info - preserve ALL existing categories, only add new ones
                 if (existingInfo.categoryInfo) {
-                    const newCategoryInfo = result.result.categoryInfo || {};
+                    const newFieldCategoryInfo = result.result.categoryInfo || {};
                     result.result.categoryInfo = {
-                        ...newCategoryInfo // Only new categories from LLM
+                        ...newFieldCategoryInfo // Only new categories from LLM
                     };
                     // Preserve existing - don't let LLM overwrite
                     for (const [category, info] of Object.entries(existingInfo.categoryInfo)) {
@@ -292,15 +270,27 @@ class AdvancedGeneration {
                         result.result.categoryInfo[category] = { icon, description: '' };
                     }
                 }
+                // Stamp inheritedFromEntityID on categories that have inheritedFromEntityName
+                // The LLM provides the entity name; we resolve the ID from the parent chain
+                if (isChildEntity && result.result.categoryInfo) {
+                    for (const info of Object.values(result.result.categoryInfo)) {
+                        if (info.inheritedFromEntityName && !info.inheritedFromEntityID) {
+                            const matchingParent = parentChain.find(p => p.entityName === info.inheritedFromEntityName);
+                            if (matchingParent) {
+                                info.inheritedFromEntityID = matchingParent.entityID;
+                            }
+                        }
+                    }
+                }
                 return result.result;
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `Form layout generation failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:Form layout generation failed: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in generateFormLayout: ${error}`);
+            LogError(`AdvancedGeneration:Error in generateFormLayout: ${error}`);
             return null;
         }
     }
@@ -313,22 +303,22 @@ class AdvancedGeneration {
         }
         try {
             const prompt = await this.getPromptEntity('CodeGen: Entity Name Generation', contextUser);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = { tableName };
             params.contextUser = contextUser;
             const result = await this.executePrompt(params);
             if (result.success && result.result) {
-                (0, core_1.LogStatus)(`Entity name generated for ${tableName}: ${result.result.entityName}`);
+                LogStatus(`Entity name generated for ${tableName}: ${result.result.entityName}`);
                 return result.result;
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `Entity name generation failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:Entity name generation failed: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in generateEntityName: ${error}`);
+            LogError(`AdvancedGeneration:Error in generateEntityName: ${error}`);
             return null;
         }
     }
@@ -341,22 +331,22 @@ class AdvancedGeneration {
         }
         try {
             const prompt = await this.getPromptEntity('CodeGen: Entity Description Generation', contextUser);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = { entityName, tableName, fields };
             params.contextUser = contextUser;
             const result = await this.executePrompt(params);
             if (result.success && result.result) {
-                (0, core_1.LogStatus)(`Entity description generated for ${entityName}`);
+                LogStatus(`Entity description generated for ${entityName}`);
                 return result.result;
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `Entity description generation failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:Entity description generation failed: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in generateEntityDescription: ${error}`);
+            LogError(`AdvancedGeneration:Error in generateEntityDescription: ${error}`);
             return null;
         }
     }
@@ -369,7 +359,7 @@ class AdvancedGeneration {
         }
         try {
             const prompt = await this.getPromptEntity('CodeGen: Check Constraint Parser', contextUser);
-            const params = new ai_core_plus_1.AIPromptParams();
+            const params = new AIPromptParams();
             params.prompt = prompt;
             params.data = {
                 constraintText,
@@ -382,7 +372,7 @@ class AdvancedGeneration {
                 const modelId = result.modelInfo?.modelId || result.modelSelectionInfo?.modelSelected?.ID;
                 if (!modelId) {
                     // shuoldn't ever happen.
-                    (0, core_1.LogError)('AdvancedGeneration', 'Model ID not found');
+                    LogError('AdvancedGeneration: Model ID not found');
                     return null;
                 }
                 else {
@@ -393,15 +383,64 @@ class AdvancedGeneration {
                 }
             }
             else {
-                (0, core_1.LogError)('AdvancedGeneration', `CHECK constraint parsing failed: ${result.errorMessage}`);
+                LogError(`AdvancedGeneration:CHECK constraint parsing failed: ${result.errorMessage}`);
+                return null;
+            }
+        }
+        catch (error) {
+            LogError(`AdvancedGeneration:Error in parseCheckConstraint: ${error}`);
+            return null;
+        }
+    }
+    /**
+     * Decorates virtual entity fields using LLM analysis of the view definition.
+     * Identifies primary keys, foreign keys, generates field descriptions,
+     * assigns categories, and suggests entity icons for constraint-less views.
+     *
+     * @param entityName The virtual entity name
+     * @param schemaName The schema containing the view
+     * @param viewName The SQL view name
+     * @param viewDefinition The SQL view definition text
+     * @param entityDescription Optional entity description
+     * @param fields Array of field info objects with Name, Type, Length, AllowsNull, IsPrimaryKey, RelatedEntityName
+     * @param availableEntities Array of available entities for FK resolution
+     * @param sourceEntities Enriched context from source entities referenced in the view SQL
+     * @param contextUser The context user for AI operations
+     * @returns Decoration result or null if feature disabled or LLM call fails
+     */
+    async decorateVirtualEntityFields(entityName, schemaName, viewName, viewDefinition, entityDescription, fields, availableEntities, sourceEntities, contextUser) {
+        if (!this.featureEnabled('VirtualEntityFieldDecoration')) {
+            return null;
+        }
+        try {
+            const prompt = await this.getPromptEntity('CodeGen: Virtual Entity Field Decoration', contextUser);
+            const params = new AIPromptParams();
+            params.prompt = prompt;
+            params.data = {
+                entityName,
+                schemaName,
+                viewName,
+                viewDefinition,
+                entityDescription: entityDescription || 'No description available',
+                fields,
+                availableEntities: availableEntities.slice(0, 200), // Limit to prevent token overflow
+                sourceEntities
+            };
+            params.contextUser = contextUser;
+            const result = await this._promptRunner.ExecutePrompt(params);
+            if (result.success && result.result) {
+                LogStatus(`      ${entityName}: ${result.result.primaryKeys?.length || 0} PKs, ${result.result.foreignKeys?.length || 0} FKs identified`);
+                return result.result;
+            }
+            else {
+                LogError(`AdvancedGeneration:Virtual entity field decoration failed for ${entityName}: ${result.errorMessage}`);
                 return null;
             }
         }
         catch (error) {
-            (0, core_1.LogError)('AdvancedGeneration', `Error in parseCheckConstraint: ${error}`);
+            LogError(`AdvancedGeneration:Error in decorateVirtualEntityFields for ${entityName}: ${error}`);
             return null;
         }
     }
 }
-exports.AdvancedGeneration = AdvancedGeneration;
 //# sourceMappingURL=advanced_generation.js.map

package/dist/Misc/advanced_generation.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced_generation.js","sourceRoot":"","sources":["../../src/Misc/advanced_generation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"advanced_generation.js","sourceRoot":"","sources":["../../src/Misc/advanced_generation.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAqB,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAY,MAAM,sBAAsB,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAqB,MAAM,8BAA8B,CAAC;AAEjF,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAiFpD;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAI3B;QACI,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,aAAa,GAAG,IAAI,cAAc,EAAE,CAAC;IAC9C,CAAC;IAED,IAAW,OAAO;QACd,OAAO,UAAU,CAAC,kBAAkB,EAAE,wBAAwB,IAAI,KAAK,CAAC;IAC5E,CAAC;IAEM,QAAQ;QACX,OAAO,UAAU,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IACnD,CAAC;IAEM,UAAU,CAAC,WAAmB;QACjC,OAAO,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IAC9D,CAAC;IAEM,cAAc,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,WAAqB;QACnE,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,UAAU,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAErH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,sEAAsE,CAAC,CAAC;QACjH,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,aAAa,CACvB,MAAsB;QAEtB,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAI,MAAM,CAAC,CAAC;YACjE,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,+CAA+C,KAAK,EAAE,CAAC,CAAC;YACjE,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,cAAc,CACvB,MAAW,EACX,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,qCAAqC,EAAE,WAAW,CAAC,CAAC;YAE9F,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG;gBACV,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBACnC,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBACpB,YAAY,EAAE,CAAC,CAAC,iBAAiB,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;oBAChG,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,IAAI;oBACtC,WAAW,EAAE,CAAC,CAAC,WAAW;iBAC7B,CAAC,CAAC;gBACH,aAAa,EAAE,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBACpD,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,aAAa,EAAE,CAAC,CAAC,aAAa;iBACjC,CAAC,CAAC,IAAI,EAAE;aACZ,CAAC;YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAiC,MAAM,CAAC,CAAC;YAEhF,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,yDAAyD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBACzF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,+CAA+C,KAAK,EAAE,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC,CAAC,oBAAoB;QACrC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,qBAAqB,CAC9B,YAAiB,EACjB,YAAiB,EACjB,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,uCAAuC,EAAE,WAAW,CAAC,CAAC;YAEhG,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG;gBACV,gBAAgB,EAAE,YAAY,CAAC,IAAI;gBACnC,gBAAgB,EAAE,YAAY,CAAC,IAAI;gBACnC,uBAAuB,EAAE,YAAY,CAAC,WAAW;gBACjD,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC/C,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,YAAY,EAAE,CAAC,CAAC,iBAAiB,IAAI,IAAI;oBACzC,WAAW,EAAE,CAAC,CAAC,WAAW;iBAC7B,CAAC,CAAC;gBACH,mBAAmB,EAAE,YAAY,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAChE,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,aAAa,EAAE,CAAC,CAAC,aAAa;oBAC9B,sBAAsB,EAAE,CAAC,CAAC,sBAAsB;iBACnD,CAAC,CAAC,IAAI,EAAE;aACZ,CAAC;YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAuB,MAAM,CAAC,CAAC;YAEtE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,SAAS,CAAC,gCAAgC,YAAY,CAAC,IAAI,MAAM,YAAY,CAAC,IAAI,cAAc,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;gBACjI,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,uDAAuD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBACvF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,sDAAsD,KAAK,EAAE,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;;;OAIG;IACK,4BAA4B,CAAC,MAAW;QAK5C,sEAAsE;QACtE,gEAAgE;QAChE,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAC1C,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAC7D,CAAC;QAEF,gCAAgC;QAChC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACpC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACjB,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE3C,2BAA2B;QAC3B,MAAM,gBAAgB,GAA6B,EAAE,CAAC;QACtD,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACpC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC1C,CAAC;YACD,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC;QAED,mGAAmG;QACnG,MAAM,YAAY,GAA6C,MAAM,CAAC,eAAe,IAAI,IAAI,CAAC;QAE9F,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IAC1D,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,MAAgF;QAM1G,4EAA4E;QAC5E,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CACxD,CAAC;QAEF,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;QACpE,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,GAAG,OAAO,CAAC;QACnD,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;YACrD,CAAC,CAAC,CAAC,CAAC;QAER,OAAO;YACH,WAAW,EAAE,MAAM,CAAC,MAAM;YAC1B,OAAO;YACP,UAAU;YACV,OAAO;SACV,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC3B,MAAW,EACX,WAAqB,EACrB,cAAuB,KAAK;QAE5B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAC;YAE1F,wCAAwC;YACxC,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;YAC/D,MAAM,qBAAqB,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;YAEjE,6EAA6E;YAC7E,MAAM,WAAW,GAAoD,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;YAC9F,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,KAAK,IAAI,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAE9E,qDAAqD;YACrD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;gBAChD,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,YAAY,EAAE,CAAC,CAAC,iBAAiB,IAAI,IAAI;gBACzC,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,uDAAuD;gBACvD,gBAAgB,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;gBACpC,+EAA+E;gBAC/E,mBAAmB,EAAE,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI;gBAChE,UAAU,EAAE,CAAC,CAAC,kBAAkB,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ;gBACxD,0FAA0F;gBAC1F,uBAAuB,EAAE,CAAC,CAAC,uBAAuB,IAAI,IAAI;gBAC1D,qBAAqB,EAAE,CAAC,CAAC,qBAAqB,IAAI,IAAI;aACzD,CAAC,CAAC,CAAC;YAEJ,yDAAyD;YACzD,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;YAEzD,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG;gBACV,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,iBAAiB,EAAE,MAAM,CAAC,WAAW;gBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,oDAAoD;gBACpD,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,aAAa;gBACb,MAAM,EAAE,YAAY;gBACpB,kCAAkC;gBAClC,kBAAkB,EAAE,YAAY,CAAC,UAAU;gBAC3C,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;gBAC/C,qBAAqB,EAAE,qBAAqB;gBAC5C,+EAA+E;gBAC/E,yBAAyB,EAAE,YAAY,CAAC,YAAY,IAAI,EAAE;gBAC1D,2DAA2D;gBAC3D,gBAAgB,EAAE,CAAC,WAAW;gBAC9B,kCAAkC;gBAClC,aAAa;gBACb,WAAW;aACd,CAAC;YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAmB,MAAM,CAAC,CAAC;YAElE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,4EAA4E;gBAC5E,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;oBAC5B,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;oBAC9D,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG;wBACzB,GAAG,oBAAoB,CAAE,+BAA+B;qBAC3D,CAAC;oBACF,8CAA8C;oBAC9C,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;wBACvE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;oBAChD,CAAC;gBACL,CAAC;gBAED,iEAAiE;gBACjE,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;oBAC7D,sCAAsC;oBACtC,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC;oBAChC,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;wBACzE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;oBACrE,CAAC;gBACL,CAAC;gBAED,8EAA8E;gBAC9E,4EAA4E;gBAC5E,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;oBAC9C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC3D,IAAI,IAAI,CAAC,uBAAuB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;4BAC9D,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,uBAAuB,CACrD,CAAC;4BACF,IAAI,cAAc,EAAE,CAAC;gCACjB,IAAI,CAAC,qBAAqB,GAAG,cAAc,CAAC,QAAQ,CAAC;4BACzD,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,qDAAqD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBACrF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,mDAAmD,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,kBAAkB,CAC3B,SAAiB,EACjB,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iCAAiC,EAAE,WAAW,CAAC,CAAC;YAE1F,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG,EAAE,SAAS,EAAE,CAAC;YAC5B,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAmB,MAAM,CAAC,CAAC;YAElE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,SAAS,CAAC,6BAA6B,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;gBACjF,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,qDAAqD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBACrF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,mDAAmD,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,yBAAyB,CAClC,UAAkB,EAClB,SAAiB,EACjB,MAA2C,EAC3C,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,wCAAwC,EAAE,WAAW,CAAC,CAAC;YAEjG,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAChD,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAA0B,MAAM,CAAC,CAAC;YAEzE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,SAAS,CAAC,oCAAoC,UAAU,EAAE,CAAC,CAAC;gBAC5D,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,4DAA4D,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC5F,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,0DAA0D,KAAK,EAAE,CAAC,CAAC;YAC5E,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,oBAAoB,CAC7B,cAAsB,EACtB,eAAuB,EACvB,kBAAiC,EACjC,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kCAAkC,EAAE,WAAW,CAAC,CAAC;YAE3F,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG;gBACV,cAAc;gBACd,eAAe;gBACf,kBAAkB,EAAE,kBAAkB,IAAI,iCAAiC;aAC9E,CAAC;YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAA8B,MAAM,CAAC,CAAC;YAE7E,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,OAAO,IAAI,MAAM,CAAC,kBAAkB,EAAE,aAAa,EAAE,EAAE,CAAC;gBAC1F,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,yBAAyB;oBACzB,QAAQ,CAAC,wCAAwC,CAAC,CAAC;oBACnD,OAAO,IAAI,CAAC;gBAChB,CAAC;qBACI,CAAC;oBACF,OAAO;wBACH,GAAG,MAAM,CAAC,MAAM;wBAChB,OAAO,EAAE,OAAO;qBACnB,CAAC;gBACN,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,uDAAuD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBACvF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,qDAAqD,KAAK,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,KAAK,CAAC,2BAA2B,CACpC,UAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,cAAsB,EACtB,iBAAyB,EACzB,MAOE,EACF,iBAKE,EACF,cAWE,EACF,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,8BAA8B,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0CAA0C,EAAE,WAAW,CAAC,CAAC;YAEnG,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,IAAI,GAAG;gBACV,UAAU;gBACV,UAAU;gBACV,QAAQ;gBACR,cAAc;gBACd,iBAAiB,EAAE,iBAAiB,IAAI,0BAA0B;gBAClE,MAAM;gBACN,iBAAiB,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,kCAAkC;gBACtF,cAAc;aACjB,CAAC;YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,MAAM,GACR,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAgC,MAAM,CAAC,CAAC;YAElF,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClC,SAAS,CAAC,SAAS,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC1I,OAAO,MAAM,CAAC,MAAM,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,iEAAiE,UAAU,KAAK,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBAChH,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,+DAA+D,UAAU,KAAK,KAAK,EAAE,CAAC,CAAC;YAChG,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CACJ"}

package/dist/Misc/createNewUser.d.ts

@@ -1,4 +1,4 @@
-import { NewUserSetup } from "../Config/config";
+import { NewUserSetup } from "../Config/config.js";
 /**
  * Base class for creating a new user in the system, you can sub-class this class to create your own user creation logic
  */

package/dist/Misc/createNewUser.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateNewUserBase = void 0;
-const core_1 = require("@memberjunction/core");
-const sqlserver_dataprovider_1 = require("@memberjunction/sqlserver-dataprovider");
-const status_logging_1 = require("./status_logging");
+import { LogError, LogStatus, Metadata, RunView } from "@memberjunction/core";
+import { UserCache } from "@memberjunction/sqlserver-dataprovider";
+import { logError, logStatus } from "./status_logging.js";
 /**
  * Base class for creating a new user in the system, you can sub-class this class to create your own user creation logic
  */
-class CreateNewUserBase {
+export class CreateNewUserBase {
     async createNewUser(newUserSetup) {
         try {
-            const matches = sqlserver_dataprovider_1.UserCache.Users.find(u => u?.Type?.trim().toLowerCase() === 'owner');
-            const currentUser = matches ? matches : sqlserver_dataprovider_1.UserCache.Users[0]; // if we don't find an Owner, use the first user in the cache
+            const matches = UserCache.Users.find(u => u?.Type?.trim().toLowerCase() === 'owner');
+            const currentUser = matches ? matches : UserCache.Users[0]; // if we don't find an Owner, use the first user in the cache
             if (!currentUser) {
                 return {
                     Success: false,
@@ -21,11 +18,11 @@ class CreateNewUserBase {
             }
             if (newUserSetup) {
                 // check for existing user by email
-                const existingNewUser = sqlserver_dataprovider_1.UserCache.Users.find(u => u.Email === newUserSetup.Email);
+                const existingNewUser = UserCache.Users.find(u => u.Email === newUserSetup.Email);
                 if (!existingNewUser) {
                     if (newUserSetup.Email && newUserSetup.Email.length > 0) {
-                        (0, status_logging_1.logStatus)("Attempting to create new user: " + newUserSetup.Email);
-                        const md = new core_1.Metadata();
+                        logStatus("Attempting to create new user: " + newUserSetup.Email);
+                        const md = new Metadata();
                         const user = await md.GetEntityObject('Users', currentUser);
                         user.NewRecord();
                         user.Name = newUserSetup.UserName ? newUserSetup.UserName : newUserSetup.Email;
@@ -40,7 +37,7 @@ class CreateNewUserBase {
                                 const roleName = newUserSetup.Roles[i];
                                 const roleID = md.Roles.find(r => r.Name === roleName)?.ID;
                                 if (!roleID) {
-                                    (0, status_logging_1.logError)("   Role not found: " + roleName + ", skipping");
+                                    logError("   Role not found: " + roleName + ", skipping");
                                     continue;
                                 }
                                 const userRole = await md.GetEntityObject('User Roles', currentUser);
@@ -48,20 +45,20 @@ class CreateNewUserBase {
                                 userRole.UserID = user.ID;
                                 userRole.RoleID = roleID;
                                 if (await userRole.Save()) {
-                                    (0, status_logging_1.logStatus)("   Created User Role: " + roleName);
+                                    logStatus("   Created User Role: " + roleName);
                                 }
                                 else {
-                                    (0, status_logging_1.logError)("   Failed to create User Role: " + roleName);
+                                    logError("   Failed to create User Role: " + roleName);
                                 }
                             }
                             // Create UserApplication records if specified in the config
                             if (newUserSetup.CreateUserApplicationRecords) {
-                                (0, status_logging_1.logStatus)("Creating User Applications for new user: " + user.Name);
+                                logStatus("Creating User Applications for new user: " + user.Name);
                                 for (const appName of newUserSetup.UserApplications) {
                                     const toLowerCase = appName.trim().toLocaleLowerCase();
                                     const application = md.Applications.find(a => a.Name.trim().toLocaleLowerCase() === toLowerCase);
                                     if (!application) {
-                                        (0, status_logging_1.logError)(`Application ${appName} not found in the Metadata, cannot assign to new user ${user.Name}`);
+                                        logError(`Application ${appName} not found in the Metadata, cannot assign to new user ${user.Name}`);
                                         continue;
                                     }
                                     const userApplication = await md.GetEntityObject('User Applications', currentUser);
@@ -71,18 +68,18 @@ class CreateNewUserBase {
                                     userApplication.IsActive = true;
                                     const userApplicationSaveResult = await userApplication.Save();
                                     if (userApplicationSaveResult) {
-                                        (0, status_logging_1.logStatus)(`Created User Application ${appName} for new user ${user.Name}`);
+                                        logStatus(`Created User Application ${appName} for new user ${user.Name}`);
                                         //now create a UserApplicationEntity records for each entity in the application
-                                        const rv = new core_1.RunView();
+                                        const rv = new RunView();
                                         const rvResult = await rv.RunView({
                                             EntityName: 'Application Entities',
                                             ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
                                         }, currentUser);
                                         if (!rvResult.Success) {
-                                            (0, core_1.LogError)(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
+                                            LogError(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
                                             continue;
                                         }
-                                        (0, core_1.LogStatus)(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
+                                        LogStatus(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
                                         for (const [index, appEntity] of rvResult.Results.entries()) {
                                             const userAppEntity = await md.GetEntityObject('User Application Entities', currentUser);
                                             userAppEntity.NewRecord();
@@ -91,19 +88,19 @@ class CreateNewUserBase {
                                             userAppEntity.Sequence = index;
                                             const userAppEntitySaveResult = await userAppEntity.Save();
                                             if (userAppEntitySaveResult) {
-                                                (0, core_1.LogStatus)(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
+                                                LogStatus(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
                                             }
                                             else {
-                                                (0, core_1.LogError)(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
+                                                LogError(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
                                             }
                                         }
                                     }
                                     else {
-                                        (0, status_logging_1.logError)(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
+                                        logError(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
                                     }
                                 }
                             }
-                            (0, status_logging_1.logStatus)("Finished creating new user: " + newUserSetup.Email);
+                            logStatus("Finished creating new user: " + newUserSetup.Email);
                             return {
                                 Success: true,
                                 Message: "Successfully created new user: " + newUserSetup.Email,
@@ -152,5 +149,4 @@ class CreateNewUserBase {
         }
     }
 }
-exports.CreateNewUserBase = CreateNewUserBase;
 //# sourceMappingURL=createNewUser.js.map

package/dist/Misc/createNewUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"createNewUser.js","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createNewUser.js","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"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"}

package/dist/Misc/entity_subclasses_codegen.d.ts

@@ -1,6 +1,6 @@
 import { EntityFieldInfo, EntityInfo } from '@memberjunction/core';
-import { ValidatorResult } from '../Database/manage-metadata';
-import * as sql from 'mssql';
+import { ValidatorResult } from '../Database/manage-metadata.js';
+import sql from 'mssql';
 /**
  * Base class for generating entity sub-classes, you can sub-class this class to modify/extend your own entity sub-class generator logic
  */
@@ -21,6 +21,11 @@ export declare class EntitySubClassGeneratorBase {
      * @param includeFileHeader
      */
     generateEntitySubClass(pool: sql.ConnectionPool, entity: EntityInfo, includeFileHeader?: boolean, skipDBUpdate?: boolean): Promise<string>;
+    /**
+     * Finds the source parent entity for an IS-A inherited field by walking the parent chain.
+     * Returns the name of the parent entity that originally defines the field (as a non-virtual column).
+     */
+    protected getISAFieldSourceEntity(entity: EntityInfo, field: EntityFieldInfo): string;
     LogAndGenerateValidateFunction(pool: sql.ConnectionPool, entity: EntityInfo, skipDBUpdate: boolean): Promise<string | null>;
     GenerateValidateFunction(entity: EntityInfo): null | {
         code: string;

package/dist/Misc/entity_subclasses_codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity_subclasses_codegen.d.ts","sourceRoot":"","sources":["../../src/Misc/entity_subclasses_codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4B,UAAU,EAAuC,MAAM,sBAAsB,CAAC;AAKlI,OAAO,EAAE,eAAe,EAAsB,MAAM,6BAA6B,CAAC;AAGlF,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAE7B;;GAEG;AACH,qBAAa,2BAA2B;IACtC;;;;;;;OAOG;IACU,2BAA2B,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB/I,gCAAgC,IAAI,MAAM;IAYjD;;;;OAIG;IACU,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAE,OAAe,EAAE,YAAY,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAmLxJ,8BAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA6DjI,wBAAwB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,eAAe,EAAE,CAAA;KAAE;IAyDpG,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAwDjD,sBAAsB,CAAC,WAAW,EAAE,eAAe,GAAG,MAAM;CAiBpE"}
+{"version":3,"file":"entity_subclasses_codegen.d.ts","sourceRoot":"","sources":["../../src/Misc/entity_subclasses_codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4B,UAAU,EAAuC,MAAM,sBAAsB,CAAC;AAKlI,OAAO,EAAE,eAAe,EAAsB,MAAM,6BAA6B,CAAC;AAGlF,OAAO,GAAG,MAAM,OAAO,CAAC;AAExB;;GAEG;AACH,qBAAa,2BAA2B;IACtC;;;;;;;OAOG;IACU,2BAA2B,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB/I,gCAAgC,IAAI,MAAM;IAYjD;;;;OAIG;IACU,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAE,OAAe,EAAE,YAAY,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAwLrK;;;OAGG;IACH,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,GAAG,MAAM;IAaxE,8BAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA6DjI,wBAAwB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,eAAe,EAAE,CAAA;KAAE;IAyDpG,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAwDjD,sBAAsB,CAAC,WAAW,EAAE,eAAe,GAAG,MAAM;CAiBpE"}