@stoker-platform/cli 0.5.101 → 0.5.102

package/init-files/.env/.env

@@ -8,6 +8,7 @@ GCP_FOLDER=""
 
 FB_GOOGLE_ANALYTICS_ACCOUNT_ID=""
 
+FB_FIRESTORE_EDITION="enterprise"
 FB_FIRESTORE_REGION="australia-southeast2"
 FB_FIRESTORE_ENABLE_PITR=true
 FB_FIRESTORE_BACKUP_RECURRENCE="daily"

package/init-files/bin/build.js

@@ -4,6 +4,7 @@ import { fileURLToPath } from "url"
 import { dirname, join } from "path"
 import { readFile, writeFile, readdir } from "fs/promises"
 import { existsSync, cpSync, rmSync } from "fs"
+import { getFirestoreDatabaseId } from "@stoker-platform/utils"
 import dotenv from "dotenv"
 
 const envDir = join(process.cwd(), ".env")
@@ -101,6 +102,7 @@ try {
         "SMTP_CONNECTION_URI=",
         "firebaseextensions.v1beta.function/location=",
         "DATABASE_REGION=",
+        "DATABASE=",
     ]
     const filteredLines = extensionEnvFileLines.filter(
         (line) => !linesToRemove.some((removeStr) => line.startsWith(removeStr)),
@@ -113,6 +115,7 @@ try {
     filteredLines.push(`DEFAULT_REPLY_TO=${mailSender.split("=")[1].replace(/^"|"$/g, "")}`)
     filteredLines.push(`SMTP_CONNECTION_URI=${mailSmtpConnectionUri.split("=")[1].replace(/^"|"$/g, "")}`)
     filteredLines.push(`DATABASE_REGION=${databaseRegion.split("=")[1].replace(/^"|"$/g, "")}`)
+    filteredLines.push(`DATABASE=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, process.env.GCP_PROJECT)}`)
     await writeFile(join(__dirname, "..", "extensions", "firestore-send-email.env"), filteredLines.join("\n"))
 
     // Create functions .env file with filtered environment variables
@@ -122,7 +125,7 @@ try {
     const projectSpecificEnvFile = join(envDir, `.env.${process.env.GCP_PROJECT}`)
 
     let envContent = ""
-    const envPattern = /^(FB_FUNCTIONS_|FB_AI_REGION|STOKER_|ADMIN_)/
+    const envPattern = /^(FB_FIRESTORE_EDITION|FB_FUNCTIONS_|FB_AI_REGION|STOKER_|ADMIN_)/
 
     if (existsSync(projectEnvFile)) {
         const projectEnvContent = await readFile(projectEnvFile, "utf8")

package/init-files/functions/src/index.ts

@@ -39,6 +39,7 @@ import {defineSecret} from "firebase-functions/params";
 import {readFileSync} from "fs";
 import {
     getPathCollections,
+    getFirestoreTriggerDatabase,
     roleHasOperationAccess,
 } from "@stoker-platform/utils";
 import {
@@ -67,6 +68,12 @@ const consumeAppCheckToken =
     process.env.FB_FUNCTIONS_CONSUME_APP_CHECK_TOKEN === "true";
 const v1Region = process.env.FB_FUNCTIONS_V1_REGION ||
     process.env.FB_FUNCTIONS_REGION;
+// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+const webAppConfig = JSON.parse(process.env.STOKER_FB_WEB_APP_CONFIG!);
+const projectId = webAppConfig.projectId;
+const firestoreDatabase =
+    getFirestoreTriggerDatabase(process.env.FB_FIRESTORE_EDITION, projectId);
+
 
 const ai = genkit({
     plugins: [vertexAI({
@@ -83,6 +90,7 @@ export const stoker: any = {};
 
 stoker["notifications"] = onDocumentCreated({
     document: "tenants/{tenantId}/Inbox/{messageId}",
+    database: firestoreDatabase,
 }, (event) => {
     return messageNotifications(
         event,
@@ -182,6 +190,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`validatefields${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return validateFields(
@@ -197,6 +206,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`verifywritelog${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return verifyWriteLog(event, collectionSchema);
@@ -216,6 +226,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`fulltextsearch${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
             secrets: [algoliaAdminKey],
         }, (event) => {
@@ -234,6 +245,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`autoincrement${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return autoIncrement(event, collectionSchema, schema);
@@ -243,6 +255,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
     stoker[`validatedenormalized${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return validateDenormalized(event, collectionSchema, schema);
@@ -258,6 +271,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`includefields${collectionNameLower}`] =
         onDocumentUpdated({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return updateIncludeFields(event, collectionSchema, schema);
@@ -273,6 +287,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         }`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return validateRelations(
@@ -295,6 +310,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         }`] =
         onDocumentDeleted({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return removeRelations(
@@ -312,6 +328,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`uniquedelete${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return uniqueDelete(
@@ -324,6 +341,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
     stoker[`deletefiles${collectionNameLower}`] =
         onDocumentDeleted({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return deleteFiles(
@@ -336,6 +354,7 @@ Object.values(schema.collections).forEach((collectionSchema) => {
         stoker[`embedding${collectionNameLower}`] =
         onDocumentWritten({
             document,
+            database: firestoreDatabase,
             retry: true,
         }, (event) => {
             return writeEmbedding(
@@ -401,6 +420,7 @@ if (process.env.STOKER_SMS_ENABLED === "true") {
     const twilioPhoneNumber = defineSecret("TWILIO_PHONE_NUMBER");
     stoker["sendmessage"] = onDocumentCreated({
         document: "system_messages/{messageId}",
+        database: firestoreDatabase,
         retry: true,
         secrets: [twilioAccountSid, twilioAuthToken, twilioPhoneNumber],
     }, (event) => {

package/lib/src/deploy/firestore-ttl/deployTTLs.js

@@ -1,4 +1,5 @@
 import { runChildProcess, initializeFirebase } from "@stoker-platform/node-client";
+import { getFirestoreDatabaseId } from "@stoker-platform/utils";
 import spawn from "cross-spawn";
 import { generateSchema } from "../schema/generateSchema.js";
 import { lintSchema } from "../../lint/lintSchema.js";
@@ -23,6 +24,7 @@ export const deployTTLs = async () => {
                 ttl,
                 `--collection-group=${collectionName}`,
                 "--enable-ttl",
+                `--database=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, projectId)}`,
                 `--project=${projectId}`,
                 "--quiet",
                 "--async",
@@ -41,6 +43,7 @@ export const deployTTLs = async () => {
                 ttl,
                 `--collection-group=${collectionName}`,
                 "--disable-ttl",
+                `--database=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, projectId)}`,
                 `--project=${projectId}`,
                 "--quiet",
                 "--async",
@@ -61,6 +64,7 @@ export const deployTTLs = async () => {
                 "ttls",
                 "list",
                 `--collection-group=${collection}`,
+                `--database=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, projectId)}`,
                 `--project=${projectId}`,
             ]);
             let stdout = "";

package/lib/src/deploy/live-update/liveUpdate.js

@@ -1,9 +1,10 @@
 import { fetchCurrentSchema, initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore, FieldValue } from "firebase-admin/firestore";
+import { FieldValue } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const liveUpdate = async (options) => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const batch = db.batch();
     const currentSchema = await fetchCurrentSchema();
     const deployId = db.collection("system_deployment").doc("latest_deploy").collection("deploy_history").doc().id;

package/lib/src/deploy/maintenance/activateMaintenanceMode.js

@@ -1,8 +1,8 @@
 import { initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../../utils/getCLIFirestore.js";
 export const activateMaintenanceMode = async () => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     await db.collection("system_deployment").doc("maintenance_mode").set({ active: true });
     console.info("MAINTENANCE MODE ENGAGED");
     process.exit();

package/lib/src/deploy/maintenance/disableMaintenanceMode.js

@@ -1,8 +1,8 @@
 import { initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../../utils/getCLIFirestore.js";
 export const disableMaintenanceMode = async () => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     await db.collection("system_deployment").doc("maintenance_mode").set({ active: false });
     console.info("MAINTENANCE MODE DISENGAGED");
     process.exit();

package/lib/src/deploy/maintenance/setDeploymentStatus.js

@@ -1,9 +1,9 @@
 import { initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const setDeploymentStatus = async (status) => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     if (!["idle", "in_progress"].includes(status)) {
         throw new Error("Invalid deployment status");
     }

package/lib/src/deploy/rules-indexes/generateFirestoreIndexes.js

@@ -11,11 +11,12 @@ export const generateFirestoreIndexes = async () => {
     const __dirname = dirname(__filename);
     const schema = await generateSchema();
     await lintSchema(true);
+    const edition = process.env.FB_FIRESTORE_EDITION || "enterprise";
     const indexesResponse = await fetch(process.env.URL_FIRESTORE_INDEXES, {
         headers: {
             "Content-Type": "application/json",
         },
-        body: JSON.stringify({ schema }),
+        body: JSON.stringify({ schema, edition }),
         method: "POST",
     });
     const { indexes, message, error } = await indexesResponse.json();

package/lib/src/migration/firestore/operations/deleteField.js

@@ -1,6 +1,7 @@
-import { getFirestore, FieldValue } from "firebase-admin/firestore";
+import { FieldValue } from "firebase-admin/firestore";
 import { appendFileSync } from "fs";
 import { join } from "path";
+import { getCLIFirestore } from "../../../utils/getCLIFirestore.js";
 export const deleteField = async (currentSchema, lastSchema) => {
     const deletedFields = [];
     const currentSchemaKeys = Object.keys(currentSchema.collections);
@@ -19,7 +20,7 @@ export const deleteField = async (currentSchema, lastSchema) => {
     });
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const filePath = join(process.cwd(), ".migration", process.env.GCP_PROJECT, `v${currentSchema.version.toString()}`);
-    const db = await getFirestore();
+    const db = getCLIFirestore();
     const bulkWriter = db.bulkWriter();
     for (const field of deletedFields) {
         const [collection, fieldName] = field.split(".");

package/lib/src/ops/auditDenormalized.js

@@ -1,14 +1,14 @@
 import { fetchCurrentSchema, initializeStoker } from "@stoker-platform/node-client";
 import { getDependencyIndexFields, getLowercaseFields, getRoleGroups, getSingleFieldRelations, isDependencyField, isRelationField, } from "@stoker-platform/utils";
 import { join } from "node:path";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 import isEqual from "lodash/isEqual.js";
 import isEmpty from "lodash/isEmpty.js";
-import { getFirestore } from "firebase-admin/firestore";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const auditDenormalized = async (options) => {
     await initializeStoker(options.mode || "production", options.tenant, join(process.cwd(), "lib", "main.js"), join(process.cwd(), "lib", "collections"));
     const schema = await fetchCurrentSchema();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     for (const [collectionName, collectionSchema] of Object.entries(schema.collections)) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const collectionData = {};

package/lib/src/ops/auditPermissions.js

@@ -1,12 +1,11 @@
 import { fetchCurrentSchema, initializeStoker } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
 import { join } from "node:path";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const auditPermissions = async (options) => {
     await initializeStoker(options.mode || "production", options.tenant, join(process.cwd(), "lib", "main.js"), join(process.cwd(), "lib", "collections"));
     const schema = await fetchCurrentSchema();
-    const db = getFirestore();
-    const dbMain = getFirestore();
+    const db = getCLIFirestore();
     const mismatches = [];
     const permissions = await db.collection("tenants").doc(options.tenant).collection("system_user_permissions").get();
     for (const authCollection of Object.values(schema.collections)) {
@@ -79,7 +78,7 @@ export const auditPermissions = async (options) => {
     }
     console.log(mismatches.join("\n\n"));
     if (options.email && mismatches.length > 0) {
-        await dbMain.collection("system_mail").add({
+        await db.collection("system_mail").add({
             to: options.email,
             message: {
                 subject: `Stoker Permissions Audit`,

package/lib/src/ops/auditRelations.js

@@ -1,13 +1,13 @@
 import { fetchCurrentSchema, getFirestorePathRef, initializeStoker } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
 import { join } from "node:path";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 import isEqual from "lodash/isEqual.js";
 import { getField, getLowercaseFields, getSingleFieldRelations } from "@stoker-platform/utils";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const auditRelations = async (options) => {
     await initializeStoker(options.mode || "production", options.tenant, join(process.cwd(), "lib", "main.js"), join(process.cwd(), "lib", "collections"));
     const schema = await fetchCurrentSchema();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const tenantPrefix = `tenants/${options.tenant}`;
     const recordByDocumentPath = new Map();
     const collectionDocsByName = new Map();

package/lib/src/ops/explainPreloadQueries.js

@@ -1,13 +1,14 @@
 import { fetchCurrentSchema, getCollectionRefs, initializeStoker } from "@stoker-platform/node-client";
 import { tryPromise, getRange } from "@stoker-platform/utils";
-import { Filter, getFirestore } from "firebase-admin/firestore";
+import { Filter } from "firebase-admin/firestore";
 import { join } from "path";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const explainPreloadQueries = async (options) => {
     const { getGlobalConfigModule } = await initializeStoker("production", options.tenant, join(process.cwd(), "lib", "main.js"), join(process.cwd(), "lib", "collections"));
     const globalConfig = getGlobalConfigModule();
     const schema = await fetchCurrentSchema();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const permissionsSnapshot = await db
         .collection("tenants")
         .doc(options.tenant)

package/lib/src/ops/getUserPermissions.js

@@ -1,9 +1,9 @@
 import { initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const getUserPermissions = async (options) => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const usersRef = await db
         .collection("tenants")
         .doc(options.tenant)

package/lib/src/ops/getUserRecord.js

@@ -1,9 +1,9 @@
 import { initializeFirebase } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const getUserRecord = async (options) => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const usersRef = await db
         .collection("tenants")
         .doc(options.tenant)

package/lib/src/project/addProject.js

@@ -2,7 +2,7 @@ import { runChildProcess } from "@stoker-platform/node-client";
 import { writeFile, unlink, readFile } from "fs/promises";
 import { join } from "path";
 import dotenv from "dotenv";
-import { retryOperation } from "@stoker-platform/utils";
+import { retryOperation, getFirestoreDatabaseId } from "@stoker-platform/utils";
 import { SecretManagerServiceClient } from "@google-cloud/secret-manager";
 import { addTenant } from "./addTenant.js";
 import { existsSync } from "fs";
@@ -277,20 +277,26 @@ export const addProject = async (options) => {
     }
     if (getProgress() < 10) {
         await new Promise((resolve) => setTimeout(resolve, 10000));
+        const args = [
+            "firestore",
+            "databases",
+            "create",
+            `--location=${process.env.FB_FIRESTORE_REGION}`,
+            "--type=firestore-native",
+            process.env.FB_FIRESTORE_EDITION ? `--edition=${process.env.FB_FIRESTORE_EDITION}` : "--edition=enterprise",
+            "--delete-protection",
+            options.pitr && process.env.FB_FIRESTORE_ENABLE_PITR !== "false" ? "--enable-pitr" : "--no-enable-pitr",
+            `--project=${projectId}`,
+            "--quiet",
+        ];
+        if ((process.env.FB_FIRESTORE_EDITION || "enterprise") === "enterprise") {
+            args.push(`--database=${projectId}`);
+            args.push("--enable-firestore-data-access");
+            args.push("--enable-realtime-updates");
+            args.push("--concurrency-mode=pessimistic");
+        }
         await retryOperation(async () => {
-            await runChildProcess("gcloud", [
-                "firestore",
-                "databases",
-                "create",
-                `--location=${process.env.FB_FIRESTORE_REGION}`,
-                "--type=firestore-native",
-                "--delete-protection",
-                options.pitr && process.env.FB_FIRESTORE_ENABLE_PITR !== "false"
-                    ? "--enable-pitr"
-                    : "--no-enable-pitr",
-                `--project=${projectId}`,
-                "--quiet",
-            ]).catch(() => {
+            await runChildProcess("gcloud", args).catch(() => {
                 throw new Error("Error creating Firestore database.");
             });
         }, [], undefined, 5000);
@@ -313,7 +319,7 @@ export const addProject = async (options) => {
                 : process.env.FB_FIRESTORE_BACKUP_RETENTION
                     ? `--retention=${process.env.FB_FIRESTORE_BACKUP_RETENTION}`
                     : "--retention=7d",
-            "--database=(default)",
+            `--database=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, projectId)}`,
             `--project=${projectId}`,
             "--quiet",
         ];
@@ -432,6 +438,18 @@ export const addProject = async (options) => {
             await runChildProcess("attrib", ["-H", firebasercPath]);
         }
         await runChildProcess("firebase", ["target:apply", "storage", "default", projectId, "--project", projectId]);
+        if ((process.env.FB_FIRESTORE_EDITION || "enterprise") === "enterprise") {
+            const firebaseJsonPath = join(process.cwd(), "firebase.json");
+            const firebaseJson = JSON.parse(await readFile(firebaseJsonPath, "utf8"));
+            firebaseJson.firestore = [
+                {
+                    database: projectId,
+                    rules: "firebase-rules/firestore.rules",
+                    indexes: "firebase-rules/firestore.indexes.json",
+                },
+            ];
+            await writeFile(firebaseJsonPath, JSON.stringify(firebaseJson, null, 4), "utf8");
+        }
         await updateProjectData(17);
     }
     if (getProgress() < 18) {
@@ -750,23 +768,31 @@ export const addProject = async (options) => {
     if (getProgress() < 33) {
         const externalSecrets = JSON.parse(process.env.EXTERNAL_SECRETS || "{}");
         for (const [secretName, secretValue] of Object.entries(externalSecrets)) {
-            const [externalSecret] = await secretManager.createSecret({
-                parent: `projects/${projectId}`,
-                secret: {
-                    name: secretName,
-                    replication: {
-                        automatic: {},
+            try {
+                const [externalSecret] = await secretManager.createSecret({
+                    parent: `projects/${projectId}`,
+                    secret: {
+                        name: secretName,
+                        replication: {
+                            automatic: {},
+                        },
                     },
-                },
-                secretId: secretName,
-            });
-            const [secretVersion] = await secretManager.addSecretVersion({
-                parent: externalSecret.name,
-                payload: {
-                    data: Buffer.from(secretValue, "utf8"),
-                },
-            });
-            console.log(secretVersion);
+                    secretId: secretName,
+                });
+                const [secretVersion] = await secretManager.addSecretVersion({
+                    parent: externalSecret.name,
+                    payload: {
+                        data: Buffer.from(secretValue, "utf8"),
+                    },
+                });
+                console.log(secretVersion);
+            }
+            catch (error) {
+                if (error?.code === 6) {
+                    continue;
+                }
+                throw error;
+            }
         }
         await updateProjectData(33);
     }
@@ -951,6 +977,7 @@ STOKER_FB_ENABLE_APP_CHECK=${process.env.FB_ENABLE_APP_CHECK}
 STOKER_FB_APP_CHECK_KEY="${recaptchaKeyId}"
 STOKER_ALGOLIA_ID="${process.env.ALGOLIA_ID || ""}"
 STOKER_FB_FUNCTIONS_REGION="${process.env.FB_FUNCTIONS_REGION}"
+STOKER_FB_FIRESTORE_EDITION="${process.env.FB_FIRESTORE_EDITION || "enterprise"}"
 FB_DATABASE="${projectId}-default-rtdb"
 FB_FIRESTORE_EXPORT_BUCKET="${projectId}-export"`;
     if (process.env.SENTRY_DSN && !options.development) {

package/lib/src/project/addTenant.js

@@ -1,12 +1,12 @@
 import { input } from "@inquirer/prompts";
 import { fetchCurrentSchema, initializeFirebase, initializeStoker } from "@stoker-platform/node-client";
-import { getFirestore } from "firebase-admin/firestore";
 import { join } from "path";
 import { retryOperation, isRelationField } from "@stoker-platform/utils";
 import { addRecordPrompt } from "./addRecordPrompt.js";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 export const addTenant = async () => {
     await initializeFirebase();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const doc = await db.collection("tenants").add({});
     const tenantId = doc.id;
     await initializeStoker("production", tenantId, join(process.cwd(), "lib", "main.js"), join(process.cwd(), "lib", "collections"));

package/lib/src/project/deleteTenant.js

@@ -1,14 +1,14 @@
 import { fetchCurrentSchema, initializeFirebase } from "@stoker-platform/node-client";
 import { getAuth } from "firebase-admin/auth";
-import { getFirestore } from "firebase-admin/firestore";
-import { getStorage } from "firebase-admin/storage";
 import { getApp } from "firebase-admin/app";
+import { getStorage } from "firebase-admin/storage";
+import { getCLIFirestore } from "../utils/getCLIFirestore.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const deleteTenant = async (options) => {
     await initializeFirebase();
     const app = getApp();
     const auth = getAuth();
-    const db = getFirestore();
+    const db = getCLIFirestore();
     const storage = getStorage();
     const schema = await fetchCurrentSchema();
     const users = await db.collection("tenants").doc(options.tenant).collection("system_user_permissions").get();

package/lib/src/utils/getCliFirestore.js

@@ -0,0 +1,8 @@
+import { getApp } from "firebase-admin/app";
+import { getFirestore } from "firebase-admin/firestore";
+import { getFirestoreDatabaseId } from "@stoker-platform/utils";
+export const getCLIFirestore = (app) => {
+    return getFirestore(app || getApp(), 
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, process.env.GCP_PROJECT));
+};

package/lib/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/main.ts","../src/data/exporttobigquery.ts","../src/data/seeddata.ts","../src/deploy/deployproject.ts","../src/deploy/cloud-functions/getfunctionsdata.ts","../src/deploy/firestore-export/exportfirestoredata.ts","../src/deploy/firestore-ttl/deployttls.ts","../src/deploy/live-update/liveupdate.ts","../src/deploy/maintenance/activatemaintenancemode.ts","../src/deploy/maintenance/disablemaintenancemode.ts","../src/deploy/maintenance/setdeploymentstatus.ts","../src/deploy/rules-indexes/generatefirestoreindexes.ts","../src/deploy/rules-indexes/generatefirestorerules.ts","../src/deploy/rules-indexes/generatestoragerules.ts","../src/deploy/schema/applyschema.ts","../src/deploy/schema/generateschema.ts","../src/deploy/schema/persistschema.ts","../src/deploy/schema/updateliveschema.ts","../src/lint/lintschema.ts","../src/lint/securityreport.ts","../src/migration/migrateall.ts","../src/migration/firestore/migratefirestore.ts","../src/migration/firestore/operations/deletefield.ts","../src/ops/auditdenormalized.ts","../src/ops/auditpermissions.ts","../src/ops/auditrelations.ts","../src/ops/explainpreloadqueries.ts","../src/ops/getuser.ts","../src/ops/getuserpermissions.ts","../src/ops/getuserrecord.ts","../src/ops/listprojects.ts","../src/ops/setusercollection.ts","../src/ops/setuserdocument.ts","../src/ops/setuserrole.ts","../src/project/addproject.ts","../src/project/addrecord.ts","../src/project/addrecordprompt.ts","../src/project/addtenant.ts","../src/project/buildwebapp.ts","../src/project/customdomain.ts","../src/project/deleteproject.ts","../src/project/deleterecord.ts","../src/project/deletetenant.ts","../src/project/getone.ts","../src/project/getsome.ts","../src/project/initproject.ts","../src/project/prepareemulatordata.ts","../src/project/setproject.ts","../src/project/startemulators.ts","../src/project/updaterecord.ts","../src/types/generatetypes.ts"],"version":"6.0.3"}
+{"root":["../src/main.ts","../src/data/exporttobigquery.ts","../src/data/seeddata.ts","../src/deploy/deployproject.ts","../src/deploy/cloud-functions/getfunctionsdata.ts","../src/deploy/firestore-export/exportfirestoredata.ts","../src/deploy/firestore-ttl/deployttls.ts","../src/deploy/live-update/liveupdate.ts","../src/deploy/maintenance/activatemaintenancemode.ts","../src/deploy/maintenance/disablemaintenancemode.ts","../src/deploy/maintenance/setdeploymentstatus.ts","../src/deploy/rules-indexes/generatefirestoreindexes.ts","../src/deploy/rules-indexes/generatefirestorerules.ts","../src/deploy/rules-indexes/generatestoragerules.ts","../src/deploy/schema/applyschema.ts","../src/deploy/schema/generateschema.ts","../src/deploy/schema/persistschema.ts","../src/deploy/schema/updateliveschema.ts","../src/lint/lintschema.ts","../src/lint/securityreport.ts","../src/migration/migrateall.ts","../src/migration/firestore/migratefirestore.ts","../src/migration/firestore/operations/deletefield.ts","../src/ops/auditdenormalized.ts","../src/ops/auditpermissions.ts","../src/ops/auditrelations.ts","../src/ops/explainpreloadqueries.ts","../src/ops/getuser.ts","../src/ops/getuserpermissions.ts","../src/ops/getuserrecord.ts","../src/ops/listprojects.ts","../src/ops/setusercollection.ts","../src/ops/setuserdocument.ts","../src/ops/setuserrole.ts","../src/project/addproject.ts","../src/project/addrecord.ts","../src/project/addrecordprompt.ts","../src/project/addtenant.ts","../src/project/buildwebapp.ts","../src/project/customdomain.ts","../src/project/deleteproject.ts","../src/project/deleterecord.ts","../src/project/deletetenant.ts","../src/project/getone.ts","../src/project/getsome.ts","../src/project/initproject.ts","../src/project/prepareemulatordata.ts","../src/project/setproject.ts","../src/project/startemulators.ts","../src/project/updaterecord.ts","../src/types/generatetypes.ts","../src/utils/getclifirestore.ts"],"version":"6.0.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.101",
+    "version": "0.5.102",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.2",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.5.2",
-        "@stoker-platform/node-client": "0.5.67",
-        "@stoker-platform/types": "0.5.46",
-        "@stoker-platform/utils": "0.5.58",
+        "@stoker-platform/node-client": "0.5.68",
+        "@stoker-platform/types": "0.5.47",
+        "@stoker-platform/utils": "0.5.59",
         "algoliasearch": "^5.53.0",
         "commander": "^15.0.0",
         "cross-spawn": "^7.0.6",