@dbx-tools/appkit 0.1.18 → 0.1.20

package/README.md

@@ -1,4 +1,4 @@
-# @dbx-tools/node-appkit
+# @dbx-tools/appkit
 
 Node-side helpers for Databricks AppKit apps.
 
@@ -47,7 +47,7 @@ environment variables before plugin setup runs.
 
 ```ts
 import { lakebase, server } from "@databricks/appkit";
-import { createApp } from "@dbx-tools/node-appkit";
+import { createApp } from "@dbx-tools/appkit";
 
 await createApp.createApp({
   plugins: [server(), lakebase()],
@@ -67,7 +67,7 @@ Databricks Asset Bundle validation, and deployed Apps.
 Use the lower-level functions when you need to inspect or customize the result:
 
 ```ts
-import { lakebaseResolver } from "@dbx-tools/node-appkit";
+import { lakebaseResolver } from "@dbx-tools/appkit";
 
 const resolved = await lakebaseResolver.resolveLakebaseConnection({
   endpoint: process.env.LAKEBASE_ENDPOINT,
@@ -83,7 +83,7 @@ lakebaseResolver.applyLakebaseToEnv(resolved);
 Databricks Asset Bundle validation output, and `app.yaml` env entries.
 
 ```ts
-import { config } from "@dbx-tools/node-appkit";
+import { config } from "@dbx-tools/appkit";
 
 const warehouseId = await config.resolveConfigValue("SQL_WAREHOUSE_ID", {
   cli: { SQL_WAREHOUSE_ID: flags.warehouse },
@@ -102,7 +102,7 @@ Lakebase hosts, and partial inputs. It gives the resolver a common shape without
 requiring users to remember one canonical format.
 
 ```ts
-import { pgaddress } from "@dbx-tools/node-appkit";
+import { pgaddress } from "@dbx-tools/appkit";
 
 pgaddress.parseAddress(
   "postgresql://user@ep-foo.database.azuredatabricks.net/databricks_postgres?sslmode=require",
@@ -119,7 +119,7 @@ code is running under AppKit, and `undefined` elsewhere. That lets libraries
 preserve OBO auth in apps while still working from scripts.
 
 ```ts
-import { appkit } from "@dbx-tools/node-appkit";
+import { appkit } from "@dbx-tools/appkit";
 import { WorkspaceClient } from "@databricks/sdk-experimental";
 
 const client = appkit.tryGetExecutionContext()?.client ?? new WorkspaceClient({});
@@ -134,7 +134,7 @@ Databricks SDK calls accept a `Context`. Many app and web APIs use
 `AbortSignal`. `databricks.toContext()` bridges the two.
 
 ```ts
-import { databricks } from "@dbx-tools/node-appkit";
+import { databricks } from "@dbx-tools/appkit";
 
 const context = databricks.toContext(request.signal);
 await client.apiClient.request({
@@ -157,7 +157,7 @@ errors when a required plugin is missing.
 
 ```ts
 import { lakebase } from "@databricks/appkit";
-import { plugin } from "@dbx-tools/node-appkit";
+import { plugin } from "@dbx-tools/appkit";
 
 const lake = plugin.instance(this.context, lakebase);
 const pool = lake?.exports().pool;
@@ -175,7 +175,7 @@ the Postgres role that will run the app. Use it after Lakebase connection env ha
 been resolved and before AppKit initializes its persistent cache.
 
 ```ts
-import { provision } from "@dbx-tools/node-appkit";
+import { provision } from "@dbx-tools/appkit";
 import { log } from "@dbx-tools/shared-core";
 
 await provision.provisionCacheSchema(
@@ -198,4 +198,4 @@ await provision.provisionCacheSchema(
 
 The shell-facing wrapper for auto-config is
 [`@dbx-tools/appkit-env`](../../cli/appkit-env). Higher-level agent composition
-is in [`@dbx-tools/node-appkit-mastra`](../appkit-mastra).
+is in [`@dbx-tools/appkit-mastra`](../appkit-mastra).

package/package.json

@@ -18,15 +18,15 @@
     "@databricks/sdk-experimental": "^0.17.0",
     "yaml": "^2.9.0",
     "zod": "^4.3.6",
-    "@dbx-tools/shared-core": "0.1.18",
-    "@dbx-tools/core": "0.1.18"
+    "@dbx-tools/core": "0.1.20",
+    "@dbx-tools/shared-core": "0.1.20"
   },
   "main": "index.ts",
   "license": "UNLICENSED",
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.18",
+  "version": "0.1.20",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/config.ts

@@ -13,7 +13,7 @@
 import { readFile } from "node:fs/promises";
 import { spawnSync } from "node:child_process";
 import { dirname, resolve } from "node:path";
-import { functionModule, iterable, log, string } from "@dbx-tools/shared-core";
+import { functionModule, object, log, string } from "@dbx-tools/shared-core";
 import { file, project } from "@dbx-tools/core";
 import { parse as parseYamlText } from "yaml";
 import { z } from "zod";
@@ -122,10 +122,10 @@ export interface ResolveConfigValueOptions {
 const bundleDefault = functionModule.memoize(() => loadBundle(process.cwd()));
 const appYamlDefault = functionModule.memoize(() => loadAppYaml(process.cwd()));
 
-function envKeysForName(name: string): iterable.Sequence<string> {
+function envKeysForName(name: string): object.Sequence<string> {
   const trimmed = name.trim();
   if (!trimmed) {
-    return iterable.sequence();
+    return object.sequence();
   }
   const keys = (function* () {
     const modifiers: (((value: string) => string) | null)[] = [
@@ -137,7 +137,7 @@ function envKeysForName(name: string): iterable.Sequence<string> {
       yield modifier ? modifier(trimmed) : trimmed;
     }
   })();
-  return iterable.sequence(keys).cache().filter(Boolean).distinct();
+  return object.sequence(keys).cache().filter(Boolean).distinct();
 }
 
 function readEnv(keys: Iterable<string>): string | undefined {
@@ -190,6 +190,24 @@ function pickAppResourceId(apps: Record<string, BundleApp>): string | undefined
   return keys.length === 1 ? keys[0] : undefined;
 }
 
+/**
+ * Resolve the effective value a `value_from`/`valueFrom` entry points at:
+ * the first present of the warehouse id, Genie space id, or Postgres
+ * endpoint/database/branch on the named resource. Shared by both the
+ * `app.yaml` and `bundle validate` flatteners, whose resource shapes match.
+ */
+function resolveResourceValue(
+  resource: z.infer<typeof bundleAppResourceSchema> | undefined,
+): string | undefined {
+  return (
+    resource?.sql_warehouse?.id ??
+    resource?.genie_space?.space_id ??
+    resource?.postgres?.endpoint ??
+    resource?.postgres?.database ??
+    resource?.postgres?.branch
+  );
+}
+
 /**
  * Flatten `env` entries from parsed `app.yaml` content. Literal `value` entries
  * are returned as-is; `valueFrom` entries resolve against the sibling
@@ -212,13 +230,7 @@ export function flattenAppYamlEnv(data: unknown): Record<string, string> {
       continue;
     }
     if (!entry.valueFrom) continue;
-    const resource = resourceByName.get(entry.valueFrom);
-    const resolved =
-      resource?.sql_warehouse?.id ??
-      resource?.genie_space?.space_id ??
-      resource?.postgres?.endpoint ??
-      resource?.postgres?.database ??
-      resource?.postgres?.branch;
+    const resolved = resolveResourceValue(resourceByName.get(entry.valueFrom));
     if (resolved) out[entry.name] = resolved;
   }
   return out;
@@ -255,13 +267,7 @@ export function flattenAppEnv(data: unknown): Record<string, string> {
       continue;
     }
     if (!entry.value_from) continue;
-    const resource = resourceByName.get(entry.value_from);
-    const resolved =
-      resource?.sql_warehouse?.id ??
-      resource?.genie_space?.space_id ??
-      resource?.postgres?.endpoint ??
-      resource?.postgres?.database ??
-      resource?.postgres?.branch;
+    const resolved = resolveResourceValue(resourceByName.get(entry.value_from));
     if (resolved) out[entry.name] = resolved;
   }
   return out;