hereya-cli 0.14.0 → 0.15.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.14.0 linux-x64 node-v22.13.0
+hereya-cli/0.15.0 linux-x64 node-v22.13.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -73,7 +73,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -98,7 +98,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -120,7 +120,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -143,7 +143,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -174,7 +174,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/env/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -220,7 +220,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -244,7 +244,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -270,7 +270,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -295,7 +295,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -317,7 +317,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -340,7 +340,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -360,7 +360,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -380,7 +380,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -406,7 +406,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -430,7 +430,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.14.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.15.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -451,7 +451,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.14.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.15.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -477,7 +477,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -503,5 +503,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.14.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/common.d.ts

@@ -10,7 +10,7 @@ export interface Backend {
     getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
     init(options: InitProjectInput): Promise<InitProjectOutput>;
     removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;
-    saveState(config: Omit<Config, 'workspace'>): Promise<void>;
+    saveState(config: Config, workspace?: string): Promise<void>;
     setEnvVar(input: SetEnvVarInput): Promise<SetEnvVarOutput>;
     unsetEnvVar(input: UnsetEnvVarInput): Promise<UnsetEnvVarOutput>;
 }
@@ -110,9 +110,10 @@ export type GetWorkspaceOutput = {
 });
 export type GetStateInput = {
     project: string;
+    workspace: string;
 };
 export type GetStateOutput = {
-    config: Omit<Config, 'workspace'>;
+    config: Config;
     found: true;
 } | {
     found: false;

package/dist/backend/local.d.ts

@@ -10,10 +10,12 @@ export declare class LocalBackend implements Backend {
     getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
     init(options: InitProjectInput): Promise<InitProjectOutput>;
     removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;
-    saveState(config: Omit<Config, 'workspace'>): Promise<void>;
+    saveState(config: Config, workspace?: string): Promise<void>;
     setEnvVar(input: SetEnvVarInput): Promise<SetEnvVarOutput>;
     unsetEnvVar(input: UnsetEnvVarInput): Promise<UnsetEnvVarOutput>;
+    private getOldProjectStatePath;
     private getProjectStatePath;
     private getWorkspacePath;
+    private migrateProjectState;
     private saveWorkspace;
 }

package/dist/backend/local.js

@@ -132,7 +132,8 @@ export class LocalBackend {
         };
     }
     async getState(input) {
-        const projectStatePath = await this.getProjectStatePath(input.project);
+        await this.migrateProjectState(input);
+        const projectStatePath = await this.getProjectStatePath(input);
         const { data, found } = await load(projectStatePath);
         if (found) {
             return {
@@ -228,9 +229,16 @@ export class LocalBackend {
             };
         }
     }
-    async saveState(config) {
-        const projectStatePath = await this.getProjectStatePath(config.project);
-        await save(config, projectStatePath);
+    async saveState(config, workspace) {
+        await this.migrateProjectState({
+            project: config.project,
+            workspace: workspace ?? config.workspace,
+        });
+        const projectStatePath = await this.getProjectStatePath({
+            project: config.project,
+            workspace: workspace ?? config.workspace,
+        });
+        await save({ ...config, workspace: workspace ?? config.workspace }, projectStatePath);
     }
     async setEnvVar(input) {
         const workspace$ = await this.getWorkspace(input.workspace);
@@ -321,12 +329,30 @@ export class LocalBackend {
             success: true,
         };
     }
-    async getProjectStatePath(project) {
-        return getAnyPath(path.join(os.homedir(), '.hereya', 'state', 'projects', `${project}.yaml`), path.join(os.homedir(), '.hereya', 'state', 'projects', `${project}.yml`));
+    async getOldProjectStatePath(input) {
+        return getAnyPath(path.join(os.homedir(), '.hereya', 'state', 'projects', `${input.project}.yaml`), path.join(os.homedir(), '.hereya', 'state', 'projects', `${input.project}.yml`));
+    }
+    async getProjectStatePath(input) {
+        return getAnyPath(path.join(os.homedir(), '.hereya', 'state', 'projects', input.workspace, `${input.project}.yaml`), path.join(os.homedir(), '.hereya', 'state', 'projects', input.workspace, `${input.project}.yml`));
     }
     async getWorkspacePath(name) {
         return getAnyPath(path.join(os.homedir(), '.hereya', 'state', 'workspaces', `${name}.yaml`), path.join(os.homedir(), '.hereya', 'state', 'workspaces', `${name}.yml`));
     }
+    async migrateProjectState(input) {
+        const oldProjectStatePath = await this.getOldProjectStatePath(input);
+        const newProjectStatePath = await this.getProjectStatePath(input);
+        const newProjectStateDir = path.dirname(newProjectStatePath);
+        await fs.mkdir(newProjectStateDir, { recursive: true });
+        try {
+            await fs.access(oldProjectStatePath);
+            await fs.rename(oldProjectStatePath, newProjectStatePath);
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT') {
+                throw error;
+            }
+        }
+    }
     async saveWorkspace(data, name) {
         const workspacePath = await this.getWorkspacePath(name);
         await save(data, workspacePath);

package/dist/commands/deploy/index.js

@@ -80,6 +80,7 @@ export default class Deploy extends Command {
                     const backend = await getBackend();
                     const savedStateOutput = await backend.getState({
                         project: ctx.configOutput.config.project,
+                        workspace: ctx.workspace,
                     });
                     if (savedStateOutput.found) {
                         ctx.savedStateOutput = savedStateOutput;
@@ -238,11 +239,11 @@ export default class Deploy extends Command {
                 title: 'Adding env vars from added packages',
             },
             {
-                async task() {
+                async task(ctx) {
                     const backend = await getBackend();
                     const configManager = getConfigManager();
                     const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                    await backend.saveState(newConfig);
+                    await backend.saveState(newConfig, ctx.workspace);
                     await delay(500);
                 },
                 title: 'Saving state',

package/dist/commands/down/index.js

@@ -72,6 +72,7 @@ export default class Down extends Command {
                                 const backend = await getBackend();
                                 const savedStateOutput = await backend.getState({
                                     project: ctx.configOutput.config.project,
+                                    workspace: ctx.workspace,
                                 });
                                 let removedPackages = [];
                                 if (savedStateOutput.found) {
@@ -141,11 +142,11 @@ export default class Down extends Command {
                             title: 'Removing env vars from destroyed packages',
                         },
                         {
-                            async task() {
+                            async task(ctx) {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 await delay(500);
                             },
                             title: 'Saving state',

package/dist/commands/undeploy/index.js

@@ -81,6 +81,7 @@ export default class Undeploy extends Command {
                                 const backend = await getBackend();
                                 const savedStateOutput = await backend.getState({
                                     project: ctx.configOutput.config.project,
+                                    workspace: ctx.workspace,
                                 });
                                 if (savedStateOutput.found) {
                                     ctx.savedStateOutput = savedStateOutput;
@@ -187,11 +188,11 @@ export default class Undeploy extends Command {
                             title: 'Removing env vars from destroyed packages',
                         },
                         {
-                            async task() {
+                            async task(ctx) {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 await delay(500);
                             },
                             title: 'Saving state',

package/dist/commands/up/index.js

@@ -71,6 +71,7 @@ export default class Up extends Command {
                                 const backend = await getBackend();
                                 const savedStateOutput = await backend.getState({
                                     project: ctx.configOutput.config.project,
+                                    workspace: ctx.workspace,
                                 });
                                 if (savedStateOutput.found) {
                                     ctx.savedStateOutput = savedStateOutput;
@@ -205,11 +206,11 @@ export default class Up extends Command {
                             title: 'Adding env vars from added packages',
                         },
                         {
-                            async task() {
+                            async task(ctx) {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 await delay(500);
                             },
                             title: 'Saving state',

package/oclif.manifest.json

@@ -884,5 +884,5 @@
       ]
     }
   },
-  "version": "0.14.0"
+  "version": "0.15.0"
 }

package/package.json

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