@dbx-tools/appkit 0.6.90 → 0.6.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.ts +4 -0
- package/lib/index.d.ts +4 -0
- package/lib/index.js +4 -1
- package/lib/src/_cache-storage.d.ts +4 -2
- package/lib/src/_cache-storage.js +31 -7
- package/lib/src/bundle.d.ts +22 -0
- package/lib/src/bundle.js +20 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -3
- package/src/_cache-storage.ts +39 -6
- package/src/bundle.ts +32 -0
package/index.ts
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
|
+
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit";
|
|
5
6
|
export * as appkit from "./src/appkit.ts";
|
|
7
|
+
export * as bundle from "./src/bundle.ts";
|
|
6
8
|
export * as databricks from "./src/databricks.ts";
|
|
7
9
|
export * as identity from "./src/identity.ts";
|
|
8
10
|
export * as interceptor from "./src/interceptor.ts";
|
|
@@ -11,6 +13,8 @@ export * as pgaddress from "./src/pgaddress.ts";
|
|
|
11
13
|
export * as plugin from "./src/plugin.ts";
|
|
12
14
|
export * as provision from "./src/provision.ts";
|
|
13
15
|
export type { AutoConfigureMode, CreateAppConfig, ExecutionContextLike, WorkspaceClientLike } from "./src/appkit.ts";
|
|
16
|
+
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.ts";
|
|
17
|
+
export type { BundleValidateJson, ConfigFile, ConfigMapValue, ConfigSource, ResolveConfigValueOptions } from "./src/bundle.ts";
|
|
14
18
|
export type { ContextLike } from "./src/databricks.ts";
|
|
15
19
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.ts";
|
|
16
20
|
export type { IdentityMode, HeaderBearing } from "./src/identity.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit";
|
|
1
2
|
export * as appkit from "./src/appkit.ts";
|
|
3
|
+
export * as bundle from "./src/bundle.ts";
|
|
2
4
|
export * as databricks from "./src/databricks.ts";
|
|
3
5
|
export * as identity from "./src/identity.ts";
|
|
4
6
|
export * as interceptor from "./src/interceptor.ts";
|
|
@@ -7,6 +9,8 @@ export * as pgaddress from "./src/pgaddress.ts";
|
|
|
7
9
|
export * as plugin from "./src/plugin.ts";
|
|
8
10
|
export * as provision from "./src/provision.ts";
|
|
9
11
|
export type { AutoConfigureMode, CreateAppConfig, ExecutionContextLike, WorkspaceClientLike } from "./src/appkit.ts";
|
|
12
|
+
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.ts";
|
|
13
|
+
export type { BundleValidateJson, ConfigFile, ConfigMapValue, ConfigSource, ResolveConfigValueOptions } from "./src/bundle.ts";
|
|
10
14
|
export type { ContextLike } from "./src/databricks.ts";
|
|
11
15
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.ts";
|
|
12
16
|
export type { IdentityMode, HeaderBearing } from "./src/identity.ts";
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
// GENERATED by projen watch - DO NOT EDIT.
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
|
+
export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit";
|
|
4
5
|
export * as appkit from "./src/appkit.js";
|
|
6
|
+
export * as bundle from "./src/bundle.js";
|
|
5
7
|
export * as databricks from "./src/databricks.js";
|
|
6
8
|
export * as identity from "./src/identity.js";
|
|
7
9
|
export * as interceptor from "./src/interceptor.js";
|
|
@@ -9,7 +11,8 @@ export * as lakebaseResolver from "./src/lakebase-resolver.js";
|
|
|
9
11
|
export * as pgaddress from "./src/pgaddress.js";
|
|
10
12
|
export * as plugin from "./src/plugin.js";
|
|
11
13
|
export * as provision from "./src/provision.js";
|
|
14
|
+
export { bundleAppResourceSchema, flattenAppYamlEnv, flattenAppEnv, getBundlePath } from "./src/bundle.js";
|
|
12
15
|
export { ACCESS_TOKEN_HEADER, USER_ID_HEADER, USER_EMAIL_HEADER, IDENTITY_MODES, DEFAULT_IDENTITY_MODE } from "./src/identity.js";
|
|
13
16
|
export { LifecycleBridgePlugin, lifecycleBridge } from "./src/interceptor.js";
|
|
14
17
|
export { SSL_MODES } from "./src/pgaddress.js";
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxtQkFBbUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxNQUFNLE1BQU0saUJBQWlCLENBQUM7QUFDMUMsT0FBTyxLQUFLLFVBQVUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxXQUFXLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxLQUFLLGdCQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxTQUFTLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssU0FBUyxNQUFNLG9CQUFvQixDQUFDO0FBRWhELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsYUFBYSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHM0csT0FBTyxFQUFFLG1CQUFtQixFQUFFLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxjQUFjLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVsSSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHOUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXRcIjtcbmV4cG9ydCAqIGFzIGFwcGtpdCBmcm9tIFwiLi9zcmMvYXBwa2l0LnRzXCI7XG5leHBvcnQgKiBhcyBidW5kbGUgZnJvbSBcIi4vc3JjL2J1bmRsZS50c1wiO1xuZXhwb3J0ICogYXMgZGF0YWJyaWNrcyBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy50c1wiO1xuZXhwb3J0ICogYXMgaWRlbnRpdHkgZnJvbSBcIi4vc3JjL2lkZW50aXR5LnRzXCI7XG5leHBvcnQgKiBhcyBpbnRlcmNlcHRvciBmcm9tIFwiLi9zcmMvaW50ZXJjZXB0b3IudHNcIjtcbmV4cG9ydCAqIGFzIGxha2ViYXNlUmVzb2x2ZXIgZnJvbSBcIi4vc3JjL2xha2ViYXNlLXJlc29sdmVyLnRzXCI7XG5leHBvcnQgKiBhcyBwZ2FkZHJlc3MgZnJvbSBcIi4vc3JjL3BnYWRkcmVzcy50c1wiO1xuZXhwb3J0ICogYXMgcGx1Z2luIGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCAqIGFzIHByb3Zpc2lvbiBmcm9tIFwiLi9zcmMvcHJvdmlzaW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IEF1dG9Db25maWd1cmVNb2RlLCBDcmVhdGVBcHBDb25maWcsIEV4ZWN1dGlvbkNvbnRleHRMaWtlLCBXb3Jrc3BhY2VDbGllbnRMaWtlIH0gZnJvbSBcIi4vc3JjL2FwcGtpdC50c1wiO1xuZXhwb3J0IHsgYnVuZGxlQXBwUmVzb3VyY2VTY2hlbWEsIGZsYXR0ZW5BcHBZYW1sRW52LCBmbGF0dGVuQXBwRW52LCBnZXRCdW5kbGVQYXRoIH0gZnJvbSBcIi4vc3JjL2J1bmRsZS50c1wiO1xuZXhwb3J0IHR5cGUgeyBCdW5kbGVWYWxpZGF0ZUpzb24sIENvbmZpZ0ZpbGUsIENvbmZpZ01hcFZhbHVlLCBDb25maWdTb3VyY2UsIFJlc29sdmVDb25maWdWYWx1ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvYnVuZGxlLnRzXCI7XG5leHBvcnQgdHlwZSB7IENvbnRleHRMaWtlIH0gZnJvbSBcIi4vc3JjL2RhdGFicmlja3MudHNcIjtcbmV4cG9ydCB7IEFDQ0VTU19UT0tFTl9IRUFERVIsIFVTRVJfSURfSEVBREVSLCBVU0VSX0VNQUlMX0hFQURFUiwgSURFTlRJVFlfTU9ERVMsIERFRkFVTFRfSURFTlRJVFlfTU9ERSB9IGZyb20gXCIuL3NyYy9pZGVudGl0eS50c1wiO1xuZXhwb3J0IHR5cGUgeyBJZGVudGl0eU1vZGUsIEhlYWRlckJlYXJpbmcgfSBmcm9tIFwiLi9zcmMvaWRlbnRpdHkudHNcIjtcbmV4cG9ydCB7IExpZmVjeWNsZUJyaWRnZVBsdWdpbiwgbGlmZWN5Y2xlQnJpZGdlIH0gZnJvbSBcIi4vc3JjL2ludGVyY2VwdG9yLnRzXCI7XG5leHBvcnQgdHlwZSB7IExpZmVjeWNsZUV2ZW50LCBMaWZlY3ljbGVIYW5kbGVyLCBSZXNvbHZlZEFwcEVudiwgQmluZGFibGVQcm9jZXNzLCBJbnRlcmNlcHRvckNvbnRleHQsIEludGVyY2VwdG9yLCBJbnRlcmNlcHRvclJ1bnRpbWUgfSBmcm9tIFwiLi9zcmMvaW50ZXJjZXB0b3IudHNcIjtcbmV4cG9ydCB0eXBlIHsgTGFrZWJhc2VSZXNvbHZlcklucHV0cywgTGFrZWJhc2VDb25uZWN0aW9uIH0gZnJvbSBcIi4vc3JjL2xha2ViYXNlLXJlc29sdmVyLnRzXCI7XG5leHBvcnQgeyBTU0xfTU9ERVMgfSBmcm9tIFwiLi9zcmMvcGdhZGRyZXNzLnRzXCI7XG5leHBvcnQgdHlwZSB7IFNzbE1vZGUsIExha2ViYXNlQ29ubmVjdGlvbklucHV0cywgUGFyc2VkQWRkcmVzcyB9IGZyb20gXCIuL3NyYy9wZ2FkZHJlc3MudHNcIjtcbmV4cG9ydCB0eXBlIHsgUGx1Z2luQ29udGV4dExpa2UgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG4iXX0=
|
|
@@ -19,9 +19,11 @@ type CacheStorage = NonNullable<CacheConfig["storage"]>;
|
|
|
19
19
|
export type PersistentStorageBase = CacheStorage & {
|
|
20
20
|
initialize(): Promise<void>;
|
|
21
21
|
initialized: boolean;
|
|
22
|
+
schemaName?: string;
|
|
23
|
+
tableName?: string;
|
|
22
24
|
};
|
|
23
|
-
/** Soften `initialize()` so
|
|
24
|
-
export declare function softenInitialize(storage: PersistentStorageBase): void;
|
|
25
|
+
/** Soften `initialize()` so an ownership-only migration failure is not fatal. */
|
|
26
|
+
export declare function softenInitialize(storage: PersistentStorageBase, skipMigrations?: () => Promise<boolean>): void;
|
|
25
27
|
/** Verify the migrated cache table can serve the reads and writes AppKit needs. */
|
|
26
28
|
export declare function probeStorage(storage: PersistentStorageBase): Promise<void>;
|
|
27
29
|
/**
|
|
@@ -57,8 +57,30 @@ function loadPersistentStorage() {
|
|
|
57
57
|
return undefined;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
/**
|
|
61
|
-
|
|
60
|
+
/**
|
|
61
|
+
* Whether an existing cache table belongs to another role.
|
|
62
|
+
*
|
|
63
|
+
* PostgreSQL allows granted reads/writes but reserves index DDL for the table
|
|
64
|
+
* owner. Skip AppKit migrations in that case; {@link probeStorage} still proves
|
|
65
|
+
* the existing table can serve the cache before it is accepted.
|
|
66
|
+
*/
|
|
67
|
+
async function tableOwnedByAnotherRole(storage, pool) {
|
|
68
|
+
if (!storage.schemaName || !storage.tableName)
|
|
69
|
+
return false;
|
|
70
|
+
const result = await pool.query(`SELECT pg_get_userbyid(c.relowner) = current_user AS owned
|
|
71
|
+
FROM pg_class c
|
|
72
|
+
JOIN pg_namespace n ON n.oid = c.relnamespace
|
|
73
|
+
WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r', 'p')`, [storage.schemaName, storage.tableName]);
|
|
74
|
+
if (result.rows[0]?.owned !== false)
|
|
75
|
+
return false;
|
|
76
|
+
logger.warn("persistent cache migrations skipped (table owned by another role)", {
|
|
77
|
+
schema: storage.schemaName,
|
|
78
|
+
table: storage.tableName,
|
|
79
|
+
});
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
/** Soften `initialize()` so an ownership-only migration failure is not fatal. */
|
|
83
|
+
export function softenInitialize(storage, skipMigrations) {
|
|
62
84
|
const originalInitialize = storage.initialize.bind(storage);
|
|
63
85
|
let softInitPromise;
|
|
64
86
|
storage.initialize = async () => {
|
|
@@ -66,7 +88,8 @@ export function softenInitialize(storage) {
|
|
|
66
88
|
return;
|
|
67
89
|
softInitPromise ??= (async () => {
|
|
68
90
|
try {
|
|
69
|
-
await
|
|
91
|
+
if (!(await skipMigrations?.()))
|
|
92
|
+
await originalInitialize();
|
|
70
93
|
}
|
|
71
94
|
catch (err) {
|
|
72
95
|
if (!isOwnershipMigrationError(err))
|
|
@@ -119,9 +142,10 @@ export async function createSoftPersistentStorage(cache) {
|
|
|
119
142
|
}
|
|
120
143
|
let pool;
|
|
121
144
|
try {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
145
|
+
const createdPool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });
|
|
146
|
+
pool = createdPool;
|
|
147
|
+
const storage = new PersistentStorage(cache ?? {}, createdPool);
|
|
148
|
+
softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));
|
|
125
149
|
if (!(await storage.healthCheck())) {
|
|
126
150
|
await storage.close().catch(() => { });
|
|
127
151
|
return undefined;
|
|
@@ -140,4 +164,4 @@ export async function createSoftPersistentStorage(cache) {
|
|
|
140
164
|
return undefined;
|
|
141
165
|
}
|
|
142
166
|
}
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_cache-storage.js","sourceRoot":"","sources":["../../src/_cache-storage.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Soft-fail Lakebase cache storage for AppKit's persistent cache.\n *\n * AppKit's `PersistentStorage.initialize()` runs DDL migrations and throws on\n * any step failure. With `cache.strictPersistence: true` that throw makes\n * `CacheManager` silently disable the cache. This wraps the same storage,\n * still runs its migrations, but logs a failed step instead of throwing so a\n * usable table keeps serving.\n *\n * `PersistentStorage` is not on AppKit's public export map. The deep load is\n * lazy and best-effort: if the installed AppKit layout changes, this returns\n * `undefined` and `createApp` leaves AppKit on its default cache path.\n *\n * @module\n */\n\nimport { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\nimport { createLakebasePool, getWorkspaceClient, type CacheConfig } from \"@databricks/appkit\";\nimport { error, hash, log } from \"@dbx-tools/shared-core\";\n\nconst logger = log.logger(\"cache-storage\");\n\n/** Process-wide dedupe for soft migration warnings. */\nconst loggedMigrationErrors = new Set<string>();\n\n/** Whether `LOG_LEVEL` is currently at or below debug. */\nfunction isDebugEnabled(): boolean {\n  return log.isLevelEnabled(\"debug\");\n}\n\n/** Whether a migration failed only because this role does not own an existing object. */\nfunction isOwnershipMigrationError(err: unknown): boolean {\n  return error.errorContext(err).hasMessage(\"must be owner\");\n}\n\ntype LakebasePool = ReturnType<typeof createLakebasePool>;\ntype CacheStorage = NonNullable<CacheConfig[\"storage\"]>;\n\n/** AppKit's internal persistent storage surface. */\nexport type PersistentStorageBase = CacheStorage & {\n  initialize(): Promise<void>;\n  initialized: boolean;\n};\n\ntype PersistentStorageConstructor = new (\n  config: CacheConfig,\n  pool: LakebasePool,\n) => PersistentStorageBase;\n\nlet persistentStorageCtor: PersistentStorageConstructor | undefined | null = null;\n\n/**\n * Lazily resolve AppKit's internal `PersistentStorage` constructor. `null`\n * means not attempted yet; `undefined` means the lookup already failed.\n */\nfunction loadPersistentStorage(): PersistentStorageConstructor | undefined {\n  if (persistentStorageCtor !== null) {\n    return persistentStorageCtor;\n  }\n  try {\n    const require = createRequire(import.meta.url);\n    const modulePath = join(\n      dirname(require.resolve(\"@databricks/appkit\")),\n      \"cache/storage/persistent.js\",\n    );\n    const loaded = require(modulePath).PersistentStorage as\n      PersistentStorageConstructor | undefined;\n    if (typeof loaded !== \"function\") {\n      logger.debug(\"soft persistent cache skipped (PersistentStorage missing)\");\n      persistentStorageCtor = undefined;\n      return undefined;\n    }\n    persistentStorageCtor = loaded;\n    return loaded;\n  } catch (err) {\n    logger.debug(\"soft persistent cache skipped (PersistentStorage unavailable)\", {\n      error: error.errorMessage(err),\n    });\n    persistentStorageCtor = undefined;\n    return undefined;\n  }\n}\n\n/** Soften `initialize()` so a migration failure is logged once, not thrown. */\nexport function softenInitialize(storage: PersistentStorageBase): void {\n  const originalInitialize = storage.initialize.bind(storage);\n  let softInitPromise: Promise<void> | undefined;\n\n  storage.initialize = async () => {\n    if (storage.initialized) return;\n    softInitPromise ??= (async () => {\n      try {\n        await originalInitialize();\n      } catch (err) {\n        if (!isOwnershipMigrationError(err)) throw err;\n        const message = error.errorMessage(err);\n        if (!loggedMigrationErrors.has(message)) {\n          loggedMigrationErrors.add(message);\n          if (isDebugEnabled()) {\n            logger.error(\"persistent cache migration failed\", err);\n          } else {\n            logger.warn(\"persistent cache migration failed\", { error: message });\n          }\n        }\n      }\n    })();\n    try {\n      await softInitPromise;\n      storage.initialized = true;\n    } catch (err) {\n      softInitPromise = undefined;\n      throw err;\n    }\n  };\n}\n\n/** Verify the migrated cache table can serve the reads and writes AppKit needs. */\nexport async function probeStorage(storage: PersistentStorageBase): Promise<void> {\n  const key = `dbx-tools:cache-probe:${hash.id()}`;\n  try {\n    await storage.set(key, { value: key, expiry: Date.now() + 60_000 });\n    const result = await storage.get(key);\n    if (result?.value !== key) {\n      throw new Error(\"persistent cache probe returned an unexpected value\");\n    }\n  } finally {\n    await storage.delete(key).catch(() => undefined);\n  }\n}\n\n/**\n * Build a soft-fail Lakebase cache storage when a pool can be created and\n * AppKit's PersistentStorage can be loaded. Returns `undefined` otherwise so\n * AppKit can fall through to its normal cache path.\n */\nexport async function createSoftPersistentStorage(\n  cache: CacheConfig | undefined,\n): Promise<CacheStorage | undefined> {\n  const PersistentStorage = loadPersistentStorage();\n  if (!PersistentStorage) {\n    return undefined;\n  }\n\n  let pool: LakebasePool | undefined;\n  try {\n    pool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });\n    const storage = new PersistentStorage(cache ?? {}, pool);\n    softenInitialize(storage);\n    if (!(await storage.healthCheck())) {\n      await storage.close().catch(() => {});\n      return undefined;\n    }\n    await storage.initialize();\n    await probeStorage(storage);\n    return storage;\n  } catch (err) {\n    logger.debug(\"soft persistent cache unavailable\", {\n      error: error.errorMessage(err),\n    });\n    if (pool) {\n      await pool.end().catch(() => {});\n    }\n    return undefined;\n  }\n}\n"]}
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_cache-storage.js","sourceRoot":"","sources":["../../src/_cache-storage.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Soft-fail Lakebase cache storage for AppKit's persistent cache.\n *\n * AppKit's `PersistentStorage.initialize()` runs DDL migrations and throws on\n * any step failure. With `cache.strictPersistence: true` that throw makes\n * `CacheManager` silently disable the cache. This wraps the same storage,\n * still runs its migrations, but logs a failed step instead of throwing so a\n * usable table keeps serving.\n *\n * `PersistentStorage` is not on AppKit's public export map. The deep load is\n * lazy and best-effort: if the installed AppKit layout changes, this returns\n * `undefined` and `createApp` leaves AppKit on its default cache path.\n *\n * @module\n */\n\nimport { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\nimport { createLakebasePool, getWorkspaceClient, type CacheConfig } from \"@databricks/appkit\";\nimport { error, hash, log } from \"@dbx-tools/shared-core\";\n\nconst logger = log.logger(\"cache-storage\");\n\n/** Process-wide dedupe for soft migration warnings. */\nconst loggedMigrationErrors = new Set<string>();\n\n/** Whether `LOG_LEVEL` is currently at or below debug. */\nfunction isDebugEnabled(): boolean {\n  return log.isLevelEnabled(\"debug\");\n}\n\n/** Whether a migration failed only because this role does not own an existing object. */\nfunction isOwnershipMigrationError(err: unknown): boolean {\n  return error.errorContext(err).hasMessage(\"must be owner\");\n}\n\ntype LakebasePool = ReturnType<typeof createLakebasePool>;\ntype CacheStorage = NonNullable<CacheConfig[\"storage\"]>;\n\n/** AppKit's internal persistent storage surface. */\nexport type PersistentStorageBase = CacheStorage & {\n  initialize(): Promise<void>;\n  initialized: boolean;\n  schemaName?: string;\n  tableName?: string;\n};\n\ntype PersistentStorageConstructor = new (\n  config: CacheConfig,\n  pool: LakebasePool,\n) => PersistentStorageBase;\n\nlet persistentStorageCtor: PersistentStorageConstructor | undefined | null = null;\n\n/**\n * Lazily resolve AppKit's internal `PersistentStorage` constructor. `null`\n * means not attempted yet; `undefined` means the lookup already failed.\n */\nfunction loadPersistentStorage(): PersistentStorageConstructor | undefined {\n  if (persistentStorageCtor !== null) {\n    return persistentStorageCtor;\n  }\n  try {\n    const require = createRequire(import.meta.url);\n    const modulePath = join(\n      dirname(require.resolve(\"@databricks/appkit\")),\n      \"cache/storage/persistent.js\",\n    );\n    const loaded = require(modulePath).PersistentStorage as\n      PersistentStorageConstructor | undefined;\n    if (typeof loaded !== \"function\") {\n      logger.debug(\"soft persistent cache skipped (PersistentStorage missing)\");\n      persistentStorageCtor = undefined;\n      return undefined;\n    }\n    persistentStorageCtor = loaded;\n    return loaded;\n  } catch (err) {\n    logger.debug(\"soft persistent cache skipped (PersistentStorage unavailable)\", {\n      error: error.errorMessage(err),\n    });\n    persistentStorageCtor = undefined;\n    return undefined;\n  }\n}\n\n/**\n * Whether an existing cache table belongs to another role.\n *\n * PostgreSQL allows granted reads/writes but reserves index DDL for the table\n * owner. Skip AppKit migrations in that case; {@link probeStorage} still proves\n * the existing table can serve the cache before it is accepted.\n */\nasync function tableOwnedByAnotherRole(\n  storage: PersistentStorageBase,\n  pool: LakebasePool,\n): Promise<boolean> {\n  if (!storage.schemaName || !storage.tableName) return false;\n  const result = await pool.query(\n    `SELECT pg_get_userbyid(c.relowner) = current_user AS owned\n     FROM pg_class c\n     JOIN pg_namespace n ON n.oid = c.relnamespace\n     WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r', 'p')`,\n    [storage.schemaName, storage.tableName],\n  );\n  if (result.rows[0]?.owned !== false) return false;\n  logger.warn(\"persistent cache migrations skipped (table owned by another role)\", {\n    schema: storage.schemaName,\n    table: storage.tableName,\n  });\n  return true;\n}\n\n/** Soften `initialize()` so an ownership-only migration failure is not fatal. */\nexport function softenInitialize(\n  storage: PersistentStorageBase,\n  skipMigrations?: () => Promise<boolean>,\n): void {\n  const originalInitialize = storage.initialize.bind(storage);\n  let softInitPromise: Promise<void> | undefined;\n\n  storage.initialize = async () => {\n    if (storage.initialized) return;\n    softInitPromise ??= (async () => {\n      try {\n        if (!(await skipMigrations?.())) await originalInitialize();\n      } catch (err) {\n        if (!isOwnershipMigrationError(err)) throw err;\n        const message = error.errorMessage(err);\n        if (!loggedMigrationErrors.has(message)) {\n          loggedMigrationErrors.add(message);\n          if (isDebugEnabled()) {\n            logger.error(\"persistent cache migration failed\", err);\n          } else {\n            logger.warn(\"persistent cache migration failed\", { error: message });\n          }\n        }\n      }\n    })();\n    try {\n      await softInitPromise;\n      storage.initialized = true;\n    } catch (err) {\n      softInitPromise = undefined;\n      throw err;\n    }\n  };\n}\n\n/** Verify the migrated cache table can serve the reads and writes AppKit needs. */\nexport async function probeStorage(storage: PersistentStorageBase): Promise<void> {\n  const key = `dbx-tools:cache-probe:${hash.id()}`;\n  try {\n    await storage.set(key, { value: key, expiry: Date.now() + 60_000 });\n    const result = await storage.get(key);\n    if (result?.value !== key) {\n      throw new Error(\"persistent cache probe returned an unexpected value\");\n    }\n  } finally {\n    await storage.delete(key).catch(() => undefined);\n  }\n}\n\n/**\n * Build a soft-fail Lakebase cache storage when a pool can be created and\n * AppKit's PersistentStorage can be loaded. Returns `undefined` otherwise so\n * AppKit can fall through to its normal cache path.\n */\nexport async function createSoftPersistentStorage(\n  cache: CacheConfig | undefined,\n): Promise<CacheStorage | undefined> {\n  const PersistentStorage = loadPersistentStorage();\n  if (!PersistentStorage) {\n    return undefined;\n  }\n\n  let pool: LakebasePool | undefined;\n  try {\n    const createdPool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });\n    pool = createdPool;\n    const storage = new PersistentStorage(cache ?? {}, createdPool);\n    softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));\n    if (!(await storage.healthCheck())) {\n      await storage.close().catch(() => {});\n      return undefined;\n    }\n    await storage.initialize();\n    await probeStorage(storage);\n    return storage;\n  } catch (err) {\n    logger.debug(\"soft persistent cache unavailable\", {\n      error: error.errorMessage(err),\n    });\n    if (pool) {\n      await pool.end().catch(() => {});\n    }\n    return undefined;\n  }\n}\n"]}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Compatibility exports for Databricks bundle/app configuration.
|
|
3
|
+
*
|
|
4
|
+
* Configuration sources, file loading, flattening, resource references, and
|
|
5
|
+
* name normalization live in `@dbx-tools/core`'s `config` module.
|
|
6
|
+
*
|
|
7
|
+
* @module
|
|
8
|
+
*/
|
|
9
|
+
import { config as coreConfig } from "@dbx-tools/core";
|
|
10
|
+
export type BundleValidateJson = Record<string, unknown>;
|
|
11
|
+
export type ConfigFile = coreConfig.ConfigFile;
|
|
12
|
+
export type ConfigMapValue = coreConfig.ConfigMapValue;
|
|
13
|
+
export type ConfigSource = coreConfig.ConfigSource;
|
|
14
|
+
export type ResolveConfigValueOptions = coreConfig.ConfigOptions;
|
|
15
|
+
export declare const bundleAppResourceSchema: import("zod").ZodObject<{
|
|
16
|
+
name: import("zod").ZodOptional<import("zod").ZodString>;
|
|
17
|
+
}, import("zod/v4/core").$loose>;
|
|
18
|
+
export declare const flattenAppYamlEnv: typeof coreConfig.flattenAppEnv;
|
|
19
|
+
export declare const flattenAppEnv: typeof coreConfig.flattenBundleEnv;
|
|
20
|
+
export declare const getBundlePath: typeof coreConfig.getBundlePath;
|
|
21
|
+
export declare function bundle(cwd?: string): Promise<ConfigFile | undefined>;
|
|
22
|
+
export declare function resolveConfigValue(name: string, options?: ResolveConfigValueOptions): Promise<string | undefined>;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Compatibility exports for Databricks bundle/app configuration.
|
|
3
|
+
*
|
|
4
|
+
* Configuration sources, file loading, flattening, resource references, and
|
|
5
|
+
* name normalization live in `@dbx-tools/core`'s `config` module.
|
|
6
|
+
*
|
|
7
|
+
* @module
|
|
8
|
+
*/
|
|
9
|
+
import { config as coreConfig } from "@dbx-tools/core";
|
|
10
|
+
export const bundleAppResourceSchema = coreConfig.bundleResourceSchema;
|
|
11
|
+
export const flattenAppYamlEnv = coreConfig.flattenAppEnv;
|
|
12
|
+
export const flattenAppEnv = coreConfig.flattenBundleEnv;
|
|
13
|
+
export const getBundlePath = coreConfig.getBundlePath;
|
|
14
|
+
export function bundle(cwd) {
|
|
15
|
+
return Promise.resolve(coreConfig.bundleFile(cwd));
|
|
16
|
+
}
|
|
17
|
+
export function resolveConfigValue(name, options = {}) {
|
|
18
|
+
return Promise.resolve(coreConfig.resolveValue(name, options));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2J1bmRsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztHQU9HO0FBRUgsT0FBTyxFQUFFLE1BQU0sSUFBSSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQVF2RCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUM7QUFDdkUsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQztBQUMxRCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDO0FBQ3pELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDO0FBRXRELE1BQU0sVUFBVSxNQUFNLENBQUMsR0FBWTtJQUNqQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0FBQ3JELENBQUM7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQ2hDLElBQVksRUFDWixVQUFxQyxFQUFFO0lBRXZDLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0FBQ2pFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvbXBhdGliaWxpdHkgZXhwb3J0cyBmb3IgRGF0YWJyaWNrcyBidW5kbGUvYXBwIGNvbmZpZ3VyYXRpb24uXG4gKlxuICogQ29uZmlndXJhdGlvbiBzb3VyY2VzLCBmaWxlIGxvYWRpbmcsIGZsYXR0ZW5pbmcsIHJlc291cmNlIHJlZmVyZW5jZXMsIGFuZFxuICogbmFtZSBub3JtYWxpemF0aW9uIGxpdmUgaW4gYEBkYngtdG9vbHMvY29yZWAncyBgY29uZmlnYCBtb2R1bGUuXG4gKlxuICogQG1vZHVsZVxuICovXG5cbmltcG9ydCB7IGNvbmZpZyBhcyBjb3JlQ29uZmlnIH0gZnJvbSBcIkBkYngtdG9vbHMvY29yZVwiO1xuXG5leHBvcnQgdHlwZSBCdW5kbGVWYWxpZGF0ZUpzb24gPSBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPjtcbmV4cG9ydCB0eXBlIENvbmZpZ0ZpbGUgPSBjb3JlQ29uZmlnLkNvbmZpZ0ZpbGU7XG5leHBvcnQgdHlwZSBDb25maWdNYXBWYWx1ZSA9IGNvcmVDb25maWcuQ29uZmlnTWFwVmFsdWU7XG5leHBvcnQgdHlwZSBDb25maWdTb3VyY2UgPSBjb3JlQ29uZmlnLkNvbmZpZ1NvdXJjZTtcbmV4cG9ydCB0eXBlIFJlc29sdmVDb25maWdWYWx1ZU9wdGlvbnMgPSBjb3JlQ29uZmlnLkNvbmZpZ09wdGlvbnM7XG5cbmV4cG9ydCBjb25zdCBidW5kbGVBcHBSZXNvdXJjZVNjaGVtYSA9IGNvcmVDb25maWcuYnVuZGxlUmVzb3VyY2VTY2hlbWE7XG5leHBvcnQgY29uc3QgZmxhdHRlbkFwcFlhbWxFbnYgPSBjb3JlQ29uZmlnLmZsYXR0ZW5BcHBFbnY7XG5leHBvcnQgY29uc3QgZmxhdHRlbkFwcEVudiA9IGNvcmVDb25maWcuZmxhdHRlbkJ1bmRsZUVudjtcbmV4cG9ydCBjb25zdCBnZXRCdW5kbGVQYXRoID0gY29yZUNvbmZpZy5nZXRCdW5kbGVQYXRoO1xuXG5leHBvcnQgZnVuY3Rpb24gYnVuZGxlKGN3ZD86IHN0cmluZyk6IFByb21pc2U8Q29uZmlnRmlsZSB8IHVuZGVmaW5lZD4ge1xuICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKGNvcmVDb25maWcuYnVuZGxlRmlsZShjd2QpKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVDb25maWdWYWx1ZShcbiAgbmFtZTogc3RyaW5nLFxuICBvcHRpb25zOiBSZXNvbHZlQ29uZmlnVmFsdWVPcHRpb25zID0ge30sXG4pOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD4ge1xuICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKGNvcmVDb25maWcucmVzb2x2ZVZhbHVlKG5hbWUsIG9wdGlvbnMpKTtcbn1cbiJdfQ==
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/_cache-storage.ts","../src/appkit.ts","../src/databricks.ts","../src/identity.ts","../src/interceptor.ts","../src/lakebase-resolver.ts","../src/pgaddress.ts","../src/plugin.ts","../src/provision.ts","../index.ts"],"version":"5.9.3"}
|
|
1
|
+
{"root":["../src/_cache-storage.ts","../src/appkit.ts","../src/bundle.ts","../src/databricks.ts","../src/identity.ts","../src/interceptor.ts","../src/lakebase-resolver.ts","../src/pgaddress.ts","../src/plugin.ts","../src/provision.ts","../index.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@databricks/appkit": "^0.43.0",
|
|
22
|
+
"@dbx-tools/test-polyglot": "0.6.91",
|
|
22
23
|
"@types/bun": "^1.3.14",
|
|
23
24
|
"@types/node": "^24.6.0",
|
|
24
25
|
"typescript": "^5.9.3"
|
|
@@ -28,8 +29,9 @@
|
|
|
28
29
|
},
|
|
29
30
|
"dependencies": {
|
|
30
31
|
"@databricks/sdk-experimental": "^0.17.0",
|
|
31
|
-
"@dbx-tools/core": "0.6.
|
|
32
|
-
"@dbx-tools/shared-core": "0.6.
|
|
32
|
+
"@dbx-tools/core": "0.6.91",
|
|
33
|
+
"@dbx-tools/shared-core": "0.6.91",
|
|
34
|
+
"zod": "4.3.6"
|
|
33
35
|
},
|
|
34
36
|
"main": "./lib/index.js",
|
|
35
37
|
"license": "UNLICENSED",
|
|
@@ -45,7 +47,7 @@
|
|
|
45
47
|
"./package.json": "./package.json"
|
|
46
48
|
}
|
|
47
49
|
},
|
|
48
|
-
"version": "0.6.
|
|
50
|
+
"version": "0.6.91",
|
|
49
51
|
"types": "./lib/index.d.ts",
|
|
50
52
|
"type": "module",
|
|
51
53
|
"exports": {
|
package/src/_cache-storage.ts
CHANGED
|
@@ -41,6 +41,8 @@ type CacheStorage = NonNullable<CacheConfig["storage"]>;
|
|
|
41
41
|
export type PersistentStorageBase = CacheStorage & {
|
|
42
42
|
initialize(): Promise<void>;
|
|
43
43
|
initialized: boolean;
|
|
44
|
+
schemaName?: string;
|
|
45
|
+
tableName?: string;
|
|
44
46
|
};
|
|
45
47
|
|
|
46
48
|
type PersistentStorageConstructor = new (
|
|
@@ -82,8 +84,38 @@ function loadPersistentStorage(): PersistentStorageConstructor | undefined {
|
|
|
82
84
|
}
|
|
83
85
|
}
|
|
84
86
|
|
|
85
|
-
/**
|
|
86
|
-
|
|
87
|
+
/**
|
|
88
|
+
* Whether an existing cache table belongs to another role.
|
|
89
|
+
*
|
|
90
|
+
* PostgreSQL allows granted reads/writes but reserves index DDL for the table
|
|
91
|
+
* owner. Skip AppKit migrations in that case; {@link probeStorage} still proves
|
|
92
|
+
* the existing table can serve the cache before it is accepted.
|
|
93
|
+
*/
|
|
94
|
+
async function tableOwnedByAnotherRole(
|
|
95
|
+
storage: PersistentStorageBase,
|
|
96
|
+
pool: LakebasePool,
|
|
97
|
+
): Promise<boolean> {
|
|
98
|
+
if (!storage.schemaName || !storage.tableName) return false;
|
|
99
|
+
const result = await pool.query(
|
|
100
|
+
`SELECT pg_get_userbyid(c.relowner) = current_user AS owned
|
|
101
|
+
FROM pg_class c
|
|
102
|
+
JOIN pg_namespace n ON n.oid = c.relnamespace
|
|
103
|
+
WHERE n.nspname = $1 AND c.relname = $2 AND c.relkind IN ('r', 'p')`,
|
|
104
|
+
[storage.schemaName, storage.tableName],
|
|
105
|
+
);
|
|
106
|
+
if (result.rows[0]?.owned !== false) return false;
|
|
107
|
+
logger.warn("persistent cache migrations skipped (table owned by another role)", {
|
|
108
|
+
schema: storage.schemaName,
|
|
109
|
+
table: storage.tableName,
|
|
110
|
+
});
|
|
111
|
+
return true;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/** Soften `initialize()` so an ownership-only migration failure is not fatal. */
|
|
115
|
+
export function softenInitialize(
|
|
116
|
+
storage: PersistentStorageBase,
|
|
117
|
+
skipMigrations?: () => Promise<boolean>,
|
|
118
|
+
): void {
|
|
87
119
|
const originalInitialize = storage.initialize.bind(storage);
|
|
88
120
|
let softInitPromise: Promise<void> | undefined;
|
|
89
121
|
|
|
@@ -91,7 +123,7 @@ export function softenInitialize(storage: PersistentStorageBase): void {
|
|
|
91
123
|
if (storage.initialized) return;
|
|
92
124
|
softInitPromise ??= (async () => {
|
|
93
125
|
try {
|
|
94
|
-
await originalInitialize();
|
|
126
|
+
if (!(await skipMigrations?.())) await originalInitialize();
|
|
95
127
|
} catch (err) {
|
|
96
128
|
if (!isOwnershipMigrationError(err)) throw err;
|
|
97
129
|
const message = error.errorMessage(err);
|
|
@@ -144,9 +176,10 @@ export async function createSoftPersistentStorage(
|
|
|
144
176
|
|
|
145
177
|
let pool: LakebasePool | undefined;
|
|
146
178
|
try {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
179
|
+
const createdPool = createLakebasePool({ workspaceClient: getWorkspaceClient({}) });
|
|
180
|
+
pool = createdPool;
|
|
181
|
+
const storage = new PersistentStorage(cache ?? {}, createdPool);
|
|
182
|
+
softenInitialize(storage, () => tableOwnedByAnotherRole(storage, createdPool));
|
|
150
183
|
if (!(await storage.healthCheck())) {
|
|
151
184
|
await storage.close().catch(() => {});
|
|
152
185
|
return undefined;
|
package/src/bundle.ts
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Compatibility exports for Databricks bundle/app configuration.
|
|
3
|
+
*
|
|
4
|
+
* Configuration sources, file loading, flattening, resource references, and
|
|
5
|
+
* name normalization live in `@dbx-tools/core`'s `config` module.
|
|
6
|
+
*
|
|
7
|
+
* @module
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { config as coreConfig } from "@dbx-tools/core";
|
|
11
|
+
|
|
12
|
+
export type BundleValidateJson = Record<string, unknown>;
|
|
13
|
+
export type ConfigFile = coreConfig.ConfigFile;
|
|
14
|
+
export type ConfigMapValue = coreConfig.ConfigMapValue;
|
|
15
|
+
export type ConfigSource = coreConfig.ConfigSource;
|
|
16
|
+
export type ResolveConfigValueOptions = coreConfig.ConfigOptions;
|
|
17
|
+
|
|
18
|
+
export const bundleAppResourceSchema = coreConfig.bundleResourceSchema;
|
|
19
|
+
export const flattenAppYamlEnv = coreConfig.flattenAppEnv;
|
|
20
|
+
export const flattenAppEnv = coreConfig.flattenBundleEnv;
|
|
21
|
+
export const getBundlePath = coreConfig.getBundlePath;
|
|
22
|
+
|
|
23
|
+
export function bundle(cwd?: string): Promise<ConfigFile | undefined> {
|
|
24
|
+
return Promise.resolve(coreConfig.bundleFile(cwd));
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export function resolveConfigValue(
|
|
28
|
+
name: string,
|
|
29
|
+
options: ResolveConfigValueOptions = {},
|
|
30
|
+
): Promise<string | undefined> {
|
|
31
|
+
return Promise.resolve(coreConfig.resolveValue(name, options));
|
|
32
|
+
}
|