hereya-cli 0.24.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.24.0 linux-x64 node-v22.14.0
+hereya-cli/0.25.0 linux-x64 node-v22.14.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -82,7 +82,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -107,7 +107,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -132,7 +132,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -158,7 +158,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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]`
 
@@ -189,7 +189,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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]`
 
@@ -216,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.24.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]`
 
@@ -262,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.24.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`
 
@@ -289,7 +289,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -315,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.24.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`
 
@@ -340,7 +340,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -365,7 +365,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -391,7 +391,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -414,7 +414,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -434,7 +434,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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]`
 
@@ -460,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.24.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`
 
@@ -484,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.24.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`
 
@@ -505,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.24.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`
 
@@ -532,7 +532,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.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`
 
@@ -549,7 +549,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.24.0/src/commands/workspace/list/index.ts)_
+_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`
 
@@ -576,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.24.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/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/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/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/oclif.manifest.json

@@ -988,5 +988,5 @@
       ]
     }
   },
-  "version": "0.24.0"
+  "version": "0.25.0"
 }

package/package.json

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