@cerema/cadriciel 1.7.7 → 1.8.1

package/cli/global/create.js

@@ -11,6 +11,157 @@ module.exports = (args) => {
     const CACHE_DIR = path.join(os.homedir(), '.cadriciel', 'starters-cache');
     const PACKAGE_NAME = '@cadriciel/starters';
 
+    // Helper: Parse CLI arguments
+    const parseArgs = (cmdArgs) => {
+        const options = {
+            name: null,
+            template: null,
+            features: null,
+            allFeatures: false,
+            defaults: false,
+            list: false,
+            listFeatures: null,
+            yes: false,
+            test: false,
+            help: false
+        };
+
+        for (let i = 0; i < cmdArgs.length; i++) {
+            const arg = cmdArgs[i];
+            const nextArg = cmdArgs[i + 1];
+
+            switch (arg) {
+                case '-n':
+                case '--name':
+                    options.name = nextArg;
+                    i++;
+                    break;
+                case '-t':
+                case '--template':
+                    options.template = nextArg;
+                    i++;
+                    break;
+                case '-f':
+                case '--features':
+                    options.features = nextArg ? nextArg.split(',').map(f => f.trim()) : [];
+                    i++;
+                    break;
+                case '-a':
+                case '--all-features':
+                    options.allFeatures = true;
+                    break;
+                case '-d':
+                case '--defaults':
+                    options.defaults = true;
+                    break;
+                case '-l':
+                case '--list':
+                    options.list = true;
+                    break;
+                case '--list-features':
+                    options.listFeatures = nextArg;
+                    i++;
+                    break;
+                case '-y':
+                case '--yes':
+                    options.yes = true;
+                    break;
+                case '--test':
+                    options.test = true;
+                    break;
+                case '-h':
+                case '--help':
+                    options.help = true;
+                    break;
+                default:
+                    // Positional argument (project name if not already set)
+                    if (!arg.startsWith('-') && !options.name && arg !== 'create') {
+                        options.name = arg;
+                    }
+                    break;
+            }
+        }
+
+        return options;
+    };
+
+    // Helper: Display help
+    const showHelp = () => {
+        console.log(chalk.bold.cyan('\nUsage: cad create [options] [project-name]\n'));
+        console.log(chalk.bold('Options:'));
+        console.log('  -n, --name <name>        Project name');
+        console.log('  -t, --template <id>      Template ID (skip template selection)');
+        console.log('  -f, --features <list>    Comma-separated list of features to enable');
+        console.log('  -a, --all-features       Enable all available features');
+        console.log('  -d, --defaults           Use default feature selection');
+        console.log('  -l, --list               List available templates');
+        console.log('  --list-features <id>     List features for a specific template');
+        console.log('  -y, --yes                Auto-confirm prompts (e.g., overwrite)');
+        console.log('  --test                   Use current directory for starters (dev mode)');
+        console.log('  -h, --help               Show this help message');
+        console.log(chalk.bold('\nExamples:'));
+        console.log(chalk.gray('  # Interactive mode (default)'));
+        console.log('  cad create');
+        console.log('  cad create my-project');
+        console.log(chalk.gray('\n  # Automated mode'));
+        console.log('  cad create -n my-project -t basic -d');
+        console.log('  cad create -n my-project -t basic -f auth,api');
+        console.log('  cad create -n my-project -t basic -a -y');
+        console.log(chalk.gray('\n  # List templates and features'));
+        console.log('  cad create --list');
+        console.log('  cad create --list-features basic');
+    };
+
+    // Helper: List templates
+    const listTemplates = (starters) => {
+        console.log(chalk.bold.cyan('\nAvailable templates:\n'));
+        starters.forEach(s => {
+            console.log(`  ${chalk.bold.green(s.id)}`);
+            console.log(`    Name: ${s.name}`);
+            console.log(`    Description: ${s.description}`);
+            console.log('');
+        });
+    };
+
+    // Helper: List features for a template
+    const listFeatures = (starter) => {
+        const optionsConfig = starter.config.options || {};
+        const coreFeatures = [];
+        const optionalFeatures = [];
+
+        Object.keys(optionsConfig).forEach(key => {
+            const opt = optionsConfig[key];
+            if (opt.type === 'core') {
+                coreFeatures.push({ id: key, ...opt });
+            } else {
+                optionalFeatures.push({ id: key, ...opt });
+            }
+        });
+
+        console.log(chalk.bold.cyan(`\nFeatures for template: ${starter.name}\n`));
+
+        if (coreFeatures.length > 0) {
+            console.log(chalk.bold('Core (always included):'));
+            coreFeatures.forEach(f => {
+                console.log(`  ${chalk.gray('•')} ${f.id}${f.description ? ` - ${f.description}` : ''}`);
+            });
+            console.log('');
+        }
+
+        if (optionalFeatures.length > 0) {
+            console.log(chalk.bold('Optional:'));
+            optionalFeatures.forEach(f => {
+                const defaultTag = f.default ? chalk.green(' [default]') : '';
+                console.log(`  ${chalk.gray('•')} ${chalk.bold(f.id)}${f.description ? ` - ${f.description}` : ''}${defaultTag}`);
+            });
+            console.log('');
+        }
+
+        if (optionalFeatures.length === 0 && coreFeatures.length === 0) {
+            console.log(chalk.yellow('  No features defined for this template.'));
+        }
+    };
+
     // Helper: Fetch/Update the starters package
     const fetchStarters = async () => {
         const spinner = ora('Fetching latest starters...').start();
@@ -71,19 +222,23 @@ module.exports = (args) => {
     };
 
     // Helper: Generate Project
-    const generateProject = async (starter, options, targetName) => {
+    const generateProject = async (starter, options, targetName, autoConfirm = false) => {
         const targetPath = path.resolve(process.cwd(), targetName);
 
         if (fs.existsSync(targetPath)) {
-            const { replace } = await inquirer.prompt([
-                {
-                    type: 'confirm',
-                    name: 'replace',
-                    message: `Directory ${targetName} already exists. Overwrite?`,
-                    default: false
-                }
-            ]);
-            if (!replace) return;
+            if (autoConfirm) {
+                console.log(chalk.yellow(`Directory ${targetName} already exists. Overwriting...`));
+            } else {
+                const { replace } = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'replace',
+                        message: `Directory ${targetName} already exists. Overwrite?`,
+                        default: false
+                    }
+                ]);
+                if (!replace) return;
+            }
         }
 
         const spinner = ora(`Generating project ${targetName}...`).start();
@@ -182,16 +337,23 @@ module.exports = (args) => {
             description: 'Create a new project from Cadriciel templates',
         },
         start: async (cmdArgs) => {
+            // Parse CLI arguments
+            const opts = parseArgs(cmdArgs);
+
+            // Show help if requested
+            if (opts.help) {
+                showHelp();
+                return;
+            }
+
             console.log(chalk.bold.cyan('Cadriciel Project Generator'));
 
-            // Check for --test flag
-            const isTestMode = cmdArgs.includes('--test');
-            // Remove --test from args so it doesn't interfere with project name
-            const filteredArgs = cmdArgs.filter(arg => arg !== '--test');
+            // Determine if running in automated mode
+            const isAutomated = opts.template && opts.name && (opts.features || opts.allFeatures || opts.defaults);
 
             // 1. Fetch Starters
             let startersPath;
-            if (isTestMode) {
+            if (opts.test) {
                 console.log(chalk.yellow('Running in TEST mode: Using current directory for starters.'));
                 startersPath = process.cwd();
             } else {
@@ -206,12 +368,26 @@ module.exports = (args) => {
                 return;
             }
 
-            // 2. Ask for Project Name (if not provided)
-            let args = [...filteredArgs];
-            if (args.length > 0 && args[0] === 'create') {
-                args.shift();
+            // Handle --list: show available templates and exit
+            if (opts.list) {
+                listTemplates(starters);
+                return;
+            }
+
+            // Handle --list-features: show features for a template and exit
+            if (opts.listFeatures) {
+                const starter = starters.find(s => s.id === opts.listFeatures);
+                if (!starter) {
+                    console.log(chalk.red(`Template '${opts.listFeatures}' not found.`));
+                    console.log(chalk.gray('Use --list to see available templates.'));
+                    return;
+                }
+                listFeatures(starter);
+                return;
             }
-            let targetName = args[0];
+
+            // 2. Get Project Name
+            let targetName = opts.name;
             if (!targetName) {
                 const answers = await inquirer.prompt([
                     {
@@ -225,25 +401,38 @@ module.exports = (args) => {
             }
 
             // 3. Select Starter
-            const { selectedStarterId } = await inquirer.prompt([
-                {
-                    type: 'list',
-                    name: 'selectedStarterId',
-                    message: 'Select a template:',
-                    choices: starters.map(s => ({
-                        name: `${chalk.bold(s.name)} - ${s.description}${isTestMode ? ` (${s.path})` : ''}`,
-                        value: s.id
-                    }))
+            let starter;
+            if (opts.template) {
+                starter = starters.find(s => s.id === opts.template);
+                if (!starter) {
+                    console.log(chalk.red(`Template '${opts.template}' not found.`));
+                    console.log(chalk.gray('Use --list to see available templates.'));
+                    return;
                 }
-            ]);
-
-            const starter = starters.find(s => s.id === selectedStarterId);
+                console.log(chalk.gray(`Using template: ${starter.name}`));
+            } else if (opts.defaults || opts.allFeatures || opts.features) {
+                // In automated mode without explicit template, use first available
+                starter = starters[0];
+                console.log(chalk.gray(`Using default template: ${starter.name}`));
+            } else {
+                const { selectedStarterId } = await inquirer.prompt([
+                    {
+                        type: 'list',
+                        name: 'selectedStarterId',
+                        message: 'Select a template:',
+                        choices: starters.map(s => ({
+                            name: `${chalk.bold(s.name)} - ${s.description}${opts.test ? ` (${s.path})` : ''}`,
+                            value: s.id
+                        }))
+                    }
+                ]);
+                starter = starters.find(s => s.id === selectedStarterId);
+            }
 
             // 4. Select Features
-            // Determine selectable features from config
             const optionsConfig = starter.config.options || {};
             const selectableFeatures = Object.keys(optionsConfig)
-                .filter(key => optionsConfig[key].type !== 'core') // Exclude core
+                .filter(key => optionsConfig[key].type !== 'core')
                 .map(key => ({
                     name: optionsConfig[key].description || key,
                     value: key,
@@ -251,7 +440,26 @@ module.exports = (args) => {
                 }));
 
             let selectedFeatures = [];
-            if (selectableFeatures.length > 0) {
+
+            if (opts.allFeatures) {
+                // Enable all features
+                selectedFeatures = selectableFeatures.map(f => f.value);
+                console.log(chalk.gray(`Enabling all features: ${selectedFeatures.join(', ') || 'none'}`));
+            } else if (opts.features) {
+                // Use specified features
+                const validFeatures = selectableFeatures.map(f => f.value);
+                const invalidFeatures = opts.features.filter(f => !validFeatures.includes(f));
+                if (invalidFeatures.length > 0) {
+                    console.log(chalk.yellow(`Warning: Unknown features ignored: ${invalidFeatures.join(', ')}`));
+                }
+                selectedFeatures = opts.features.filter(f => validFeatures.includes(f));
+                console.log(chalk.gray(`Selected features: ${selectedFeatures.join(', ') || 'none'}`));
+            } else if (opts.defaults) {
+                // Use default features
+                selectedFeatures = selectableFeatures.filter(f => f.checked).map(f => f.value);
+                console.log(chalk.gray(`Using default features: ${selectedFeatures.join(', ') || 'none'}`));
+            } else if (selectableFeatures.length > 0) {
+                // Interactive mode
                 const featureAnswers = await inquirer.prompt([
                     {
                         type: 'checkbox',
@@ -264,9 +472,9 @@ module.exports = (args) => {
             }
 
             // 5. Generate
-            await generateProject(starter, { selectedFeatures }, targetName);
+            await generateProject(starter, { selectedFeatures }, targetName, opts.yes);
 
-            if (isTestMode) process.exit(0);
+            if (opts.test) process.exit(0);
         },
     };
 };

package/cli.js

@@ -10,6 +10,7 @@ const userHomeDir = os.homedir(); // Fetching the user's home directory.
 const boxen = require('boxen'); // For creating boxes in the console.
 const axios = require('axios'); // For making HTTP requests.
 
+
 // Locating the '.cadriciel' directory starting from the current working directory.
 const CADRICIEL_PATH = findCadricielDir(process.cwd());
 const CADRICIEL_COMMAND = 'cad';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.7.7",
+  "version": "1.8.1",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",

package/.gitlab-ci.yml

@@ -1,16 +0,0 @@
-image: node:20
-
-stages:
-  - publish
-
-publish:
-  stage: publish
-  tags:
-    - k8-runner
-  script:
-    - npm install
-    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-    - npm publish
-  rules:
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH == "main"'

package/cli/assets/docker/.env

@@ -1,27 +0,0 @@
-
-MINIO_URL=localhost
-MINIO_ROOT_USER=minioadmin
-MINIO_ROOT_PASSWORD=minioadmin
-
-POSTGRES_DB=sysadyp
-POSTGRES_PASSWORD=password
-PG_USER=postgres
-
-REDIS_PASSWORD=password
-KEYCLOAK_ADMIN_USER=admin
-KEYCLOAK_ADMIN_PASSWORD=dreammotion
-
-DOCKER_REGISTRY=cerema
-PROJECT_NAME=sysadyp
-VERSION=latest
-
-# CADRICIEL
-CADRICIEL_PG_DB="postgres://postgres:password@postgres:5432/sysadyp"
-CADRICIEL_PG_DBAPI="postgres://postgres:password@postgres:5432/sysadyp"
-CADRICIEL_PG_DB_SCHEMA="sysadyp"
-CADRICIEL_API_PORT=3000
-CADRICIEL_APP_PORT=4200
-CADRICIEL_AUTH_STRATEGY="guest"
-CADRICIEL_ORION_URI="http://localhost:9090"
-CADRICIEL_ORION_REALM="62540d37-7443-44e2-be54-2b402e899660"
-