@bash-app/bash-common 30.21.1 → 30.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.21.1",
+  "version": "30.22.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -46,6 +46,11 @@
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
-  }
+    "typescript": "^5.3.3"
+  },
+  "files": [
+    "dist",
+    "src",
+    "prisma"
+  ]
 }

package/src/definitions.ts

@@ -11,11 +11,11 @@ import {
   YearsOfExperience,
 } from "@prisma/client";
 import { CheckoutExt, PublicUser, ServiceBookingExt } from "./extendedSchemas";
-import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
-import { FrontendServiceGetPriceToBookResult } from "./utils/service/frontendServiceBookingUtils";
 import { LuxonDateRange } from "./utils/luxonUtils";
 import { ApiServiceCantBookReason } from "./utils/service/apiServiceBookingApiUtils";
 import { ServiceAttendeeOption } from "./utils/service/attendeeOptionUtils";
+import { FrontendServiceGetPriceToBookResult } from "./utils/service/frontendServiceBookingUtils";
+import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
 
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
@@ -256,7 +256,7 @@ export type ApiServiceBookingParams = {
   bookedDays: ApiServiceBookedDayParams[];
   timezone: string;
   attendeeOption: ServiceAttendeeOption;
-  bashEventId?: string; 
+  bashEventId?: string;
 };
 
 export type ApiServiceCanBookParams = {} & ApiServiceBookingParams;
@@ -391,6 +391,22 @@ export interface ApiResult<T, P extends ErrorDataType = ErrorDataType> {
   rawResponse?: any;
 }
 
+export function removeDataFromResult<
+  T,
+  P extends ErrorDataType = ErrorDataType
+>(
+  result: ApiResult<T, P> | null | undefined
+): ApiResult<undefined, P> | undefined {
+  if (result == null) {
+    return undefined;
+  }
+
+  const { data, ...rest } = result;
+  return {
+    ...rest,
+  };
+}
+
 export enum ApiErrorType {
   Unknown = 1,
   UserAlreadyHasMaximumAllowedFreeTicketsForBashEvent,
@@ -606,7 +622,7 @@ export const ASSET_MIME_TYPES_TO_EXT = {
   "image/tiff": ".tiff",
   "image/vnd": ".ico",
   "video/mp4": ".mp4",
-  "application/pdf": ".pdf", 
+  "application/pdf": ".pdf",
   "video/mov": ".mov",
 };
 export const VALID_ASSET_MIME_TYPES = Object.keys(ASSET_MIME_TYPES_TO_EXT);

package/src/index.ts

@@ -16,6 +16,7 @@ export * from "./utils/promoCodesUtils";
 export * from "./utils/userPromoCodeUtils";
 export * from "./utils/userSubscriptionUtils";
 export * from "./utils/service/regexUtils";
+export * from "./utils/objUtils"
 export * from "./utils/service/serviceUtils";
 export * from "./utils/service/venueUtils";
 export * from "./utils/service/attendeeOptionUtils";

package/src/utils/objUtils.ts

@@ -0,0 +1,41 @@
+export function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+export function deepMerge<
+  T extends Record<string, any>,
+  U extends Record<string, any>
+>(
+  target: T | undefined | null,
+  source: U | undefined | null,
+  mergeArrays: boolean = false,
+  mergeCommon: boolean = false
+): T & U {
+  const output = { ...(mergeCommon ? [] : target) } as T & U;
+
+  for (const key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      const sourceVal = source[key];
+      const targetVal = target ? target[key] : undefined;
+
+      if (mergeArrays && Array.isArray(sourceVal) && Array.isArray(targetVal)) {
+        // Merge arrays by concatenating them.
+        output[key] = [...targetVal, ...sourceVal] as (T & U)[Extract<
+          keyof U,
+          string
+        >];
+      } else if (isObject(sourceVal) && isObject(targetVal)) {
+        // When both values are objects, merge them recursively.
+        output[key] = deepMerge(targetVal, sourceVal) as (T & U)[Extract<
+          keyof U,
+          string
+        >];
+      } else {
+        // Otherwise, overwrite target with source.
+        output[key] = sourceVal as (T & U)[Extract<keyof U, string>];
+      }
+    }
+  }
+
+  return output;
+}

package/.vscode/settings.json

@@ -1,9 +0,0 @@
-{
-    "cSpell.words": [
-        "autoincrement",
-        "bashfeed",
-        "cuid",
-        "Pinterest",
-        "Tradeshow"
-    ]
-}

package/scripts/symlinks.sh

@@ -1,33 +0,0 @@
-#! /bin/bash
-
-# run this script after any schema change to make sure the typescript defintions are updated or
-#... or if npm i is run on any of the repos, as it may overwrite the symlink
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-PATH_TO_PARENT_DIR="../.."
-NODE_MODULES_PATH="node_modules/@bash-app"
-FRONT_END_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/bash-app"
-API_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/api"
-
-TARGETS=(
-  $FRONT_END_TARGET
-  $API_TARGET
-)
-
-BASH_COMMON_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/bash-common"
-
-echo "FRONT_END_TARGET: $FRONT_END_TARGET"
-echo "API_TARGET: $API_TARGET"
-echo "BASH_COMMON_TARGET: $BASH_COMMON_TARGET"
-printf "\n\n"
-
-cd $BASH_COMMON_TARGET && npx prisma generate
-
-for TARGET in "${TARGETS[@]}"; do
-  rm -rf "$TARGET/$NODE_MODULES_PATH"
-  mkdir -p "$TARGET/$NODE_MODULES_PATH"
-  
-  ln -s "$BASH_COMMON_TARGET" "$TARGET/$NODE_MODULES_PATH"
-  cd $TARGET && cp -rf "./$NODE_MODULES_PATH/bash-common/prisma" . && npm run generate
-done

package/tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "noEmit": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "strict": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react-jsx",
-    "noImplicitAny": true,
-    "sourceMap": true
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "src/types/**/*.d.ts"],
-  "exclude": ["node_modules"]
-}