@cipherstash/stack 0.3.0 → 0.5.0

package/dist/bin/stash.js

@@ -1125,13 +1125,71 @@ var Y2 = ({ indicator: t = "dots" } = {}) => {
   } };
 };
 
-// src/bin/commands/init/types.ts
-var CancelledError = class extends Error {
-  constructor() {
-    super("cancelled");
-    this.name = "CancelledError";
-  }
-};
+// src/bin/commands/init/providers/base.ts
+function createBaseProvider() {
+  return {
+    name: "base",
+    introMessage: "Setting up CipherStash for your project...",
+    connectionOptions: [
+      { value: "drizzle", label: "Drizzle ORM", hint: "recommended" },
+      { value: "prisma", label: "Prisma" },
+      { value: "raw-sql", label: "Raw SQL / pg" }
+    ],
+    getNextSteps(state) {
+      const steps = [
+        "Install @cipherstash/stack: npm install @cipherstash/stack"
+      ];
+      if (state.connectionMethod === "drizzle") {
+        steps.push("Import encryptedType from @cipherstash/stack/drizzle");
+      } else if (state.connectionMethod === "prisma") {
+        steps.push("Set up Prisma with @cipherstash/stack");
+      }
+      steps.push(
+        "Define your encrypted schema",
+        "Read the docs: https://docs.cipherstash.com"
+      );
+      return steps;
+    }
+  };
+}
+
+// src/bin/commands/init/providers/supabase.ts
+function createSupabaseProvider() {
+  return {
+    name: "supabase",
+    introMessage: "Setting up CipherStash for your Supabase project...",
+    connectionOptions: [
+      {
+        value: "supabase-js",
+        label: "Supabase JS Client",
+        hint: "recommended"
+      },
+      { value: "drizzle", label: "Drizzle ORM" },
+      { value: "prisma", label: "Prisma" },
+      { value: "raw-sql", label: "Raw SQL / pg" }
+    ],
+    getNextSteps(state) {
+      const steps = [
+        "Install @cipherstash/stack: npm install @cipherstash/stack"
+      ];
+      if (state.connectionMethod === "supabase-js") {
+        steps.push("Import encryptedSupabase from @cipherstash/stack/supabase");
+      } else if (state.connectionMethod === "drizzle") {
+        steps.push("Import encryptedType from @cipherstash/stack/drizzle");
+      } else if (state.connectionMethod === "prisma") {
+        steps.push("Set up Prisma with @cipherstash/stack");
+      }
+      steps.push(
+        "Define your encrypted schema",
+        "Supabase guides: https://cipherstash.com/docs/supabase/encrypt-user-data",
+        "Multi-tenant encryption: https://docs.cipherstash.com/docs/multi-tenant",
+        "Migrating existing data: https://docs.cipherstash.com/docs/migration",
+        "Need help? #supabase in Discord or support@cipherstash.com"
+      );
+      return steps;
+    }
+  };
+}
 
 // src/bin/commands/init/stubs.ts
 function delay(ms) {
@@ -1174,6 +1232,14 @@ async function installEqlExtension(databaseUrl) {
   await delay(1500);
 }
 
+// src/bin/commands/init/types.ts
+var CancelledError = class extends Error {
+  constructor() {
+    super("cancelled");
+    this.name = "CancelledError";
+  }
+};
+
 // src/bin/commands/init/steps/authenticate.ts
 var authenticateStep = {
   id: "authenticate",
@@ -1195,78 +1261,6 @@ Code:  ${userCode}`,
   }
 };
 
-// src/bin/commands/init/steps/select-workspace.ts
-var selectWorkspaceStep = {
-  id: "select-workspace",
-  name: "Select workspace",
-  async run(state, _provider) {
-    const s = Y2();
-    s.start("Loading workspaces...");
-    const workspaces = await fetchWorkspaces(state.accessToken);
-    s.stop("Workspaces loaded");
-    const options = [
-      ...workspaces.map((ws2) => ({ value: ws2.id, label: ws2.name })),
-      { value: "__create__", label: "Create new workspace" }
-    ];
-    const selected = await ve({
-      message: "Select a workspace",
-      options
-    });
-    if (pD(selected)) throw new CancelledError();
-    if (selected === "__create__") {
-      const name = await he({
-        message: "What should we call your new workspace?",
-        placeholder: "my-project",
-        validate: (val) => {
-          if (!val.trim()) return "Workspace name is required";
-        }
-      });
-      if (pD(name)) throw new CancelledError();
-      const s2 = Y2();
-      s2.start("Creating workspace...");
-      const ws2 = await createWorkspace(state.accessToken, name);
-      s2.stop(`Workspace created: ${ws2.name}`);
-      return { ...state, workspaceId: ws2.id, workspaceName: ws2.name };
-    }
-    const ws = workspaces.find((w2) => w2.id === selected);
-    return { ...state, workspaceId: ws.id, workspaceName: ws.name };
-  }
-};
-
-// src/bin/commands/init/steps/select-region.ts
-var REGIONS = [
-  { value: "ap-southeast-2", label: "Asia Pacific (Sydney)" },
-  { value: "us-east-1", label: "US East (N. Virginia)" },
-  { value: "us-west-2", label: "US West (Oregon)" },
-  { value: "eu-west-1", label: "Europe (Ireland)" }
-];
-var selectRegionStep = {
-  id: "select-region",
-  name: "Select region",
-  async run(state, _provider) {
-    const region = await ve({
-      message: "Where should we create your workspace?",
-      options: REGIONS
-    });
-    if (pD(region)) throw new CancelledError();
-    return { ...state, region };
-  }
-};
-
-// src/bin/commands/init/steps/select-connection.ts
-var selectConnectionStep = {
-  id: "select-connection",
-  name: "Select connection method",
-  async run(state, provider) {
-    const method = await ve({
-      message: "How will you connect to your database?",
-      options: provider.connectionOptions
-    });
-    if (pD(method)) throw new CancelledError();
-    return { ...state, connectionMethod: method };
-  }
-};
-
 // src/bin/commands/init/steps/detect-database-url.ts
 function maskUrl(url) {
   return url.replace(/:\/\/([^:]+):([^@]+)@/, "://***@");
@@ -1296,7 +1290,8 @@ var detectDatabaseUrlStep = {
         placeholder: "postgresql://user:password@host:5432/database",
         validate: (val) => {
           if (!val.trim()) return "Database URL is required";
-          if (!val.startsWith("postgres")) return "Must be a PostgreSQL connection string";
+          if (!val.startsWith("postgres"))
+            return "Must be a PostgreSQL connection string";
         }
       });
       if (pD(url)) throw new CancelledError();
@@ -1358,67 +1353,77 @@ var nextStepsStep = {
   }
 };
 
-// src/bin/commands/init/providers/supabase.ts
-function createSupabaseProvider() {
-  return {
-    name: "supabase",
-    introMessage: "Setting up CipherStash for your Supabase project...",
-    connectionOptions: [
-      { value: "supabase-js", label: "Supabase JS Client", hint: "recommended" },
-      { value: "drizzle", label: "Drizzle ORM" },
-      { value: "prisma", label: "Prisma" },
-      { value: "raw-sql", label: "Raw SQL / pg" }
-    ],
-    getNextSteps(state) {
-      const steps = [
-        "Install @cipherstash/stack: npm install @cipherstash/stack"
-      ];
-      if (state.connectionMethod === "supabase-js") {
-        steps.push("Import encryptedSupabase from @cipherstash/stack/supabase");
-      } else if (state.connectionMethod === "drizzle") {
-        steps.push("Import encryptedType from @cipherstash/stack/drizzle");
-      } else if (state.connectionMethod === "prisma") {
-        steps.push("Set up Prisma with @cipherstash/stack");
-      }
-      steps.push(
-        "Define your encrypted schema",
-        "Supabase guides: https://cipherstash.com/docs/supabase/encrypt-user-data",
-        "Multi-tenant encryption: https://docs.cipherstash.com/docs/multi-tenant",
-        "Migrating existing data: https://docs.cipherstash.com/docs/migration",
-        "Need help? #supabase in Discord or support@cipherstash.com"
-      );
-      return steps;
-    }
-  };
-}
+// src/bin/commands/init/steps/select-connection.ts
+var selectConnectionStep = {
+  id: "select-connection",
+  name: "Select connection method",
+  async run(state, provider) {
+    const method = await ve({
+      message: "How will you connect to your database?",
+      options: provider.connectionOptions
+    });
+    if (pD(method)) throw new CancelledError();
+    return { ...state, connectionMethod: method };
+  }
+};
 
-// src/bin/commands/init/providers/base.ts
-function createBaseProvider() {
-  return {
-    name: "base",
-    introMessage: "Setting up CipherStash for your project...",
-    connectionOptions: [
-      { value: "drizzle", label: "Drizzle ORM", hint: "recommended" },
-      { value: "prisma", label: "Prisma" },
-      { value: "raw-sql", label: "Raw SQL / pg" }
-    ],
-    getNextSteps(state) {
-      const steps = [
-        "Install @cipherstash/stack: npm install @cipherstash/stack"
-      ];
-      if (state.connectionMethod === "drizzle") {
-        steps.push("Import encryptedType from @cipherstash/stack/drizzle");
-      } else if (state.connectionMethod === "prisma") {
-        steps.push("Set up Prisma with @cipherstash/stack");
-      }
-      steps.push(
-        "Define your encrypted schema",
-        "Read the docs: https://docs.cipherstash.com"
-      );
-      return steps;
+// src/bin/commands/init/steps/select-region.ts
+var REGIONS = [
+  { value: "ap-southeast-2", label: "Asia Pacific (Sydney)" },
+  { value: "us-east-1", label: "US East (N. Virginia)" },
+  { value: "us-west-2", label: "US West (Oregon)" },
+  { value: "eu-west-1", label: "Europe (Ireland)" }
+];
+var selectRegionStep = {
+  id: "select-region",
+  name: "Select region",
+  async run(state, _provider) {
+    const region = await ve({
+      message: "Where should we create your workspace?",
+      options: REGIONS
+    });
+    if (pD(region)) throw new CancelledError();
+    return { ...state, region };
+  }
+};
+
+// src/bin/commands/init/steps/select-workspace.ts
+var selectWorkspaceStep = {
+  id: "select-workspace",
+  name: "Select workspace",
+  async run(state, _provider) {
+    const s = Y2();
+    s.start("Loading workspaces...");
+    const workspaces = await fetchWorkspaces(state.accessToken);
+    s.stop("Workspaces loaded");
+    const options = [
+      ...workspaces.map((ws2) => ({ value: ws2.id, label: ws2.name })),
+      { value: "__create__", label: "Create new workspace" }
+    ];
+    const selected = await ve({
+      message: "Select a workspace",
+      options
+    });
+    if (pD(selected)) throw new CancelledError();
+    if (selected === "__create__") {
+      const name = await he({
+        message: "What should we call your new workspace?",
+        placeholder: "my-project",
+        validate: (val) => {
+          if (!val.trim()) return "Workspace name is required";
+        }
+      });
+      if (pD(name)) throw new CancelledError();
+      const s2 = Y2();
+      s2.start("Creating workspace...");
+      const ws2 = await createWorkspace(state.accessToken, name);
+      s2.stop(`Workspace created: ${ws2.name}`);
+      return { ...state, workspaceId: ws2.id, workspaceName: ws2.name };
     }
-  };
-}
+    const ws = workspaces.find((w2) => w2.id === selected);
+    return { ...state, workspaceId: ws.id, workspaceName: ws.name };
+  }
+};
 
 // src/bin/commands/init/index.ts
 var PROVIDER_MAP = {
@@ -1470,15 +1475,9 @@ function encryptedToPgComposite(obj) {
   };
 }
 function encryptedToCompositeLiteral(obj) {
-  if (obj === null) {
-    throw new Error("encryptedToCompositeLiteral: obj cannot be null");
-  }
   return `(${JSON.stringify(JSON.stringify(obj))})`;
 }
 function encryptedToEscapedCompositeLiteral(obj) {
-  if (obj === null) {
-    throw new Error("encryptedToEscapedCompositeLiteral: obj cannot be null");
-  }
   return JSON.stringify(encryptedToCompositeLiteral(obj));
 }
 function formatEncryptedResult(encrypted, returnType) {
@@ -1507,18 +1506,9 @@ function isEncryptedPayload(value) {
   return true;
 }
 
-// src/errors/index.ts
-var EncryptionErrorTypes = {
-  ClientInitError: "ClientInitError",
-  EncryptionError: "EncryptionError",
-  DecryptionError: "DecryptionError",
-  LockContextError: "LockContextError",
-  CtsTokenError: "CtsTokenError"
-};
-
 // src/schema/index.ts
 import { z as z2 } from "zod";
-var castAsEnum = z2.enum(["bigint", "boolean", "date", "number", "string", "json"]).default("string");
+var castAsEnum = z2.enum(["bigint", "boolean", "date", "number", "string", "json", "text"]).default("text");
 var tokenFilterSchema = z2.object({
   kind: z2.literal("downcase")
 });
@@ -1566,7 +1556,7 @@ var EncryptedField = class {
   castAsValue;
   constructor(valueName) {
     this.valueName = valueName;
-    this.castAsValue = "string";
+    this.castAsValue = "text";
   }
   /**
    * Set or override the plaintext data type for this field.
@@ -1575,7 +1565,7 @@ var EncryptedField = class {
    * a different type so the encryption layer knows how to encode the plaintext
    * before encrypting.
    *
-   * @param castAs - The plaintext data type: `'string'`, `'number'`, `'boolean'`, `'date'`, `'bigint'`, or `'json'`.
+   * @param castAs - The plaintext data type: `'string'`, `'number'`, `'boolean'`, `'date'`, `'text'`, `'bigint'`, or `'json'`.
    * @returns This `EncryptedField` instance for method chaining.
    *
    * @example
@@ -1591,7 +1581,7 @@ var EncryptedField = class {
   }
   build() {
     return {
-      cast_as: this.castAsValue,
+      cast_as: this.castAsValue === "string" ? "text" : this.castAsValue,
       indexes: {}
     };
   }
@@ -1745,7 +1735,7 @@ var EncryptedColumn = class {
   }
   build() {
     return {
-      cast_as: this.castAsValue,
+      cast_as: this.castAsValue === "string" ? "text" : this.castAsValue,
       indexes: this.indexesValue
     };
   }
@@ -1840,6 +1830,15 @@ function buildEncryptConfig(...protectTables) {
   return config3;
 }
 
+// src/errors/index.ts
+var EncryptionErrorTypes = {
+  ClientInitError: "ClientInitError",
+  EncryptionError: "EncryptionError",
+  DecryptionError: "DecryptionError",
+  LockContextError: "LockContextError",
+  CtsTokenError: "CtsTokenError"
+};
+
 // src/utils/config/index.ts
 import fs from "node:fs";
 import path from "node:path";
@@ -1904,26 +1903,34 @@ function loadWorkSpaceId(suppliedCrn) {
 }
 
 // src/utils/logger/index.ts
-import { initLogger, createRequestLogger } from "evlog";
-function samplingFromEnv() {
-  const env = process.env.STASH_LOG_LEVEL;
-  if (!env) return void 0;
-  const levels = ["debug", "info", "warn", "error"];
-  const idx = levels.indexOf(env);
-  if (idx === -1) return void 0;
-  return Object.fromEntries(levels.map((l2, i) => [l2, i >= idx ? 100 : 0]));
+import { createRequestLogger, initLogger } from "evlog";
+var validLevels = ["debug", "info", "error"];
+function levelFromEnv() {
+  const env = process.env.STASH_STACK_LOG;
+  if (env && validLevels.includes(env)) return env;
+  return "error";
+}
+function samplingRatesForLevel(level) {
+  switch (level) {
+    case "debug":
+      return { debug: 100, info: 100, warn: 100, error: 100 };
+    case "info":
+      return { debug: 0, info: 100, warn: 100, error: 100 };
+    case "error":
+    default:
+      return { debug: 0, info: 0, warn: 0, error: 100 };
+  }
 }
 var initialized = false;
-function initStackLogger(config3) {
+function initStackLogger() {
   if (initialized) return;
   initialized = true;
-  const rates = samplingFromEnv();
+  const level = levelFromEnv();
+  const rates = samplingRatesForLevel(level);
   initLogger({
     env: { service: "@cipherstash/stack" },
-    enabled: config3?.enabled ?? !!rates,
-    pretty: config3?.pretty,
-    ...rates && { sampling: { rates } },
-    ...config3?.drain && { drain: config3.drain }
+    enabled: true,
+    sampling: { rates }
   });
 }
 initStackLogger();
@@ -1961,6 +1968,7 @@ var logger = {
 // src/encryption/index.ts
 import { withResult as withResult11 } from "@byteslice/result";
 import { newClient } from "@cipherstash/protect-ffi";
+import { validate as uuidValidate } from "uuid";
 
 // src/encryption/helpers/type-guards.ts
 function isScalarQueryTermArray(value) {
@@ -2120,18 +2128,6 @@ var EncryptionOperation = class {
 };
 
 // src/encryption/operations/batch-encrypt-query.ts
-function filterNullTerms(terms) {
-  const nullIndices = /* @__PURE__ */ new Set();
-  const nonNullTerms = [];
-  terms.forEach((term, index) => {
-    if (term.value === null || term.value === void 0) {
-      nullIndices.add(index);
-    } else {
-      nonNullTerms.push({ term, originalIndex: index });
-    }
-  });
-  return { nullIndices, nonNullTerms };
-}
 function buildQueryPayload(term, lockContext) {
   assertValidNumericValue(term.value);
   const { indexType, queryOp } = resolveIndexType(
@@ -2152,13 +2148,10 @@ function buildQueryPayload(term, lockContext) {
   }
   return payload;
 }
-function assembleResults(totalLength, encryptedValues, nonNullTerms) {
-  const results = new Array(totalLength).fill(null);
-  nonNullTerms.forEach(({ term, originalIndex }, i) => {
-    const encrypted = encryptedValues[i];
-    results[originalIndex] = formatEncryptedResult(encrypted, term.returnType);
-  });
-  return results;
+function assembleResults(terms, encryptedValues) {
+  return terms.map(
+    (term, i) => formatEncryptedResult(encryptedValues[i], term.returnType)
+  );
 }
 var BatchEncryptQueryOperation = class extends EncryptionOperation {
   constructor(client, terms) {
@@ -2185,23 +2178,18 @@ var BatchEncryptQueryOperation = class extends EncryptionOperation {
       log.emit();
       return { data: [] };
     }
-    const { nullIndices, nonNullTerms } = filterNullTerms(this.terms);
-    if (nonNullTerms.length === 0) {
-      log.emit();
-      return { data: this.terms.map(() => null) };
-    }
     const result = await withResult(
       async () => {
         if (!this.client) throw noClientError();
         const { metadata } = this.getAuditData();
-        const queries = nonNullTerms.map(
-          ({ term }) => buildQueryPayload(term)
+        const queries = this.terms.map(
+          (term) => buildQueryPayload(term)
         );
         const encrypted = await ffiEncryptQueryBulk(this.client, {
           queries,
           unverifiedContext: metadata
         });
-        return assembleResults(this.terms.length, encrypted, nonNullTerms);
+        return assembleResults(this.terms, encrypted);
       },
       (error) => {
         log.set({ errorCode: getErrorCode(error) ?? "unknown" });
@@ -2235,11 +2223,6 @@ var BatchEncryptQueryOperationWithLockContext = class extends EncryptionOperatio
       log.emit();
       return { data: [] };
     }
-    const { nullIndices, nonNullTerms } = filterNullTerms(this.terms);
-    if (nonNullTerms.length === 0) {
-      log.emit();
-      return { data: this.terms.map(() => null) };
-    }
     const lockContextResult = await this.lockContext.getLockContext();
     if (lockContextResult.failure) {
       log.emit();
@@ -2250,15 +2233,15 @@ var BatchEncryptQueryOperationWithLockContext = class extends EncryptionOperatio
       async () => {
         if (!this.client) throw noClientError();
         const { metadata } = this.getAuditData();
-        const queries = nonNullTerms.map(
-          ({ term }) => buildQueryPayload(term, context)
+        const queries = this.terms.map(
+          (term) => buildQueryPayload(term, context)
         );
         const encrypted = await ffiEncryptQueryBulk(this.client, {
           queries,
           serviceToken: ctsToken,
           unverifiedContext: metadata
         });
-        return assembleResults(this.terms.length, encrypted, nonNullTerms);
+        return assembleResults(this.terms, encrypted);
       },
       (error) => {
         log.set({ errorCode: getErrorCode(error) ?? "unknown" });
@@ -2280,42 +2263,25 @@ import {
   decryptBulkFallible
 } from "@cipherstash/protect-ffi";
 var createDecryptPayloads = (encryptedPayloads, lockContext) => {
-  return encryptedPayloads.map((item, index) => ({ ...item, originalIndex: index })).filter(({ data }) => data !== null).map(({ id, data, originalIndex }) => ({
+  return encryptedPayloads.map(({ id, data }) => ({
     id,
     ciphertext: data,
-    originalIndex,
     ...lockContext && { lockContext }
   }));
 };
-var createNullResult = (encryptedPayloads) => {
-  return encryptedPayloads.map(({ id }) => ({
-    id,
-    data: null
-  }));
-};
 var mapDecryptedDataToResult = (encryptedPayloads, decryptedData) => {
-  const result = new Array(encryptedPayloads.length);
-  let decryptedIndex = 0;
-  for (let i = 0; i < encryptedPayloads.length; i++) {
-    if (encryptedPayloads[i].data === null) {
-      result[i] = { id: encryptedPayloads[i].id, data: null };
-    } else {
-      const decryptResult = decryptedData[decryptedIndex];
-      if ("error" in decryptResult) {
-        result[i] = {
-          id: encryptedPayloads[i].id,
-          error: decryptResult.error
-        };
-      } else {
-        result[i] = {
-          id: encryptedPayloads[i].id,
-          data: decryptResult.data
-        };
-      }
-      decryptedIndex++;
+  return decryptedData.map((decryptResult, i) => {
+    if ("error" in decryptResult) {
+      return {
+        id: encryptedPayloads[i].id,
+        error: decryptResult.error
+      };
     }
-  }
-  return result;
+    return {
+      id: encryptedPayloads[i].id,
+      data: decryptResult.data
+    };
+  });
 };
 var BulkDecryptOperation = class extends EncryptionOperation {
   client;
@@ -2340,13 +2306,10 @@ var BulkDecryptOperation = class extends EncryptionOperation {
         if (!this.client) throw noClientError();
         if (!this.encryptedPayloads || this.encryptedPayloads.length === 0)
           return [];
-        const nonNullPayloads = createDecryptPayloads(this.encryptedPayloads);
-        if (nonNullPayloads.length === 0) {
-          return createNullResult(this.encryptedPayloads);
-        }
+        const payloads = createDecryptPayloads(this.encryptedPayloads);
         const { metadata } = this.getAuditData();
         const decryptedData = await decryptBulkFallible(this.client, {
-          ciphertexts: nonNullPayloads,
+          ciphertexts: payloads,
           unverifiedContext: metadata
         });
         return mapDecryptedDataToResult(this.encryptedPayloads, decryptedData);
@@ -2398,16 +2361,13 @@ var BulkDecryptOperationWithLockContext = class extends EncryptionOperation {
         if (context.failure) {
           throw new Error(`[encryption]: ${context.failure.message}`);
         }
-        const nonNullPayloads = createDecryptPayloads(
+        const payloads = createDecryptPayloads(
           encryptedPayloads,
           context.data.context
         );
-        if (nonNullPayloads.length === 0) {
-          return createNullResult(encryptedPayloads);
-        }
         const { metadata } = this.getAuditData();
         const decryptedData = await decryptBulkFallible(client, {
-          ciphertexts: nonNullPayloads,
+          ciphertexts: payloads,
           serviceToken: context.data.ctsToken,
           unverifiedContext: metadata
         });
@@ -3049,34 +3009,14 @@ var BulkDecryptModelsOperationWithLockContext = class extends EncryptionOperatio
 import { withResult as withResult4 } from "@byteslice/result";
 import { encryptBulk as encryptBulk2 } from "@cipherstash/protect-ffi";
 var createEncryptPayloads = (plaintexts, column, table, lockContext) => {
-  return plaintexts.map((item, index) => ({ ...item, originalIndex: index })).filter(({ plaintext }) => plaintext !== null).map(({ id, plaintext, originalIndex }) => ({
+  return plaintexts.map(({ id, plaintext }) => ({
     id,
     plaintext,
     column: column.getName(),
     table: table.tableName,
-    originalIndex,
     ...lockContext && { lockContext }
   }));
 };
-var createNullResult2 = (plaintexts) => {
-  return plaintexts.map(({ id }) => ({ id, data: null }));
-};
-var mapEncryptedDataToResult = (plaintexts, encryptedData) => {
-  const result = new Array(plaintexts.length);
-  let encryptedIndex = 0;
-  for (let i = 0; i < plaintexts.length; i++) {
-    if (plaintexts[i].plaintext === null) {
-      result[i] = { id: plaintexts[i].id, data: null };
-    } else {
-      result[i] = {
-        id: plaintexts[i].id,
-        data: encryptedData[encryptedIndex]
-      };
-      encryptedIndex++;
-    }
-  }
-  return result;
-};
 var BulkEncryptOperation = class extends EncryptionOperation {
   client;
   plaintexts;
@@ -3109,20 +3049,20 @@ var BulkEncryptOperation = class extends EncryptionOperation {
         if (!this.plaintexts || this.plaintexts.length === 0) {
           return [];
         }
-        const nonNullPayloads = createEncryptPayloads(
+        const payloads = createEncryptPayloads(
           this.plaintexts,
           this.column,
           this.table
         );
-        if (nonNullPayloads.length === 0) {
-          return createNullResult2(this.plaintexts);
-        }
         const { metadata } = this.getAuditData();
         const encryptedData = await encryptBulk2(this.client, {
-          plaintexts: nonNullPayloads,
+          plaintexts: payloads,
           unverifiedContext: metadata
         });
-        return mapEncryptedDataToResult(this.plaintexts, encryptedData);
+        return encryptedData.map((data, i) => ({
+          id: this.plaintexts[i].id,
+          data
+        }));
       },
       (error) => {
         log.set({ errorCode: getErrorCode(error) ?? "unknown" });
@@ -3179,22 +3119,22 @@ var BulkEncryptOperationWithLockContext = class extends EncryptionOperation {
         if (context.failure) {
           throw new Error(`[encryption]: ${context.failure.message}`);
         }
-        const nonNullPayloads = createEncryptPayloads(
+        const payloads = createEncryptPayloads(
           plaintexts,
           column,
           table,
           context.data.context
         );
-        if (nonNullPayloads.length === 0) {
-          return createNullResult2(plaintexts);
-        }
         const { metadata } = this.getAuditData();
         const encryptedData = await encryptBulk2(client, {
-          plaintexts: nonNullPayloads,
+          plaintexts: payloads,
           serviceToken: context.data.ctsToken,
           unverifiedContext: metadata
         });
-        return mapEncryptedDataToResult(plaintexts, encryptedData);
+        return encryptedData.map((data, i) => ({
+          id: plaintexts[i].id,
+          data
+        }));
       },
       (error) => {
         log.set({ errorCode: getErrorCode(error) ?? "unknown" });
@@ -3346,9 +3286,6 @@ var DecryptOperation = class extends EncryptionOperation {
         if (!this.client) {
           throw noClientError();
         }
-        if (this.encryptedData === null) {
-          return null;
-        }
         const { metadata } = this.getAuditData();
         return await ffiDecrypt(this.client, {
           ciphertext: this.encryptedData,
@@ -3399,9 +3336,6 @@ var DecryptOperationWithLockContext = class extends EncryptionOperation {
         if (!client) {
           throw noClientError();
         }
-        if (encryptedData === null) {
-          return null;
-        }
         const { metadata } = this.getAuditData();
         const context = await this.lockContext.getLockContext();
         if (context.failure) {
@@ -3557,9 +3491,6 @@ var EncryptOperation = class extends EncryptionOperation {
         if (!this.client) {
           throw noClientError();
         }
-        if (this.plaintext === null) {
-          return null;
-        }
         if (typeof this.plaintext === "number" && Number.isNaN(this.plaintext)) {
           throw new Error("[encryption]: Cannot encrypt NaN value");
         }
@@ -3621,9 +3552,6 @@ var EncryptOperationWithLockContext = class extends EncryptionOperation {
         if (!client) {
           throw noClientError();
         }
-        if (plaintext === null) {
-          return null;
-        }
         const { metadata } = this.getAuditData();
         const context = await this.lockContext.getLockContext();
         if (context.failure) {
@@ -3789,10 +3717,6 @@ var EncryptQueryOperation = class extends EncryptionOperation {
       queryType: this.opts.queryType,
       lockContext: false
     });
-    if (this.plaintext === null || this.plaintext === void 0) {
-      log.emit();
-      return { data: null };
-    }
     const validationError = validateNumericValue(this.plaintext);
     if (validationError?.failure) {
       log.emit();
@@ -3856,10 +3780,6 @@ var EncryptQueryOperationWithLockContext = class extends EncryptionOperation {
       queryType: this.opts.queryType,
       lockContext: true
     });
-    if (this.plaintext === null || this.plaintext === void 0) {
-      log.emit();
-      return { data: null };
-    }
     const validationError = validateNumericValue(this.plaintext);
     if (validationError?.failure) {
       log.emit();
@@ -3964,7 +3884,7 @@ var EncryptionClient = class {
   /**
    * Encrypt a value - returns a promise which resolves to an encrypted value.
    *
-   * @param plaintext - The plaintext value to be encrypted. Can be null.
+   * @param plaintext - The plaintext value to be encrypted.
    * @param opts - Options specifying the column (or nested field) and table for encryption. See {@link EncryptOptions}.
    * @returns An EncryptOperation that can be awaited or chained with additional methods.
    *
@@ -4265,7 +4185,7 @@ var EncryptionClient = class {
    *
    * Each value is encrypted with its own unique key via a single call to ZeroKMS.
    * Values can include optional `id` fields for correlating results back to
-   * your application data. Null plaintext values are preserved as null.
+   * your application data.
    *
    * @param plaintexts - An array of objects with `plaintext` (and optional `id`) fields.
    * @param opts - Options specifying the target column (or nested {@link encryptedField}) and table. See {@link EncryptOptions}.
@@ -4286,7 +4206,6 @@ var EncryptionClient = class {
    *   [
    *     { id: "u1", plaintext: "alice@example.com" },
    *     { id: "u2", plaintext: "bob@example.com" },
-   *     { id: "u3", plaintext: null },
    *   ],
    *   { column: users.email, table: users },
    * )
@@ -4340,23 +4259,14 @@ var EncryptionClient = class {
     };
   }
 };
-
-// src/index.ts
-function isValidUuid(uuid) {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-  return uuidRegex.test(uuid);
-}
 var Encryption = async (config3) => {
-  if (config3.logging) {
-    initStackLogger(config3.logging);
-  }
   const { schemas, config: clientConfig } = config3;
   if (!schemas.length) {
     throw new Error(
       "[encryption]: At least one encryptedTable must be provided to initialize the encryption client"
     );
   }
-  if (clientConfig?.keyset && "id" in clientConfig.keyset && !isValidUuid(clientConfig.keyset.id)) {
+  if (clientConfig?.keyset && "id" in clientConfig.keyset && !uuidValidate(clientConfig.keyset.id)) {
     throw new Error(
       "[encryption]: Invalid UUID provided for keyset id. Must be a valid UUID."
     );
@@ -4382,7 +4292,22 @@ var Secrets = class {
     value: encryptedColumn("value")
   });
   constructor(config3) {
-    this.config = config3;
+    const workspaceCRN = config3.workspaceCRN ?? process.env.CS_WORKSPACE_CRN;
+    const clientId = config3.clientId ?? process.env.CS_CLIENT_ID;
+    const clientKey = config3.clientKey ?? process.env.CS_CLIENT_KEY;
+    const accessKey = config3.accessKey ?? process.env.CS_CLIENT_ACCESS_KEY;
+    if (!workspaceCRN || !clientId || !clientKey || !accessKey) {
+      throw new Error(
+        "Missing required configuration or environment variables."
+      );
+    }
+    this.config = {
+      environment: config3.environment,
+      workspaceCRN,
+      clientId,
+      clientKey,
+      accessKey
+    };
   }
   initPromise = null;
   /**
@@ -4395,24 +4320,24 @@ var Secrets = class {
     return this.initPromise;
   }
   async _doInit() {
+    logger.debug("Initializing the Secrets client.");
     this.encryptionClient = await Encryption({
       schemas: [this.secretsSchema],
       config: {
         workspaceCrn: this.config.workspaceCRN,
         clientId: this.config.clientId,
         clientKey: this.config.clientKey,
-        accessKey: this.config.apiKey,
-        keyset: {
-          name: this.config.environment
-        }
+        accessKey: this.config.accessKey,
+        keyset: { name: this.config.environment }
       }
     });
+    logger.debug("Successfully initialized the Secrets client.");
   }
   /**
    * Get the authorization header for API requests
    */
   getAuthHeader() {
-    return `Bearer ${this.config.apiKey}`;
+    return `Bearer ${this.config.accessKey}`;
   }
   /**
    * Make an API request with error handling.
@@ -4427,6 +4352,7 @@ var Secrets = class {
         const searchParams = new URLSearchParams(options.params);
         url = `${url}?${searchParams.toString()}`;
       }
+      logger.debug(`Secrets API request: ${method} ${path2}`);
       const headers = {
         "Content-Type": "application/json",
         Authorization: this.getAuthHeader()
@@ -4445,6 +4371,7 @@ var Secrets = class {
         } catch {
           errorMessage = errorText || errorMessage;
         }
+        logger.error(`Secrets API error on ${method} ${path2}: ${errorMessage}`);
         return {
           failure: {
             type: "ApiError",
@@ -4452,13 +4379,16 @@ var Secrets = class {
           }
         };
       }
+      logger.debug(`Secrets API request successful: ${method} ${path2}`);
       const data = await response.json();
       return { data };
     } catch (error) {
+      const message = error instanceof Error ? error.message : "Unknown network error occurred";
+      logger.error(`Secrets network error on ${method} ${path2}: ${message}`);
       return {
         failure: {
           type: "NetworkError",
-          message: error instanceof Error ? error.message : "Unknown network error occurred"
+          message
         }
       };
     }
@@ -4474,6 +4404,7 @@ var Secrets = class {
    * @returns A Result containing the API response or an error
    */
   async set(name, value) {
+    logger.debug("Setting secret");
     await this.ensureInitialized();
     if (!this.encryptionClient) {
       return {
@@ -4488,6 +4419,7 @@ var Secrets = class {
       table: this.secretsSchema
     });
     if (encryptResult.failure) {
+      logger.error("Failed to encrypt secret");
       return {
         failure: {
           type: "EncryptionError",
@@ -4515,6 +4447,7 @@ var Secrets = class {
    * @returns A Result containing the decrypted value or an error
    */
   async get(name) {
+    logger.debug("Getting secret");
     await this.ensureInitialized();
     if (!this.encryptionClient) {
       return {
@@ -4539,6 +4472,7 @@ var Secrets = class {
       apiResult.data.encryptedValue.data
     );
     if (decryptResult.failure) {
+      logger.error("Failed to decrypt secret");
       return {
         failure: {
           type: "DecryptionError",
@@ -4547,6 +4481,7 @@ var Secrets = class {
       };
     }
     if (typeof decryptResult.data !== "string") {
+      logger.error("Decrypted secret value is not a string");
       return {
         failure: {
           type: "DecryptionError",
@@ -4571,6 +4506,7 @@ var Secrets = class {
    * @returns A Result containing an object mapping secret names to their decrypted values
    */
   async getMany(names) {
+    logger.debug(`Getting ${names.length} secrets.`);
     await this.ensureInitialized();
     if (!this.encryptionClient) {
       return {
@@ -4617,6 +4553,9 @@ var Secrets = class {
     }));
     const decryptResult = await this.encryptionClient.bulkDecryptModels(dataToDecrypt);
     if (decryptResult.failure) {
+      logger.error(
+        `Failed to decrypt secrets: ${decryptResult.failure.message}`
+      );
       return {
         failure: {
           type: "DecryptionError",
@@ -4642,6 +4581,7 @@ var Secrets = class {
    * @returns A Result containing the list of secrets or an error
    */
   async list() {
+    logger.debug("Listing secrets.");
     const workspaceId = extractWorkspaceIdFromCrn(this.config.workspaceCRN);
     const apiResult = await this.apiRequest(
       "GET",
@@ -4667,6 +4607,7 @@ var Secrets = class {
    * @returns A Result containing the API response or an error
    */
   async delete(name) {
+    logger.debug("Deleting secret");
     const workspaceId = extractWorkspaceIdFromCrn(this.config.workspaceCRN);
     return await this.apiRequest("POST", "/delete", {
       body: {