@dbx-tools/databricks 0.9.153 → 0.9.157

package/lib/src/workspace-client.js

@@ -6,9 +6,9 @@
  * @module
  */
 import { createWorkspaceClient as _createWorkspaceClient, } from "@databricks/appkit";
-import { appkit } from "@dbx-tools/appkit";
-import { client as authClient } from "@dbx-tools/auth";
-import { functionUtils, net, stringUtils } from "@dbx-tools/shared-core";
+import { tryGetExecutionContext } from "@dbx-tools/appkit";
+import { createAuthClient } from "@dbx-tools/auth";
+import { memoize, urlBuilder, trimToUndefined } from "@dbx-tools/shared-core";
 /** Databricks workspace ids are a 10-20 digit run embedded in the host. */
 const WORKSPACE_ID_REGEX = /\d{10,20}/;
 const workspaceAuth = new WeakMap();
@@ -22,7 +22,7 @@ const workspaceAuth = new WeakMap();
  * execution.
  */
 export async function createWorkspaceClient(options = {}) {
-    const auth = await authClient.createAuthClient(options);
+    const auth = await createAuthClient(options);
     const client = _createWorkspaceClient({ host: auth.host });
     client.config.credentials = {
         name: "pat",
@@ -58,14 +58,14 @@ export function toLegacyWorkspaceClient(client) {
  * construction happens at most once per process. Used only when there's no
  * AppKit execution context to borrow a client from.
  */
-const getDefaultWorkspaceClient = functionUtils.memoize(async () => (await createWorkspaceClient()).toLegacyWorkspaceClient());
+const getDefaultWorkspaceClient = memoize(async () => (await createWorkspaceClient()).toLegacyWorkspaceClient());
 /**
  * The AppKit execution-context workspace client when available, otherwise
  * `undefined`. Never constructs a fallback client and never throws for a
  * missing AppKit scope.
  */
 export function tryGetWorkspaceClient() {
-    return appkit.tryGetExecutionContext()?.client.toLegacyWorkspaceClient();
+    return tryGetExecutionContext()?.client.toLegacyWorkspaceClient();
 }
 /**
  * Resolve a {@link WorkspaceClient}: {@link tryGetWorkspaceClient} first, else
@@ -95,7 +95,7 @@ async function getWorkspaceConfig() {
  * calls `currentUser.me()` on {@link client} (or {@link getWorkspaceClient}).
  */
 export async function getCurrentUserName(client) {
-    const contextUser = readContextUserName(appkit.tryGetExecutionContext());
+    const contextUser = readContextUserName(tryGetExecutionContext());
     if (contextUser)
         return contextUser;
     const resolved = client ?? (await getWorkspaceClient());
@@ -111,7 +111,7 @@ function readContextUserName(ctx) {
     if (typeof ctx !== "object" || ctx === null || !("userName" in ctx))
         return undefined;
     const value = ctx.userName;
-    return stringUtils.trimToUndefined(value);
+    return trimToUndefined(value);
 }
 /**
  * Resolve the current workspace host as a `net.UrlBuilder`: the workspace
@@ -120,11 +120,11 @@ function readContextUserName(ctx) {
 export async function getWorkspaceUrl() {
     const config = await getWorkspaceConfig();
     if (config) {
-        const configHost = net.urlBuilder(await config.getHost());
+        const configHost = urlBuilder(await config.getHost());
         if (configHost)
             return configHost;
     }
-    const databricksHost = net.urlBuilder(process.env.DATABRICKS_HOST);
+    const databricksHost = urlBuilder(process.env.DATABRICKS_HOST);
     if (databricksHost)
         return databricksHost;
     return undefined;
@@ -146,4 +146,4 @@ export async function getWorkspaceId(workspaceHost) {
     }
     return undefined;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-client.js","sourceRoot":"","sources":["../../src/workspace-client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Resolve the current Databricks workspace's URL, numeric id, and client from\n * the active execution context (AppKit, when initialized), a default\n * {@link WorkspaceClient}, or the environment. Server-only.\n *\n * @module\n */\n\nimport {\n  createWorkspaceClient as _createWorkspaceClient,\n  type WorkspaceClient as AppKitWorkspaceClient,\n} from \"@databricks/appkit\";\nimport { appkit } from \"@dbx-tools/appkit\";\nimport { client as authClient, type AuthClient, type DatabricksAuthOptions } from \"@dbx-tools/auth\";\nimport { functionUtils, net, stringUtils } from \"@dbx-tools/shared-core\";\n\n/** Databricks workspace ids are a 10-20 digit run embedded in the host. */\nconst WORKSPACE_ID_REGEX = /\\d{10,20}/;\nconst workspaceAuth = new WeakMap<AppKitWorkspaceClient, AuthClient>();\n\n/** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */\nexport type WorkspaceClient = ReturnType<AppKitWorkspaceClient[\"toLegacyWorkspaceClient\"]>;\ntype Config = WorkspaceClient[\"config\"];\n\n/**\n * Create an AppKit workspace client whose SDK credential visitor delegates to\n * `@dbx-tools/auth`.\n *\n * The auth package resolves the active profile, host, token lifecycle, and\n * unified-workspace header without requiring callers to mirror profile values\n * into environment variables. The SDK still owns workspace APIs and request\n * execution.\n */\nexport async function createWorkspaceClient(\n  options: DatabricksAuthOptions = {},\n): Promise<AppKitWorkspaceClient> {\n  const auth = await authClient.createAuthClient(options);\n  const client = _createWorkspaceClient({ host: auth.host });\n  client.config.credentials = {\n    name: \"pat\",\n    async configure() {\n      return async (headers) => {\n        for (const [name, value] of Object.entries(await auth.headers())) {\n          headers.set(name, value);\n        }\n      };\n    },\n  };\n  workspaceAuth.set(client, auth);\n  return client;\n}\n\n/**\n * Refresh the dbx-tools credential lifecycle attached by\n * {@link createWorkspaceClient}. Returns `false` for externally supplied\n * AppKit clients whose credential owner is unknown.\n */\nexport async function refreshWorkspaceClientAuthentication(\n  client: AppKitWorkspaceClient,\n): Promise<boolean> {\n  const auth = workspaceAuth.get(client);\n  if (!auth) return false;\n  await auth.headers({ login: false, refresh: true });\n  return true;\n}\n\n/** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */\nexport function toLegacyWorkspaceClient(\n  client: AppKitWorkspaceClient | WorkspaceClient,\n): WorkspaceClient {\n  return \"toLegacyWorkspaceClient\" in client ? client.toLegacyWorkspaceClient() : client;\n}\n\n/**\n * Lazily-constructed default `WorkspaceClient` (env / profile auth), memoized so\n * construction happens at most once per process. Used only when there's no\n * AppKit execution context to borrow a client from.\n */\nconst getDefaultWorkspaceClient = functionUtils.memoize(async () =>\n  (await createWorkspaceClient()).toLegacyWorkspaceClient(),\n);\n\n/**\n * The AppKit execution-context workspace client when available, otherwise\n * `undefined`. Never constructs a fallback client and never throws for a\n * missing AppKit scope.\n */\nexport function tryGetWorkspaceClient(): WorkspaceClient | undefined {\n  return appkit.tryGetExecutionContext()?.client.toLegacyWorkspaceClient();\n}\n\n/**\n * Resolve a {@link WorkspaceClient}: {@link tryGetWorkspaceClient} first, else\n * a memoized default client from env / profile auth.\n */\nexport async function getWorkspaceClient(): Promise<WorkspaceClient> {\n  return tryGetWorkspaceClient() ?? (await getDefaultWorkspaceClient());\n}\n\n/**\n * The active workspace `Config`: the AppKit execution-context client's config\n * when AppKit is initialized, else the default client's. Returns `undefined`\n * (never throws) when neither is available.\n */\nasync function getWorkspaceConfig(): Promise<Config | undefined> {\n  try {\n    return (await getWorkspaceClient()).config;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Current Databricks username for workspace home paths\n * (`/Workspace/Users/<userName>`).\n *\n * Prefers `userName` on the AppKit execution context when set, otherwise\n * calls `currentUser.me()` on {@link client} (or {@link getWorkspaceClient}).\n */\nexport async function getCurrentUserName(client?: WorkspaceClient): Promise<string> {\n  const contextUser = readContextUserName(appkit.tryGetExecutionContext());\n  if (contextUser) return contextUser;\n\n  const resolved = client ?? (await getWorkspaceClient());\n  const me = await resolved.currentUser.me();\n  const userName = me.userName?.trim();\n  if (!userName) {\n    throw new Error(\"Databricks currentUser.me() did not return a userName\");\n  }\n  return userName;\n}\n\n/** Best-effort `userName` off an AppKit execution context (shape varies by mode). */\nfunction readContextUserName(ctx: unknown): string | undefined {\n  if (typeof ctx !== \"object\" || ctx === null || !(\"userName\" in ctx)) return undefined;\n  const value = (ctx as { userName?: unknown }).userName;\n  return stringUtils.trimToUndefined(value);\n}\n\n/**\n * Resolve the current workspace host as a `net.UrlBuilder`: the workspace\n * `Config` host first, then the `DATABRICKS_HOST` env var, else `undefined`.\n */\nexport async function getWorkspaceUrl(): Promise<net.UrlBuilder | undefined> {\n  const config = await getWorkspaceConfig();\n  if (config) {\n    const configHost = net.urlBuilder(await config.getHost());\n    if (configHost) return configHost;\n  }\n  const databricksHost = net.urlBuilder(process.env.DATABRICKS_HOST);\n  if (databricksHost) return databricksHost;\n  return undefined;\n}\n\n/**\n * Resolve the numeric workspace id: the workspace `Config`'s `workspaceId`\n * first, else the 10-20 digit run of `workspaceHost` (defaulting to\n * {@link getWorkspaceUrl}'s host). `undefined` when neither yields an id.\n */\nexport async function getWorkspaceId(workspaceHost?: string): Promise<string | undefined> {\n  const workspaceId = (await getWorkspaceConfig())?.workspaceId;\n  if (workspaceId) return workspaceId;\n  workspaceHost = workspaceHost ?? (await getWorkspaceUrl())?.host;\n  if (workspaceHost) {\n    const match = workspaceHost.match(WORKSPACE_ID_REGEX)?.[0];\n    if (match) return match;\n  }\n  return undefined;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-client.js","sourceRoot":"","sources":["../../src/workspace-client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Resolve the current Databricks workspace's URL, numeric id, and client from\n * the active execution context (AppKit, when initialized), a default\n * {@link WorkspaceClient}, or the environment. Server-only.\n *\n * @module\n */\n\nimport {\n  createWorkspaceClient as _createWorkspaceClient,\n  type WorkspaceClient as AppKitWorkspaceClient,\n} from \"@databricks/appkit\";\nimport { tryGetExecutionContext } from \"@dbx-tools/appkit\";\nimport { type AuthClient, type DatabricksAuthOptions, createAuthClient } from \"@dbx-tools/auth\";\nimport { memoize, type UrlBuilder, urlBuilder, trimToUndefined } from \"@dbx-tools/shared-core\";\n\n/** Databricks workspace ids are a 10-20 digit run embedded in the host. */\nconst WORKSPACE_ID_REGEX = /\\d{10,20}/;\nconst workspaceAuth = new WeakMap<AppKitWorkspaceClient, AuthClient>();\n\n/** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */\nexport type WorkspaceClient = ReturnType<AppKitWorkspaceClient[\"toLegacyWorkspaceClient\"]>;\ntype Config = WorkspaceClient[\"config\"];\n\n/**\n * Create an AppKit workspace client whose SDK credential visitor delegates to\n * `@dbx-tools/auth`.\n *\n * The auth package resolves the active profile, host, token lifecycle, and\n * unified-workspace header without requiring callers to mirror profile values\n * into environment variables. The SDK still owns workspace APIs and request\n * execution.\n */\nexport async function createWorkspaceClient(\n  options: DatabricksAuthOptions = {},\n): Promise<AppKitWorkspaceClient> {\n  const auth = await createAuthClient(options);\n  const client = _createWorkspaceClient({ host: auth.host });\n  client.config.credentials = {\n    name: \"pat\",\n    async configure() {\n      return async (headers) => {\n        for (const [name, value] of Object.entries(await auth.headers())) {\n          headers.set(name, value);\n        }\n      };\n    },\n  };\n  workspaceAuth.set(client, auth);\n  return client;\n}\n\n/**\n * Refresh the dbx-tools credential lifecycle attached by\n * {@link createWorkspaceClient}. Returns `false` for externally supplied\n * AppKit clients whose credential owner is unknown.\n */\nexport async function refreshWorkspaceClientAuthentication(\n  client: AppKitWorkspaceClient,\n): Promise<boolean> {\n  const auth = workspaceAuth.get(client);\n  if (!auth) return false;\n  await auth.headers({ login: false, refresh: true });\n  return true;\n}\n\n/** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */\nexport function toLegacyWorkspaceClient(\n  client: AppKitWorkspaceClient | WorkspaceClient,\n): WorkspaceClient {\n  return \"toLegacyWorkspaceClient\" in client ? client.toLegacyWorkspaceClient() : client;\n}\n\n/**\n * Lazily-constructed default `WorkspaceClient` (env / profile auth), memoized so\n * construction happens at most once per process. Used only when there's no\n * AppKit execution context to borrow a client from.\n */\nconst getDefaultWorkspaceClient = memoize(async () =>\n  (await createWorkspaceClient()).toLegacyWorkspaceClient(),\n);\n\n/**\n * The AppKit execution-context workspace client when available, otherwise\n * `undefined`. Never constructs a fallback client and never throws for a\n * missing AppKit scope.\n */\nexport function tryGetWorkspaceClient(): WorkspaceClient | undefined {\n  return tryGetExecutionContext()?.client.toLegacyWorkspaceClient();\n}\n\n/**\n * Resolve a {@link WorkspaceClient}: {@link tryGetWorkspaceClient} first, else\n * a memoized default client from env / profile auth.\n */\nexport async function getWorkspaceClient(): Promise<WorkspaceClient> {\n  return tryGetWorkspaceClient() ?? (await getDefaultWorkspaceClient());\n}\n\n/**\n * The active workspace `Config`: the AppKit execution-context client's config\n * when AppKit is initialized, else the default client's. Returns `undefined`\n * (never throws) when neither is available.\n */\nasync function getWorkspaceConfig(): Promise<Config | undefined> {\n  try {\n    return (await getWorkspaceClient()).config;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Current Databricks username for workspace home paths\n * (`/Workspace/Users/<userName>`).\n *\n * Prefers `userName` on the AppKit execution context when set, otherwise\n * calls `currentUser.me()` on {@link client} (or {@link getWorkspaceClient}).\n */\nexport async function getCurrentUserName(client?: WorkspaceClient): Promise<string> {\n  const contextUser = readContextUserName(tryGetExecutionContext());\n  if (contextUser) return contextUser;\n\n  const resolved = client ?? (await getWorkspaceClient());\n  const me = await resolved.currentUser.me();\n  const userName = me.userName?.trim();\n  if (!userName) {\n    throw new Error(\"Databricks currentUser.me() did not return a userName\");\n  }\n  return userName;\n}\n\n/** Best-effort `userName` off an AppKit execution context (shape varies by mode). */\nfunction readContextUserName(ctx: unknown): string | undefined {\n  if (typeof ctx !== \"object\" || ctx === null || !(\"userName\" in ctx)) return undefined;\n  const value = (ctx as { userName?: unknown }).userName;\n  return trimToUndefined(value);\n}\n\n/**\n * Resolve the current workspace host as a `net.UrlBuilder`: the workspace\n * `Config` host first, then the `DATABRICKS_HOST` env var, else `undefined`.\n */\nexport async function getWorkspaceUrl(): Promise<UrlBuilder | undefined> {\n  const config = await getWorkspaceConfig();\n  if (config) {\n    const configHost = urlBuilder(await config.getHost());\n    if (configHost) return configHost;\n  }\n  const databricksHost = urlBuilder(process.env.DATABRICKS_HOST);\n  if (databricksHost) return databricksHost;\n  return undefined;\n}\n\n/**\n * Resolve the numeric workspace id: the workspace `Config`'s `workspaceId`\n * first, else the 10-20 digit run of `workspaceHost` (defaulting to\n * {@link getWorkspaceUrl}'s host). `undefined` when neither yields an id.\n */\nexport async function getWorkspaceId(workspaceHost?: string): Promise<string | undefined> {\n  const workspaceId = (await getWorkspaceConfig())?.workspaceId;\n  if (workspaceId) return workspaceId;\n  workspaceHost = workspaceHost ?? (await getWorkspaceUrl())?.host;\n  if (workspaceHost) {\n    const match = workspaceHost.match(WORKSPACE_ID_REGEX)?.[0];\n    if (match) return match;\n  }\n  return undefined;\n}\n"]}

package/package.json

@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.153",
-    "@dbx-tools/auth": "^0.9.153",
-    "@dbx-tools/cli-service": "^0.9.153",
-    "@dbx-tools/core": "^0.9.153",
-    "@dbx-tools/shared-core": "^0.9.153",
-    "@dbx-tools/shared-fs": "^0.9.153"
+    "@dbx-tools/appkit": "^0.9.157",
+    "@dbx-tools/auth": "^0.9.157",
+    "@dbx-tools/cli-service": "^0.9.157",
+    "@dbx-tools/core": "^0.9.157",
+    "@dbx-tools/shared-core": "^0.9.157",
+    "@dbx-tools/shared-fs": "^0.9.157"
   },
   "main": "./lib/index.js",
   "license": "Apache-2.0",
@@ -42,34 +42,10 @@
         "types": "./lib/index.d.ts",
         "default": "./lib/index.js"
       },
-      "./cloud": {
-        "types": "./lib/src/cloud.d.ts",
-        "default": "./lib/src/cloud.js"
-      },
-      "./databricks-fs": {
-        "types": "./lib/src/databricks-fs.d.ts",
-        "default": "./lib/src/databricks-fs.js"
-      },
-      "./databricks-path": {
-        "types": "./lib/src/databricks-path.d.ts",
-        "default": "./lib/src/databricks-path.js"
-      },
-      "./net": {
-        "types": "./lib/src/net.d.ts",
-        "default": "./lib/src/net.js"
-      },
-      "./workspace-client": {
-        "types": "./lib/src/workspace-client.d.ts",
-        "default": "./lib/src/workspace-client.js"
-      },
-      "./*": {
-        "types": "./lib/src/*/index.d.ts",
-        "default": "./lib/src/*/index.js"
-      },
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.153",
+  "version": "0.9.157",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [
@@ -82,34 +58,10 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./cloud": {
-      "types": "./lib/src/cloud.d.ts",
-      "default": "./lib/src/cloud.js"
-    },
-    "./databricks-fs": {
-      "types": "./lib/src/databricks-fs.d.ts",
-      "default": "./lib/src/databricks-fs.js"
-    },
-    "./databricks-path": {
-      "types": "./lib/src/databricks-path.d.ts",
-      "default": "./lib/src/databricks-path.js"
-    },
-    "./net": {
-      "types": "./lib/src/net.d.ts",
-      "default": "./lib/src/net.js"
-    },
-    "./workspace-client": {
-      "types": "./lib/src/workspace-client.d.ts",
-      "default": "./lib/src/workspace-client.js"
-    },
-    "./*": {
-      "types": "./lib/src/*/index.d.ts",
-      "default": "./lib/src/*/index.js"
-    },
     "./package.json": "./package.json"
   },
   "files": [
-    "index.ts",
+    "index*.ts",
     "src",
     "lib"
   ],

package/src/cloud.ts

@@ -23,8 +23,21 @@ import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 
-import { file } from "@dbx-tools/core";
-import { errorUtils, functionUtils, hash, http, json, log, net } from "@dbx-tools/shared-core";
+import { statSync } from "@dbx-tools/core";
+import {
+  log,
+  toError,
+  memoize,
+  fnvHash,
+  id,
+  createFetchError,
+  parse,
+  type Cidr,
+  type UrlLike,
+  parseIp,
+  findContainingCidr,
+  parseCidr,
+} from "@dbx-tools/shared-core";
 import { resolveHostIps } from "./net.ts";
 
 const logger = log.logger("cloud");
@@ -67,7 +80,7 @@ export interface CloudLocation {
 }
 
 /** A parsed CIDR block tagged with the region it belongs to. */
-interface RegionCidr extends net.Cidr {
+interface RegionCidr extends Cidr {
   region: string;
 }
 
@@ -96,7 +109,7 @@ interface ProviderRanges {
  * // { provider: CloudProvider.Aws,
  * //   region: "us-west-2", ip: "...", cidr: "..." }
  */
-export async function resolveCloudLocation(input: net.UrlLike): Promise<CloudLocation | null> {
+export async function resolveCloudLocation(input: UrlLike): Promise<CloudLocation | null> {
   const ips = await resolveHostIps(input);
   if (ips.length === 0) {
     logger.debug("no ips resolved", { input: String(input) });
@@ -104,10 +117,10 @@ export async function resolveCloudLocation(input: net.UrlLike): Promise<CloudLoc
   }
   const providers = await loadProviderRanges();
   for (const ip of ips) {
-    const parsed = net.parseIp(ip);
+    const parsed = parseIp(ip);
     if (!parsed) continue;
     for (const { provider, ranges } of providers) {
-      const match = net.findContainingCidr(parsed, ranges);
+      const match = findContainingCidr(parsed, ranges);
       if (match) {
         return { provider, region: match.region, ip, cidr: match.cidr };
       }
@@ -132,7 +145,7 @@ export async function loadProviderRanges(): Promise<ProviderRanges[]> {
     if (result.status === "fulfilled") {
       out.push(result.value);
     } else {
-      logger.warn("provider range load failed", { error: errorUtils.toError(result.reason) });
+      logger.warn("provider range load failed", { error: toError(result.reason) });
     }
   }
   return out;
@@ -142,9 +155,9 @@ export async function loadProviderRanges(): Promise<ProviderRanges[]> {
 // Per-provider cached loaders
 // ────────────────────────────────────────────────────────────────
 
-const loadAwsRanges = functionUtils.memoize(fetchAwsRanges, { ttlMs: RANGE_CACHE_TTL_MS });
-const loadAzureRanges = functionUtils.memoize(fetchAzureRanges, { ttlMs: RANGE_CACHE_TTL_MS });
-const loadGcpRanges = functionUtils.memoize(fetchGcpRanges, { ttlMs: RANGE_CACHE_TTL_MS });
+const loadAwsRanges = memoize(fetchAwsRanges, { ttlMs: RANGE_CACHE_TTL_MS });
+const loadAzureRanges = memoize(fetchAzureRanges, { ttlMs: RANGE_CACHE_TTL_MS });
+const loadGcpRanges = memoize(fetchGcpRanges, { ttlMs: RANGE_CACHE_TTL_MS });
 
 // ────────────────────────────────────────────────────────────────
 // Provider feed fetch + parse
@@ -233,7 +246,7 @@ async function fetchAzureRanges(): Promise<ProviderRanges> {
 /** Parse `cidr` and, when valid and `region` is set, push a tagged range. */
 function addRange(ranges: RegionCidr[], cidr?: string, region?: string): void {
   if (!cidr || !region) return;
-  const parsed = net.parseCidr(cidr);
+  const parsed = parseCidr(cidr);
   if (parsed) ranges.push({ ...parsed, region });
 }
 
@@ -245,7 +258,7 @@ function addRange(ranges: RegionCidr[], cidr?: string, region?: string): void {
  */
 async function fetchJson<T>(url: string): Promise<T> {
   const text = await fetchText(url);
-  const parsed = json.parse<T>(text);
+  const parsed = parse<T>(text);
   if (parsed === undefined) {
     throw new Error(`range feed returned non-JSON content: ${url}`);
   }
@@ -262,7 +275,7 @@ async function fetchJson<T>(url: string): Promise<T> {
 async function fetchText(url: string): Promise<string> {
   const cacheDir = join(tmpdir(), "dbx-tools", "shared", "cloud");
   const cacheDirCreated = await mkdir(cacheDir, { recursive: true });
-  const cachePath = join(cacheDir, `fetch-${hash.fnvHash(url)}.txt`);
+  const cachePath = join(cacheDir, `fetch-${fnvHash(url)}.txt`);
   const createdAt = cacheDirCreated ? undefined : await getCreated(cachePath);
   if (createdAt) {
     const expiresAt = new Date(createdAt.getTime() + RANGE_CACHE_TTL_MS);
@@ -271,11 +284,11 @@ async function fetchText(url: string): Promise<string> {
       return readFile(cachePath, "utf8");
     }
   }
-  let tempPath: string | null = join(cacheDir, `${hash.id()}.txt`);
+  let tempPath: string | null = join(cacheDir, `${id()}.txt`);
   try {
     const response = await fetch(url);
     if (!response.ok) {
-      throw await http.createFetchError(response, url);
+      throw await createFetchError(response, url);
     }
     const responseText = await response.text();
     await mkdir(dirname(tempPath), { recursive: true });
@@ -294,5 +307,5 @@ async function fetchText(url: string): Promise<string> {
 
 /** Birth time of `path`, or `undefined` when it doesn't exist yet. */
 async function getCreated(path: string): Promise<Date | undefined> {
-  return (await file.statSync(path))?.birthtime;
+  return (await statSync(path))?.birthtime;
 }

package/src/databricks-fs.ts

@@ -13,19 +13,19 @@
  * @module
  */
 
-import { hash, object } from "@dbx-tools/shared-core";
+import { fnvHash, toDate } from "@dbx-tools/shared-core";
 import {
   BaseFileSystem,
-  baseFS,
   FileSystemError,
-  posixPath,
   type CopyOptions,
   type FileEntry,
   type FileStat,
   type WriteFileOptions,
+  mapFileSystemError,
+  isHomeRelativePath,
+  basename,
 } from "@dbx-tools/shared-fs";
 import {
-  isHomeRelativePath,
   normalizeDatabricksRoot,
   resolveDatabricksFilesBackend,
   resolveDatabricksRoot,
@@ -121,7 +121,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
   constructor(options: DatabricksFileSystemOptions) {
     const root = normalizeDatabricksRoot(options.root, { userName: options.userName });
     super({
-      id: options.id ?? `databricks-${hash.fnvHash(root)}`,
+      id: options.id ?? `databricks-${fnvHash(root)}`,
       backend: "databricks",
       root,
       readOnly: options.readOnly,
@@ -174,7 +174,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
         },
       });
     } catch (error) {
-      throw baseFS.mapFileSystemError(error, resolvedPath);
+      throw mapFileSystemError(error, resolvedPath);
     }
   }
 
@@ -206,7 +206,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
           }),
       });
     } catch (error) {
-      throw baseFS.mapFileSystemError(error, resolvedPath);
+      throw mapFileSystemError(error, resolvedPath);
     }
   }
 
@@ -306,13 +306,13 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
     return this.dispatch<FileEntry[]>(resolvedPath, {
       dbfs: (client) =>
         collect(client.dbfs.list({ path: resolvedPath }), (info) => ({
-          name: posixPath.basename(info.path ?? ""),
+          name: basename(info.path ?? ""),
           type: info.is_dir ? "directory" : "file",
           size: info.file_size,
         })),
       workspace: (client) =>
         collect(client.workspace.list({ path: resolvedPath }), (info) => ({
-          name: posixPath.basename(info.path ?? ""),
+          name: basename(info.path ?? ""),
           type: info.object_type === "DIRECTORY" ? "directory" : "file",
           metadata: {
             createdAt: info.created_at,
@@ -322,7 +322,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
         })),
       volumes: (client) =>
         collect(client.files.listDirectoryContents({ directory_path: resolvedPath }), (entry) => ({
-          name: entry.name ?? posixPath.basename(entry.path ?? ""),
+          name: entry.name ?? basename(entry.path ?? ""),
           type: entry.is_directory ? "directory" : "file",
           size: entry.file_size,
         })),
@@ -330,13 +330,13 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
   }
 
   protected override async statAt(resolvedPath: string): Promise<Omit<FileStat, "path">> {
-    const fallbackName = posixPath.basename(resolvedPath) || posixPath.basename(this.root);
+    const fallbackName = basename(resolvedPath) || basename(this.root);
     return this.dispatch<Omit<FileStat, "path">>(resolvedPath, {
       dbfs: async (client) => {
         const info = await client.dbfs.getStatus({ path: resolvedPath });
-        const modified = object.toDate(info.modification_time);
+        const modified = toDate(info.modification_time);
         return {
-          name: posixPath.basename(info.path ?? resolvedPath) || fallbackName,
+          name: basename(info.path ?? resolvedPath) || fallbackName,
           type: info.is_dir ? "directory" : "file",
           size: info.file_size,
           createdAt: modified,
@@ -346,10 +346,10 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
       workspace: async (client) => {
         const info = await client.workspace.getStatus({ path: resolvedPath });
         return {
-          name: posixPath.basename(info.path ?? resolvedPath) || fallbackName,
+          name: basename(info.path ?? resolvedPath) || fallbackName,
           type: info.object_type === "DIRECTORY" ? "directory" : "file",
-          createdAt: object.toDate(info.created_at),
-          modifiedAt: object.toDate(info.modified_at),
+          createdAt: toDate(info.created_at),
+          modifiedAt: toDate(info.modified_at),
         };
       },
       volumes: (client) => this.statVolumePath(client, resolvedPath, fallbackName),
@@ -416,7 +416,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
   ): Promise<Omit<FileStat, "path">> {
     try {
       const metadata = await client.files.getMetadata({ file_path: absolutePath });
-      const modified = object.toDate(metadata["last-modified"]);
+      const modified = toDate(metadata["last-modified"]);
       return {
         name: fallbackName,
         type: "file",
@@ -428,7 +428,7 @@ export class DatabricksFileSystem extends BaseFileSystem<"databricks"> {
     } catch (fileErr) {
       // A directory has no file metadata, and an unreadable one reports as
       // missing / denied - both are worth a directory probe before failing.
-      const code = baseFS.mapFileSystemError(fileErr, absolutePath).code;
+      const code = mapFileSystemError(fileErr, absolutePath).code;
       if (code !== "NOT_FOUND" && code !== "PERMISSION_DENIED") throw fileErr;
       await client.files.getDirectoryMetadata({ directory_path: absolutePath });
       return { name: fallbackName, type: "directory" };

package/src/databricks-path.ts

@@ -11,7 +11,13 @@
  * @module
  */
 
-import { posixPath } from "@dbx-tools/shared-fs";
+import {
+  isHomeRelativePath,
+  toPosix,
+  expandHome,
+  normalizeRoot,
+  isAbsolute,
+} from "@dbx-tools/shared-fs";
 import { getCurrentUserName, type WorkspaceClient } from "./workspace-client.ts";
 
 /** Which Databricks Files API serves an absolute path. */
@@ -37,9 +43,6 @@ export interface ResolveDatabricksRootOptions {
   client?: WorkspaceClient;
 }
 
-/** True when {@link input} is `~` or a path under `~/`. See {@link posixPath.isHomeRelativePath}. */
-export const isHomeRelativePath = posixPath.isHomeRelativePath;
-
 /**
  * Expand `~` / `~/...` to `/Workspace/Users/<userName>/...`.
  * Non-home inputs are returned unchanged (POSIX separators only).
@@ -50,9 +53,9 @@ export function expandHomePath(input: string, userName: string): string {
     throw new TypeError("Databricks home expansion requires a non-empty userName");
   }
   if (!isHomeRelativePath(input)) {
-    return posixPath.toPosix(input.trim());
+    return toPosix(input.trim());
   }
-  return posixPath.expandHome(input, `/Workspace/Users/${name}`);
+  return expandHome(input, `/Workspace/Users/${name}`);
 }
 
 /**
@@ -80,26 +83,26 @@ export function normalizeDatabricksRoot(
         `Databricks home path "${root}" requires userName; use resolveDatabricksRoot() or pass userName`,
       );
     }
-    return posixPath.normalizeRoot(expandHomePath(trimmed, options.userName));
+    return normalizeRoot(expandHomePath(trimmed, options.userName));
   }
 
   const threePart = VOLUME_THREE_PART.exec(trimmed);
   if (threePart) {
-    return posixPath.normalizeRoot(`/Volumes/${threePart[1]}/${threePart[2]}/${threePart[3]}`);
+    return normalizeRoot(`/Volumes/${threePart[1]}/${threePart[2]}/${threePart[3]}`);
   }
 
-  let posix = posixPath.toPosix(trimmed);
+  let posix = toPosix(trimmed);
   if (posix === "/Volume" || posix.startsWith("/Volume/")) {
     posix = `/Volumes${posix.slice("/Volume".length)}`;
   }
 
-  if (!posixPath.isAbsolute(posix)) {
+  if (!isAbsolute(posix)) {
     throw new TypeError(
       `Databricks filesystem root must be absolute, catalog.schema.volume, or ~, got: ${root}`,
     );
   }
 
-  return posixPath.normalizeRoot(posix);
+  return normalizeRoot(posix);
 }
 
 /**
@@ -119,7 +122,7 @@ export async function resolveDatabricksRoot(
 
 /** True when {@link absolutePath} is served by the workspace objects API. */
 export function isWorkspaceFilesPath(absolutePath: string): boolean {
-  const p = posixPath.toPosix(absolutePath);
+  const p = toPosix(absolutePath);
   return (
     p === "/Workspace" ||
     p.startsWith("/Workspace/") ||
@@ -131,13 +134,13 @@ export function isWorkspaceFilesPath(absolutePath: string): boolean {
 
 /** True when {@link absolutePath} is a Unity Catalog volume path. */
 export function isVolumesPath(absolutePath: string): boolean {
-  const p = posixPath.toPosix(absolutePath);
+  const p = toPosix(absolutePath);
   return p === "/Volumes" || p.startsWith("/Volumes/");
 }
 
 /** True when {@link absolutePath} is a DBFS path. */
 export function isDbfsPath(absolutePath: string): boolean {
-  const p = posixPath.toPosix(absolutePath);
+  const p = toPosix(absolutePath);
   return p === "/dbfs" || p.startsWith("/dbfs/");
 }
 

package/src/net.ts

@@ -8,14 +8,20 @@
  */
 
 import { lookup } from "node:dns/promises";
-import { functionUtils, http, net } from "@dbx-tools/shared-core";
+import {
+  memoize,
+  createFetchError,
+  type UrlLike,
+  urlBuilder,
+  parseIp,
+} from "@dbx-tools/shared-core";
 
 /**
  * This process's outbound public IP, cached for 5 minutes. Asks Cloudflare's
  * `cdn-cgi/trace` first and falls back to ipify. Useful for allowlisting or for
  * reasoning about egress from a Databricks App.
  */
-export const getPublicIp = functionUtils.memoize(
+export const getPublicIp = memoize(
   async () => {
     const cloudflareResponse = await fetch("https://cloudflare.com/cdn-cgi/trace");
     if (cloudflareResponse.ok) {
@@ -30,7 +36,7 @@ export const getPublicIp = functionUtils.memoize(
     }
     const ipifyResponse = await fetch("https://api.ipify.org?format=json");
     if (!ipifyResponse.ok) {
-      throw await http.createFetchError(ipifyResponse);
+      throw await createFetchError(ipifyResponse);
     }
     const ipifyData = (await ipifyResponse.json()) as { ip?: string };
     const ip = ipifyData?.ip;
@@ -53,11 +59,11 @@ export const getPublicIp = functionUtils.memoize(
  * platform resolver order are honored, matching what an outbound connection to
  * the host would actually use.
  */
-export async function resolveHostIps(input: net.UrlLike): Promise<string[]> {
-  const host = net.urlBuilder(input)?.hostname;
+export async function resolveHostIps(input: UrlLike): Promise<string[]> {
+  const host = urlBuilder(input)?.hostname;
   if (!host) return [];
   // WHATWG `URL.hostname` brackets IPv6 literals; strip before parsing.
-  const literal = net.parseIp(host.replace(/^\[|\]$/g, ""));
+  const literal = parseIp(host.replace(/^\[|\]$/g, ""));
   if (literal) return [host.replace(/^\[|\]$/g, "")];
   try {
     const results = await lookup(host, { all: true });