@scaleway/configuration-loader 0.1.0-beta.3 → 0.1.0-beta.4

package/CHANGELOG.md

@@ -3,13 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 0.1.0-beta.3 (2022-08-08)
+## 0.1.0-beta.4 (2022-11-23)
 
 **Note:** Version bump only for package @scaleway/configuration-loader
 
+## 0.1.0-beta.3 (2022-08-08)
 
-
-
+**Note:** Version bump only for package @scaleway/configuration-loader
 
 ## [0.1.0-beta.2](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/configuration-loader@0.1.0-beta.1...@scaleway/configuration-loader@0.1.0-beta.2) (2022-07-13)
 

package/dist/config-loader.js

@@ -10,7 +10,6 @@ import { loadConfigurationFromFile } from './yml-loader.js';
  *
  * @public
  */
-
 const loadProfileFromEnvironmentValues = () => ({
   accessKey: env[EnvironmentKey.ScwAccessKey],
   apiURL: env[EnvironmentKey.ScwAPIURL],
@@ -20,6 +19,7 @@ const loadProfileFromEnvironmentValues = () => ({
   defaultZone: env[EnvironmentKey.ScwDefaultZone],
   secretKey: env[EnvironmentKey.ScwSecretKey]
 });
+
 /**
  * Loads profile from configuration file.
  *
@@ -32,22 +32,17 @@ const loadProfileFromEnvironmentValues = () => ({
  *
  * @public
  */
-
 const loadProfileFromConfigurationFile = params => {
   const filePath = (params == null ? void 0 : params.filepath) ?? resolveConfigurationFilePath();
-
   if (typeof filePath !== 'string' || filePath.length === 0) {
     throw new Error('Could not find the path to the configuration file.');
   }
-
   const configs = loadConfigurationFromFile(filePath);
   const profileName = (params == null ? void 0 : params.profileName) ?? 'default';
   const profileMap = configs[profileName];
-
   if (typeof profileMap !== 'object') {
     throw new Error(`Could not find the desired profile '${profileName}' in the configuration file.`);
   }
-
   return {
     accessKey: profileMap.access_key,
     apiURL: profileMap.api_url,

package/dist/env.js

@@ -2,7 +2,6 @@
  * Environment Key.
  */
 let EnvironmentKey;
-
 (function (EnvironmentKey) {
   EnvironmentKey["ScwConfigPath"] = "SCW_CONFIG_PATH";
   EnvironmentKey["ScwAccessKey"] = "SCW_ACCESS_KEY";

package/dist/index.cjs

@@ -1,14 +1,11 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var process = require('process');
 var os = require('os');
 var path = require('path');
 var fs = require('fs');
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
+function _interopNamespaceDefault(e) {
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -21,17 +18,16 @@ function _interopNamespace(e) {
       }
     });
   }
-  n["default"] = e;
+  n.default = e;
   return Object.freeze(n);
 }
 
-var path__namespace = /*#__PURE__*/_interopNamespace(path);
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
 /**
  * Environment Key.
  */
 let EnvironmentKey;
-
 (function (EnvironmentKey) {
   EnvironmentKey["ScwConfigPath"] = "SCW_CONFIG_PATH";
   EnvironmentKey["ScwAccessKey"] = "SCW_ACCESS_KEY";
@@ -50,12 +46,14 @@ let EnvironmentKey;
  *
  * @internal
  */
-
 const getScwConfigurationDirectory = () => {
   const xdgConfigPath = process.env.XDG_CONFIG_HOME;
-  if (typeof xdgConfigPath === 'string' && xdgConfigPath.length > 0) return path__namespace.join(xdgConfigPath, 'scw');
+  if (typeof xdgConfigPath === 'string' && xdgConfigPath.length > 0) {
+    return path__namespace.join(xdgConfigPath, 'scw');
+  }
   return path__namespace.join(os.homedir(), '.config', 'scw');
 };
+
 /**
  * Gets the configuration file path.
  *
@@ -63,18 +61,21 @@ const getScwConfigurationDirectory = () => {
  *
  * @internal
  */
-
 const resolveConfigurationFilePath = () => {
   // Try path defined by user in env variables
   const envFilePath = process.env[EnvironmentKey.ScwConfigPath];
-  if (typeof envFilePath === 'string' && envFilePath.length > 0) return envFilePath; // or fallback on the default path
+  if (typeof envFilePath === 'string' && envFilePath.length > 0) {
+    return envFilePath;
+  }
 
+  // or fallback on the default path
   return path__namespace.join(getScwConfigurationDirectory(), 'config.yaml');
 };
 
 const STRIP_COMMENT_REGEX = /(^|\s)[;#]/;
 const DETECT_SECTION_REGEX = /^\s*([^]+):\s*$/;
 const DETECT_ITEM_REGEX = /^\s*(.+?)\s*:\s*(.+?)\s*$/;
+
 /**
  * Converts Yaml to configuration map.
  *
@@ -83,34 +84,29 @@ const DETECT_ITEM_REGEX = /^\s*(.+?)\s*:\s*(.+?)\s*$/;
  *
  * @internal
  */
-
 const convertYamlToConfiguration = input => {
   let foundProfilesKey = false;
   let currentSection = 'default';
   const map = {};
-
   if (typeof input !== 'string') {
     return map;
   }
-
   input.split(/\r?\n/).forEach(rawLine => {
     // remove comments
-    const line = rawLine.split(STRIP_COMMENT_REGEX)[0]; // parse sections
-
+    const line = rawLine.split(STRIP_COMMENT_REGEX)[0];
+    // parse sections
     const newSection = DETECT_SECTION_REGEX.exec(line);
-
     if (newSection) {
       currentSection = undefined;
-
       if (newSection[1] === 'profiles') {
         foundProfilesKey = true;
       } else if (foundProfilesKey === true) {
         [, currentSection] = newSection;
       }
-    } // parse items
+    }
+    // parse items
     else if (currentSection) {
       const item = DETECT_ITEM_REGEX.exec(line);
-
       if (item) {
         if (typeof map[currentSection] !== 'object') {
           map[currentSection] = {};
@@ -121,6 +117,7 @@ const convertYamlToConfiguration = input => {
   });
   return map;
 };
+
 /**
  * Loads configuration from a file.
  *
@@ -132,7 +129,6 @@ const convertYamlToConfiguration = input => {
  *
  * @internal
  */
-
 const loadConfigurationFromFile = filePath => {
   // `readFileSync` returns a string when encoding option is specified.
   // {@link https://nodejs.org/api/fs.html#fs_fs_readfilesync_path_options}
@@ -147,7 +143,6 @@ const loadConfigurationFromFile = filePath => {
  *
  * @public
  */
-
 const loadProfileFromEnvironmentValues = () => ({
   accessKey: process.env[EnvironmentKey.ScwAccessKey],
   apiURL: process.env[EnvironmentKey.ScwAPIURL],
@@ -157,6 +152,7 @@ const loadProfileFromEnvironmentValues = () => ({
   defaultZone: process.env[EnvironmentKey.ScwDefaultZone],
   secretKey: process.env[EnvironmentKey.ScwSecretKey]
 });
+
 /**
  * Loads profile from configuration file.
  *
@@ -169,22 +165,17 @@ const loadProfileFromEnvironmentValues = () => ({
  *
  * @public
  */
-
 const loadProfileFromConfigurationFile = params => {
   const filePath = (params == null ? void 0 : params.filepath) ?? resolveConfigurationFilePath();
-
   if (typeof filePath !== 'string' || filePath.length === 0) {
     throw new Error('Could not find the path to the configuration file.');
   }
-
   const configs = loadConfigurationFromFile(filePath);
   const profileName = (params == null ? void 0 : params.profileName) ?? 'default';
   const profileMap = configs[profileName];
-
   if (typeof profileMap !== 'object') {
     throw new Error(`Could not find the desired profile '${profileName}' in the configuration file.`);
   }
-
   return {
     accessKey: profileMap.access_key,
     apiURL: profileMap.api_url,

package/dist/path-resolver.js

@@ -10,12 +10,14 @@ import { EnvironmentKey } from './env.js';
  *
  * @internal
  */
-
 const getScwConfigurationDirectory = () => {
   const xdgConfigPath = env.XDG_CONFIG_HOME;
-  if (typeof xdgConfigPath === 'string' && xdgConfigPath.length > 0) return path.join(xdgConfigPath, 'scw');
+  if (typeof xdgConfigPath === 'string' && xdgConfigPath.length > 0) {
+    return path.join(xdgConfigPath, 'scw');
+  }
   return path.join(homedir(), '.config', 'scw');
 };
+
 /**
  * Gets the configuration file path.
  *
@@ -23,12 +25,14 @@ const getScwConfigurationDirectory = () => {
  *
  * @internal
  */
-
 const resolveConfigurationFilePath = () => {
   // Try path defined by user in env variables
   const envFilePath = env[EnvironmentKey.ScwConfigPath];
-  if (typeof envFilePath === 'string' && envFilePath.length > 0) return envFilePath; // or fallback on the default path
+  if (typeof envFilePath === 'string' && envFilePath.length > 0) {
+    return envFilePath;
+  }
 
+  // or fallback on the default path
   return path.join(getScwConfigurationDirectory(), 'config.yaml');
 };
 

package/dist/yml-loader.js

@@ -3,6 +3,7 @@ import { readFileSync } from 'fs';
 const STRIP_COMMENT_REGEX = /(^|\s)[;#]/;
 const DETECT_SECTION_REGEX = /^\s*([^]+):\s*$/;
 const DETECT_ITEM_REGEX = /^\s*(.+?)\s*:\s*(.+?)\s*$/;
+
 /**
  * Converts Yaml to configuration map.
  *
@@ -11,34 +12,29 @@ const DETECT_ITEM_REGEX = /^\s*(.+?)\s*:\s*(.+?)\s*$/;
  *
  * @internal
  */
-
 const convertYamlToConfiguration = input => {
   let foundProfilesKey = false;
   let currentSection = 'default';
   const map = {};
-
   if (typeof input !== 'string') {
     return map;
   }
-
   input.split(/\r?\n/).forEach(rawLine => {
     // remove comments
-    const line = rawLine.split(STRIP_COMMENT_REGEX)[0]; // parse sections
-
+    const line = rawLine.split(STRIP_COMMENT_REGEX)[0];
+    // parse sections
     const newSection = DETECT_SECTION_REGEX.exec(line);
-
     if (newSection) {
       currentSection = undefined;
-
       if (newSection[1] === 'profiles') {
         foundProfilesKey = true;
       } else if (foundProfilesKey === true) {
         [, currentSection] = newSection;
       }
-    } // parse items
+    }
+    // parse items
     else if (currentSection) {
       const item = DETECT_ITEM_REGEX.exec(line);
-
       if (item) {
         if (typeof map[currentSection] !== 'object') {
           map[currentSection] = {};
@@ -49,6 +45,7 @@ const convertYamlToConfiguration = input => {
   });
   return map;
 };
+
 /**
  * Loads configuration from a file.
  *
@@ -60,7 +57,6 @@ const convertYamlToConfiguration = input => {
  *
  * @internal
  */
-
 const loadConfigurationFromFile = filePath => {
   // `readFileSync` returns a string when encoding option is specified.
   // {@link https://nodejs.org/api/fs.html#fs_fs_readfilesync_path_options}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/configuration-loader",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "license": "Apache-2.0",
   "description": "Load configuration via file or environment for NodeJS.",
   "main": "dist/index.cjs",
@@ -21,5 +21,5 @@
   "devDependencies": {
     "@types/node": "^17.0.45"
   },
-  "gitHead": "d0dccb15478b4b9580c5696920fc210b3ab18e98"
+  "gitHead": "5484de96723e18038b6a8781ebb941a1f270f49a"
 }