[cascading] from release/9.0.0-rc to main

apps/github-cascading-app/src/cascading/cascading-probot.ts

@@ -142,7 +142,11 @@ export class CascadingProbot extends Cascading {
   /** @inheritdoc */
   protected async getBranches() {
     this.logger.debug('List remote branches');
-    const res = await this.options.octokit.repos.listBranches(this.options.repo);
+    const res = await this.options.octokit.repos.listBranches({
+      ...this.options.repo,
+      // eslint-disable-next-line @typescript-eslint/naming-convention, camelcase
+      per_page: 100
+    });
     return res.data.map(({name}) => name);
   }
 

apps/github-cascading-app/src/cascading/cascading.ts

@@ -344,7 +344,7 @@ export abstract class Cascading {
 
     const currentBranch = cascadingBranches[branchIndex];
     const targetBranch = cascadingBranches[branchIndex + 1];
-    const cascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch);
+    let cascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch);
     const isAhead = await this.isBranchAhead(currentBranch.branch, targetBranch.branch);
 
     if (!isAhead) {
@@ -373,6 +373,7 @@ export abstract class Cascading {
         }
         const conflictCascadingBranch = this.determineCascadingBranchName(currentBranch.semver?.format() || currentBranch.branch, targetBranch.semver?.format() || targetBranch.branch, true);
         await this.createBranch(conflictCascadingBranch, currentBranch.branch);
+        cascadingBranch = conflictCascadingBranch;
       }
     }
     await this.createPullRequestWithMessage(cascadingBranch, currentBranch.branch, targetBranch.branch, config);

packages/@ama-sdk/schematics/schematics/typescript/shell/schema.json

@@ -6,13 +6,13 @@
   "properties": {
     "name": {
       "type": "string",
-      "description": "Project name (NPM package scope)",
-      "x-prompt": "Project name (NPM package scope)?"
+      "description": "Project name (NPM package scope, package.json name will be @{projectName}/{packageName})",
+      "x-prompt": "Project name (NPM package scope, package.json name will be @{projectName}/{packageName})?"
     },
     "package": {
       "type": "string",
-      "description": "Package name",
-      "x-prompt": "Package name?",
+      "description": "Package name (package.json name will be @{projectName}/{packageName})",
+      "x-prompt": "Package name (package.json name will be @{projectName}/{packageName})?",
       "default": "sdk"
     },
     "description": {

packages/@ama-sdk/schematics/schematics/typescript/shell/schema.ts

@@ -1,10 +1,10 @@
 import type { JsonObject } from '@angular-devkit/core';
 
 export interface NgGenerateTypescriptSDKShellSchematicsSchema extends JsonObject {
-  /** Project name (NPM package scope) */
+  /** Project name (NPM package scope, package.json name will be @{projectName}/{packageName}) */
   name: string;
 
-  /** Package name */
+  /** Package name (package.json name will be @{projectName}/{packageName}) */
   package: string;
 
   /** Project description */

packages/@o3r/components/builders/component-extractor/helpers/component/component-config.extractor.ts

@@ -162,7 +162,7 @@ export class ComponentConfigExtractor {
         } else if (configurationWrapper) {
           const type = this.checker.getTypeFromTypeNode(typeNode);
           const baseTypes = type.getBaseTypes();
-          const symbolName = this.getSymbolName(type.symbol);
+          const symbolName = this.getSymbolName(type.symbol || type.aliasSymbol);
           const alreadyExtracted = !!configurationWrapper.nestedConfiguration.find((c) => c.name === symbolName);
           const extendsNested = !!baseTypes?.some((baseType) => this.getSymbolName(baseType.symbol).match(/^NestedConfiguration$/));
           if (extendsNested && !alreadyExtracted) {

packages/@o3r/dynamic-content/src/stores/index.ts

@@ -1,4 +1,5 @@
 export * from './asset-path-override/asset-path-override.actions';
+export * from './asset-path-override/asset-path-override.module';
 export * from './asset-path-override/asset-path-override.reducer';
 export * from './asset-path-override/asset-path-override.selectors';
 export * from './asset-path-override/asset-path-override.state';

packages/@o3r/testing/src/core/playwright/angular-materials/autocomplete-material.ts

@@ -16,7 +16,7 @@ export class MatAutocomplete extends O3rElement implements MatAutocompleteProfil
     await this.setValue(value);
     await this.click();
     const element = this.sourceElement.page;
-    const matOptions = element.locator('.mat-option');
+    const matOptions = element.locator('.mat-option, mat-option');
     await matOptions.first().waitFor({state: 'attached', timeout});
     const matOptionsCount = await matOptions.count();
     const options: (string | undefined)[] = [];
@@ -32,6 +32,6 @@ export class MatAutocomplete extends O3rElement implements MatAutocompleteProfil
       return this.sourceElement.element.press('Tab');
     }
 
-    return Promise.reject('Element with selector .mat-option not found.');
+    return Promise.reject('Element with selector .mat-option, mat-option not found.');
   }
 }

packages/@o3r/testing/src/core/protractor/angular-materials/autocomplete-material.ts

@@ -16,7 +16,7 @@ export class MatAutocomplete extends O3rElement implements MatAutocompleteProfil
   public async selectByValue(value: string, _timeout?: number) {
     await this.setValue(value);
     await this.click();
-    const matOption = element(By.css('.mat-option'));
+    const matOption = element(By.css('.mat-option, mat-option'));
     return new O3rElement(matOption).click();
   }
 }