hereya-cli 0.55.0 → 0.57.0

package/dist/lib/package/index.js

@@ -1,42 +1,139 @@
 import * as yaml from 'yaml';
 import { z } from 'zod';
+import { getCurrentBackendType } from '../../backend/config.js';
+import { BackendType, getBackend } from '../../backend/index.js';
 import { IacType } from '../../iac/common.js';
 import { InfrastructureType } from '../../infrastructure/common.js';
+import { CloudPackageManager } from './cloud.js';
 import { GitHubPackageManager } from './github.js';
 import { LocalPackageManager } from './local.js';
-export const packageManager = new GitHubPackageManager();
+export const githubPackageManager = new GitHubPackageManager();
 export const localPackageManager = new LocalPackageManager();
-export function getPackageManager(protocol) {
+export async function getPackageManager(protocol, logger) {
     if (protocol === 'local') {
         return localPackageManager;
     }
-    return packageManager;
+    if (protocol === 'cloud') {
+        const backend = await getBackend();
+        return new CloudPackageManager(backend, logger);
+    }
+    // Default to GitHub
+    return githubPackageManager;
 }
 export async function resolvePackage(input) {
-    if (input.package.includes('.')) {
+    // Parse package spec to extract name and version
+    const { packageName, version } = parsePackageSpec(input.package);
+    // Validate package name format
+    if (packageName.includes('.')) {
         return { found: false, reason: 'Invalid package format. Package name cannot contain dots (.) nor double dashes (--)' };
     }
-    if (input.package.includes('--')) {
+    if (packageName.includes('--')) {
         return { found: false, reason: 'Invalid package format. Package name cannot contain dots (.) nor double dashes (--)' };
     }
-    const isLocal = input.package.startsWith('local/');
+    const isLocal = packageName.startsWith('local/');
+    // Try cloud first if not local and backend is cloud
+    if (!isLocal) {
+        const backendType = await getCurrentBackendType();
+        if (backendType === BackendType.Cloud) {
+            const result = await tryCloudResolution(input);
+            if (result.found) {
+                return result; // Success
+            }
+            // Failed - check if we should fallback to GitHub or return the error
+            if (!packageName.includes('/')) {
+                // Simple package names can't fallback to GitHub, return the detailed error
+                return result;
+            }
+            // For owner/repo format, we can fallback to GitHub
+            input.logger?.debug(`Package ${packageName} not found in registry, trying GitHub...`);
+            input.logger?.debug(`Registry error: ${result.reason}`);
+        }
+    }
+    // Determine protocol for standard resolution
+    const protocol = isLocal ? 'local' : '';
+    // Standard resolution (GitHub or local)  
+    return resolveWithStandardManager(protocol, input, packageName, version);
+}
+export function getPackageCanonicalName(packageName) {
+    return packageName.replaceAll('/', '--');
+}
+export async function downloadPackage(pkgUrl, destPath) {
+    // Determine protocol based on URL characteristics
+    let protocol = '';
+    if (pkgUrl.startsWith('local/')) {
+        protocol = 'local';
+    }
+    else if (pkgUrl.includes('#')) {
+        // Registry package URLs contain commit SHA
+        const backendType = await getCurrentBackendType();
+        if (backendType === BackendType.Cloud) {
+            protocol = 'cloud';
+        }
+    }
+    // Otherwise defaults to GitHub
+    const packageManager = await getPackageManager(protocol);
+    return packageManager.downloadPackage(pkgUrl, destPath);
+}
+export const PackageMetadata = z.object({
+    dependencies: z.record(z.string()).optional(),
+    deploy: z.boolean().optional(),
+    iac: z.nativeEnum(IacType),
+    infra: z.nativeEnum(InfrastructureType),
+    onDeploy: z
+        .object({
+        pkg: z.string(),
+        version: z.string(),
+    })
+        .optional(),
+    originalInfra: z.nativeEnum(InfrastructureType).optional(),
+});
+// Helper function to parse package spec into name and version
+function parsePackageSpec(spec) {
+    const match = spec.match(/^([^@]+)(?:@(.+))?$/);
+    if (!match) {
+        return { packageName: spec };
+    }
+    const [, packageName, version] = match;
+    return { packageName, version };
+}
+// Helper function to try cloud resolution
+async function tryCloudResolution(input) {
+    const cloudManager = await getPackageManager('cloud', input.logger);
+    const cloudPackageInfo = await cloudManager.resolvePackage(input.package);
+    if (cloudPackageInfo) {
+        // Successfully found in registry, now get metadata
+        input.logger?.debug(`Found package in registry: ${cloudPackageInfo.name}@${cloudPackageInfo.version}`);
+        const result = await resolveCloudPackage(cloudPackageInfo, cloudManager, input);
+        input.logger?.debug(`Metadata resolution result: ${result.found ? 'success' : result.reason}`);
+        return result; // Return success or failure with detailed reason
+    }
+    // Package not found in registry at all
+    return {
+        found: false,
+        reason: `Package '${input.package}' not found in cloud registry. Make sure the package name is correct and you have access to it.`
+    };
+}
+// Helper function for standard (GitHub/local) resolution
+async function resolveWithStandardManager(protocol, input, packageName, version) {
+    // Standard managers don't support logger yet
+    // Parse owner/repo from package name
     let [owner, repo] = ['', ''];
-    if (isLocal) {
+    if (protocol === 'local') {
         owner = 'local';
-        repo = input.package.replace('local/', '');
+        repo = packageName.replace('local/', '');
     }
     else {
-        const pkgParts = input.package.split('/');
+        const pkgParts = packageName.split('/');
         if (pkgParts.length !== 2) {
-            return { found: false, reason: 'Invalid package format. Use owner/repository' };
+            return { found: false, reason: 'Invalid package format. Use owner/repository or org/name' };
         }
         ;
         [owner, repo] = pkgParts;
     }
-    const packageManager = getPackageManager(isLocal ? 'local' : '');
+    const packageManager = await getPackageManager(protocol);
     const metadataContentCandidates = (await Promise.all([
-        packageManager.getRepoContent({ owner, path: 'hereyarc.yaml', projectRootDir: input.projectRootDir, repo }),
-        packageManager.getRepoContent({ owner, path: 'hereyarc.yml', projectRootDir: input.projectRootDir, repo }),
+        packageManager.getRepoContent({ owner, path: 'hereyarc.yaml', projectRootDir: input.projectRootDir, repo, version }),
+        packageManager.getRepoContent({ owner, path: 'hereyarc.yml', projectRootDir: input.projectRootDir, repo, version }),
     ])).filter((content$) => content$.found);
     if (metadataContentCandidates.length === 0) {
         return { found: false, reason: `No hereya metadata file found in ${input.package}` };
@@ -48,37 +145,83 @@ export async function resolvePackage(input) {
             return { found: false, reason: 'Package has dependencies but is not a deploy package' };
         }
         if (input.isDeploying && metadata.onDeploy) {
-            return resolvePackage({ package: metadata.onDeploy.pkg, projectRootDir: input.projectRootDir });
+            return resolvePackage({ ...input, package: metadata.onDeploy.pkg });
         }
         return {
-            canonicalName: getPackageCanonicalName(input.package),
+            canonicalName: getPackageCanonicalName(packageName),
             found: true,
             metadata,
             packageUri: metadataContent$.pkgUrl,
-            pkgName: input.package,
+            pkgName: packageName,
+            version: version || '',
         };
     }
     catch (error) {
         return { found: false, reason: error.message };
     }
 }
-export function getPackageCanonicalName(packageName) {
-    return packageName.replaceAll('/', '--');
-}
-export async function downloadPackage(pkgUrl, destPath) {
-    const packageManager = getPackageManager(pkgUrl.startsWith('local/') ? 'local' : '');
-    return packageManager.downloadPackage(pkgUrl, destPath);
+// Helper function to resolve cloud package metadata
+async function resolveCloudPackage(packageInfo, cloudManager, input) {
+    // Parse package name to determine owner/repo for getRepoContent interface
+    // For simple names like 'mongo', owner will be empty
+    // For org/name format like 'hereya/mongo', split into owner and repo
+    const parts = packageInfo.name.split('/');
+    const owner = parts.length === 2 ? parts[0] : '';
+    const repo = parts.length === 2 ? parts[1] : packageInfo.name;
+    // Get metadata using the standard getRepoContent interface
+    // CloudPackageManager will reconstruct the package name and look it up in registry
+    const metadataContentCandidates = (await Promise.all([
+        cloudManager.getRepoContent({
+            owner,
+            path: 'hereyarc.yaml',
+            projectRootDir: input.projectRootDir,
+            repo,
+            version: packageInfo.version,
+        }),
+        cloudManager.getRepoContent({
+            owner,
+            path: 'hereyarc.yml',
+            projectRootDir: input.projectRootDir,
+            repo,
+            version: packageInfo.version,
+        }),
+    ])).filter((content$) => content$.found);
+    if (metadataContentCandidates.length === 0) {
+        // Try to get more detailed error from the last attempt
+        const lastAttempt = await cloudManager.getRepoContent({
+            owner,
+            path: 'hereyarc.yaml',
+            projectRootDir: input.projectRootDir,
+            repo,
+        });
+        const detailedReason = !lastAttempt.found && lastAttempt.reason
+            ? lastAttempt.reason
+            : `No hereya metadata file (hereyarc.yaml or hereyarc.yml) found for package '${packageInfo.name}'`;
+        return { found: false, reason: detailedReason };
+    }
+    const metadataContent$ = metadataContentCandidates[0];
+    try {
+        const metadata = PackageMetadata.parse(yaml.parse(metadataContent$.content));
+        if (!metadata.deploy && metadata.dependencies) {
+            return { found: false, reason: 'Package has dependencies but is not a deploy package' };
+        }
+        if (input.isDeploying && metadata.onDeploy) {
+            return resolvePackage({ ...input, package: metadata.onDeploy.pkg });
+        }
+        // Build packageUri with repository and commit
+        const packageUri = packageInfo.registryPackage.commit
+            ? `${packageInfo.registryPackage.repository}#${packageInfo.registryPackage.commit}`
+            : packageInfo.registryPackage.repository || metadataContent$.pkgUrl;
+        return {
+            canonicalName: getPackageCanonicalName(packageInfo.name),
+            found: true,
+            metadata,
+            packageUri,
+            pkgName: packageInfo.name,
+            version: packageInfo.version,
+        };
+    }
+    catch (error) {
+        return { found: false, reason: error.message };
+    }
 }
-export const PackageMetadata = z.object({
-    dependencies: z.record(z.string()).optional(),
-    deploy: z.boolean().optional(),
-    iac: z.nativeEnum(IacType),
-    infra: z.nativeEnum(InfrastructureType),
-    onDeploy: z
-        .object({
-        pkg: z.string(),
-        version: z.string(),
-    })
-        .optional(),
-    originalInfra: z.nativeEnum(InfrastructureType).optional(),
-});

package/dist/lib/package/local.js

@@ -7,6 +7,7 @@ export class LocalPackageManager {
         return destPath;
     }
     async getRepoContent({ path: filePath, projectRootDir, repo }) {
+        // Local packages don't have versions, version parameter is ignored
         try {
             const pkgRootDir = path.join(projectRootDir ?? process.cwd(), repo);
             const resolvedPath = path.join(pkgRootDir, filePath);

package/oclif.manifest.json

@@ -193,6 +193,63 @@
         "index.js"
       ]
     },
+    "doc": {
+      "aliases": [],
+      "args": {
+        "package": {
+          "description": "Package name with optional version (e.g., my-package or my-package@1.0.0)",
+          "name": "package",
+          "required": true
+        }
+      },
+      "description": "Display documentation for a package from the registry",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> my-package",
+        "<%= config.bin %> <%= command.id %> my-package@1.0.0",
+        "<%= config.bin %> <%= command.id %> my-package --json",
+        "<%= config.bin %> <%= command.id %> my-package --no-doc"
+      ],
+      "flags": {
+        "chdir": {
+          "char": "C",
+          "description": "directory to run command in",
+          "helpGroup": "global",
+          "name": "chdir",
+          "default": ".",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "char": "j",
+          "description": "Output in JSON format",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-doc": {
+          "description": "Show only metadata without the full documentation",
+          "name": "no-doc",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "doc",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "doc",
+        "index.js"
+      ]
+    },
     "down": {
       "aliases": [],
       "args": {},
@@ -507,6 +564,40 @@
         "index.js"
       ]
     },
+    "publish": {
+      "aliases": [],
+      "args": {},
+      "description": "Publish a package to the Hereya registry",
+      "examples": [
+        "$ hereya publish",
+        "$ hereya publish --chdir=/path/to/package"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "\n        Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n      ",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "publish",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "publish",
+        "index.js"
+      ]
+    },
     "remove": {
       "aliases": [],
       "args": {
@@ -1786,5 +1877,5 @@
       ]
     }
   },
-  "version": "0.55.0"
+  "version": "0.57.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.55.0",
+  "version": "0.57.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -19,10 +19,13 @@
     "@oclif/core": "^4.2.6",
     "@oclif/plugin-help": "^6.2.25",
     "@oclif/plugin-plugins": "^5.4.31",
+    "chalk": "^5.5.0",
     "glob": "^11.0.1",
     "ignore": "^7.0.3",
     "keytar": "^7.9.0",
     "listr2": "^8.2.5",
+    "marked": "^16.1.2",
+    "marked-terminal": "7.3.0",
     "node-machine-id": "^1.1.12",
     "open": "^10.1.1",
     "simple-git": "^3.27.0",
@@ -35,10 +38,13 @@
     "@oclif/test": "^4.1.9",
     "@types/chai": "^5.0.1",
     "@types/jsonwebtoken": "^9.0.9",
+    "@types/marked-terminal": "^6.1.1",
     "@types/mocha": "^10.0.10",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22",
     "@types/sinon": "^17.0.3",
+    "@types/sinon-chai": "^4.0.0",
+    "@types/tar": "^6.1.13",
     "@types/unzip-stream": "^0.3.4",
     "chai": "^5.1.2",
     "eslint": "^9.20.1",
@@ -52,6 +58,7 @@
     "oclif": "^4.17.27",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",
+    "sinon-chai": "^4.0.0",
     "tsx": "^4.20.3",
     "typescript": "^5.7.3"
   },