@smithy/shared-ini-file-loader 2.0.13 → 2.2.0

package/dist-cjs/getConfigData.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigData = void 0;
+const types_1 = require("@smithy/types");
+const loadSharedConfigFiles_1 = require("./loadSharedConfigFiles");
+const getConfigData = (data) => Object.entries(data)
+    .filter(([key]) => {
+    const sections = key.split(loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR);
+    if (sections.length === 2 && Object.values(types_1.IniSectionType).includes(sections[0])) {
+        return true;
+    }
+    return false;
+})
+    .reduce((acc, [key, value]) => {
+    const updatedKey = key.startsWith(types_1.IniSectionType.PROFILE) ? key.split(loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR)[1] : key;
+    acc[updatedKey] = value;
+    return acc;
+}, {
+    ...(data.default && { default: data.default }),
+});
+exports.getConfigData = getConfigData;

package/dist-cjs/getSsoSessionData.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSsoSessionData = void 0;
-const ssoSessionKeyRegex = /^sso-session\s(["'])?([^\1]+)\1$/;
+const types_1 = require("@smithy/types");
+const loadSharedConfigFiles_1 = require("./loadSharedConfigFiles");
 const getSsoSessionData = (data) => Object.entries(data)
-    .filter(([key]) => ssoSessionKeyRegex.test(key))
-    .reduce((acc, [key, value]) => ({ ...acc, [ssoSessionKeyRegex.exec(key)[2]]: value }), {});
+    .filter(([key]) => key.startsWith(types_1.IniSectionType.SSO_SESSION + loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR))
+    .reduce((acc, [key, value]) => ({ ...acc, [key.split(loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR)[1]]: value }), {});
 exports.getSsoSessionData = getSsoSessionData;

package/dist-cjs/loadSharedConfigFiles.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSharedConfigFiles = void 0;
+exports.loadSharedConfigFiles = exports.CONFIG_PREFIX_SEPARATOR = void 0;
+const getConfigData_1 = require("./getConfigData");
 const getConfigFilepath_1 = require("./getConfigFilepath");
 const getCredentialsFilepath_1 = require("./getCredentialsFilepath");
-const getProfileData_1 = require("./getProfileData");
 const parseIni_1 = require("./parseIni");
 const slurpFile_1 = require("./slurpFile");
 const swallowError = () => ({});
+exports.CONFIG_PREFIX_SEPARATOR = ".";
 const loadSharedConfigFiles = async (init = {}) => {
     const { filepath = (0, getCredentialsFilepath_1.getCredentialsFilepath)(), configFilepath = (0, getConfigFilepath_1.getConfigFilepath)() } = init;
     const parsedFiles = await Promise.all([
@@ -14,7 +15,7 @@ const loadSharedConfigFiles = async (init = {}) => {
             ignoreCache: init.ignoreCache,
         })
             .then(parseIni_1.parseIni)
-            .then(getProfileData_1.getProfileData)
+            .then(getConfigData_1.getConfigData)
             .catch(swallowError),
         (0, slurpFile_1.slurpFile)(filepath, {
             ignoreCache: init.ignoreCache,

package/dist-cjs/parseIni.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseIni = void 0;
+const types_1 = require("@smithy/types");
+const loadSharedConfigFiles_1 = require("./loadSharedConfigFiles");
+const prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-]+)\2$/;
 const profileNameBlockList = ["__proto__", "profile __proto__"];
 const parseIni = (iniData) => {
     const map = {};
@@ -10,10 +13,21 @@ const parseIni = (iniData) => {
         line = line.split(/(^|\s)[;#]/)[0].trim();
         const isSection = line[0] === "[" && line[line.length - 1] === "]";
         if (isSection) {
+            currentSection = undefined;
             currentSubSection = undefined;
-            currentSection = line.substring(1, line.length - 1);
-            if (profileNameBlockList.includes(currentSection)) {
-                throw new Error(`Found invalid profile name "${currentSection}"`);
+            const sectionName = line.substring(1, line.length - 1);
+            const matches = prefixKeyRegex.exec(sectionName);
+            if (matches) {
+                const [, prefix, , name] = matches;
+                if (Object.values(types_1.IniSectionType).includes(prefix)) {
+                    currentSection = [prefix, name].join(loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR);
+                }
+            }
+            else {
+                currentSection = sectionName;
+            }
+            if (profileNameBlockList.includes(sectionName)) {
+                throw new Error(`Found invalid profile name "${sectionName}"`);
             }
         }
         else if (currentSection) {
@@ -26,9 +40,10 @@ const parseIni = (iniData) => {
                 if (value === "") {
                     currentSubSection = name;
                 }
-                else if (currentSubSection === undefined) {
+                else {
                     map[currentSection] = map[currentSection] || {};
-                    map[currentSection][name] = value;
+                    const key = currentSubSection ? [currentSubSection, name].join(loadSharedConfigFiles_1.CONFIG_PREFIX_SEPARATOR) : name;
+                    map[currentSection][key] = value;
                 }
             }
         }

package/dist-es/getConfigData.js

@@ -0,0 +1,17 @@
+import { IniSectionType } from "@smithy/types";
+import { CONFIG_PREFIX_SEPARATOR } from "./loadSharedConfigFiles";
+export const getConfigData = (data) => Object.entries(data)
+    .filter(([key]) => {
+    const sections = key.split(CONFIG_PREFIX_SEPARATOR);
+    if (sections.length === 2 && Object.values(IniSectionType).includes(sections[0])) {
+        return true;
+    }
+    return false;
+})
+    .reduce((acc, [key, value]) => {
+    const updatedKey = key.startsWith(IniSectionType.PROFILE) ? key.split(CONFIG_PREFIX_SEPARATOR)[1] : key;
+    acc[updatedKey] = value;
+    return acc;
+}, {
+    ...(data.default && { default: data.default }),
+});

package/dist-es/getSsoSessionData.js

@@ -1,4 +1,5 @@
-const ssoSessionKeyRegex = /^sso-session\s(["'])?([^\1]+)\1$/;
+import { IniSectionType } from "@smithy/types";
+import { CONFIG_PREFIX_SEPARATOR } from "./loadSharedConfigFiles";
 export const getSsoSessionData = (data) => Object.entries(data)
-    .filter(([key]) => ssoSessionKeyRegex.test(key))
-    .reduce((acc, [key, value]) => ({ ...acc, [ssoSessionKeyRegex.exec(key)[2]]: value }), {});
+    .filter(([key]) => key.startsWith(IniSectionType.SSO_SESSION + CONFIG_PREFIX_SEPARATOR))
+    .reduce((acc, [key, value]) => ({ ...acc, [key.split(CONFIG_PREFIX_SEPARATOR)[1]]: value }), {});

package/dist-es/loadSharedConfigFiles.js

@@ -1,9 +1,10 @@
+import { getConfigData } from "./getConfigData";
 import { getConfigFilepath } from "./getConfigFilepath";
 import { getCredentialsFilepath } from "./getCredentialsFilepath";
-import { getProfileData } from "./getProfileData";
 import { parseIni } from "./parseIni";
 import { slurpFile } from "./slurpFile";
 const swallowError = () => ({});
+export const CONFIG_PREFIX_SEPARATOR = ".";
 export const loadSharedConfigFiles = async (init = {}) => {
     const { filepath = getCredentialsFilepath(), configFilepath = getConfigFilepath() } = init;
     const parsedFiles = await Promise.all([
@@ -11,7 +12,7 @@ export const loadSharedConfigFiles = async (init = {}) => {
             ignoreCache: init.ignoreCache,
         })
             .then(parseIni)
-            .then(getProfileData)
+            .then(getConfigData)
             .catch(swallowError),
         slurpFile(filepath, {
             ignoreCache: init.ignoreCache,

package/dist-es/parseIni.js

@@ -1,3 +1,6 @@
+import { IniSectionType } from "@smithy/types";
+import { CONFIG_PREFIX_SEPARATOR } from "./loadSharedConfigFiles";
+const prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-]+)\2$/;
 const profileNameBlockList = ["__proto__", "profile __proto__"];
 export const parseIni = (iniData) => {
     const map = {};
@@ -7,10 +10,21 @@ export const parseIni = (iniData) => {
         line = line.split(/(^|\s)[;#]/)[0].trim();
         const isSection = line[0] === "[" && line[line.length - 1] === "]";
         if (isSection) {
+            currentSection = undefined;
             currentSubSection = undefined;
-            currentSection = line.substring(1, line.length - 1);
-            if (profileNameBlockList.includes(currentSection)) {
-                throw new Error(`Found invalid profile name "${currentSection}"`);
+            const sectionName = line.substring(1, line.length - 1);
+            const matches = prefixKeyRegex.exec(sectionName);
+            if (matches) {
+                const [, prefix, , name] = matches;
+                if (Object.values(IniSectionType).includes(prefix)) {
+                    currentSection = [prefix, name].join(CONFIG_PREFIX_SEPARATOR);
+                }
+            }
+            else {
+                currentSection = sectionName;
+            }
+            if (profileNameBlockList.includes(sectionName)) {
+                throw new Error(`Found invalid profile name "${sectionName}"`);
             }
         }
         else if (currentSection) {
@@ -23,9 +37,10 @@ export const parseIni = (iniData) => {
                 if (value === "") {
                     currentSubSection = name;
                 }
-                else if (currentSubSection === undefined) {
+                else {
                     map[currentSection] = map[currentSection] || {};
-                    map[currentSection][name] = value;
+                    const key = currentSubSection ? [currentSubSection, name].join(CONFIG_PREFIX_SEPARATOR) : name;
+                    map[currentSection][key] = value;
                 }
             }
         }

package/dist-types/getConfigData.d.ts

@@ -0,0 +1,8 @@
+import { ParsedIniData } from "@smithy/types";
+/**
+ * Returns the config data from parsed ini data.
+ * * Returns data for `default`
+ * * Returns profile name without prefix.
+ * * Returns non-profiles as is.
+ */
+export declare const getConfigData: (data: ParsedIniData) => ParsedIniData;

package/dist-types/loadSharedConfigFiles.d.ts

@@ -18,4 +18,5 @@ export interface SharedConfigInit {
      */
     ignoreCache?: boolean;
 }
+export declare const CONFIG_PREFIX_SEPARATOR = ".";
 export declare const loadSharedConfigFiles: (init?: SharedConfigInit) => Promise<SharedConfigFiles>;

package/dist-types/ts3.4/getConfigData.d.ts

@@ -0,0 +1,8 @@
+import { ParsedIniData } from "@smithy/types";
+/**
+ * Returns the config data from parsed ini data.
+ * * Returns data for `default`
+ * * Returns profile name without prefix.
+ * * Returns non-profiles as is.
+ */
+export declare const getConfigData: (data: ParsedIniData) => ParsedIniData;

package/dist-types/ts3.4/loadSharedConfigFiles.d.ts

@@ -18,4 +18,5 @@ export interface SharedConfigInit {
      */
     ignoreCache?: boolean;
 }
+export declare const CONFIG_PREFIX_SEPARATOR = ".";
 export declare const loadSharedConfigFiles: (init?: SharedConfigInit) => Promise<SharedConfigFiles>;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@smithy/shared-ini-file-loader",
-  "version": "2.0.13",
+  "version": "2.2.0",
   "dependencies": {
-    "@smithy/types": "^2.3.4",
+    "@smithy/types": "^2.3.5",
     "tslib": "^2.5.0"
   },
   "devDependencies": {

package/dist-cjs/getProfileData.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProfileData = void 0;
-const profileKeyRegex = /^profile\s(["'])?([^\1]+)\1$/;
-const getProfileData = (data) => Object.entries(data)
-    .filter(([key]) => profileKeyRegex.test(key))
-    .reduce((acc, [key, value]) => ({ ...acc, [profileKeyRegex.exec(key)[2]]: value }), {
-    ...(data.default && { default: data.default }),
-});
-exports.getProfileData = getProfileData;

package/dist-es/getProfileData.js

@@ -1,6 +0,0 @@
-const profileKeyRegex = /^profile\s(["'])?([^\1]+)\1$/;
-export const getProfileData = (data) => Object.entries(data)
-    .filter(([key]) => profileKeyRegex.test(key))
-    .reduce((acc, [key, value]) => ({ ...acc, [profileKeyRegex.exec(key)[2]]: value }), {
-    ...(data.default && { default: data.default }),
-});

package/dist-types/getProfileData.d.ts

@@ -1,7 +0,0 @@
-import { ParsedIniData } from "@smithy/types";
-/**
- * Returns the profile data from parsed ini data.
- * * Returns data for `default`
- * * Reads profileName after profile prefix including/excluding quotes
- */
-export declare const getProfileData: (data: ParsedIniData) => ParsedIniData;

package/dist-types/ts3.4/getProfileData.d.ts

@@ -1,7 +0,0 @@
-import { ParsedIniData } from "@smithy/types";
-/**
- * Returns the profile data from parsed ini data.
- * * Returns data for `default`
- * * Reads profileName after profile prefix including/excluding quotes
- */
-export declare const getProfileData: (data: ParsedIniData) => ParsedIniData;