specweave 0.29.1 → 0.30.0

package/dist/src/cli/commands/sync-scheduled.js

@@ -0,0 +1,170 @@
+/**
+ * Sync Scheduled Command
+ *
+ * Executes due scheduled sync jobs. Designed for:
+ * 1. Cron jobs (periodic execution)
+ * 2. Manual invocation
+ * 3. CI/CD pipelines
+ *
+ * Usage:
+ *   specweave sync-scheduled           # Execute due jobs
+ *   specweave sync-scheduled --dry-run # Show what would run
+ *   specweave sync-scheduled --force   # Run all jobs (ignore schedule)
+ *
+ * Cron example (every 15 minutes):
+ *   0,15,30,45 * * * * cd /path/to/project && npx specweave sync-scheduled
+ *
+ * @module cli/commands/sync-scheduled
+ */
+import { Command } from 'commander';
+import path from 'path';
+import { SessionSyncExecutor, } from '../../core/scheduler/session-sync-executor.js';
+import { SchedulePersistence } from '../../core/scheduler/schedule-persistence.js';
+import { consoleLogger } from '../../utils/logger.js';
+/**
+ * Create the sync-scheduled command
+ */
+export function createSyncScheduledCommand(options = {}) {
+    const logger = options.logger ?? consoleLogger;
+    const specweavePath = options.specweavePath ?? path.join(process.cwd(), '.specweave');
+    const projectRoot = path.dirname(specweavePath);
+    const command = new Command('sync-scheduled')
+        .description('Execute due scheduled sync jobs (for cron/CI use)')
+        .option('--dry-run', 'Show what would run without executing')
+        .option('--force', 'Run all sync jobs regardless of schedule')
+        .option('--json', 'Output as JSON')
+        .option('--silent', 'Suppress output (for cron)')
+        .action(async (opts) => {
+        try {
+            if (opts.force) {
+                await runForcedSync(projectRoot, opts, logger);
+            }
+            else {
+                await runScheduledSync(projectRoot, opts, logger);
+            }
+        }
+        catch (error) {
+            if (!opts.silent) {
+                logger.error(`Sync failed: ${error}`);
+            }
+            process.exit(1);
+        }
+    });
+    return command;
+}
+/**
+ * Run scheduled sync (only due jobs)
+ */
+async function runScheduledSync(projectRoot, opts, logger) {
+    const executor = new SessionSyncExecutor({
+        projectRoot,
+        logger: opts.silent ? createSilentLogger() : logger,
+        dryRun: opts.dryRun,
+        maxJobsPerSession: 10, // Allow more jobs for cron
+    });
+    const result = await executor.executeDueJobs();
+    if (opts.json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+    }
+    if (opts.silent) {
+        return;
+    }
+    // Human-readable output
+    printResult(result, opts.dryRun);
+}
+/**
+ * Run forced sync (all jobs regardless of schedule)
+ */
+async function runForcedSync(projectRoot, opts, logger) {
+    const specweavePath = path.join(projectRoot, '.specweave');
+    const persistence = new SchedulePersistence({
+        specweavePath,
+        logger: opts.silent ? createSilentLogger() : logger,
+    });
+    // Load all jobs
+    const jobs = await persistence.loadSchedules();
+    if (jobs.length === 0) {
+        if (!opts.silent) {
+            logger.log('No scheduled jobs found');
+        }
+        return;
+    }
+    if (!opts.silent) {
+        logger.log(`\n🔄 Force sync: ${jobs.length} job(s) to execute\n`);
+    }
+    // Reset all jobs to be due immediately
+    for (const job of jobs) {
+        if (job.schedule.enabled) {
+            const updatedJob = {
+                ...job,
+                schedule: {
+                    ...job.schedule,
+                    nextRun: new Date().toISOString(),
+                },
+            };
+            await persistence.updateJob(job.id, updatedJob);
+        }
+    }
+    // Now run the executor
+    const executor = new SessionSyncExecutor({
+        projectRoot,
+        logger: opts.silent ? createSilentLogger() : logger,
+        dryRun: opts.dryRun,
+        maxJobsPerSession: 100, // No limit for forced sync
+    });
+    const result = await executor.executeDueJobs();
+    if (opts.json) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+    }
+    if (!opts.silent) {
+        printResult(result, opts.dryRun);
+    }
+}
+/**
+ * Print human-readable result
+ */
+function printResult(result, dryRun) {
+    const mode = dryRun ? '[DRY RUN] ' : '';
+    console.log(`\n${mode}📅 Sync Scheduled Results`);
+    console.log('─'.repeat(40));
+    console.log(`Due jobs:      ${result.dueJobCount}`);
+    console.log(`Executed:      ${result.executedJobs.length}`);
+    console.log(`Skipped:       ${result.skippedJobs.length}`);
+    console.log(`Duration:      ${result.totalDurationMs}ms`);
+    if (result.executedJobs.length > 0) {
+        console.log('\nExecuted Jobs:');
+        for (const job of result.executedJobs) {
+            const status = job.success ? '✅' : '❌';
+            const duration = `(${job.durationMs}ms)`;
+            console.log(`  ${status} ${job.jobId} ${duration}`);
+            if (job.error) {
+                console.log(`      Error: ${job.error}`);
+            }
+        }
+    }
+    if (result.skippedJobs.length > 0) {
+        console.log('\nSkipped Jobs:');
+        for (const job of result.skippedJobs) {
+            console.log(`  ⏭️  ${job.jobId}: ${job.skipReason || 'Unknown reason'}`);
+        }
+    }
+    console.log('─'.repeat(40));
+    console.log(result.success ? '✅ Sync completed successfully' : '⚠️  Some jobs failed');
+    console.log('');
+}
+/**
+ * Create a silent logger for cron mode
+ */
+function createSilentLogger() {
+    return {
+        log: () => { },
+        debug: () => { },
+        warn: () => { },
+        error: () => { },
+    };
+}
+// Default export for CLI registration
+export default createSyncScheduledCommand;
+//# sourceMappingURL=sync-scheduled.js.map

package/dist/src/cli/commands/sync-scheduled.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-scheduled.js","sourceRoot":"","sources":["../../../../src/cli/commands/sync-scheduled.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/helpers/init/external-import-grouping.d.ts

@@ -0,0 +1,53 @@
+/**
+ * External Import Grouping Logic
+ *
+ * Groups imported items by external container (JIRA project/board, ADO project/area path)
+ * for 2-level directory structure support.
+ *
+ * Extracted from external-import.ts to reduce file size and improve maintainability.
+ *
+ * @module cli/helpers/init/external-import-grouping
+ */
+import type { ExternalItem } from '../../../importers/external-importer.js';
+import type { ExternalContainerContext } from '../../../core/types/increment-metadata.js';
+/**
+ * Container group for organizing imported items
+ */
+export interface ContainerGroup {
+    containerId: string;
+    containerType: 'jira' | 'ado' | null;
+    projectId: string;
+    items: ExternalItem[];
+    externalContainer: ExternalContainerContext | undefined;
+    /** The parent Epic/Capability item for this group (if ADO hierarchy) */
+    parentItem?: ExternalItem;
+}
+/**
+ * Group items by their source repository
+ * Items without sourceRepo go into '_default' group
+ */
+export declare function groupItemsBySourceRepo(items: ExternalItem[]): Map<string, ExternalItem[]>;
+/**
+ * Group items by external container (JIRA project/board, ADO project/area path)
+ * Returns groups with container context for 2-level directory structure
+ *
+ * CRITICAL FIX (2025-12-01): For ADO items with hierarchy, group by parent Epic/Capability
+ * instead of by area path. This ensures each Epic becomes a separate FS-XXX folder.
+ *
+ * ADO Hierarchy: Capability → Epic → Feature → User Story → Task
+ * - Each top-level Epic/Capability becomes its own group (→ FS-XXX folder)
+ * - Child User Stories/Tasks are grouped under their parent Epic
+ * - Items without parents get their own individual groups
+ */
+export declare function groupItemsByExternalContainer(items: ExternalItem[]): ContainerGroup[];
+/**
+ * Group ADO items by their parent Epic/Capability hierarchy
+ * Each top-level Epic/Capability becomes its own FS-XXX folder
+ */
+export declare function groupAdoItemsByParentHierarchy(items: ExternalItem[]): ContainerGroup[];
+/**
+ * Group non-hierarchy items (JIRA, GitHub, or ADO without hierarchy)
+ * Original grouping logic by project/board/repo
+ */
+export declare function groupNonHierarchyItems(items: ExternalItem[]): ContainerGroup[];
+//# sourceMappingURL=external-import-grouping.d.ts.map

package/dist/src/cli/helpers/init/external-import-grouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"external-import-grouping.d.ts","sourceRoot":"","sources":["../../../../../src/cli/helpers/init/external-import-grouping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAG1F;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,iBAAiB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACxD,wEAAwE;IACxE,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAiCzF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CA8BrF;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CA4ItF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CAiF9E"}

package/dist/src/cli/helpers/init/external-import-grouping.js

@@ -0,0 +1,287 @@
+/**
+ * External Import Grouping Logic
+ *
+ * Groups imported items by external container (JIRA project/board, ADO project/area path)
+ * for 2-level directory structure support.
+ *
+ * Extracted from external-import.ts to reduce file size and improve maintainability.
+ *
+ * @module cli/helpers/init/external-import-grouping
+ */
+import chalk from 'chalk';
+import { normalizeToProjectId } from '../../../utils/project-id-generator.js';
+/**
+ * Group items by their source repository
+ * Items without sourceRepo go into '_default' group
+ */
+export function groupItemsBySourceRepo(items) {
+    const groups = new Map();
+    for (const item of items) {
+        // Extract repo name from sourceRepo (e.g., "owner/repo" -> "repo")
+        let repoKey = '_default';
+        if (item.sourceRepo) {
+            // sourceRepo is "owner/repo", we want just "repo"
+            const parts = item.sourceRepo.split('/');
+            const rawRepoName = parts.length > 1 ? parts[1] : item.sourceRepo;
+            // Sanitize repo name to prevent path injection:
+            // - Allow only alphanumeric, hyphens, underscores
+            // - Trim leading/trailing hyphens
+            // - Limit to 100 chars
+            repoKey = rawRepoName
+                .replace(/[^a-zA-Z0-9-_]/g, '-')
+                .replace(/^-+|-+$/g, '')
+                .slice(0, 100);
+            // Fall back to _default if sanitization results in empty string
+            if (!repoKey) {
+                repoKey = '_default';
+            }
+        }
+        if (!groups.has(repoKey)) {
+            groups.set(repoKey, []);
+        }
+        groups.get(repoKey).push(item);
+    }
+    return groups;
+}
+/**
+ * Group items by external container (JIRA project/board, ADO project/area path)
+ * Returns groups with container context for 2-level directory structure
+ *
+ * CRITICAL FIX (2025-12-01): For ADO items with hierarchy, group by parent Epic/Capability
+ * instead of by area path. This ensures each Epic becomes a separate FS-XXX folder.
+ *
+ * ADO Hierarchy: Capability → Epic → Feature → User Story → Task
+ * - Each top-level Epic/Capability becomes its own group (→ FS-XXX folder)
+ * - Child User Stories/Tasks are grouped under their parent Epic
+ * - Items without parents get their own individual groups
+ */
+export function groupItemsByExternalContainer(items) {
+    const groups = new Map();
+    // Check if we have ADO items with hierarchy
+    const adoItems = items.filter(item => item.platform === 'ado' && item.adoProjectName);
+    const hasAdoHierarchy = adoItems.some(item => item.parentId || item.type === 'epic');
+    // For ADO with hierarchy, use parent-based grouping
+    if (hasAdoHierarchy && adoItems.length > 0) {
+        const adoGroups = groupAdoItemsByParentHierarchy(adoItems);
+        for (const group of adoGroups) {
+            groups.set(group.projectId, group);
+        }
+        // Also process non-ADO items normally
+        const nonAdoItems = items.filter(item => item.platform !== 'ado' || !item.adoProjectName);
+        if (nonAdoItems.length > 0) {
+            const nonAdoGroups = groupNonHierarchyItems(nonAdoItems);
+            for (const group of nonAdoGroups) {
+                // Avoid key collisions with ADO groups
+                const uniqueKey = `other:${group.projectId}`;
+                groups.set(uniqueKey, group);
+            }
+        }
+        return Array.from(groups.values());
+    }
+    // No ADO hierarchy - use original grouping logic for all items
+    return groupNonHierarchyItems(items);
+}
+/**
+ * Group ADO items by their parent Epic/Capability hierarchy
+ * Each top-level Epic/Capability becomes its own FS-XXX folder
+ */
+export function groupAdoItemsByParentHierarchy(items) {
+    const groups = new Map();
+    // Build item lookup map
+    const itemById = new Map();
+    for (const item of items) {
+        itemById.set(item.id, item);
+    }
+    // Find feature-level types (these become folder leaders)
+    const featureLevelTypes = new Set(['capability', 'epic', 'feature']);
+    // Find ALL top-level parents (Epics/Capabilities that are NOT children of other items in our dataset)
+    const topLevelParents = new Map();
+    for (const item of items) {
+        const witType = item.adoWorkItemType?.toLowerCase() || item.type;
+        if (featureLevelTypes.has(witType)) {
+            // Check if this item's parent is NOT in our dataset (making it a top-level parent)
+            const hasParentInDataset = item.parentId && itemById.has(item.parentId);
+            if (!hasParentInDataset) {
+                topLevelParents.set(item.id, item);
+            }
+        }
+    }
+    // Function to find the top-level parent for an item
+    function findTopLevelParent(item) {
+        // If this item IS a top-level parent, return it
+        if (topLevelParents.has(item.id)) {
+            return item;
+        }
+        // Walk up the parent chain
+        let current = item;
+        const visited = new Set();
+        while (current && current.parentId && !visited.has(current.id)) {
+            visited.add(current.id);
+            // Check if parent is a top-level parent
+            if (topLevelParents.has(current.parentId)) {
+                return topLevelParents.get(current.parentId);
+            }
+            // Move to parent
+            current = itemById.get(current.parentId);
+        }
+        // No top-level parent found
+        return undefined;
+    }
+    // Create groups for each top-level parent first
+    for (const [parentId, parentItem] of topLevelParents) {
+        const containerId = parentItem.adoProjectName || 'default';
+        const projectId = normalizeToProjectId(parentItem.title) || `ado-${parentId.replace('ADO-', '')}`;
+        const groupKey = `ado:parent:${parentId}`;
+        groups.set(groupKey, {
+            containerId,
+            containerType: 'ado',
+            projectId,
+            items: [parentItem], // Parent item goes first
+            externalContainer: {
+                type: 'ado-project',
+                containerId,
+                containerName: containerId,
+                areaPath: parentItem.adoAreaPath
+            },
+            parentItem
+        });
+    }
+    // Assign child items to their parent groups
+    for (const item of items) {
+        // Skip top-level parents (already added)
+        if (topLevelParents.has(item.id)) {
+            continue;
+        }
+        // Find the top-level parent
+        const topLevelParent = findTopLevelParent(item);
+        if (topLevelParent) {
+            // Add to parent's group
+            const groupKey = `ado:parent:${topLevelParent.id}`;
+            const group = groups.get(groupKey);
+            if (group) {
+                group.items.push(item);
+            }
+        }
+        else {
+            // No parent found - group by area path (2-level structure: project/areaPath)
+            // This handles orphan items (User Stories with parents outside our dataset)
+            // CRITICAL FIX (2025-12-01): Group by area path, NOT by User Story title
+            const containerId = item.adoProjectName || 'default';
+            // Extract area path leaf segment for grouping (e.g., "Project\Platform-Engineering" → "platform-engineering")
+            let areaFolder = '_default';
+            if (item.adoAreaPath) {
+                const segments = item.adoAreaPath.split('\\');
+                // Use leaf segment, or second segment if only project name
+                const leafSegment = segments.length > 1 ? segments[segments.length - 1] : segments[0];
+                areaFolder = normalizeToProjectId(leafSegment) || '_default';
+            }
+            // Group all items without parents by their area path
+            // This ensures siblings with same area path stay together
+            const groupKey = `ado:area:${containerId}:${areaFolder}`;
+            const projectId = areaFolder;
+            if (!groups.has(groupKey)) {
+                groups.set(groupKey, {
+                    containerId,
+                    containerType: 'ado',
+                    projectId,
+                    items: [],
+                    externalContainer: {
+                        type: 'ado-project',
+                        containerId,
+                        containerName: containerId,
+                        areaPath: item.adoAreaPath
+                    }
+                });
+            }
+            groups.get(groupKey).items.push(item);
+        }
+    }
+    // Log grouping results for diagnostics
+    console.log(chalk.cyan(`   📊 ADO Hierarchy Grouping:`));
+    console.log(chalk.gray(`      → ${topLevelParents.size} top-level Epics/Capabilities found`));
+    for (const [key, group] of groups) {
+        const parentInfo = group.parentItem
+            ? ` (parent: ${group.parentItem.adoWorkItemType || 'Epic'} "${group.parentItem.title.slice(0, 30)}...")`
+            : '';
+        console.log(chalk.gray(`      → ${group.projectId}: ${group.items.length} items${parentInfo}`));
+    }
+    return Array.from(groups.values());
+}
+/**
+ * Group non-hierarchy items (JIRA, GitHub, or ADO without hierarchy)
+ * Original grouping logic by project/board/repo
+ */
+export function groupNonHierarchyItems(items) {
+    const groups = new Map();
+    for (const item of items) {
+        let groupKey;
+        let containerType = null;
+        let containerId;
+        let projectId;
+        let externalContainer;
+        // Check for JIRA container context
+        if (item.jiraProjectKey) {
+            containerType = 'jira';
+            containerId = item.jiraProjectKey;
+            // Project ID from board name (if available) or default
+            projectId = item.jiraBoardName
+                ? normalizeToProjectId(item.jiraBoardName) || 'default'
+                : 'default';
+            groupKey = `jira:${containerId}:${projectId}`;
+            externalContainer = {
+                type: 'jira-project',
+                containerId: containerId,
+                containerName: containerId,
+                boardId: item.jiraBoardId,
+                boardName: item.jiraBoardName
+            };
+        }
+        // Check for ADO container context (without hierarchy)
+        else if (item.adoProjectName) {
+            containerType = 'ado';
+            containerId = item.adoProjectName;
+            // Project ID from area path (extract last segment) or default
+            if (item.adoAreaPath) {
+                const areaSegments = item.adoAreaPath.split('\\');
+                const lastSegment = areaSegments[areaSegments.length - 1];
+                projectId = normalizeToProjectId(lastSegment) || 'default';
+            }
+            else {
+                projectId = 'default';
+            }
+            groupKey = `ado:${containerId}:${projectId}`;
+            externalContainer = {
+                type: 'ado-project',
+                containerId: containerId,
+                containerName: containerId,
+                areaPath: item.adoAreaPath
+            };
+        }
+        // GitHub or default (1-level structure)
+        else {
+            // Use sourceRepo if available, otherwise '_default'
+            if (item.sourceRepo) {
+                const parts = item.sourceRepo.split('/');
+                const rawRepoName = parts.length > 1 ? parts[1] : item.sourceRepo;
+                projectId = normalizeToProjectId(rawRepoName) || '_default';
+            }
+            else {
+                projectId = '_default';
+            }
+            groupKey = `gh:${projectId}`;
+            // No externalContainer for GitHub (1-level structure)
+        }
+        if (!groups.has(groupKey)) {
+            groups.set(groupKey, {
+                containerId: containerId || projectId,
+                containerType,
+                projectId,
+                items: [],
+                externalContainer
+            });
+        }
+        groups.get(groupKey).items.push(item);
+    }
+    return Array.from(groups.values());
+}
+//# sourceMappingURL=external-import-grouping.js.map

package/dist/src/cli/helpers/init/external-import-grouping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"external-import-grouping.js","sourceRoot":"","sources":["../../../../../src/cli/helpers/init/external-import-grouping.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/helpers/init/external-import.d.ts

@@ -3,9 +3,8 @@
  * Imports work items from GitHub, JIRA, Azure DevOps
  */
 import { CoordinatorResult } from '../../../importers/import-coordinator.js';
-import type { ExternalItem } from '../../../importers/external-importer.js';
-import type { ExternalContainerContext } from '../../../core/types/increment-metadata.js';
 import type { SupportedLanguage } from '../../../core/i18n/types.js';
+import { groupItemsByExternalContainer, groupAdoItemsByParentHierarchy, groupNonHierarchyItems, type ContainerGroup } from './external-import-grouping.js';
 /**
  * Prompt user and run external tool import
  * Detects GitHub/JIRA/ADO configuration and imports work items
@@ -33,38 +32,6 @@ export interface BackgroundImportResult {
     pid?: number;
     message: string;
 }
-/**
- * Group items by external container (JIRA project/board, ADO project/area path)
- * Returns groups with container context for 2-level directory structure
- *
- * CRITICAL FIX (2025-12-01): For ADO items with hierarchy, group by parent Epic/Capability
- * instead of by area path. This ensures each Epic becomes a separate FS-XXX folder.
- *
- * ADO Hierarchy: Capability → Epic → Feature → User Story → Task
- * - Each top-level Epic/Capability becomes its own group (→ FS-XXX folder)
- * - Child User Stories/Tasks are grouped under their parent Epic
- * - Items without parents get their own individual groups
- */
-interface ContainerGroup {
-    containerId: string;
-    containerType: 'jira' | 'ado' | null;
-    projectId: string;
-    items: ExternalItem[];
-    externalContainer: ExternalContainerContext | undefined;
-    /** The parent Epic/Capability item for this group (if ADO hierarchy) */
-    parentItem?: ExternalItem;
-}
-declare function groupItemsByExternalContainer(items: ExternalItem[]): ContainerGroup[];
-/**
- * Group ADO items by their parent Epic/Capability hierarchy
- * Each top-level Epic/Capability becomes its own FS-XXX folder
- */
-declare function groupAdoItemsByParentHierarchy(items: ExternalItem[]): ContainerGroup[];
-/**
- * Group non-hierarchy items (JIRA, GitHub, or ADO without hierarchy)
- * Original grouping logic by project/board/repo
- */
-declare function groupNonHierarchyItems(items: ExternalItem[]): ContainerGroup[];
 export declare const __test__: {
     groupAdoItemsByParentHierarchy: typeof groupAdoItemsByParentHierarchy;
     groupItemsByExternalContainer: typeof groupItemsByExternalContainer;

package/dist/src/cli/helpers/init/external-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-import.d.ts","sourceRoot":"","sources":["../../../../../src/cli/helpers/init/external-import.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,OAAO,EAAwC,iBAAiB,EAAgB,MAAM,0CAA0C,CAAC;AAEjI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAK1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAmVrE;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,8CAA8C;IAC9C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gCAAgC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,EACb,QAAQ,GAAE,iBAAwB,EAClC,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,iBAAiB,GAAG,sBAAsB,CAAC,CAiTrD;AA2TD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AA0bD;;;;;;;;;;;GAWG;AACH,UAAU,cAAc;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,iBAAiB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACxD,wEAAwE;IACxE,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,iBAAS,6BAA6B,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CA8B9E;AAED;;;GAGG;AACH,iBAAS,8BAA8B,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CA4I/E;AAED;;;GAGG;AACH,iBAAS,sBAAsB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,cAAc,EAAE,CAiFvE;AAkBD,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,YAAY,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"external-import.d.ts","sourceRoot":"","sources":["../../../../../src/cli/helpers/init/external-import.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,OAAO,EAAwC,iBAAiB,EAAgB,MAAM,0CAA0C,CAAC;AAQjI,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAwBrE,OAAO,EACL,6BAA6B,EAE7B,8BAA8B,EAC9B,sBAAsB,EACtB,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAC;AAoUvC;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,8CAA8C;IAC9C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gCAAgC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,EACb,QAAQ,GAAE,iBAAwB,EAClC,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,iBAAiB,GAAG,sBAAsB,CAAC,CAiTrD;AAyED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AA4aD,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAGF,YAAY,EAAE,cAAc,EAAE,CAAC"}