swoop-common 1.0.21 → 1.0.23

package/README.md

@@ -24,6 +24,7 @@ init({
   coreServiceUrl: 'https://your.core.service',
   swoopServiceForwardUrl: 'https://your.forward.service'
 });
+```
 
 ## Service Interfaces
 

package/dist/api/gen.js

@@ -1,4 +1,7 @@
 import fs from "fs";
+import { capitalise } from "../rendering/util/string";
+// Really quick gen file dont judge
+// Considering making a fork of the codegen lib instead of this
 // Export into one file, so i can export entire file out of the swoop lib
 const buildExports = (sdk, excludeCoreTypes, excludeServiceTypes, exclude) => {
     const existing = fs.readFileSync(`./src/api/generated/${sdk}/index.ts`, "utf-8");
@@ -7,6 +10,9 @@ const buildExports = (sdk, excludeCoreTypes, excludeServiceTypes, exclude) => {
     lines.forEach(l => {
         if (!l.startsWith("export"))
             return;
+        // Dont export service
+        if (l.includes("Service }"))
+            return;
         // Dont export openApi or openapi config
         if (l.includes("{ OpenAPI }"))
             return;
@@ -18,6 +24,9 @@ const buildExports = (sdk, excludeCoreTypes, excludeServiceTypes, exclude) => {
             return;
         if (exclude === null || exclude === void 0 ? void 0 : exclude.some(e => l.includes(e)))
             return;
+        if (sdk === "swoop" && l.includes(" as ")) {
+            l = l.split(" as ")[0] + "Swoop } from './index;'";
+        }
         if (excludeServiceTypes && !l.includes(`${sdk[0].toUpperCase()}${sdk.slice(1, sdk.length)}Service`))
             return;
         out.push(l.replace(/'(.*?)'/g, "'./index'"));
@@ -25,59 +34,16 @@ const buildExports = (sdk, excludeCoreTypes, excludeServiceTypes, exclude) => {
     const file = out.join("\n");
     fs.writeFileSync(`./src/api/generated/${sdk}/exports.ts`, file);
 };
-// Little different as it uses as
-const buildExportsSwoop = () => {
-    const existing = fs.readFileSync(`./src/api/generated/swoop/index.ts`, "utf-8");
-    const lines = existing.split("\n");
-    // List of services
-    const services = [];
-    const types = [];
-    lines.forEach(line => {
-        if (line.includes("from './services/")) {
-            const service = line.match(/\{\s*([^}]*?)\s*\}/);
-            if (service && service[1])
-                services.push(service[1]);
-        }
-        if (line.startsWith("export type")) {
-            types.push(line);
-        }
-    });
-    const servicesArray = `const services = [${services.join(", ")}]`;
-    const servicesType = `type SwoopService = ${services.map(s => `StaticMethods<typeof ${s}>`).join("&\n")}`;
-    const serviceImports = services.map(s => `import { ${s} } from './services/${s}';`).join("\n");
-    // Base code to flatten
-    const flatten = `type StaticMethods<T> = {
-    [K in keyof T as T[K] extends (...args: any[]) => any ? K : never]: T[K];
-};
-
-function flatten(): SwoopService
-{
-    const flattened: Record<string, any> = {};
-
-    services.forEach((service) =>
-    {
-        const methodNames = Object.getOwnPropertyNames(service)
-            .filter(name =>
-                name !== 'constructor' &&
-                name !== 'prototype' &&
-                name !== 'length' &&
-                name !== 'name' &&
-                typeof (service as any)[name] === 'function'
-            );
-
-        methodNames.forEach(methodName =>
-        {
-            flattened[methodName] = (service as any)[methodName];
-        })
-    });
-
-    return flattened as SwoopService;
-}
-
-export const SwoopService = flatten();`;
-    const out = ["// GENERATED FILE DO NOT EDIT //", "", types.join("\n"), "", serviceImports, "", servicesType, "", servicesArray, "", flatten].join("\n");
-    fs.writeFileSync(`./src/api/generated/swoop/exports.ts`, out);
+// Edits the class to ensure all methods are not static (so it can be instanced)
+const makeNotStatic = (sdk) => {
+    const existing = fs.readFileSync(`./src/api/generated/${sdk}/services/${capitalise(sdk)}Service.ts`, "utf-8");
+    // Replace static with nothing
+    const clean = existing.replace(/public static/g, "public");
+    fs.writeFileSync(`./src/api/generated/${sdk}/services/${capitalise(sdk)}Service.ts`, clean);
 };
 buildExports("core", false, false, ["{ Traveller }"]);
 buildExports("itinerary", true, true);
-buildExportsSwoop();
+buildExports("swoop", true, false);
+makeNotStatic("core");
+makeNotStatic("itinerary");
+makeNotStatic("swoop");

package/dist/api/generated/core/exports.d.ts

@@ -45,4 +45,3 @@ export type { templateId } from './index';
 export type { TravellerResponse } from './index';
 export type { UserComponentInstanceField } from './index';
 export type { ValidationSchemas } from './index';
-export { CoreService } from './index';

package/dist/api/generated/core/exports.js

@@ -3,4 +3,3 @@ export { ApiError } from './index';
 export { CancelablePromise, CancelError } from './index';
 export { regionParam } from './index';
 export { regionRequired } from './index';
-export { CoreService } from './index';

package/dist/api/generated/core/services/CoreService.d.ts

@@ -14,7 +14,7 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static templateList(page?: number): CancelablePromise<{
+    templateList(page?: number): CancelablePromise<{
         data: Array<DTOTemplateRead>;
         pagination?: Pagination;
     }>;
@@ -25,7 +25,7 @@ export declare class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateCreate(requestBody: DTOTemplateCreate): CancelablePromise<DTOTemplateRead>;
+    templateCreate(requestBody: DTOTemplateCreate): CancelablePromise<DTOTemplateRead>;
     /**
      * Get Template
      * Get a template via id
@@ -33,7 +33,7 @@ export declare class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateGet(templateId: string): CancelablePromise<DTOTemplateRead>;
+    templateGet(templateId: string): CancelablePromise<DTOTemplateRead>;
     /**
      * Update Template
      * Updates a template as a new revision
@@ -42,7 +42,7 @@ export declare class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateUpdate(templateId: string, requestBody: DTOTemplateUpdate): CancelablePromise<DTOTemplateRead>;
+    templateUpdate(templateId: string, requestBody: DTOTemplateUpdate): CancelablePromise<DTOTemplateRead>;
     /**
      * Delete Template
      * Delete a template via id
@@ -50,7 +50,7 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static templateDelete(templateId: string): CancelablePromise<any>;
+    templateDelete(templateId: string): CancelablePromise<any>;
     /**
      * List components
      * List all components
@@ -59,7 +59,7 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentList(page?: number, limit?: number): CancelablePromise<{
+    componentList(page?: number, limit?: number): CancelablePromise<{
         data: Array<DTOComponentRead>;
         pagination?: Pagination;
     }>;
@@ -70,7 +70,7 @@ export declare class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentCreate(requestBody: DTOComponentCreate): CancelablePromise<DTOComponentRead>;
+    componentCreate(requestBody: DTOComponentCreate): CancelablePromise<DTOComponentRead>;
     /**
      * Get Component
      * Get a component via id
@@ -78,7 +78,7 @@ export declare class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentGet(componentId: string): CancelablePromise<DTOComponentRead>;
+    componentGet(componentId: string): CancelablePromise<DTOComponentRead>;
     /**
      * Update Component
      * Update a component as a new revision
@@ -87,7 +87,7 @@ export declare class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentUpdate(componentId: string, requestBody: DTOComponentUpdate): CancelablePromise<DTOComponentRead>;
+    componentUpdate(componentId: string, requestBody: DTOComponentUpdate): CancelablePromise<DTOComponentRead>;
     /**
      * Delete Component
      * Delete a component via id
@@ -95,7 +95,7 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentDelete(componentId: string): CancelablePromise<any>;
+    componentDelete(componentId: string): CancelablePromise<any>;
     /**
      * Update Component State
      * Directly update component state. This does not create a new revision
@@ -104,7 +104,7 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentStateUpdate(componentId: string, requestBody: {
+    componentStateUpdate(componentId: string, requestBody: {
         state?: 'published' | 'deprecated' | 'unpublished';
     }): CancelablePromise<any>;
     /**
@@ -113,5 +113,5 @@ export declare class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static itineraryGet(): CancelablePromise<any>;
+    itineraryGet(): CancelablePromise<any>;
 }

package/dist/api/generated/core/services/CoreService.js

@@ -8,7 +8,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static templateList(page) {
+    templateList(page) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/templates',
@@ -24,7 +24,7 @@ export class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateCreate(requestBody) {
+    templateCreate(requestBody) {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/templates',
@@ -39,7 +39,7 @@ export class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateGet(templateId) {
+    templateGet(templateId) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/templates/{templateId}',
@@ -56,7 +56,7 @@ export class CoreService {
      * @returns DTOTemplateRead OK
      * @throws ApiError
      */
-    static templateUpdate(templateId, requestBody) {
+    templateUpdate(templateId, requestBody) {
         return __request(OpenAPI, {
             method: 'PATCH',
             url: '/templates/{templateId}',
@@ -74,7 +74,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static templateDelete(templateId) {
+    templateDelete(templateId) {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/templates/{templateId}',
@@ -91,7 +91,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentList(page, limit) {
+    componentList(page, limit) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/components',
@@ -108,7 +108,7 @@ export class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentCreate(requestBody) {
+    componentCreate(requestBody) {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/components',
@@ -123,7 +123,7 @@ export class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentGet(componentId) {
+    componentGet(componentId) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/components/{componentId}',
@@ -140,7 +140,7 @@ export class CoreService {
      * @returns DTOComponentRead OK
      * @throws ApiError
      */
-    static componentUpdate(componentId, requestBody) {
+    componentUpdate(componentId, requestBody) {
         return __request(OpenAPI, {
             method: 'PATCH',
             url: '/components/{componentId}',
@@ -158,7 +158,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentDelete(componentId) {
+    componentDelete(componentId) {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/components/{componentId}',
@@ -175,7 +175,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static componentStateUpdate(componentId, requestBody) {
+    componentStateUpdate(componentId, requestBody) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/components/{componentId}/state',
@@ -192,7 +192,7 @@ export class CoreService {
      * @returns any OK
      * @throws ApiError
      */
-    static itineraryGet() {
+    itineraryGet() {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/itineraries',

package/dist/api/generated/itinerary/exports.d.ts

@@ -1 +0,0 @@
-export { ItineraryService } from './index';

package/dist/api/generated/itinerary/exports.js

@@ -1,2 +1,2 @@
+"use strict";
 // GENERATED FILE DO NOT EDIT //
-export { ItineraryService } from './index';

package/dist/api/generated/itinerary/index.d.ts

@@ -22,6 +22,8 @@ export type { DTOComponentUpdate } from './models/DTOComponentUpdate';
 export type { DTOItineraryCreate } from './models/DTOItineraryCreate';
 export type { DTOItineraryRead } from './models/DTOItineraryRead';
 export type { DTOItineraryUpdate } from './models/DTOItineraryUpdate';
+export type { DTORegionCreate } from './models/DTORegionCreate';
+export type { DTORegionRead } from './models/DTORegionRead';
 export type { DTOTemplateCreate } from './models/DTOTemplateCreate';
 export type { DTOTemplateRead } from './models/DTOTemplateRead';
 export type { DTOTemplateUpdate } from './models/DTOTemplateUpdate';

package/dist/api/generated/itinerary/models/DTORegionCreate.d.ts

@@ -0,0 +1,6 @@
+export type DTORegionCreate = {
+    name: string;
+    description: string;
+    destination: string;
+    images: Array<Array<any>>;
+};

package/dist/api/generated/itinerary/models/DTORegionCreate.js

@@ -0,0 +1 @@
+export {};

package/dist/api/generated/itinerary/models/DTORegionRead.d.ts

@@ -0,0 +1,9 @@
+import type { Metadata } from './Metadata';
+export type DTORegionRead = {
+    id: string;
+    metadata: Metadata;
+    name: string;
+    description: string;
+    destination: string;
+    images: Array<string>;
+};

package/dist/api/generated/itinerary/models/DTORegionRead.js

@@ -0,0 +1 @@
+export {};

package/dist/api/generated/itinerary/services/ItineraryService.d.ts

@@ -1,16 +1,9 @@
-import type { BookingItemResponse } from '../models/BookingItemResponse';
-import type { CurrencyItemResponse } from '../models/CurrencyItemResponse';
 import type { DTOItineraryCreate } from '../models/DTOItineraryCreate';
 import type { DTOItineraryRead } from '../models/DTOItineraryRead';
 import type { DTOItineraryUpdate } from '../models/DTOItineraryUpdate';
-import type { IBEvent } from '../models/IBEvent';
-import type { Member } from '../models/Member';
+import type { DTORegionCreate } from '../models/DTORegionCreate';
+import type { DTORegionRead } from '../models/DTORegionRead';
 import type { Pagination } from '../models/Pagination';
-import type { Partner } from '../models/Partner';
-import type { PartnerResponse } from '../models/PartnerResponse';
-import type { SwooperResponse } from '../models/SwooperResponse';
-import type { Traveller } from '../models/Traveller';
-import type { TravellerResponse } from '../models/TravellerResponse';
 import type { CancelablePromise } from '../core/CancelablePromise';
 export declare class ItineraryService {
     /**
@@ -22,7 +15,7 @@ export declare class ItineraryService {
      * @returns any OK
      * @throws ApiError
      */
-    static itineraryList(page?: number, limit?: number, search?: string): CancelablePromise<{
+    itineraryList(page?: number, limit?: number, search?: string): CancelablePromise<{
         data: Array<DTOItineraryRead>;
         pagination?: Pagination;
     }>;
@@ -33,7 +26,7 @@ export declare class ItineraryService {
      * @returns DTOItineraryRead OK
      * @throws ApiError
      */
-    static itineraryCreate(requestBody: DTOItineraryCreate): CancelablePromise<DTOItineraryRead>;
+    itineraryCreate(requestBody: DTOItineraryCreate): CancelablePromise<DTOItineraryRead>;
     /**
      * Get Itinerary
      * Get itinerary via id
@@ -41,7 +34,7 @@ export declare class ItineraryService {
      * @returns DTOItineraryRead OK
      * @throws ApiError
      */
-    static itineraryGet(itineraryId: string): CancelablePromise<DTOItineraryRead>;
+    itineraryGet(itineraryId: string): CancelablePromise<DTOItineraryRead>;
     /**
      * Update Itinerary
      * Update itinerary
@@ -50,7 +43,7 @@ export declare class ItineraryService {
      * @returns DTOItineraryRead OK
      * @throws ApiError
      */
-    static itineraryUpdate(itineraryId: string, requestBody: DTOItineraryUpdate): CancelablePromise<DTOItineraryRead>;
+    itineraryUpdate(itineraryId: string, requestBody: DTOItineraryUpdate): CancelablePromise<DTOItineraryRead>;
     /**
      * Delete Itinerary
      * Delete itinerary via id
@@ -58,23 +51,7 @@ export declare class ItineraryService {
      * @returns any OK
      * @throws ApiError
      */
-    static itineraryDelete(itineraryId: string): CancelablePromise<any>;
-    /**
-     * List Persons
-     * List swoopers
-     * @param region Region name
-     * @returns SwooperResponse OK
-     * @throws ApiError
-     */
-    static personList(region?: 'patagonia' | 'antarctica' | 'arctic'): CancelablePromise<SwooperResponse>;
-    /**
-     * Get Person
-     * Get swooper via id
-     * @param id Object Id
-     * @returns Member OK
-     * @throws ApiError
-     */
-    static personGet(id: string): CancelablePromise<Member>;
+    itineraryDelete(itineraryId: string): CancelablePromise<any>;
     /**
      * Sync Itinerary
      * Sync an itinerary with swoop
@@ -82,62 +59,25 @@ export declare class ItineraryService {
      * @returns DTOItineraryRead OK
      * @throws ApiError
      */
-    static sync(itineraryId: string): CancelablePromise<DTOItineraryRead>;
+    sync(itineraryId: string): CancelablePromise<DTOItineraryRead>;
     /**
-     * List Partners
-     * List all partners
+     * List Regions
+     * List all regions
      * @param page Pagination, starting at page 1
-     * @param region Region name
-     * @param itemsPerPage Items per page
-     * @returns PartnerResponse OK
-     * @throws ApiError
-     */
-    static partnerList(page?: number, region?: 'patagonia' | 'antarctica' | 'arctic', itemsPerPage?: string): CancelablePromise<PartnerResponse>;
-    /**
-     * Get Partner
-     * Get partner via id
-     * @param id Object Id
-     * @returns Partner OK
-     * @throws ApiError
-     */
-    static partnerGet(id: string): CancelablePromise<Partner>;
-    /**
-     * List Travellers
-     * List all travellers
-     * @param enquiryId Enquiry Id
-     * @param region Region
-     * @returns TravellerResponse OK
-     * @throws ApiError
-     */
-    static travellerList(enquiryId: string, region: 'patagonia' | 'antarctica' | 'arctic'): CancelablePromise<TravellerResponse>;
-    /**
-     * Get Traveller
-     * Get traveller via id
-     * @param id Object Id
-     * @returns Traveller OK
-     * @throws ApiError
-     */
-    static travellerGet(id: string): CancelablePromise<Traveller>;
-    /**
-     * List Booking Items
-     * List all booking items
-     * @returns BookingItemResponse OK
-     * @throws ApiError
-     */
-    static bookingItemList(): CancelablePromise<BookingItemResponse>;
-    /**
-     * List Currencies
-     * List all currencies
-     * @returns CurrencyItemResponse OK
+     * @param limit Number of items per page
+     * @returns any OK
      * @throws ApiError
      */
-    static currencyList(): CancelablePromise<CurrencyItemResponse>;
+    regionList(page?: number, limit?: number): CancelablePromise<{
+        data: Array<DTORegionRead>;
+        pagination: Pagination;
+    }>;
     /**
-     * Audit
-     * Audit
+     * Create Region
+     * Create a region
      * @param requestBody
-     * @returns any OK
+     * @returns DTORegionRead OK
      * @throws ApiError
      */
-    static audit(requestBody: IBEvent): CancelablePromise<any>;
+    regionCreate(requestBody?: DTORegionCreate): CancelablePromise<DTORegionRead>;
 }