@taqueria/toolkit 0.28.0 → 0.28.1

package/bin/run.js

@@ -21,10 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // bin/run.ts
 var import_cross_spawn = require("cross-spawn");
-var import_promises = __toESM(require("fs/promises"));
-var import_promises2 = require("fs/promises");
-var import_path = __toESM(require("path"));
 var import_yargs = __toESM(require("yargs"));
+
+// lib/env.ts
+var import_promises = require("fs/promises");
+var import_path = __toESM(require("path"));
 var CustomErr = class extends Error {
 };
 var TaqNotFoundError = class extends CustomErr {
@@ -39,30 +40,12 @@ function isCustomError(err) {
 async function checkTaqProject(dir) {
   try {
     const searchPath = import_path.default.join(dir, ".taq");
-    await (0, import_promises2.stat)(searchPath);
+    await (0, import_promises.stat)(searchPath);
     return searchPath;
   } catch {
     throw new TaqNotFoundError(`${dir} is not a valid Taqueria project.`);
   }
 }
-function withArguments(cliArgs, fn) {
-  if (cliArgs[0].endsWith("node"))
-    cliArgs.shift();
-  const script = cliArgs.shift();
-  const parsedArgs = (0, import_yargs.default)(cliArgs).option("projectDir", {
-    alias: "p",
-    type: "string",
-    requiresArg: true
-  }).option("prefix", {
-    type: "string",
-    requiresArg: true,
-    default: ""
-  }).global(["projectDir"]).parseSync();
-  if (parsedArgs._.length > 0 && parsedArgs.projectDir) {
-    fn(parsedArgs.projectDir, parsedArgs.prefix, parsedArgs._.join(" "));
-  } else
-    console.log(`Usage: ${script} --projectDir <projectDir> [--prefix <prefix>] <command>`);
-}
 function getEnvName(filename, prefix = "") {
   return `${prefix}TAQ_${filename}`.replace(".json", "").replace(/\./mg, "_").replace(/\-/mg, "_").toUpperCase();
 }
@@ -70,14 +53,14 @@ var TaqConfigError = class extends CustomErr {
 };
 async function getConfig(taqDir, prefix) {
   try {
-    const files = await import_promises.default.readdir(taqDir);
+    const files = await (0, import_promises.readdir)(taqDir);
     return files.reduce(
       async (retval, file) => {
         if (!file.endsWith(".json"))
           return await retval;
         return {
           ...await retval,
-          [getEnvName(file, prefix)]: await (0, import_promises2.readFile)(import_path.default.join(taqDir, file), "utf-8")
+          [getEnvName(file, prefix)]: await (0, import_promises.readFile)(import_path.default.join(taqDir, file), "utf-8")
         };
       },
       Promise.resolve({})
@@ -88,16 +71,56 @@ async function getConfig(taqDir, prefix) {
     );
   }
 }
+function encode(value) {
+  const buffer = Buffer.from(value, "utf8");
+  return buffer.toString("base64");
+}
+async function getEncodedConfig(taqDir, prefix) {
+  const config = await getConfig(taqDir, prefix);
+  return Object.fromEntries(
+    Object.entries(config).map(
+      ([k, v]) => [k, encode(v)]
+    )
+  );
+}
+
+// bin/run.ts
+function withArguments(cliArgs, fn) {
+  if (cliArgs[0].endsWith("node"))
+    cliArgs.shift();
+  const script = cliArgs.shift();
+  const parsedArgs = (0, import_yargs.default)(cliArgs).option("projectDir", {
+    alias: "p",
+    type: "string",
+    requiresArg: true
+  }).option("prefix", {
+    type: "string",
+    requiresArg: true,
+    default: ""
+  }).global(["projectDir"]).parseSync();
+  if (parsedArgs._.length > 0 && parsedArgs.projectDir) {
+    fn(parsedArgs.projectDir, parsedArgs.prefix, parsedArgs._.join(" "));
+  } else
+    console.log(`Usage: ${script} --projectDir <projectDir> [--prefix <prefix>] <command>`);
+}
 function toCommandWithEnvVars(cmd, config) {
   return Object.entries(config).reduce(
-    (retval, [key, value]) => `${key}=${btoa(value)} ${retval}`,
+    (retval, [key, value]) => {
+      try {
+        return `${key}=${value} ${retval}`;
+      } catch (err) {
+        console.warn(`Could not set ${key}`);
+        console.warn("Check the contents of the associated file and ensure that it can be Base64 encoded.");
+        return retval;
+      }
+    },
     cmd
   );
 }
 async function run(projectDir, prefix, cmd) {
   try {
     const taqDir = await checkTaqProject(projectDir);
-    const config = await getConfig(taqDir, prefix);
+    const config = await getEncodedConfig(taqDir, prefix);
     const cmdWithEnvVars = toCommandWithEnvVars(cmd, config);
     (0, import_cross_spawn.spawn)(cmdWithEnvVars, {
       shell: true,

package/bin/run.js.map

@@ -1 +1 @@
-{"version":3,"sources":["run.ts"],"sourcesContent":["#!/usr/bin/env node\nimport { spawn } from 'cross-spawn';\nimport fs from 'fs/promises';\nimport { readFile, stat } from 'fs/promises';\nimport path from 'path';\nimport yargs from 'yargs';\n\nclass CustomErr extends Error {}\n\nclass TaqNotFoundError extends CustomErr {\n\tpublic isCustomErr = true;\n}\n\nfunction isCustomError(err: unknown): err is Error {\n\treturn typeof err === 'object' && (err as object).hasOwnProperty('isCustomErr');\n}\n\nasync function checkTaqProject(dir: string) {\n\ttry {\n\t\tconst searchPath = path.join(dir, '.taq');\n\t\tawait stat(searchPath);\n\t\treturn searchPath;\n\t} catch {\n\t\tthrow new TaqNotFoundError(`${dir} is not a valid Taqueria project.`);\n\t}\n}\n\nfunction withArguments(cliArgs: string[], fn: (projectDir: string, prefix: string, cmd: string) => Promise<void>) {\n\tif (cliArgs[0].endsWith('node')) cliArgs.shift();\n\n\tconst script = cliArgs.shift();\n\n\tconst parsedArgs = yargs(cliArgs)\n\t\t.option('projectDir', {\n\t\t\talias: 'p',\n\t\t\ttype: 'string',\n\t\t\trequiresArg: true,\n\t\t})\n\t\t.option('prefix', {\n\t\t\ttype: 'string',\n\t\t\trequiresArg: true,\n\t\t\tdefault: '',\n\t\t})\n\t\t.global(['projectDir'])\n\t\t.parseSync();\n\n\tif (parsedArgs._.length > 0 && parsedArgs.projectDir) {\n\t\tfn(parsedArgs.projectDir, parsedArgs.prefix, parsedArgs._.join(' '));\n\t} else console.log(`Usage: ${script} --projectDir <projectDir> [--prefix <prefix>] <command>`);\n}\n\nfunction getEnvName(filename: string, prefix = '') {\n\treturn `${prefix}TAQ_${filename}`\n\t\t.replace('.json', '')\n\t\t.replace(/\\./mg, '_')\n\t\t.replace(/\\-/mg, '_')\n\t\t.toUpperCase();\n}\n\nclass TaqConfigError extends CustomErr {}\nasync function getConfig(taqDir: string, prefix: string) {\n\ttry {\n\t\tconst files = await fs.readdir(taqDir);\n\t\treturn files.reduce(\n\t\t\tasync (retval, file) => {\n\t\t\t\tif (!file.endsWith('.json')) return (await retval);\n\t\t\t\treturn {\n\t\t\t\t\t...(await retval),\n\t\t\t\t\t[getEnvName(file, prefix)]: await readFile(path.join(taqDir, file), 'utf-8'),\n\t\t\t\t};\n\t\t\t},\n\t\t\tPromise.resolve({}),\n\t\t);\n\t} catch {\n\t\tthrow new TaqConfigError(\n\t\t\t`There was a problem reading the config files in ${taqDir}. Please check file permissions are try again.`,\n\t\t);\n\t}\n}\n\nfunction toCommandWithEnvVars(cmd: string, config: Record<string, string>) {\n\treturn Object.entries(config).reduce(\n\t\t(retval, [key, value]) => `${key}=${btoa(value)} ${retval}`,\n\t\tcmd,\n\t);\n}\n\nasync function run(projectDir: string, prefix: string, cmd: string) {\n\ttry {\n\t\tconst taqDir = await checkTaqProject(projectDir);\n\t\tconst config = await getConfig(taqDir, prefix);\n\t\tconst cmdWithEnvVars = toCommandWithEnvVars(cmd, config);\n\n\t\tspawn(cmdWithEnvVars, {\n\t\t\tshell: true,\n\t\t\tstdio: 'inherit',\n\t\t});\n\t} catch (err) {\n\t\tif (isCustomError(err)) {\n\t\t\tconsole.error(err.message);\n\t\t\treturn;\n\t\t}\n\t\tthrow err;\n\t}\n}\n\nwithArguments(process.argv, run);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,yBAAsB;AACtB,sBAAe;AACf,IAAAA,mBAA+B;AAC/B,kBAAiB;AACjB,mBAAkB;AAElB,IAAM,YAAN,cAAwB,MAAM;AAAC;AAE/B,IAAM,mBAAN,cAA+B,UAAU;AAAA,EAAzC;AAAA;AACC,SAAO,cAAc;AAAA;AACtB;AAEA,SAAS,cAAc,KAA4B;AAClD,SAAO,OAAO,QAAQ,YAAa,IAAe,eAAe,aAAa;AAC/E;AAEA,eAAe,gBAAgB,KAAa;AAC3C,MAAI;AACH,UAAM,aAAa,YAAAC,QAAK,KAAK,KAAK,MAAM;AACxC,cAAM,uBAAK,UAAU;AACrB,WAAO;AAAA,EACR,QAAE;AACD,UAAM,IAAI,iBAAiB,GAAG,sCAAsC;AAAA,EACrE;AACD;AAEA,SAAS,cAAc,SAAmB,IAAwE;AACjH,MAAI,QAAQ,GAAG,SAAS,MAAM;AAAG,YAAQ,MAAM;AAE/C,QAAM,SAAS,QAAQ,MAAM;AAE7B,QAAM,iBAAa,aAAAC,SAAM,OAAO,EAC9B,OAAO,cAAc;AAAA,IACrB,OAAO;AAAA,IACP,MAAM;AAAA,IACN,aAAa;AAAA,EACd,CAAC,EACA,OAAO,UAAU;AAAA,IACjB,MAAM;AAAA,IACN,aAAa;AAAA,IACb,SAAS;AAAA,EACV,CAAC,EACA,OAAO,CAAC,YAAY,CAAC,EACrB,UAAU;AAEZ,MAAI,WAAW,EAAE,SAAS,KAAK,WAAW,YAAY;AACrD,OAAG,WAAW,YAAY,WAAW,QAAQ,WAAW,EAAE,KAAK,GAAG,CAAC;AAAA,EACpE;AAAO,YAAQ,IAAI,UAAU,gEAAgE;AAC9F;AAEA,SAAS,WAAW,UAAkB,SAAS,IAAI;AAClD,SAAO,GAAG,aAAa,WACrB,QAAQ,SAAS,EAAE,EACnB,QAAQ,QAAQ,GAAG,EACnB,QAAQ,QAAQ,GAAG,EACnB,YAAY;AACf;AAEA,IAAM,iBAAN,cAA6B,UAAU;AAAC;AACxC,eAAe,UAAU,QAAgB,QAAgB;AACxD,MAAI;AACH,UAAM,QAAQ,MAAM,gBAAAC,QAAG,QAAQ,MAAM;AACrC,WAAO,MAAM;AAAA,MACZ,OAAO,QAAQ,SAAS;AACvB,YAAI,CAAC,KAAK,SAAS,OAAO;AAAG,iBAAQ,MAAM;AAC3C,eAAO;AAAA,UACN,GAAI,MAAM;AAAA,UACV,CAAC,WAAW,MAAM,MAAM,IAAI,UAAM,2BAAS,YAAAF,QAAK,KAAK,QAAQ,IAAI,GAAG,OAAO;AAAA,QAC5E;AAAA,MACD;AAAA,MACA,QAAQ,QAAQ,CAAC,CAAC;AAAA,IACnB;AAAA,EACD,QAAE;AACD,UAAM,IAAI;AAAA,MACT,mDAAmD;AAAA,IACpD;AAAA,EACD;AACD;AAEA,SAAS,qBAAqB,KAAa,QAAgC;AAC1E,SAAO,OAAO,QAAQ,MAAM,EAAE;AAAA,IAC7B,CAAC,QAAQ,CAAC,KAAK,KAAK,MAAM,GAAG,OAAO,KAAK,KAAK,KAAK;AAAA,IACnD;AAAA,EACD;AACD;AAEA,eAAe,IAAI,YAAoB,QAAgB,KAAa;AACnE,MAAI;AACH,UAAM,SAAS,MAAM,gBAAgB,UAAU;AAC/C,UAAM,SAAS,MAAM,UAAU,QAAQ,MAAM;AAC7C,UAAM,iBAAiB,qBAAqB,KAAK,MAAM;AAEvD,kCAAM,gBAAgB;AAAA,MACrB,OAAO;AAAA,MACP,OAAO;AAAA,IACR,CAAC;AAAA,EACF,SAAS,KAAP;AACD,QAAI,cAAc,GAAG,GAAG;AACvB,cAAQ,MAAM,IAAI,OAAO;AACzB;AAAA,IACD;AACA,UAAM;AAAA,EACP;AACD;AAEA,cAAc,QAAQ,MAAM,GAAG;","names":["import_promises","path","yargs","fs"]}
+{"version":3,"sources":["run.ts","../lib/env.ts"],"sourcesContent":["#!/usr/bin/env node\nimport { spawn } from 'cross-spawn';\nimport path from 'path';\nimport yargs from 'yargs';\nimport { checkTaqProject, getEncodedConfig, isCustomError } from '../lib/env';\n\nfunction withArguments(cliArgs: string[], fn: (projectDir: string, prefix: string, cmd: string) => Promise<void>) {\n\tif (cliArgs[0].endsWith('node')) cliArgs.shift();\n\n\tconst script = cliArgs.shift();\n\n\tconst parsedArgs = yargs(cliArgs)\n\t\t.option('projectDir', {\n\t\t\talias: 'p',\n\t\t\ttype: 'string',\n\t\t\trequiresArg: true,\n\t\t})\n\t\t.option('prefix', {\n\t\t\ttype: 'string',\n\t\t\trequiresArg: true,\n\t\t\tdefault: '',\n\t\t})\n\t\t.global(['projectDir'])\n\t\t.parseSync();\n\n\tif (parsedArgs._.length > 0 && parsedArgs.projectDir) {\n\t\tfn(parsedArgs.projectDir, parsedArgs.prefix, parsedArgs._.join(' '));\n\t} else console.log(`Usage: ${script} --projectDir <projectDir> [--prefix <prefix>] <command>`);\n}\n\nfunction toCommandWithEnvVars(cmd: string, config: Record<string, string>) {\n\treturn Object.entries(config).reduce(\n\t\t(retval, [key, value]) => {\n\t\t\ttry {\n\t\t\t\treturn `${key}=${value} ${retval}`;\n\t\t\t} catch (err) {\n\t\t\t\tconsole.warn(`Could not set ${key}`);\n\t\t\t\tconsole.warn('Check the contents of the associated file and ensure that it can be Base64 encoded.');\n\t\t\t\treturn retval;\n\t\t\t}\n\t\t},\n\t\tcmd,\n\t);\n}\n\nasync function run(projectDir: string, prefix: string, cmd: string) {\n\ttry {\n\t\tconst taqDir = await checkTaqProject(projectDir);\n\t\tconst config = await getEncodedConfig(taqDir, prefix);\n\t\tconst cmdWithEnvVars = toCommandWithEnvVars(cmd, config);\n\n\t\tspawn(cmdWithEnvVars, {\n\t\t\tshell: true,\n\t\t\tstdio: 'inherit',\n\t\t});\n\t} catch (err) {\n\t\tif (isCustomError(err)) {\n\t\t\tconsole.error(err.message);\n\t\t\treturn;\n\t\t}\n\t\tthrow err;\n\t}\n}\n\nwithArguments(process.argv, run);\n","import { readdir, readFile, stat } from 'fs/promises';\nimport path from 'path';\n\nclass CustomErr extends Error {}\n\nexport class TaqNotFoundError extends CustomErr {\n\tpublic isCustomErr = true;\n}\n\nexport function isCustomError(err: unknown): err is Error {\n\treturn typeof err === 'object' && (err as object).hasOwnProperty('isCustomErr');\n}\n\nexport async function checkTaqProject(dir: string) {\n\ttry {\n\t\tconst searchPath = path.join(dir, '.taq');\n\t\tawait stat(searchPath);\n\t\treturn searchPath;\n\t} catch {\n\t\tthrow new TaqNotFoundError(`${dir} is not a valid Taqueria project.`);\n\t}\n}\n\nfunction getEnvName(filename: string, prefix = '') {\n\treturn `${prefix}TAQ_${filename}`\n\t\t.replace('.json', '')\n\t\t.replace(/\\./mg, '_')\n\t\t.replace(/\\-/mg, '_')\n\t\t.toUpperCase();\n}\n\nexport class TaqConfigError extends CustomErr {}\nexport async function getConfig(taqDir: string, prefix: string) {\n\ttry {\n\t\tconst files = await readdir(taqDir);\n\t\treturn files.reduce(\n\t\t\tasync (retval, file) => {\n\t\t\t\tif (!file.endsWith('.json')) return (await retval);\n\t\t\t\treturn {\n\t\t\t\t\t...(await retval),\n\t\t\t\t\t[getEnvName(file, prefix)]: await readFile(path.join(taqDir, file), 'utf-8'),\n\t\t\t\t};\n\t\t\t},\n\t\t\tPromise.resolve({}),\n\t\t);\n\t} catch {\n\t\tthrow new TaqConfigError(\n\t\t\t`There was a problem reading the config files in ${taqDir}. Please check file permissions are try again.`,\n\t\t);\n\t}\n}\n\nexport function encode(value: string) {\n\tconst buffer = Buffer.from(value, 'utf8');\n\treturn buffer.toString('base64');\n}\n\nexport async function getEncodedConfig(taqDir: string, prefix: string) {\n\tconst config = await getConfig(taqDir, prefix);\n\treturn Object.fromEntries(\n\t\tObject.entries(config).map(\n\t\t\t([k, v]) => [k, encode(v as string)],\n\t\t),\n\t);\n}\n\nexport async function getEnv(env: typeof process.env, taqDir: string, prefix: string = '') {\n\tconst realTaqDir = await checkTaqProject(taqDir);\n\treturn {\n\t\t...env,\n\t\t...await getEncodedConfig(realTaqDir, prefix),\n\t};\n}\n"],"mappings":"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","names":["path","yargs"]}

package/bin/run.ts

@@ -1,29 +1,8 @@
 #!/usr/bin/env node
 import { spawn } from 'cross-spawn';
-import fs from 'fs/promises';
-import { readFile, stat } from 'fs/promises';
 import path from 'path';
 import yargs from 'yargs';
-
-class CustomErr extends Error {}
-
-class TaqNotFoundError extends CustomErr {
-	public isCustomErr = true;
-}
-
-function isCustomError(err: unknown): err is Error {
-	return typeof err === 'object' && (err as object).hasOwnProperty('isCustomErr');
-}
-
-async function checkTaqProject(dir: string) {
-	try {
-		const searchPath = path.join(dir, '.taq');
-		await stat(searchPath);
-		return searchPath;
-	} catch {
-		throw new TaqNotFoundError(`${dir} is not a valid Taqueria project.`);
-	}
-}
+import { checkTaqProject, getEncodedConfig, isCustomError } from '../lib/env';
 
 function withArguments(cliArgs: string[], fn: (projectDir: string, prefix: string, cmd: string) => Promise<void>) {
 	if (cliArgs[0].endsWith('node')) cliArgs.shift();
@@ -49,38 +28,17 @@ function withArguments(cliArgs: string[], fn: (projectDir: string, prefix: strin
 	} else console.log(`Usage: ${script} --projectDir <projectDir> [--prefix <prefix>] <command>`);
 }
 
-function getEnvName(filename: string, prefix = '') {
-	return `${prefix}TAQ_${filename}`
-		.replace('.json', '')
-		.replace(/\./mg, '_')
-		.replace(/\-/mg, '_')
-		.toUpperCase();
-}
-
-class TaqConfigError extends CustomErr {}
-async function getConfig(taqDir: string, prefix: string) {
-	try {
-		const files = await fs.readdir(taqDir);
-		return files.reduce(
-			async (retval, file) => {
-				if (!file.endsWith('.json')) return (await retval);
-				return {
-					...(await retval),
-					[getEnvName(file, prefix)]: await readFile(path.join(taqDir, file), 'utf-8'),
-				};
-			},
-			Promise.resolve({}),
-		);
-	} catch {
-		throw new TaqConfigError(
-			`There was a problem reading the config files in ${taqDir}. Please check file permissions are try again.`,
-		);
-	}
-}
-
 function toCommandWithEnvVars(cmd: string, config: Record<string, string>) {
 	return Object.entries(config).reduce(
-		(retval, [key, value]) => `${key}=${btoa(value)} ${retval}`,
+		(retval, [key, value]) => {
+			try {
+				return `${key}=${value} ${retval}`;
+			} catch (err) {
+				console.warn(`Could not set ${key}`);
+				console.warn('Check the contents of the associated file and ensure that it can be Base64 encoded.');
+				return retval;
+			}
+		},
 		cmd,
 	);
 }
@@ -88,7 +46,7 @@ function toCommandWithEnvVars(cmd: string, config: Record<string, string>) {
 async function run(projectDir: string, prefix: string, cmd: string) {
 	try {
 		const taqDir = await checkTaqProject(projectDir);
-		const config = await getConfig(taqDir, prefix);
+		const config = await getEncodedConfig(taqDir, prefix);
 		const cmdWithEnvVars = toCommandWithEnvVars(cmd, config);
 
 		spawn(cmdWithEnvVars, {

package/index.d.ts

@@ -1,32 +1,15 @@
 import * as _taqueria_protocol_Environment from '@taqueria/protocol/Environment';
 import * as Config from '@taqueria/protocol/Config';
 export { Config };
-import * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';
+export { v as V2 } from './v2-e3846710.js';
 import * as transform from '@taqueria/protocol/types-config-files';
-import { ConfigFileSetV2 as ConfigFileSetV2$1 } from '@taqueria/protocol/types-config-files';
+import '@taqueria/protocol/ConfigEnvironmentFileV2';
 
 declare class TaqError extends Error {
     isTaqError: boolean;
 }
 declare const isTaqError: (err: unknown) => err is TaqError;
 
-type ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & {
-    __type: 'expandedEnv';
-};
-declare function getEnv(envName: string, settings: ConfigFileSetV2$1): ExpandedEnv;
-declare const getCurrentEnv$1: (settings: ConfigFileSetV2$1) => ExpandedEnv;
-declare function getContractAddress(contractName: string, env: ExpandedEnv): string | undefined;
-
-declare const v2_getContractAddress: typeof getContractAddress;
-declare const v2_getEnv: typeof getEnv;
-declare namespace v2 {
-  export {
-    v2_getContractAddress as getContractAddress,
-    getCurrentEnv$1 as getCurrentEnv,
-    v2_getEnv as getEnv,
-  };
-}
-
 declare const getConfigAsV1: (env: Record<string, string | undefined>, prefix?: string) => Config.t;
 declare function getConfigV2(env: Record<string, string | undefined>, prefix?: string): transform.ConfigFileSetV2;
 declare const getAliasAddress: (config: any, alias: string) => string;
@@ -34,4 +17,4 @@ declare const getCurrentEnv: (config: Config.Config) => _taqueria_protocol_Envir
 
 type ConfigFileSetV2 = transform.ConfigFileSetV2;
 
-export { ConfigFileSetV2, TaqError, v2 as V2, getAliasAddress, getConfigAsV1, getConfigV2, getCurrentEnv, isTaqError };
+export { ConfigFileSetV2, TaqError, getAliasAddress, getConfigAsV1, getConfigV2, getCurrentEnv, isTaqError };

package/index.js

@@ -100,6 +100,10 @@ var transform = __toESM(require("@taqueria/protocol/types-config-files"));
 var DEFAULT_ENV_VAR_PREFIX = "";
 function withEnv(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
   const getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;
+  const decode = (value) => {
+    const buffer = Buffer.from(value, "base64");
+    return buffer.toString("utf8");
+  };
   const getRawConfig = () => {
     const key = getConfigEnvKey();
     const data = env[key];
@@ -109,7 +113,7 @@ function withEnv(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
       );
     }
     try {
-      const decoded = atob(data);
+      const decoded = decode(data);
       const rawConfig = JSON.parse(decoded);
       return rawConfig;
     } catch (e) {
@@ -126,7 +130,7 @@ function withEnv(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
       return ConfigEnvironmentFileV2.from({});
     }
     try {
-      const decoded = atob(data);
+      const decoded = decode(data);
       const rawConfig = JSON.parse(decoded);
       return ConfigEnvironmentFileV2.from(rawConfig);
     } catch (e) {

package/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts","TaqError.ts","v1.ts","v2.ts"],"sourcesContent":["import * as Config from '@taqueria/protocol/Config';\nimport * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';\nimport * as ConfigFileV2 from '@taqueria/protocol/ConfigFileV2';\nimport { isTaqError, TaqError } from './TaqError';\nexport { isTaqError, TaqError } from './TaqError';\nimport * as V1 from './v1';\nexport * as V2 from './v2';\nimport * as transform from '@taqueria/protocol/types-config-files';\n\nconst DEFAULT_ENV_VAR_PREFIX = '';\n\nfunction withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX) {\n\tconst getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;\n\n\tconst getRawConfig = () => {\n\t\tconst key = getConfigEnvKey();\n\t\tconst data = env[key];\n\t\tif (!data) {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not find config. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t\ttry {\n\t\t\tconst decoded = atob(data);\n\t\t\tconst rawConfig = JSON.parse(decoded);\n\t\t\treturn rawConfig;\n\t\t} catch {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not parse the config. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t};\n\n\tconst getEnvironmentConfigKey = (environmentName: string) =>\n\t\t`${prefix}TAQ_CONFIG_LOCAL_${environmentName.toUpperCase()}`;\n\n\tconst getEnvironmentConfig = (environmentName: string) => {\n\t\tconst key = getEnvironmentConfigKey(environmentName);\n\t\tconst data = env[key];\n\t\tif (!data) {\n\t\t\treturn ConfigEnvironmentFileV2.from({});\n\t\t}\n\t\ttry {\n\t\t\tconst decoded = atob(data);\n\t\t\tconst rawConfig = JSON.parse(decoded);\n\t\t\treturn ConfigEnvironmentFileV2.from(rawConfig);\n\t\t} catch {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not parse environment config for an environment called ${environmentName}. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t};\n\n\treturn {\n\t\tgetConfigEnvKey,\n\t\tgetRawConfig,\n\t\tgetEnvironmentConfigKey,\n\t\tgetEnvironmentConfig,\n\t};\n}\n\nexport const getConfigAsV1 = (env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX): Config.t => {\n\tconst { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);\n\n\tconst rawConfig = getRawConfig();\n\n\ttry {\n\t\t// If version v1, return the config object\n\t\tif (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') return Config.from(rawConfig);\n\t\t// If version v2, transform to V1 and return that\n\t\telse if (rawConfig.version.toLowerCase() === 'v2') {\n\t\t\tconst config = ConfigFileV2.from(rawConfig);\n\t\t\tconst environments = Object.keys(config.environments ?? {}).reduce(\n\t\t\t\t(retval, envName) => ({\n\t\t\t\t\t...retval,\n\t\t\t\t\t[envName]: getEnvironmentConfig(envName),\n\t\t\t\t}),\n\t\t\t\t{},\n\t\t\t);\n\n\t\t\treturn Config.create(transform.transformConfigFileV2ToConfig({\n\t\t\t\tconfig,\n\t\t\t\tenvironments,\n\t\t\t}));\n\t\t}\n\n\t\t// Other version handlers go here\n\t\tthrow new TaqError(`The version of your configuration is not yet supported.`);\n\t} catch (err) {\n\t\tthrow isTaqError(err)\n\t\t\t? err\n\t\t\t: new TaqError(\n\t\t\t\t`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,\n\t\t\t);\n\t}\n};\n\nexport function getConfigV2(\n\tenv: Record<string, string | undefined>,\n\tprefix = DEFAULT_ENV_VAR_PREFIX,\n): transform.ConfigFileSetV2 {\n\tconst { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);\n\n\tconst rawConfig = getRawConfig();\n\n\ttry {\n\t\t// If version v1, return the config object\n\t\tif (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') {\n\t\t\tconst configV1 = Config.from(rawConfig);\n\t\t\treturn transform.transformConfigToConfigFileV2(configV1);\n\t\t} else if (rawConfig.version.toLowerCase() === 'v2') {\n\t\t\tconst configV2 = ConfigFileV2.from(rawConfig);\n\t\t\tconst environments = Object.keys(configV2.environments ?? {}).reduce(\n\t\t\t\t(retval, envName) => ({ ...retval, [envName]: getEnvironmentConfig(envName) }),\n\t\t\t\t{},\n\t\t\t);\n\t\t\tconst retval: transform.ConfigFileSetV2 = {\n\t\t\t\tconfig: configV2,\n\t\t\t\tenvironments,\n\t\t\t};\n\n\t\t\treturn retval;\n\t\t}\n\t\t// Other version handlers go here\n\t\t// No other versions we're aware of.\n\t\tthrow new TaqError(`The version of your configuration is not yet supported.`);\n\t} catch (err) {\n\t\tthrow isTaqError(err)\n\t\t\t? err\n\t\t\t: new TaqError(\n\t\t\t\t`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,\n\t\t\t);\n\t}\n}\n\n// Backwards compatibility\n// Before introducing V1, the toolkit just exported these two functions\nconst getAliasAddress = V1.getAliasAddress;\nconst getCurrentEnv = V1.getCurrentEnv;\nexport { Config, getAliasAddress, getCurrentEnv };\n\n// New exports as of V2\nexport type ConfigFileSetV2 = transform.ConfigFileSetV2;\n","export class TaqError extends Error {\n\tpublic isTaqError = true;\n}\nexport const isTaqError = (err: unknown): err is TaqError =>\n\ttypeof err === 'object' && (err as object).hasOwnProperty('isTaqError');\n","import * as Config from '@taqueria/protocol/Config';\nimport * as Environment from '@taqueria/protocol/Environment';\n\nexport const getCurrentEnv = (config: Config.t): Environment.t | undefined => {\n\tconst currentEnv = config?.environment?.default ? config.environment.default as string : 'development';\n\treturn config.environment && config.environment[currentEnv]\n\t\t? config.environment[currentEnv] as Environment.t | undefined\n\t\t: undefined;\n};\n\nexport const getAliasAddress = (config: any, alias: string): string => {\n\tconst currentEnv = getCurrentEnv(config);\n\tif (currentEnv?.aliases?.[alias]?.address) return currentEnv.aliases[alias].address;\n\talert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);\n\treturn '';\n};\n","// TODO: Write a comprehensive API for V2\nimport * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';\nimport * as Config from '@taqueria/protocol/ConfigFileV2';\nimport { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';\nimport { isTaqError, TaqError } from './TaqError';\n\ntype ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & { __type: 'expandedEnv' };\nexport function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv {\n\tconst mainEnv = settings.config.environments?.[envName];\n\tif (mainEnv) {\n\t\treturn {\n\t\t\t...mainEnv,\n\t\t\t...settings.environments[envName],\n\t\t} as ExpandedEnv;\n\t}\n\tthrow new TaqError(`There is no environment configured called ${envName}`);\n}\n\nexport const getCurrentEnv = (settings: ConfigFileSetV2) => {\n\tif (settings.config.environmentDefault) {\n\t\treturn getEnv(settings.config.environmentDefault, settings);\n\t}\n\tthrow new TaqError(\n\t\t`No default environment has been configured. Please set the \"environmentDefault\" property in your .taq/config.json.`,\n\t);\n};\n\nexport function getContractAddress(contractName: string, env: ExpandedEnv) {\n\treturn env.contracts?.[contractName]?.address;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAAA;AAAA,EAAA;AAAA;AAAA,uBAAAC;AAAA,EAAA;AAAA;AAAA;AAAA,aAAwB;AACxB,8BAAyC;AACzC,mBAA8B;;;ACFvB,IAAM,WAAN,cAAuB,MAAM;AAAA,EAA7B;AAAA;AACN,SAAO,aAAa;AAAA;AACrB;AACO,IAAM,aAAa,CAAC,QAC1B,OAAO,QAAQ,YAAa,IAAe,eAAe,YAAY;;;ACDhE,IAAM,gBAAgB,CAAC,WAAgD;AAH9E;AAIC,QAAM,eAAa,sCAAQ,gBAAR,mBAAqB,WAAU,OAAO,YAAY,UAAoB;AACzF,SAAO,OAAO,eAAe,OAAO,YAAY,cAC7C,OAAO,YAAY,cACnB;AACJ;AAEO,IAAM,kBAAkB,CAAC,QAAa,UAA0B;AAVvE;AAWC,QAAM,aAAa,cAAc,MAAM;AACvC,OAAI,oDAAY,YAAZ,mBAAsB,WAAtB,mBAA8B;AAAS,WAAO,WAAW,QAAQ,OAAO;AAC5E,QAAM,sBAAsB,6DAA6D;AACzF,SAAO;AACR;;;ACfA;AAAA;AAAA;AAAA,uBAAAC;AAAA,EAAA;AAAA;AAOO,SAAS,OAAO,SAAiB,UAAwC;AAPhF;AAQC,QAAM,WAAU,cAAS,OAAO,iBAAhB,mBAA+B;AAC/C,MAAI,SAAS;AACZ,WAAO;AAAA,MACN,GAAG;AAAA,MACH,GAAG,SAAS,aAAa;AAAA,IAC1B;AAAA,EACD;AACA,QAAM,IAAI,SAAS,6CAA6C,SAAS;AAC1E;AAEO,IAAMC,iBAAgB,CAAC,aAA8B;AAC3D,MAAI,SAAS,OAAO,oBAAoB;AACvC,WAAO,OAAO,SAAS,OAAO,oBAAoB,QAAQ;AAAA,EAC3D;AACA,QAAM,IAAI;AAAA,IACT;AAAA,EACD;AACD;AAEO,SAAS,mBAAmB,cAAsB,KAAkB;AA3B3E;AA4BC,UAAO,eAAI,cAAJ,mBAAgB,kBAAhB,mBAA+B;AACvC;;;AHtBA,gBAA2B;AAE3B,IAAM,yBAAyB;AAE/B,SAAS,QAAQ,KAAyC,SAAS,wBAAwB;AAC1F,QAAM,kBAAkB,MAAM,GAAG;AAEjC,QAAM,eAAe,MAAM;AAC1B,UAAM,MAAM,gBAAgB;AAC5B,UAAM,OAAO,IAAI;AACjB,QAAI,CAAC,MAAM;AACV,YAAM,IAAI;AAAA,QACT,6EAA6E;AAAA,MAC9E;AAAA,IACD;AACA,QAAI;AACH,YAAM,UAAU,KAAK,IAAI;AACzB,YAAM,YAAY,KAAK,MAAM,OAAO;AACpC,aAAO;AAAA,IACR,SAAQ,GAAN;AACD,YAAM,IAAI;AAAA,QACT,kFAAkF;AAAA,MACnF;AAAA,IACD;AAAA,EACD;AAEA,QAAM,0BAA0B,CAAC,oBAChC,GAAG,0BAA0B,gBAAgB,YAAY;AAE1D,QAAM,uBAAuB,CAAC,oBAA4B;AACzD,UAAM,MAAM,wBAAwB,eAAe;AACnD,UAAM,OAAO,IAAI;AACjB,QAAI,CAAC,MAAM;AACV,aAA+B,6BAAK,CAAC,CAAC;AAAA,IACvC;AACA,QAAI;AACH,YAAM,UAAU,KAAK,IAAI;AACzB,YAAM,YAAY,KAAK,MAAM,OAAO;AACpC,aAA+B,6BAAK,SAAS;AAAA,IAC9C,SAAQ,GAAN;AACD,YAAM,IAAI;AAAA,QACT,gEAAgE,uEAAuE;AAAA,MACxI;AAAA,IACD;AAAA,EACD;AAEA,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;AAEO,IAAM,gBAAgB,CAAC,KAAyC,SAAS,2BAAqC;AA7DrH;AA8DC,QAAM,EAAE,cAAc,qBAAqB,IAAI,QAAQ,KAAK,MAAM;AAElE,QAAM,YAAY,aAAa;AAE/B,MAAI;AAEH,QAAI,CAAC,UAAU,WAAW,UAAU,QAAQ,YAAY,MAAM;AAAM,aAAc,YAAK,SAAS;AAAA,aAEvF,UAAU,QAAQ,YAAY,MAAM,MAAM;AAClD,YAAM,SAAsB,kBAAK,SAAS;AAC1C,YAAM,eAAe,OAAO,MAAK,YAAO,iBAAP,YAAuB,CAAC,CAAC,EAAE;AAAA,QAC3D,CAAC,QAAQ,aAAa;AAAA,UACrB,GAAG;AAAA,UACH,CAAC,UAAU,qBAAqB,OAAO;AAAA,QACxC;AAAA,QACA,CAAC;AAAA,MACF;AAEA,aAAc,cAAiB,wCAA8B;AAAA,QAC5D;AAAA,QACA;AAAA,MACD,CAAC,CAAC;AAAA,IACH;AAGA,UAAM,IAAI,SAAS,yDAAyD;AAAA,EAC7E,SAAS,KAAP;AACD,UAAM,WAAW,GAAG,IACjB,MACA,IAAI;AAAA,MACL,2GAA2G;AAAA,IAC5G;AAAA,EACF;AACD;AAEO,SAAS,YACf,KACA,SAAS,wBACmB;AApG7B;AAqGC,QAAM,EAAE,cAAc,qBAAqB,IAAI,QAAQ,KAAK,MAAM;AAElE,QAAM,YAAY,aAAa;AAE/B,MAAI;AAEH,QAAI,CAAC,UAAU,WAAW,UAAU,QAAQ,YAAY,MAAM,MAAM;AACnE,YAAM,WAAkB,YAAK,SAAS;AACtC,aAAiB,wCAA8B,QAAQ;AAAA,IACxD,WAAW,UAAU,QAAQ,YAAY,MAAM,MAAM;AACpD,YAAM,WAAwB,kBAAK,SAAS;AAC5C,YAAM,eAAe,OAAO,MAAK,cAAS,iBAAT,YAAyB,CAAC,CAAC,EAAE;AAAA,QAC7D,CAACC,SAAQ,aAAa,EAAE,GAAGA,SAAQ,CAAC,UAAU,qBAAqB,OAAO,EAAE;AAAA,QAC5E,CAAC;AAAA,MACF;AACA,YAAM,SAAoC;AAAA,QACzC,QAAQ;AAAA,QACR;AAAA,MACD;AAEA,aAAO;AAAA,IACR;AAGA,UAAM,IAAI,SAAS,yDAAyD;AAAA,EAC7E,SAAS,KAAP;AACD,UAAM,WAAW,GAAG,IACjB,MACA,IAAI;AAAA,MACL,2GAA2G;AAAA,IAC5G;AAAA,EACF;AACD;AAIA,IAAMC,mBAAqB;AAC3B,IAAMC,iBAAmB;","names":["getAliasAddress","getCurrentEnv","getCurrentEnv","getCurrentEnv","retval","getAliasAddress","getCurrentEnv"]}
+{"version":3,"sources":["index.ts","TaqError.ts","v1.ts","v2.ts"],"sourcesContent":["import * as Config from '@taqueria/protocol/Config';\nimport * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';\nimport * as ConfigFileV2 from '@taqueria/protocol/ConfigFileV2';\nimport { isTaqError, TaqError } from './TaqError';\nexport { isTaqError, TaqError } from './TaqError';\nimport * as V1 from './v1';\nexport * as V2 from './v2';\nimport * as transform from '@taqueria/protocol/types-config-files';\n\nconst DEFAULT_ENV_VAR_PREFIX = '';\n\nfunction withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX) {\n\tconst getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;\n\n\tconst decode = (value: string) => {\n\t\tconst buffer = Buffer.from(value, 'base64');\n\t\treturn buffer.toString('utf8');\n\t};\n\n\tconst getRawConfig = () => {\n\t\tconst key = getConfigEnvKey();\n\t\tconst data = env[key];\n\t\tif (!data) {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not find config. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t\ttry {\n\t\t\tconst decoded = decode(data);\n\t\t\tconst rawConfig = JSON.parse(decoded);\n\t\t\treturn rawConfig;\n\t\t} catch {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not parse the config. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t};\n\n\tconst getEnvironmentConfigKey = (environmentName: string) =>\n\t\t`${prefix}TAQ_CONFIG_LOCAL_${environmentName.toUpperCase()}`;\n\n\tconst getEnvironmentConfig = (environmentName: string) => {\n\t\tconst key = getEnvironmentConfigKey(environmentName);\n\t\tconst data = env[key];\n\t\tif (!data) {\n\t\t\treturn ConfigEnvironmentFileV2.from({});\n\t\t}\n\t\ttry {\n\t\t\tconst decoded = decode(data);\n\t\t\tconst rawConfig = JSON.parse(decoded);\n\t\t\treturn ConfigEnvironmentFileV2.from(rawConfig);\n\t\t} catch {\n\t\t\tthrow new TaqError(\n\t\t\t\t`Could not parse environment config for an environment called ${environmentName}. Please ensure that the environment variable called ${key} is defined and set to the value of your config.json file using Base64 encoding.`,\n\t\t\t);\n\t\t}\n\t};\n\n\treturn {\n\t\tgetConfigEnvKey,\n\t\tgetRawConfig,\n\t\tgetEnvironmentConfigKey,\n\t\tgetEnvironmentConfig,\n\t};\n}\n\nexport const getConfigAsV1 = (env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX): Config.t => {\n\tconst { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);\n\n\tconst rawConfig = getRawConfig();\n\n\ttry {\n\t\t// If version v1, return the config object\n\t\tif (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') return Config.from(rawConfig);\n\t\t// If version v2, transform to V1 and return that\n\t\telse if (rawConfig.version.toLowerCase() === 'v2') {\n\t\t\tconst config = ConfigFileV2.from(rawConfig);\n\t\t\tconst environments = Object.keys(config.environments ?? {}).reduce(\n\t\t\t\t(retval, envName) => ({\n\t\t\t\t\t...retval,\n\t\t\t\t\t[envName]: getEnvironmentConfig(envName),\n\t\t\t\t}),\n\t\t\t\t{},\n\t\t\t);\n\n\t\t\treturn Config.create(transform.transformConfigFileV2ToConfig({\n\t\t\t\tconfig,\n\t\t\t\tenvironments,\n\t\t\t}));\n\t\t}\n\n\t\t// Other version handlers go here\n\t\tthrow new TaqError(`The version of your configuration is not yet supported.`);\n\t} catch (err) {\n\t\tthrow isTaqError(err)\n\t\t\t? err\n\t\t\t: new TaqError(\n\t\t\t\t`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,\n\t\t\t);\n\t}\n};\n\nexport function getConfigV2(\n\tenv: Record<string, string | undefined>,\n\tprefix = DEFAULT_ENV_VAR_PREFIX,\n): transform.ConfigFileSetV2 {\n\tconst { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);\n\n\tconst rawConfig = getRawConfig();\n\n\ttry {\n\t\t// If version v1, return the config object\n\t\tif (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') {\n\t\t\tconst configV1 = Config.from(rawConfig);\n\t\t\treturn transform.transformConfigToConfigFileV2(configV1);\n\t\t} else if (rawConfig.version.toLowerCase() === 'v2') {\n\t\t\tconst configV2 = ConfigFileV2.from(rawConfig);\n\t\t\tconst environments = Object.keys(configV2.environments ?? {}).reduce(\n\t\t\t\t(retval, envName) => ({ ...retval, [envName]: getEnvironmentConfig(envName) }),\n\t\t\t\t{},\n\t\t\t);\n\t\t\tconst retval: transform.ConfigFileSetV2 = {\n\t\t\t\tconfig: configV2,\n\t\t\t\tenvironments,\n\t\t\t};\n\n\t\t\treturn retval;\n\t\t}\n\t\t// Other version handlers go here\n\t\t// No other versions we're aware of.\n\t\tthrow new TaqError(`The version of your configuration is not yet supported.`);\n\t} catch (err) {\n\t\tthrow isTaqError(err)\n\t\t\t? err\n\t\t\t: new TaqError(\n\t\t\t\t`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,\n\t\t\t);\n\t}\n}\n\n// Backwards compatibility\n// Before introducing V1, the toolkit just exported these two functions\nconst getAliasAddress = V1.getAliasAddress;\nconst getCurrentEnv = V1.getCurrentEnv;\nexport { Config, getAliasAddress, getCurrentEnv };\n\n// New exports as of V2\nexport type ConfigFileSetV2 = transform.ConfigFileSetV2;\n","export class TaqError extends Error {\n\tpublic isTaqError = true;\n}\nexport const isTaqError = (err: unknown): err is TaqError =>\n\ttypeof err === 'object' && (err as object).hasOwnProperty('isTaqError');\n","import * as Config from '@taqueria/protocol/Config';\nimport * as Environment from '@taqueria/protocol/Environment';\n\nexport const getCurrentEnv = (config: Config.t): Environment.t | undefined => {\n\tconst currentEnv = config?.environment?.default ? config.environment.default as string : 'development';\n\treturn config.environment && config.environment[currentEnv]\n\t\t? config.environment[currentEnv] as Environment.t | undefined\n\t\t: undefined;\n};\n\nexport const getAliasAddress = (config: any, alias: string): string => {\n\tconst currentEnv = getCurrentEnv(config);\n\tif (currentEnv?.aliases?.[alias]?.address) return currentEnv.aliases[alias].address;\n\talert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);\n\treturn '';\n};\n","// TODO: Write a comprehensive API for V2\nimport * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';\nimport * as Config from '@taqueria/protocol/ConfigFileV2';\nimport { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';\nimport { isTaqError, TaqError } from './TaqError';\n\ntype ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & { __type: 'expandedEnv' };\nexport function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv {\n\tconst mainEnv = settings.config.environments?.[envName];\n\tif (mainEnv) {\n\t\treturn {\n\t\t\t...mainEnv,\n\t\t\t...settings.environments[envName],\n\t\t} as ExpandedEnv;\n\t}\n\tthrow new TaqError(`There is no environment configured called ${envName}`);\n}\n\nexport const getCurrentEnv = (settings: ConfigFileSetV2) => {\n\tif (settings.config.environmentDefault) {\n\t\treturn getEnv(settings.config.environmentDefault, settings);\n\t}\n\tthrow new TaqError(\n\t\t`No default environment has been configured. Please set the \"environmentDefault\" property in your .taq/config.json.`,\n\t);\n};\n\nexport function getContractAddress(contractName: string, env: ExpandedEnv) {\n\treturn env.contracts?.[contractName]?.address;\n}\n"],"mappings":"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","names":["getAliasAddress","getCurrentEnv","getCurrentEnv","getCurrentEnv","retval","getAliasAddress","getCurrentEnv"]}

package/index.ts

@@ -12,6 +12,11 @@ const DEFAULT_ENV_VAR_PREFIX = '';
 function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX) {
 	const getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;
 
+	const decode = (value: string) => {
+		const buffer = Buffer.from(value, 'base64');
+		return buffer.toString('utf8');
+	};
+
 	const getRawConfig = () => {
 		const key = getConfigEnvKey();
 		const data = env[key];
@@ -21,7 +26,7 @@ function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_V
 			);
 		}
 		try {
-			const decoded = atob(data);
+			const decoded = decode(data);
 			const rawConfig = JSON.parse(decoded);
 			return rawConfig;
 		} catch {
@@ -41,7 +46,7 @@ function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_V
 			return ConfigEnvironmentFileV2.from({});
 		}
 		try {
-			const decoded = atob(data);
+			const decoded = decode(data);
 			const rawConfig = JSON.parse(decoded);
 			return ConfigEnvironmentFileV2.from(rawConfig);
 		} catch {

package/lib/README.md

@@ -0,0 +1 @@
+This directory contains packages that are NodeJS specific

package/lib/env.d.ts

@@ -0,0 +1,19 @@
+declare class CustomErr extends Error {
+}
+export declare class TaqNotFoundError extends CustomErr {
+    isCustomErr: boolean;
+}
+export declare function isCustomError(err: unknown): err is Error;
+export declare function checkTaqProject(dir: string): Promise<string>;
+export declare class TaqConfigError extends CustomErr {
+}
+export declare function getConfig(taqDir: string, prefix: string): Promise<{}>;
+export declare function encode(value: string): string;
+export declare function getEncodedConfig(taqDir: string, prefix: string): Promise<{
+    [k: string]: string;
+}>;
+export declare function getEnv(env: typeof process.env, taqDir: string, prefix?: string): Promise<{
+    [x: string]: string | undefined;
+    TZ?: string | undefined;
+}>;
+export {};

package/lib/env.ts

@@ -0,0 +1,73 @@
+import { readdir, readFile, stat } from 'fs/promises';
+import path from 'path';
+
+class CustomErr extends Error {}
+
+export class TaqNotFoundError extends CustomErr {
+	public isCustomErr = true;
+}
+
+export function isCustomError(err: unknown): err is Error {
+	return typeof err === 'object' && (err as object).hasOwnProperty('isCustomErr');
+}
+
+export async function checkTaqProject(dir: string) {
+	try {
+		const searchPath = path.join(dir, '.taq');
+		await stat(searchPath);
+		return searchPath;
+	} catch {
+		throw new TaqNotFoundError(`${dir} is not a valid Taqueria project.`);
+	}
+}
+
+function getEnvName(filename: string, prefix = '') {
+	return `${prefix}TAQ_${filename}`
+		.replace('.json', '')
+		.replace(/\./mg, '_')
+		.replace(/\-/mg, '_')
+		.toUpperCase();
+}
+
+export class TaqConfigError extends CustomErr {}
+export async function getConfig(taqDir: string, prefix: string) {
+	try {
+		const files = await readdir(taqDir);
+		return files.reduce(
+			async (retval, file) => {
+				if (!file.endsWith('.json')) return (await retval);
+				return {
+					...(await retval),
+					[getEnvName(file, prefix)]: await readFile(path.join(taqDir, file), 'utf-8'),
+				};
+			},
+			Promise.resolve({}),
+		);
+	} catch {
+		throw new TaqConfigError(
+			`There was a problem reading the config files in ${taqDir}. Please check file permissions are try again.`,
+		);
+	}
+}
+
+export function encode(value: string) {
+	const buffer = Buffer.from(value, 'utf8');
+	return buffer.toString('base64');
+}
+
+export async function getEncodedConfig(taqDir: string, prefix: string) {
+	const config = await getConfig(taqDir, prefix);
+	return Object.fromEntries(
+		Object.entries(config).map(
+			([k, v]) => [k, encode(v as string)],
+		),
+	);
+}
+
+export async function getEnv(env: typeof process.env, taqDir: string, prefix: string = '') {
+	const realTaqDir = await checkTaqProject(taqDir);
+	return {
+		...env,
+		...await getEncodedConfig(realTaqDir, prefix),
+	};
+}

package/package.json

@@ -1,8 +1,9 @@
 {
 	"name": "@taqueria/toolkit",
-	"version": "0.28.0",
+	"version": "0.28.1",
 	"description": "A TypeScript library for NodeJS to work with Taqueria projects",
 	"source": "./index.ts",
+	"main": "./index.js",
 	"bin": {
 		"withTaq": "./bin/run.js"
 	},
@@ -36,14 +37,16 @@
 		"typescript": "^4.7.2"
 	},
 	"dependencies": {
-		"@taqueria/protocol": "^0.28.0",
+		"@taqueria/protocol": "^0.28.1",
 		"cross-spawn": "^7.0.3",
 		"yargs": "^17.6.2"
 	},
 	"tsup": [
 		{
 			"entry": [
-				"index.ts"
+				"index.ts",
+				"v1.ts",
+				"v2.ts"
 			],
 			"sourcemap": true,
 			"target": "es2018",
@@ -66,5 +69,12 @@
 			"skipNodeModulesBundle": true,
 			"platform": "node"
 		}
-	]
+	],
+	"exports": {
+		"./lib/*": "./lib/*",
+		".*": "./*",
+		".": "./index.js",
+		"./v1": "./v1.js",
+		"./v2": "./v2.js"
+	}
 }

package/v1.d.ts

@@ -1,4 +1,7 @@
 import * as Config from '@taqueria/protocol/Config';
-import * as Environment from '@taqueria/protocol/Environment';
-export declare const getCurrentEnv: (config: Config.t) => Environment.t | undefined;
-export declare const getAliasAddress: (config: any, alias: string) => string;
+import * as _taqueria_protocol_Environment from '@taqueria/protocol/Environment';
+
+declare const getCurrentEnv: (config: Config.t) => _taqueria_protocol_Environment.t | undefined;
+declare const getAliasAddress: (config: any, alias: string) => string;
+
+export { getAliasAddress, getCurrentEnv };

package/v1.js

@@ -0,0 +1,40 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// v1.ts
+var v1_exports = {};
+__export(v1_exports, {
+  getAliasAddress: () => getAliasAddress,
+  getCurrentEnv: () => getCurrentEnv
+});
+module.exports = __toCommonJS(v1_exports);
+var getCurrentEnv = (config) => {
+  var _a;
+  const currentEnv = ((_a = config == null ? void 0 : config.environment) == null ? void 0 : _a.default) ? config.environment.default : "development";
+  return config.environment && config.environment[currentEnv] ? config.environment[currentEnv] : void 0;
+};
+var getAliasAddress = (config, alias) => {
+  var _a, _b;
+  const currentEnv = getCurrentEnv(config);
+  if ((_b = (_a = currentEnv == null ? void 0 : currentEnv.aliases) == null ? void 0 : _a[alias]) == null ? void 0 : _b.address)
+    return currentEnv.aliases[alias].address;
+  alert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);
+  return "";
+};
+//# sourceMappingURL=v1.js.map

package/v1.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["v1.ts"],"sourcesContent":["import * as Config from '@taqueria/protocol/Config';\nimport * as Environment from '@taqueria/protocol/Environment';\n\nexport const getCurrentEnv = (config: Config.t): Environment.t | undefined => {\n\tconst currentEnv = config?.environment?.default ? config.environment.default as string : 'development';\n\treturn config.environment && config.environment[currentEnv]\n\t\t? config.environment[currentEnv] as Environment.t | undefined\n\t\t: undefined;\n};\n\nexport const getAliasAddress = (config: any, alias: string): string => {\n\tconst currentEnv = getCurrentEnv(config);\n\tif (currentEnv?.aliases?.[alias]?.address) return currentEnv.aliases[alias].address;\n\talert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);\n\treturn '';\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,IAAM,gBAAgB,CAAC,WAAgD;AAH9E;AAIC,QAAM,eAAa,sCAAQ,gBAAR,mBAAqB,WAAU,OAAO,YAAY,UAAoB;AACzF,SAAO,OAAO,eAAe,OAAO,YAAY,cAC7C,OAAO,YAAY,cACnB;AACJ;AAEO,IAAM,kBAAkB,CAAC,QAAa,UAA0B;AAVvE;AAWC,QAAM,aAAa,cAAc,MAAM;AACvC,OAAI,oDAAY,YAAZ,mBAAsB,WAAtB,mBAA8B;AAAS,WAAO,WAAW,QAAQ,OAAO;AAC5E,QAAM,sBAAsB,6DAA6D;AACzF,SAAO;AACR;","names":[]}

package/v2-e3846710.d.ts

@@ -0,0 +1,22 @@
+import * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';
+import { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';
+
+type ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & {
+    __type: 'expandedEnv';
+};
+declare function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv;
+declare const getCurrentEnv: (settings: ConfigFileSetV2) => ExpandedEnv;
+declare function getContractAddress(contractName: string, env: ExpandedEnv): string | undefined;
+
+declare const v2_getContractAddress: typeof getContractAddress;
+declare const v2_getCurrentEnv: typeof getCurrentEnv;
+declare const v2_getEnv: typeof getEnv;
+declare namespace v2 {
+  export {
+    v2_getContractAddress as getContractAddress,
+    v2_getCurrentEnv as getCurrentEnv,
+    v2_getEnv as getEnv,
+  };
+}
+
+export { getCurrentEnv as a, getContractAddress as b, getEnv as g, v2 as v };

package/v2.d.ts

@@ -1,9 +1,3 @@
-import * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';
-import { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';
-type ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & {
-    __type: 'expandedEnv';
-};
-export declare function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv;
-export declare const getCurrentEnv: (settings: ConfigFileSetV2) => ExpandedEnv;
-export declare function getContractAddress(contractName: string, env: ExpandedEnv): string | undefined;
-export {};
+import '@taqueria/protocol/ConfigEnvironmentFileV2';
+import '@taqueria/protocol/types-config-files';
+export { b as getContractAddress, a as getCurrentEnv, g as getEnv } from './v2-e3846710.js';

package/v2.js

@@ -0,0 +1,61 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// v2.ts
+var v2_exports = {};
+__export(v2_exports, {
+  getContractAddress: () => getContractAddress,
+  getCurrentEnv: () => getCurrentEnv,
+  getEnv: () => getEnv
+});
+module.exports = __toCommonJS(v2_exports);
+
+// TaqError.ts
+var TaqError = class extends Error {
+  constructor() {
+    super(...arguments);
+    this.isTaqError = true;
+  }
+};
+
+// v2.ts
+function getEnv(envName, settings) {
+  var _a;
+  const mainEnv = (_a = settings.config.environments) == null ? void 0 : _a[envName];
+  if (mainEnv) {
+    return {
+      ...mainEnv,
+      ...settings.environments[envName]
+    };
+  }
+  throw new TaqError(`There is no environment configured called ${envName}`);
+}
+var getCurrentEnv = (settings) => {
+  if (settings.config.environmentDefault) {
+    return getEnv(settings.config.environmentDefault, settings);
+  }
+  throw new TaqError(
+    `No default environment has been configured. Please set the "environmentDefault" property in your .taq/config.json.`
+  );
+};
+function getContractAddress(contractName, env) {
+  var _a, _b;
+  return (_b = (_a = env.contracts) == null ? void 0 : _a[contractName]) == null ? void 0 : _b.address;
+}
+//# sourceMappingURL=v2.js.map

package/v2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["v2.ts","TaqError.ts"],"sourcesContent":["// TODO: Write a comprehensive API for V2\nimport * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';\nimport * as Config from '@taqueria/protocol/ConfigFileV2';\nimport { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';\nimport { isTaqError, TaqError } from './TaqError';\n\ntype ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & { __type: 'expandedEnv' };\nexport function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv {\n\tconst mainEnv = settings.config.environments?.[envName];\n\tif (mainEnv) {\n\t\treturn {\n\t\t\t...mainEnv,\n\t\t\t...settings.environments[envName],\n\t\t} as ExpandedEnv;\n\t}\n\tthrow new TaqError(`There is no environment configured called ${envName}`);\n}\n\nexport const getCurrentEnv = (settings: ConfigFileSetV2) => {\n\tif (settings.config.environmentDefault) {\n\t\treturn getEnv(settings.config.environmentDefault, settings);\n\t}\n\tthrow new TaqError(\n\t\t`No default environment has been configured. Please set the \"environmentDefault\" property in your .taq/config.json.`,\n\t);\n};\n\nexport function getContractAddress(contractName: string, env: ExpandedEnv) {\n\treturn env.contracts?.[contractName]?.address;\n}\n","export class TaqError extends Error {\n\tpublic isTaqError = true;\n}\nexport const isTaqError = (err: unknown): err is TaqError =>\n\ttypeof err === 'object' && (err as object).hasOwnProperty('isTaqError');\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,IAAM,WAAN,cAAuB,MAAM;AAAA,EAA7B;AAAA;AACN,SAAO,aAAa;AAAA;AACrB;;;ADKO,SAAS,OAAO,SAAiB,UAAwC;AAPhF;AAQC,QAAM,WAAU,cAAS,OAAO,iBAAhB,mBAA+B;AAC/C,MAAI,SAAS;AACZ,WAAO;AAAA,MACN,GAAG;AAAA,MACH,GAAG,SAAS,aAAa;AAAA,IAC1B;AAAA,EACD;AACA,QAAM,IAAI,SAAS,6CAA6C,SAAS;AAC1E;AAEO,IAAM,gBAAgB,CAAC,aAA8B;AAC3D,MAAI,SAAS,OAAO,oBAAoB;AACvC,WAAO,OAAO,SAAS,OAAO,oBAAoB,QAAQ;AAAA,EAC3D;AACA,QAAM,IAAI;AAAA,IACT;AAAA,EACD;AACD;AAEO,SAAS,mBAAmB,cAAsB,KAAkB;AA3B3E;AA4BC,UAAO,eAAI,cAAJ,mBAAgB,kBAAhB,mBAA+B;AACvC;","names":[]}