hereya-cli 0.85.3 → 0.85.5

package/dist/lib/app-parameters.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import * as yaml from 'yaml';
 /**
  * Build the resolved parameter map for an app deployment by:
  *   1. Starting with each declared parameter's `default` (if present).
@@ -118,3 +119,55 @@ async function collectYamlFiles(dir) {
     }
     return out;
 }
+async function getAnyExisting(...candidates) {
+    for (const candidate of candidates) {
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            await fs.access(candidate);
+            return candidate;
+        }
+        catch {
+            // try next
+        }
+    }
+    return undefined;
+}
+async function readDeclaredParameters(rootDir) {
+    const hereyarcPath = await getAnyExisting(path.join(rootDir, 'hereyarc.yaml'), path.join(rootDir, 'hereyarc.yml'));
+    if (!hereyarcPath) {
+        return {};
+    }
+    const content = await fs.readFile(hereyarcPath, 'utf8');
+    const parsed = (yaml.parse(content) ?? {});
+    return parsed.parameters ?? {};
+}
+/**
+ * Read declared parameters from `<rootDir>/hereyarc.yaml`, validate provided
+ * values against the declarations, then substitute `{{name}}` placeholders in
+ * any `hereyaconfig/hereyavars/*.yaml` files. Returns the resolved parameter
+ * map for the caller to forward to `executor.provision({parameters})`.
+ *
+ * Used by `hereya app deploy --local`, `hereya app destroy --local`, and the
+ * remote executor wrapper (which now shells out to those commands).
+ */
+export async function resolveAndSubstituteAppParams(input) {
+    const declared = await readDeclaredParameters(input.rootDir);
+    const resolved = resolveAppParameters({ declared, provided: input.provided });
+    if (resolved.errors.length > 0) {
+        return { reason: `Parameter validation failed: ${resolved.errors.join('; ')}`, success: false };
+    }
+    try {
+        const { filesWritten } = await substituteAppParameters({
+            declaredNames: Object.keys(declared),
+            parameters: resolved.parameters,
+            rootDir: input.rootDir,
+        });
+        if (filesWritten.length > 0) {
+            input.logger?.info(`Substituted parameters in ${filesWritten.length} hereyavars file(s).`);
+        }
+    }
+    catch (error) {
+        return { reason: `Failed to substitute hereyavars parameters: ${error.message}`, success: false };
+    }
+    return { parameters: resolved.parameters, success: true };
+}

package/oclif.manifest.json

@@ -599,6 +599,30 @@
         "index.js"
       ]
     },
+    "list": {
+      "aliases": [],
+      "args": {},
+      "description": "List your projects.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "list",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "list",
+        "index.js"
+      ]
+    },
     "login": {
       "aliases": [],
       "args": {
@@ -643,30 +667,6 @@
         "index.js"
       ]
     },
-    "list": {
-      "aliases": [],
-      "args": {},
-      "description": "List your projects.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "list",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "list",
-        "index.js"
-      ]
-    },
     "logout": {
       "aliases": [],
       "args": {},
@@ -1201,6 +1201,20 @@
         "<%= config.bin %> <%= command.id %> my-org/my-app -w prod -p organizationId=org-123"
       ],
       "flags": {
+        "chdir": {
+          "description": "Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "local": {
+          "description": "force local execution (skip remote executor)",
+          "name": "local",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "parameter": {
           "char": "p",
           "description": "parameter for the app deployment, in the form of key=value (repeatable)",
@@ -1289,6 +1303,29 @@
         "<%= config.bin %> <%= command.id %> my-org/my-app -w my-workspace"
       ],
       "flags": {
+        "chdir": {
+          "description": "Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "local": {
+          "description": "force local execution (skip remote executor)",
+          "name": "local",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "parameter": {
+          "char": "p",
+          "description": "parameter for the app deployment, in the form of key=value (repeatable)",
+          "name": "parameter",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "workspace where the app is currently deployed",
@@ -2082,40 +2119,49 @@
         "index.js"
       ]
     },
-    "flow:provid": {
+    "flow:env": {
       "aliases": [],
       "args": {
-        "package": {
-          "description": "Package name (e.g., hereya/postgres)",
-          "name": "package",
-          "required": true
+        "name": {
+          "description": "name of the env to display",
+          "name": "name",
+          "required": false
         }
       },
-      "description": "Display the provisioning ID for a package in a git branch-based workspace",
+      "description": "Print project environment variables for a git branch-based workspace",
       "examples": [
-        "<%= config.bin %> <%= command.id %> hereya/postgres",
-        "<%= config.bin %> <%= command.id %> hereya/postgres --profile staging",
-        "<%= config.bin %> <%= command.id %> hereya/postgres --pin"
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> myEnv",
+        "<%= config.bin %> <%= command.id %> --profile staging",
+        "<%= config.bin %> <%= command.id %> --pin",
+        "<%= config.bin %> <%= command.id %> -l"
       ],
       "flags": {
         "chdir": {
-          "char": "C",
-          "description": "Project root directory",
+          "description": "project root directory",
           "name": "chdir",
           "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "list": {
+          "char": "l",
+          "description": "list only the env vars without values",
+          "name": "list",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
         "pin": {
-          "description": "Append git commit SHA to workspace name for commit-specific isolation",
+          "description": "append git commit SHA to workspace name for commit-specific isolation",
           "name": "pin",
           "required": false,
           "allowNo": false,
           "type": "boolean"
         },
         "profile": {
-          "description": "Profile to use for the workspace (will be appended to workspace name)",
+          "description": "profile to use for the workspace (will be appended to workspace name)",
           "name": "profile",
           "required": false,
           "hasDynamicHelp": false,
@@ -2125,7 +2171,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "flow:provid",
+      "id": "flow:env",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -2136,53 +2182,44 @@
         "dist",
         "commands",
         "flow",
-        "provid",
+        "env",
         "index.js"
       ]
     },
-    "flow:env": {
+    "flow:provid": {
       "aliases": [],
       "args": {
-        "name": {
-          "description": "name of the env to display",
-          "name": "name",
-          "required": false
+        "package": {
+          "description": "Package name (e.g., hereya/postgres)",
+          "name": "package",
+          "required": true
         }
       },
-      "description": "Print project environment variables for a git branch-based workspace",
+      "description": "Display the provisioning ID for a package in a git branch-based workspace",
       "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> myEnv",
-        "<%= config.bin %> <%= command.id %> --profile staging",
-        "<%= config.bin %> <%= command.id %> --pin",
-        "<%= config.bin %> <%= command.id %> -l"
+        "<%= config.bin %> <%= command.id %> hereya/postgres",
+        "<%= config.bin %> <%= command.id %> hereya/postgres --profile staging",
+        "<%= config.bin %> <%= command.id %> hereya/postgres --pin"
       ],
       "flags": {
         "chdir": {
-          "description": "project root directory",
+          "char": "C",
+          "description": "Project root directory",
           "name": "chdir",
           "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "list": {
-          "char": "l",
-          "description": "list only the env vars without values",
-          "name": "list",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
         "pin": {
-          "description": "append git commit SHA to workspace name for commit-specific isolation",
+          "description": "Append git commit SHA to workspace name for commit-specific isolation",
           "name": "pin",
           "required": false,
           "allowNo": false,
           "type": "boolean"
         },
         "profile": {
-          "description": "profile to use for the workspace (will be appended to workspace name)",
+          "description": "Profile to use for the workspace (will be appended to workspace name)",
           "name": "profile",
           "required": false,
           "hasDynamicHelp": false,
@@ -2192,7 +2229,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "flow:env",
+      "id": "flow:provid",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -2203,7 +2240,7 @@
         "dist",
         "commands",
         "flow",
-        "env",
+        "provid",
         "index.js"
       ]
     },
@@ -3175,5 +3212,5 @@
       ]
     }
   },
-  "version": "0.85.3"
+  "version": "0.85.5"
 }

package/package.json

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