@mondaydotcomorg/z2h-cli 0.32.0 → 0.32.2

package/handler-api/backend-runner/channels/snowflake-channel/run-query.ts

@@ -26,7 +26,7 @@ export interface SnowflakeRow {
 export interface RunQueryOptions {
   /** Clamped to MAX_TIMEOUT_MS. Defaults to DEFAULT_TIMEOUT_MS. */
   timeoutMs?: number;
-  /** Human-readable label for the pool identifier/logs, e.g. a widget name, instead of the default query-shape hash. Sanitized to `[a-z0-9-_]`, max 64 chars. */
+  /** Human-readable label appended to the pool identifier/logs (e.g. a widget name), alongside the query-shape hash — never replacing it, so `query_hash` lookups keep working. Sanitized to `[a-z0-9-_]`, max 64 chars. */
   identifier?: string;
 }
 
@@ -142,8 +142,9 @@ export async function runSnowflakeQuery(
 
   // Cache key stays parameter-sensitive; the pool identifier deliberately is not.
   const queryCacheKey = hashQuery(boundSql, params ?? {});
+  const queryHash = hashQueryShape(sql);
   const sanitizedIdentifier = options?.identifier ? sanitizeIdentifier(options.identifier) : '';
-  const queryIdentifier = sanitizedIdentifier || hashQueryShape(sql);
+  const queryIdentifier = sanitizedIdentifier || queryHash;
   const scope = cacheScope(useStateless);
   const startMs = Date.now();
   const cached = scope ? await readCache(queryCacheKey, scope) : null;
@@ -167,7 +168,9 @@ export async function runSnowflakeQuery(
 
   const queryOptions = {
     query: boundSql,
-    identifier: `z2h-query:${appName}:${queryIdentifier}`,
+    // `queryHash` always occupies this slot so `query_hash`-keyed joins never break;
+    // a caller-supplied identifier is appended, not substituted.
+    identifier: `z2h-query:${appName}:${queryHash}${sanitizedIdentifier ? `:${sanitizedIdentifier}` : ''}`,
     fallback: [] as SnowflakeRow[],
     timeoutInMs,
     convertToSingularResult: false,

package/handler-api/backend-runner/channels/snowflake-channel/snowflake.channel.ts

@@ -36,8 +36,8 @@ export function makeSnowflakeChannel(appName: string) {
      * @param options - Optional `{ timeoutMs?: number, identifier?: string }`. `timeoutMs` is
      *   clamped to 5 min (`MAX_TIMEOUT_MS`); effective ceiling is ~5.5 min including the host
      *   backstop. `identifier` names this query in logs/metrics and the Snowflake pool identifier
-     *   (e.g. a widget name) instead of the default query-shape hash — sanitized to `[a-z0-9-_]`,
-     *   max 64 chars.
+     *   (e.g. a widget name), appended alongside the query-shape hash — it never replaces the hash,
+     *   so `query_hash` lookups keep working. Sanitized to `[a-z0-9-_]`, max 64 chars.
      * @returns Array of row objects with **camelCase keys** — SQL aliases are normalized
      *   to camelCase regardless of their casing in the query
      *   (e.g. `AS current_user` → `rows[0].currentUser`, `AS total_count` → `rows[0].totalCount`).
@@ -68,7 +68,7 @@ export function makeSnowflakeChannel(appName: string) {
      * );
      *
      * @example
-     * // Name this query in logs/metrics instead of the default hash
+     * // Name this query in logs/metrics alongside the default hash
      * const rows = await ctx.api.v1.snowflake.query(
      *   `SELECT COUNT(*) AS total FROM monday_items`,
      *   undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -51,7 +51,7 @@
   ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.706.0",
-    "@mondaydotcomorg/z2h-dashboard-templates": "^0.3.6",
+    "@mondaydotcomorg/z2h-dashboard-templates": "^0.4.0",
     "@mondaydotcomorg/z2h-shared-utils": "^0.6.2",
     "acorn": "^8.14.0",
     "acorn-walk": "^8.3.4",
@@ -77,6 +77,7 @@
     "@types/mime-types": "^2.1.4",
     "@types/node": "^22.19.0",
     "@types/semver": "^7.5.0",
+    "nx": "^21.6.0",
     "typescript": "^5.7.2",
     "vitest": "^2.1.4"
   },