hereya-cli 0.23.0 → 0.25.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.23.0 linux-x64 node-v22.13.1
+hereya-cli/0.25.0 linux-x64 node-v22.14.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -48,6 +48,7 @@ USAGE
 * [`hereya workspace env set`](#hereya-workspace-env-set)
 * [`hereya workspace env unset`](#hereya-workspace-env-unset)
 * [`hereya workspace install PACKAGE`](#hereya-workspace-install-package)
+* [`hereya workspace list`](#hereya-workspace-list)
 * [`hereya workspace uninstall PACKAGE`](#hereya-workspace-uninstall-package)
 
 ## `hereya add PACKAGE`
@@ -81,7 +82,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -106,7 +107,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -131,7 +132,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -157,7 +158,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -188,7 +189,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -215,7 +216,7 @@ EXAMPLES
   $ hereya env set FOO -v bar -w dev
 ```
 
-_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -261,7 +262,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -288,7 +289,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -314,7 +315,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -339,7 +340,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -364,7 +365,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -390,7 +391,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -398,11 +399,14 @@ Create a new workspace if it does not exist.
 
 ```
 USAGE
-  $ hereya workspace create NAME
+  $ hereya workspace create NAME [--mirror <value>]
 
 ARGUMENTS
   NAME  name of the workspace to create
 
+FLAGS
+  --mirror=<value>  workspace to mirror
+
 DESCRIPTION
   Create a new workspace if it does not exist.
 
@@ -410,7 +414,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -430,7 +434,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -456,7 +460,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -480,7 +484,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.23.0/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -501,7 +505,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.23.0/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -528,7 +532,24 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/install/index.ts)_
+
+## `hereya workspace list`
+
+List workspaces.
+
+```
+USAGE
+  $ hereya workspace list
+
+DESCRIPTION
+  List workspaces.
+
+EXAMPLES
+  $ hereya workspace list
+```
+
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -555,5 +576,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.23.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.25.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/common.d.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 import { InfrastructureType } from '../infrastructure/common.js';
 import { Config } from '../lib/config/common.js';
 export interface Backend {
@@ -9,11 +10,47 @@ export interface Backend {
     getWorkspace(workspace: string): Promise<GetWorkspaceOutput>;
     getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
     init(options: InitProjectInput): Promise<InitProjectOutput>;
+    listWorkspaces(): Promise<string[]>;
     removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;
     saveState(config: Config, workspace?: string): Promise<void>;
     setEnvVar(input: SetEnvVarInput): Promise<SetEnvVarOutput>;
     unsetEnvVar(input: UnsetEnvVarInput): Promise<UnsetEnvVarOutput>;
 }
+export declare const WorkspaceSchema: z.ZodObject<{
+    env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    id: z.ZodString;
+    mirrorOf: z.ZodOptional<z.ZodString>;
+    name: z.ZodString;
+    packages: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        parameters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        version: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        version: string;
+        parameters?: Record<string, any> | undefined;
+    }, {
+        version: string;
+        parameters?: Record<string, any> | undefined;
+    }>>>;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    id: string;
+    env?: Record<string, string> | undefined;
+    mirrorOf?: string | undefined;
+    packages?: Record<string, {
+        version: string;
+        parameters?: Record<string, any> | undefined;
+    }> | undefined;
+}, {
+    name: string;
+    id: string;
+    env?: Record<string, string> | undefined;
+    mirrorOf?: string | undefined;
+    packages?: Record<string, {
+        version: string;
+        parameters?: Record<string, any> | undefined;
+    }> | undefined;
+}>;
+export type Workspace = z.infer<typeof WorkspaceSchema>;
 export type AddPackageToWorkspaceInput = {
     env: {
         [key: string]: string;
@@ -30,15 +67,7 @@ export type AddPackageToWorkspaceOutput = {
     success: false;
 } | {
     success: true;
-    workspace: {
-        id: string;
-        name: string;
-        packages?: {
-            [key: string]: {
-                version: string;
-            };
-        };
-    };
+    workspace: Workspace;
 };
 export type RemovePackageFromWorkspaceInput = AddPackageToWorkspaceInput;
 export type RemovePackageFromWorkspaceOutput = AddPackageToWorkspaceOutput;
@@ -57,6 +86,7 @@ export interface InitProjectOutput {
     };
 }
 export interface CreateWorkspaceInput {
+    mirrorOf?: string;
     name: string;
 }
 export type CreateWorkspaceOutput = {
@@ -92,21 +122,7 @@ export type GetWorkspaceOutput = {
 } | {
     found: true;
     hasError: false;
-    workspace: {
-        env?: {
-            [key: string]: string;
-        };
-        id: string;
-        name: string;
-        packages?: {
-            [key: string]: {
-                parameters?: {
-                    [key: string]: string;
-                };
-                version: string;
-            };
-        };
-    };
+    workspace: Workspace;
 });
 export type GetStateInput = {
     project: string;
@@ -141,9 +157,7 @@ export type GetProvisioningIdOutput = {
     success: false;
 };
 export type SetEnvVarInput = {
-    infra: InfrastructureType;
     name: string;
-    sensitive?: boolean;
     value: string;
     workspace: string;
 };

package/dist/backend/common.js

@@ -1 +1,13 @@
-export {};
+import { z } from 'zod';
+export const WorkspaceSchema = z.object({
+    env: z.record(z.string()).optional(),
+    id: z.string().min(2),
+    mirrorOf: z.string().optional(),
+    name: z.string().min(2),
+    packages: z
+        .record(z.object({
+        parameters: z.record(z.any()).optional(),
+        version: z.string(),
+    }))
+        .optional(),
+});

package/dist/backend/local.d.ts

@@ -9,6 +9,7 @@ export declare class LocalBackend implements Backend {
     getWorkspace(workspace: string): Promise<GetWorkspaceOutput>;
     getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
     init(options: InitProjectInput): Promise<InitProjectOutput>;
+    listWorkspaces(): Promise<string[]>;
     removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;
     saveState(config: Config, workspace?: string): Promise<void>;
     setEnvVar(input: SetEnvVarInput): Promise<SetEnvVarOutput>;

package/dist/backend/local.js

@@ -1,22 +1,9 @@
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { z } from 'zod';
-import { getExecutor } from '../executor/index.js';
-import { getInfrastructure } from '../infrastructure/index.js';
 import { getAnyPath } from '../lib/filesystem.js';
 import { load, save } from '../lib/yaml-utils.js';
-const WorkspaceSchema = z.object({
-    env: z.record(z.string()).optional(),
-    id: z.string().min(2),
-    name: z.string().min(2),
-    packages: z
-        .record(z.object({
-        parameters: z.record(z.any()).optional(),
-        version: z.string(),
-    }))
-        .optional(),
-});
+import { WorkspaceSchema, } from './common.js';
 export class LocalBackend {
     async addPackageToWorkspace(input) {
         const workspace$ = await this.getWorkspace(input.workspace);
@@ -33,6 +20,12 @@ export class LocalBackend {
             };
         }
         const { workspace } = workspace$;
+        if (workspace.mirrorOf) {
+            return {
+                reason: `Cannot add package to mirrored workspace ${input.workspace}`,
+                success: false,
+            };
+        }
         workspace.packages = {
             ...workspace.packages,
             [input.package]: {
@@ -73,8 +66,24 @@ export class LocalBackend {
                     workspace: workspace$.workspace,
                 };
         }
+        if (input.mirrorOf) {
+            const mirroredWorkspace$ = await this.getWorkspace(input.mirrorOf);
+            if (!mirroredWorkspace$.found) {
+                return {
+                    reason: `Mirrored workspace ${input.mirrorOf} not found`,
+                    success: false,
+                };
+            }
+            if (mirroredWorkspace$.hasError) {
+                return {
+                    reason: mirroredWorkspace$.error,
+                    success: false,
+                };
+            }
+        }
         const workspace = {
             id: input.name,
+            mirrorOf: input.mirrorOf,
             name: input.name,
         };
         try {
@@ -107,7 +116,24 @@ export class LocalBackend {
             };
         }
         const { workspace } = workspace$;
-        if (Object.keys(workspace.packages ?? {}).length > 0) {
+        const workspaceNames = await this.listWorkspaces();
+        const allWorkspaces = await Promise.all(workspaceNames.map(async (workspaceName) => {
+            const w$ = await this.getWorkspace(workspaceName);
+            if (!w$.found || w$.hasError) {
+                throw new Error(`Workspace ${workspaceName} not found or has an error`);
+            }
+            return w$.workspace;
+        }));
+        if (allWorkspaces.some((w) => w.mirrorOf === input.name)) {
+            return {
+                reason: `Cannot delete workspace ${input.name} because it is mirrored by ${allWorkspaces
+                    .filter((w) => w.mirrorOf === input.name)
+                    .map((w) => w.name)
+                    .join(', ')}`,
+                success: false,
+            };
+        }
+        if (!workspace.mirrorOf && Object.keys(workspace.packages ?? {}).length > 0) {
             return {
                 reason: `Cannot delete workspace ${input.name} because it has packages`,
                 success: false,
@@ -147,24 +173,66 @@ export class LocalBackend {
     }
     async getWorkspace(workspace) {
         const workspacePath = await getAnyPath(path.join(os.homedir(), '.hereya', 'state', 'workspaces', `${workspace}.yaml`), path.join(os.homedir(), '.hereya', 'state', 'workspaces', `${workspace}.yml`));
-        const { data, found } = await load(workspacePath);
-        if (found) {
-            const workspace$ = WorkspaceSchema.safeParse(data);
-            if (!workspace$.success) {
+        const { data, error, found } = await load(workspacePath);
+        if (error) {
+            return {
+                error,
+                found: true,
+                hasError: true,
+            };
+        }
+        if (!found) {
+            return {
+                found: false,
+            };
+        }
+        const workspace$ = WorkspaceSchema.safeParse(data);
+        if (!workspace$.success) {
+            return {
+                error: workspace$.error.message,
+                found: true,
+                hasError: true,
+            };
+        }
+        let mirroredWorkspace;
+        if (workspace$.data.mirrorOf) {
+            const mirroredWorkspace$ = await this.getWorkspace(workspace$.data.mirrorOf);
+            if (!mirroredWorkspace$.found) {
                 return {
-                    error: workspace$.error.message,
+                    error: `Mirrored workspace ${workspace$.data.mirrorOf} not found`,
                     found: true,
                     hasError: true,
                 };
             }
-            return {
-                found: true,
-                hasError: false,
-                workspace: workspace$.data,
-            };
+            if (mirroredWorkspace$.hasError) {
+                return {
+                    error: mirroredWorkspace$.error,
+                    found: true,
+                    hasError: true,
+                };
+            }
+            mirroredWorkspace = mirroredWorkspace$.workspace;
         }
         return {
-            found: false,
+            found: true,
+            hasError: false,
+            workspace: mirroredWorkspace
+                ? {
+                    ...workspace$.data,
+                    env: {
+                        ...mirroredWorkspace.env,
+                        ...workspace$.data.env,
+                    },
+                    packages: {
+                        ...mirroredWorkspace.packages,
+                    },
+                }
+                : {
+                    ...workspace$.data,
+                    packages: {
+                        ...workspace$.data.packages,
+                    },
+                },
         };
     }
     async getWorkspaceEnv(input) {
@@ -181,16 +249,8 @@ export class LocalBackend {
                 success: false,
             };
         }
-        const executor$ = getExecutor();
-        if (!executor$.success) {
-            return {
-                reason: executor$.reason,
-                success: false,
-            };
-        }
-        const { executor } = executor$;
         return {
-            env: await executor.resolveEnvValues({ env: workspace$.workspace.env ?? {} }),
+            env: workspace$.workspace.env ?? {},
             success: true,
         };
     }
@@ -206,6 +266,11 @@ export class LocalBackend {
             },
         };
     }
+    async listWorkspaces() {
+        const workspacesPath = path.join(os.homedir(), '.hereya', 'state', 'workspaces');
+        const workspaces = await fs.readdir(workspacesPath);
+        return workspaces.map((workspace) => workspace.replace(/\.yaml|\.yml$/, '')).sort();
+    }
     async removePackageFromWorkspace(input) {
         const workspace$ = await this.getWorkspace(input.workspace);
         if (!workspace$.found) {
@@ -221,6 +286,12 @@ export class LocalBackend {
             };
         }
         const { workspace } = workspace$;
+        if (workspace.mirrorOf) {
+            return {
+                reason: `Cannot remove package from mirrored workspace ${input.workspace}`,
+                success: false,
+            };
+        }
         workspace.packages = Object.fromEntries(Object.entries(workspace.packages ?? {}).filter(([key]) => key !== input.package));
         workspace.env = Object.fromEntries(Object.entries(workspace.env ?? {}).filter(([key]) => !(key in input.env)));
         try {
@@ -263,29 +334,9 @@ export class LocalBackend {
             };
         }
         const { workspace } = workspace$;
-        const infrastructure$ = getInfrastructure({ type: input.infra });
-        if (!infrastructure$.supported) {
-            return {
-                reason: `Infrastructure ${input.infra} not found`,
-                success: false,
-            };
-        }
-        const { infrastructure } = infrastructure$;
-        const setEnvVarOutput = await infrastructure.storeEnv({
-            name: input.name,
-            oldValue: workspace.env?.[input.name]?.split(':').slice(1).join(':'),
-            sensitive: input.sensitive,
-            value: input.value,
-        });
-        if (!setEnvVarOutput.success) {
-            return {
-                reason: setEnvVarOutput.reason,
-                success: false,
-            };
-        }
         workspace.env = {
             ...workspace.env,
-            [input.name]: `${input.infra}:${setEnvVarOutput.value}`,
+            [input.name]: input.value,
         };
         await this.saveWorkspace(workspace, input.workspace);
         return {
@@ -313,24 +364,6 @@ export class LocalBackend {
                 success: true,
             };
         }
-        const infra = value.split(':')[0];
-        const infrastructure$ = getInfrastructure({ type: infra });
-        if (!infrastructure$.supported) {
-            return {
-                reason: `Infrastructure ${infra} not found`,
-                success: false,
-            };
-        }
-        const { infrastructure } = infrastructure$;
-        const unsetEnvVarOutput = await infrastructure.unstoreEnv({
-            value: value.split(':').slice(1).join(':'),
-        });
-        if (!unsetEnvVarOutput.success) {
-            return {
-                reason: unsetEnvVarOutput.reason,
-                success: false,
-            };
-        }
         workspace.env = Object.fromEntries(Object.entries(workspace.env ?? {}).filter(([key]) => key !== input.name));
         await this.saveWorkspace(workspace, input.workspace);
         return {

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

@@ -1,6 +1,7 @@
 import { Args, Command, Flags } from '@oclif/core';
 import path from 'node:path';
 import { getConfigManager } from '../../../lib/config/index.js';
+import { getEnvManager } from '../../../lib/env/index.js';
 import { getAnyPath } from '../../../lib/filesystem.js';
 import { load, save } from '../../../lib/yaml-utils.js';
 export default class EnvSet extends Command {
@@ -40,13 +41,11 @@ export default class EnvSet extends Command {
             this.warn(`Project not initialized. Run 'hereya init' first.`);
             return;
         }
-        const rootDir = projectRootDir ?? process.cwd();
+        const envManager = getEnvManager();
+        const envDir = await envManager.getStaticEnvDir(projectRootDir);
         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`)];
+            ? [path.join(envDir, `env.${flags.workspace}.yaml`), path.join(envDir, `env.${flags.workspace}.yml`)]
+            : [path.join(envDir, `env.yaml`), path.join(envDir, `env.yml`)];
         const envFile = await getAnyPath(...candidates);
         const { data: env } = await load(envFile);
         env[args.name] = flags.value;

package/dist/commands/workspace/create/index.d.ts

@@ -5,5 +5,8 @@ export default class WorkspaceCreate extends Command {
     };
     static description: string;
     static examples: string[];
+    static flags: {
+        mirror: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/workspace/create/index.js

@@ -1,17 +1,21 @@
-import { Args, Command } from '@oclif/core';
+import { Args, Command, Flags } from '@oclif/core';
 import { getBackend } from '../../../backend/index.js';
 export default class WorkspaceCreate extends Command {
     static args = {
         name: Args.string({ description: 'name of the workspace to create', required: true }),
     };
     static description = 'Create a new workspace if it does not exist.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %> dev',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %> dev'];
+    static flags = {
+        mirror: Flags.string({ description: 'workspace to mirror', required: false }),
+    };
     async run() {
-        const { args } = await this.parse(WorkspaceCreate);
+        const { args, flags } = await this.parse(WorkspaceCreate);
         const backend = await getBackend();
-        const createWorkspaceOutput = await backend.createWorkspace({ name: args.name });
+        const createWorkspaceOutput = await backend.createWorkspace({
+            mirrorOf: flags.mirror,
+            name: args.name,
+        });
         if (!createWorkspaceOutput.success) {
             this.error(`Failed to create workspace: ${createWorkspaceOutput.reason}`);
         }

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

@@ -1,5 +1,6 @@
 import { Args, Command, Flags } from '@oclif/core';
 import { getBackend } from '../../../backend/index.js';
+import { getExecutor } from '../../../executor/index.js';
 import { logEnv } from '../../../lib/env-utils.js';
 export default class WorkspaceEnv extends Command {
     static args = {
@@ -43,6 +44,12 @@ export default class WorkspaceEnv extends Command {
             this.log(Object.keys(env).join('\n'));
             return;
         }
-        logEnv(env);
+        const executor$ = getExecutor();
+        if (!executor$.success) {
+            this.error(executor$.reason);
+        }
+        const { executor } = executor$;
+        const resolvedEnv = await executor.resolveEnvValues({ env });
+        logEnv(resolvedEnv);
     }
 }

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

@@ -1,5 +1,5 @@
 import { Command, Flags } from '@oclif/core';
-import { getBackend } from '../../../../backend/index.js';
+import { getExecutor } from '../../../../executor/index.js';
 export default class WorkspaceEnvSet extends Command {
     static description = 'set an env var for a workspace';
     static examples = ['<%= config.bin %> <%= command.id %> -w my-workspace -n myVar -v my-value -i aws -s'];
@@ -16,15 +16,12 @@ export default class WorkspaceEnvSet extends Command {
     };
     async run() {
         const { flags } = await this.parse(WorkspaceEnvSet);
-        const backend = await getBackend();
-        const getWorkspaceOutput = await backend.getWorkspace(flags.workspace);
-        if (!getWorkspaceOutput.found) {
-            this.error(`Workspace ${flags.workspace} not found`);
+        const executor$ = getExecutor();
+        if (!executor$.success) {
+            this.error(executor$.reason);
         }
-        if (getWorkspaceOutput.hasError) {
-            this.error(getWorkspaceOutput.error);
-        }
-        const setEnvVarOutput = await backend.setEnvVar({
+        const { executor } = executor$;
+        const setEnvVarOutput = await executor.setEnvVar({
             infra: flags.infra,
             name: flags.name,
             sensitive: flags.sensitive,

package/dist/commands/workspace/env/unset/index.js

@@ -1,5 +1,5 @@
 import { Command, Flags } from '@oclif/core';
-import { getBackend } from '../../../../backend/index.js';
+import { getExecutor } from '../../../../executor/index.js';
 export default class WorkspaceEnvUnset extends Command {
     static description = 'unset an env var for a workspace';
     static examples = ['<%= config.bin %> <%= command.id %> -w my-workspace -n myVar'];
@@ -13,15 +13,12 @@ export default class WorkspaceEnvUnset extends Command {
     };
     async run() {
         const { flags } = await this.parse(WorkspaceEnvUnset);
-        const backend = await getBackend();
-        const getWorkspaceOutput = await backend.getWorkspace(flags.workspace);
-        if (!getWorkspaceOutput.found) {
-            this.error(`Workspace ${flags.workspace} not found`);
+        const executor$ = getExecutor();
+        if (!executor$.success) {
+            this.error(executor$.reason);
         }
-        if (getWorkspaceOutput.hasError) {
-            this.error(getWorkspaceOutput.error);
-        }
-        const unsetEnvVarOutput = await backend.unsetEnvVar({
+        const { executor } = executor$;
+        const unsetEnvVarOutput = await executor.unsetEnvVar({
             name: flags.name,
             workspace: flags.workspace,
         });

package/dist/commands/workspace/install/index.js

@@ -51,6 +51,9 @@ export default class WorkspaceInstall extends Command {
                                 if (!loadWorkspaceOutput.found || loadWorkspaceOutput.hasError) {
                                     throw new Error(`Workspace ${flags.workspace} not found`);
                                 }
+                                if (loadWorkspaceOutput.workspace.mirrorOf) {
+                                    throw new Error(`Workspace ${flags.workspace} is a mirror of ${loadWorkspaceOutput.workspace.mirrorOf}`);
+                                }
                                 ctx.workspace = loadWorkspaceOutput;
                                 await delay(500);
                             },

package/dist/commands/workspace/list/index.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class WorkspaceList extends Command {
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/workspace/list/index.js

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+import { getBackend } from '../../../backend/index.js';
+export default class WorkspaceList extends Command {
+    static description = 'List workspaces.';
+    static examples = ['<%= config.bin %> <%= command.id %>'];
+    async run() {
+        await this.parse(WorkspaceList);
+        const backend = await getBackend();
+        const output = await backend.listWorkspaces();
+        this.log(output.join('\n'));
+    }
+}

package/dist/commands/workspace/uninstall/index.js

@@ -51,6 +51,9 @@ export default class WorkspaceUninstall extends Command {
                                 if (!loadWorkspaceOutput.found || loadWorkspaceOutput.hasError) {
                                     throw new Error(`Workspace ${flags.workspace} not found`);
                                 }
+                                if (loadWorkspaceOutput.workspace.mirrorOf) {
+                                    throw new Error(`Workspace ${flags.workspace} is a mirror of ${loadWorkspaceOutput.workspace.mirrorOf}`);
+                                }
                                 if (!(args.package in (loadWorkspaceOutput.workspace.packages ?? {}))) {
                                     throw new Error(`Package ${args.package} not found in workspace ${flags.workspace}`);
                                 }

package/dist/executor/interface.d.ts

@@ -1,3 +1,4 @@
+import { InfrastructureType } from '../infrastructure/common.js';
 import { Logger } from '../lib/log.js';
 import { IPackageMetadata } from '../lib/package/index.js';
 export type ExecutorProvisionInput = {
@@ -36,8 +37,33 @@ export type ExecutorResolveEnvValuesInput = {
 export type ExecutorResolveEnvValuesOutput = {
     [key: string]: string;
 };
+export type ExecutorSetEnvVarInput = {
+    infra: InfrastructureType;
+    name: string;
+    sensitive?: boolean;
+    value: string;
+    workspace: string;
+};
+export type ExecutorSetEnvVarOutput = {
+    reason: string;
+    success: false;
+} | {
+    success: true;
+};
+export type ExecutorUnsetEnvVarOutput = {
+    reason: string;
+    success: false;
+} | {
+    success: true;
+};
+export type ExecutorUnsetEnvVarInput = {
+    name: string;
+    workspace: string;
+};
 export interface Executor {
     destroy(input: ExecutorDestroyInput): Promise<ExecutorDestroyOutput>;
     provision(input: ExecutorProvisionInput): Promise<ExecutorProvisionOutput>;
     resolveEnvValues(input: ExecutorResolveEnvValuesInput): Promise<ExecutorResolveEnvValuesOutput>;
+    setEnvVar(input: ExecutorSetEnvVarInput): Promise<ExecutorSetEnvVarOutput>;
+    unsetEnvVar(input: ExecutorUnsetEnvVarInput): Promise<ExecutorUnsetEnvVarOutput>;
 }

package/dist/executor/local.d.ts

@@ -1,7 +1,9 @@
-import { Executor, ExecutorDestroyInput, ExecutorDestroyOutput, ExecutorProvisionInput, ExecutorProvisionOutput, ExecutorResolveEnvValuesInput, ExecutorResolveEnvValuesOutput } from './interface.js';
+import { Executor, ExecutorDestroyInput, ExecutorDestroyOutput, ExecutorProvisionInput, ExecutorProvisionOutput, ExecutorResolveEnvValuesInput, ExecutorResolveEnvValuesOutput, ExecutorSetEnvVarInput, ExecutorSetEnvVarOutput, ExecutorUnsetEnvVarInput, ExecutorUnsetEnvVarOutput } from './interface.js';
 export declare class LocalExecutor implements Executor {
     destroy(input: ExecutorDestroyInput): Promise<ExecutorDestroyOutput>;
     provision(input: ExecutorProvisionInput): Promise<ExecutorProvisionOutput>;
     resolveEnvValues(input: ExecutorResolveEnvValuesInput): Promise<ExecutorResolveEnvValuesOutput>;
+    setEnvVar(input: ExecutorSetEnvVarInput): Promise<ExecutorSetEnvVarOutput>;
+    unsetEnvVar(input: ExecutorUnsetEnvVarInput): Promise<ExecutorUnsetEnvVarOutput>;
     private getWorkspaceEnv;
 }

package/dist/executor/local.js

@@ -45,14 +45,96 @@ export class LocalExecutor {
             return [key, finalValue];
         })));
     }
+    async setEnvVar(input) {
+        const backend = await getBackend();
+        const workspace$ = await backend.getWorkspace(input.workspace);
+        if (!workspace$.found) {
+            return {
+                reason: `Workspace ${input.workspace} not found`,
+                success: false,
+            };
+        }
+        if (workspace$.hasError) {
+            return {
+                reason: workspace$.error,
+                success: false,
+            };
+        }
+        const { workspace } = workspace$;
+        const infrastructure$ = getInfrastructure({ type: input.infra });
+        if (!infrastructure$.supported) {
+            return { reason: `Infrastructure ${input.infra} not found`, success: false };
+        }
+        const { infrastructure } = infrastructure$;
+        const setEnvVarOutput = await infrastructure.storeEnv({
+            name: input.name,
+            oldValue: workspace.env?.[input.name]?.split(':').slice(1).join(':'),
+            sensitive: input.sensitive,
+            value: input.value,
+        });
+        if (!setEnvVarOutput.success) {
+            return { reason: setEnvVarOutput.reason, success: false };
+        }
+        return backend.setEnvVar({
+            name: input.name,
+            value: `${input.infra}:${setEnvVarOutput.value}`,
+            workspace: input.workspace,
+        });
+    }
+    async unsetEnvVar(input) {
+        const backend = await getBackend();
+        const workspace$ = await backend.getWorkspace(input.workspace);
+        if (!workspace$.found) {
+            return { reason: `Workspace ${input.workspace} not found`, success: false };
+        }
+        if (workspace$.hasError) {
+            return { reason: workspace$.error, success: false };
+        }
+        const { workspace } = workspace$;
+        const value = workspace.env?.[input.name];
+        if (!value) {
+            return {
+                success: true,
+            };
+        }
+        const infra = value.split(':')[0];
+        const infrastructure$ = getInfrastructure({ type: infra });
+        if (!infrastructure$.supported) {
+            return {
+                reason: `Infrastructure ${infra} not found`,
+                success: false,
+            };
+        }
+        const { infrastructure } = infrastructure$;
+        const unsetEnvVarOutput = await infrastructure.unstoreEnv({
+            value: value.split(':').slice(1).join(':'),
+        });
+        if (!unsetEnvVarOutput.success) {
+            return {
+                reason: unsetEnvVarOutput.reason,
+                success: false,
+            };
+        }
+        return backend.unsetEnvVar({
+            name: input.name,
+            workspace: input.workspace,
+        });
+    }
     async getWorkspaceEnv({ project, workspace, }) {
         if (!workspace || !project) {
             return { env: {}, success: true };
         }
         const backend = await getBackend();
-        return backend.getWorkspaceEnv({
+        const result = await backend.getWorkspaceEnv({
             project,
             workspace,
         });
+        if (!result.success) {
+            return { reason: result.reason, success: false };
+        }
+        return {
+            env: await this.resolveEnvValues({ env: result.env }),
+            success: true,
+        };
     }
 }

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

@@ -2,6 +2,7 @@ import { InfrastructureType } from '../../infrastructure/common.js';
 export declare class EnvManager {
     addProjectEnv(input: AddEnvInput): Promise<void>;
     getProjectEnv(input: GetProjectEnvInput): Promise<GetProjectEnvOutput>;
+    getStaticEnvDir(projectRootDir?: string): Promise<string>;
     removeProjectEnv(input: RemoveEnvInput): Promise<void>;
     private getEnvPath;
     private getUserEnvPaths;

package/dist/lib/env/index.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { getExecutor } from '../../executor/index.js';
-import { getAnyPath } from '../filesystem.js';
+import { getAnyPath, migrateFiles } from '../filesystem.js';
 import { load, save } from '../yaml-utils.js';
 export class EnvManager {
     async addProjectEnv(input) {
@@ -33,6 +33,12 @@ export class EnvManager {
         const finalEnv = { ...resolvedEnv, ...userMergedEnv };
         return { env: finalEnv, success: true };
     }
+    async getStaticEnvDir(projectRootDir) {
+        const sourceDir = path.join(projectRootDir ?? process.cwd(), 'hereyastaticenv');
+        const targetDir = path.join(projectRootDir ?? process.cwd(), 'hereyaconfig', 'hereyastaticenv');
+        await migrateFiles(sourceDir, targetDir);
+        return targetDir;
+    }
     async removeProjectEnv(input) {
         const envPath = await this.getEnvPath(input);
         const { data: existingEnv, found } = await load(envPath);
@@ -48,8 +54,8 @@ export class EnvManager {
     }
     async getUserEnvPaths(input) {
         const paths = await Promise.all([
-            getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.yaml`), path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.yml`)),
-            getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.${input.workspace}.yaml`), path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.${input.workspace}.yml`)),
+            getAnyPath(path.join(await this.getStaticEnvDir(input.projectRootDir), `env.yaml`), path.join(await this.getStaticEnvDir(input.projectRootDir), `env.yml`)),
+            getAnyPath(path.join(await this.getStaticEnvDir(input.projectRootDir), `env.${input.workspace}.yaml`), path.join(await this.getStaticEnvDir(input.projectRootDir), `env.${input.workspace}.yml`)),
         ]);
         return paths;
     }

package/dist/lib/filesystem.d.ts

@@ -1,3 +1,4 @@
 export declare function getAnyPath(...candidates: string[]): Promise<string>;
 export declare function fileExists(filePath: string): Promise<boolean>;
 export declare function isNotEmpty(directoryPath: string): Promise<boolean>;
+export declare function migrateFiles(sourceDir: string, targetDir: string): Promise<void>;

package/dist/lib/filesystem.js

@@ -1,4 +1,5 @@
-import { access, constants, readdir } from 'node:fs/promises';
+import fs, { access, constants, readdir } from 'node:fs/promises';
+import path from 'node:path';
 export async function getAnyPath(...candidates) {
     const checkAccess = async (index) => {
         if (index >= candidates.length)
@@ -31,3 +32,27 @@ export async function isNotEmpty(directoryPath) {
         return false;
     }
 }
+export async function migrateFiles(sourceDir, targetDir) {
+    const sourceDirExists = await fs
+        .access(sourceDir)
+        .then(() => true)
+        .catch(() => false);
+    if (!sourceDirExists) {
+        return;
+    }
+    const targetDirExists = await fs
+        .access(targetDir)
+        .then(() => true)
+        .catch(() => false);
+    if (targetDirExists) {
+        return;
+    }
+    await fs.mkdir(targetDir, { recursive: true });
+    const files = await fs.readdir(sourceDir);
+    await Promise.all(files.map(async (file) => {
+        const sourcePath = path.join(sourceDir, file);
+        const targetPath = path.join(targetDir, file);
+        await fs.rename(sourcePath, targetPath);
+    }));
+    await fs.rmdir(sourceDir);
+}

package/dist/lib/id-utils.d.ts

@@ -0,0 +1 @@
+export declare function generateRandomGuid(): string;

package/dist/lib/id-utils.js

@@ -0,0 +1,6 @@
+import crypto from 'node:crypto';
+export function generateRandomGuid() {
+    const uuid = crypto.randomUUID();
+    // Remove all dashes from the UUID and add "hereya" as a prefix
+    return `hereya${uuid.replaceAll('-', '')}`;
+}

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

@@ -1,6 +1,7 @@
 export declare class ParameterManager {
     getPackageParameters(input: GetPackageParametersInput): Promise<GetPackageParametersOutput>;
     savePackageParameters(input: SavePackageParametersInput): Promise<SavePackageParametersOutput>;
+    private getParametersFolder;
 }
 export declare const parameterManager: ParameterManager;
 export declare function getParameterManager(): ParameterManager;

package/dist/lib/parameter/index.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { getAnyPath } from '../filesystem.js';
+import { getAnyPath, migrateFiles } from '../filesystem.js';
 import { getPackageCanonicalName } from '../package/index.js';
 import { load, save } from '../yaml-utils.js';
 export class ParameterManager {
@@ -9,7 +9,7 @@ export class ParameterManager {
             [`${pkgName}.yaml`, `${pkgName}.yml`],
             [`${pkgName}.${input.workspace}.yaml`, `${pkgName}.${input.workspace}.yml`],
         ].map(async ([filename, altFilename]) => {
-            const filePath = await getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyavars', filename), path.join(input.projectRootDir ?? process.cwd(), 'hereyavars', altFilename));
+            const filePath = await getAnyPath(path.join(await this.getParametersFolder(input.projectRootDir), filename), path.join(await this.getParametersFolder(input.projectRootDir), altFilename));
             const { data: parameters } = await load(filePath);
             return parameters;
         }));
@@ -29,7 +29,7 @@ export class ParameterManager {
             [`${pkgName}.yaml`, `${pkgName}.yml`],
             [`${pkgName}.${input.workspace}.yaml`, `${pkgName}.${input.workspace}.yml`],
         ].map(async ([filename, altFilename]) => {
-            const filePath = await getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyavars', filename), path.join(input.projectRootDir ?? process.cwd(), 'hereyavars', altFilename));
+            const filePath = await getAnyPath(path.join(await this.getParametersFolder(input.projectRootDir), filename), path.join(await this.getParametersFolder(input.projectRootDir), altFilename));
             const { found } = await load(filePath);
             return found;
         }));
@@ -39,13 +39,19 @@ export class ParameterManager {
                 saved: false,
             };
         }
-        const filePath = path.join(input.projectRootDir ?? process.cwd(), 'hereyavars', `${pkgName}.yaml`);
+        const filePath = path.join(await this.getParametersFolder(input.projectRootDir), `${pkgName}.yaml`);
         await save(input.parameters, filePath);
         return {
             filePath,
             saved: true,
         };
     }
+    async getParametersFolder(projectRootDir) {
+        const sourceDir = path.join(projectRootDir ?? process.cwd(), 'hereyavars');
+        const targetDir = path.join(projectRootDir ?? process.cwd(), 'hereyaconfig', 'hereyavars');
+        await migrateFiles(sourceDir, targetDir);
+        return targetDir;
+    }
 }
 export const parameterManager = new ParameterManager();
 export function getParameterManager() {

package/dist/lib/yaml-utils.d.ts

@@ -1,5 +1,6 @@
 export declare function save<T extends object>(content: T, file: string): Promise<void>;
 export declare function load<T extends object>(file: string): Promise<{
     data: T;
+    error?: string;
     found: boolean;
 }>;

package/dist/lib/yaml-utils.js

@@ -20,7 +20,7 @@ export async function load(file) {
     }
     catch (error) {
         if (error.code !== 'ENOENT') {
-            throw new Error(`could not load file ${file}: ${error}`);
+            return { data: {}, error: `could not load file ${file}: ${error}`, found: true };
         }
     }
     return { data: data || {}, found };

package/oclif.manifest.json

@@ -611,7 +611,16 @@
       "examples": [
         "<%= config.bin %> <%= command.id %> dev"
       ],
-      "flags": {},
+      "flags": {
+        "mirror": {
+          "description": "workspace to mirror",
+          "name": "mirror",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
       "id": "workspace:create",
@@ -774,6 +783,31 @@
         "index.js"
       ]
     },
+    "workspace:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List workspaces.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workspace:list",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workspace",
+        "list",
+        "index.js"
+      ]
+    },
     "workspace:uninstall": {
       "aliases": [],
       "args": {
@@ -954,5 +988,5 @@
       ]
     }
   },
-  "version": "0.23.0"
+  "version": "0.25.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -90,6 +90,7 @@
     "posttest": "yarn lint",
     "prepack": "oclif manifest && oclif readme",
     "test": "mocha --forbid-only \"src/**/*.test.ts\"",
+    "t": "mocha --forbid-only",
     "version": "oclif readme && git add README.md",
     "doc": "yarn build && yarn run version && shx rm -rf dist"
   },