@mondaydotcomorg/z2h-cli 0.22.0 → 0.23.0

package/dist/auth.d.ts

@@ -0,0 +1,3 @@
+export { generateZ2HTokenCommand, type GenerateZ2HTokenOptions } from './commands/generate-z2h-token';
+export { readZthAuth, Z2hAuthMissingError, Z2H_AUTH_FILE, type ZthAuth } from './util/auth/auth-store';
+//# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,KAAK,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/auth.js

@@ -0,0 +1,11 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const commands_generateZ2hToken = require('./commands/generate-z2h-token.js');
+const util_auth_authStore = require('./util/auth/auth-store.js');
+
+
+
+exports.generateZ2HTokenCommand = commands_generateZ2hToken.generateZ2HTokenCommand;
+exports.Z2H_AUTH_FILE = util_auth_authStore.Z2H_AUTH_FILE;
+exports.Z2hAuthMissingError = util_auth_authStore.Z2hAuthMissingError;
+exports.readZthAuth = util_auth_authStore.readZthAuth;

package/dist/esm/auth.d.ts

@@ -0,0 +1,3 @@
+export { generateZ2HTokenCommand, type GenerateZ2HTokenOptions } from './commands/generate-z2h-token';
+export { readZthAuth, Z2hAuthMissingError, Z2H_AUTH_FILE, type ZthAuth } from './util/auth/auth-store';
+//# sourceMappingURL=auth.d.ts.map

package/dist/esm/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,KAAK,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/esm/auth.mjs

@@ -0,0 +1,2 @@
+export { generateZ2HTokenCommand } from './commands/generate-z2h-token.mjs';
+export { Z2H_AUTH_FILE, Z2hAuthMissingError, readZthAuth } from './util/auth/auth-store.mjs';

package/dist/esm/s3.d.ts

@@ -0,0 +1,3 @@
+export { setupS3Client, getS3Client } from './util/s3/client';
+export { uploadDir } from './util/s3/upload';
+//# sourceMappingURL=s3.d.ts.map

package/dist/esm/s3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../src/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/esm/s3.mjs

@@ -0,0 +1,2 @@
+export { getS3Client, setupS3Client } from './util/s3/client.mjs';
+export { uploadDir } from './util/s3/upload.mjs';

package/dist/esm/util/s3/upload.d.ts

@@ -1,2 +1,2 @@
-export declare function uploadDir(localDir: string, keyPrefix: string): Promise<string[]>;
+export declare function uploadDir(localDir: string, keyPrefix: string, bucket?: string): Promise<string[]>;
 //# sourceMappingURL=upload.d.ts.map

package/dist/esm/util/s3/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/util/s3/upload.ts"],"names":[],"mappings":"AAeA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BtF"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/util/s3/upload.ts"],"names":[],"mappings":"AAeA,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,MAA0B,GACjC,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB"}

package/dist/esm/util/s3/upload.mjs

@@ -11,7 +11,7 @@ import { getS3Client } from './client.mjs';
 // the URL itself is the cache key. Assets never need to be revalidated.
 const FOREVER = 'public, immutable';
 const UPLOAD_CONCURRENCY = 5;
-async function uploadDir(localDir, keyPrefix) {
+async function uploadDir(localDir, keyPrefix, bucket = BUCKET_WRITE_NAME) {
     const entries = await readdir(localDir, { recursive: true, withFileTypes: true });
     const files = entries.filter(e => e.isFile()).map(e => path.relative(localDir, path.join(e.parentPath, e.name)));
     const s3 = getS3Client();
@@ -20,7 +20,7 @@ async function uploadDir(localDir, keyPrefix) {
         const contentType = lookup(rel) || 'application/octet-stream';
         const key = `${keyPrefix}/${rel.split(path.sep).join('/')}`;
         await s3.send(new PutObjectCommand({
-            Bucket: BUCKET_WRITE_NAME,
+            Bucket: bucket,
             Key: key,
             Body: body,
             ContentType: contentType,

package/dist/s3.d.ts

@@ -0,0 +1,3 @@
+export { setupS3Client, getS3Client } from './util/s3/client';
+export { uploadDir } from './util/s3/upload';
+//# sourceMappingURL=s3.d.ts.map

package/dist/s3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../src/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/s3.js

@@ -0,0 +1,10 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const util_s3_client = require('./util/s3/client.js');
+const util_s3_upload = require('./util/s3/upload.js');
+
+
+
+exports.getS3Client = util_s3_client.getS3Client;
+exports.setupS3Client = util_s3_client.setupS3Client;
+exports.uploadDir = util_s3_upload.uploadDir;

package/dist/util/s3/upload.d.ts

@@ -1,2 +1,2 @@
-export declare function uploadDir(localDir: string, keyPrefix: string): Promise<string[]>;
+export declare function uploadDir(localDir: string, keyPrefix: string, bucket?: string): Promise<string[]>;
 //# sourceMappingURL=upload.d.ts.map

package/dist/util/s3/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/util/s3/upload.ts"],"names":[],"mappings":"AAeA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BtF"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/util/s3/upload.ts"],"names":[],"mappings":"AAeA,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,MAA0B,GACjC,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB"}

package/dist/util/s3/upload.js

@@ -18,7 +18,7 @@ const pMap__default = /*#__PURE__*/_interopDefault(pMap);
 // the URL itself is the cache key. Assets never need to be revalidated.
 const FOREVER = 'public, immutable';
 const UPLOAD_CONCURRENCY = 5;
-async function uploadDir(localDir, keyPrefix) {
+async function uploadDir(localDir, keyPrefix, bucket = constants.BUCKET_WRITE_NAME) {
     const entries = await promises.readdir(localDir, { recursive: true, withFileTypes: true });
     const files = entries.filter(e => e.isFile()).map(e => path__default.default.relative(localDir, path__default.default.join(e.parentPath, e.name)));
     const s3 = util_s3_client.getS3Client();
@@ -27,7 +27,7 @@ async function uploadDir(localDir, keyPrefix) {
         const contentType = mimeTypes.lookup(rel) || 'application/octet-stream';
         const key = `${keyPrefix}/${rel.split(path__default.default.sep).join('/')}`;
         await s3.send(new clientS3.PutObjectCommand({
-            Bucket: constants.BUCKET_WRITE_NAME,
+            Bucket: bucket,
             Key: key,
             Body: body,
             ContentType: contentType,

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

@@ -32,6 +32,15 @@ function hashQuery(boundSql: string, params: Record<string, SnowflakeParamValue>
   return createHash('sha256').update(boundSql).update('|').update(JSON.stringify(sorted)).digest('hex').slice(0, 16);
 }
 
+/**
+ * Hashes the *unbound* SQL so one logical query keeps one identifier whatever its parameters are.
+ * Must agree with bigbrain-zth's `hashQueryShape`, or the same query buckets differently
+ * depending on which service ran it.
+ */
+function hashQueryShape(rawSql: string): string {
+  return createHash('sha256').update(rawSql.replace(/\s+/g, ' ').trim()).digest('hex').slice(0, 16);
+}
+
 /**
  * The permissions-aware pool returns different rows to different people, so the
  * cache key has to carry whatever decides that — the caller's roles and user
@@ -118,16 +127,18 @@ export async function runSnowflakeQuery(
     );
   }
 
-  const queryHash = hashQuery(boundSql, params ?? {});
+  // Cache key stays parameter-sensitive; the pool identifier deliberately is not.
+  const queryCacheKey = hashQuery(boundSql, params ?? {});
+  const queryIdentifier = hashQueryShape(sql);
   const scope = cacheScope(useStateless);
-  const cached = scope ? await readCache(queryHash, scope) : null;
+  const cached = scope ? await readCache(queryCacheKey, scope) : null;
   if (cached) {
     return cached;
   }
 
   const queryOptions = {
     query: boundSql,
-    identifier: `z2h-query:${queryHash}`,
+    identifier: `z2h-query:${queryIdentifier}`,
     fallback: [] as SnowflakeRow[],
     timeoutInMs,
     convertToSingularResult: false,
@@ -157,7 +168,7 @@ export async function runSnowflakeQuery(
   }
   const rows = Array.isArray(data) ? data : [];
   if (scope) {
-    await writeCache(queryHash, scope, rows);
+    await writeCache(queryCacheKey, scope, rows);
   }
   return rows;
 }
@@ -167,9 +178,10 @@ export async function runSnowflakeQuery(
  * correctness, so a failure here falls through to the warehouse rather than
  * failing the handler's query. Compressed, as bigbrain-zth stores the same rows.
  */
-async function readCache(queryHash: string, scope: string): Promise<SnowflakeRow[] | null> {
+/** `queryHash` is pinned: it is in this pattern's `patternVariableKeys`, so it is Redis key material. */
+async function readCache(queryCacheKey: string, scope: string): Promise<SnowflakeRow[] | null> {
   try {
-    const hit = await getDefaultClient().getCompressed(CACHE_PATTERN, { queryHash, scope });
+    const hit = await getDefaultClient().getCompressed(CACHE_PATTERN, { queryHash: queryCacheKey, scope });
     return hit ? (JSON.parse(hit.toString()) as SnowflakeRow[]) : null;
   } catch (err) {
     logger.warn({ tag: 'z2h-snowflake', error: err instanceof Error ? err.message : String(err) }, 'cache read failed');
@@ -177,9 +189,9 @@ async function readCache(queryHash: string, scope: string): Promise<SnowflakeRow
   }
 }
 
-async function writeCache(queryHash: string, scope: string, rows: SnowflakeRow[]): Promise<void> {
+async function writeCache(queryCacheKey: string, scope: string, rows: SnowflakeRow[]): Promise<void> {
   try {
-    await getDefaultClient().setCompressed(CACHE_PATTERN, { queryHash, scope }, JSON.stringify(rows));
+    await getDefaultClient().setCompressed(CACHE_PATTERN, { queryHash: queryCacheKey, scope }, JSON.stringify(rows));
   } catch (err) {
     logger.warn(
       { tag: 'z2h-snowflake', error: err instanceof Error ? err.message : String(err) },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,6 +15,16 @@
       "require": "./dist/constants.js",
       "types": "./dist/constants.d.ts"
     },
+    "./auth": {
+      "import": "./dist/esm/auth.mjs",
+      "require": "./dist/auth.js",
+      "types": "./dist/auth.d.ts"
+    },
+    "./s3": {
+      "import": "./dist/esm/s3.mjs",
+      "require": "./dist/s3.js",
+      "types": "./dist/s3.d.ts"
+    },
     "./package.json": "./package.json"
   },
   "nx": {

package/src/auth.ts

@@ -0,0 +1,2 @@
+export { generateZ2HTokenCommand, type GenerateZ2HTokenOptions } from './commands/generate-z2h-token';
+export { readZthAuth, Z2hAuthMissingError, Z2H_AUTH_FILE, type ZthAuth } from './util/auth/auth-store';

package/src/s3.ts

@@ -0,0 +1,2 @@
+export { setupS3Client, getS3Client } from './util/s3/client';
+export { uploadDir } from './util/s3/upload';

package/src/templates/workspace/package.json.tmpl

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@mondaydotcomorg/trident-runtime": "^1.24.1",
-    "@mondaydotcomorg/z2h-runtime-sdk": "^0.1.0",
+    "@mondaydotcomorg/z2h-runtime-sdk": "0.x",
     "@vibe/core": "^4.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/src/util/s3/upload.ts

@@ -13,7 +13,11 @@ const FOREVER = 'public, immutable';
 
 const UPLOAD_CONCURRENCY = 5;
 
-export async function uploadDir(localDir: string, keyPrefix: string): Promise<string[]> {
+export async function uploadDir(
+  localDir: string,
+  keyPrefix: string,
+  bucket: string = BUCKET_WRITE_NAME
+): Promise<string[]> {
   const entries = await readdir(localDir, { recursive: true, withFileTypes: true });
   const files = entries.filter(e => e.isFile()).map(e => path.relative(localDir, path.join(e.parentPath, e.name)));
 
@@ -27,7 +31,7 @@ export async function uploadDir(localDir: string, keyPrefix: string): Promise<st
       const key = `${keyPrefix}/${rel.split(path.sep).join('/')}`;
       await s3.send(
         new PutObjectCommand({
-          Bucket: BUCKET_WRITE_NAME,
+          Bucket: bucket,
           Key: key,
           Body: body,
           ContentType: contentType,