@taqueria/toolkit 0.42.5 → 0.42.7

package/index.js

@@ -102,6 +102,19 @@ function getContractAddress(contractName, env) {
 // index.ts
 var transform = __toESM(require("@taqueria/protocol/types-config-files"));
 var DEFAULT_ENV_VAR_PREFIX = "";
+function withFixedEnv(env) {
+  return Object.entries(env).reduce(
+    (acc, [key, value]) => {
+      if (key.startsWith("VITE_")) {
+        const newKey = key.replace("VITE_", "");
+        acc[newKey] = value;
+      }
+      acc[key] = value;
+      return acc;
+    },
+    {}
+  );
+}
 function withEnv(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
   const getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;
   const decode = (value) => {
@@ -152,7 +165,7 @@ function withEnv(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
 }
 var getConfigAsV1 = (env, prefix = DEFAULT_ENV_VAR_PREFIX) => {
   var _a;
-  const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+  const { getRawConfig, getEnvironmentConfig } = withEnv(withFixedEnv(env), prefix);
   const rawConfig = getRawConfig();
   try {
     if (!rawConfig.version || rawConfig.version.toLowerCase() === "v1")
@@ -180,7 +193,7 @@ var getConfigAsV1 = (env, prefix = DEFAULT_ENV_VAR_PREFIX) => {
 };
 function getConfigV2(env, prefix = DEFAULT_ENV_VAR_PREFIX) {
   var _a;
-  const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+  const { getRawConfig, getEnvironmentConfig } = withEnv(withFixedEnv(env), prefix);
   const rawConfig = getRawConfig();
   try {
     if (!rawConfig.version || rawConfig.version.toLowerCase() === "v1") {

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 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"]}
+{"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 withFixedEnv(env: Record<string, string | undefined>) {\n\treturn Object.entries(env).reduce(\n\t\t(acc, [key, value]) => {\n\t\t\tif (key.startsWith('VITE_')) {\n\t\t\t\tconst newKey = key.replace('VITE_', '');\n\t\t\t\tacc[newKey] = value;\n\t\t\t}\n\t\t\tacc[key] = value;\n\t\t\treturn acc;\n\t\t},\n\t\t{} as Record<string, string | undefined>,\n\t);\n}\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(withFixedEnv(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(withFixedEnv(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

@@ -9,6 +9,20 @@ import * as transform from '@taqueria/protocol/types-config-files';
 
 const DEFAULT_ENV_VAR_PREFIX = '';
 
+function withFixedEnv(env: Record<string, string | undefined>) {
+	return Object.entries(env).reduce(
+		(acc, [key, value]) => {
+			if (key.startsWith('VITE_')) {
+				const newKey = key.replace('VITE_', '');
+				acc[newKey] = value;
+			}
+			acc[key] = value;
+			return acc;
+		},
+		{} as Record<string, string | undefined>,
+	);
+}
+
 function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX) {
 	const getConfigEnvKey = () => `${prefix}TAQ_CONFIG`;
 
@@ -65,7 +79,7 @@ function withEnv(env: Record<string, string | undefined>, prefix = DEFAULT_ENV_V
 }
 
 export const getConfigAsV1 = (env: Record<string, string | undefined>, prefix = DEFAULT_ENV_VAR_PREFIX): Config.t => {
-	const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+	const { getRawConfig, getEnvironmentConfig } = withEnv(withFixedEnv(env), prefix);
 
 	const rawConfig = getRawConfig();
 
@@ -104,7 +118,7 @@ export function getConfigV2(
 	env: Record<string, string | undefined>,
 	prefix = DEFAULT_ENV_VAR_PREFIX,
 ): transform.ConfigFileSetV2 {
-	const { getRawConfig, getEnvironmentConfig } = withEnv(env, prefix);
+	const { getRawConfig, getEnvironmentConfig } = withEnv(withFixedEnv(env), prefix);
 
 	const rawConfig = getRawConfig();
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/toolkit",
-	"version": "0.42.5",
+	"version": "0.42.7",
 	"description": "A TypeScript library for NodeJS to work with Taqueria projects",
 	"source": "./index.ts",
 	"main": "./index.js",
@@ -37,7 +37,7 @@
 		"typescript": "^5.2.2"
 	},
 	"dependencies": {
-		"@taqueria/protocol": "^0.42.5",
+		"@taqueria/protocol": "^0.42.7",
 		"cross-spawn": "^7.0.3",
 		"yargs": "^17.7.2"
 	},