swoop-common 1.0.28 → 1.0.30

package/dist/api/generated/swoop/core/request.js

@@ -1,3 +1,5 @@
+// DO NOT EDIT THIS FILE //
+// THE IMPORTS WILL RESOLVE //
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,10 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
+// This adds hydra unwrapping
+//@ts-nocheck
 import { ApiError } from './ApiError';
 import { CancelablePromise } from './CancelablePromise';
 export const isDefined = (value) => {
@@ -235,6 +235,27 @@ export const catchErrorCodes = (options, result) => {
         throw new ApiError(options, result, `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`);
     }
 };
+const unwrapHydra = (json) => {
+    const context = json["@context"];
+    // Do nothing if not hydra
+    if (!context || typeof context !== "object")
+        return json;
+    // Get keys
+    const keys = Object.keys(context);
+    if (keys.length != 3) {
+        console.log("Unexpected number of keys within hydra context:", keys);
+        return json;
+    }
+    // Get the key that is not hydra
+    const main = keys.find(s => !["@vocab", "hydra"].includes(s));
+    // Main WILL exist, as there are 3 keys and filter max 2
+    const data = json[main];
+    if (!data) {
+        console.log("Hydra defined key did not exist within object:", Object.keys(json));
+        return json;
+    }
+    return data;
+};
 /**
  * Request method
  * @param config The OpenAPI configuration object
@@ -251,7 +272,7 @@ export const request = (config, options) => {
             const headers = yield getHeaders(config, options);
             if (!onCancel.isCancelled) {
                 const response = yield sendRequest(config, options, url, body, formData, headers, onCancel);
-                const responseBody = yield getResponseBody(response);
+                const responseBody = unwrapHydra(yield getResponseBody(response));
                 const responseHeader = getResponseHeader(response, options.responseHeader);
                 const result = {
                     url,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "1.0.28",
+    "version": "1.0.30",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {
@@ -24,7 +24,7 @@
         "build-imports": "tsx ./src/rendering/prebuild/import.ts",
         "build-core-sdk": "npx openapi-typescript-codegen --input ./openapi/generated/core_bundled.yaml --output ./src/api/generated/core --client fetch",
         "build-itinerary-sdk": "npx openapi-typescript-codegen --input ./openapi/generated/itinerary_bundled.yaml --output ./src/api/generated/itinerary --client fetch",
-        "build-swoop-sdk": "npx openapi-typescript-codegen --input ./openapi/swoop_service.yaml --output ./src/api/generated/swoop --client fetch --postfixModels Swoop",
+        "build-swoop-sdk": "npx openapi-typescript-codegen --input ./openapi/swoop_service.yaml --output ./src/api/generated/swoop --client fetch --postfixModels Swoop --request ./src/api/templates/request.ts",
         "prebuild": "npm run build-imports && npm run bundle && npm run build-sdk",
         "build-sdk-exports": "tsx ./src/api/gen.ts",
         "bundle": "",

package/dist/api/gen.d.ts

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

package/dist/api/gen.js

@@ -1,49 +0,0 @@
-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");
-    const out = ["// GENERATED FILE DO NOT EDIT //", ""];
-    const lines = existing.split("\n");
-    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;
-        if (l.includes("{ OpenAPIConfig }"))
-            return;
-        if (excludeCoreTypes && l.includes("{ ApiError }"))
-            return;
-        if (excludeCoreTypes && l.includes("{ CancelablePromise, CancelError }"))
-            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'"));
-    });
-    const file = out.join("\n");
-    fs.writeFileSync(`./src/api/generated/${sdk}/exports.ts`, file);
-};
-// 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);
-buildExports("swoop", true, false);
-makeNotStatic("core");
-makeNotStatic("itinerary");
-makeNotStatic("swoop");