swoop-common 2.0.1 → 2.0.3

package/dist/api/additions/templateHierarchyResolver.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { services } from "../init";
+import { CoreService } from "../generated/core";
 const buildTemplateTree = (templates) => {
     const revisionGroups = new Map();
     // Step 1: Group templates by revisionGroupId
@@ -43,7 +43,7 @@ const buildTemplateTree = (templates) => {
 };
 export const resolveTemplateHierarchy = (templateId) => __awaiter(void 0, void 0, void 0, function* () {
     // First fetch all templates
-    const allTemplates = yield services.CoreService.templateList(1);
+    const allTemplates = yield (new CoreService).templateList(1);
     // Find the initial template
     const initialTemplate = allTemplates.data.find((t) => t.id === templateId);
     if (!initialTemplate) {

package/dist/api/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./generated/core/exports";
 export * from "./generated/swoop/exports";
 export { init } from "./init";
+export { deepOrderedMerge } from "../rendering/util/merge";

package/dist/api/index.js

@@ -3,3 +3,4 @@ export * from "./generated/core/exports";
 //export * from "./api/generated/itinerary/exports" Nothing exported directly
 export * from "./generated/swoop/exports";
 export { init } from "./init";
+export { deepOrderedMerge } from "../rendering/util/merge";

package/dist/api/init.d.ts

@@ -1,11 +1,6 @@
 import * as Core from "./generated/core/index";
 import * as Itinerary from "./generated/itinerary/index";
 import * as Swoop from "./generated/swoop/index";
-export declare const services: {
-    SwoopService: Swoop.SwoopService;
-    CoreService: Core.CoreService;
-    ItineraryService: Itinerary.ItineraryService;
-};
 export declare const init: (opts: {
     itineraryServiceUrl: string;
     coreServiceUrl: string;

package/dist/api/init.js

@@ -2,11 +2,6 @@ import * as Core from "./generated/core/index";
 import * as Itinerary from "./generated/itinerary/index";
 import * as Swoop from "./generated/swoop/index";
 let initalised = false;
-export const services = {
-    SwoopService: new Swoop.SwoopService(),
-    CoreService: new Core.CoreService(),
-    ItineraryService: new Itinerary.ItineraryService(),
-};
 export const init = (opts) => {
     // Keeps it consitent
     if (opts.coreServiceUrl.endsWith("/"))
@@ -20,7 +15,11 @@ export const init = (opts) => {
     Itinerary.OpenAPI.BASE = opts.itineraryServiceUrl;
     Swoop.OpenAPI.BASE = opts.swoopServiceForwardUrl;
     initalised = true;
-    return services;
+    return {
+        SwoopService: new Swoop.SwoopService(),
+        CoreService: new Core.CoreService(),
+        ItineraryService: new Itinerary.ItineraryService(),
+    };
 };
 export const initialisedCheck = () => {
     if (initalised)

package/dist/rendering/renderers/ComponentPicker.d.ts

@@ -6,15 +6,15 @@ export declare const fetchComponents: () => Promise<{
         templateId: string;
         revisionGroupId: string;
         revision: number;
-        metadata: import("../../api/generated/core/exports").Metadata;
+        metadata: import("../../api/generated/core").Metadata;
         name: string;
-        componentFields: Array<import("../../api/generated/core/exports").Field>;
+        componentFields: Array<import("../../api/generated/core").Field>;
         partners: Array<string>;
-        bundle: Array<import("../../api/generated/core/exports").Bundle>;
+        bundle: Array<import("../../api/generated/core").Bundle>;
         startDate?: string | null;
         endDate?: string | null;
         duration?: number | null;
-        details: import("../../api/generated/core/exports").ComponentDetails;
+        details: import("../../api/generated/core").ComponentDetails;
         state?: string | null;
     }[];
 }>;

package/dist/rendering/renderers/ComponentPicker.js

@@ -12,7 +12,7 @@ import { Paper, Typography, Box, TextField, Autocomplete } from '@mui/material';
 import { useLocalErrors } from '../hooks/errors';
 import { ComponentPool } from '../registry/types';
 import { registerComponent } from '../registry/components';
-import { services } from '../../api/init';
+import { CoreService } from '../../api/generated/core';
 const FormComponentPicker = ({ components, selectedComponent, onChange, templateIds, getError, label, enabled }) => {
     const selected = components.find(c => c.id === selectedComponent) || null;
     return (React.createElement(Paper, { component: "form", sx: { display: 'flex', flexDirection: 'column', gap: 1, p: 2, mb: 1 }, noValidate: true, autoComplete: "off" },
@@ -51,7 +51,7 @@ const FormRendererComponentPicker = ({ data, handleChange, path, label, enabled,
 registerComponent("component", FormRendererComponentPicker, ComponentPool.FORM);
 export const fetchComponents = () => __awaiter(void 0, void 0, void 0, function* () {
     const componentsByGroup = new Map();
-    const data = yield services.CoreService.componentList(1, 1000);
+    const data = yield (new CoreService).componentList(1, 1000);
     (data.data || []).forEach((component) => {
         const groupId = component.revisionGroupId;
         if (!componentsByGroup.has(groupId)) {

package/dist/rendering/renderers/TemplatePicker.js

@@ -13,7 +13,7 @@ import { Paper, Typography, Box, TextField, Chip, Autocomplete } from '@mui/mate
 import { useLocalErrors } from '../hooks/errors';
 import { registerComponent } from '../registry/components';
 import { ComponentPool } from '../registry/types';
-import { services } from '../../api/init';
+import { CoreService } from '../../api/generated/core';
 const FormTemplatePicker = ({ templates, selectedTemplates, onChange, label, enabled }) => {
     const selectedValues = templates.filter(t => selectedTemplates.includes(t.id));
     return (React.createElement(Paper, { component: "form", sx: { display: 'flex', flexDirection: 'column', gap: 2, p: 2, mb: 1 }, noValidate: true, autoComplete: "off" },
@@ -33,7 +33,7 @@ const FormRendererTemplatePicker = ({ data, handleChange, path, label, enabled }
     useEffect(() => {
         const load = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
-                const result = yield services.CoreService.templateList(1);
+                const result = yield (new CoreService).templateList(1);
                 setTemplates(result.data);
             }
             catch (err) {

package/dist/rendering/util/merge.d.ts

@@ -0,0 +1 @@
+export declare const deepOrderedMerge: (...objects: Array<Record<string, any>>) => Record<string, any>;

package/dist/rendering/util/merge.js

@@ -0,0 +1,26 @@
+// If this throws an error, it is due to a missmatch in types between objects
+// Objects a merged in order, with later objects taking priority
+export const deepOrderedMerge = (...objects) => {
+    if (objects.length === 0)
+        return {};
+    if (objects.length === 1)
+        return objects[0];
+    let base = objects[0];
+    // Does not account for TYPES changing, only values
+    for (let i = 1; i < objects.length; i++) {
+        let keys = Object.keys(objects[i]);
+        keys.forEach(key => {
+            const val = objects[i][key];
+            if (!(key in base)) {
+                base[key] = val;
+            }
+            else if (val === null || typeof val !== "object" || Array.isArray(val)) {
+                base[key] = val;
+            }
+            else {
+                base[key] = deepOrderedMerge(base[key], val);
+            }
+        });
+    }
+    return base;
+};

package/dist/test.d.ts

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

package/dist/test.js

@@ -1,26 +1 @@
-// If this throws an error, it is due to a missmatch in types between objects
-const conv = (...objects) => {
-    if (objects.length === 0)
-        return {};
-    if (objects.length === 1)
-        return objects[0];
-    let base = objects[0];
-    // Does not account for TYPES changing, only values
-    for (let i = 1; i < objects.length; i++) {
-        let keys = Object.keys(objects[i]);
-        keys.forEach(key => {
-            const val = objects[i][key];
-            if (!(key in base)) {
-                base[key] = val;
-            }
-            else if (val === null || typeof val !== "object" || Array.isArray(val)) {
-                base[key] = val;
-            }
-            else {
-                base[key] = conv(base[key], val);
-            }
-        });
-    }
-    return base;
-};
-export {};
+"use strict";

package/package.json

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