@prosopo/dotenv 2.6.1 → 3.0.4

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.
Files changed (7) hide show
  1. package/CHANGELOG.md +52 -0
  2. package/dist/cjs/env.cjs +18 -10
  3. package/dist/env.d.ts.map +1 -1
  4. package/dist/env.js +18 -6
  5. package/dist/env.js.map +1 -1
  6. package/package.json +12 -7
  7. package/vite.test.config.ts +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,57 @@
1
1
  # @prosopo/dotenv
2
2
 
3
+ ## 3.0.4
4
+ ### Patch Changes
5
+
6
+ - Updated dependencies [745cc89]
7
+ - @prosopo/config@3.1.0
8
+
9
+ ## 3.0.3
10
+ ### Patch Changes
11
+
12
+ - Updated dependencies [5619b4b]
13
+ - @prosopo/config@3.0.1
14
+
15
+ ## 3.0.2
16
+ ### Patch Changes
17
+
18
+ - @prosopo/common@3.0.2
19
+
20
+ ## 3.0.1
21
+ ### Patch Changes
22
+
23
+ - @prosopo/common@3.0.1
24
+
25
+ ## 3.0.0
26
+ ### Major Changes
27
+
28
+ - 64b5bcd: Access Controls
29
+
30
+ ### Patch Changes
31
+
32
+ - Updated dependencies [64b5bcd]
33
+ - @prosopo/common@3.0.0
34
+ - @prosopo/config@3.0.0
35
+
36
+ ## 2.6.4
37
+ ### Patch Changes
38
+
39
+ - 86c22b8: structured logging
40
+ - Updated dependencies [86c22b8]
41
+ - @prosopo/common@2.7.2
42
+ - @prosopo/config@2.6.1
43
+
44
+ ## 2.6.3
45
+ ### Patch Changes
46
+
47
+ - @prosopo/common@2.7.1
48
+
49
+ ## 2.6.2
50
+ ### Patch Changes
51
+
52
+ - Updated dependencies [8f0644a]
53
+ - @prosopo/common@2.7.0
54
+
3
55
  ## 2.6.1
4
56
 
5
57
  ### Patch Changes
package/dist/cjs/env.cjs CHANGED
@@ -8,8 +8,8 @@ const dotenv = require("dotenv");
8
8
  const __filename$1 = node_url.fileURLToPath(module);
9
9
  const __dirname$1 = path.dirname(__filename$1);
10
10
  const logger = common.getLogger(
11
- process.env.PROSOPO_LOG_LEVEL || common.LogLevel.enum.info,
12
- "env"
11
+ common.parseLogLevel(process.env.PROSOPO_LOG_LEVEL, common.LogLevel.enum.info),
12
+ module
13
13
  );
14
14
  function getEnv() {
15
15
  if (process.env.NODE_ENV) {
@@ -25,7 +25,10 @@ function loadEnv(rootDir, filename, filePath, nodeEnv, override = false) {
25
25
  nodeEnv
26
26
  );
27
27
  const args = { path: envPath, override };
28
- logger.info(`Loading env from ${envPath}`);
28
+ logger.info(() => ({
29
+ data: { envPath },
30
+ msg: "Loading env"
31
+ }));
29
32
  dotenv.config(args);
30
33
  return envPath;
31
34
  }
@@ -33,7 +36,10 @@ function getEnvFile(rootDir, filename = ".env", filepath = path.join(__dirname$1
33
36
  const env = nodeEnv || getEnv();
34
37
  const fileNameFull = `${filename}.${env}`;
35
38
  let searchPath = path.resolve(rootDir || ".");
36
- logger.info(`Searching for ${fileNameFull} in ${searchPath}`);
39
+ logger.info(() => ({
40
+ data: { fileName: fileNameFull, searchPath },
41
+ msg: "Searching"
42
+ }));
37
43
  let levelCount = 0;
38
44
  while (!fs.existsSync(path.join(searchPath, fileNameFull))) {
39
45
  if (fs.existsSync(path.join(searchPath, "package.json"))) {
@@ -41,18 +47,20 @@ function getEnvFile(rootDir, filename = ".env", filepath = path.join(__dirname$1
41
47
  fs.readFileSync(path.join(searchPath, "package.json"), "utf8")
42
48
  );
43
49
  if (pkgJson.name === "@prosopo/captcha-private") {
44
- logger.info(
45
- `Reached the workspace root package.json, stopping search for ${fileNameFull}.`
46
- );
50
+ logger.info(() => ({
51
+ data: { fileName: fileNameFull },
52
+ msg: "Reached the workspace root package.json, stopping search."
53
+ }));
47
54
  break;
48
55
  }
49
56
  }
50
57
  searchPath = path.resolve(searchPath, "..");
51
58
  levelCount += 1;
52
59
  if (levelCount > 10) {
53
- logger.warn(
54
- `Checked ${levelCount} directories above, stopping search for ${fileNameFull}.`
55
- );
60
+ logger.warn(() => ({
61
+ data: { fileName: fileNameFull, levelCount },
62
+ msg: "Checked directories above, stopping search."
63
+ }));
56
64
  break;
57
65
  }
58
66
  }
package/dist/env.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AA2BA,wBAAgB,MAAM,WAKrB;AAED,wBAAgB,OAAO,CACtB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,UAAQ,GACd,MAAM,CAWR;AAUD,wBAAgB,UAAU,CACzB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,SAAS,EACjB,QAAQ,SAAgC,EACxC,OAAO,CAAC,EAAE,MAAM,UAqChB"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AA2BA,wBAAgB,MAAM,WAKrB;AAED,wBAAgB,OAAO,CACtB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,UAAQ,GACd,MAAM,CAcR;AAUD,wBAAgB,UAAU,CACzB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,SAAS,EACjB,QAAQ,SAAgC,EACxC,OAAO,CAAC,EAAE,MAAM,UA0ChB"}
package/dist/env.js CHANGED
@@ -1,11 +1,11 @@
1
1
  import fs from "node:fs";
2
2
  import path from "node:path";
3
3
  import { fileURLToPath } from "node:url";
4
- import { LogLevel, getLogger } from "@prosopo/common";
4
+ import { LogLevel, getLogger, parseLogLevel } from "@prosopo/common";
5
5
  import dotenv from "dotenv";
6
6
  const __filename = fileURLToPath(import.meta.url);
7
7
  const __dirname = path.dirname(__filename);
8
- const logger = getLogger(process.env.PROSOPO_LOG_LEVEL || LogLevel.enum.info, "env");
8
+ const logger = getLogger(parseLogLevel(process.env.PROSOPO_LOG_LEVEL, LogLevel.enum.info), import.meta.url);
9
9
  export function getEnv() {
10
10
  if (process.env.NODE_ENV) {
11
11
  return process.env.NODE_ENV.replace(/\W/g, "");
@@ -15,7 +15,10 @@ export function getEnv() {
15
15
  export function loadEnv(rootDir, filename, filePath, nodeEnv, override = false) {
16
16
  const envPath = getEnvFile(path.resolve(rootDir || "."), filename, filePath, nodeEnv);
17
17
  const args = { path: envPath, override };
18
- logger.info(`Loading env from ${envPath}`);
18
+ logger.info(() => ({
19
+ data: { envPath },
20
+ msg: "Loading env",
21
+ }));
19
22
  dotenv.config(args);
20
23
  return envPath;
21
24
  }
@@ -23,20 +26,29 @@ export function getEnvFile(rootDir, filename = ".env", filepath = path.join(__di
23
26
  const env = nodeEnv || getEnv();
24
27
  const fileNameFull = `${filename}.${env}`;
25
28
  let searchPath = path.resolve(rootDir || ".");
26
- logger.info(`Searching for ${fileNameFull} in ${searchPath}`);
29
+ logger.info(() => ({
30
+ data: { fileName: fileNameFull, searchPath: searchPath },
31
+ msg: "Searching",
32
+ }));
27
33
  let levelCount = 0;
28
34
  while (!fs.existsSync(path.join(searchPath, fileNameFull))) {
29
35
  if (fs.existsSync(path.join(searchPath, "package.json"))) {
30
36
  const pkgJson = JSON.parse(fs.readFileSync(path.join(searchPath, "package.json"), "utf8"));
31
37
  if (pkgJson.name === "@prosopo/captcha-private") {
32
- logger.info(`Reached the workspace root package.json, stopping search for ${fileNameFull}.`);
38
+ logger.info(() => ({
39
+ data: { fileName: fileNameFull },
40
+ msg: "Reached the workspace root package.json, stopping search.",
41
+ }));
33
42
  break;
34
43
  }
35
44
  }
36
45
  searchPath = path.resolve(searchPath, "..");
37
46
  levelCount += 1;
38
47
  if (levelCount > 10) {
39
- logger.warn(`Checked ${levelCount} directories above, stopping search for ${fileNameFull}.`);
48
+ logger.warn(() => ({
49
+ data: { fileName: fileNameFull, levelCount },
50
+ msg: "Checked directories above, stopping search.",
51
+ }));
40
52
  break;
41
53
  }
42
54
  }
package/dist/env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prosopo/dotenv",
3
- "version": "2.6.1",
3
+ "version": "3.0.4",
4
4
  "author": "PROSOPO LIMITED <info@prosopo.io>",
5
5
  "license": "Apache-2.0",
6
6
  "private": false,
@@ -25,20 +25,25 @@
25
25
  },
26
26
  "types": "./dist/index.d.ts",
27
27
  "dependencies": {
28
- "@prosopo/common": "2.6.1",
29
- "@prosopo/config": "2.6.0",
28
+ "@prosopo/common": "3.0.2",
29
+ "@prosopo/config": "3.1.0",
30
+ "@typegoose/auto-increment": "4.13.0",
31
+ "axios": "1.10.0",
30
32
  "dotenv": "16.4.5",
31
- "express": "4.21.2"
33
+ "esbuild": "0.25.6",
34
+ "express": "4.21.2",
35
+ "openpgp": "5.11.3",
36
+ "webpack-dev-server": "5.2.2"
32
37
  },
33
38
  "devDependencies": {
34
39
  "@vitest/coverage-v8": "3.0.9",
35
40
  "concurrently": "9.0.1",
36
41
  "del-cli": "6.0.0",
37
- "npm-run-all": "2.1.0",
42
+ "npm-run-all": "4.1.5",
38
43
  "tslib": "2.7.0",
39
- "tsx": "4.19.1",
44
+ "tsx": "4.20.3",
40
45
  "typescript": "5.6.2",
41
- "vite": "6.2.3",
46
+ "vite": "6.3.5",
42
47
  "vitest": "3.0.9"
43
48
  },
44
49
  "repository": {
package/vite.test.config.ts CHANGED
@@ -29,4 +29,4 @@ if (fs.existsSync(envFile)) {
29
29
 
30
30
  dotenv.config({ path: envPath });
31
31
 
32
- export default ViteTestConfig;
32
+ export default ViteTestConfig();