@mondaydotcomorg/z2h-cli 0.34.0 → 0.34.2

package/dist/esm/util/broker/app.mjs

@@ -48,7 +48,7 @@ async function claimApp(appName, gitRemote) {
     }
 }
 async function registerApp(params) {
-    const { appName, token, nextVersion: version, entry, visibility, gitRemote, integrations, handlerNames, apiUsages, description, masterAppName, } = params;
+    const { appName, token, nextVersion: version, entry, visibility, gitRemote, integrations, handlerNames, description, masterAppName, } = params;
     const res = await fetch(`${brokerBaseUrl()}/z2h-cli/apps/register`, {
         method: 'POST',
         headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json', ...routingHeaders() },
@@ -60,7 +60,6 @@ async function registerApp(params) {
             gitRemote,
             integrations,
             handlerNames,
-            apiUsages,
             description,
             masterAppName,
         }),
@@ -72,11 +71,11 @@ async function registerApp(params) {
 }
 /** Releases a new version onto an app that already exists. */
 async function updateApp(params) {
-    const { appName, token, nextVersion: version, entry, gitRemote, integrations, handlerNames, apiUsages, description, } = params;
+    const { appName, token, nextVersion: version, entry, gitRemote, integrations, handlerNames, description } = params;
     const res = await fetch(`${brokerBaseUrl()}/z2h-cli/apps/update`, {
         method: 'POST',
         headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json', ...routingHeaders() },
-        body: JSON.stringify({ appName, version, entry, gitRemote, integrations, handlerNames, apiUsages, description }),
+        body: JSON.stringify({ appName, version, entry, gitRemote, integrations, handlerNames, description }),
     });
     if (!res.ok) {
         const text = await res.text();

package/dist/esm/util/git/repo.mjs

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'fs-extra';
 import { execa } from 'execa';
-import { BUCKET_WRITE_NAME } from '../../constants.mjs';
+import { BUCKET_WRITE_NAME } from '@mondaydotcomorg/z2h-shared-utils';
 import { mfAppName } from '../app-name.mjs';
 import { GitConflictError, DeployError, messageOf } from '../errors.mjs';
 

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

@@ -1,5 +1,5 @@
 import { S3Client } from '@aws-sdk/client-s3';
-import { REGION } from '../../constants.mjs';
+import { REGION } from '@mondaydotcomorg/z2h-shared-utils';
 
 let client = null;
 function setupS3Client(credentials) {

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

@@ -4,7 +4,7 @@ import { readFile } from 'fs-extra';
 import { lookup } from 'mime-types';
 import pMap from 'p-map';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
-import { BUCKET_WRITE_NAME } from '../../constants.mjs';
+import { BUCKET_WRITE_NAME } from '@mondaydotcomorg/z2h-shared-utils';
 import { tagDeployError } from '../errors.mjs';
 import { getS3Client } from './client.mjs';
 

package/dist/esm/util/usage-json.d.ts

@@ -1,6 +1,6 @@
 export declare function hasHandlers(appDir: string): boolean;
 /** Other features may add top-level fields, so writes merge into the existing file instead of replacing it. */
-export declare function writeUsageJson(appDir: string, patch: Record<string, unknown>): Promise<void>;
+export declare function writeUsageJson(appDir: string, patch: Record<string, unknown>): Promise<Record<string, unknown>>;
 /** Refreshes the git-tracked `usage.json` and commits it if it changed, so a deploy's push carries it. */
-export declare function updateOrCreateUsageJson(appDir: string, appName: string, deployedBy: string): Promise<void>;
+export declare function updateOrCreateUsageJson(appDir: string, appName: string, deployedBy: string): Promise<Record<string, unknown>>;
 //# sourceMappingURL=usage-json.d.ts.map

package/dist/esm/util/usage-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-json.d.ts","sourceRoot":"","sources":["../../../src/util/usage-json.ts"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAWlG;AAED,0GAA0G;AAC1G,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhH"}
+{"version":3,"file":"usage-json.d.ts","sourceRoot":"","sources":["../../../src/util/usage-json.ts"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAarH;AAED,0GAA0G;AAC1G,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CASlC"}

package/dist/esm/util/usage-json.mjs

@@ -20,17 +20,20 @@ async function writeUsageJson(appDir, patch) {
             throw err;
         }
     }
-    await writeJson(file, { ...existing, ...patch }, { spaces: 2 });
+    const merged = { ...existing, ...patch };
+    await writeJson(file, merged, { spaces: 2 });
+    return merged;
 }
 /** Refreshes the git-tracked `usage.json` and commits it if it changed, so a deploy's push carries it. */
 async function updateOrCreateUsageJson(appDir, appName, deployedBy) {
     const apiUsages = hasHandlers(appDir) ? (await readHandlers(appDir)).apiUsages : {};
-    await writeUsageJson(appDir, { appName, deployedBy, apiUsages });
+    const usage = await writeUsageJson(appDir, { appName, deployedBy, apiUsages });
     await execGit(['add', 'usage.json'], appDir);
     const { exitCode } = await execa('git', ['diff', '--cached', '--quiet'], { cwd: appDir, reject: false });
     if (exitCode !== 0) {
         await execGit(['commit', '-m', 'Update usage.json'], appDir);
     }
+    return usage;
 }
 
 export { hasHandlers, updateOrCreateUsageJson, writeUsageJson };

package/dist/esm/util/usage-upload.d.ts

@@ -0,0 +1,3 @@
+/** Snowpipe ignores re-uploads of an existing key, so the key is unique per app row id and deploy version. */
+export declare function putAppUsage(appName: string, appId: number | null, usage: Record<string, unknown>, uploadVersion: number): Promise<void>;
+//# sourceMappingURL=usage-upload.d.ts.map

package/dist/esm/util/usage-upload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-upload.d.ts","sourceRoot":"","sources":["../../../src/util/usage-upload.ts"],"names":[],"mappings":"AAKA,8GAA8G;AAC9G,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/esm/util/usage-upload.mjs

@@ -0,0 +1,29 @@
+import { PutObjectCommand } from '@aws-sdk/client-s3';
+import { isProdBroker, brokerBaseUrl } from '../constants.mjs';
+import { warn } from './logger.mjs';
+import { getS3Client } from './s3/client.mjs';
+import { APP_USAGE_BUCKET_NAME, appUsageFolder } from '@mondaydotcomorg/z2h-shared-utils';
+
+/** Snowpipe ignores re-uploads of an existing key, so the key is unique per app row id and deploy version. */
+async function putAppUsage(appName, appId, usage, uploadVersion) {
+    if (!isProdBroker()) {
+        warn(`skipping app usage upload to Snowflake: ${brokerBaseUrl()} is not the production broker, and only production deploys are recorded.`);
+        return;
+    }
+    if (appId === null) {
+        return;
+    }
+    try {
+        await getS3Client().send(new PutObjectCommand({
+            Bucket: APP_USAGE_BUCKET_NAME,
+            Key: `${appUsageFolder(appName, appId)}/${uploadVersion}/usage.json`,
+            Body: JSON.stringify({ ...usage, appName, appId, uploadVersion }),
+            ContentType: 'application/json',
+        }));
+    }
+    catch (err) {
+        warn(`could not record app usage for Snowflake: ${err.message}. Your app is live. To record it, run \`z2h-cli deploy\` again (no changes or commit needed).`);
+    }
+}
+
+export { putAppUsage };

package/dist/util/__tests__/usage-upload.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=usage-upload.test.d.ts.map

package/dist/util/__tests__/usage-upload.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-upload.test.d.ts","sourceRoot":"","sources":["../../../src/util/__tests__/usage-upload.test.ts"],"names":[],"mappings":""}

package/dist/util/app-name.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const fs = require('node:fs');
-const constants = require('../constants.js');
+const z2hSharedUtils = require('@mondaydotcomorg/z2h-shared-utils');
 
 /**
  * Strip any npm scope (`@scope/`) from a package name.
@@ -40,12 +40,12 @@ function validateAppName(appName) {
     if (RESERVED_APP_NAMES.has(appName)) {
         throw new Error(`App name "${appName}" is reserved by the Z2H host for a platform page under /bigbrain-vibe/${appName}. Pick a different name.`);
     }
-    if (!constants.APP_NAME_PATTERN.test(appName)) {
+    if (!z2hSharedUtils.APP_NAME_PATTERN.test(appName)) {
         throw new Error(`App name "${appName}" is invalid. Use lowercase kebab-case (a-z, 0-9, -), ` +
             `2-50 chars, starting with a letter.`);
     }
-    if (appName.startsWith(constants.PREVIEW_APP_NAME_PREFIX)) {
-        throw new Error(`App names starting with "${constants.PREVIEW_APP_NAME_PREFIX}" are reserved for the ephemeral preview mechanism. Pick a different name.`);
+    if (appName.startsWith(z2hSharedUtils.PREVIEW_APP_NAME_PREFIX)) {
+        throw new Error(`App names starting with "${z2hSharedUtils.PREVIEW_APP_NAME_PREFIX}" are reserved for the ephemeral preview mechanism. Pick a different name.`);
     }
 }
 // Preview slugs are capped here so the mf-prefixed name (`mf-` + slug) stays
@@ -61,13 +61,13 @@ const PREVIEW_SLUG_MAX_LEN = 47;
  */
 function buildPreviewSlug(appName, previewId) {
     const shortId = previewId.replace(/-/g, '').slice(0, 8);
-    const base = `${constants.PREVIEW_APP_NAME_PREFIX}${shortId}-${cleanAppName(appName)}`;
+    const base = `${z2hSharedUtils.PREVIEW_APP_NAME_PREFIX}${shortId}-${cleanAppName(appName)}`;
     // Trailing hyphens are stripped post-slice — a cut that lands right after a
     // hyphen in appName would otherwise leave one dangling.
     return base.slice(0, PREVIEW_SLUG_MAX_LEN).replace(/-+$/, '');
 }
 function isPreviewAppName(appName) {
-    return appName.startsWith(`mf-${constants.PREVIEW_APP_NAME_PREFIX}`);
+    return appName.startsWith(`mf-${z2hSharedUtils.PREVIEW_APP_NAME_PREFIX}`);
 }
 
 exports.buildPreviewSlug = buildPreviewSlug;

package/dist/util/auth/__tests__/index.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.test.d.ts.map

package/dist/util/auth/__tests__/index.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/util/auth/__tests__/index.test.ts"],"names":[],"mappings":""}

package/dist/util/auth/broker-credential-provider.d.ts

@@ -1,12 +1,16 @@
 import type { AwsCredentialIdentityProvider } from '@aws-sdk/types';
 export declare const STS_BROKER_PATH = "/z2h-cli/sts/credentials";
 export declare const DEPLOY_VERSION_PATH = "/z2h-cli/apps/version";
+interface VersionResponse {
+    version?: number;
+    id?: number | null;
+}
 /**
  * Reserve the version this deploy will write to. Split out of the STS
  * credentials call so version derivation lives on its own endpoint — the CLI
  * asks for the version first, then requests credentials scoped to it.
  */
-export declare function fetchDeployVersion(appName: string): Promise<number>;
+export declare function fetchDeployVersion(appName: string): Promise<Required<VersionResponse>>;
 /**
  * AWS SDK credential provider that fetches short-lived credentials from the
  * bigbrain-zth STS broker, scoped to `appName` — or, when `previewId` is
@@ -19,4 +23,5 @@ export declare function brokerCredentialProvider({ appName, previewId, }: {
     appName: string;
     previewId?: string;
 }): AwsCredentialIdentityProvider;
+export {};
 //# sourceMappingURL=broker-credential-provider.d.ts.map

package/dist/util/auth/broker-credential-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"broker-credential-provider.d.ts","sourceRoot":"","sources":["../../../src/util/auth/broker-credential-provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAyB,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAE3F,eAAO,MAAM,eAAe,6BAA6B,CAAC;AAC1D,eAAO,MAAM,mBAAmB,0BAA0B,CAAC;AA0D3D;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMzE;AAwDD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,SAAS,GACV,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,6BAA6B,CAIhC"}
+{"version":3,"file":"broker-credential-provider.d.ts","sourceRoot":"","sources":["../../../src/util/auth/broker-credential-provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAyB,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAE3F,eAAO,MAAM,eAAe,6BAA6B,CAAC;AAC1D,eAAO,MAAM,mBAAmB,0BAA0B,CAAC;AAa3D,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AA2CD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAK5F;AAwDD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,SAAS,GACV,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,6BAA6B,CAIhC"}

package/dist/util/auth/broker-credential-provider.js

@@ -51,8 +51,8 @@ async function assertBrokerOk(res, errorLabel) {
 async function fetchDeployVersion(appName) {
     const res = await postToBroker(DEPLOY_VERSION_PATH, { appName });
     await assertBrokerOk(res, 'deploy');
-    const body = (await res.json());
-    return body.version ?? 0;
+    const { version = 0, id = null } = (await res.json());
+    return { version, id };
 }
 async function requestSts(path, body, errorLabel) {
     const res = await postToBroker(path, body);

package/dist/util/auth/index.d.ts

@@ -0,0 +1,3 @@
+export { ensureZ2hToken, type EnsureZ2hTokenOptions } from '../npm/ensure-token';
+export { readZthAuth, tryReadAuthTokenSync, Z2hAuthMissingError, type ZthAuth } from './auth-store';
+//# sourceMappingURL=index.d.ts.map

package/dist/util/auth/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC"}

package/dist/util/auth/index.js

@@ -0,0 +1,11 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const util_npm_ensureToken = require('../npm/ensure-token.js');
+const util_auth_authStore = require('./auth-store.js');
+
+
+
+exports.ensureZ2hToken = util_npm_ensureToken.ensureZ2hToken;
+exports.Z2hAuthMissingError = util_auth_authStore.Z2hAuthMissingError;
+exports.readZthAuth = util_auth_authStore.readZthAuth;
+exports.tryReadAuthTokenSync = util_auth_authStore.tryReadAuthTokenSync;

package/dist/util/broker/app.d.ts

@@ -30,7 +30,6 @@ export interface RegisterOrUpdateOptions {
     gitRemote: string;
     integrations?: string[];
     handlerNames?: string[];
-    apiUsages?: Record<string, unknown>;
     description?: string;
     /**
      * The base app a preview is for, sent only on first registration — the link

package/dist/util/broker/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/util/broker/app.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,0FAA0F;IAC1F,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACtC,uGAAuG;IACvG,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAsBvE;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AA8DD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBtF"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/util/broker/app.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,0FAA0F;IAC1F,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACtC,uGAAuG;IACvG,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAsBvE;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAkDD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBtF"}

package/dist/util/broker/app.js

@@ -50,7 +50,7 @@ async function claimApp(appName, gitRemote) {
     }
 }
 async function registerApp(params) {
-    const { appName, token, nextVersion: version, entry, visibility, gitRemote, integrations, handlerNames, apiUsages, description, masterAppName, } = params;
+    const { appName, token, nextVersion: version, entry, visibility, gitRemote, integrations, handlerNames, description, masterAppName, } = params;
     const res = await fetch(`${constants.brokerBaseUrl()}/z2h-cli/apps/register`, {
         method: 'POST',
         headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json', ...constants.routingHeaders() },
@@ -62,7 +62,6 @@ async function registerApp(params) {
             gitRemote,
             integrations,
             handlerNames,
-            apiUsages,
             description,
             masterAppName,
         }),
@@ -74,11 +73,11 @@ async function registerApp(params) {
 }
 /** Releases a new version onto an app that already exists. */
 async function updateApp(params) {
-    const { appName, token, nextVersion: version, entry, gitRemote, integrations, handlerNames, apiUsages, description, } = params;
+    const { appName, token, nextVersion: version, entry, gitRemote, integrations, handlerNames, description } = params;
     const res = await fetch(`${constants.brokerBaseUrl()}/z2h-cli/apps/update`, {
         method: 'POST',
         headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json', ...constants.routingHeaders() },
-        body: JSON.stringify({ appName, version, entry, gitRemote, integrations, handlerNames, apiUsages, description }),
+        body: JSON.stringify({ appName, version, entry, gitRemote, integrations, handlerNames, description }),
     });
     if (!res.ok) {
         const text = await res.text();

package/dist/util/git/repo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const path = require('node:path');
 const fs = require('fs-extra');
 const execa = require('execa');
-const constants = require('../../constants.js');
+const z2hSharedUtils = require('@mondaydotcomorg/z2h-shared-utils');
 const util_appName = require('../app-name.js');
 const util_errors = require('../errors.js');
 
@@ -23,7 +23,7 @@ async function execGitLines(args, dir, env) {
 const REQUIRED_GITIGNORE_ENTRIES = ['node_modules/', '.zth/', 'build/'];
 const LOCAL_HOOKS_DIR = '.zth/hooks';
 function defaultS3Remote(app) {
-    return `s3://${constants.BUCKET_WRITE_NAME}/${util_appName.mfAppName(app)}/git`;
+    return `s3://${z2hSharedUtils.BUCKET_WRITE_NAME}/${util_appName.mfAppName(app)}/git`;
 }
 async function initRepo(dir, remote) {
     await ensureGitignore(dir);

package/dist/util/s3/client.js

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const clientS3 = require('@aws-sdk/client-s3');
-const constants = require('../../constants.js');
+const z2hSharedUtils = require('@mondaydotcomorg/z2h-shared-utils');
 
 let client = null;
 function setupS3Client(credentials) {
-    client = new clientS3.S3Client({ region: constants.REGION, credentials });
+    client = new clientS3.S3Client({ region: z2hSharedUtils.REGION, credentials });
 }
 function getS3Client() {
     if (!client) {

package/dist/util/s3/upload.js

@@ -6,7 +6,7 @@ const fs = require('fs-extra');
 const mimeTypes = require('mime-types');
 const pMap = require('p-map');
 const clientS3 = require('@aws-sdk/client-s3');
-const constants = require('../../constants.js');
+const z2hSharedUtils = require('@mondaydotcomorg/z2h-shared-utils');
 const util_errors = require('../errors.js');
 const util_s3_client = require('./client.js');
 
@@ -19,7 +19,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, bucket = constants.BUCKET_WRITE_NAME) {
+async function uploadDir(localDir, keyPrefix, bucket = z2hSharedUtils.BUCKET_WRITE_NAME) {
     try {
         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)));

package/dist/util/usage-json.d.ts

@@ -1,6 +1,6 @@
 export declare function hasHandlers(appDir: string): boolean;
 /** Other features may add top-level fields, so writes merge into the existing file instead of replacing it. */
-export declare function writeUsageJson(appDir: string, patch: Record<string, unknown>): Promise<void>;
+export declare function writeUsageJson(appDir: string, patch: Record<string, unknown>): Promise<Record<string, unknown>>;
 /** Refreshes the git-tracked `usage.json` and commits it if it changed, so a deploy's push carries it. */
-export declare function updateOrCreateUsageJson(appDir: string, appName: string, deployedBy: string): Promise<void>;
+export declare function updateOrCreateUsageJson(appDir: string, appName: string, deployedBy: string): Promise<Record<string, unknown>>;
 //# sourceMappingURL=usage-json.d.ts.map

package/dist/util/usage-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-json.d.ts","sourceRoot":"","sources":["../../src/util/usage-json.ts"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAWlG;AAED,0GAA0G;AAC1G,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhH"}
+{"version":3,"file":"usage-json.d.ts","sourceRoot":"","sources":["../../src/util/usage-json.ts"],"names":[],"mappings":"AAOA,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,+GAA+G;AAC/G,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAarH;AAED,0GAA0G;AAC1G,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CASlC"}

package/dist/util/usage-json.js

@@ -26,17 +26,20 @@ async function writeUsageJson(appDir, patch) {
             throw err;
         }
     }
-    await fs$1.writeJson(file, { ...existing, ...patch }, { spaces: 2 });
+    const merged = { ...existing, ...patch };
+    await fs$1.writeJson(file, merged, { spaces: 2 });
+    return merged;
 }
 /** Refreshes the git-tracked `usage.json` and commits it if it changed, so a deploy's push carries it. */
 async function updateOrCreateUsageJson(appDir, appName, deployedBy) {
     const apiUsages = hasHandlers(appDir) ? (await backend_handlers.readHandlers(appDir)).apiUsages : {};
-    await writeUsageJson(appDir, { appName, deployedBy, apiUsages });
+    const usage = await writeUsageJson(appDir, { appName, deployedBy, apiUsages });
     await util_git_repo.execGit(['add', 'usage.json'], appDir);
     const { exitCode } = await execa.execa('git', ['diff', '--cached', '--quiet'], { cwd: appDir, reject: false });
     if (exitCode !== 0) {
         await util_git_repo.execGit(['commit', '-m', 'Update usage.json'], appDir);
     }
+    return usage;
 }
 
 exports.hasHandlers = hasHandlers;

package/dist/util/usage-upload.d.ts

@@ -0,0 +1,3 @@
+/** Snowpipe ignores re-uploads of an existing key, so the key is unique per app row id and deploy version. */
+export declare function putAppUsage(appName: string, appId: number | null, usage: Record<string, unknown>, uploadVersion: number): Promise<void>;
+//# sourceMappingURL=usage-upload.d.ts.map

package/dist/util/usage-upload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-upload.d.ts","sourceRoot":"","sources":["../../src/util/usage-upload.ts"],"names":[],"mappings":"AAKA,8GAA8G;AAC9G,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/util/usage-upload.js

@@ -0,0 +1,31 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const clientS3 = require('@aws-sdk/client-s3');
+const constants = require('../constants.js');
+const util_logger = require('./logger.js');
+const util_s3_client = require('./s3/client.js');
+const z2hSharedUtils = require('@mondaydotcomorg/z2h-shared-utils');
+
+/** Snowpipe ignores re-uploads of an existing key, so the key is unique per app row id and deploy version. */
+async function putAppUsage(appName, appId, usage, uploadVersion) {
+    if (!constants.isProdBroker()) {
+        util_logger.warn(`skipping app usage upload to Snowflake: ${constants.brokerBaseUrl()} is not the production broker, and only production deploys are recorded.`);
+        return;
+    }
+    if (appId === null) {
+        return;
+    }
+    try {
+        await util_s3_client.getS3Client().send(new clientS3.PutObjectCommand({
+            Bucket: z2hSharedUtils.APP_USAGE_BUCKET_NAME,
+            Key: `${z2hSharedUtils.appUsageFolder(appName, appId)}/${uploadVersion}/usage.json`,
+            Body: JSON.stringify({ ...usage, appName, appId, uploadVersion }),
+            ContentType: 'application/json',
+        }));
+    }
+    catch (err) {
+        util_logger.warn(`could not record app usage for Snowflake: ${err.message}. Your app is live. To record it, run \`z2h-cli deploy\` again (no changes or commit needed).`);
+    }
+}
+
+exports.putAppUsage = putAppUsage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -57,7 +57,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.706.0",
     "@mondaydotcomorg/z2h-dashboard-templates": "^0.4.0",
-    "@mondaydotcomorg/z2h-shared-utils": "^0.7.2",
+    "@mondaydotcomorg/z2h-shared-utils": "^0.7.4",
     "acorn": "^8.14.0",
     "acorn-walk": "^8.3.4",
     "chokidar": "^3.6.0",
@@ -94,4 +94,4 @@
     "url": "https://github.com/DaPulse/bigbrain-z2h.git",
     "directory": "packages/z2h-cli"
   }
-}
+}

package/src/commands/__tests__/backend-deploy.test.ts

@@ -75,7 +75,7 @@ describe('deployBackend (live)', () => {
         deployedBy: 'test-user',
         isPreview: false,
       })
-    ).resolves.toEqual({ integrations: [], handlerNames: [], apiUsages: {} });
+    ).resolves.toEqual({ integrations: [], handlerNames: [] });
     expect(mockSend).not.toHaveBeenCalled();
   });
 
@@ -92,7 +92,7 @@ describe('deployBackend (live)', () => {
         deployedBy: 'test-user',
         isPreview: false,
       })
-    ).resolves.toEqual({ integrations: [], handlerNames: [], apiUsages: {} });
+    ).resolves.toEqual({ integrations: [], handlerNames: [] });
     expect(mockSend).not.toHaveBeenCalled();
   });
 
@@ -118,7 +118,6 @@ describe('deployBackend (live)', () => {
     ).resolves.toEqual({
       integrations: [],
       handlerNames: ['call_snowflake'],
-      apiUsages: { call_snowflake: { snowflake: { query: [{ sql: 'x' }] } } },
     });
     expect(mockSend).toHaveBeenCalled();
     const keys: string[] = mockSend.mock.calls.map((c: unknown[]) => (c[0] as { input: { Key: string } }).input.Key);
@@ -186,7 +185,6 @@ describe('deployBackend (preview)', () => {
     ).resolves.toEqual({
       integrations: ['monday'],
       handlerNames: ['call_snowflake'],
-      apiUsages: { call_snowflake: { monday: { query: [{ query: 'x' }] } } },
     });
     expect(mockSend).toHaveBeenCalled();
     const keys: string[] = mockSend.mock.calls.map((c: unknown[]) => (c[0] as { input: { Key: string } }).input.Key);