@o3r/components 11.6.0-prerelease.2 → 11.6.0-prerelease.20

package/builders/component-extractor/helpers/component/component-class.extractor.d.ts

@@ -1,6 +1,6 @@
 import { logging } from '@angular-devkit/core';
-import type { ComponentStructure } from '@o3r/components';
 import * as ts from 'typescript';
+import type { ComponentStructure } from '@o3r/components';
 /** Information extracted from a component file */
 export interface ComponentInformation {
     /** Name of the component */
@@ -34,6 +34,7 @@ export declare class ComponentClassExtractor {
     /** List of interfaces that a configurable component can implement */
     readonly CONFIGURABLE_INTERFACES: string[];
     /**
+     * Component class extractor constructor
      * @param source Typescript SourceFile node of the file
      * @param logger Logger
      * @param filePath Path to the file to extract the data from
@@ -41,26 +42,22 @@ export declare class ComponentClassExtractor {
     constructor(source: ts.SourceFile, logger: logging.LoggerApi, filePath: string);
     /**
      * Indicates if the given decorator is a component decorator.
-     *
      * @param decoratorNode The decorator node to test
      */
     private isComponentDecorator;
     /**
      * Get the component type from the given decorator node.
-     *
      * @param decoratorNode The decorator node to get the component type from
      */
     private getComponentType;
     /**
      * Get the component selector from the given decorator node.
-     *
      * @param decoratorNode The decorator node to get the component selector from
      */
     private getComponentSelector;
     /**
      * Sanitize component type by removing extra quotes
      * Example: "'Page'" becomes 'Page'
-     *
      * @param type
      * @private
      */
@@ -68,15 +65,12 @@ export declare class ComponentClassExtractor {
     private getComponentStructure;
     /**
      * Extract component information of a given class node
-     *
      * @param classNode Typescript node of a class
      */
     private getComponentInformation;
     /**
      * Get the file path of the given class from the import
-     *
-     * @param contextName Name of the class to find in the imports
-     * @param className
+     * @param className Name of the class to find in the imports
      */
     private getFilePath;
     /**

package/builders/component-extractor/helpers/component/component-class.extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-class.extractor.d.ts","sourceRoot":"","sources":["../../../../../builders/component-extractor/helpers/component/component-class.extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAK1D,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,kDAAkD;AAClD,MAAM,WAAW,oBAAoB;IACnC,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,eAAe,EAAE,OAAO,CAAC;IACzB,gDAAgD;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,IAAI,EAAE,kBAAkB,CAAC;IACzB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,qBAAa,uBAAuB;IAUf,MAAM,EAAE,EAAE,CAAC,UAAU;IAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAA4B,QAAQ,EAAE,MAAM;IAR7G,qEAAqE;IACrE,SAAgB,uBAAuB,EAAE,MAAM,EAAE,CAA4E;IAE7H;;;;OAIG;gBACgB,MAAM,EAAE,EAAE,CAAC,UAAU,EAAmB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAS,QAAQ,EAAE,MAAM;IAG7G;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAexB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,qBAAqB;IAc7B;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAwD/B;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAsBnB;;OAEG;IACI,OAAO;CAkBf"}
+{"version":3,"file":"component-class.extractor.d.ts","sourceRoot":"","sources":["../../../../../builders/component-extractor/helpers/component/component-class.extractor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EACV,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAEzB,kDAAkD;AAClD,MAAM,WAAW,oBAAoB;IACnC,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,eAAe,EAAE,OAAO,CAAC;IACzB,gDAAgD;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,IAAI,EAAE,kBAAkB,CAAC;IACzB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,qBAAa,uBAAuB;IAUf,MAAM,EAAE,EAAE,CAAC,UAAU;IAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAA4B,QAAQ,EAAE,MAAM;IAT7G,qEAAqE;IACrE,SAAgB,uBAAuB,EAAE,MAAM,EAAE,CAA4E;IAE7H;;;;;OAKG;gBACgB,MAAM,EAAE,EAAE,CAAC,UAAU,EAAmB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAS,QAAQ,EAAE,MAAM;IAE7G;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,qBAAqB;IAkB7B;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IA2D/B;;;OAGG;IACH,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACI,OAAO;CAiBf"}

package/builders/component-extractor/helpers/component/component-class.extractor.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentClassExtractor = void 0;
 const tslib_1 = require("tslib");
-const extractors_1 = require("@o3r/extractors");
-const schematics_1 = require("@o3r/schematics");
 const fs = tslib_1.__importStar(require("node:fs"));
 const path = tslib_1.__importStar(require("node:path"));
+const extractors_1 = require("@o3r/extractors");
+const schematics_1 = require("@o3r/schematics");
 const ts = tslib_1.__importStar(require("typescript"));
 /**
  * Component class extractor.
  */
 class ComponentClassExtractor {
     /**
+     * Component class extractor constructor
      * @param source Typescript SourceFile node of the file
      * @param logger Logger
      * @param filePath Path to the file to extract the data from
@@ -25,7 +26,6 @@ class ComponentClassExtractor {
     }
     /**
      * Indicates if the given decorator is a component decorator.
-     *
      * @param decoratorNode The decorator node to test
      */
     isComponentDecorator(decoratorNode) {
@@ -33,29 +33,25 @@ class ComponentClassExtractor {
     }
     /**
      * Get the component type from the given decorator node.
-     *
      * @param decoratorNode The decorator node to get the component type from
      */
     getComponentType(decoratorNode) {
-        if (ts.isCallExpression(decoratorNode.expression)) {
-            if (decoratorNode.expression.expression.getText(this.source) === 'O3rComponent') {
-                const arg1 = decoratorNode.expression.arguments[0];
-                if (ts.isObjectLiteralExpression(arg1)) {
-                    return this.getComponentStructure(arg1.properties
-                        .find((prop) => prop.name?.getText(this.source) === 'componentType')
-                        ?.initializer.getText(this.source));
-                }
+        if (ts.isCallExpression(decoratorNode.expression) && decoratorNode.expression.expression.getText(this.source) === 'O3rComponent') {
+            const arg1 = decoratorNode.expression.arguments[0];
+            if (ts.isObjectLiteralExpression(arg1)) {
+                return this.getComponentStructure(arg1.properties
+                    .find((prop) => prop.name?.getText(this.source) === 'componentType')
+                    ?.initializer.getText(this.source));
             }
         }
     }
     /**
      * Get the component selector from the given decorator node.
-     *
      * @param decoratorNode The decorator node to get the component selector from
      */
     getComponentSelector(decoratorNode) {
         if (this.isComponentDecorator(decoratorNode)) {
-            const matches = /selector:\s*['"](.*)['"]/.exec(decoratorNode.getText(this.source));
+            const matches = /selector:\s*["'](.*)["']/.exec(decoratorNode.getText(this.source));
             if (matches) {
                 return matches[1];
             }
@@ -64,7 +60,6 @@ class ComponentClassExtractor {
     /**
      * Sanitize component type by removing extra quotes
      * Example: "'Page'" becomes 'Page'
-     *
      * @param type
      * @private
      */
@@ -72,24 +67,27 @@ class ComponentClassExtractor {
         if (!type) {
             return;
         }
-        return type.replaceAll(/['"]/g, '');
+        return type.replaceAll(/["']/g, '');
     }
     getComponentStructure(type) {
         const sanitizedType = this.sanitizeComponentType(type);
         switch (sanitizedType) {
-            case 'Block':
+            case 'Block': {
                 return 'BLOCK';
-            case 'Page':
+            }
+            case 'Page': {
                 return 'PAGE';
-            case 'ExposedComponent':
+            }
+            case 'ExposedComponent': {
                 return 'EXPOSED_COMPONENT';
-            default:
+            }
+            default: {
                 return 'COMPONENT';
+            }
         }
     }
     /**
      * Extract component information of a given class node
-     *
      * @param classNode Typescript node of a class
      */
     getComponentInformation(classNode) {
@@ -107,16 +105,17 @@ class ComponentClassExtractor {
                     const interfaceValue = implNode.getText(this.source);
                     if (!configName && regExp.test(interfaceValue)) {
                         configName = interfaceValue.replace(/.*<(.*?)\s*(,\s*('\w*')\s*)?>.*/, '$1');
-                        isDynamic = /^Dynamic/.test(interfaceValue);
+                        isDynamic = interfaceValue.startsWith('Dynamic');
                     }
                     else if (!contextName && interfaceValue.endsWith('Context')) {
                         contextName = interfaceValue;
                     }
                     else {
                         switch (interfaceValue) {
-                            case 'LinkableToRuleset':
+                            case 'LinkableToRuleset': {
                                 linkableToRuleset = true;
                                 break;
+                            }
                         }
                     }
                 });
@@ -138,19 +137,19 @@ class ComponentClassExtractor {
         const localizationFiles = (0, extractors_1.getLocalizationFileFromAngularElement)(classNode);
         const localizationKeys = (localizationFiles || []).reduce((acc, file) => {
             const resolvedFilePath = path.resolve(path.dirname(this.filePath), file);
-            const data = JSON.parse(fs.readFileSync(resolvedFilePath, 'utf-8'));
+            const data = JSON.parse(fs.readFileSync(resolvedFilePath, 'utf8'));
             return acc.concat(Object.keys(data));
         }, []);
-        return name && type ? {
-            name, configName, contextName, isDynamicConfig: isDynamic, type, selector, linkableToRuleset,
-            ...(localizationKeys.length ? { localizationKeys } : {})
-        } : undefined;
+        return name && type
+            ? {
+                name, configName, contextName, isDynamicConfig: isDynamic, type, selector, linkableToRuleset,
+                ...(localizationKeys.length > 0 ? { localizationKeys } : {})
+            }
+            : undefined;
     }
     /**
      * Get the file path of the given class from the import
-     *
-     * @param contextName Name of the class to find in the imports
-     * @param className
+     * @param className Name of the class to find in the imports
      */
     getFilePath(className) {
         if (!className) {
@@ -158,15 +157,13 @@ class ComponentClassExtractor {
         }
         let res;
         this.source.forEachChild((node) => {
-            if (!res && ts.isImportDeclaration(node)) {
-                if (new RegExp(className).test(node.getText(this.source))) {
-                    const children = node.getChildren(this.source);
-                    res = children[children.length - 2].getText(this.source).replace(/^['"](.*)['"]/, '$1');
-                }
+            if (!res && ts.isImportDeclaration(node) && new RegExp(className).test(node.getText(this.source))) {
+                const children = node.getChildren(this.source);
+                res = children.at(-2)?.getText(this.source).replace(/^["'](.*)["']/, '$1');
             }
         });
         if (res && /^\./.test(res)) {
-            res = path.resolve(path.dirname(this.filePath), `${res}.ts`).replace(/[\\/]/g, '/');
+            res = path.resolve(path.dirname(this.filePath), `${res}.ts`).replace(/[/\\]/g, '/');
         }
         return res;
     }

package/builders/component-extractor/helpers/component/component-config.extractor.d.ts

@@ -1,7 +1,7 @@
 import { logging } from '@angular-devkit/core';
-import type { ConfigProperty } from '@o3r/components';
 import type { CategoryDescription } from '@o3r/core';
 import * as ts from 'typescript';
+import type { ConfigProperty } from '@o3r/components';
 /** Information extracted from a configuration file */
 export interface ConfigurationInformation {
     /** Name of the configuration */
@@ -16,7 +16,6 @@ export interface ConfigurationInformation {
     categories?: CategoryDescription[];
     /**
      * Determine if the configuration is runtime
-     *
      * @note the current implementation set this value as `undefined` for all the components (only AppBuildConfiguration is set to `false` and AppRuntimeConfiguration is set to `true`)
      */
     runtime?: boolean;
@@ -56,6 +55,7 @@ export declare class ComponentConfigExtractor {
     /** Parser of configuration doc */
     private readonly configDocParser;
     /**
+     * Configuration file extractor constructor
      * @param libraryName
      * @param strictMode
      * @param source Typescript SourceFile node of the file
@@ -67,20 +67,17 @@ export declare class ComponentConfigExtractor {
     constructor(libraryName: string, strictMode: boolean, source: ts.SourceFile, logger: logging.LoggerApi, filePath: string, checker: ts.TypeChecker, libraries?: string[]);
     /**
      * Handle error cases depending on the mode: throwing errors or logging warnings
-     *
      * @param message the warning message to be logged
      * @param errorMessage the error message to be thrown. If not provided, the warning one will be used
      */
     private handleErrorCases;
     /**
      * Verifies if an UnionType has strings elements.
-     *
      * @param node Typescript node to be checked
      */
     private hasStringElements;
     /**
      * Returns the name of the symbol
-     *
      * @param symbol
      */
     private getSymbolName;
@@ -88,7 +85,6 @@ export declare class ComponentConfigExtractor {
      * Get the type from a property
      * If the type refers to a NestedConfiguration type, then it will be replaced with element
      * and a reference to the object will be returned
-     *
      * @param node Typescript node to extract the data from
      * @param configurationWrapper the configuration wrapper containing nestedConfig and union type strings
      * @param source
@@ -96,7 +92,6 @@ export declare class ComponentConfigExtractor {
     private getTypeFromNode;
     /**
      * Extract the property data from an interface property signature
-     *
      * @param propertyNode Node to extract the data from
      * @param configurationWrapper the configuration wrapper containing nestedConfig and union type strings
      * @param source
@@ -104,14 +99,12 @@ export declare class ComponentConfigExtractor {
     private extractPropertySignatureData;
     /**
      * Extract the possible options in case of an enum node
-     *
      * @param node Node to extract the data from
      * @param source
      */
     private extractOptionsForEnum;
     /**
      * Get the configuration properties from a given interface node
-     *
      * @param interfaceNode Node of a typescript interface
      * @param configurationWrapper
      * @param source
@@ -119,20 +112,17 @@ export declare class ComponentConfigExtractor {
     private getPropertiesFromConfigurationInterface;
     /**
      * Extract the default value of a configuration interface
-     *
      * @param variableNode Typescript node of the default constant implementing the interface
      * @param configurationInformationWrapper Configuration object extracted from the interface
      */
     private getDefaultValueFromConfigurationInterface;
     /**
      * Remove all quotation marks from the input string to prevent any ""my_string"" and "'my_string'" in the metadata file
-     *
      * @param inputString that needs to be format
      */
     private removeQuotationMarks;
     /**
      * Check is name is typed as a known nested configuration
-     *
      * @param propertyName
      * @param nestedConfiguration List of nested configuration
      * @param libraries
@@ -140,7 +130,6 @@ export declare class ComponentConfigExtractor {
     private isTypedNestedConfiguration;
     /**
      * This function checks if the interface name given as parameter is extended by the interface node
-     *
      * @param interfaceDeclaration
      * @param extendedInterfaceNames
      * @param source
@@ -148,13 +137,11 @@ export declare class ComponentConfigExtractor {
     private isExtending;
     /**
      * Fill the nested configuration with default values
-     *
      * @param nestedConfigurationInformation
      */
     private fillNestedConfigurationDefaultValues;
     /**
      * Collect nested configuration information
-     *
      * @param source
      */
     private collectNestedConfiguration;

package/builders/component-extractor/helpers/component/component-config.extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-config.extractor.d.ts","sourceRoot":"","sources":["../../../../../builders/component-extractor/helpers/component/component-config.extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAwD,MAAM,iBAAiB,CAAC;AAC5G,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,WAAW,CAAC;AAIrE,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,sDAAsD;AACtD,MAAM,WAAW,wBAAwB;IACvC,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IAEb,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACnC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,8CAA8C;IAC9C,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,kGAAkG;AAClG,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,iEAAiE;AACjE,MAAM,WAAW,+BAA+B;IAC9C,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;IACjD,mBAAmB,EAAE,wBAAwB,EAAE,CAAC;CACjD;AAED,mCAAmC;AACnC,qBAAa,wBAAwB;IAuBjC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IACpB,MAAM,EAAE,EAAE,CAAC,UAAU;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,OAAO,EAAE,EAAE,CAAC,WAAW;IACvB,SAAS,EAAE,MAAM,EAAE;IA5B5B,+FAA+F;IAC/F,SAAgB,kCAAkC,EAAE,MAAM,EAAE,CAAmI;IAE/L,6CAA6C;IAC7C,SAAgB,wBAAwB,EAAE,MAAM,EAAE,CAAyE;IAE3H,gDAAgD;IAChD,SAAgB,oBAAoB,aAAa;IAEjD,kCAAkC;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAElD;;;;;;;;OAQG;gBAEgB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,OAAO,EAC7B,MAAM,EAAE,EAAE,CAAC,UAAU,EACX,MAAM,EAAE,OAAO,CAAC,SAAS,EACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,SAAS,GAAE,MAAM,EAAO;IAMjC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAIrB;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAwGvB;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;;;;OAMG;IACH,OAAO,CAAC,uCAAuC;IAuD/C;;;;;OAKG;IACH,OAAO,CAAC,yCAAyC;IAwEjD;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;;;OAMG;IACH,OAAO,CAAC,0BAA0B;IAyBlC;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAWnB;;;;OAIG;IACH,OAAO,CAAC,oCAAoC;IA2B5C;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IA0BlC;;OAEG;IACI,OAAO;CA0Bf"}
+{"version":3,"file":"component-config.extractor.d.ts","sourceRoot":"","sources":["../../../../../builders/component-extractor/helpers/component/component-config.extractor.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,WAAW,CAAC;AAOnB,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,iBAAiB,CAAC;AAEzB,sDAAsD;AACtD,MAAM,WAAW,wBAAwB;IACvC,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IAEb,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACnC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,8CAA8C;IAC9C,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,kGAAkG;AAClG,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,iEAAiE;AACjE,MAAM,WAAW,+BAA+B;IAC9C,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;IACjD,mBAAmB,EAAE,wBAAwB,EAAE,CAAC;CACjD;AAED,mCAAmC;AACnC,qBAAa,wBAAwB;IAwBjC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IACpB,MAAM,EAAE,EAAE,CAAC,UAAU;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,OAAO,EAAE,EAAE,CAAC,WAAW;IACvB,SAAS,EAAE,MAAM,EAAE;IA7B5B,+FAA+F;IAC/F,SAAgB,kCAAkC,EAAE,MAAM,EAAE,CAAmI;IAE/L,6CAA6C;IAC7C,SAAgB,wBAAwB,EAAE,MAAM,EAAE,CAAyE;IAE3H,gDAAgD;IAChD,SAAgB,oBAAoB,aAAa;IAEjD,kCAAkC;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAElD;;;;;;;;;OASG;gBAEgB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,OAAO,EAC7B,MAAM,EAAE,EAAE,CAAC,UAAU,EACX,MAAM,EAAE,OAAO,CAAC,SAAS,EACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,SAAS,GAAE,MAAM,EAAO;IAKjC;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAwGvB;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;;;OAKG;IACH,OAAO,CAAC,uCAAuC;IAkD/C;;;;OAIG;IACH,OAAO,CAAC,yCAAyC;IAsEjD;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAyBlC;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAWnB;;;OAGG;IACH,OAAO,CAAC,oCAAoC;IA2B5C;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAwBlC;;OAEG;IACI,OAAO;CA0Bf"}

package/builders/component-extractor/helpers/component/component-config.extractor.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentConfigExtractor = void 0;
 const tslib_1 = require("tslib");
+const node_fs_1 = require("node:fs");
 const extractors_1 = require("@o3r/extractors");
 const schematics_1 = require("@o3r/schematics");
-const node_fs_1 = require("node:fs");
 const ts = tslib_1.__importStar(require("typescript"));
 /** Configuration file extractor */
 class ComponentConfigExtractor {
     /**
+     * Configuration file extractor constructor
      * @param libraryName
      * @param strictMode
      * @param source Typescript SourceFile node of the file
@@ -35,21 +36,19 @@ class ComponentConfigExtractor {
     }
     /**
      * Handle error cases depending on the mode: throwing errors or logging warnings
-     *
      * @param message the warning message to be logged
      * @param errorMessage the error message to be thrown. If not provided, the warning one will be used
      */
     handleErrorCases(message, errorMessage) {
-        if (!this.strictMode) {
-            this.logger.warn(`${message.replace(/([^.])$/, '$1.')} Will throw in strict mode.`);
+        if (this.strictMode) {
+            throw new schematics_1.O3rCliError(errorMessage || message);
         }
         else {
-            throw new schematics_1.O3rCliError(errorMessage || message);
+            this.logger.warn(`${message.replace(/([^.])$/, '$1.')} Will throw in strict mode.`);
         }
     }
     /**
      * Verifies if an UnionType has strings elements.
-     *
      * @param node Typescript node to be checked
      */
     hasStringElements(node) {
@@ -57,7 +56,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Returns the name of the symbol
-     *
      * @param symbol
      */
     getSymbolName(symbol) {
@@ -67,7 +65,6 @@ class ComponentConfigExtractor {
      * Get the type from a property
      * If the type refers to a NestedConfiguration type, then it will be replaced with element
      * and a reference to the object will be returned
-     *
      * @param node Typescript node to extract the data from
      * @param configurationWrapper the configuration wrapper containing nestedConfig and union type strings
      * @param source
@@ -89,9 +86,9 @@ class ComponentConfigExtractor {
                     && this.libraries.includes(statement.moduleSpecifier.text)
                     && !!statement.importClause?.namedBindings
                     && ts.isNamedImports(statement.importClause.namedBindings)
-                    && !!statement.importClause.namedBindings.elements.find((nameBinding) => ts.isImportSpecifier(nameBinding)
+                    && !!statement.importClause.namedBindings.elements.some((nameBinding) => ts.isImportSpecifier(nameBinding)
                         && ts.isIdentifier(nameBinding.name)
-                        && nameBinding.name.escapedText === typeNode.typeName.getText()));
+                        && nameBinding.name.escapedText.toString() === typeNode.typeName.getText()));
                 if (importFromLibraries) {
                     return {
                         type: 'element[]',
@@ -105,7 +102,7 @@ class ComponentConfigExtractor {
                     const type = this.checker.getTypeFromTypeNode(typeNode);
                     const baseTypes = type.getBaseTypes();
                     const symbolName = this.getSymbolName(type.symbol || type.aliasSymbol);
-                    const alreadyExtracted = !!configurationWrapper.nestedConfiguration.find((c) => c.name === symbolName);
+                    const alreadyExtracted = configurationWrapper.nestedConfiguration.some((c) => c.name === symbolName);
                     const extendsNested = !!baseTypes?.some((baseType) => this.getSymbolName(baseType.symbol).match(/^NestedConfiguration$/));
                     if (extendsNested && !alreadyExtracted) {
                         const nestedFilePath = type.symbol.parent.declarations[0].fileName;
@@ -139,7 +136,7 @@ class ComponentConfigExtractor {
             if (nodeType.isUnion()) {
                 return {
                     type: 'enum',
-                    choices: nodeType.types.map((type) => type.isLiteral() && type.isStringLiteral() && type.value || '')
+                    choices: nodeType.types.map((type) => (type.isLiteral() && type.isStringLiteral() && type.value) || '')
                 };
             }
             return { type: this.DEFAULT_UNKNOWN_TYPE };
@@ -168,7 +165,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Extract the property data from an interface property signature
-     *
      * @param propertyNode Node to extract the data from
      * @param configurationWrapper the configuration wrapper containing nestedConfig and union type strings
      * @param source
@@ -179,7 +175,7 @@ class ComponentConfigExtractor {
         const res = {
             description: configDocInfo?.description || '',
             category: configDocInfo?.category,
-            label: configDocInfo?.label ? configDocInfo.label : name.replace(/([A-Z])/g, ' $1'),
+            label: configDocInfo?.label || name.replace(/([A-Z])/g, ' $1'),
             name,
             type: 'unknown',
             widget: configDocInfo?.widget,
@@ -200,7 +196,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Extract the possible options in case of an enum node
-     *
      * @param node Node to extract the data from
      * @param source
      */
@@ -218,7 +213,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Get the configuration properties from a given interface node
-     *
      * @param interfaceNode Node of a typescript interface
      * @param configurationWrapper
      * @param source
@@ -238,19 +232,14 @@ class ComponentConfigExtractor {
                     const content = extendedInterfaceNode.getText(source);
                     isConfiguration = isConfiguration || this.CONFIGURATION_INTERFACES.some((r) => r.test(content));
                     if (typeof runtime === 'undefined') {
-                        if (new RegExp('AppBuildConfiguration').test(content)) {
-                            runtime = false;
-                        }
-                        else {
-                            runtime = new RegExp('AppRuntimeConfiguration').test(content) || undefined;
-                        }
+                        runtime = new RegExp('AppBuildConfiguration').test(content) ? false : new RegExp('AppRuntimeConfiguration').test(content) || undefined;
                     }
                 });
             }
             else if (isConfiguration && ts.isPropertySignature(node)) {
                 const property = this.extractPropertySignatureData(node, configurationWrapper, source);
                 properties.push(property);
-                if (property.category && categoriesOnProps.indexOf(property.category) === -1) {
+                if (property.category && !categoriesOnProps.includes(property.category)) {
                     categoriesOnProps.push(property.category);
                 }
             }
@@ -265,7 +254,7 @@ class ComponentConfigExtractor {
         const configDocInfo = this.configDocParser.parseConfigDocFromNode(source, interfaceNode);
         if (configDocInfo && configDocInfo.categories) {
             for (const describedCategory of configDocInfo.categories) {
-                if (categoriesOnProps.indexOf(describedCategory.name) === -1) {
+                if (!categoriesOnProps.includes(describedCategory.name)) {
                     this.handleErrorCases(`Description found for category "${describedCategory.name}" but no property has this category.`);
                 }
             }
@@ -274,7 +263,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Extract the default value of a configuration interface
-     *
      * @param variableNode Typescript node of the default constant implementing the interface
      * @param configurationInformationWrapper Configuration object extracted from the interface
      */
@@ -312,10 +300,8 @@ class ComponentConfigExtractor {
                                                                 && this.isTypedNestedConfiguration(property.reference.name, configurationInformationWrapper, this.libraries)) {
                                                                 let defaultValuesMapArrayItem = {};
                                                                 arrayItem.forEachChild((arrayItemProperty) => {
-                                                                    if (ts.isPropertyAssignment(arrayItemProperty)) {
-                                                                        if (ts.isStringLiteral(arrayItemProperty.name)) {
-                                                                            arrayItemProperty.name.getText(this.source);
-                                                                        }
+                                                                    if (ts.isPropertyAssignment(arrayItemProperty) && ts.isStringLiteral(arrayItemProperty.name)) {
+                                                                        arrayItemProperty.name.getText(this.source);
                                                                     }
                                                                     // Build the property map pushing all the key/value from the default config
                                                                     // getChildAt(0, this.source) is the key, getChildAt(1, this.source) the ":" and getChildAt(2, this.source) the value
@@ -327,7 +313,7 @@ class ComponentConfigExtractor {
                                                                 property.values.push(defaultValuesMapArrayItem);
                                                             }
                                                             else {
-                                                                console.warn(`Unsupported type found will be ignored with kind = ${arrayItem.kind} and value = ${arrayItem.getText(this.source)}`);
+                                                                this.logger.warn(`Unsupported type found will be ignored with kind = ${arrayItem.kind} and value = ${arrayItem.getText(this.source)}`);
                                                             }
                                                         });
                                                         if (typeReplacement) {
@@ -352,15 +338,13 @@ class ComponentConfigExtractor {
     }
     /**
      * Remove all quotation marks from the input string to prevent any ""my_string"" and "'my_string'" in the metadata file
-     *
      * @param inputString that needs to be format
      */
     removeQuotationMarks(inputString) {
-        return inputString.replace(/^['"](.*)['"]$/, '$1');
+        return inputString.replace(/^["'](.*)["']$/, '$1');
     }
     /**
      * Check is name is typed as a known nested configuration
-     *
      * @param propertyName
      * @param nestedConfiguration List of nested configuration
      * @param libraries
@@ -388,7 +372,6 @@ class ComponentConfigExtractor {
     }
     /**
      * This function checks if the interface name given as parameter is extended by the interface node
-     *
      * @param interfaceDeclaration
      * @param extendedInterfaceNames
      * @param source
@@ -405,7 +388,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Fill the nested configuration with default values
-     *
      * @param nestedConfigurationInformation
      */
     fillNestedConfigurationDefaultValues(nestedConfigurationInformation) {
@@ -436,7 +418,6 @@ class ComponentConfigExtractor {
     }
     /**
      * Collect nested configuration information
-     *
      * @param source
      */
     collectNestedConfiguration(source) {
@@ -448,15 +429,13 @@ class ComponentConfigExtractor {
                     choices: this.extractOptionsForEnum(node.type, source)
                 });
             }
-            if (ts.isInterfaceDeclaration(node)) {
-                // If it extends NestedConfiguration, we consider it as an independent NestedConfig
-                if (this.isExtending(node, [/NestedConfiguration/], source)) {
-                    let nestedConfigurationInformation = this.getPropertiesFromConfigurationInterface(node, configurationInformationWrapper, source);
-                    nestedConfigurationInformation = this.fillNestedConfigurationDefaultValues(nestedConfigurationInformation);
-                    if (nestedConfigurationInformation) {
-                        // We add it to the list of Nested config if the result is not undefined
-                        configurationInformationWrapper.nestedConfiguration.push(nestedConfigurationInformation);
-                    }
+            if (ts.isInterfaceDeclaration(node) // If it extends NestedConfiguration, we consider it as an independent NestedConfig
+                && this.isExtending(node, [/NestedConfiguration/], source)) {
+                let nestedConfigurationInformation = this.getPropertiesFromConfigurationInterface(node, configurationInformationWrapper, source);
+                nestedConfigurationInformation = this.fillNestedConfigurationDefaultValues(nestedConfigurationInformation);
+                if (nestedConfigurationInformation) {
+                    // We add it to the list of Nested config if the result is not undefined
+                    configurationInformationWrapper.nestedConfiguration.push(nestedConfigurationInformation);
                 }
             }
         });