@bash-app/bash-common 1.0.8 → 1.0.10

package/src/extendedSchemas.ts

@@ -1,143 +1,145 @@
-import {
-  AmountOfGuests,
-  EventTask,
-  AssociatedBash,
-  BashEvent,
-  Invitation,
-  TargetAudience,
-  Ticket,
-  User,
-  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact
-} from "@prisma/client";
-import {RecordKey} from "./definitions";
-
-// TODO: Get this to work
-type PrismaInclude<T extends Record<RecordKey, unknown>> = {[key in keyof T]: boolean | {include: T[key]}};
-
-export interface BashEventExt extends BashEvent {
-  targetAudience?: TargetAudience;
-  amountOfGuests?: AmountOfGuests;
-  recurrence?: Recurrence;
-  creator?: User;
-  ticketTiers: TicketTierExt[];
-  media: Media[];
-  eventTasks: EventTask[];
-  tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
-  // Do not include in fetch. Could be hundreds of these
-  invitations: InvitationExt[];
-}
-
-export const BASH_EVENT_DATA_TO_INCLUDE = {
-  targetAudience: true,
-  amountOfGuests: true,
-  recurrence: true,
-  ticketTiers: true,
-  creator: true,
-  eventTasks: true,
-  media: true
-}
-
-export const BASH_EVENT_DATA_TO_CLONE = [
-  'targetAudience',
-  'amountOfGuests',
-  'ticketTiers',
-  'media',
-  'recurrence',
-  'invitations',
-] as const;
-
-type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);
-type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
-type BashEventExtMinusDataToCloneType = Omit<BashEventExt, UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>>;
-
-export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
-  'creator',
-  'eventTasks',
-  'tickets'
-];
-
-export interface InvitationExt extends Invitation {
-  creator: User;
-  sentTo: User;
-  tickets: Ticket[];
-}
-
-export const INVITATION_DATA_TO_INCLUDE = {
-  creator: true,
-  sentTo: true,
-  tickets: true
-}
-
-export interface InvitationExtraData extends Invitation {
-  isFreeGuest?: boolean;
-  isOrganizer?: boolean;
-}
-
-export interface AssociatedBashExt extends AssociatedBash {
-  bashEvent: BashEventExt;
-  invitation: InvitationExt;
-}
-
-
-export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
-  bashEvent: {
-    include: BASH_EVENT_DATA_TO_INCLUDE
-  },
-  invitation: {
-    include: INVITATION_DATA_TO_INCLUDE
-  }
-}
-
-export interface TicketTierExt extends TicketTier {
-  bashEvent: BashEvent;
-  tickets: TicketExt[];
-}
-
-export interface TicketExt extends Ticket {
-  owner: User;
-  forUser: User;
-}
-
-export interface ReviewExt extends Review {
-  comments: BashComment[];
-}
-
-export interface UserExtraData extends User {
-  password: string;
-}
-
-export interface UserExt extends User {
-  services: Service[];
-
-  // Do not include in fetch as there could be thousands of these
-  associatedBashes?: AssociatedBash[]
-  reviews?: ReviewExt[];
-  contacts?: Contact[];
-}
-
-export const USER_DATA_TO_INCLUDE = {
-  services: true,
-}
-
-export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
-  reviews: {
-    include: {
-      comments: true
-    }
-  }
-}
-
-export const PUBLIC_USER_DATA_TO_SELECT = {
-  id: true,
-  email: true,
-  givenName: true,
-  familyName: true,
-  fullName: true,
-  username: true,
-  image: true,
-  uploadedImage: true,
-  services: true,
-}
-
-export type Public_User = Pick<UserExt, keyof typeof PUBLIC_USER_DATA_TO_SELECT>
-  & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
+import {
+  AmountOfGuests,
+  EventTask,
+  AssociatedBash,
+  BashEvent,
+  Invitation,
+  TargetAudience,
+  Ticket,
+  User,
+  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact
+} from "@prisma/client";
+import {RecordKey} from "./definitions";
+
+// TODO: Get this to work
+type PrismaInclude<T extends Record<RecordKey, unknown>> = {[key in keyof T]: boolean | {include: T[key]}};
+
+export interface BashEventExt extends BashEvent {
+  targetAudience?: TargetAudience;
+  amountOfGuests?: AmountOfGuests;
+  recurrence?: Recurrence;
+  creator?: User;
+  ticketTiers: TicketTierExt[];
+  media: Media[];
+  eventTasks: EventTask[];
+  tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
+  // Do not include in fetch. Could be hundreds of these
+  invitations: InvitationExt[];
+  location: string;
+  place?: string;
+}
+
+export const BASH_EVENT_DATA_TO_INCLUDE = {
+  targetAudience: true,
+  amountOfGuests: true,
+  recurrence: true,
+  ticketTiers: true,
+  creator: true,
+  eventTasks: true,
+  media: true
+}
+
+export const BASH_EVENT_DATA_TO_CLONE = [
+  'targetAudience',
+  'amountOfGuests',
+  'ticketTiers',
+  'media',
+  'recurrence',
+  'invitations',
+] as const;
+
+type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);
+type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
+type BashEventExtMinusDataToCloneType = Omit<BashEventExt, UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>>;
+
+export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
+  'creator',
+  'eventTasks',
+  'tickets'
+];
+
+export interface InvitationExt extends Invitation {
+  creator: User;
+  sentTo: User;
+  tickets: Ticket[];
+}
+
+export const INVITATION_DATA_TO_INCLUDE = {
+  creator: true,
+  sentTo: true,
+  tickets: true
+}
+
+export interface InvitationExtraData extends Invitation {
+  isFreeGuest?: boolean;
+  isOrganizer?: boolean;
+}
+
+export interface AssociatedBashExt extends AssociatedBash {
+  bashEvent: BashEventExt;
+  invitation: InvitationExt;
+}
+
+
+export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
+  bashEvent: {
+    include: BASH_EVENT_DATA_TO_INCLUDE
+  },
+  invitation: {
+    include: INVITATION_DATA_TO_INCLUDE
+  }
+}
+
+export interface TicketTierExt extends TicketTier {
+  bashEvent: BashEvent;
+  tickets: TicketExt[];
+}
+
+export interface TicketExt extends Ticket {
+  owner: User;
+  forUser: User;
+}
+
+export interface ReviewExt extends Review {
+  comments: BashComment[];
+}
+
+export interface UserExtraData extends User {
+  password: string;
+}
+
+export interface UserExt extends User {
+  services: Service[];
+
+  // Do not include in fetch as there could be thousands of these
+  associatedBashes?: AssociatedBash[]
+  reviews?: ReviewExt[];
+  contacts?: Contact[];
+}
+
+export const USER_DATA_TO_INCLUDE = {
+  services: true,
+}
+
+export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
+  reviews: {
+    include: {
+      comments: true
+    }
+  }
+}
+
+export const PUBLIC_USER_DATA_TO_SELECT = {
+  id: true,
+  email: true,
+  givenName: true,
+  familyName: true,
+  fullName: true,
+  username: true,
+  image: true,
+  uploadedImage: true,
+  services: true,
+}
+
+export type Public_User = Pick<UserExt, keyof typeof PUBLIC_USER_DATA_TO_SELECT>
+  & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;

package/src/index.ts

@@ -1,2 +1,2 @@
-export * from "./extendedSchemas";
-export * from "./definitions";
+export * from "./extendedSchemas";
+export * from "./definitions";

package/tsconfig.json

@@ -1,19 +1,19 @@
-{
-  "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"],
-  "exclude": ["node_modules"]
-}
+{
+  "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"],
+  "exclude": ["node_modules"]
+}

package/scripts/installSelfInMainProject.ts

@@ -1,23 +0,0 @@
-import shell from 'shelljs';
-
-const BASH_COMMON_DIR = 'bash-common';
-const BASH_APP_PATH = '../node_modules/@bash-app/'; // Need to get to the main project folder
-const BASH_COMMON_PATH = `${BASH_APP_PATH}${BASH_COMMON_DIR}`;
-
-shell.echo('', `Current working dir: ${shell.pwd()}`);
-shell.echo('', `Deleting bash-common folder: ${BASH_COMMON_PATH}`);
-
-shell.rm('-rf', BASH_COMMON_PATH);
-shell.mkdir('-p', BASH_COMMON_PATH);
-
-shell.echo('', `Copying bash-common folder: ${BASH_COMMON_PATH}`);
-shell.cp('-rf', `../${BASH_COMMON_DIR}`,`${BASH_APP_PATH}`);
-
-shell.echo('', `Running npm commands in bash-common folder: ${BASH_COMMON_PATH}`);
-shell.exec(`npm --prefix ${BASH_COMMON_PATH} install`);
-shell.exec(`npm --prefix ${BASH_COMMON_PATH} run build`);
-
-shell.echo('', `Copying prisma folder from bash-common folder: ${BASH_COMMON_PATH}`);
-shell.cp('-rf', `${BASH_COMMON_PATH}/prisma`, '../'); // Need to get to the main project folder
-
-shell.echo('', 'Done setting up bash-common!');