@8ms/helpers 3.0.20 → 3.0.22

package/dist/api/ApiResponseClass.cjs

@@ -97,8 +97,9 @@ var ApiResponseClass = class ApiResponseClass {
 	};
 	validateZod = (schema) => {
 		try {
+			const validatedBody = schema.parse(this.body);
 			return new ApiResponseClass({
-				body: schema.parse(this.body),
+				body: validatedBody,
 				state: this.state
 			});
 		} catch (error) {

package/dist/api/ApiResponseClass.mjs

@@ -96,8 +96,9 @@ var ApiResponseClass = class ApiResponseClass {
 	};
 	validateZod = (schema) => {
 		try {
+			const validatedBody = schema.parse(this.body);
 			return new ApiResponseClass({
-				body: schema.parse(this.body),
+				body: validatedBody,
 				state: this.state
 			});
 		} catch (error) {

package/dist/aws/server/getAwsConfig.cjs

@@ -28,8 +28,10 @@ const getAwsConfig = async (props) => {
 	if (props.oidcRoleArn && require_environment_environment.isVercel()) {
 		const { awsCredentialsProvider } = await import("@vercel/oidc-aws-credentials-provider");
 		credentials = await awsCredentialsProvider({ roleArn: props.oidcRoleArn })();
+	} else if (props.oidcRoleArn && require_environment_environment.isGoogleCloud()) {
+		const gcpToken = await getGcpOidcToken();
+		credentials = await assumeAwsRoleWithGcpToken(gcpToken, props);
 	}
-	if (props.oidcRoleArn && require_environment_environment.isGoogleCloud()) credentials = await assumeAwsRoleWithGcpToken(await getGcpOidcToken(), props);
 	return { credentials };
 };
 //#endregion

package/dist/aws/server/getAwsConfig.mjs

@@ -27,8 +27,10 @@ const getAwsConfig = async (props) => {
 	if (props.oidcRoleArn && isVercel()) {
 		const { awsCredentialsProvider } = await import("@vercel/oidc-aws-credentials-provider");
 		credentials = await awsCredentialsProvider({ roleArn: props.oidcRoleArn })();
+	} else if (props.oidcRoleArn && isGoogleCloud()) {
+		const gcpToken = await getGcpOidcToken();
+		credentials = await assumeAwsRoleWithGcpToken(gcpToken, props);
 	}
-	if (props.oidcRoleArn && isGoogleCloud()) credentials = await assumeAwsRoleWithGcpToken(await getGcpOidcToken(), props);
 	return { credentials };
 };
 //#endregion

package/dist/date/format.cjs

@@ -86,25 +86,29 @@ const getYearMonthString = (input) => {
 * Shorthand to get the current date.
 */
 const getTodayYmdString = (setMidnight) => {
-	return getYmdString(require_date_calculation.getToday(setMidnight));
+	const today = require_date_calculation.getToday(setMidnight);
+	return getYmdString(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdHisString = (setMidnight) => {
-	return getYmdHisString(require_date_calculation.getToday(setMidnight));
+	const today = require_date_calculation.getToday(setMidnight);
+	return getYmdHisString(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdNumber = (setMidnight) => {
-	return getYmdNumber(require_date_calculation.getToday(setMidnight));
+	const today = require_date_calculation.getToday(setMidnight);
+	return getYmdNumber(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdHisNumber = (setMidnight) => {
-	return getYmdHisNumber(require_date_calculation.getToday(setMidnight));
+	const today = require_date_calculation.getToday(setMidnight);
+	return getYmdHisNumber(today);
 };
 /**
 * Convert a Date into a YYYY number.

package/dist/date/format.mjs

@@ -85,25 +85,29 @@ const getYearMonthString = (input) => {
 * Shorthand to get the current date.
 */
 const getTodayYmdString = (setMidnight) => {
-	return getYmdString(getToday(setMidnight));
+	const today = getToday(setMidnight);
+	return getYmdString(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdHisString = (setMidnight) => {
-	return getYmdHisString(getToday(setMidnight));
+	const today = getToday(setMidnight);
+	return getYmdHisString(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdNumber = (setMidnight) => {
-	return getYmdNumber(getToday(setMidnight));
+	const today = getToday(setMidnight);
+	return getYmdNumber(today);
 };
 /**
 * Shorthand to get the current date.
 */
 const getTodayYmdHisNumber = (setMidnight) => {
-	return getYmdHisNumber(getToday(setMidnight));
+	const today = getToday(setMidnight);
+	return getYmdHisNumber(today);
 };
 /**
 * Convert a Date into a YYYY number.

package/dist/environment/environment.cjs

@@ -7,6 +7,7 @@ const environment = {
 };
 const platform = {
 	AWS: "AWS",
+	LOCALHOST: "LOCALHOST",
 	VERCEL: "VERCEL",
 	GCP: "GCP"
 };
@@ -37,7 +38,7 @@ const getEnvironment = () => {
 * Check to see if we are working on AWS Lambda.
 */
 const isAws = () => platform.AWS === process.env["EMS_PLATFORM"];
-const isVercel = () => "undefined" !== typeof process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF;
+const isVercel = () => platform.VERCEL === process.env["EMS_PLATFORM"];
 const isGoogleCloud = () => platform.GCP === process.env["EMS_PLATFORM"];
 /**
 * Some code should only run on the server side to protect the data.
@@ -52,12 +53,7 @@ const isProduction = () => environment.PRODUCTION === getEnvironment();
 /**
 * Check to see if we are developing locally or on the hosted platform.
 */
-const isLocalhost = () => {
-	if ("true" === process.env["IS_LOCAL"]) return true;
-	if (isAws()) return "true" === process.env["AWS_SAM_LOCAL"];
-	if (isVercel()) return "undefined" === typeof process.env["NEXT_PUBLIC_VERCEL_GIT_REPO_ID"];
-	return false;
-};
+const isLocalhost = () => platform.LOCALHOST === process.env["EMS_PLATFORM"];
 //#endregion
 exports.environment = environment;
 exports.getEnvironment = getEnvironment;

package/dist/environment/environment.d.cts

@@ -7,6 +7,7 @@ declare const environment: {
 type Environment = typeof environment[keyof typeof environment];
 declare const platform: {
   readonly AWS: "AWS";
+  readonly LOCALHOST: "LOCALHOST";
   readonly VERCEL: "VERCEL";
   readonly GCP: "GCP";
 };

package/dist/environment/environment.d.mts

@@ -7,6 +7,7 @@ declare const environment: {
 type Environment = typeof environment[keyof typeof environment];
 declare const platform: {
   readonly AWS: "AWS";
+  readonly LOCALHOST: "LOCALHOST";
   readonly VERCEL: "VERCEL";
   readonly GCP: "GCP";
 };

package/dist/environment/environment.mjs

@@ -6,6 +6,7 @@ const environment = {
 };
 const platform = {
 	AWS: "AWS",
+	LOCALHOST: "LOCALHOST",
 	VERCEL: "VERCEL",
 	GCP: "GCP"
 };
@@ -36,7 +37,7 @@ const getEnvironment = () => {
 * Check to see if we are working on AWS Lambda.
 */
 const isAws = () => platform.AWS === process.env["EMS_PLATFORM"];
-const isVercel = () => "undefined" !== typeof process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF;
+const isVercel = () => platform.VERCEL === process.env["EMS_PLATFORM"];
 const isGoogleCloud = () => platform.GCP === process.env["EMS_PLATFORM"];
 /**
 * Some code should only run on the server side to protect the data.
@@ -51,11 +52,6 @@ const isProduction = () => environment.PRODUCTION === getEnvironment();
 /**
 * Check to see if we are developing locally or on the hosted platform.
 */
-const isLocalhost = () => {
-	if ("true" === process.env["IS_LOCAL"]) return true;
-	if (isAws()) return "true" === process.env["AWS_SAM_LOCAL"];
-	if (isVercel()) return "undefined" === typeof process.env["NEXT_PUBLIC_VERCEL_GIT_REPO_ID"];
-	return false;
-};
+const isLocalhost = () => platform.LOCALHOST === process.env["EMS_PLATFORM"];
 //#endregion
 export { environment, getEnvironment, isAws, isDevelopment, isGoogleCloud, isLocalhost, isProduction, isServer, isStaging, isVercel, platform };

package/dist/util/isUndefined.cjs

@@ -6,7 +6,8 @@ const undefinedValue = "__!!UNDEFINED!!__";
 * Check to see if a value is undefined.
 */
 const isUndefined = (instance, keys) => {
-	return undefinedValue === require_util_defaultTo.defaultTo(instance, keys, undefinedValue);
+	const value = require_util_defaultTo.defaultTo(instance, keys, undefinedValue);
+	return undefinedValue === value;
 };
 //#endregion
 exports.isUndefined = isUndefined;

package/dist/util/isUndefined.mjs

@@ -5,7 +5,8 @@ const undefinedValue = "__!!UNDEFINED!!__";
 * Check to see if a value is undefined.
 */
 const isUndefined = (instance, keys) => {
-	return undefinedValue === defaultTo(instance, keys, undefinedValue);
+	const value = defaultTo(instance, keys, undefinedValue);
+	return undefinedValue === value;
 };
 //#endregion
 export { isUndefined };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "3.0.20",
+	"version": "3.0.22",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"