@databricks/appkit 0.1.4 → 0.1.5

package/dist/type-generator/vite-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.js","names":["root: string","outFile: string","watchFolders: string[]"],"sources":["../../src/type-generator/vite-plugin.ts"],"sourcesContent":["import path from \"node:path\";\nimport type { Plugin } from \"vite\";\nimport fs from \"node:fs\";\nimport { generateFromEntryPoint } from \"./index\";\n\n/**\n * Options for the AppKit types plugin.\n */\ninterface AppKitTypesPluginOptions {\n  /* Path to the output d.ts file (relative to client folder). */\n  outFile?: string;\n  /** Folders to watch for changes. */\n  watchFolders?: string[];\n}\n\n/**\n * Vite plugin to generate types for AppKit queries.\n * Calls generateFromEntryPoint under the hood.\n * @param options - Options to override default values.\n * @returns Vite plugin to generate types for AppKit queries.\n */\nexport function appKitTypesPlugin(options?: AppKitTypesPluginOptions): Plugin {\n  let root: string;\n  let outFile: string;\n  let watchFolders: string[];\n\n  async function generate() {\n    try {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        console.warn(\n          \"[AppKit] Warehouse ID not found. Skipping type generation.\",\n        );\n        return;\n      }\n\n      await generateFromEntryPoint({\n        outFile,\n        queryFolder: watchFolders[0],\n        warehouseId,\n        noCache: false,\n      });\n    } catch (error) {\n      // throw in production to fail the build\n      if (process.env.NODE_ENV === \"production\") {\n        throw error;\n      }\n      console.error(\"[AppKit] Error generating types:\", error);\n    }\n  }\n\n  return {\n    name: \"appkit-types\",\n\n    apply() {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        console.warn(\n          \"[AppKit] Warehouse ID not found. Skipping type generation.\",\n        );\n        return false;\n      }\n\n      if (!fs.existsSync(path.join(process.cwd(), \"config\", \"queries\"))) {\n        return false;\n      }\n\n      return true;\n    },\n\n    configResolved(config) {\n      root = config.root;\n      outFile = path.resolve(root, options?.outFile ?? \"src/appKitTypes.d.ts\");\n      watchFolders = options?.watchFolders ?? [\n        path.join(process.cwd(), \"config\", \"queries\"),\n      ];\n    },\n\n    buildStart() {\n      generate();\n    },\n\n    configureServer(server) {\n      server.watcher.add(watchFolders);\n\n      server.watcher.on(\"change\", (changedFile) => {\n        const isWatchedFile = watchFolders.some((folder) =>\n          changedFile.startsWith(folder),\n        );\n\n        if (isWatchedFile && changedFile.endsWith(\".sql\")) {\n          generate();\n        }\n      });\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;AAqBA,SAAgB,kBAAkB,SAA4C;CAC5E,IAAIA;CACJ,IAAIC;CACJ,IAAIC;CAEJ,eAAe,WAAW;AACxB,MAAI;GACF,MAAM,cAAc,QAAQ,IAAI,2BAA2B;AAE3D,OAAI,CAAC,aAAa;AAChB,YAAQ,KACN,6DACD;AACD;;AAGF,SAAM,uBAAuB;IAC3B;IACA,aAAa,aAAa;IAC1B;IACA,SAAS;IACV,CAAC;WACK,OAAO;AAEd,OAAI,QAAQ,IAAI,aAAa,aAC3B,OAAM;AAER,WAAQ,MAAM,oCAAoC,MAAM;;;AAI5D,QAAO;EACL,MAAM;EAEN,QAAQ;AAGN,OAAI,EAFgB,QAAQ,IAAI,2BAA2B,KAEzC;AAChB,YAAQ,KACN,6DACD;AACD,WAAO;;AAGT,OAAI,CAAC,GAAG,WAAW,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAAC,CAC/D,QAAO;AAGT,UAAO;;EAGT,eAAe,QAAQ;AACrB,UAAO,OAAO;AACd,aAAU,KAAK,QAAQ,MAAM,SAAS,WAAW,uBAAuB;AACxE,kBAAe,SAAS,gBAAgB,CACtC,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAC9C;;EAGH,aAAa;AACX,aAAU;;EAGZ,gBAAgB,QAAQ;AACtB,UAAO,QAAQ,IAAI,aAAa;AAEhC,UAAO,QAAQ,GAAG,WAAW,gBAAgB;AAK3C,QAJsB,aAAa,MAAM,WACvC,YAAY,WAAW,OAAO,CAC/B,IAEoB,YAAY,SAAS,OAAO,CAC/C,WAAU;KAEZ;;EAEL"}
+{"version":3,"file":"vite-plugin.js","names":[],"sources":["../../src/type-generator/vite-plugin.ts"],"sourcesContent":["import path from \"node:path\";\nimport type { Plugin } from \"vite\";\nimport fs from \"node:fs\";\nimport { generateFromEntryPoint } from \"./index\";\n\n/**\n * Options for the AppKit types plugin.\n */\ninterface AppKitTypesPluginOptions {\n  /* Path to the output d.ts file (relative to client folder). */\n  outFile?: string;\n  /** Folders to watch for changes. */\n  watchFolders?: string[];\n}\n\n/**\n * Vite plugin to generate types for AppKit queries.\n * Calls generateFromEntryPoint under the hood.\n * @param options - Options to override default values.\n * @returns Vite plugin to generate types for AppKit queries.\n */\nexport function appKitTypesPlugin(options?: AppKitTypesPluginOptions): Plugin {\n  let root: string;\n  let outFile: string;\n  let watchFolders: string[];\n\n  async function generate() {\n    try {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        console.warn(\n          \"[AppKit] Warehouse ID not found. Skipping type generation.\",\n        );\n        return;\n      }\n\n      await generateFromEntryPoint({\n        outFile,\n        queryFolder: watchFolders[0],\n        warehouseId,\n        noCache: false,\n      });\n    } catch (error) {\n      // throw in production to fail the build\n      if (process.env.NODE_ENV === \"production\") {\n        throw error;\n      }\n      console.error(\"[AppKit] Error generating types:\", error);\n    }\n  }\n\n  return {\n    name: \"appkit-types\",\n\n    apply() {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        console.warn(\n          \"[AppKit] Warehouse ID not found. Skipping type generation.\",\n        );\n        return false;\n      }\n\n      if (!fs.existsSync(path.join(process.cwd(), \"config\", \"queries\"))) {\n        return false;\n      }\n\n      return true;\n    },\n\n    configResolved(config) {\n      root = config.root;\n      outFile = path.resolve(root, options?.outFile ?? \"src/appKitTypes.d.ts\");\n      watchFolders = options?.watchFolders ?? [\n        path.join(process.cwd(), \"config\", \"queries\"),\n      ];\n    },\n\n    buildStart() {\n      generate();\n    },\n\n    configureServer(server) {\n      server.watcher.add(watchFolders);\n\n      server.watcher.on(\"change\", (changedFile) => {\n        const isWatchedFile = watchFolders.some((folder) =>\n          changedFile.startsWith(folder),\n        );\n\n        if (isWatchedFile && changedFile.endsWith(\".sql\")) {\n          generate();\n        }\n      });\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;AAqBA,SAAgB,kBAAkB,SAA4C;CAC5E,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,eAAe,WAAW;AACxB,MAAI;GACF,MAAM,cAAc,QAAQ,IAAI,2BAA2B;AAE3D,OAAI,CAAC,aAAa;AAChB,YAAQ,KACN,6DACD;AACD;;AAGF,SAAM,uBAAuB;IAC3B;IACA,aAAa,aAAa;IAC1B;IACA,SAAS;IACV,CAAC;WACK,OAAO;AAEd,OAAI,QAAQ,IAAI,aAAa,aAC3B,OAAM;AAER,WAAQ,MAAM,oCAAoC,MAAM;;;AAI5D,QAAO;EACL,MAAM;EAEN,QAAQ;AAGN,OAAI,EAFgB,QAAQ,IAAI,2BAA2B,KAEzC;AAChB,YAAQ,KACN,6DACD;AACD,WAAO;;AAGT,OAAI,CAAC,GAAG,WAAW,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAAC,CAC/D,QAAO;AAGT,UAAO;;EAGT,eAAe,QAAQ;AACrB,UAAO,OAAO;AACd,aAAU,KAAK,QAAQ,MAAM,SAAS,WAAW,uBAAuB;AACxE,kBAAe,SAAS,gBAAgB,CACtC,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAC9C;;EAGH,aAAa;AACX,aAAU;;EAGZ,gBAAgB,QAAQ;AACtB,UAAO,QAAQ,IAAI,aAAa;AAEhC,UAAO,QAAQ,GAAG,WAAW,gBAAgB;AAK3C,QAJsB,aAAa,MAAM,WACvC,YAAY,WAAW,OAAO,CAC/B,IAEoB,YAAY,SAAS,OAAO,CAC/C,WAAU;KAEZ;;EAEL"}

package/dist/utils/env-validator.js

@@ -1,14 +1,10 @@
-import { __esmMin } from "../_virtual/rolldown_runtime.js";
-
 //#region src/utils/env-validator.ts
 function validateEnv(envVars) {
 	const missingVars = [];
 	for (const envVar of envVars) if (!process.env[envVar]) missingVars.push(envVar);
 	if (missingVars.length > 0) throw new Error(`Missing required environment variables: ${missingVars.join(", ")}`);
 }
-var init_env_validator = __esmMin((() => {}));
 
 //#endregion
-init_env_validator();
-export { init_env_validator, validateEnv };
+export { validateEnv };
 //# sourceMappingURL=env-validator.js.map

package/dist/utils/env-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-validator.js","names":[],"sources":["../../src/utils/env-validator.ts"],"sourcesContent":["export function validateEnv(envVars: string[]) {\n  const missingVars = [];\n\n  for (const envVar of envVars) {\n    if (!process.env[envVar]) {\n      missingVars.push(envVar);\n    }\n  }\n\n  if (missingVars.length > 0) {\n    throw new Error(\n      `Missing required environment variables: ${missingVars.join(\", \")}`,\n    );\n  }\n}\n"],"mappings":";;;AAAA,SAAgB,YAAY,SAAmB;CAC7C,MAAM,cAAc,EAAE;AAEtB,MAAK,MAAM,UAAU,QACnB,KAAI,CAAC,QAAQ,IAAI,QACf,aAAY,KAAK,OAAO;AAI5B,KAAI,YAAY,SAAS,EACvB,OAAM,IAAI,MACR,2CAA2C,YAAY,KAAK,KAAK,GAClE"}
+{"version":3,"file":"env-validator.js","names":[],"sources":["../../src/utils/env-validator.ts"],"sourcesContent":["export function validateEnv(envVars: string[]) {\n  const missingVars = [];\n\n  for (const envVar of envVars) {\n    if (!process.env[envVar]) {\n      missingVars.push(envVar);\n    }\n  }\n\n  if (missingVars.length > 0) {\n    throw new Error(\n      `Missing required environment variables: ${missingVars.join(\", \")}`,\n    );\n  }\n}\n"],"mappings":";AAAA,SAAgB,YAAY,SAAmB;CAC7C,MAAM,cAAc,EAAE;AAEtB,MAAK,MAAM,UAAU,QACnB,KAAI,CAAC,QAAQ,IAAI,QACf,aAAY,KAAK,OAAO;AAI5B,KAAI,YAAY,SAAS,EACvB,OAAM,IAAI,MACR,2CAA2C,YAAY,KAAK,KAAK,GAClE"}

package/dist/utils/merge.js

@@ -1,5 +1,3 @@
-import { __esmMin } from "../_virtual/rolldown_runtime.js";
-
 //#region src/utils/merge.ts
 function deepMerge(target, ...sources) {
 	if (!sources.length) return target;
@@ -17,9 +15,7 @@ function deepMerge(target, ...sources) {
 function isObject(item) {
 	return typeof item === "object" && item !== null && !Array.isArray(item);
 }
-var init_merge = __esmMin((() => {}));
 
 //#endregion
-init_merge();
-export { deepMerge, init_merge };
+export { deepMerge };
 //# sourceMappingURL=merge.js.map

package/dist/utils/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","names":[],"sources":["../../src/utils/merge.ts"],"sourcesContent":["export function deepMerge<T extends Record<string, unknown>>(\n  target: T,\n  ...sources: Array<Partial<T> | undefined>\n): T {\n  if (!sources.length) return target;\n\n  const source = sources.shift();\n  if (!source) return deepMerge(target, ...sources);\n\n  const result = { ...target };\n\n  for (const key in source) {\n    const sourceValue = source[key];\n    const targetValue = result[key];\n\n    if (sourceValue !== undefined) {\n      if (isObject(sourceValue) && isObject(targetValue)) {\n        result[key] = deepMerge(\n          targetValue as Record<string, unknown>,\n          sourceValue as Record<string, unknown>,\n        ) as T[Extract<keyof T, string>];\n      } else {\n        result[key] = sourceValue as T[Extract<keyof T, string>];\n      }\n    }\n  }\n\n  return sources.length ? deepMerge(result, ...sources) : result;\n}\n\nfunction isObject(item: unknown): item is Record<string, unknown> {\n  return typeof item === \"object\" && item !== null && !Array.isArray(item);\n}\n"],"mappings":";;;AAAA,SAAgB,UACd,QACA,GAAG,SACA;AACH,KAAI,CAAC,QAAQ,OAAQ,QAAO;CAE5B,MAAM,SAAS,QAAQ,OAAO;AAC9B,KAAI,CAAC,OAAQ,QAAO,UAAU,QAAQ,GAAG,QAAQ;CAEjD,MAAM,SAAS,EAAE,GAAG,QAAQ;AAE5B,MAAK,MAAM,OAAO,QAAQ;EACxB,MAAM,cAAc,OAAO;EAC3B,MAAM,cAAc,OAAO;AAE3B,MAAI,gBAAgB,OAClB,KAAI,SAAS,YAAY,IAAI,SAAS,YAAY,CAChD,QAAO,OAAO,UACZ,aACA,YACD;MAED,QAAO,OAAO;;AAKpB,QAAO,QAAQ,SAAS,UAAU,QAAQ,GAAG,QAAQ,GAAG;;AAG1D,SAAS,SAAS,MAAgD;AAChE,QAAO,OAAO,SAAS,YAAY,SAAS,QAAQ,CAAC,MAAM,QAAQ,KAAK"}
+{"version":3,"file":"merge.js","names":[],"sources":["../../src/utils/merge.ts"],"sourcesContent":["export function deepMerge<T extends Record<string, unknown>>(\n  target: T,\n  ...sources: Array<Partial<T> | undefined>\n): T {\n  if (!sources.length) return target;\n\n  const source = sources.shift();\n  if (!source) return deepMerge(target, ...sources);\n\n  const result = { ...target };\n\n  for (const key in source) {\n    const sourceValue = source[key];\n    const targetValue = result[key];\n\n    if (sourceValue !== undefined) {\n      if (isObject(sourceValue) && isObject(targetValue)) {\n        result[key] = deepMerge(\n          targetValue as Record<string, unknown>,\n          sourceValue as Record<string, unknown>,\n        ) as T[Extract<keyof T, string>];\n      } else {\n        result[key] = sourceValue as T[Extract<keyof T, string>];\n      }\n    }\n  }\n\n  return sources.length ? deepMerge(result, ...sources) : result;\n}\n\nfunction isObject(item: unknown): item is Record<string, unknown> {\n  return typeof item === \"object\" && item !== null && !Array.isArray(item);\n}\n"],"mappings":";AAAA,SAAgB,UACd,QACA,GAAG,SACA;AACH,KAAI,CAAC,QAAQ,OAAQ,QAAO;CAE5B,MAAM,SAAS,QAAQ,OAAO;AAC9B,KAAI,CAAC,OAAQ,QAAO,UAAU,QAAQ,GAAG,QAAQ;CAEjD,MAAM,SAAS,EAAE,GAAG,QAAQ;AAE5B,MAAK,MAAM,OAAO,QAAQ;EACxB,MAAM,cAAc,OAAO;EAC3B,MAAM,cAAc,OAAO;AAE3B,MAAI,gBAAgB,OAClB,KAAI,SAAS,YAAY,IAAI,SAAS,YAAY,CAChD,QAAO,OAAO,UACZ,aACA,YACD;MAED,QAAO,OAAO;;AAKpB,QAAO,QAAQ,SAAS,UAAU,QAAQ,GAAG,QAAQ,GAAG;;AAG1D,SAAS,SAAS,MAAgD;AAChE,QAAO,OAAO,SAAS,YAAY,SAAS,QAAQ,CAAC,MAAM,QAAQ,KAAK"}

package/dist/utils/vite-config-merge.js

@@ -1,5 +1,3 @@
-import { __esmMin } from "../_virtual/rolldown_runtime.js";
-
 //#region src/utils/vite-config-merge.ts
 function mergeConfigDedup(base, override, mergeFn) {
 	const merged = mergeFn(base, override);
@@ -14,9 +12,7 @@ function mergeConfigDedup(base, override, mergeFn) {
 	}
 	return merged;
 }
-var init_vite_config_merge = __esmMin((() => {}));
 
 //#endregion
-init_vite_config_merge();
-export { init_vite_config_merge, mergeConfigDedup };
+export { mergeConfigDedup };
 //# sourceMappingURL=vite-config-merge.js.map

package/dist/utils/vite-config-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-config-merge.js","names":[],"sources":["../../src/utils/vite-config-merge.ts"],"sourcesContent":["import type { Plugin } from \"vite\";\n\nexport function mergeConfigDedup(\n  base: any,\n  override: any,\n  mergeFn: (a: any, b: any) => any,\n) {\n  const merged = mergeFn(base, override);\n  if (base.plugins && override.plugins) {\n    const seen = new Set<string>();\n    merged.plugins = [...base.plugins, ...override.plugins].filter(\n      (p: Plugin) => {\n        const name = p.name;\n        if (seen.has(name)) return false;\n        seen.add(name);\n        return true;\n      },\n    );\n  }\n  return merged;\n}\n"],"mappings":";;;AAEA,SAAgB,iBACd,MACA,UACA,SACA;CACA,MAAM,SAAS,QAAQ,MAAM,SAAS;AACtC,KAAI,KAAK,WAAW,SAAS,SAAS;EACpC,MAAM,uBAAO,IAAI,KAAa;AAC9B,SAAO,UAAU,CAAC,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ,CAAC,QACrD,MAAc;GACb,MAAM,OAAO,EAAE;AACf,OAAI,KAAK,IAAI,KAAK,CAAE,QAAO;AAC3B,QAAK,IAAI,KAAK;AACd,UAAO;IAEV;;AAEH,QAAO"}
+{"version":3,"file":"vite-config-merge.js","names":[],"sources":["../../src/utils/vite-config-merge.ts"],"sourcesContent":["import type { Plugin } from \"vite\";\n\nexport function mergeConfigDedup(\n  base: any,\n  override: any,\n  mergeFn: (a: any, b: any) => any,\n) {\n  const merged = mergeFn(base, override);\n  if (base.plugins && override.plugins) {\n    const seen = new Set<string>();\n    merged.plugins = [...base.plugins, ...override.plugins].filter(\n      (p: Plugin) => {\n        const name = p.name;\n        if (seen.has(name)) return false;\n        seen.add(name);\n        return true;\n      },\n    );\n  }\n  return merged;\n}\n"],"mappings":";AAEA,SAAgB,iBACd,MACA,UACA,SACA;CACA,MAAM,SAAS,QAAQ,MAAM,SAAS;AACtC,KAAI,KAAK,WAAW,SAAS,SAAS;EACpC,MAAM,uBAAO,IAAI,KAAa;AAC9B,SAAO,UAAU,CAAC,GAAG,KAAK,SAAS,GAAG,SAAS,QAAQ,CAAC,QACrD,MAAc;GACb,MAAM,OAAO,EAAE;AACf,OAAI,KAAK,IAAI,KAAK,CAAE,QAAO;AAC3B,QAAK,IAAI,KAAK;AACd,UAAO;IAEV;;AAEH,QAAO"}

package/llms.txt

@@ -440,23 +440,49 @@ Formats:
 - `format: "JSON"` (default) returns JSON rows
 - `format: "ARROW"` returns an Arrow “statement_id” payload over SSE, then the client fetches binary Arrow from `/api/analytics/arrow-result/:jobId`
 
-### Request context (`getRequestContext()`)
+### Execution context and `asUser(req)`
 
-If a plugin sets `requiresDatabricksClient = true`, AppKit adds middleware that provides request context.
+AppKit manages Databricks authentication via two contexts:
 
-Headers used:
+- **ServiceContext** (singleton): Initialized at app startup with service principal credentials
+- **ExecutionContext**: Determined at runtime - either service principal or user context
+
+**Headers used for user context:**
 
 - `x-forwarded-user`: required in production; identifies the user
-- `x-forwarded-access-token`: optional; enables **user token passthrough** if `DATABRICKS_HOST` is set
+- `x-forwarded-access-token`: required for user token passthrough
+
+**Using `asUser(req)` for user-scoped operations:**
+
+The `asUser(req)` pattern allows plugins to execute operations using the requesting user's credentials:
+
+```ts
+// In a custom plugin route handler
+router.post("/users/me/data", async (req, res) => {
+  // Execute as the user (uses their Databricks permissions)
+  const result = await this.asUser(req).query("SELECT ...");
+  res.json(result);
+});
+
+// Service principal execution (default)
+router.post("/system/data", async (req, res) => {
+  const result = await this.query("SELECT ...");
+  res.json(result);
+});
+```
+
+**Context helper functions (exported from `@databricks/appkit`):**
+
+- `getExecutionContext()`: Returns current context (user or service)
+- `getCurrentUserId()`: Returns user ID in user context, service user ID otherwise
+- `getWorkspaceClient()`: Returns the appropriate WorkspaceClient for current context
+- `getWarehouseId()`: `Promise<string>` (from `DATABRICKS_WAREHOUSE_ID` or auto-selected in dev)
+- `getWorkspaceId()`: `Promise<string>` (from `DATABRICKS_WORKSPACE_ID` or fetched)
+- `isInUserContext()`: Returns `true` if currently executing in user context
 
-Context fields (real behavior):
+**Development mode behavior:**
 
-- `userId`: derived from `x-forwarded-user` (in development it falls back to `serviceUserId`)
-- `serviceUserId`: service principal/user ID
-- `warehouseId`: `Promise<string>` (from `DATABRICKS_WAREHOUSE_ID`, or auto-selected in development)
-- `workspaceId`: `Promise<string>` (from `DATABRICKS_WORKSPACE_ID` or fetched)
-- `userDatabricksClient`: present only when passthrough is available (or in dev it equals service client)
-- `serviceDatabricksClient`: always present
+In local development (`NODE_ENV=development`), if `asUser(req)` is called without a user token, it logs a warning and falls back to the service principal.
 
 ### Custom plugins (backend)
 
@@ -469,7 +495,6 @@ import type express from "express";
 class MyPlugin extends Plugin {
   name = "my-plugin";
   envVars = [];                 // list required env vars here
-  requiresDatabricksClient = false; // set true if you need getRequestContext()
 
   injectRoutes(router: express.Router) {
     this.route(router, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@databricks/appkit",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "packageManager": "pnpm@10.21.0",
@@ -54,9 +54,11 @@
     "@opentelemetry/sdk-metrics": "^2.2.0",
     "@opentelemetry/sdk-node": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.38.0",
+    "@types/semver": "^7.7.1",
     "dotenv": "^16.6.1",
     "express": "^4.22.0",
     "pg": "^8.16.3",
+    "semver": "^7.7.3",
     "vite": "npm:rolldown-vite@7.1.14",
     "ws": "^8.18.3",
     "zod-to-ts": "^2.0.0"

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["export type {\n  BasePluginConfig,\n  IAppRouter,\n  SQLTypeMarker,\n  StreamExecutionSettings,\n} from \"shared\";\nexport {\n  isSQLTypeMarker,\n  sql,\n} from \"shared\";\nexport { analytics } from \"./analytics\";\nexport { CacheManager } from \"./cache\";\nexport { createApp } from \"./core\";\nexport { Plugin, toPlugin } from \"./plugin\";\nexport { server } from \"./server\";\nexport type { ITelemetry } from \"./telemetry\";\nexport {\n  type Counter,\n  type Histogram,\n  SeverityNumber,\n  type Span,\n  SpanStatusCode,\n} from \"./telemetry\";\nexport { appKitTypesPlugin } from \"./type-generator/vite-plugin\";\nexport { getRequestContext } from \"./utils\";\n"],"mappings":";;;;;;;;;;;;;;;;YAwB4C"}

package/dist/utils/databricks-client-middleware.d.ts

@@ -1,17 +0,0 @@
-import { WorkspaceClient } from "@databricks/sdk-experimental";
-import express from "express";
-
-//#region src/utils/databricks-client-middleware.d.ts
-type RequestContext = {
-  userDatabricksClient?: WorkspaceClient;
-  serviceDatabricksClient: WorkspaceClient;
-  userId: string;
-  userName?: string;
-  serviceUserId: string;
-  warehouseId: Promise<string>;
-  workspaceId: Promise<string>;
-};
-declare function getRequestContext(): RequestContext;
-//#endregion
-export { getRequestContext };
-//# sourceMappingURL=databricks-client-middleware.d.ts.map

package/dist/utils/databricks-client-middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"databricks-client-middleware.d.ts","names":[],"sources":["../../src/utils/databricks-client-middleware.ts"],"sourcesContent":[],"mappings":";;;;KAYY,cAAA;yBACa;EADb,uBAAc,EAEC,eAFD;EAAA,MAAA,EAAA,MAAA;UACD,CAAA,EAAA,MAAA;eACE,EAAA,MAAA;aAIZ,EAAA,OAAA,CAAA,MAAA,CAAA;aACA,EAAA,OAAA,CAAA,MAAA,CAAA;CAAO;iBA4EN,iBAAA,CAAA,GAAqB"}

package/dist/utils/databricks-client-middleware.js

@@ -1,117 +0,0 @@
-import { __esmMin } from "../_virtual/rolldown_runtime.js";
-import { name, version } from "../appkit/package.js";
-import { WorkspaceClient } from "@databricks/sdk-experimental";
-import { AsyncLocalStorage } from "node:async_hooks";
-
-//#region src/utils/databricks-client-middleware.ts
-function getClientOptions() {
-	const isDev = process.env.NODE_ENV === "development";
-	return {
-		product: name,
-		productVersion: version.split(".").slice(0, 3).join("."),
-		...isDev && { userAgentExtra: { mode: "dev" } }
-	};
-}
-async function databricksClientMiddleware() {
-	const serviceDatabricksClient = new WorkspaceClient({}, getClientOptions());
-	const warehouseId = getWarehouseId(serviceDatabricksClient);
-	const workspaceId = getWorkspaceId(serviceDatabricksClient);
-	const serviceUserId = (await serviceDatabricksClient.currentUser.me()).id;
-	if (!serviceUserId) throw new Error("Service user ID not found");
-	return async (req, res, next) => {
-		const userToken = req.headers["x-forwarded-access-token"];
-		let userDatabricksClient;
-		const host = process.env.DATABRICKS_HOST;
-		if (userToken && host) userDatabricksClient = new WorkspaceClient({
-			token: userToken,
-			host,
-			authType: "pat"
-		}, getClientOptions());
-		else if (process.env.NODE_ENV === "development") userDatabricksClient = serviceDatabricksClient;
-		let userName = req.headers["x-forwarded-user"];
-		if (!userName && process.env.NODE_ENV !== "development") {
-			res.status(401).json({ error: "Unauthorized" });
-			return;
-		} else userName = serviceUserId;
-		return asyncLocalStorage.run({
-			userDatabricksClient,
-			serviceDatabricksClient,
-			warehouseId,
-			workspaceId,
-			userId: userName,
-			serviceUserId
-		}, async () => {
-			return next();
-		});
-	};
-}
-function getRequestContext() {
-	const store = asyncLocalStorage.getStore();
-	if (!store) throw new Error("Request context not found");
-	return store;
-}
-/**
-* Get the appropriate WorkspaceClient based on whether the request
-* should be executed as the user or as the service principal.
-*
-* @param asUser - If true, returns user's WorkspaceClient (requires token passthrough)
-* @throws Error if asUser is true but user token passthrough is not enabled
-*/
-function getWorkspaceClient(asUser) {
-	const context = getRequestContext();
-	if (asUser) {
-		if (!context.userDatabricksClient) throw new Error(`User token passthrough is not enabled for this workspace.`);
-		return context.userDatabricksClient;
-	}
-	return context.serviceDatabricksClient;
-}
-async function getWorkspaceId(workspaceClient) {
-	if (process.env.DATABRICKS_WORKSPACE_ID) return process.env.DATABRICKS_WORKSPACE_ID;
-	const response = await workspaceClient.apiClient.request({
-		path: "/api/2.0/preview/scim/v2/Me",
-		method: "GET",
-		headers: new Headers(),
-		raw: false,
-		query: {},
-		responseHeaders: ["x-databricks-org-id"]
-	});
-	if (!response["x-databricks-org-id"]) throw new Error("Workspace ID not found");
-	return response["x-databricks-org-id"];
-}
-async function getWarehouseId(workspaceClient) {
-	if (process.env.DATABRICKS_WAREHOUSE_ID) return process.env.DATABRICKS_WAREHOUSE_ID;
-	if (process.env.NODE_ENV === "development") {
-		const response = await workspaceClient.apiClient.request({
-			path: "/api/2.0/sql/warehouses",
-			method: "GET",
-			headers: new Headers(),
-			raw: false,
-			query: { skip_cannot_use: "true" }
-		});
-		const priorities = {
-			RUNNING: 0,
-			STOPPED: 1,
-			STARTING: 2,
-			STOPPING: 3,
-			DELETED: 99,
-			DELETING: 99
-		};
-		const warehouses = (response.warehouses || []).sort((a, b) => {
-			return priorities[a.state] - priorities[b.state];
-		});
-		if (response.warehouses.length === 0) throw new Error("Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.");
-		const firstWarehouse = warehouses[0];
-		if (firstWarehouse.state === "DELETED" || firstWarehouse.state === "DELETING" || !firstWarehouse.id) throw new Error("Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.");
-		return firstWarehouse.id;
-	}
-	throw new Error("Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.");
-}
-var asyncLocalStorage;
-var init_databricks_client_middleware = __esmMin((() => {
-	asyncLocalStorage = new AsyncLocalStorage();
-}));
-
-//#endregion
-init_databricks_client_middleware();
-export { databricksClientMiddleware, getRequestContext, getWorkspaceClient, init_databricks_client_middleware };
-//# sourceMappingURL=databricks-client-middleware.js.map

package/dist/utils/databricks-client-middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"databricks-client-middleware.js","names":["productName","productVersion","userDatabricksClient: WorkspaceClient | undefined","priorities: Record<sql.State, number>"],"sources":["../../src/utils/databricks-client-middleware.ts"],"sourcesContent":["import { AsyncLocalStorage } from \"node:async_hooks\";\nimport {\n  type ClientOptions,\n  type sql,\n  WorkspaceClient,\n} from \"@databricks/sdk-experimental\";\nimport type express from \"express\";\nimport {\n  name as productName,\n  version as productVersion,\n} from \"../../package.json\";\n\nexport type RequestContext = {\n  userDatabricksClient?: WorkspaceClient;\n  serviceDatabricksClient: WorkspaceClient;\n  userId: string;\n  userName?: string;\n  serviceUserId: string;\n  warehouseId: Promise<string>;\n  workspaceId: Promise<string>;\n};\n\nconst asyncLocalStorage = new AsyncLocalStorage<RequestContext>();\n\nfunction getClientOptions(): ClientOptions {\n  const isDev = process.env.NODE_ENV === \"development\";\n  const normalizedVersion = productVersion\n    .split(\".\")\n    .slice(0, 3)\n    .join(\".\") as ClientOptions[\"productVersion\"];\n\n  return {\n    product: productName,\n    productVersion: normalizedVersion,\n    ...(isDev && { userAgentExtra: { mode: \"dev\" } }),\n  };\n}\n\nexport async function databricksClientMiddleware(): Promise<express.RequestHandler> {\n  const serviceDatabricksClient = new WorkspaceClient({}, getClientOptions());\n  const warehouseId = getWarehouseId(serviceDatabricksClient);\n  const workspaceId = getWorkspaceId(serviceDatabricksClient);\n  const serviceUserId = (await serviceDatabricksClient.currentUser.me()).id;\n\n  if (!serviceUserId) {\n    throw new Error(\"Service user ID not found\");\n  }\n\n  return async (\n    req: express.Request,\n    res: express.Response,\n    next: express.NextFunction,\n  ) => {\n    const userToken = req.headers[\"x-forwarded-access-token\"] as string;\n    let userDatabricksClient: WorkspaceClient | undefined;\n    const host = process.env.DATABRICKS_HOST;\n    if (userToken && host) {\n      userDatabricksClient = new WorkspaceClient(\n        {\n          token: userToken,\n          host,\n          authType: \"pat\",\n        },\n        getClientOptions(),\n      );\n    } else if (process.env.NODE_ENV === \"development\") {\n      // in local development service and no user token are the same\n      // TODO: use `databricks apps run-local` to fix this\n      userDatabricksClient = serviceDatabricksClient;\n    }\n\n    let userName = req.headers[\"x-forwarded-user\"] as string;\n    if (!userName && process.env.NODE_ENV !== \"development\") {\n      res.status(401).json({ error: \"Unauthorized\" });\n      return;\n    } else {\n      userName = serviceUserId;\n    }\n\n    return asyncLocalStorage.run(\n      {\n        userDatabricksClient,\n        serviceDatabricksClient,\n        warehouseId,\n        workspaceId,\n        userId: userName,\n        serviceUserId,\n      },\n      async () => {\n        return next();\n      },\n    );\n  };\n}\n\nexport function getRequestContext(): RequestContext {\n  const store = asyncLocalStorage.getStore();\n  if (!store) {\n    throw new Error(\"Request context not found\");\n  }\n  return store;\n}\n\n/**\n * Get the appropriate WorkspaceClient based on whether the request\n * should be executed as the user or as the service principal.\n *\n * @param asUser - If true, returns user's WorkspaceClient (requires token passthrough)\n * @throws Error if asUser is true but user token passthrough is not enabled\n */\nexport function getWorkspaceClient(asUser: boolean): WorkspaceClient {\n  const context = getRequestContext();\n\n  if (asUser) {\n    if (!context.userDatabricksClient) {\n      throw new Error(\n        `User token passthrough is not enabled for this workspace.`,\n      );\n    }\n    return context.userDatabricksClient;\n  }\n\n  return context.serviceDatabricksClient;\n}\n\nasync function getWorkspaceId(\n  workspaceClient: WorkspaceClient,\n): Promise<string> {\n  if (process.env.DATABRICKS_WORKSPACE_ID) {\n    return process.env.DATABRICKS_WORKSPACE_ID;\n  }\n\n  const response = (await workspaceClient.apiClient.request({\n    path: \"/api/2.0/preview/scim/v2/Me\",\n    method: \"GET\",\n    headers: new Headers(),\n    raw: false,\n    query: {},\n    responseHeaders: [\"x-databricks-org-id\"],\n  })) as { \"x-databricks-org-id\": string };\n\n  if (!response[\"x-databricks-org-id\"]) {\n    throw new Error(\"Workspace ID not found\");\n  }\n\n  return response[\"x-databricks-org-id\"];\n}\n\nasync function getWarehouseId(\n  workspaceClient: WorkspaceClient,\n): Promise<string> {\n  if (process.env.DATABRICKS_WAREHOUSE_ID) {\n    return process.env.DATABRICKS_WAREHOUSE_ID;\n  }\n\n  if (process.env.NODE_ENV === \"development\") {\n    const response = (await workspaceClient.apiClient.request({\n      path: \"/api/2.0/sql/warehouses\",\n      method: \"GET\",\n      headers: new Headers(),\n      raw: false,\n      query: {\n        skip_cannot_use: \"true\",\n      },\n    })) as { warehouses: sql.EndpointInfo[] };\n\n    const priorities: Record<sql.State, number> = {\n      RUNNING: 0,\n      STOPPED: 1,\n      STARTING: 2,\n      STOPPING: 3,\n      DELETED: 99,\n      DELETING: 99,\n    };\n\n    const warehouses = (response.warehouses || []).sort((a, b) => {\n      return (\n        priorities[a.state as sql.State] - priorities[b.state as sql.State]\n      );\n    });\n\n    if (response.warehouses.length === 0) {\n      throw new Error(\n        \"Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.\",\n      );\n    }\n\n    const firstWarehouse = warehouses[0];\n    if (\n      firstWarehouse.state === \"DELETED\" ||\n      firstWarehouse.state === \"DELETING\" ||\n      !firstWarehouse.id\n    ) {\n      throw new Error(\n        \"Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.\",\n      );\n    }\n\n    return firstWarehouse.id;\n  }\n\n  throw new Error(\n    \"Warehouse ID not found. Please configure the DATABRICKS_WAREHOUSE_ID environment variable.\",\n  );\n}\n\nexport type Request = express.Request;\nexport type Response = express.Response;\n"],"mappings":"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"}

package/dist/utils/index.js

@@ -1,26 +0,0 @@
-import { __esmMin, __exportAll } from "../_virtual/rolldown_runtime.js";
-import { databricksClientMiddleware, getRequestContext, getWorkspaceClient, init_databricks_client_middleware } from "./databricks-client-middleware.js";
-import { init_env_validator, validateEnv } from "./env-validator.js";
-import { deepMerge, init_merge } from "./merge.js";
-import { init_vite_config_merge, mergeConfigDedup } from "./vite-config-merge.js";
-
-//#region src/utils/index.ts
-var utils_exports = /* @__PURE__ */ __exportAll({
-	databricksClientMiddleware: () => databricksClientMiddleware,
-	deepMerge: () => deepMerge,
-	getRequestContext: () => getRequestContext,
-	getWorkspaceClient: () => getWorkspaceClient,
-	mergeConfigDedup: () => mergeConfigDedup,
-	validateEnv: () => validateEnv
-});
-var init_utils = __esmMin((() => {
-	init_databricks_client_middleware();
-	init_env_validator();
-	init_merge();
-	init_vite_config_merge();
-}));
-
-//#endregion
-init_utils();
-export { init_utils, utils_exports };
-//# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/utils/index.ts"],"sourcesContent":["export * from \"./databricks-client-middleware\";\nexport * from \"./env-validator\";\nexport * from \"./merge\";\nexport * from \"./vite-config-merge\";\n"],"mappings":""}