@galaxy-tool-util/schema 0.2.0 → 1.0.0

package/dist/workflow/param-navigation.js

@@ -0,0 +1,60 @@
+/**
+ * Utility for navigating a ToolParameterModel tree by path segments.
+ *
+ * Used by LSP language servers to resolve completion and hover context
+ * inside tool_state YAML, including conditional branch filtering.
+ */
+import { isConditionalParam, isRepeatParam, isSectionParam } from "../schema/type-guards.js";
+import { selectWhichWhen } from "./walk-helpers.js";
+/**
+ * Navigate a tool parameter tree by path segments.
+ *
+ * - Sections: recurse into `parameters`
+ * - Repeats: skip numeric path segments, recurse into `parameters`
+ * - Conditionals: call selectWhichWhen(conditional, stateAtCurrentLevel),
+ *   fall back to all branches merged if no state provided or no match
+ *
+ * `state` is the full state dict at the top of the tree; the function
+ * navigates it in parallel with the param tree to resolve nested conditionals.
+ */
+export function findParamAtPath(params, path, state) {
+    if (path.length === 0)
+        return { param: undefined, availableParams: params };
+    const [head, ...tail] = path;
+    // Skip numeric segments (repeat instance indices)
+    if (typeof head === "number")
+        return findParamAtPath(params, tail, state);
+    const match = params.find((p) => p.name === head);
+    if (!match)
+        return { param: undefined, availableParams: params };
+    if (tail.length === 0)
+        return { param: match, availableParams: params };
+    if (isSectionParam(match)) {
+        return findParamAtPath(match.parameters, tail, _getSubState(state, head));
+    }
+    if (isRepeatParam(match)) {
+        return findParamAtPath(match.parameters, tail, _getSubState(state, head));
+    }
+    if (isConditionalParam(match)) {
+        const conditionalState = _getSubState(state, head);
+        // Only filter to a specific branch when the discriminator key is
+        // explicitly present in state. If state is absent OR the discriminator
+        // key hasn't been set yet, merge all branches so completions/hover
+        // aren't artificially restricted to a default branch the user may not
+        // have chosen.
+        const discriminatorSet = conditionalState !== undefined && match.test_parameter.name in conditionalState;
+        const activeWhen = discriminatorSet ? selectWhichWhen(match, conditionalState) : null;
+        const branchParams = activeWhen
+            ? activeWhen.parameters
+            : match.whens.flatMap((w) => w.parameters);
+        return findParamAtPath([match.test_parameter, ...branchParams], tail, conditionalState);
+    }
+    return { param: undefined, availableParams: params };
+}
+function _getSubState(state, key) {
+    const val = state?.[key];
+    return val && typeof val === "object" && !Array.isArray(val)
+        ? val
+        : undefined;
+}
+//# sourceMappingURL=param-navigation.js.map

package/dist/workflow/param-navigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"param-navigation.js","sourceRoot":"","sources":["../../src/workflow/param-navigation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AASpD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA4B,EAC5B,IAAyB,EACzB,KAA+B;IAE/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAE5E,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAE7B,kDAAkD;IAClD,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAE1E,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAEjE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAExE,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnD,iEAAiE;QACjE,uEAAuE;QACvE,mEAAmE;QACnE,sEAAsE;QACtE,eAAe;QACf,MAAM,gBAAgB,GACpB,gBAAgB,KAAK,SAAS,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,IAAI,gBAAgB,CAAC;QAClF,MAAM,UAAU,GAAG,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,gBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACvF,MAAM,YAAY,GAAG,UAAU;YAC7B,CAAC,CAAC,UAAU,CAAC,UAAU;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC7C,OAAO,eAAe,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,YAAY,CACnB,KAA0C,EAC1C,GAAW;IAEX,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;IACzB,OAAO,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAC1D,CAAC,CAAE,GAA+B;QAClC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}

package/dist/workflow/raw/gxformat2.effect.d.ts

@@ -40,6 +40,13 @@ export declare const DocumentedSchema: Schema.Struct<{
     doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
 }>;
 export type Documented = typeof DocumentedSchema.Type;
+export declare const RecordSchemaSchema: Schema.Struct<{
+    /** Defines the fields of the record. */
+    fields: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.suspend<any, any, never>>]>>;
+    /** Must be `record` */
+    type: Schema.Literal<["record"]>;
+}>;
+export type RecordSchema = typeof RecordSchemaSchema.Type;
 /**
  * Define an enumerated type.
  */
@@ -50,13 +57,6 @@ export declare const EnumSchemaSchema: Schema.Struct<{
     type: Schema.Literal<["enum"]>;
 }>;
 export type EnumSchema = typeof EnumSchemaSchema.Type;
-export declare const RecordSchemaSchema: Schema.Struct<{
-    /** Defines the fields of the record. */
-    fields: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.suspend<any, any, never>>]>>;
-    /** Must be `record` */
-    type: Schema.Literal<["record"]>;
-}>;
-export type RecordSchema = typeof RecordSchemaSchema.Type;
 export declare const ArraySchemaSchema: Schema.Struct<{
     /** Defines the type of the array elements. */
     items: Schema.Union<[Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string"]>, Schema.Struct<{
@@ -204,25 +204,6 @@ export declare const OutputParameterSchema: Schema.Struct<{
     doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
 }>;
 export type OutputParameter = typeof OutputParameterSchema.Type;
-/**
- * Describe an output parameter of a workflow.  The parameter must be
-connected to one parameter defined in the workflow that
-will provide the value of the output parameter. It is legal to
-connect a WorkflowInputParameter to a WorkflowOutputParameter.
- */
-export declare const WorkflowOutputParameterSchema: Schema.Struct<{
-    /** The unique identifier for this object. */
-    id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** A short, human-readable label of this object. */
-    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** A documentation string for this object, or an array of strings which should be concatenated. */
-    doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
-    /** Specifies workflow parameter that supply the value of to the output parameter. */
-    outputSource: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Specify valid types of data that may be assigned to this parameter. */
-    type: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>]>>;
-}>;
-export type WorkflowOutputParameter = typeof WorkflowOutputParameterSchema.Type;
 /**
  * This field specifies the location of the step's node when rendered in the workflow editor.
  */
@@ -266,6 +247,25 @@ export declare const WorkflowInputParameterSchema: Schema.Struct<{
     default: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Unknown]>>;
 }>;
 export type WorkflowInputParameter = typeof WorkflowInputParameterSchema.Type;
+/**
+ * Describe an output parameter of a workflow.  The parameter must be
+connected to one parameter defined in the workflow that
+will provide the value of the output parameter. It is legal to
+connect a WorkflowInputParameter to a WorkflowOutputParameter.
+ */
+export declare const WorkflowOutputParameterSchema: Schema.Struct<{
+    /** The unique identifier for this object. */
+    id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** A short, human-readable label of this object. */
+    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** A documentation string for this object, or an array of strings which should be concatenated. */
+    doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+    /** Specifies workflow parameter that supply the value of to the output parameter. */
+    outputSource: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Specify valid types of data that may be assigned to this parameter. */
+    type: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>]>>;
+}>;
+export type WorkflowOutputParameter = typeof WorkflowOutputParameterSchema.Type;
 /**
  * The base executable type in CWL is the `Process` object defined by the
 document.  Note that the `Process` object is abstract and cannot be
@@ -386,22 +386,45 @@ export declare const ReferencesToolSchema: Schema.Struct<{
     tool_version: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
 export type ReferencesTool = typeof ReferencesToolSchema.Type;
-export declare const SinkSchema: Schema.Struct<{
-    /** Specifies one or more workflow parameters that will provide input to the underlying step parameter. */
-    source: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+/**
+ * Definition of an invocation report for this workflow. Currently the only
+field is 'markdown'.
+ */
+export declare const ReportSchema: Schema.Struct<{
+    /** Galaxy flavored Markdown to define an invocation report. */
+    markdown: typeof Schema.String;
 }>;
-export type Sink = typeof SinkSchema.Type;
+export type Report = typeof ReportSchema.Type;
 /**
- * TODO:
+ * Base fields shared by all comment types.
  */
-export declare const WorkflowStepInputSchema: Schema.Struct<{
-    /** The default value for this parameter to use if either there is no `source` field, or the value produced by the `source` is `null`.  The default must be applied prior to scattering or evaluating `va... */
-    default: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Unknown]>>;
+export declare const BaseCommentSchema: Schema.Struct<{
+    /** Position of the comment on the editor canvas as ``[x, y]`` coordinates. */
+    position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+    /** Size of the comment as ``[width, height]``. */
+    size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+    /** Display color of the comment (e.g. ``"none"``, ``"blue"``). */
+    color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Optional label for referencing this comment from frame ``contains_comments`` fields or for use as a map key when comments are represented as a mapping. */
     label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    source: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
-    id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
-export type WorkflowStepInput = typeof WorkflowStepInputSchema.Type;
+export type BaseComment = typeof BaseCommentSchema.Type;
+/**
+ * A freehand drawn line on the editor canvas.
+ */
+export declare const FreehandCommentSchema: Schema.Struct<{
+    /** Comment type (``freehand``). */
+    type: Schema.Literal<["freehand"]>;
+    /** Line thickness. */
+    thickness: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
+    /** Array of ``[x, y]`` coordinate pairs defining the freehand line path. */
+    line: Schema.optional<Schema.Union<[Schema.Array$<Schema.Array$<typeof Schema.Number>>, typeof Schema.Null]>>;
+    position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+    size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+    color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+}>;
+export type FreehandComment = typeof FreehandCommentSchema.Type;
 /**
  * Base fields shared by all creator types, corresponding to schema.org
 Thing properties common to both Person and Organization.
@@ -428,12 +451,22 @@ export declare const BaseCreatorSchema: Schema.Struct<{
 }>;
 export type BaseCreator = typeof BaseCreatorSchema.Type;
 /**
- * An organization that created or contributed to the workflow.
-Corresponds to a `schema.org Organization <https://schema.org/Organization>`_.
+ * A person who created or contributed to the workflow.
+Corresponds to a `schema.org Person <https://schema.org/Person>`_.
  */
-export declare const CreatorOrganizationSchema: Schema.Struct<{
-    /** Creator type discriminator (``Organization``). */
-    class: Schema.Literal<["Organization"]>;
+export declare const CreatorPersonSchema: Schema.Struct<{
+    /** Creator type discriminator (``Person``). */
+    class: Schema.Literal<["Person"]>;
+    /** Given (first) name. */
+    givenName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Family (last) name. */
+    familyName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Honorific prefix (e.g. ``Dr``, ``Prof``). */
+    honorificPrefix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Honorific suffix (e.g. ``M.D.``, ``PhD``). */
+    honorificSuffix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Job title or role. */
+    jobTitle: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     name: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     identifier: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     url: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
@@ -444,44 +477,27 @@ export declare const CreatorOrganizationSchema: Schema.Struct<{
     telephone: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     faxNumber: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
-export type CreatorOrganization = typeof CreatorOrganizationSchema.Type;
-/**
- * Base fields shared by all comment types.
- */
-export declare const BaseCommentSchema: Schema.Struct<{
-    /** Position of the comment on the editor canvas as ``[x, y]`` coordinates. */
-    position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
-    /** Size of the comment as ``[width, height]``. */
-    size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
-    /** Display color of the comment (e.g. ``"none"``, ``"blue"``). */
-    color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Optional label for referencing this comment from frame ``contains_comments`` fields or for use as a map key when comments are represented as a mapping. */
-    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-}>;
-export type BaseComment = typeof BaseCommentSchema.Type;
+export type CreatorPerson = typeof CreatorPersonSchema.Type;
 /**
- * A Markdown-rendered annotation in the workflow editor.
+ * A plain text annotation in the workflow editor.
  */
-export declare const MarkdownCommentSchema: Schema.Struct<{
-    /** Comment type (``markdown``). */
-    type: Schema.Literal<["markdown"]>;
-    /** Markdown content. */
+export declare const TextCommentSchema: Schema.Struct<{
+    /** Comment type (``text``). */
+    type: Schema.Literal<["text"]>;
+    /** The text content. */
     text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    /** Whether the text is displayed in bold. */
+    bold: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+    /** Whether the text is displayed in italic. */
+    italic: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+    /** Font size of the text. */
+    text_size: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
     position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
     size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
     color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
-export type MarkdownComment = typeof MarkdownCommentSchema.Type;
-/**
- * Definition of an invocation report for this workflow. Currently the only
-field is 'markdown'.
- */
-export declare const ReportSchema: Schema.Struct<{
-    /** Galaxy flavored Markdown to define an invocation report. */
-    markdown: typeof Schema.String;
-}>;
-export type Report = typeof ReportSchema.Type;
+export type TextComment = typeof TextCommentSchema.Type;
 /**
  * A rectangular grouping box that visually contains steps and other comments.
  */
@@ -501,42 +517,26 @@ export declare const FrameCommentSchema: Schema.Struct<{
 }>;
 export type FrameComment = typeof FrameCommentSchema.Type;
 /**
- * A plain text annotation in the workflow editor.
+ * A Markdown-rendered annotation in the workflow editor.
  */
-export declare const TextCommentSchema: Schema.Struct<{
-    /** Comment type (``text``). */
-    type: Schema.Literal<["text"]>;
-    /** The text content. */
+export declare const MarkdownCommentSchema: Schema.Struct<{
+    /** Comment type (``markdown``). */
+    type: Schema.Literal<["markdown"]>;
+    /** Markdown content. */
     text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Whether the text is displayed in bold. */
-    bold: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
-    /** Whether the text is displayed in italic. */
-    italic: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
-    /** Font size of the text. */
-    text_size: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
     position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
     size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
     color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
-export type TextComment = typeof TextCommentSchema.Type;
+export type MarkdownComment = typeof MarkdownCommentSchema.Type;
 /**
- * A person who created or contributed to the workflow.
-Corresponds to a `schema.org Person <https://schema.org/Person>`_.
+ * An organization that created or contributed to the workflow.
+Corresponds to a `schema.org Organization <https://schema.org/Organization>`_.
  */
-export declare const CreatorPersonSchema: Schema.Struct<{
-    /** Creator type discriminator (``Person``). */
-    class: Schema.Literal<["Person"]>;
-    /** Given (first) name. */
-    givenName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Family (last) name. */
-    familyName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Honorific prefix (e.g. ``Dr``, ``Prof``). */
-    honorificPrefix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Honorific suffix (e.g. ``M.D.``, ``PhD``). */
-    honorificSuffix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    /** Job title or role. */
-    jobTitle: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+export declare const CreatorOrganizationSchema: Schema.Struct<{
+    /** Creator type discriminator (``Organization``). */
+    class: Schema.Literal<["Organization"]>;
     name: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     identifier: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     url: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
@@ -547,23 +547,7 @@ export declare const CreatorPersonSchema: Schema.Struct<{
     telephone: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
     faxNumber: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
-export type CreatorPerson = typeof CreatorPersonSchema.Type;
-/**
- * A freehand drawn line on the editor canvas.
- */
-export declare const FreehandCommentSchema: Schema.Struct<{
-    /** Comment type (``freehand``). */
-    type: Schema.Literal<["freehand"]>;
-    /** Line thickness. */
-    thickness: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
-    /** Array of ``[x, y]`` coordinate pairs defining the freehand line path. */
-    line: Schema.optional<Schema.Union<[Schema.Array$<Schema.Array$<typeof Schema.Number>>, typeof Schema.Null]>>;
-    position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
-    size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
-    color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
-}>;
-export type FreehandComment = typeof FreehandCommentSchema.Type;
+export type CreatorOrganization = typeof CreatorOrganizationSchema.Type;
 /**
  * A Galaxy workflow description. This record corresponds to the description of a workflow that should be executable
 on a Galaxy server that includes the contained tool definitions.
@@ -825,6 +809,22 @@ export declare const WorkflowStepOutputSchema: Schema.Struct<{
     id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
 }>;
 export type WorkflowStepOutput = typeof WorkflowStepOutputSchema.Type;
+export declare const SinkSchema: Schema.Struct<{
+    /** Specifies one or more workflow parameters that will provide input to the underlying step parameter. */
+    source: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+}>;
+export type Sink = typeof SinkSchema.Type;
+/**
+ * TODO:
+ */
+export declare const WorkflowStepInputSchema: Schema.Struct<{
+    /** The default value for this parameter to use if either there is no `source` field, or the value produced by the `source` is `null`.  The default must be applied prior to scattering or evaluating `va... */
+    default: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Unknown]>>;
+    label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+    source: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+    id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+}>;
+export type WorkflowStepInput = typeof WorkflowStepInputSchema.Type;
 /**
  * This represents a non-input step a Galaxy Workflow.
 
@@ -884,7 +884,231 @@ export declare const WorkflowStepSchema: Schema.Struct<{
     /** Workflow step module's type (defaults to 'tool'). */
     type: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Literal<["tool", "subworkflow", "pause", "pick_value"]>]>>;
     /** Specifies a subworkflow to run. May be an inline workflow definition, a URL string, or an @import reference dict. */
-    run: Schema.optional<Schema.Union<[Schema.suspend<any, any, never>, typeof Schema.String, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>, typeof Schema.Null]>>;
+    run: Schema.optional<Schema.Union<[Schema.Struct<{
+        /** The unique identifier for this object. */
+        id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        class: Schema.Literal<["GalaxyWorkflow"]>;
+        /** A short, human-readable label of this object. */
+        label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        /** A documentation string for this object, or an array of strings which should be concatenated. */
+        doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+        /** The individual steps that make up the workflow. Each step is executed when all of its input data links are fulfilled. */
+        steps: Schema.Union<[Schema.Array$<Schema.suspend<any, any, never>>, Schema.Record$<typeof Schema.String, Schema.suspend<any, any, never>>]>;
+        /** Workflow invocation report template. */
+        report: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Struct<{
+            /** Galaxy flavored Markdown to define an invocation report. */
+            markdown: typeof Schema.String;
+        }>]>>;
+        /** Tags for the workflow. */
+        tags: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.String>, typeof Schema.Null]>>;
+        /** Visual annotations for the workflow editor canvas. Comments are non-functional and do not affect workflow execution. May be specified as a list or as a mapping keyed by label. */
+        comments: Schema.optional<Schema.Union<[Schema.Array$<Schema.Union<[Schema.Struct<{
+            /** Comment type (``text``). */
+            type: Schema.Literal<["text"]>;
+            /** The text content. */
+            text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Whether the text is displayed in bold. */
+            bold: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+            /** Whether the text is displayed in italic. */
+            italic: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+            /** Font size of the text. */
+            text_size: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``markdown``). */
+            type: Schema.Literal<["markdown"]>;
+            /** Markdown content. */
+            text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``frame``). */
+            type: Schema.Literal<["frame"]>;
+            /** Title displayed on the frame header. */
+            title: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Step labels or indices contained within this frame. */
+            contains_steps: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.Union<[typeof Schema.String, typeof Schema.Number]>>]>>;
+            /** Comment labels or indices contained within this frame. */
+            contains_comments: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.Union<[typeof Schema.String, typeof Schema.Number]>>]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``freehand``). */
+            type: Schema.Literal<["freehand"]>;
+            /** Line thickness. */
+            thickness: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
+            /** Array of ``[x, y]`` coordinate pairs defining the freehand line path. */
+            line: Schema.optional<Schema.Union<[Schema.Array$<Schema.Array$<typeof Schema.Number>>, typeof Schema.Null]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>]>>, Schema.Record$<typeof Schema.String, Schema.Union<[Schema.Struct<{
+            /** Comment type (``text``). */
+            type: Schema.Literal<["text"]>;
+            /** The text content. */
+            text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Whether the text is displayed in bold. */
+            bold: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+            /** Whether the text is displayed in italic. */
+            italic: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Boolean]>>;
+            /** Font size of the text. */
+            text_size: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``markdown``). */
+            type: Schema.Literal<["markdown"]>;
+            /** Markdown content. */
+            text: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``frame``). */
+            type: Schema.Literal<["frame"]>;
+            /** Title displayed on the frame header. */
+            title: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Step labels or indices contained within this frame. */
+            contains_steps: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.Union<[typeof Schema.String, typeof Schema.Number]>>]>>;
+            /** Comment labels or indices contained within this frame. */
+            contains_comments: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<Schema.Union<[typeof Schema.String, typeof Schema.Number]>>]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Comment type (``freehand``). */
+            type: Schema.Literal<["freehand"]>;
+            /** Line thickness. */
+            thickness: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Number]>>;
+            /** Array of ``[x, y]`` coordinate pairs defining the freehand line path. */
+            line: Schema.optional<Schema.Union<[Schema.Array$<Schema.Array$<typeof Schema.Number>>, typeof Schema.Null]>>;
+            position: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            size: Schema.optional<Schema.Union<[Schema.Array$<typeof Schema.Number>, typeof Schema.Null]>>;
+            color: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>]>>, typeof Schema.Null]>>;
+        /** Workflow creators. Can be schema.org Person (https://schema.org/Person) or Organization (https://schema.org/Organization) entities. */
+        creator: Schema.optional<Schema.Union<[Schema.Array$<Schema.Union<[Schema.Struct<{
+            /** Creator type discriminator (``Person``). */
+            class: Schema.Literal<["Person"]>;
+            /** Given (first) name. */
+            givenName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Family (last) name. */
+            familyName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Honorific prefix (e.g. ``Dr``, ``Prof``). */
+            honorificPrefix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Honorific suffix (e.g. ``M.D.``, ``PhD``). */
+            honorificSuffix: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Job title or role. */
+            jobTitle: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            name: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            identifier: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            url: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            email: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            image: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            address: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            alternateName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            telephone: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            faxNumber: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>, Schema.Struct<{
+            /** Creator type discriminator (``Organization``). */
+            class: Schema.Literal<["Organization"]>;
+            name: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            identifier: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            url: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            email: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            image: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            address: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            alternateName: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            telephone: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            faxNumber: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        }>]>>, typeof Schema.Null]>>;
+        /** Must be a valid license listed at https://spdx.org/licenses/ */
+        license: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        /** If listed should correspond to the release of the workflow in its source reposiory. */
+        release: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        uuid: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+        inputs: Schema.Union<[Schema.Array$<Schema.Struct<{
+            /** The unique identifier for this object. */
+            id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A short, human-readable label of this object. */
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A documentation string for this object, or an array of strings which should be concatenated. */
+            doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+            /** Specify valid types of data that may be assigned to this parameter. */
+            type: Schema.optional<Schema.Union<[Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>, typeof Schema.Null, Schema.Array$<Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>>]>>;
+            /** If set to true, `WorkflowInputParameter` is not required to submit the workflow. */
+            optional: Schema.optional<Schema.Union<[typeof Schema.Boolean, typeof Schema.Null]>>;
+            /** Specify datatype extension for valid input datasets. */
+            format: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<typeof Schema.String>]>>;
+            /** Collection type (defaults to `list` if `type` is `collection`). Nested collection types are separated with colons, e.g. `list:list:paired`. */
+            collection_type: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            position: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Struct<{
+                /** Relative vertical position of the step's node when rendered in the workflow editor. */
+                top: typeof Schema.Number;
+                /** Relative horizontal position of the step's node when rendered in the workflow editor. */
+                left: typeof Schema.Number;
+            }>]>>;
+            default: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Unknown]>>;
+        }>>, Schema.Record$<typeof Schema.String, Schema.Union<[Schema.Struct<{
+            /** The unique identifier for this object. */
+            id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A short, human-readable label of this object. */
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A documentation string for this object, or an array of strings which should be concatenated. */
+            doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+            /** Specify valid types of data that may be assigned to this parameter. */
+            type: Schema.optional<Schema.Union<[Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>, typeof Schema.Null, Schema.Array$<Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>>]>>;
+            /** If set to true, `WorkflowInputParameter` is not required to submit the workflow. */
+            optional: Schema.optional<Schema.Union<[typeof Schema.Boolean, typeof Schema.Null]>>;
+            /** Specify datatype extension for valid input datasets. */
+            format: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<typeof Schema.String>]>>;
+            /** Collection type (defaults to `list` if `type` is `collection`). Nested collection types are separated with colons, e.g. `list:list:paired`. */
+            collection_type: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            position: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Struct<{
+                /** Relative vertical position of the step's node when rendered in the workflow editor. */
+                top: typeof Schema.Number;
+                /** Relative horizontal position of the step's node when rendered in the workflow editor. */
+                left: typeof Schema.Number;
+            }>]>>;
+            default: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.Unknown]>>;
+        }>, typeof Schema.String]>>, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>;
+        outputs: Schema.Union<[Schema.Array$<Schema.Struct<{
+            /** The unique identifier for this object. */
+            id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A short, human-readable label of this object. */
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A documentation string for this object, or an array of strings which should be concatenated. */
+            doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+            /** Specifies workflow parameter that supply the value of to the output parameter. */
+            outputSource: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Specify valid types of data that may be assigned to this parameter. */
+            type: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>]>>;
+        }>>, Schema.Record$<typeof Schema.String, Schema.Union<[Schema.Struct<{
+            /** The unique identifier for this object. */
+            id: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A short, human-readable label of this object. */
+            label: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** A documentation string for this object, or an array of strings which should be concatenated. */
+            doc: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String, Schema.Array$<typeof Schema.String>]>>;
+            /** Specifies workflow parameter that supply the value of to the output parameter. */
+            outputSource: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;
+            /** Specify valid types of data that may be assigned to this parameter. */
+            type: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Literal<["null", "boolean", "int", "long", "float", "double", "string", "integer", "text", "File", "data", "collection"]>]>>;
+        }>, typeof Schema.String]>>, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>;
+    }>, typeof Schema.String, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>, typeof Schema.Null]>>;
     runtime_inputs: Schema.optional<Schema.Union<[typeof Schema.Null, Schema.Array$<typeof Schema.String>]>>;
     /** If defined, only run the step when the expression evaluates to `true`.  If `false` the step is skipped.  A skipped step produces a `null` on each output.  Expression should be an ecma5.1 expression. */
     when: Schema.optional<Schema.Union<[typeof Schema.Null, typeof Schema.String]>>;