@solidstarters/solid-core 1.2.21 → 1.2.23

package/src/services/model-metadata.service.ts

@@ -131,7 +131,8 @@ export class ModelMetadataService {
         return model
       });
     } catch (error) {
-      console.error('Transaction failed:', error);
+      // console.error('Transaction failed:', error);
+      this.logger.error('Transaction failed:', error);
       throw error;
     }
   }
@@ -165,7 +166,8 @@ export class ModelMetadataService {
         // return model
       });
     } catch (error) {
-      console.error('Transaction failed:', error);
+      // console.error('Transaction failed:', error);
+      this.logger.error('Transaction failed:', error);
       throw error;
     }
   }
@@ -200,6 +202,7 @@ export class ModelMetadataService {
         fieldMetadata['mediaStorageProvider'] = await this.mediaStorageProviderMetadataService.findOne(fieldMetadata.mediaStorageProviderId);
       }
       // console.log(fieldMetadata.displayName);
+      // this.logger.debug(fieldMetadata.displayName);
 
       const fieldMetadataObject = this.fieldMetadataRepo.create(fieldMetadata);
       const affectedField = await manager.save(fieldMetadataObject);
@@ -357,6 +360,17 @@ export class ModelMetadataService {
 
         }
       }
+      const column1Fields = [];
+      const column2Fields = [];
+
+      // Distribute fields between two columns
+      for (let i = 0; i < formViewLayoutFields.length; i++) {
+        if (i % 2 === 0) {
+          column1Fields.push(formViewLayoutFields[i]);
+        } else {
+          column2Fields.push(formViewLayoutFields[i]);
+        }
+      }
       const action = {
         displayName: `${model.displayName} List View`,
         name: `${model.singularName}-list-view`,
@@ -424,11 +438,17 @@ export class ModelMetadataService {
                 {
                   type: "row",
                   attrs: { name: "sheet-1" },
-                  children: [{
-                    type: "column",
-                    attrs: { name: "group-1", label: "", className: "col-6" },
-                    children: formViewLayoutFields
-                  }]
+                  children: [
+                    {
+                      type: "column",
+                      attrs: { name: "group-1", label: "", className: "col-6" },
+                      children: column1Fields
+                    },
+                    {
+                      type: "column",
+                      attrs: { name: "group-1", label: "", className: "col-6" },
+                      children: column2Fields
+                    }]
                 },
               ]
             }
@@ -448,7 +468,8 @@ export class ModelMetadataService {
       await fs.writeFile(filePath, updatedContent);
 
     } catch (error) {
-      console.error('File creation failed:', error);
+      // console.error('File creation failed:', error);
+      this.logger.error('File creation failed:', error);
       throw new Error('File creation failed, rolling back transaction'); // Trigger rollback
     }
   }
@@ -489,7 +510,7 @@ export class ModelMetadataService {
         // Existing field
         const existingField = existingFields.find((field) => field.id === fieldMetadata.id);
         if (existingField) {
-          if (fieldMetadata.mediaStorageProviderId) { 
+          if (fieldMetadata.mediaStorageProviderId) {
             fieldMetadata['mediaStorageProvider'] = await this.mediaStorageProviderMetadataService.findOne(fieldMetadata.mediaStorageProviderId);
           }
           Object.assign(existingField, fieldMetadata);
@@ -535,28 +556,28 @@ export class ModelMetadataService {
     const userKeyFields = fieldsMetadata.filter(field => field.isUserKey);
 
     if (userKeyFields.length > 0) {
-        const newUserKeyField = userKeyFields[userKeyFields.length - 1]; 
-        const savedUserKeyField = await fieldRepo.findOne({ where: { id: newUserKeyField.id } });
-    
-        if (savedUserKeyField) {
-            finalModel.userKeyField = savedUserKeyField;
-            await modelRepo.save(finalModel);
-        }
-    
-        const otherUserKeyFields = userKeyFields.filter(field => field.id !== newUserKeyField.id);
-    
-        for (const field of otherUserKeyFields) {
-            const existingField = await fieldRepo.findOne({ where: { id: field.id } });
-            if (existingField) {
-                existingField.isUserKey = false;
-                await fieldRepo.save(existingField);
-            }
+      const newUserKeyField = userKeyFields[userKeyFields.length - 1];
+      const savedUserKeyField = await fieldRepo.findOne({ where: { id: newUserKeyField.id } });
+
+      if (savedUserKeyField) {
+        finalModel.userKeyField = savedUserKeyField;
+        await modelRepo.save(finalModel);
+      }
+
+      const otherUserKeyFields = userKeyFields.filter(field => field.id !== newUserKeyField.id);
+
+      for (const field of otherUserKeyFields) {
+        const existingField = await fieldRepo.findOne({ where: { id: field.id } });
+        if (existingField) {
+          existingField.isUserKey = false;
+          await fieldRepo.save(existingField);
         }
+      }
     } else {
-        if (finalModel.userKeyField) {
-            finalModel.userKeyField = null;
-            await modelRepo.save(finalModel);
-        }
+      if (finalModel.userKeyField) {
+        finalModel.userKeyField = null;
+        await modelRepo.save(finalModel);
+      }
     }
 
     return updatedModel;
@@ -615,7 +636,8 @@ export class ModelMetadataService {
       await fs.writeFile(filePath, updatedContent);
 
     } catch (error) {
-      console.error('File creation failed:', error);
+      // console.error('File creation failed:', error);
+      this.logger.error('File creation failed:', error);
       throw new Error('File creation failed, rolling back transaction'); // Trigger rollback
     }
   }
@@ -679,38 +701,38 @@ export class ModelMetadataService {
 
   async generateCode(options: CodeGenerationOptions): Promise<string> {
     const query = {
-        populate: ["module", "fields"]
+      populate: ["module", "fields"]
     };
 
-    const model = options.modelId 
-        ? await this.findOne(options.modelId, query) 
-        : await this.findOneByUserKey(options.modelUserKey, query.populate);
+    const model = options.modelId
+      ? await this.findOne(options.modelId, query)
+      : await this.findOneByUserKey(options.modelUserKey, query.populate);
 
     options.fieldIdsForRemoval = model.fields
-        .filter(field => field.isMarkedForRemoval)
-        .map(field => field.id);
+      .filter(field => field.isMarkedForRemoval)
+      .map(field => field.id);
 
     const refreshModelCodeOutput = await this.generateModelCode(options);
     const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
 
     const listViewLayout = model.fields.map(field => ({
-        type: "field",
-        attrs: { 
-            name: `${field.name}`, 
-            sortable: true, 
-            filterable: true 
-        }
+      type: "field",
+      attrs: {
+        name: `${field.name}`,
+        sortable: true,
+        filterable: true
+      }
     }));
 
     const formViewLayout = model.fields.map(field => ({
-        type: "field",
-        attrs: { 
-            name: `${field.name}`
-        }
+      type: "field",
+      attrs: {
+        name: `${field.name}`
+      }
     }));
 
     const resolvedModule = await this.dataSource.getRepository(ModuleMetadata).findOne({
-        where: { id: model.module.id }
+      where: { id: model.module.id }
     });
 
     const viewRepo = this.dataSource.getRepository(ViewMetadata);
@@ -718,82 +740,82 @@ export class ModelMetadataService {
     const menuRepo = this.dataSource.getRepository(MenuItemMetadata);
 
     const modelViews = [
-        {
-            name: `${model.singularName}-list-view`,
-            displayName: `${model.displayName}`,
-            type: 'list',
-            context: "{}",
-            module: resolvedModule,
-            model: model,
-            layout: JSON.stringify({
-                type: "list",
-                attrs: {
-                    pagination: true,
-                    pageSizeOptions: [10, 25, 50],
-                    enableGlobalSearch: true,
-                    create: true,
-                    edit: true,
-                    delete: true
-                },
-                children: listViewLayout
-            }, null, 3)
-        },
-        {
-            name: `${model.singularName}-form-view`,
-            displayName: `${model.displayName}`,
-            type: 'form',
-            context: "{}",
-            module: resolvedModule,
-            model: model,
-            layout: JSON.stringify({
-                type: "form",
-                attrs: { name: "form-1", label: `${model.displayName}`, className: "grid" },
-                children: [
+      {
+        name: `${model.singularName}-list-view`,
+        displayName: `${model.displayName}`,
+        type: 'list',
+        context: "{}",
+        module: resolvedModule,
+        model: model,
+        layout: JSON.stringify({
+          type: "list",
+          attrs: {
+            pagination: true,
+            pageSizeOptions: [10, 25, 50],
+            enableGlobalSearch: true,
+            create: true,
+            edit: true,
+            delete: true
+          },
+          children: listViewLayout
+        }, null, 3)
+      },
+      {
+        name: `${model.singularName}-form-view`,
+        displayName: `${model.displayName}`,
+        type: 'form',
+        context: "{}",
+        module: resolvedModule,
+        model: model,
+        layout: JSON.stringify({
+          type: "form",
+          attrs: { name: "form-1", label: `${model.displayName}`, className: "grid" },
+          children: [
+            {
+              type: "sheet",
+              attrs: { name: "sheet-1" },
+              children: [
+                {
+                  type: "row",
+                  attrs: { name: "group-1", label: "", className: "" },
+                  children: [
                     {
-                        type: "sheet",
-                        attrs: { name: "sheet-1" },
-                        children: [
-                            {
-                                type: "row",
-                                attrs: { name: "group-1", label: "", className: "" },
-                                children: [
-                                    {
-                                        type: "column",
-                                        attrs: { name: "group-1", label: "", className: "col-6" },
-                                        children: formViewLayout
-                                    }
-                                ]
-                            }
-                        ]
+                      type: "column",
+                      attrs: { name: "group-1", label: "", className: "col-6" },
+                      children: formViewLayout
                     }
-                ]
-            }, null, 3)
-        }
+                  ]
+                }
+              ]
+            }
+          ]
+        }, null, 3)
+      }
     ];
 
     for (const view of modelViews) {
-        const existingView = await viewRepo.findOne({ where: { name: view.name } });
+      const existingView = await viewRepo.findOne({ where: { name: view.name } });
 
-        if (!existingView) {
-          const createdView = viewRepo.create(view);
-          await viewRepo.save(createdView);
-        }
+      if (!existingView) {
+        const createdView = viewRepo.create(view);
+        await viewRepo.save(createdView);
+      }
     }
 
     let view = await viewRepo.findOne({ where: { name: `${model.singularName}-list-view` } });
 
     const actionData = {
-        displayName: `${model.displayName} List View`,
-        name: `${model.singularName}-list-view`,
-        type: "solid",
-        domain: "" as any,
-        context: "" as any,
-        customComponent: `/admin/address-master/${model.singularName}/all`,
-        customIsModal: true,
-        serverEndpoint: "",
-        view: view,
-        module: resolvedModule,
-        model: model
+      displayName: `${model.displayName} List View`,
+      name: `${model.singularName}-list-view`,
+      type: "solid",
+      domain: "" as any,
+      context: "" as any,
+      customComponent: `/admin/address-master/${model.singularName}/all`,
+      customIsModal: true,
+      serverEndpoint: "",
+      view: view,
+      module: resolvedModule,
+      model: model
     };
 
     let existingAction = await actionRepo.findOne({ where: { name: actionData.name } });
@@ -806,13 +828,13 @@ export class ModelMetadataService {
     const adminRole = await this.roleService.findRoleByName('Admin');
 
     const menuData = {
-        displayName: `${model.displayName}`,
-        name: `${model.singularName}-menu-item`,
-        sequenceNumber: 1,
-        action: existingAction,
-        module: resolvedModule,
-        roles: [adminRole],
-        parentMenuItemUserKey: ""
+      displayName: `${model.displayName}`,
+      name: `${model.singularName}-menu-item`,
+      sequenceNumber: 1,
+      action: existingAction,
+      module: resolvedModule,
+      roles: [adminRole],
+      parentMenuItemUserKey: ""
     };
 
     let existingMenu = await menuRepo.findOne({ where: { name: menuData.name } });
@@ -905,11 +927,43 @@ export class ModelMetadataService {
     return output;
   }
 
+  async updateUserKey(data: any) {
+    const { modelName, fieldName } = data;
+
+    const model = await this.modelMetadataRepo.findOne({
+        where: { singularName: modelName },
+        relations: ['fields', 'userKeyField'],
+    });
+
+    if (!model) {
+        throw new Error(`Model with name ${modelName} not found`);
+    }
+
+    if (model.userKeyField) {
+      throw new Error(`User key is already set to ${model.userKeyField.name}. No changes were made.`);
+    }
+
+    const fieldToUpdate = model.fields.find(field => field.name === fieldName);
+    if (!fieldToUpdate) {
+        throw new Error(`Field with name ${fieldName} not found in model ${modelName}`);
+    }
+
+    fieldToUpdate.isUserKey = true;
+
+    model.userKeyField = fieldToUpdate;
+
+    await this.modelMetadataRepo.save(model);
+
+    return {
+      message: `User key has been successfully updated to ${fieldName}.`,
+      success: true
+    };
+  }
 
   private async getRelationInverseFields(modelId: number, repo: Repository<FieldMetadata>): Promise<FieldMetadata[]> {
     return await repo.find({
       where: {
-        model : {
+        model: {
           id: modelId
         },
         type: SolidFieldType.relation,

package/src/services/module-metadata.service.ts

@@ -112,7 +112,8 @@ export class ModuleMetadataService {
         return module
       });
     } catch (error) {
-      console.error('Transaction failed:', error);
+      // console.error('Transaction failed:', error);
+      this.logger.error('Transaction failed:', error);
       throw error;
     }
   }
@@ -165,7 +166,8 @@ export class ModuleMetadataService {
       await fs.writeFile(filePath, metadataJson);
 
     } catch (error) {
-      console.error('File creation failed:', error);
+      // console.error('File creation failed:', error);
+      this.logger.error('File creation failed:', error);
       throw new Error('File creation failed, rolling back transaction'); // Trigger rollback
     }
   }
@@ -179,7 +181,8 @@ export class ModuleMetadataService {
         return module
       });
     } catch (error) {
-      console.error('Transaction failed:', error);
+      // console.error('Transaction failed:', error);
+      this.logger.error('Transaction failed:', error);
       throw error;
     }
   }
@@ -251,7 +254,8 @@ export class ModuleMetadataService {
       await fs.writeFile(filePath, updatedContent);
 
     } catch (error) {
-      console.error('File creation failed:', error);
+      // console.error('File creation failed:', error);
+      this.logger.error('File creation failed:', error);
       throw new Error('File creation failed, rolling back transaction'); // Trigger rollback
     }
   }

package/src/services/solid-introspect.service.ts

@@ -128,21 +128,23 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     return !!isSolidDatabaseModule;
   }
 
-  private isModule(provider: InstanceWrapper) {
-    // Check if the provider is a module
+
+  private isModule(provider: InstanceWrapper): boolean {
     const metatype = provider.metatype;
-    return metatype && Reflect.getMetadata('imports', metatype); 
+    // Check if it's a Static Module (Class-Based)
+    if (metatype && typeof metatype === 'function' && Reflect.getMetadata('imports', metatype)) {
+      return true;
+    }
+  
+    // Ensure provider.instance is an object before checking for 'module'
+    if (provider.instance && typeof provider.instance === 'object') {
+      // Check if it's a Dynamic Module (Object-Based)
+      if ('module' in provider.instance && typeof provider.instance.module === 'function') {
+        return true;
+      }
+    }
+  
+    return false;
   }
-  // This method uses the @SolidSeeder decorator to identify if a provider is a seeder
-  // private isSeeder(provider: InstanceWrapper) {
-  //   const { instance } = provider;
-  //   if (!instance) return false;
-
-  //   const seederMetadata = this.reflector.get(
-  //     'SOLID_SERVICE',
-  //     instance.constructor,
-  //   );
-  //   if (!seederMetadata || !seederMetadata.seeder) return false;
-  //   return true;
-  // }
+
 }

package/src/services/view-metadata.service.ts

@@ -137,6 +137,19 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
       return this.repo.save(viewData);
     }
   }
+  async createIfNotPresent(updateSolidViewDto: UpdateViewMetadataDto) {
+    // First check if module already exists using name
+    const existingSolidView = await this.findOneByUserKey(updateSolidViewDto.name);
+
+    // if found
+    if (existingSolidView) {
+    }
+    // if not found - create new 
+    else {
+      const viewData = this.repo.create(updateSolidViewDto);
+      return this.repo.save(viewData);
+    }
+  }
 
   // END: Custom Service Methods
 

package/src/subscribers/softDeleteAwareEventSubscriber.subscriber.ts

@@ -23,7 +23,8 @@ export class SoftDeleteAwareEventSubscriber implements EntitySubscriberInterface
         } else {
             entity.deletedTracker = `${entity.deletedAt}`; // Set trackerDate to the deleted Date
         }
-        console.log('TrackerDate updated:', entity.trackerDate);
+        // console.log('TrackerDate updated:', entity.trackerDate);
+        this.logger.debug(`TrackerDate updated: ${entity.trackerDate}`);
 
     }
 

package/dist/commands/basic.command.d.ts

@@ -1,19 +0,0 @@
-import { CommandRunner } from 'nest-commander';
-interface BasicCommandOptions {
-    string?: string;
-    boolean?: boolean;
-    number?: number;
-}
-export declare class BasicCommand extends CommandRunner {
-    constructor();
-    run(passedParam: string[], options?: BasicCommandOptions): Promise<void>;
-    parseNumber(val: string): number;
-    parseString(val: string): string;
-    parseBoolean(val: string): boolean;
-    runWithString(param: string[], option: string): void;
-    runWithNumber(param: string[], option: number): void;
-    runWithBoolean(param: string[], option: boolean): void;
-    runWithNone(param: string[]): void;
-}
-export {};
-//# sourceMappingURL=basic.command.d.ts.map

package/dist/commands/basic.command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"basic.command.d.ts","sourceRoot":"","sources":["../../src/commands/basic.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAEhE,UAAU,mBAAmB;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBACa,YAAa,SAAQ,aAAa;;IAKrC,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9E,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAKhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAKhC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIlC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIpD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIpD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAItD,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;CAGrC"}

package/dist/commands/basic.command.js

@@ -1,79 +0,0 @@
-"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 __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasicCommand = void 0;
-const nest_commander_1 = require("nest-commander");
-let BasicCommand = class BasicCommand extends nest_commander_1.CommandRunner {
-    constructor() {
-        super();
-    }
-    async run(passedParam, options) {
-        console.log(`passed params are: `, passedParam);
-        console.log(`options are: `, options);
-        if (options?.boolean !== undefined && options?.boolean !== null) {
-            this.runWithBoolean(passedParam, options.boolean);
-        }
-        else if (options?.number) {
-            this.runWithNumber(passedParam, options.number);
-        }
-        else if (options?.string) {
-            this.runWithString(passedParam, options.string);
-        }
-        else {
-            this.runWithNone(passedParam);
-        }
-    }
-    parseNumber(val) {
-        return Number(val);
-    }
-    parseString(val) {
-        return val;
-    }
-    parseBoolean(val) {
-        return JSON.parse(val);
-    }
-    runWithString(param, option) {
-        console.log({ param, string: option });
-    }
-    runWithNumber(param, option) {
-        console.log({ param, number: option });
-    }
-    runWithBoolean(param, option) {
-        console.log({ param, boolean: option });
-    }
-    runWithNone(param) {
-        console.log({ param });
-    }
-};
-exports.BasicCommand = BasicCommand;
-__decorate([
-    (0, nest_commander_1.Option)({ flags: '-n, --number [number]', description: 'A basic number parser' }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Number)
-], BasicCommand.prototype, "parseNumber", null);
-__decorate([
-    (0, nest_commander_1.Option)({ flags: '-s, --string [string]', description: 'A string return' }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", String)
-], BasicCommand.prototype, "parseString", null);
-__decorate([
-    (0, nest_commander_1.Option)({ flags: '-b, --boolean [boolean]', description: 'A boolean parser' }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Boolean)
-], BasicCommand.prototype, "parseBoolean", null);
-exports.BasicCommand = BasicCommand = __decorate([
-    (0, nest_commander_1.Command)({ name: 'basic', description: 'A parameter parse' }),
-    __metadata("design:paramtypes", [])
-], BasicCommand);
-//# sourceMappingURL=basic.command.js.map

package/dist/commands/basic.command.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"basic.command.js","sourceRoot":"","sources":["../../src/commands/basic.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgE;AASzD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,8BAAa;IAC3C;QACI,KAAK,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAqB,EAAE,OAA6B;QAC1D,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,OAAO,EAAE,OAAO,KAAK,SAAS,IAAI,OAAO,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC9D,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;IAGD,WAAW,CAAC,GAAW;QACnB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAGD,WAAW,CAAC,GAAW;QACnB,OAAO,GAAG,CAAC;IACf,CAAC;IAGD,YAAY,CAAC,GAAW;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,KAAe,EAAE,MAAc;QACzC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,aAAa,CAAC,KAAe,EAAE,MAAc;QACzC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,KAAe,EAAE,MAAe;QAC3C,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,KAAe;QACvB,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3B,CAAC;CACJ,CAAA;AAlDY,oCAAY;AAqBrB;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC;;;;+CAGhF;AAGD;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;;;;+CAG1E;AAGD;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;;;;gDAG7E;uBAjCQ,YAAY;IADxB,IAAA,wBAAO,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC;;GAChD,YAAY,CAkDxB"}