@o3r/amaterasu-otter 8.0.0-alpha.0 → 8.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/amaterasu-otter",
-  "version": "8.0.0-alpha.0",
+  "version": "8.0.0-alpha.6",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "description": "Command Line Interface to administrate a DES project",
@@ -26,51 +26,51 @@
     }
   },
   "devDependencies": {
-    "@ama-terasu/core": "^8.0.0-alpha.0",
-    "@o3r/build-helpers": "^8.0.0-alpha.0",
-    "@o3r/dev-tools": "^8.0.0-alpha.0",
+    "@ama-terasu/core": "^8.0.0-alpha.6",
+    "@angular-eslint/eslint-plugin": "~15.1.0",
+    "@nrwl/jest": "^15.3.3",
+    "@o3r/build-helpers": "^8.0.0-alpha.6",
+    "@o3r/dev-tools": "^8.0.0-alpha.6",
+    "@o3r/eslint-plugin": "^8.0.0-alpha.6",
+    "@types/jest": "~28.1.2",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^17.0.23",
+    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/parser": "^5.19.0",
+    "eslint": "^8.22.0",
+    "eslint-import-resolver-node": "^0.3.4",
+    "eslint-plugin-jest": "^26.1.4",
+    "eslint-plugin-jsdoc": "^39.3.6",
+    "eslint-plugin-prefer-arrow": "^1.2.3",
+    "jest": "~28.1.1",
     "nx": "^15.3.3",
+    "ts-jest": "^28.0.5",
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@ama-terasu/core": "^8.0.0-alpha.0",
+    "@ama-terasu/core": "^8.0.0-alpha.6",
     "@angular/cli": "~15.0.0",
     "@types/request-promise-native": "1.0.18",
     "azure-devops-node-api": "11.2.0",
-    "chalk": "4.1.2",
-    "commander": "9.4.1",
     "comment-json": "4.2.3",
-    "form-data": "4.0.0",
-    "fs-extra": "7.0.1",
     "jasmine-spec-reporter": "5.0.2",
-    "minimatch": "5.1.2",
     "request": "2.88.2",
     "request-promise-native": "1.0.9",
-    "winston": "3.8.2",
-    "@o3r/eslint-plugin": "8.0.0-alpha.0",
     "@typescript-eslint/experimental-utils": "5.45.1",
     "@angular-eslint/utils": "15.1.0",
     "jest-junit": "14.0.1",
     "@types/fs-extra": "9.0.13",
-    "@types/glob": "7.2.0",
     "@types/gulp": "4.0.10",
     "@types/gulp-cached": "0.0.32",
-    "@types/jasmine": "3.10.7",
     "@types/request": "2.48.8",
     "@types/rimraf": "3.0.2",
     "@types/semver": "7.3.13",
     "gulp": "4.0.2",
     "gulp-cached": "1.1.1",
     "gulp-typescript": "6.0.0-alpha.1",
-    "node-fetch": "2.6.7",
-    "type-fest": "2.19.0",
-    "util": "0.10.3",
     "@types/minimist": "1.2.2",
     "@types/yargs": "17.0.16",
-    "loglevel": "1.8.1",
-    "yargs": "17.6.2"
+    "loglevel": "1.8.1"
   },
   "engines": {
     "node": ">=14.0.0",

package/src/create-application.command.d.ts

@@ -1,36 +1,36 @@
-import { Context } from '@ama-terasu/core';
-/** Option to create an application */
-export interface CreateApplicationOptions {
-    /** Application Name */
-    name: string;
-    /** Path of the folder to create the application */
-    path: string;
-    /**
-     * Set default options instead of requiring input
-     *
-     * @default false
-     */
-    yes?: boolean;
-    /** Otter generator version to use */
-    'otter-version': string;
-    /**
-     * use yarn instead of npm
-     *
-     * @default false
-     */
-    yarn?: boolean;
-    /**
-     * install material with Otter
-     *
-     * @default false
-     */
-    material?: boolean;
-}
-/**
- * Create an Otter Application
- *
- * @param context Context of the command
- * @param options Options
- */
-export declare const createApplication: (context: Context, options: CreateApplicationOptions) => Promise<void>;
+import { Context } from '@ama-terasu/core';
+/** Option to create an application */
+export interface CreateApplicationOptions {
+    /** Application Name */
+    name: string;
+    /** Path of the folder to create the application */
+    path: string;
+    /**
+     * Set default options instead of requiring input
+     *
+     * @default false
+     */
+    yes?: boolean;
+    /** Otter generator version to use */
+    'otter-version': string;
+    /**
+     * use yarn instead of npm
+     *
+     * @default false
+     */
+    yarn?: boolean;
+    /**
+     * install material with Otter
+     *
+     * @default false
+     */
+    material?: boolean;
+}
+/**
+ * Create an Otter Application
+ *
+ * @param context Context of the command
+ * @param options Options
+ */
+export declare const createApplication: (context: Context, options: CreateApplicationOptions) => Promise<void>;
 //# sourceMappingURL=create-application.command.d.ts.map

package/src/create-application.command.js

@@ -1,52 +1,52 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createApplication = void 0;
-const core_1 = require("@ama-terasu/core");
-const node_fs_1 = require("node:fs");
-const path = require("node:path");
-const { peerDependencies } = require(path.resolve(__dirname, '..', 'package.json'));
-/**
- * Create an Otter Application
- *
- * @param context Context of the command
- * @param options Options
- */
-const createApplication = async (context, options) => {
-    const { logger } = context;
-    let cwd = path.resolve(process.cwd(), options.path);
-    const directory = options.name.replace(/ /g, '-');
-    const npmClient = options.yarn ? 'yarn' : 'npm';
-    const npmRunner = options.yarn ? 'yarn' : 'npx';
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-    const interactive = `${!options.yes}`;
-    const ngVersion = peerDependencies?.['@angular/cli'] || 'latest';
-    if (!(0, node_fs_1.existsSync)(cwd)) {
-        await node_fs_1.promises.mkdir(cwd, { recursive: true });
-    }
-    await context.getSpinner('Creating a new Angular application...').fromPromise(
-    // eslint-disable-next-line max-len
-    (0, core_1.promiseSpawn)(`npx -p @angular/cli@${ngVersion} ng new "${options.name}" --style=scss --interactive=${interactive} --directory=${directory} --package-manager=${options.yarn ? 'yarn' : 'npm'} --routing`, { cwd, logger, stderrLogger: logger.debug }), `Application created (in ${path.resolve(cwd, directory)})`);
-    cwd = path.resolve(cwd, directory);
-    await context.getSpinner('Installing NPM dependencies...').fromPromise((0, core_1.promiseSpawn)(`${npmClient} install`, { cwd, logger, stderrLogger: logger.debug }), `NPM dependencies installed (with ${npmClient})`);
-    await context.getSpinner('Adding Otter dependencies...').fromPromise((0, core_1.promiseSpawn)(`${npmRunner} ng add @o3r/core@${options['otter-version']} --interactive=${interactive} --skip-confirmation`, { cwd, logger, stderrLogger: logger.debug }), 'Otter dependencies registered');
-    if (options.material) {
-        await context.getSpinner('Adding Material Dependency...').fromPromise((0, core_1.promiseSpawn)(`${npmRunner} ng add @angular/material --interactive=${interactive} --skip-confirmation`, { cwd, logger, stderrLogger: logger.debug }), 'Material Design library registered');
-        const updateStyleTask = context.getSpinner('Updating styles...');
-        updateStyleTask.start();
-        const stylingFile = path.resolve(cwd, 'src/styles.scss');
-        if ((0, node_fs_1.existsSync)(stylingFile)) {
-            const style = (await node_fs_1.promises.readFile(stylingFile, { encoding: 'utf-8' }))
-                .replace('// @include mat-core', '@include mat-core')
-                .replace('// @include angular-material-typography', '@include angular-material-typography')
-                .replace('// @include angular-material-theme', '@include angular-material-theme');
-            await node_fs_1.promises.writeFile(stylingFile, style);
-        }
-        else {
-            context.logger.error(`File ${stylingFile} not found`);
-        }
-        updateStyleTask.succeed('Style updated');
-    }
-    logger.info(`Application created in ${cwd}`);
-};
-exports.createApplication = createApplication;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createApplication = void 0;
+const core_1 = require("@ama-terasu/core");
+const node_fs_1 = require("node:fs");
+const path = require("node:path");
+const { peerDependencies } = require(path.resolve(__dirname, '..', 'package.json'));
+/**
+ * Create an Otter Application
+ *
+ * @param context Context of the command
+ * @param options Options
+ */
+const createApplication = async (context, options) => {
+    const { logger } = context;
+    let cwd = path.resolve(process.cwd(), options.path);
+    const directory = options.name.replace(/ /g, '-');
+    const npmClient = options.yarn ? 'yarn' : 'npm';
+    const npmRunner = options.yarn ? 'yarn' : 'npx';
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+    const interactive = `${!options.yes}`;
+    const ngVersion = peerDependencies?.['@angular/cli'] || 'latest';
+    if (!(0, node_fs_1.existsSync)(cwd)) {
+        await node_fs_1.promises.mkdir(cwd, { recursive: true });
+    }
+    await context.getSpinner('Creating a new Angular application...').fromPromise(
+    // eslint-disable-next-line max-len
+    (0, core_1.promiseSpawn)(`npx -p @angular/cli@${ngVersion} ng new "${options.name}" --style=scss --interactive=${interactive} --directory=${directory} --package-manager=${options.yarn ? 'yarn' : 'npm'} --routing`, { cwd, logger, stderrLogger: logger.debug }), `Application created (in ${path.resolve(cwd, directory)})`);
+    cwd = path.resolve(cwd, directory);
+    await context.getSpinner('Installing NPM dependencies...').fromPromise((0, core_1.promiseSpawn)(`${npmClient} install`, { cwd, logger, stderrLogger: logger.debug }), `NPM dependencies installed (with ${npmClient})`);
+    await context.getSpinner('Adding Otter dependencies...').fromPromise((0, core_1.promiseSpawn)(`${npmRunner} ng add @o3r/core@${options['otter-version']} --interactive=${interactive} --skip-confirmation`, { cwd, logger, stderrLogger: logger.debug }), 'Otter dependencies registered');
+    if (options.material) {
+        await context.getSpinner('Adding Material Dependency...').fromPromise((0, core_1.promiseSpawn)(`${npmRunner} ng add @angular/material --interactive=${interactive} --skip-confirmation`, { cwd, logger, stderrLogger: logger.debug }), 'Material Design library registered');
+        const updateStyleTask = context.getSpinner('Updating styles...');
+        updateStyleTask.start();
+        const stylingFile = path.resolve(cwd, 'src/styles.scss');
+        if ((0, node_fs_1.existsSync)(stylingFile)) {
+            const style = (await node_fs_1.promises.readFile(stylingFile, { encoding: 'utf-8' }))
+                .replace('// @include mat-core', '@include mat-core')
+                .replace('// @include angular-material-typography', '@include angular-material-typography')
+                .replace('// @include angular-material-theme', '@include angular-material-theme');
+            await node_fs_1.promises.writeFile(stylingFile, style);
+        }
+        else {
+            context.logger.error(`File ${stylingFile} not found`);
+        }
+        updateStyleTask.succeed('Style updated');
+    }
+    logger.info(`Application created in ${cwd}`);
+};
+exports.createApplication = createApplication;
 //# sourceMappingURL=create-application.command.js.map

package/src/create-custom-application.command.d.ts

@@ -1,28 +1,28 @@
-import { Context } from '@ama-terasu/core';
-/** Option to create a Custom Application */
-export interface CreateCustomAppOptions {
-    /** Airline code */
-    airline: string;
-    /** Path of the folder to create the application */
-    path: string;
-    /**
-     * Set default options instead of requiring input
-     *
-     * @default false
-     */
-    yes?: boolean;
-    /** Otter generator version to use */
-    'otter-version': string;
-    /** RefX Flavour */
-    flavour: string;
-    /** RefX Tag version */
-    tag: string;
-}
-/**
- * Create a custom application
- *
- * @param context Context of the command
- * @param options Options
- */
-export declare const createCustomApplication: (context: Context, options: CreateCustomAppOptions) => Promise<void>;
+import { Context } from '@ama-terasu/core';
+/** Option to create a Custom Application */
+export interface CreateCustomAppOptions {
+    /** Airline code */
+    airline: string;
+    /** Path of the folder to create the application */
+    path: string;
+    /**
+     * Set default options instead of requiring input
+     *
+     * @default false
+     */
+    yes?: boolean;
+    /** Otter generator version to use */
+    'otter-version': string;
+    /** RefX Flavour */
+    flavour: string;
+    /** RefX Tag version */
+    tag: string;
+}
+/**
+ * Create a custom application
+ *
+ * @param context Context of the command
+ * @param options Options
+ */
+export declare const createCustomApplication: (context: Context, options: CreateCustomAppOptions) => Promise<void>;
 //# sourceMappingURL=create-custom-application.command.d.ts.map

package/src/create-custom-application.command.js

@@ -1,21 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCustomApplication = void 0;
-const core_1 = require("@ama-terasu/core");
-const node_path_1 = require("node:path");
-/**
- * Create a custom application
- *
- * @param context Context of the command
- * @param options Options
- */
-const createCustomApplication = async (context, options) => {
-    const { logger } = context;
-    const cwd = (0, node_path_1.resolve)(process.cwd(), options.path);
-    await context.getSpinner('Generating a new custom application...').fromPromise(
-    // eslint-disable-next-line max-len
-    (0, core_1.promiseSpawn)(`npx -p @o3r/customization@${options['otter-version']} -p @angular-devkit/schematics-cli schematics @o3r/customization:generate --airlineCode ${options.airline} --checkoutTag ${options.tag} --refxFlavour ${options.flavour}`, { cwd, stderrLogger: logger.debug, logger }), `Application generated (in ${cwd})`);
-    logger.info(`Application created in ${(0, node_path_1.resolve)(cwd, `${options.airline}-${options.flavour}`)}`);
-};
-exports.createCustomApplication = createCustomApplication;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCustomApplication = void 0;
+const core_1 = require("@ama-terasu/core");
+const node_path_1 = require("node:path");
+/**
+ * Create a custom application
+ *
+ * @param context Context of the command
+ * @param options Options
+ */
+const createCustomApplication = async (context, options) => {
+    const { logger } = context;
+    const cwd = (0, node_path_1.resolve)(process.cwd(), options.path);
+    await context.getSpinner('Generating a new custom application...').fromPromise(
+    // eslint-disable-next-line max-len
+    (0, core_1.promiseSpawn)(`npx -p @o3r/customization@${options['otter-version']} -p @angular-devkit/schematics-cli schematics @o3r/customization:generate --airlineCode ${options.airline} --checkoutTag ${options.tag} --refxFlavour ${options.flavour}`, { cwd, stderrLogger: logger.debug, logger }), `Application generated (in ${cwd})`);
+    logger.info(`Application created in ${(0, node_path_1.resolve)(cwd, `${options.airline}-${options.flavour}`)}`);
+};
+exports.createCustomApplication = createCustomApplication;
 //# sourceMappingURL=create-custom-application.command.js.map

package/src/index.d.ts

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=index.d.ts.map

package/src/index.js

@@ -1,64 +1,64 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable no-shadow */
-const core_1 = require("@ama-terasu/core");
-const create_application_command_1 = require("./create-application.command");
-const create_custom_application_command_1 = require("./create-custom-application.command");
-const name = 'otter';
-module.exports = {
-    name,
-    description: 'Commands relative to Otter framework',
-    init: (yargs, baseContext) => {
-        return yargs
-            .option(core_1.EXTRA_COMMON_OPTIONS.yarn, {
-            ...core_1.MODULE_OPTIONS.yarn,
-            type: 'boolean'
-        })
-            .demandCommand()
-            .command('create', 'Generate a new Otter based project', (yargsInstance) => yargsInstance
-            .usage(baseContext.generateUsageMessage(name, 'create <command>'))
-            .demandCommand()
-            .option(core_1.EXTRA_COMMON_OPTIONS.path, {
-            ...core_1.MODULE_OPTIONS.path,
-            type: 'string',
-            default: '.',
-            description: 'Path to the generated application'
-        })
-            .option('otter-version', {
-            alias: ['O'],
-            type: 'string',
-            default: 'latest',
-            description: 'Version of the Otter generators to use',
-            demandOption: 'Amadeus NPM registries token is mandatory'
-        })
-            .command('application <name>', 'Generate a new Otter based application', (yargsInstanceApp) => yargsInstanceApp
-            .positional('name', {
-            type: 'string',
-            description: 'Application name',
-            demandOption: 'Application name is mandatory'
-        })
-            .option('material', {
-            type: 'boolean',
-            default: true,
-            description: 'Add material dependency'
-        }), (options) => (0, create_application_command_1.createApplication)(baseContext.getContext(options), options))
-            .command('custom-application <airline>', 'Generate Otter custom application', (yargsInstanceCustomApp) => yargsInstanceCustomApp
-            .positional('airline', {
-            type: 'string',
-            description: 'Airline code for the application',
-            demandOption: 'Airline code is mandatory'
-        })
-            .option('flavour', {
-            type: 'string',
-            choices: ['booking', 'ssci', 'servicing', 'ndc'],
-            description: 'RefX flavour',
-            demandOption: 'RefX flavour selection is mandatory'
-        })
-            .option('tag', {
-            type: 'string',
-            default: '5.4.0',
-            description: 'The git tag of the white label that is to be customized.'
-        }), (options) => (0, create_custom_application_command_1.createCustomApplication)(baseContext.getContext(options), options)));
-    }
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-shadow */
+const core_1 = require("@ama-terasu/core");
+const create_application_command_1 = require("./create-application.command");
+const create_custom_application_command_1 = require("./create-custom-application.command");
+const name = 'otter';
+module.exports = {
+    name,
+    description: 'Commands relative to Otter framework',
+    init: (yargs, baseContext) => {
+        return yargs
+            .option(core_1.EXTRA_COMMON_OPTIONS.yarn, {
+            ...core_1.MODULE_OPTIONS.yarn,
+            type: 'boolean'
+        })
+            .demandCommand()
+            .command('create', 'Generate a new Otter based project', (yargsInstance) => yargsInstance
+            .usage(baseContext.generateUsageMessage(name, 'create <command>'))
+            .demandCommand()
+            .option(core_1.EXTRA_COMMON_OPTIONS.path, {
+            ...core_1.MODULE_OPTIONS.path,
+            type: 'string',
+            default: '.',
+            description: 'Path to the generated application'
+        })
+            .option('otter-version', {
+            alias: ['O'],
+            type: 'string',
+            default: 'latest',
+            description: 'Version of the Otter generators to use',
+            demandOption: 'Amadeus NPM registries token is mandatory'
+        })
+            .command('application <name>', 'Generate a new Otter based application', (yargsInstanceApp) => yargsInstanceApp
+            .positional('name', {
+            type: 'string',
+            description: 'Application name',
+            demandOption: 'Application name is mandatory'
+        })
+            .option('material', {
+            type: 'boolean',
+            default: true,
+            description: 'Add material dependency'
+        }), (options) => (0, create_application_command_1.createApplication)(baseContext.getContext(options), options))
+            .command('custom-application <airline>', 'Generate Otter custom application', (yargsInstanceCustomApp) => yargsInstanceCustomApp
+            .positional('airline', {
+            type: 'string',
+            description: 'Airline code for the application',
+            demandOption: 'Airline code is mandatory'
+        })
+            .option('flavour', {
+            type: 'string',
+            choices: ['booking', 'ssci', 'servicing', 'ndc'],
+            description: 'RefX flavour',
+            demandOption: 'RefX flavour selection is mandatory'
+        })
+            .option('tag', {
+            type: 'string',
+            default: '5.4.0',
+            description: 'The git tag of the white label that is to be customized.'
+        }), (options) => (0, create_custom_application_command_1.createCustomApplication)(baseContext.getContext(options), options)));
+    }
+};
 //# sourceMappingURL=index.js.map