@temporalio/envconfig 1.16.1 → 1.17.1
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/lib/envconfig-toml.d.ts +1 -1
- package/lib/envconfig-toml.js +16 -13
- package/lib/envconfig-toml.js.map +1 -1
- package/lib/envconfig.d.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js.map +1 -1
- package/lib/utils.d.ts +2 -2
- package/lib/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/envconfig-toml.ts +19 -15
- package/src/envconfig.ts +1 -1
- package/src/index.ts +1 -0
- package/src/utils.ts +3 -2
package/lib/envconfig-toml.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
1
|
+
import type { LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
2
2
|
export declare function normalizeGrpcMetaKey(key: string): string;
|
|
3
3
|
/**
|
|
4
4
|
* Raw TOML structure representing the client configuration file.
|
package/lib/envconfig-toml.js
CHANGED
|
@@ -138,9 +138,9 @@ function strictValidateTomlStructure(parsed) {
|
|
|
138
138
|
}
|
|
139
139
|
function getFallbackConfigData(envProvider) {
|
|
140
140
|
// configSource was not set - fallback to TEMPORAL_CONFIG_FILE, then the default file path
|
|
141
|
-
|
|
141
|
+
const filePath = envProvider['TEMPORAL_CONFIG_FILE'] ?? getDefaultConfigFilePath(envProvider);
|
|
142
142
|
if (filePath === undefined) {
|
|
143
|
-
|
|
143
|
+
return undefined;
|
|
144
144
|
}
|
|
145
145
|
return (0, fs_1.readFileSync)(filePath, { encoding: 'utf-8' });
|
|
146
146
|
}
|
|
@@ -237,40 +237,43 @@ function envVarToBool(envVar) {
|
|
|
237
237
|
}
|
|
238
238
|
const DEFAULT_CONFIG_FILE_PROFILE = 'default';
|
|
239
239
|
const DEFAULT_CONFIG_FILE = 'temporal.toml';
|
|
240
|
-
function getDefaultConfigFilePath() {
|
|
241
|
-
const configDir = getUserConfigDir();
|
|
240
|
+
function getDefaultConfigFilePath(envProvider) {
|
|
241
|
+
const configDir = getUserConfigDir(envProvider);
|
|
242
|
+
if (configDir === undefined) {
|
|
243
|
+
return undefined;
|
|
244
|
+
}
|
|
242
245
|
const configPath = path.join(configDir, 'temporalio', DEFAULT_CONFIG_FILE);
|
|
243
246
|
return configPath;
|
|
244
247
|
}
|
|
245
|
-
function getUserConfigDir() {
|
|
248
|
+
function getUserConfigDir(envProvider) {
|
|
246
249
|
const platform = os.platform();
|
|
247
250
|
switch (platform) {
|
|
248
251
|
case 'win32': {
|
|
249
|
-
const dir =
|
|
252
|
+
const dir = envProvider['APPDATA'];
|
|
250
253
|
if (!dir) {
|
|
251
|
-
|
|
254
|
+
return undefined;
|
|
252
255
|
}
|
|
253
256
|
return dir;
|
|
254
257
|
}
|
|
255
258
|
case 'darwin': {
|
|
256
|
-
const dir =
|
|
259
|
+
const dir = envProvider['HOME'];
|
|
257
260
|
if (!dir) {
|
|
258
|
-
|
|
261
|
+
return undefined;
|
|
259
262
|
}
|
|
260
263
|
return path.join(dir, 'Library', 'Application Support');
|
|
261
264
|
}
|
|
262
265
|
default: {
|
|
263
266
|
// Unix/Linux
|
|
264
|
-
let dir =
|
|
267
|
+
let dir = envProvider['XDG_CONFIG_HOME'];
|
|
265
268
|
if (!dir) {
|
|
266
|
-
const home =
|
|
269
|
+
const home = envProvider['HOME'];
|
|
267
270
|
if (!home) {
|
|
268
|
-
|
|
271
|
+
return undefined;
|
|
269
272
|
}
|
|
270
273
|
dir = path.join(home, '.config');
|
|
271
274
|
}
|
|
272
275
|
else if (!path.isAbsolute(dir)) {
|
|
273
|
-
|
|
276
|
+
return undefined;
|
|
274
277
|
}
|
|
275
278
|
return dir;
|
|
276
279
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envconfig-toml.js","sourceRoot":"","sources":["../src/envconfig-toml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"envconfig-toml.js","sourceRoot":"","sources":["../src/envconfig-toml.ts"],"names":[],"mappings":"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"}
|
package/lib/envconfig.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { TLSConfig } from '@temporalio/common/lib/internal-non-workflow';
|
|
2
|
-
import { ClientConfig, ClientConfigFromTomlOptions, ClientConfigProfile, ClientConfigTLS, ClientConnectConfig, LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
2
|
+
import type { ClientConfig, ClientConfigFromTomlOptions, ClientConfigProfile, ClientConfigTLS, ClientConnectConfig, LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
3
3
|
export declare function loadClientConfig(options: LoadClientConfigOptions): ClientConfig;
|
|
4
4
|
export declare function loadClientConfigFromToml(tomlData: Uint8Array, options: ClientConfigFromTomlOptions): ClientConfig;
|
|
5
5
|
export declare function clientConfigToToml(config: ClientConfig): Uint8Array;
|
package/lib/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { loadClientConfig, loadClientConfigProfile, loadClientConnectConfig, loadClientConfigFromToml, clientConfigToToml, toClientOptions, } from './envconfig';
|
|
2
|
-
export { ClientConfig, ClientConfigProfile, ClientConfigTLS, LoadClientConfigOptions, LoadClientProfileOptions, ClientConfigFromTomlOptions, ConfigDataSource, } from './types';
|
|
2
|
+
export { ClientConfig, ClientConfigProfile, ClientConfigTLS, ClientConnectConfig, LoadClientConfigOptions, LoadClientProfileOptions, ClientConfigFromTomlOptions, ConfigDataSource, } from './types';
|
|
3
3
|
export { fromTomlConfig, fromTomlProfile, toTomlConfig, toTomlProfile, loadConfigData } from './utils';
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,yCAOqB;AANnB,6GAAA,gBAAgB,OAAA;AAChB,oHAAA,uBAAuB,OAAA;AACvB,oHAAA,uBAAuB,OAAA;AACvB,qHAAA,wBAAwB,OAAA;AACxB,+GAAA,kBAAkB,OAAA;AAClB,4GAAA,eAAe,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,yCAOqB;AANnB,6GAAA,gBAAgB,OAAA;AAChB,oHAAA,uBAAuB,OAAA;AACvB,oHAAA,uBAAuB,OAAA;AACvB,qHAAA,wBAAwB,OAAA;AACxB,+GAAA,kBAAkB,OAAA;AAClB,4GAAA,eAAe,OAAA;AAcjB,iCAAuG;AAA9F,uGAAA,cAAc,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAE,sGAAA,aAAa,OAAA;AAAE,uGAAA,cAAc,OAAA"}
|
package/lib/utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ClientConfigProfile, ClientConfigTLS, ClientConfig, ConfigDataSource } from './types';
|
|
2
|
-
import { TomlClientConfig, TomlClientConfigProfile, TomlClientConfigTLS } from './envconfig-toml';
|
|
1
|
+
import type { ClientConfigProfile, ClientConfigTLS, ClientConfig, ConfigDataSource } from './types';
|
|
2
|
+
import type { TomlClientConfig, TomlClientConfigProfile, TomlClientConfigTLS } from './envconfig-toml';
|
|
3
3
|
/**
|
|
4
4
|
* Loads configuration data from a {@link ConfigDataSource} and returns it as a Uint8Array.
|
|
5
5
|
*/
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@temporalio/envconfig",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.17.1",
|
|
4
4
|
"description": "Temporal.io SDK Environment Configuration sub-package",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
"license": "MIT",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"smol-toml": "^1.6.1",
|
|
17
|
-
"@temporalio/common": "1.
|
|
17
|
+
"@temporalio/common": "1.17.1"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@temporalio/worker": "1.
|
|
20
|
+
"@temporalio/worker": "1.17.1"
|
|
21
21
|
},
|
|
22
22
|
"engines": {
|
|
23
23
|
"node": ">= 20.0.0"
|
package/src/envconfig-toml.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { readFileSync } from 'fs';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as os from 'os';
|
|
4
|
-
import {
|
|
4
|
+
import type { TomlTable } from 'smol-toml';
|
|
5
|
+
import { parse, stringify } from 'smol-toml';
|
|
5
6
|
import { filterNullAndUndefined } from '@temporalio/common/lib/internal-workflow/objects-helpers';
|
|
6
7
|
import { decode, encode } from '@temporalio/common/lib/encoding';
|
|
7
|
-
import { ConfigDataSource, LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
8
|
+
import type { ConfigDataSource, LoadClientConfigOptions, LoadClientProfileOptions } from './types';
|
|
8
9
|
|
|
9
10
|
export function normalizeGrpcMetaKey(key: string): string {
|
|
10
11
|
return key.toLocaleLowerCase().replace('_', '-');
|
|
@@ -180,9 +181,9 @@ function strictValidateTomlStructure(parsed: TomlTable): void {
|
|
|
180
181
|
|
|
181
182
|
function getFallbackConfigData(envProvider: Record<string, string | undefined>): string | undefined {
|
|
182
183
|
// configSource was not set - fallback to TEMPORAL_CONFIG_FILE, then the default file path
|
|
183
|
-
|
|
184
|
+
const filePath = envProvider['TEMPORAL_CONFIG_FILE'] ?? getDefaultConfigFilePath(envProvider);
|
|
184
185
|
if (filePath === undefined) {
|
|
185
|
-
|
|
186
|
+
return undefined;
|
|
186
187
|
}
|
|
187
188
|
return readFileSync(filePath, { encoding: 'utf-8' });
|
|
188
189
|
}
|
|
@@ -293,43 +294,46 @@ function envVarToBool(envVar?: string): boolean | undefined {
|
|
|
293
294
|
const DEFAULT_CONFIG_FILE_PROFILE = 'default';
|
|
294
295
|
const DEFAULT_CONFIG_FILE = 'temporal.toml';
|
|
295
296
|
|
|
296
|
-
function getDefaultConfigFilePath(): string {
|
|
297
|
-
const configDir = getUserConfigDir();
|
|
297
|
+
function getDefaultConfigFilePath(envProvider: Record<string, string | undefined>): string | undefined {
|
|
298
|
+
const configDir = getUserConfigDir(envProvider);
|
|
299
|
+
if (configDir === undefined) {
|
|
300
|
+
return undefined;
|
|
301
|
+
}
|
|
298
302
|
const configPath = path.join(configDir, 'temporalio', DEFAULT_CONFIG_FILE);
|
|
299
303
|
return configPath;
|
|
300
304
|
}
|
|
301
305
|
|
|
302
|
-
function getUserConfigDir(): string {
|
|
306
|
+
function getUserConfigDir(envProvider: Record<string, string | undefined>): string | undefined {
|
|
303
307
|
const platform = os.platform();
|
|
304
308
|
|
|
305
309
|
switch (platform) {
|
|
306
310
|
case 'win32': {
|
|
307
|
-
const dir =
|
|
311
|
+
const dir = envProvider['APPDATA'];
|
|
308
312
|
if (!dir) {
|
|
309
|
-
|
|
313
|
+
return undefined;
|
|
310
314
|
}
|
|
311
315
|
return dir;
|
|
312
316
|
}
|
|
313
317
|
|
|
314
318
|
case 'darwin': {
|
|
315
|
-
const dir =
|
|
319
|
+
const dir = envProvider['HOME'];
|
|
316
320
|
if (!dir) {
|
|
317
|
-
|
|
321
|
+
return undefined;
|
|
318
322
|
}
|
|
319
323
|
return path.join(dir, 'Library', 'Application Support');
|
|
320
324
|
}
|
|
321
325
|
|
|
322
326
|
default: {
|
|
323
327
|
// Unix/Linux
|
|
324
|
-
let dir =
|
|
328
|
+
let dir = envProvider['XDG_CONFIG_HOME'];
|
|
325
329
|
if (!dir) {
|
|
326
|
-
const home =
|
|
330
|
+
const home = envProvider['HOME'];
|
|
327
331
|
if (!home) {
|
|
328
|
-
|
|
332
|
+
return undefined;
|
|
329
333
|
}
|
|
330
334
|
dir = path.join(home, '.config');
|
|
331
335
|
} else if (!path.isAbsolute(dir)) {
|
|
332
|
-
|
|
336
|
+
return undefined;
|
|
333
337
|
}
|
|
334
338
|
return dir;
|
|
335
339
|
}
|
package/src/envconfig.ts
CHANGED
package/src/index.ts
CHANGED
package/src/utils.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { readFileSync } from 'fs';
|
|
2
2
|
import { filterNullAndUndefined } from '@temporalio/common/lib/internal-workflow';
|
|
3
3
|
import { encode, decode } from '@temporalio/common/lib/encoding';
|
|
4
|
-
import { ClientConfigProfile, ClientConfigTLS, ClientConfig, ConfigDataSource } from './types';
|
|
5
|
-
import {
|
|
4
|
+
import type { ClientConfigProfile, ClientConfigTLS, ClientConfig, ConfigDataSource } from './types';
|
|
5
|
+
import type { TomlClientConfig, TomlClientConfigProfile, TomlClientConfigTLS } from './envconfig-toml';
|
|
6
|
+
import { normalizeGrpcMetaKey } from './envconfig-toml';
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* Loads configuration data from a {@link ConfigDataSource} and returns it as a Uint8Array.
|