hereya-cli 0.17.1 → 0.18.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.17.1 linux-x64 node-v22.13.1
+hereya-cli/0.18.0 linux-x64 node-v22.13.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -74,7 +74,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -99,7 +99,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -121,7 +121,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -144,7 +144,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -175,7 +175,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -197,10 +197,12 @@ DESCRIPTION
   Set an user-defined environment variable for the project
 
 EXAMPLES
-  $ hereya env set FOO bar
+  $ hereya env set FOO -v bar
+
+  $ hereya env set FOO -v bar -w dev
 ```
 
-_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -246,7 +248,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -270,7 +272,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -296,7 +298,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -321,7 +323,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -343,7 +345,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -366,7 +368,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -386,7 +388,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -406,7 +408,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -432,7 +434,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -456,7 +458,7 @@ EXAMPLES
   $ hereya workspace env set -w my-workspace -n myVar -v my-value -i aws -s
 ```
 
-_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -477,7 +479,7 @@ EXAMPLES
   $ hereya workspace env unset -w my-workspace -n myVar
 ```
 
-_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -504,7 +506,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -531,5 +533,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.1/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.18.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/commands/down/index.js

@@ -87,31 +87,30 @@ export default class Down extends Command {
                         {
                             skip: (ctx) => !ctx.packages || ctx.packages.length === 0,
                             async task(ctx) {
-                                const { configOutput, destroyed, packages, workspace, workspaceEnvOutput } = ctx;
-                                if (!packages || packages.length === 0) {
+                                if (!ctx.packages || ctx.packages.length === 0) {
                                     return;
                                 }
-                                return task.newListr(packages.map((packageName) => ({
+                                return task.newListr(ctx.packages.map((packageName) => ({
                                     async task() {
                                         const parameterManager = getParameterManager();
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             projectRootDir,
-                                            workspace,
+                                            workspace: ctx.workspace,
                                         });
                                         const destroyOutput = await destroyPackage({
-                                            env: workspaceEnvOutput.env,
+                                            env: ctx.workspaceEnvOutput.env,
                                             isDeploying: flags.deploy,
                                             package: packageName,
                                             parameters,
-                                            project: configOutput.config.project,
-                                            workspace,
+                                            project: ctx.configOutput.config.project,
+                                            workspace: ctx.workspace,
                                         });
                                         if (!destroyOutput.success) {
                                             throw new Error(destroyOutput.reason);
                                         }
                                         const { env, metadata } = destroyOutput;
-                                        const output = destroyed || [];
+                                        const output = ctx.destroyed || [];
                                         output.push({ env, metadata, packageName });
                                         ctx.destroyed = output;
                                     },

package/dist/commands/env/set/index.js

@@ -8,7 +8,10 @@ export default class EnvSet extends Command {
         name: Args.string({ description: 'name of the environment variable to set' }),
     };
     static description = 'Set an user-defined environment variable for the project';
-    static examples = ['<%= config.bin %> <%= command.id %> FOO bar'];
+    static examples = [
+        '<%= config.bin %> <%= command.id %> FOO -v bar',
+        '<%= config.bin %> <%= command.id %> FOO -v bar -w dev',
+    ];
     static flags = {
         chdir: Flags.string({
             description: 'project root directory',
@@ -38,15 +41,14 @@ export default class EnvSet extends Command {
             return;
         }
         const rootDir = projectRootDir ?? process.cwd();
-        const candidates = flags.workspace ? [
-            path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yaml`),
-            path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yml`),
-        ] : [
-            path.join(rootDir, 'hereyastaticenv', `env.yaml`),
-            path.join(rootDir, 'hereyastaticenv', `env.yml`),
-        ];
+        const candidates = flags.workspace
+            ? [
+                path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yaml`),
+                path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yml`),
+            ]
+            : [path.join(rootDir, 'hereyastaticenv', `env.yaml`), path.join(rootDir, 'hereyastaticenv', `env.yml`)];
         const envFile = await getAnyPath(...candidates);
-        const { data: env, } = await load(envFile);
+        const { data: env } = await load(envFile);
         env[args.name] = flags.value;
         await save(env, envFile);
         this.log(`Environment variable ${args.name} set to ${flags.value} in ${envFile}`);

package/dist/lib/package/github.d.ts

@@ -1,5 +1,7 @@
 import type { GetRepoContentInput, GetRepoContentOutput, PackageManager } from './common.js';
 export declare class GitHubPackageManager implements PackageManager {
+    private readonly registryUrl;
+    constructor(registryUrl?: string);
     downloadPackage(pkgUrl: string, destPath: string): Promise<string>;
     getRepoContent({ owner, path: filePath, repo }: GetRepoContentInput): Promise<GetRepoContentOutput>;
 }

package/dist/lib/package/github.js

@@ -11,6 +11,10 @@ import { simpleGit } from 'simple-git';
 import { BackOffPolicy, Retryable } from 'typescript-retry-decorator';
 import { isNotEmpty } from '../filesystem.js';
 export class GitHubPackageManager {
+    registryUrl;
+    constructor(registryUrl = process.env.HEREYA_REGISTRY_URL || 'https://github.com') {
+        this.registryUrl = registryUrl;
+    }
     // eslint-disable-next-line new-cap
     async downloadPackage(pkgUrl, destPath) {
         if (await isNotEmpty(destPath)) {
@@ -24,7 +28,7 @@ export class GitHubPackageManager {
         return destPath;
     }
     async getRepoContent({ owner, path: filePath, repo }) {
-        const pkgUrl = `https://github.com/${owner}/${repo}`;
+        const pkgUrl = `${this.registryUrl}/${owner}/${repo}`;
         const tmpFolder = path.join(os.tmpdir(), 'hereya', 'github', owner, repo);
         try {
             const destPath = await this.downloadPackage(pkgUrl, tmpFolder);

package/dist/lib/package/index.d.ts

@@ -2,8 +2,10 @@ import { z } from 'zod';
 import { IacType } from '../../iac/common.js';
 import { InfrastructureType } from '../../infrastructure/common.js';
 import { PackageManager } from './common.js';
+import { LocalPackageManager } from './local.js';
 export declare const packageManager: PackageManager;
-export declare function getPackageManager(): PackageManager;
+export declare const localPackageManager: LocalPackageManager;
+export declare function getPackageManager(protocol: string): PackageManager;
 export declare function resolvePackage(input: ResolvePackageInput): Promise<ResolvePackageOutput>;
 export declare function getPackageCanonicalName(packageName: string): string;
 export declare function downloadPackage(pkgUrl: string, destPath: string): Promise<string>;

package/dist/lib/package/index.js

@@ -3,17 +3,31 @@ import { z } from 'zod';
 import { IacType } from '../../iac/common.js';
 import { InfrastructureType } from '../../infrastructure/common.js';
 import { GitHubPackageManager } from './github.js';
+import { LocalPackageManager } from './local.js';
 export const packageManager = new GitHubPackageManager();
-export function getPackageManager() {
+export const localPackageManager = new LocalPackageManager();
+export function getPackageManager(protocol) {
+    if (protocol === 'local') {
+        return localPackageManager;
+    }
     return packageManager;
 }
 export async function resolvePackage(input) {
-    const pkgParts = input.package.split('/');
-    if (pkgParts.length !== 2) {
-        return { found: false, reason: 'Invalid package format. Use owner/repository' };
+    const isLocal = input.package.startsWith('local://');
+    let [owner, repo] = ['', ''];
+    if (isLocal) {
+        ;
+        [owner, repo] = input.package.split('://');
+    }
+    else {
+        const pkgParts = input.package.split('/');
+        if (pkgParts.length !== 2) {
+            return { found: false, reason: 'Invalid package format. Use owner/repository' };
+        }
+        ;
+        [owner, repo] = pkgParts;
     }
-    const [owner, repo] = pkgParts;
-    const packageManager = getPackageManager();
+    const packageManager = getPackageManager(isLocal ? 'local' : '');
     const metadataContentCandidates = (await Promise.all([
         packageManager.getRepoContent({ owner, path: 'hereyarc.yaml', repo }),
         packageManager.getRepoContent({ owner, path: 'hereyarc.yml', repo }),
@@ -43,10 +57,14 @@ export async function resolvePackage(input) {
     }
 }
 export function getPackageCanonicalName(packageName) {
+    const isLocal = packageName.startsWith('local://');
+    if (isLocal) {
+        return packageName.replace('local://', 'local--').replace('/', '-');
+    }
     return packageName.replace('/', '-');
 }
 export async function downloadPackage(pkgUrl, destPath) {
-    const packageManager = getPackageManager();
+    const packageManager = getPackageManager(pkgUrl.startsWith('local://') ? 'local' : '');
     return packageManager.downloadPackage(pkgUrl, destPath);
 }
 export const PackageMetadata = z.object({

package/dist/lib/package/local.d.ts

@@ -0,0 +1,5 @@
+import { GetRepoContentInput, GetRepoContentOutput, PackageManager } from './common.js';
+export declare class LocalPackageManager implements PackageManager {
+    downloadPackage(pkgUrl: string, destPath: string): Promise<string>;
+    getRepoContent({ path: filePath, repo }: GetRepoContentInput): Promise<GetRepoContentOutput>;
+}

package/dist/lib/package/local.js

@@ -0,0 +1,32 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+export class LocalPackageManager {
+    async downloadPackage(pkgUrl, destPath) {
+        const [, source] = pkgUrl.split('://');
+        await fs.cp(source, destPath, { recursive: true });
+        return destPath;
+    }
+    async getRepoContent({ path: filePath, repo }) {
+        try {
+            const resolvedPath = path.join(repo, filePath);
+            if (await fs.stat(resolvedPath)) {
+                const content = await fs.readFile(resolvedPath, 'utf8');
+                return {
+                    content,
+                    found: true,
+                    pkgUrl: `local://${repo}`,
+                };
+            }
+            return {
+                found: false,
+                reason: `File ${filePath} not found in ${repo}`,
+            };
+        }
+        catch (error) {
+            return {
+                found: false,
+                reason: error.message,
+            };
+        }
+    }
+}

package/oclif.manifest.json

@@ -304,18 +304,19 @@
         "index.js"
       ]
     },
-    "remove": {
+    "run": {
       "aliases": [],
       "args": {
-        "package": {
-          "description": "The package to remove. Packages are gitHub repositories. Use the format owner/repository",
-          "name": "package",
+        "cmd": {
+          "description": "command to run",
+          "name": "cmd",
           "required": true
         }
       },
-      "description": "Remove a package from the project.",
+      "description": "Run a command with hereya env vars.",
       "examples": [
-        "<%= config.bin %> <%= command.id %> cloudy/docker_postgres"
+        "<%= config.bin %> <%= command.id %> -- npm run dev",
+        "<%= config.bin %> <%= command.id %> -w uat -- node index.js"
       ],
       "flags": {
         "chdir": {
@@ -326,42 +327,44 @@
           "multiple": false,
           "type": "option"
         },
-        "debug": {
-          "description": "enable debug mode",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to run the command in",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "remove",
+      "id": "run",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
         "commands",
-        "remove",
+        "run",
         "index.js"
       ]
     },
-    "run": {
+    "remove": {
       "aliases": [],
       "args": {
-        "cmd": {
-          "description": "command to run",
-          "name": "cmd",
+        "package": {
+          "description": "The package to remove. Packages are gitHub repositories. Use the format owner/repository",
+          "name": "package",
           "required": true
         }
       },
-      "description": "Run a command with hereya env vars.",
+      "description": "Remove a package from the project.",
       "examples": [
-        "<%= config.bin %> <%= command.id %> -- npm run dev",
-        "<%= config.bin %> <%= command.id %> -w uat -- node index.js"
+        "<%= config.bin %> <%= command.id %> cloudy/docker_postgres"
       ],
       "flags": {
         "chdir": {
@@ -372,29 +375,26 @@
           "multiple": false,
           "type": "option"
         },
-        "workspace": {
-          "char": "w",
-          "description": "name of the workspace to run the command in",
-          "name": "workspace",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "run",
+      "id": "remove",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
         "commands",
-        "run",
+        "remove",
         "index.js"
       ]
     },
@@ -550,7 +550,8 @@
       },
       "description": "Set an user-defined environment variable for the project",
       "examples": [
-        "<%= config.bin %> <%= command.id %> FOO bar"
+        "<%= config.bin %> <%= command.id %> FOO -v bar",
+        "<%= config.bin %> <%= command.id %> FOO -v bar -w dev"
       ],
       "flags": {
         "chdir": {
@@ -953,5 +954,5 @@
       ]
     }
   },
-  "version": "0.17.1"
+  "version": "0.18.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"