@taqueria/toolkit 0.27.2-alpha → 0.27.2-rc

package/README.md

@@ -0,0 +1,92 @@
+# Taqueria Toolkit
+
+A client-side package to load Taqueria config and state into a (d)App.
+
+### Quickstart
+
+1. Initialize a taqueria project: `taq init`
+1. Create an app in `./app`.
+1. In app, install the toolkit: `npm i -S @taqueria/toolkit`.
+1. In your app, use the toolkit to get an address of an originated contract: 
+```ts
+import {loadFromEnv, getAliasAddress} from "@taqueria/toolkit"
+const config = await loadFromEnv(process.env)
+const address = getAliasAddress(config, "hello-tacos")
+```
+1. Build the app with the needed environment variables: `withTaq --projectdir ./ npm run app:build`.  
+> This will populate environment variables needed by the toolkit
+
+### Using with create-react-app
+1. Initialize a taqueria project: `taq init`
+1. Create a react app: `npx create-react-app ./app --template typescript`
+1. In `./app/.env`, add `SKIP_PREFLIGHT_CHECK=true`.
+1. In `./app`, run: `npm install`
+1. In `./app`, run: `npm i -S @taqueria/toolkit`.
+1. In `./app`, edit index.tsx to pass environment variables to the App component:
+```ts
+<App env={process.env}/>
+``` 
+1. In `./app`, edit App.tsx to include the toolkit:
+```ts
+import {loadFromEnv, getAliasAddress} from "@taqueria/toolkit"
+
+type AppProps = {
+  env: Record<string, string|undefined>
+}
+
+function App(props: AppProps) {
+    const [contractAddress, setContractAddress] = useState<string|undefined>(undefined)
+
+    useEffect(async ()=>{
+        const config = await loadFromEnv(props.env)
+        // "hello-tacos" is the name of the contract
+        setContractAddress(getAliasAddress(config, "hello-tacos"))
+    })
+}
+```
+1. Adjust the build and start scripts in `package.json` to use the toolkit to populate the necessary environment variables:
+```json
+"scripts": {
+    "start": "withTaq --projectDir ../ --prefix REACT_APP_ react-scripts start",
+    "build": "withTaq --projectDir ../ --prefix REACT_APP_ react-scripts build",
+}
+```
+
+### How it works
+
+The `withTaq` command populates the environment with variables needed by the toolkit. These variables will include your Taqueria & environment configuration:
+```sh
+TAQ_CONFIG=[base64 encoded data]
+TAQ_CONFIG_LOCAL_DEVELOPMENT=[base64 encoded data]
+TAQ_CONFIG_LOCAL_TESTING=[base64 encoded data]
+```
+
+An environment variable will exist for each environment configuration file that exists in your Taqueria project.
+
+These environment variables are then consumed in your app using `loadFromEnv`:
+```ts
+import loadFromEnv from `@taqueria/toolkit`
+const config = await loadFromEnv(process.env)
+```
+
+Rather than having to set these environment variables manually, you can wrap a command using `withTaq`:
+```sh
+withTaq --projectDir ../ npm run build
+```
+
+The above command is an example of how you would populate the environment variables needed when running `npm run build`.
+
+### Advanced Usage:
+
+In some cases and app frameworks, environment variables need special prefixes to be included in your app's environment context. For instance, apps created using `create-react-app` will only have access to environment variables with the `REACT_APP_` prefix. To handle this, two modifications are required:
+
+#### Adjust withTaq to use the prefix
+```sh
+withTaq --projectDir ../ --prefix "REACT_APP_" npm run build
+```
+
+#### Adjust the loadFromEnv call to use the prefix
+```ts
+import loadFromEnv from `@taqueria/toolkit`
+const config = await loadFromEnv(process.env, "REACT_APP_")
+```

package/TaqError.d.ts

@@ -0,0 +1,4 @@
+export declare class TaqError extends Error {
+    isTaqError: boolean;
+}
+export declare const isTaqError: (err: unknown) => err is TaqError;

package/TaqError.ts

@@ -0,0 +1,5 @@
+export class TaqError extends Error {
+	public isTaqError = true;
+}
+export const isTaqError = (err: unknown): err is TaqError =>
+	typeof err === 'object' && (err as object).hasOwnProperty('isTaqError');

package/bin/run.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/bin/run.js

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// 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"));
+var CustomErr = class extends Error {
+};
+var TaqNotFoundError = class extends CustomErr {
+  constructor() {
+    super(...arguments);
+    this.isCustomErr = true;
+  }
+};
+function isCustomError(err) {
+  return typeof err === "object" && err.hasOwnProperty("isCustomErr");
+}
+async function checkTaqProject(dir) {
+  try {
+    const searchPath = import_path.default.join(dir, ".taq");
+    await (0, import_promises2.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();
+}
+var TaqConfigError = class extends CustomErr {
+};
+async function getConfig(taqDir, prefix) {
+  try {
+    const files = await import_promises.default.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")
+        };
+      },
+      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, config) {
+  return Object.entries(config).reduce(
+    (retval, [key, value]) => `${key}=${btoa(value)} ${retval}`,
+    cmd
+  );
+}
+async function run(projectDir, prefix, cmd) {
+  try {
+    const taqDir = await checkTaqProject(projectDir);
+    const config = await getConfig(taqDir, prefix);
+    const cmdWithEnvVars = toCommandWithEnvVars(cmd, config);
+    (0, import_cross_spawn.spawn)(cmdWithEnvVars, {
+      shell: true,
+      stdio: "inherit"
+    });
+  } catch (err) {
+    if (isCustomError(err)) {
+      console.error(err.message);
+      return;
+    }
+    throw err;
+  }
+}
+withArguments(process.argv, run);
+//# sourceMappingURL=run.js.map

package/bin/run.js.map

@@ -0,0 +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"]}

package/bin/run.ts

@@ -0,0 +1,107 @@
+#!/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.`);
+	}
+}
+
+function withArguments(cliArgs: string[], fn: (projectDir: string, prefix: string, cmd: string) => Promise<void>) {
+	if (cliArgs[0].endsWith('node')) cliArgs.shift();
+
+	const script = cliArgs.shift();
+
+	const parsedArgs = yargs(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: 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}`,
+		cmd,
+	);
+}
+
+async function run(projectDir: string, prefix: string, cmd: string) {
+	try {
+		const taqDir = await checkTaqProject(projectDir);
+		const config = await getConfig(taqDir, prefix);
+		const cmdWithEnvVars = toCommandWithEnvVars(cmd, config);
+
+		spawn(cmdWithEnvVars, {
+			shell: true,
+			stdio: 'inherit',
+		});
+	} catch (err) {
+		if (isCustomError(err)) {
+			console.error(err.message);
+			return;
+		}
+		throw err;
+	}
+}
+
+withArguments(process.argv, run);

package/index.d.ts

@@ -1 +1,37 @@
-export declare const getAliasAddress: (config: any, alias: string) => string;
+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';
+import * as transform from '@taqueria/protocol/types-config-files';
+import { ConfigFileSetV2 as ConfigFileSetV2$1 } from '@taqueria/protocol/types-config-files';
+
+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;
+declare const getCurrentEnv: (config: Config.Config) => _taqueria_protocol_Environment.Environment | undefined;
+
+type ConfigFileSetV2 = transform.ConfigFileSetV2;
+
+export { ConfigFileSetV2, TaqError, v2 as V2, getAliasAddress, getConfigAsV1, getConfigV2, getCurrentEnv, isTaqError };

package/index.js

@@ -1,2 +1,202 @@
-"use strict";var a=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var o=Object.prototype.hasOwnProperty;var m=(e,n)=>{for(var t in n)a(e,t,{get:n[t],enumerable:!0})},u=(e,n,t,s)=>{if(n&&typeof n=="object"||typeof n=="function")for(let r of i(n))!o.call(e,r)&&r!==t&&a(e,r,{get:()=>n[r],enumerable:!(s=d(n,r))||s.enumerable});return e};var v=e=>u(a({},"__esModule",{value:!0}),e);var E={};m(E,{getAliasAddress:()=>p});module.exports=v(E);var l=e=>{var t;let n=(t=e==null?void 0:e.environment)!=null&&t.default?e.environment.default:"development";return e.environment&&e.environment[n]?e.environment[n]:void 0},p=(e,n)=>{var s,r;let t=l(e);return(r=(s=t==null?void 0:t.aliases)==null?void 0:s[n])!=null&&r.address?t.aliases[n].address:(alert(`Address for alias, ${n}, is missing. Please deploy a contract with such alias`),"")};0&&(module.exports={getAliasAddress});
-//# sourceMappingURL=index.js.map
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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, from4, except, desc) => {
+  if (from4 && typeof from4 === "object" || typeof from4 === "function") {
+    for (let key of __getOwnPropNames(from4))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from4[key], enumerable: !(desc = __getOwnPropDesc(from4, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// index.ts
+var taqueria_toolkit_exports = {};
+__export(taqueria_toolkit_exports, {
+  Config: () => Config,
+  TaqError: () => TaqError,
+  V2: () => v2_exports,
+  getAliasAddress: () => getAliasAddress2,
+  getConfigAsV1: () => getConfigAsV1,
+  getConfigV2: () => getConfigV2,
+  getCurrentEnv: () => getCurrentEnv3,
+  isTaqError: () => isTaqError
+});
+module.exports = __toCommonJS(taqueria_toolkit_exports);
+var Config = __toESM(require("@taqueria/protocol/Config"));
+var ConfigEnvironmentFileV2 = __toESM(require("@taqueria/protocol/ConfigEnvironmentFileV2"));
+var ConfigFileV2 = __toESM(require("@taqueria/protocol/ConfigFileV2"));
+
+// TaqError.ts
+var TaqError = class extends Error {
+  constructor() {
+    super(...arguments);
+    this.isTaqError = true;
+  }
+};
+var isTaqError = (err) => typeof err === "object" && err.hasOwnProperty("isTaqError");
+
+// v1.ts
+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 "";
+};
+
+// v2.ts
+var v2_exports = {};
+__export(v2_exports, {
+  getContractAddress: () => getContractAddress,
+  getCurrentEnv: () => getCurrentEnv2,
+  getEnv: () => getEnv
+});
+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 getCurrentEnv2 = (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;
+}
+
+// index.ts
+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 getRawConfig = () => {
+    const key = getConfigEnvKey();
+    const data = env[key];
+    if (!data) {
+      throw new TaqError(
+        `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.`
+      );
+    }
+    try {
+      const decoded = atob(data);
+      const rawConfig = JSON.parse(decoded);
+      return rawConfig;
+    } catch (e) {
+      throw new TaqError(
+        `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.`
+      );
+    }
+  };
+  const getEnvironmentConfigKey = (environmentName) => `${prefix}TAQ_CONFIG_LOCAL_${environmentName.toUpperCase()}`;
+  const getEnvironmentConfig = (environmentName) => {
+    const key = getEnvironmentConfigKey(environmentName);
+    const data = env[key];
+    if (!data) {
+      return ConfigEnvironmentFileV2.from({});
+    }
+    try {
+      const decoded = atob(data);
+      const rawConfig = JSON.parse(decoded);
+      return ConfigEnvironmentFileV2.from(rawConfig);
+    } catch (e) {
+      throw new TaqError(
+        `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.`
+      );
+    }
+  };
+  return {
+    getConfigEnvKey,
+    getRawConfig,
+    getEnvironmentConfigKey,
+    getEnvironmentConfig
+  };
+}
+var getConfigAsV1 = (env, prefix = DEFAULT_ENV_VAR_PREFIX) => {
+  var _a;
+  const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+  const rawConfig = getRawConfig();
+  try {
+    if (!rawConfig.version || rawConfig.version.toLowerCase() === "v1")
+      return Config.from(rawConfig);
+    else if (rawConfig.version.toLowerCase() === "v2") {
+      const config = ConfigFileV2.from(rawConfig);
+      const environments = Object.keys((_a = config.environments) != null ? _a : {}).reduce(
+        (retval, envName) => ({
+          ...retval,
+          [envName]: getEnvironmentConfig(envName)
+        }),
+        {}
+      );
+      return Config.create(transform.transformConfigFileV2ToConfig({
+        config,
+        environments
+      }));
+    }
+    throw new TaqError(`The version of your configuration is not yet supported.`);
+  } catch (err) {
+    throw isTaqError(err) ? err : new TaqError(
+      `Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`
+    );
+  }
+};
+function getConfigV2(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
+  var _a;
+  const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+  const rawConfig = getRawConfig();
+  try {
+    if (!rawConfig.version || rawConfig.version.toLowerCase() === "v1") {
+      const configV1 = Config.from(rawConfig);
+      return transform.transformConfigToConfigFileV2(configV1);
+    } else if (rawConfig.version.toLowerCase() === "v2") {
+      const configV2 = ConfigFileV2.from(rawConfig);
+      const environments = Object.keys((_a = configV2.environments) != null ? _a : {}).reduce(
+        (retval2, envName) => ({ ...retval2, [envName]: getEnvironmentConfig(envName) }),
+        {}
+      );
+      const retval = {
+        config: configV2,
+        environments
+      };
+      return retval;
+    }
+    throw new TaqError(`The version of your configuration is not yet supported.`);
+  } catch (err) {
+    throw isTaqError(err) ? err : new TaqError(
+      `Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`
+    );
+  }
+}
+var getAliasAddress2 = getAliasAddress;
+var getCurrentEnv3 = getCurrentEnv;
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["index.ts"],
-  "sourcesContent": ["import * as Config from '@taqueria/protocol/Config';\nimport * as Environment from '@taqueria/protocol/Environment';\n\n// Copied from state package\n// const getProjectAbsPath = async (search = './'): Promise<string> => {\n// \tconst dir = resolve(search);\n\n// \t// If we've reached / or c:\\, then give up\n// \tif (/^(\\/|[A-Z]:\\\\?)$/.test(dir)) {\n// \t\tthrow 'Could not find project directory';\n// \t}\n\n// \tconst filename = join(dir, '.taq', 'config.json');\n// \ttry {\n// \t\tconst exists = await stat(filename);\n\n// \t\t// TODO: Will this work on Windows?\n// \t\t// ... I might need to use .taq\\config.json\n// \t\treturn filename.replace('.taq/config.json', '');\n// \t} catch {\n// \t\t// TODO: Will this work on Windows?\n// \t\t// I might need to do ..\\\n// \t\treturn await getProjectAbsPath(join(dir, '../'));\n// \t}\n// };\n\n// Copied from state package\n// const getConfig = async (projectAbspath: string): Promise<Config.t> => {\n// \ttry {\n// \t\tconst configAbspath = join(projectAbspath, '.taq', 'config.json');\n// \t\tconst contents = await readFile(configAbspath, 'utf-8');\n// \t\tconst unvalided = JSON.parse(contents);\n// \t\treturn Config.create(unvalided);\n// \t} catch {\n// \t\tthrow 'Could not load .taq/config.json';\n// \t}\n// };\n\n// const sendErr = (msg: string, newline = true) => {\n// \tif (!msg || msg.length === 0) return;\n// \treturn newline\n// \t\t? console.error(msg)\n// \t\t: process.stderr.write(msg) as unknown as void;\n// };\n\n// const getConfigJSON = async (): Promise<Config.t> => {\n// \tconst projectAbspath = await getProjectAbsPath();\n// \tconst config = await getConfig(projectAbspath);\n// \treturn config;\n// };\n\nconst 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": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,IAAA,eAAAC,EAAAH,GAmDA,IAAMI,EAAiBC,GAAgD,CAnDvE,IAAAC,EAoDC,IAAMC,GAAaD,EAAAD,GAAA,YAAAA,EAAQ,cAAR,MAAAC,EAAqB,QAAUD,EAAO,YAAY,QAAoB,cACzF,OAAOA,EAAO,aAAeA,EAAO,YAAYE,GAC7CF,EAAO,YAAYE,GACnB,MACJ,EAEaL,EAAkB,CAACG,EAAaG,IAA0B,CA1DvE,IAAAF,EAAAG,EA2DC,IAAMF,EAAaH,EAAcC,CAAM,EACvC,OAAII,GAAAH,EAAAC,GAAA,YAAAA,EAAY,UAAZ,YAAAD,EAAsBE,KAAtB,MAAAC,EAA8B,QAAgBF,EAAW,QAAQC,GAAO,SAC5E,MAAM,sBAAsBA,yDAA6D,EAClF,GACR",
-  "names": ["taqueria_toolkit_exports", "__export", "getAliasAddress", "__toCommonJS", "getCurrentEnv", "config", "_a", "currentEnv", "alias", "_b"]
-}
+{"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":"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","names":["getAliasAddress","getCurrentEnv","getCurrentEnv","getCurrentEnv","retval","getAliasAddress","getCurrentEnv"]}

package/index.ts

@@ -1,64 +1,143 @@
 import * as Config from '@taqueria/protocol/Config';
-import * as Environment from '@taqueria/protocol/Environment';
-
-// Copied from state package
-// const getProjectAbsPath = async (search = './'): Promise<string> => {
-// 	const dir = resolve(search);
-
-// 	// If we've reached / or c:\, then give up
-// 	if (/^(\/|[A-Z]:\\?)$/.test(dir)) {
-// 		throw 'Could not find project directory';
-// 	}
-
-// 	const filename = join(dir, '.taq', 'config.json');
-// 	try {
-// 		const exists = await stat(filename);
-
-// 		// TODO: Will this work on Windows?
-// 		// ... I might need to use .taq\config.json
-// 		return filename.replace('.taq/config.json', '');
-// 	} catch {
-// 		// TODO: Will this work on Windows?
-// 		// I might need to do ..\
-// 		return await getProjectAbsPath(join(dir, '../'));
-// 	}
-// };
-
-// Copied from state package
-// const getConfig = async (projectAbspath: string): Promise<Config.t> => {
-// 	try {
-// 		const configAbspath = join(projectAbspath, '.taq', 'config.json');
-// 		const contents = await readFile(configAbspath, 'utf-8');
-// 		const unvalided = JSON.parse(contents);
-// 		return Config.create(unvalided);
-// 	} catch {
-// 		throw 'Could not load .taq/config.json';
-// 	}
-// };
-
-// const sendErr = (msg: string, newline = true) => {
-// 	if (!msg || msg.length === 0) return;
-// 	return newline
-// 		? console.error(msg)
-// 		: process.stderr.write(msg) as unknown as void;
-// };
-
-// const getConfigJSON = async (): Promise<Config.t> => {
-// 	const projectAbspath = await getProjectAbsPath();
-// 	const config = await getConfig(projectAbspath);
-// 	return config;
-// };
-
-const getCurrentEnv = (config: Config.t): Environment.t | undefined => {
-	const currentEnv = config?.environment?.default ? config.environment.default as string : 'development';
-	return config.environment && config.environment[currentEnv]
-		? config.environment[currentEnv] as Environment.t | undefined
-		: undefined;
-};
+import * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';
+import * as ConfigFileV2 from '@taqueria/protocol/ConfigFileV2';
+import { isTaqError, TaqError } from './TaqError';
+export { isTaqError, TaqError } from './TaqError';
+import * as V1 from './v1';
+export * as V2 from './v2';
+import * as transform from '@taqueria/protocol/types-config-files';
+
+const DEFAULT_ENV_VAR_PREFIX = '';
+
+function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX) {
+	const getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;
+
+	const getRawConfig = () => {
+		const key = getConfigEnvKey();
+		const data = env[key];
+		if (!data) {
+			throw new TaqError(
+				`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.`,
+			);
+		}
+		try {
+			const decoded = atob(data);
+			const rawConfig = JSON.parse(decoded);
+			return rawConfig;
+		} catch {
+			throw new TaqError(
+				`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.`,
+			);
+		}
+	};
+
+	const getEnvironmentConfigKey = (environmentName: string) =>
+		`${prefix}TAQ_CONFIG_LOCAL_${environmentName.toUpperCase()}`;
+
+	const getEnvironmentConfig = (environmentName: string) => {
+		const key = getEnvironmentConfigKey(environmentName);
+		const data = env[key];
+		if (!data) {
+			return ConfigEnvironmentFileV2.from({});
+		}
+		try {
+			const decoded = atob(data);
+			const rawConfig = JSON.parse(decoded);
+			return ConfigEnvironmentFileV2.from(rawConfig);
+		} catch {
+			throw new TaqError(
+				`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.`,
+			);
+		}
+	};
+
+	return {
+		getConfigEnvKey,
+		getRawConfig,
+		getEnvironmentConfigKey,
+		getEnvironmentConfig,
+	};
+}
+
+export const getConfigAsV1 = (env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX): Config.t => {
+	const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+
+	const rawConfig = getRawConfig();
 
-export const getAliasAddress = (config: any, alias: string): string => {
-	const currentEnv = getCurrentEnv(config);
-	if (currentEnv?.aliases?.[alias]?.address) return currentEnv.aliases[alias].address;
-	alert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);
-	return '';
+	try {
+		// If version v1, return the config object
+		if (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') return Config.from(rawConfig);
+		// If version v2, transform to V1 and return that
+		else if (rawConfig.version.toLowerCase() === 'v2') {
+			const config = ConfigFileV2.from(rawConfig);
+			const environments = Object.keys(config.environments ?? {}).reduce(
+				(retval, envName) => ({
+					...retval,
+					[envName]: getEnvironmentConfig(envName),
+				}),
+				{},
+			);
+
+			return Config.create(transform.transformConfigFileV2ToConfig({
+				config,
+				environments,
+			}));
+		}
+
+		// Other version handlers go here
+		throw new TaqError(`The version of your configuration is not yet supported.`);
+	} catch (err) {
+		throw isTaqError(err)
+			? err
+			: new TaqError(
+				`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,
+			);
+	}
 };
+
+export function getConfigV2(
+	env: Record<string, string | undefined>,
+	prefix = DEFAULT_ENV_VAR_PREFIX,
+): transform.ConfigFileSetV2 {
+	const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+
+	const rawConfig = getRawConfig();
+
+	try {
+		// If version v1, return the config object
+		if (!rawConfig.version || rawConfig.version.toLowerCase() === 'v1') {
+			const configV1 = Config.from(rawConfig);
+			return transform.transformConfigToConfigFileV2(configV1);
+		} else if (rawConfig.version.toLowerCase() === 'v2') {
+			const configV2 = ConfigFileV2.from(rawConfig);
+			const environments = Object.keys(configV2.environments ?? {}).reduce(
+				(retval, envName) => ({ ...retval, [envName]: getEnvironmentConfig(envName) }),
+				{},
+			);
+			const retval: transform.ConfigFileSetV2 = {
+				config: configV2,
+				environments,
+			};
+
+			return retval;
+		}
+		// Other version handlers go here
+		// No other versions we're aware of.
+		throw new TaqError(`The version of your configuration is not yet supported.`);
+	} catch (err) {
+		throw isTaqError(err)
+			? err
+			: new TaqError(
+				`Something went wrong trying to parse your configuration. Please report this to the Taqueria Developers: ${err}`,
+			);
+	}
+}
+
+// Backwards compatibility
+// Before introducing V1, the toolkit just exported these two functions
+const getAliasAddress = V1.getAliasAddress;
+const getCurrentEnv = V1.getCurrentEnv;
+export { Config, getAliasAddress, getCurrentEnv };
+
+// New exports as of V2
+export type ConfigFileSetV2 = transform.ConfigFileSetV2;

package/package.json

@@ -1,18 +1,14 @@
 {
 	"name": "@taqueria/toolkit",
-	"version": "0.27.2-alpha",
+	"version": "0.27.2-rc",
 	"description": "A TypeScript library for NodeJS to work with Taqueria projects",
-	"main": "./index.js",
 	"source": "./index.ts",
-	"targets": {
-		"main": {
-			"context": "node",
-			"isLibrary": true
-		}
+	"bin": {
+		"withTaq": "./bin/run.js"
 	},
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",
-		"build": "npx tsc -p ./tsconfig.json && npx esbuild --bundle ./index.ts --outfile=./index.js --minify --platform=node --sourcemap --target=es6"
+		"build": "npx tsc -p ./tsconfig.json && npx tsup"
 	},
 	"types": "./index.d.ts",
 	"keywords": [
@@ -33,8 +29,42 @@
 	},
 	"homepage": "https://github.com/ecadlabs/taqueria#readme",
 	"devDependencies": {
+		"@types/cross-spawn": "^6.0.2",
 		"@types/node": "^17.0.12",
-		"esbuild": "^0.14.39",
+		"@types/yargs": "^17.0.19",
+		"tsup": "^6.5.0",
 		"typescript": "^4.7.2"
-	}
+	},
+	"dependencies": {
+		"@taqueria/protocol": "^0.27.2-rc",
+		"cross-spawn": "^7.0.3",
+		"yargs": "^17.6.2"
+	},
+	"tsup": [
+		{
+			"entry": [
+				"index.ts"
+			],
+			"sourcemap": true,
+			"target": "es2018",
+			"outDir": "./",
+			"dts": true,
+			"clean": false,
+			"shims": true,
+			"skipNodeModulesBundle": false,
+			"platform": "browser"
+		},
+		{
+			"entry": [
+				"bin/run.ts"
+			],
+			"sourcemap": true,
+			"target": "node16",
+			"outDir": "./bin/",
+			"dts": false,
+			"clean": false,
+			"skipNodeModulesBundle": true,
+			"platform": "node"
+		}
+	]
 }

package/tsconfig.json

@@ -11,7 +11,7 @@
 		// "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
 		/* Language and Environment */
-		"target": "ES6", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+		"target": "ES2019", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
 		// "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
 		// "jsx": "preserve",                                /* Specify what JSX code is generated. */
 		// "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */

package/v1.d.ts

@@ -0,0 +1,4 @@
+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;

package/v1.ts

@@ -0,0 +1,16 @@
+import * as Config from '@taqueria/protocol/Config';
+import * as Environment from '@taqueria/protocol/Environment';
+
+export const getCurrentEnv = (config: Config.t): Environment.t | undefined => {
+	const currentEnv = config?.environment?.default ? config.environment.default as string : 'development';
+	return config.environment && config.environment[currentEnv]
+		? config.environment[currentEnv] as Environment.t | undefined
+		: undefined;
+};
+
+export const getAliasAddress = (config: any, alias: string): string => {
+	const currentEnv = getCurrentEnv(config);
+	if (currentEnv?.aliases?.[alias]?.address) return currentEnv.aliases[alias].address;
+	alert(`Address for alias, ${alias}, is missing. Please deploy a contract with such alias`);
+	return '';
+};

package/v2.d.ts

@@ -0,0 +1,9 @@
+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 {};

package/v2.ts

@@ -0,0 +1,30 @@
+// TODO: Write a comprehensive API for V2
+import * as ConfigEnvironmentFileV2 from '@taqueria/protocol/ConfigEnvironmentFileV2';
+import * as Config from '@taqueria/protocol/ConfigFileV2';
+import { ConfigFileSetV2 } from '@taqueria/protocol/types-config-files';
+import { isTaqError, TaqError } from './TaqError';
+
+type ExpandedEnv = Record<string, unknown> & ConfigEnvironmentFileV2.t & { __type: 'expandedEnv' };
+export function getEnv(envName: string, settings: ConfigFileSetV2): ExpandedEnv {
+	const mainEnv = settings.config.environments?.[envName];
+	if (mainEnv) {
+		return {
+			...mainEnv,
+			...settings.environments[envName],
+		} as ExpandedEnv;
+	}
+	throw new TaqError(`There is no environment configured called ${envName}`);
+}
+
+export const getCurrentEnv = (settings: ConfigFileSetV2) => {
+	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.`,
+	);
+};
+
+export function getContractAddress(contractName: string, env: ExpandedEnv) {
+	return env.contracts?.[contractName]?.address;
+}