@jayfong/x-utils 1.0.0-202409200008 → 1.0.0-202409200026

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 (3) hide show
  1. package/_cjs/env.js +8 -6
  2. package/env.js +8 -6
  3. package/package.json +1 -1
package/_cjs/env.js CHANGED
@@ -39,21 +39,23 @@ var import_yaml = require("./yaml.js");
39
39
  class XEnv {
40
40
  static getEnvVarsFromFile = (0, import_vtils.memoize)(
41
41
  async function get(mode = "", local = false) {
42
- let envVars = mode ? await XEnv.getEnvVarsFromFile("") : {};
42
+ const envVars = mode ? await XEnv.getEnvVarsFromFile("") : {};
43
43
  const baseName = local ? `.env${mode ? `.${mode}` : ""}.local` : `.env${mode ? `.${mode}` : ""}`;
44
44
  const envYmlFile = import_path.XPath.join(process.cwd(), `${baseName}.yml`);
45
45
  const envYamlFile = import_path.XPath.join(process.cwd(), `${baseName}.yaml`);
46
46
  const dotenvFile = import_path.XPath.join(process.cwd(), baseName);
47
47
  if (await import_fs.XFs.pathExists(envYmlFile)) {
48
- envVars = await import_yaml.XYaml.read(envYmlFile);
48
+ Object.assign(envVars, await import_yaml.XYaml.read(envYmlFile));
49
49
  } else if (await import_fs.XFs.pathExists(envYamlFile)) {
50
- envVars = await import_yaml.XYaml.read(envYamlFile);
50
+ Object.assign(envVars, await import_yaml.XYaml.read(envYamlFile));
51
51
  } else if (await import_fs.XFs.pathExists(dotenvFile)) {
52
52
  const dotenvContent = await import_fs.XFs.readFile(dotenvFile, "utf-8");
53
- envVars = await import_dotenv.default.parse(dotenvContent);
53
+ Object.assign(envVars, await import_dotenv.default.parse(dotenvContent));
54
+ }
55
+ if (!local) {
56
+ const localEnvVars = await XEnv.getEnvVarsFromFile(mode, true);
57
+ Object.assign(envVars, localEnvVars);
54
58
  }
55
- const localEnvVars = await XEnv.getEnvVarsFromFile(mode, true);
56
- Object.assign(envVars, localEnvVars);
57
59
  return envVars;
58
60
  },
59
61
  (mode, local) => `${mode}_${local}`
package/env.js CHANGED
@@ -6,21 +6,23 @@ import { XYaml } from "./yaml.js";
6
6
  class XEnv {
7
7
  static getEnvVarsFromFile = memoize(
8
8
  async function get(mode = "", local = false) {
9
- let envVars = mode ? await XEnv.getEnvVarsFromFile("") : {};
9
+ const envVars = mode ? await XEnv.getEnvVarsFromFile("") : {};
10
10
  const baseName = local ? `.env${mode ? `.${mode}` : ""}.local` : `.env${mode ? `.${mode}` : ""}`;
11
11
  const envYmlFile = XPath.join(process.cwd(), `${baseName}.yml`);
12
12
  const envYamlFile = XPath.join(process.cwd(), `${baseName}.yaml`);
13
13
  const dotenvFile = XPath.join(process.cwd(), baseName);
14
14
  if (await XFs.pathExists(envYmlFile)) {
15
- envVars = await XYaml.read(envYmlFile);
15
+ Object.assign(envVars, await XYaml.read(envYmlFile));
16
16
  } else if (await XFs.pathExists(envYamlFile)) {
17
- envVars = await XYaml.read(envYamlFile);
17
+ Object.assign(envVars, await XYaml.read(envYamlFile));
18
18
  } else if (await XFs.pathExists(dotenvFile)) {
19
19
  const dotenvContent = await XFs.readFile(dotenvFile, "utf-8");
20
- envVars = await dotenv.parse(dotenvContent);
20
+ Object.assign(envVars, await dotenv.parse(dotenvContent));
21
+ }
22
+ if (!local) {
23
+ const localEnvVars = await XEnv.getEnvVarsFromFile(mode, true);
24
+ Object.assign(envVars, localEnvVars);
21
25
  }
22
- const localEnvVars = await XEnv.getEnvVarsFromFile(mode, true);
23
- Object.assign(envVars, localEnvVars);
24
26
  return envVars;
25
27
  },
26
28
  (mode, local) => `${mode}_${local}`
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@jayfong/x-utils",
3
3
  "description": "123456",
4
- "version": "1.0.0-202409200008",
4
+ "version": "1.0.0-202409200026",
5
5
  "type": "module",
6
6
  "dependencies": {
7
7
  "vtils": "^4.115.0",