@intrig/core 0.0.15-15 → 0.0.15-16

package/main.js

@@ -901,6 +901,10 @@ class SpecManagementService {
             external_fs_namespaceObject.mkdirSync(this.specsDir, {
                 recursive: true
             });
+            // Create the file if it doesn't exist (proper-lockfile requires the file to exist)
+            if (!external_fs_namespaceObject.existsSync(filePath)) {
+                external_fs_namespaceObject.writeFileSync(filePath, '', 'utf-8');
+            }
             // Acquire lock for the file
             release = await external_proper_lockfile_namespaceObject.lock(filePath, {
                 retries: {
@@ -984,6 +988,10 @@ class SpecManagementService {
         if (external_fs_namespaceObject.existsSync(specPath)) {
             try {
                 const content = external_fs_namespaceObject.readFileSync(specPath, 'utf-8');
+                // Handle empty files (created for locking purposes)
+                if (!content || content.trim() === '') {
+                    return undefined;
+                }
                 return JSON.parse(content);
             } catch (error) {
                 this.logger.error(`Failed to parse JSON for ${apiName}: ${error.message}`);
@@ -5296,6 +5304,9 @@ class SourcesAddCommand extends external_nest_commander_namespaceObject.CommandR
     constructor(pm, httpService, lazyPluginService, configService){
         super(), this.pm = pm, this.httpService = httpService, this.lazyPluginService = lazyPluginService, this.configService = configService;
     }
+    parseIdOption(val) {
+        return val;
+    }
     async run(passedParams, options) {
         const metadata = await this.pm.getMetadata();
         if (!metadata) {
@@ -5327,15 +5338,27 @@ class SourcesAddCommand extends external_nest_commander_namespaceObject.CommandR
         console.log(external_chalk_default().bold.cyan('\nSource details:'));
         console.log(`${external_chalk_default().green('Name:')}    ${external_chalk_default().white(source.name ?? 'N/A')}`);
         console.log(`${external_chalk_default().green('Spec:')}    ${external_chalk_default().white(source.specUrl ?? 'N/A')}`);
-        // 6) Ask for ID
-        const { id } = await external_inquirer_default().prompt([
-            {
-                type: 'input',
-                name: 'id',
-                message: external_chalk_default().yellow('Enter an ID for this source (letters/numbers/-/_):'),
-                validate: (v)=>/^[\w-]+$/.test(v) || 'ID must contain only letters, numbers, hyphens, or underscores'
+        // 6) Get ID from option or prompt
+        let id;
+        if (options?.id) {
+            // Validate the provided ID
+            if (!/^[\w-]+$/.test(options.id)) {
+                console.error(external_chalk_default().red.bold('Error:'), external_chalk_default().red('ID must contain only letters, numbers, hyphens, or underscores'));
+                process.exit(1);
             }
-        ]);
+            id = options.id;
+            console.log(external_chalk_default().blue(`ℹ️  Using provided ID: ${id}`));
+        } else {
+            const { id: promptedId } = await external_inquirer_default().prompt([
+                {
+                    type: 'input',
+                    name: 'id',
+                    message: external_chalk_default().yellow('Enter an ID for this source (letters/numbers/-/_):'),
+                    validate: (v)=>/^[\w-]+$/.test(v) || 'ID must contain only letters, numbers, hyphens, or underscores'
+                }
+            ]);
+            id = promptedId;
+        }
         source.id = id;
         // 7) Add endpoint
         const addUrl = `${metadata.url}/api/config/sources/add`;
@@ -5368,6 +5391,17 @@ class SourcesAddCommand extends external_nest_commander_namespaceObject.CommandR
         }
     }
 }
+sources_command_ts_decorate([
+    (0,external_nest_commander_namespaceObject.Option)({
+        flags: '--id <id>',
+        description: 'Specify source ID directly (letters/numbers/-/_)'
+    }),
+    sources_command_ts_metadata("design:type", Function),
+    sources_command_ts_metadata("design:paramtypes", [
+        String
+    ]),
+    sources_command_ts_metadata("design:returntype", String)
+], SourcesAddCommand.prototype, "parseIdOption", null);
 SourcesAddCommand = sources_command_ts_decorate([
     (0,external_nest_commander_namespaceObject.SubCommand)({
         name: 'add',
@@ -5426,6 +5460,12 @@ class SourceRemoveCommand extends external_nest_commander_namespaceObject.Comman
     constructor(pm, httpService, lazyPluginService, configService){
         super(), this.pm = pm, this.httpService = httpService, this.lazyPluginService = lazyPluginService, this.configService = configService;
     }
+    parseIdOption(val) {
+        return val;
+    }
+    parseYesOption() {
+        return true;
+    }
     async run(passedParams, options) {
         // 1) fetch metadata
         const metadata = await this.pm.getMetadata();
@@ -5444,33 +5484,54 @@ class SourceRemoveCommand extends external_nest_commander_namespaceObject.Comman
             console.log(external_chalk_default().yellow('No sources found.'));
             return;
         }
-        // 3) prompt user to choose one
-        const choices = sources.map((src)=>({
-                name: `${src.id} — ${src.name ?? 'N/A'} (${src.specUrl})`,
-                value: src.id
-            }));
-        const { id } = await external_inquirer_default().prompt([
-            {
-                type: 'list',
-                name: 'id',
-                message: external_chalk_default().yellow('Select a source to remove:'),
-                choices
+        // 3) Get source ID from option or prompt
+        let id;
+        if (options?.id) {
+            // Validate the ID exists in sources
+            const sourceExists = sources.some((src)=>src.id === options.id);
+            if (!sourceExists) {
+                console.error(external_chalk_default().red.bold('Error:'), external_chalk_default().red(`Source with ID "${options.id}" not found.`));
+                console.log(external_chalk_default().yellow('Available sources:'));
+                sources.forEach((src)=>{
+                    console.log(`  - ${src.id}`);
+                });
+                process.exit(1);
             }
-        ]);
+            id = options.id;
+            console.log(external_chalk_default().blue(`ℹ️  Using provided ID: ${id}`));
+        } else {
+            const choices = sources.map((src)=>({
+                    name: `${src.id} — ${src.name ?? 'N/A'} (${src.specUrl})`,
+                    value: src.id
+                }));
+            const { id: promptedId } = await external_inquirer_default().prompt([
+                {
+                    type: 'list',
+                    name: 'id',
+                    message: external_chalk_default().yellow('Select a source to remove:'),
+                    choices
+                }
+            ]);
+            id = promptedId;
+        }
         // Store the source details before deletion for lifecycle method
         const selectedSource = sources.find((src)=>src.id === id);
-        // 4) confirm deletion
-        const { confirm } = await external_inquirer_default().prompt([
-            {
-                type: 'confirm',
-                name: 'confirm',
-                message: external_chalk_default().red(`Are you sure you want to delete "${id}"?`),
-                default: false
+        // 4) Confirm deletion (skip if --yes flag is set)
+        if (!options?.yes) {
+            const { confirm } = await external_inquirer_default().prompt([
+                {
+                    type: 'confirm',
+                    name: 'confirm',
+                    message: external_chalk_default().red(`Are you sure you want to delete "${id}"?`),
+                    default: false
+                }
+            ]);
+            if (!confirm) {
+                console.log(external_chalk_default().gray('Aborted.'));
+                return;
             }
-        ]);
-        if (!confirm) {
-            console.log(external_chalk_default().gray('Aborted.'));
-            return;
+        } else {
+            console.log(external_chalk_default().blue(`ℹ️  Skipping confirmation (--yes flag set)`));
         }
         // 5) call DELETE /remove/:id
         const removeUrl = `${metadata.url}/api/config/sources/remove/${encodeURIComponent(id)}`;
@@ -5497,6 +5558,26 @@ class SourceRemoveCommand extends external_nest_commander_namespaceObject.Comman
         }
     }
 }
+sources_command_ts_decorate([
+    (0,external_nest_commander_namespaceObject.Option)({
+        flags: '--id <id>',
+        description: 'Specify source ID to remove directly'
+    }),
+    sources_command_ts_metadata("design:type", Function),
+    sources_command_ts_metadata("design:paramtypes", [
+        String
+    ]),
+    sources_command_ts_metadata("design:returntype", String)
+], SourceRemoveCommand.prototype, "parseIdOption", null);
+sources_command_ts_decorate([
+    (0,external_nest_commander_namespaceObject.Option)({
+        flags: '-y, --yes',
+        description: 'Skip confirmation prompt'
+    }),
+    sources_command_ts_metadata("design:type", Function),
+    sources_command_ts_metadata("design:paramtypes", []),
+    sources_command_ts_metadata("design:returntype", Boolean)
+], SourceRemoveCommand.prototype, "parseYesOption", null);
 SourceRemoveCommand = sources_command_ts_decorate([
     (0,external_nest_commander_namespaceObject.SubCommand)({
         name: 'rm',
@@ -8118,6 +8199,9 @@ function init_command_ts_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;
 }
+function init_command_ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
 
 
 
@@ -8129,6 +8213,12 @@ function init_command_ts_decorate(decorators, target, key, desc) {
 
 
 class InitCommand extends external_nest_commander_namespaceObject.CommandRunner {
+    parsePluginOption(val) {
+        return val;
+    }
+    parseYesOption() {
+        return true;
+    }
     async run(passedParams, options) {
         console.log(external_chalk_default().blue('🚀 Initializing Intrig setup...'));
         const rootDir = process.cwd();
@@ -8143,17 +8233,49 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
             // Check for existing plugin dependency matching the plugin regex format
             const existingPlugin = this.checkForExistingPlugin(packageJson);
             let selectedPlugin;
-            if (existingPlugin) {
+            // Priority: 1. CLI --plugin option, 2. Existing plugin in package.json, 3. Interactive prompt (or best match with --yes)
+            if (options?.plugin) {
+                console.log(external_chalk_default().blue(`ℹ️  Using plugin from CLI option: ${options.plugin}`));
+                selectedPlugin = {
+                    type: 'generator',
+                    generator: 'custom',
+                    name: options.plugin,
+                    compat: {
+                        latest: {
+                            dependencies: {}
+                        }
+                    }
+                };
+            } else if (existingPlugin) {
                 console.log(external_chalk_default().green(`✅ Found existing plugin dependency: ${existingPlugin.name}`));
                 selectedPlugin = existingPlugin;
             } else {
                 // Fetch approved plugins from GitHub
                 const approvedPlugins = await this.fetchApprovedPlugins();
-                // Prompt user to select plugin (show all plugins with best match as default)
-                selectedPlugin = await this.promptUserForPlugin(approvedPlugins, packageJson);
+                // If --yes flag is set, use the best matching plugin automatically
+                if (options?.yes) {
+                    const projectDependencies = {
+                        ...packageJson.dependencies,
+                        ...packageJson.devDependencies
+                    };
+                    const pluginsWithScores = approvedPlugins.map((plugin)=>({
+                            plugin,
+                            score: this.calculateCompatibilityScore(plugin, projectDependencies)
+                        })).sort((a, b)=>b.score - a.score);
+                    const bestMatch = pluginsWithScores[0]?.plugin;
+                    if (bestMatch) {
+                        console.log(external_chalk_default().blue(`ℹ️  Auto-selecting best matching plugin: ${bestMatch.name} (score: ${pluginsWithScores[0].score})`));
+                        selectedPlugin = bestMatch;
+                    } else {
+                        throw new Error('No plugins available and --yes flag was set. Please specify a plugin with --plugin option.');
+                    }
+                } else {
+                    // Prompt user to select plugin (show all plugins with best match as default)
+                    selectedPlugin = await this.promptUserForPlugin(approvedPlugins, packageJson);
+                }
             }
             // Load and initialize the selected plugin
-            const { pluginInstance, generatorOptions, postInitFunction } = await this.loadAndInitializePlugin(selectedPlugin);
+            const { pluginInstance, generatorOptions, postInitFunction } = await this.loadAndInitializePlugin(selectedPlugin, options?.yes);
             // Check if plugin loading failed
             if (!pluginInstance) {
                 throw new Error(`Failed to load and initialize plugin ${selectedPlugin.name}. Please check the plugin installation and try again.`);
@@ -8352,7 +8474,7 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
         }
         return selectedPlugin;
     }
-    async loadAndInitializePlugin(plugin) {
+    async loadAndInitializePlugin(plugin, skipPrompts) {
         const installSpinner = external_ora_default()(`Installing plugin: ${plugin.name}`).start();
         try {
             const rootDir = process.cwd();
@@ -8397,7 +8519,7 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
                     loadSpinner.text = 'Collecting generator configuration...';
                     // Stop the spinner before collecting interactive input to prevent interference
                     loadSpinner.stop();
-                    generatorOptions = await this.collectGeneratorOptions(pluginInstance.$generatorSchema, plugin.name);
+                    generatorOptions = await this.collectGeneratorOptions(pluginInstance.$generatorSchema, plugin.name, skipPrompts);
                     console.log("Generator options", generatorOptions);
                     // Restart the spinner if we have more work to do
                     loadSpinner.start();
@@ -8460,7 +8582,7 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
             throw new Error(`Plugin "${pluginName}" does not export a factory function. ` + `Expected "createPlugin()" or a default function export. ` + `Available exports: ${Object.keys(mod || {}).join(', ')}`);
         }
     }
-    async collectGeneratorOptions(generatorSchema, pluginName) {
+    async collectGeneratorOptions(generatorSchema, pluginName, skipPrompts) {
         const options = {};
         if (!generatorSchema.properties) {
             return options;
@@ -8468,6 +8590,17 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
         // Use schinquirer to generate questions from schema
         if (generatorSchema.properties && Object.keys(generatorSchema.properties).length > 0) {
             try {
+                // If --yes flag is set, use defaults from schema
+                if (skipPrompts) {
+                    console.log(external_chalk_default().blue(`ℹ️  Using default generator options (--yes flag set)`));
+                    for (const [key, prop] of Object.entries(generatorSchema.properties)){
+                        if (prop.default !== undefined) {
+                            options[key] = prop.default;
+                        }
+                    }
+                    console.log(external_chalk_default().blue(`ℹ️  You can configure generator options later in intrig.config.json`));
+                    return options;
+                }
                 // Check if we're in a non-interactive environment
                 if (!process.stdin.isTTY) {
                     console.log(external_chalk_default().yellow(`⚠️  Non-interactive environment detected. Skipping generator configuration for plugin ${pluginName}.`));
@@ -8535,6 +8668,26 @@ class InitCommand extends external_nest_commander_namespaceObject.CommandRunner
         }
     }
 }
+init_command_ts_decorate([
+    (0,external_nest_commander_namespaceObject.Option)({
+        flags: '-p, --plugin <plugin>',
+        description: 'Specify plugin name directly (e.g., @intrig/plugin-react)'
+    }),
+    init_command_ts_metadata("design:type", Function),
+    init_command_ts_metadata("design:paramtypes", [
+        String
+    ]),
+    init_command_ts_metadata("design:returntype", String)
+], InitCommand.prototype, "parsePluginOption", null);
+init_command_ts_decorate([
+    (0,external_nest_commander_namespaceObject.Option)({
+        flags: '-y, --yes',
+        description: 'Accept defaults and skip interactive prompts'
+    }),
+    init_command_ts_metadata("design:type", Function),
+    init_command_ts_metadata("design:paramtypes", []),
+    init_command_ts_metadata("design:returntype", Boolean)
+], InitCommand.prototype, "parseYesOption", null);
 InitCommand = init_command_ts_decorate([
     (0,external_nest_commander_namespaceObject.Command)({
         name: 'init',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intrig/core",
-  "version": "0.0.15-15",
+  "version": "0.0.15-16",
   "private": false,
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "12.0.2",
+    "@intrig/plugin-sdk": "^0.0.15-16",
     "@nestjs/axios": "4.0.1",
     "@nestjs/common": "10.4.20",
     "@nestjs/config": "4.0.2",