swoop-common 2.1.57 → 2.1.59

package/README.md

@@ -1,204 +1,204 @@
-# Swoop Library
-
-This library is used for rendering **Swoop itinerary templates**. 
-It provides tools for defining **custom field types**, registering **custom components**, 
-rendering templates from a **MasterSchema**, and includes SDKs for all related services. 
-It supports both input mode (for creating templates) and presentation mode (for rendering them for end users). 
-The schema system is stage-aware, enabling precise control over what data is editable or displayed at which stage.
-
-> Note: This package is intended for internal use only.
-
----
-
-# Swoop Library
-
-## Initialization
-
-Before using the Swoop Library, you must initialize it with service URLs:
-
-```ts
-import { init } from 'swoop-common';
-
-init({
-  itineraryServiceUrl: 'https://your.itinerary.service',
-  coreServiceUrl: 'https://your.core.service',
-  swoopServiceForwardUrl: 'https://your.forward.service'
-});
-```
-
-## Service Interfaces
-
-The library provides three primary service interfaces to interact with backend systems:
-
-- **SwoopService** — Interfaces with the Swoop API.
-- **ItineraryService** — For itinerary service.
-- **CoreService** — For core service.
-
-These interfaces offer convenient methods to work seamlessly with the underlying services required by the itinerary system.
-
-## StyledFormView
-
-The `StyledFormView` component is the entry point for rendering a full itinerary template. It handles schema parsing and renderer injection based on mode and form stage.
-
-```tsx
-import { StyledFormView } from 'your-form-library';
-
-<StyledFormView
-  initialData={/* object */}
-  schema={/* MasterSchema */}
-  onChange={(val) => console.log(val)}
-  pool="FORM"
-  readonly={false}
-  stage="Inst"
-/>
-```
-
-### Props
-
-| Name         | Type                          | Description                                                                 |
-|--------------|-------------------------------|-----------------------------------------------------------------------------|
-| initialData  | `any`                         | Initial values for the template. Should not be updated frequently.          |
-| schema       | `MasterSchema`                | Template definition object.                                                 |
-| onChange     | `(val: any) => void`          | Callback with updated data.                                                 |
-| pool         | `ComponentPool`               | `"FORM"` or `"PRESENTATION"` depending on context.                          |
-| readonly     | `boolean`                     | Disables inputs if true (only relevant in FORM pool).                       |
-| stage        | `Stage`                       | Controls which data segment is being rendered.                              |
-
-### Stages
-
-The template system is divided into stages:
-
-- **Stage.Comp** – Data stored on the root component, often static (e.g. metadata, titles). Does not include any dynamic or time-based fields.
-- **Stage.Inst** – Instance-specific data (e.g. timings, localized notes). This is the most common stage for editable fields.
-- **Stage.User** – Data unique to individual users (e.g. room number).
-
-Each stage builds on the one before it. For example, `Stage.User` includes everything from `Stage.Comp` and `Stage.Inst`. Fields are editable based on the current stage. If a value is defined in two stages, the lower stage will take priority.
-
----
-
-## Custom Components
-
-Custom components define how individual fields render. These can behave like typical form inputs or be used for display-only formatting in the `PRESENTATION` pool.
-
-### Example
-
-```tsx
-const FormExample: React.FC<Props> = ({ text, onChange, getError, label, enabled }) => {
-  const [val, setVal] = useState(text);
-  const error = getError ? getError("example")?.message : undefined;
-  const onChangeDebounced = useMemo(() => debounce(onChange, 300), [onChange]);
-
-  const update = (value: string) => {
-    setVal(value);
-    onChangeDebounced(value);
-  };
-
-  return (
-    <Paper sx={{ display: 'flex', flexDirection: 'column', gap: 1, p: 2, background: "#CBC3E3", mb: 1 }}>
-      {!enabled && "THIS IS DISABLED"}
-      <Typography variant='h6'>{label}</Typography>
-      <TextField
-        label="Example label"
-        value={val}
-        onChange={(e) => update(e.target.value)}
-        error={!!error}
-        helperText={error}
-        disabled={!enabled}
-      />
-    </Paper>
-  );
-};
-
-const FormRendererExample: React.FC<ControlProps> = ({ data, handleChange, path, label, enabled }) => {
-  const getError = useLocalErrors(path);
-  return (
-    <FormExample
-      text={data as string}
-      onChange={(val) => handleChange(path, val)}
-      getError={getError}
-      label={label}
-      enabled={enabled}
-    />
-  );
-};
-
-registerComponent("example", FormRendererExample, ComponentPool.FORM);
-registerComponent("example", FormRendererExample, ComponentPool.PRESENTATION);
-```
-
-> Important: You **cannot register two components with the same name within the same pool**. You *can* register the same component name across different pools (e.g., `"example"` in both `"FORM"` and `"PRESENTATION"`).
-
-### Presentation Pool
-
-The `PRESENTATION` pool is more than just read-only. It is designed for **customer-facing output**, rendering fields in a clean, non-form-like layout for readability and professionalism.
-
----
-
-## Custom Types
-
-Custom field types define what kinds of fields can be used when **building a template**. These appear in the template builder UI as selectable field types and control how data is validated and configured.
-
-### Syntax
-
-```ts
-registerType(
-  "typeId",             // Unique type string
-  "Display Name",       // Name shown in template builder
-  schema,               // JSON Schema defining the data structure
-  optionsSchema,        // JSON Schema defining configuration data structure
-  requiredOptions       // boolean: must the options be filled?
-);
-```
-
-### Example
-
-```ts
-registerType("enum", "Dropdown",
-  { type: "array" },
-  {
-    type: "object",
-    title: "Dropdown Options",
-    properties: {
-      enumValues: {
-        title: "Dropdown Values",
-        type: "array",
-        items: { type: "string" }
-      }
-    }
-  },
-  true
-);
-```
-
-This type defines a dropdown field where the values are defined via the `enumValues` property in the template configuration.
-
-### Custom Option Editors
-
-If you want to render a **custom options block** (i.e., how the field type's options are displayed in the template editor), you must do the following:
-
-1. In the top-level `optionsSchema` of the type, define `"x-type": "yourTypeName"`  
-2. Create and register a custom component with the name `"yourTypeName"` in the `"FORM"` pool.
-
-This component will then be used to render the configuration UI for that field type.
-
----
-
-## File Locations
-
-- **Custom components** must be placed in `src/renderers`. They may be nested within subfolders. All files inside `renderers/` will be automatically imported in the correct order.
-- **Custom types** must be added to `src/default_registration/fields_base.tsx`.
-
-No manual import wiring is required beyond placing the file in the correct folder.
-
----
-
-## Publishing to NPM
-
-To publish a new version of the package:
-
-```bash
-npm run build             # Compile the package
-npm version patch         # Bump the patch version (or use minor/major as needed)
-npm adduser               # Log in to NPM (if not already)
-npm publish               # Publish the package
-```
+# Swoop Library
+
+This library is used for rendering **Swoop itinerary templates**. 
+It provides tools for defining **custom field types**, registering **custom components**, 
+rendering templates from a **MasterSchema**, and includes SDKs for all related services. 
+It supports both input mode (for creating templates) and presentation mode (for rendering them for end users). 
+The schema system is stage-aware, enabling precise control over what data is editable or displayed at which stage.
+
+> Note: This package is intended for internal use only.
+
+---
+
+# Swoop Library
+
+## Initialization
+
+Before using the Swoop Library, you must initialize it with service URLs:
+
+```ts
+import { init } from 'swoop-common';
+
+init({
+  itineraryServiceUrl: 'https://your.itinerary.service',
+  coreServiceUrl: 'https://your.core.service',
+  swoopServiceForwardUrl: 'https://your.forward.service'
+});
+```
+
+## Service Interfaces
+
+The library provides three primary service interfaces to interact with backend systems:
+
+- **SwoopService** — Interfaces with the Swoop API.
+- **ItineraryService** — For itinerary service.
+- **CoreService** — For core service.
+
+These interfaces offer convenient methods to work seamlessly with the underlying services required by the itinerary system.
+
+## StyledFormView
+
+The `StyledFormView` component is the entry point for rendering a full itinerary template. It handles schema parsing and renderer injection based on mode and form stage.
+
+```tsx
+import { StyledFormView } from 'your-form-library';
+
+<StyledFormView
+  initialData={/* object */}
+  schema={/* MasterSchema */}
+  onChange={(val) => console.log(val)}
+  pool="FORM"
+  readonly={false}
+  stage="Inst"
+/>
+```
+
+### Props
+
+| Name         | Type                          | Description                                                                 |
+|--------------|-------------------------------|-----------------------------------------------------------------------------|
+| initialData  | `any`                         | Initial values for the template. Should not be updated frequently.          |
+| schema       | `MasterSchema`                | Template definition object.                                                 |
+| onChange     | `(val: any) => void`          | Callback with updated data.                                                 |
+| pool         | `ComponentPool`               | `"FORM"` or `"PRESENTATION"` depending on context.                          |
+| readonly     | `boolean`                     | Disables inputs if true (only relevant in FORM pool).                       |
+| stage        | `Stage`                       | Controls which data segment is being rendered.                              |
+
+### Stages
+
+The template system is divided into stages:
+
+- **Stage.Comp** – Data stored on the root component, often static (e.g. metadata, titles). Does not include any dynamic or time-based fields.
+- **Stage.Inst** – Instance-specific data (e.g. timings, localized notes). This is the most common stage for editable fields.
+- **Stage.User** – Data unique to individual users (e.g. room number).
+
+Each stage builds on the one before it. For example, `Stage.User` includes everything from `Stage.Comp` and `Stage.Inst`. Fields are editable based on the current stage. If a value is defined in two stages, the lower stage will take priority.
+
+---
+
+## Custom Components
+
+Custom components define how individual fields render. These can behave like typical form inputs or be used for display-only formatting in the `PRESENTATION` pool.
+
+### Example
+
+```tsx
+const FormExample: React.FC<Props> = ({ text, onChange, getError, label, enabled }) => {
+  const [val, setVal] = useState(text);
+  const error = getError ? getError("example")?.message : undefined;
+  const onChangeDebounced = useMemo(() => debounce(onChange, 300), [onChange]);
+
+  const update = (value: string) => {
+    setVal(value);
+    onChangeDebounced(value);
+  };
+
+  return (
+    <Paper sx={{ display: 'flex', flexDirection: 'column', gap: 1, p: 2, background: "#CBC3E3", mb: 1 }}>
+      {!enabled && "THIS IS DISABLED"}
+      <Typography variant='h6'>{label}</Typography>
+      <TextField
+        label="Example label"
+        value={val}
+        onChange={(e) => update(e.target.value)}
+        error={!!error}
+        helperText={error}
+        disabled={!enabled}
+      />
+    </Paper>
+  );
+};
+
+const FormRendererExample: React.FC<ControlProps> = ({ data, handleChange, path, label, enabled }) => {
+  const getError = useLocalErrors(path);
+  return (
+    <FormExample
+      text={data as string}
+      onChange={(val) => handleChange(path, val)}
+      getError={getError}
+      label={label}
+      enabled={enabled}
+    />
+  );
+};
+
+registerComponent("example", FormRendererExample, ComponentPool.FORM);
+registerComponent("example", FormRendererExample, ComponentPool.PRESENTATION);
+```
+
+> Important: You **cannot register two components with the same name within the same pool**. You *can* register the same component name across different pools (e.g., `"example"` in both `"FORM"` and `"PRESENTATION"`).
+
+### Presentation Pool
+
+The `PRESENTATION` pool is more than just read-only. It is designed for **customer-facing output**, rendering fields in a clean, non-form-like layout for readability and professionalism.
+
+---
+
+## Custom Types
+
+Custom field types define what kinds of fields can be used when **building a template**. These appear in the template builder UI as selectable field types and control how data is validated and configured.
+
+### Syntax
+
+```ts
+registerType(
+  "typeId",             // Unique type string
+  "Display Name",       // Name shown in template builder
+  schema,               // JSON Schema defining the data structure
+  optionsSchema,        // JSON Schema defining configuration data structure
+  requiredOptions       // boolean: must the options be filled?
+);
+```
+
+### Example
+
+```ts
+registerType("enum", "Dropdown",
+  { type: "array" },
+  {
+    type: "object",
+    title: "Dropdown Options",
+    properties: {
+      enumValues: {
+        title: "Dropdown Values",
+        type: "array",
+        items: { type: "string" }
+      }
+    }
+  },
+  true
+);
+```
+
+This type defines a dropdown field where the values are defined via the `enumValues` property in the template configuration.
+
+### Custom Option Editors
+
+If you want to render a **custom options block** (i.e., how the field type's options are displayed in the template editor), you must do the following:
+
+1. In the top-level `optionsSchema` of the type, define `"x-type": "yourTypeName"`  
+2. Create and register a custom component with the name `"yourTypeName"` in the `"FORM"` pool.
+
+This component will then be used to render the configuration UI for that field type.
+
+---
+
+## File Locations
+
+- **Custom components** must be placed in `src/renderers`. They may be nested within subfolders. All files inside `renderers/` will be automatically imported in the correct order.
+- **Custom types** must be added to `src/default_registration/fields_base.tsx`.
+
+No manual import wiring is required beyond placing the file in the correct folder.
+
+---
+
+## Publishing to NPM
+
+To publish a new version of the package:
+
+```bash
+npm run build             # Compile the package
+npm version patch         # Bump the patch version (or use minor/major as needed)
+npm adduser               # Log in to NPM (if not already)
+npm publish               # Publish the package
+```

package/dist/api/fetch.d.ts

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

package/dist/api/fetch.js

@@ -0,0 +1,20 @@
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import fs from "fs";
+const getSpec = (file) => __awaiter(void 0, void 0, void 0, function* () {
+    const gotted = yield fetch("https://openapi-specs.vercel.app/" + file);
+    return gotted.text();
+});
+const saveSpec = (file, specs) => {
+    fs.writeFileSync("./openapi/" + file, specs);
+};
+getSpec("models.yaml").then(spec => saveSpec("models.yaml", spec));
+getSpec("core_data_service.yaml").then(spec => saveSpec("core_service.yaml", spec));
+getSpec("itinerary_service.yaml").then(spec => saveSpec("itinerary_service.yaml", spec));

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

@@ -4,6 +4,8 @@ export type { Amendment } from './index';
 export type { AssignedPassenger } from './index';
 export type { AssignedTravellerGroup } from './index';
 export { BookingStatus } from './index';
+export type { BranchId } from './index';
+export type { BranchTag } from './index';
 export type { ComponentDescription } from './index';
 export type { ComponentFAQ } from './index';
 export type { ComponentId } from './index';
@@ -16,6 +18,10 @@ export { ComponentState } from './index';
 export { Currency } from './index';
 export { Destination } from './index';
 export type { Discount } from './index';
+export type { DTOBranchCreate } from './index';
+export type { DTOBranchEntity } from './index';
+export type { DTOBranchRead } from './index';
+export type { DTOBranchUpdate } from './index';
 export type { DTOComponentCreate } from './index';
 export type { DTOComponentEntity } from './index';
 export type { DTOComponentRead } from './index';

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

@@ -6,6 +6,8 @@ export type { Amendment } from './models/Amendment';
 export type { AssignedPassenger } from './models/AssignedPassenger';
 export type { AssignedTravellerGroup } from './models/AssignedTravellerGroup';
 export { BookingStatus } from './models/BookingStatus';
+export type { BranchId } from './models/BranchId';
+export type { BranchTag } from './models/BranchTag';
 export type { ComponentDescription } from './models/ComponentDescription';
 export type { ComponentFAQ } from './models/ComponentFAQ';
 export type { ComponentId } from './models/ComponentId';
@@ -18,6 +20,10 @@ export { ComponentState } from './models/ComponentState';
 export { Currency } from './models/Currency';
 export { Destination } from './models/Destination';
 export type { Discount } from './models/Discount';
+export type { DTOBranchCreate } from './models/DTOBranchCreate';
+export type { DTOBranchEntity } from './models/DTOBranchEntity';
+export type { DTOBranchRead } from './models/DTOBranchRead';
+export type { DTOBranchUpdate } from './models/DTOBranchUpdate';
 export type { DTOComponentCreate } from './models/DTOComponentCreate';
 export type { DTOComponentEntity } from './models/DTOComponentEntity';
 export type { DTOComponentRead } from './models/DTOComponentRead';

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

@@ -1,6 +1,8 @@
+import type { AssignedPassenger } from './AssignedPassenger';
 import type { Price } from './Price';
 import type { Title } from './Title';
 export type Amendment = {
     name: Title;
     price: Price;
+    assignedPassenger: AssignedPassenger;
 };

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

@@ -0,0 +1 @@
+export type BranchId = string;

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

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

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

@@ -0,0 +1 @@
+export type BranchTag = string;

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

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

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

@@ -2,12 +2,13 @@ import type { Amendment } from './Amendment';
 import type { AssignedPassenger } from './AssignedPassenger';
 import type { AssignedTravellerGroup } from './AssignedTravellerGroup';
 import type { BookingStatus } from './BookingStatus';
+import type { ComponentId } from './ComponentId';
 import type { Field } from './Field';
 import type { Price } from './Price';
 import type { UserComponentInstanceField } from './UserComponentInstanceField';
 export type ComponentInstance = {
     id: string;
-    componentId: string;
+    componentId: ComponentId;
     componentInstanceFields: Array<Field>;
     userComponentInstanceFields: Array<UserComponentInstanceField>;
     assignedPassengers: Array<AssignedPassenger>;

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

@@ -0,0 +1,8 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+export type DTOBranchCreate = {
+    tag: BranchTag;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,11 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+import type { Metadata } from './Metadata';
+export type DTOBranchEntity = {
+    id: BranchId;
+    tag: BranchTag;
+    metadata: Metadata;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,11 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+import type { Metadata } from './Metadata';
+export type DTOBranchRead = {
+    id: BranchId;
+    tag: BranchTag;
+    metadata: Metadata;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,4 @@
+import type { BranchTag } from './BranchTag';
+export type DTOBranchUpdate = {
+    tag: BranchTag;
+};

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

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

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

@@ -1,6 +1,7 @@
+import type { Title } from './Title';
 import type { ValidationSchemas } from './ValidationSchemas';
 export type DTOTemplateUpdate = {
-    name?: string;
+    name?: Title;
     masterSchema?: string;
     validationSchemas?: ValidationSchemas;
 };

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

@@ -4,6 +4,4 @@ export type Package = {
     spans?: Array<PackageSpan>;
     title: Title;
     description: string;
-    startDate: string;
-    endDate: string;
 };

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

@@ -6,6 +6,8 @@ export type { Amendment } from './models/Amendment';
 export type { AssignedPassenger } from './models/AssignedPassenger';
 export type { AssignedTravellerGroup } from './models/AssignedTravellerGroup';
 export { BookingStatus } from './models/BookingStatus';
+export type { BranchId } from './models/BranchId';
+export type { BranchTag } from './models/BranchTag';
 export type { ComponentDescription } from './models/ComponentDescription';
 export type { ComponentFAQ } from './models/ComponentFAQ';
 export type { ComponentId } from './models/ComponentId';
@@ -18,6 +20,10 @@ export { ComponentState } from './models/ComponentState';
 export { Currency } from './models/Currency';
 export { Destination } from './models/Destination';
 export type { Discount } from './models/Discount';
+export type { DTOBranchCreate } from './models/DTOBranchCreate';
+export type { DTOBranchEntity } from './models/DTOBranchEntity';
+export type { DTOBranchRead } from './models/DTOBranchRead';
+export type { DTOBranchUpdate } from './models/DTOBranchUpdate';
 export type { DTOComponentCreate } from './models/DTOComponentCreate';
 export type { DTOComponentEntity } from './models/DTOComponentEntity';
 export type { DTOComponentRead } from './models/DTOComponentRead';

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

@@ -1,6 +1,8 @@
+import type { AssignedPassenger } from './AssignedPassenger';
 import type { Price } from './Price';
 import type { Title } from './Title';
 export type Amendment = {
     name: Title;
     price: Price;
+    assignedPassenger: AssignedPassenger;
 };

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

@@ -0,0 +1 @@
+export type BranchId = string;

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

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

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

@@ -0,0 +1 @@
+export type BranchTag = string;

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

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

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

@@ -2,12 +2,13 @@ import type { Amendment } from './Amendment';
 import type { AssignedPassenger } from './AssignedPassenger';
 import type { AssignedTravellerGroup } from './AssignedTravellerGroup';
 import type { BookingStatus } from './BookingStatus';
+import type { ComponentId } from './ComponentId';
 import type { Field } from './Field';
 import type { Price } from './Price';
 import type { UserComponentInstanceField } from './UserComponentInstanceField';
 export type ComponentInstance = {
     id: string;
-    componentId: string;
+    componentId: ComponentId;
     componentInstanceFields: Array<Field>;
     userComponentInstanceFields: Array<UserComponentInstanceField>;
     assignedPassengers: Array<AssignedPassenger>;

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

@@ -0,0 +1,8 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+export type DTOBranchCreate = {
+    tag: BranchTag;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,11 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+import type { Metadata } from './Metadata';
+export type DTOBranchEntity = {
+    id: BranchId;
+    tag: BranchTag;
+    metadata: Metadata;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,11 @@
+import type { BranchId } from './BranchId';
+import type { BranchTag } from './BranchTag';
+import type { ItineraryRevisionGroupId } from './ItineraryRevisionGroupId';
+import type { Metadata } from './Metadata';
+export type DTOBranchRead = {
+    id: BranchId;
+    tag: BranchTag;
+    metadata: Metadata;
+    parentId: BranchId;
+    currentRevisionGroupId: ItineraryRevisionGroupId;
+};

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

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

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

@@ -0,0 +1,4 @@
+import type { BranchTag } from './BranchTag';
+export type DTOBranchUpdate = {
+    tag: BranchTag;
+};

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

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

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

@@ -1,6 +1,7 @@
+import type { Title } from './Title';
 import type { ValidationSchemas } from './ValidationSchemas';
 export type DTOTemplateUpdate = {
-    name?: string;
+    name?: Title;
     masterSchema?: string;
     validationSchemas?: ValidationSchemas;
 };

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

@@ -4,6 +4,4 @@ export type Package = {
     spans?: Array<PackageSpan>;
     title: Title;
     description: string;
-    startDate: string;
-    endDate: string;
 };

package/dist/rendering/schema/generate/jsonSchemaGenerate.js

@@ -19,7 +19,7 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
                 return;
             const fieldSchema = defaultConverter(s, stage);
             built.properties[generateFieldId(s.name)] = fieldSchema;
-            if (s.required)
+            if (s.required && s.fieldType !== "boolean")
                 built.required.push(generateFieldId(s.name));
         });
         return built;
@@ -49,7 +49,8 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
     for (const child of (_d = (_c = field.objectOptions) === null || _c === void 0 ? void 0 : _c.properties) !== null && _d !== void 0 ? _d : []) {
         const fieldId = generateFieldId(child.name);
         properties[fieldId] = defaultConverter(child, stage, false, true);
-        if (child.required && child.fieldType !== "boolean")
+        console.log("FILD TYPE", child.fieldType, "REWQUIRED", child.required);
+        if (child.required && child.fieldType != "boolean")
             requiredFields.push(fieldId);
     }
     let enumOpts = field.fieldType === "enum"
@@ -77,8 +78,6 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         ? { "x-templateIds": field.componentOptions["x-templateIds"] }
         : {};
     let title = omitTitle ? undefined : field.name;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (!isChild &&
-        !(Array.isArray(field.editableIn) ? field.editableIn : [])
-            .map(Number)
-            .includes(stage) && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties })), (field.fieldType === "string" && Object.assign({}, field.stringOptions)));
+    let isReadonly = !isChild && !field.editableIn.map(Number).includes(stage);
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties })), (field.fieldType === "string" && Object.assign({}, field.stringOptions)));
 };

package/package.json

@@ -1,62 +1,63 @@
-{
-    "name": "swoop-common",
-    "version": "2.1.57",
-    "main": "dist/api/index.js",
-    "types": "dist/api/index.d.ts",
-    "exports": {
-        ".": {
-            "import": "./dist/api/index.js",
-            "require": "./dist/api/index.js",
-            "types": "./dist/api/index.d.ts"
-        },
-        "./rendering": {
-            "import": "./dist/rendering/index.js",
-            "require": "./dist/rendering/index.js",
-            "types": "./dist/rendering/index.d.ts"
-        }
-    },
-    "files": [
-        "dist"
-    ],
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "build": "rimraf ./dist && tsc",
-        "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 --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": "tsx ./src/api/bundler.ts",
-        "build-sdk": "npm run build-core-sdk && npm run build-itinerary-sdk && npm run build-swoop-sdk && npm run build-sdk-exports"
-    },
-    "author": "",
-    "license": "ISC",
-    "description": "",
-    "dependencies": {
-        "@apidevtools/swagger-parser": "^12.0.0",
-        "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.1",
-        "@jsonforms/core": "^3.5.1",
-        "@jsonforms/material-renderers": "^3.5.1",
-        "@jsonforms/react": "^3.5.1",
-        "ajv": "^8.17.1",
-        "js-yaml": "^4.1.0",
-        "lodash.merge": "^4.6.2",
-        "openapi-ts": "^0.3.4",
-        "react": "^19.0.0",
-        "rimraf": "^6.0.1",
-        "swoop-common": "^2.1.55"
-    },
-    "devDependencies": {
-        "@apidevtools/swagger-cli": "^4.0.4",
-        "@hey-api/openapi-ts": "^0.80.2",
-        "@types/js-yaml": "^4.0.9",
-        "@types/lodash.merge": "^4.6.9",
-        "@types/node": "^24.0.14",
-        "@types/react": "^19",
-        "openapi-typescript-codegen": "^0.29.0",
-        "tsx": "^4.20.3",
-        "typescript": "^5.8.3"
-    }
-}
+{
+    "name": "swoop-common",
+    "version": "2.1.59",
+    "main": "dist/api/index.js",
+    "types": "dist/api/index.d.ts",
+    "exports": {
+        ".": {
+            "import": "./dist/api/index.js",
+            "require": "./dist/api/index.js",
+            "types": "./dist/api/index.d.ts"
+        },
+        "./rendering": {
+            "import": "./dist/rendering/index.js",
+            "require": "./dist/rendering/index.js",
+            "types": "./dist/rendering/index.d.ts"
+        }
+    },
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "build": "rimraf ./dist && tsc",
+        "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 --request ./src/api/templates/request.ts",
+        "prebuild": "npm run build-imports && npm run fetch-specs && npm run bundle && npm run build-sdk",
+        "build-sdk-exports": "tsx ./src/api/gen.ts",
+        "bundle": "tsx ./src/api/bundler.ts",
+        "build-sdk": "npm run build-core-sdk && npm run build-itinerary-sdk && npm run build-swoop-sdk && npm run build-sdk-exports",
+        "fetch-specs": "tsx ./src/api/fetch.ts"
+    },
+    "author": "",
+    "license": "ISC",
+    "description": "",
+    "dependencies": {
+        "@apidevtools/swagger-parser": "^12.0.0",
+        "@emotion/react": "^11.14.0",
+        "@emotion/styled": "^11.14.1",
+        "@jsonforms/core": "^3.5.1",
+        "@jsonforms/material-renderers": "^3.5.1",
+        "@jsonforms/react": "^3.5.1",
+        "ajv": "^8.17.1",
+        "js-yaml": "^4.1.0",
+        "lodash.merge": "^4.6.2",
+        "openapi-ts": "^0.3.4",
+        "react": "^19.0.0",
+        "rimraf": "^6.0.1",
+        "swoop-common": "^2.1.55"
+    },
+    "devDependencies": {
+        "@apidevtools/swagger-cli": "^4.0.4",
+        "@hey-api/openapi-ts": "^0.80.2",
+        "@types/js-yaml": "^4.0.9",
+        "@types/lodash.merge": "^4.6.9",
+        "@types/node": "^24.0.14",
+        "@types/react": "^19",
+        "openapi-typescript-codegen": "^0.29.0",
+        "tsx": "^4.20.3",
+        "typescript": "^5.8.3"
+    }
+}