swoop-common 1.0.30 → 1.0.32

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

@@ -20,6 +20,8 @@ export type { DTOComponentUpdate } from './index';
 export type { DTOItineraryCreate } from './index';
 export type { DTOItineraryRead } from './index';
 export type { DTOItineraryUpdate } from './index';
+export type { DTORegionCreate } from './index';
+export type { DTORegionRead } from './index';
 export type { DTOTemplateCreate } from './index';
 export type { DTOTemplateRead } from './index';
 export type { DTOTemplateUpdate } from './index';
@@ -40,6 +42,7 @@ export type { Region } from './index';
 export { regionParam } from './index';
 export { regionRequired } from './index';
 export type { search } from './index';
+export type { sortParam } from './index';
 export type { SwooperResponse } from './index';
 export type { templateId } from './index';
 export type { TravellerResponse } from './index';

package/dist/api/generated/core/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';
@@ -42,6 +44,7 @@ export type { Region } from './models/Region';
 export { regionParam } from './models/regionParam';
 export { regionRequired } from './models/regionRequired';
 export type { search } from './models/search';
+export type { sortParam } from './models/sortParam';
 export type { SwooperResponse } from './models/SwooperResponse';
 export type { templateId } from './models/templateId';
 export type { Traveller } from './models/Traveller';

package/dist/api/generated/core/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/core/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/core/models/DTORegionRead.js

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

package/dist/api/generated/core/models/sortParam.d.ts

@@ -0,0 +1,4 @@
+/**
+ * List of fields to sort by
+ */
+export type sortParam = any[];

package/dist/api/generated/core/models/sortParam.js

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

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

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

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

@@ -0,0 +1,27 @@
+import fs from "fs";
+// Super lazy bundler, just sticks models onto the end of specs and updates refs
+const bundle = (sdk) => {
+    const specs = fs.readFileSync(`./openapi/${sdk}_service.yaml`, "utf-8");
+    const models = fs.readFileSync("./openapi/models.yaml", "utf-8");
+    // Remove header of models
+    const clean = models.split("\n");
+    let reached = false;
+    let full = "";
+    for (let i = 0; i < clean.length; i++) {
+        if (!reached && clean[i].startsWith("components"))
+            reached = true;
+        // Removes tags
+        if (clean[i].startsWith("tags"))
+            break;
+        if (reached)
+            full += "\n" + clean[i];
+    }
+    // Dont need to parse specs, can just look for references
+    const updatedSpecs = specs.replace(/\.\/models\.yaml/g, "") + "\n" + full;
+    // Make sure all refs are wrapped in '
+    const cleanedSpecs = updatedSpecs.split("\n").map(line => line.replace(/(\$ref:\s*)(?!')([^\s']+)(?!')/, (_, prefix, path) => `${prefix}'${path}'`)).join("\n");
+    fs.mkdirSync("./openapi/generated", { recursive: true });
+    fs.writeFileSync(`./openapi/generated/${sdk}_bundled.yaml`, cleanedSpecs);
+};
+bundle("core");
+bundle("itinerary");

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

@@ -44,6 +44,7 @@ export type { Region } from './models/Region';
 export { regionParam } from './models/regionParam';
 export { regionRequired } from './models/regionRequired';
 export type { search } from './models/search';
+export type { sortParam } from './models/sortParam';
 export type { SwooperResponse } from './models/SwooperResponse';
 export type { templateId } from './models/templateId';
 export type { Traveller } from './models/Traveller';

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

@@ -0,0 +1,4 @@
+/**
+ * List of fields to sort by
+ */
+export type sortParam = any[];

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

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

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

@@ -12,10 +12,11 @@ export declare class ItineraryService {
      * @param page Pagination, starting at page 1
      * @param limit Number of items per page
      * @param search Search term
+     * @param sort List of fields to sort by
      * @returns any OK
      * @throws ApiError
      */
-    itineraryList(page?: number, limit?: number, search?: string): CancelablePromise<{
+    itineraryList(page?: number, limit?: number, search?: string, sort?: any[]): CancelablePromise<{
         data: Array<DTOItineraryRead>;
         pagination?: Pagination;
     }>;
@@ -65,10 +66,11 @@ export declare class ItineraryService {
      * List all regions
      * @param page Pagination, starting at page 1
      * @param limit Number of items per page
+     * @param sort List of fields to sort by
      * @returns any OK
      * @throws ApiError
      */
-    regionList(page?: number, limit?: number): CancelablePromise<{
+    regionList(page?: number, limit?: number, sort?: any[]): CancelablePromise<{
         data: Array<DTORegionRead>;
         pagination: Pagination;
     }>;

package/dist/api/generated/itinerary/services/ItineraryService.js

@@ -7,10 +7,11 @@ export class ItineraryService {
      * @param page Pagination, starting at page 1
      * @param limit Number of items per page
      * @param search Search term
+     * @param sort List of fields to sort by
      * @returns any OK
      * @throws ApiError
      */
-    itineraryList(page, limit, search) {
+    itineraryList(page, limit, search, sort) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/itineraries',
@@ -18,6 +19,7 @@ export class ItineraryService {
                 'page': page,
                 'limit': limit,
                 'search': search,
+                'sort': sort,
             },
         });
     }
@@ -108,16 +110,18 @@ export class ItineraryService {
      * List all regions
      * @param page Pagination, starting at page 1
      * @param limit Number of items per page
+     * @param sort List of fields to sort by
      * @returns any OK
      * @throws ApiError
      */
-    regionList(page, limit) {
+    regionList(page, limit, sort) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/regions',
             query: {
                 'page': page,
                 'limit': limit,
+                'sort': sort,
             },
         });
     }

package/dist/rendering/components/StyledFormView.d.ts

@@ -30,6 +30,8 @@ interface Props {
      * The stage at which to render this template
      */
     stage: Stage;
+    jsonSchema?: any;
+    uiSchema?: any;
 }
 export declare const StyledFormView: React.FC<Props>;
 export {};

package/dist/rendering/components/StyledFormView.js

@@ -5,9 +5,9 @@ import { getComponents } from '../registry/components';
 import { generateJsonSchema } from '../schema/generate/jsonSchemaGenerate';
 import { generateUiSchema } from '../schema/generate/uiSchemaGenerate';
 import { initialisedCheck } from '../../api/init';
-export const StyledFormView = ({ initialData, schema, onChange, stage, pool, readonly }) => {
+export const StyledFormView = ({ initialData, schema, onChange, stage, pool, readonly, jsonSchema, uiSchema }) => {
     useEffect(initialisedCheck, []);
-    const json = generateJsonSchema(schema, stage);
-    const ui = generateUiSchema(schema, stage);
+    const json = jsonSchema || generateJsonSchema(schema, stage);
+    const ui = uiSchema || generateUiSchema(schema, stage);
     return (React.createElement(JsonForms, { onChange: onChange, data: initialData, schema: json, uischema: ui, renderers: [...materialRenderers, ...getComponents(pool)], readonly: readonly, cells: materialCells }));
 };

package/dist/rendering/prebuild/generated/import_generated.d.ts

@@ -1,4 +1,4 @@
-import "../../default_registration/fields_base";
+import "../../type_registration/register";
 import "../../renderers/Address";
 import "../../renderers/ComponentPicker";
 import "../../renderers/Debug";

package/dist/rendering/prebuild/generated/import_generated.js

@@ -1,5 +1,5 @@
 // Base field types
-import "../../default_registration/fields_base";
+import "../../type_registration/register";
 // Custom component renderers
 import "../../renderers/Address";
 import "../../renderers/ComponentPicker";

package/dist/rendering/prebuild/import.js

@@ -21,7 +21,7 @@ const getImports = (base) => {
         return `import "../../renderers/${normalized}"`;
     });
     const templateFormSchemas = [`import "../../schema/formBuilders/formBuilderJsonSchema"`, `import "../../schema/formBuilders/formBuilderUiSchema"`];
-    const baseFieldTypes = `import "../../default_registration/fields_base"`;
+    const baseFieldTypes = `import "../../type_registration/register"`;
     return [
         "// Base field types", baseFieldTypes, "",
         "// Custom component renderers",

package/dist/rendering/type_registration/register.d.ts

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

package/dist/rendering/{default_registration/fields_base.js → type_registration/register.js}

@@ -117,13 +117,23 @@ registerType("address", "Address", {
     },
     required: ["line1", "city", "postcode"]
 }, {}, false);
-registerType("subset", "Subset", {
-    title: "your address",
-    description: "your address",
-    type: "array",
-    items: {
-        type: "string"
-    }
-}, {}, false);
+/*
+registerType(
+    "subset",
+    "Subset",
+    {
+        type: "object",
+        title: "Subset Options",
+        properties: {
+            minItems: { type: "integer", minimum: 0 },
+            maxItems: { type: "integer", minimum: 1 },
+            uniqueItems: { type: "boolean", default: false },
+            itemDefinition: { $ref: "#/$defs/arrayItemDefinition" },
+        },
+    },
+    {
+    },
+    false
+);*/
 registerType("image", "Image", { type: "string" }, {}, false);
 registerType("multiline", "Multiline", { type: "string" }, {}, false);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "1.0.30",
+    "version": "1.0.32",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {