Merge pull request #150 from rabix/release/1.23.2

Release/1.23.2
rabix · Nov 16, 2021 · 2ac1345 · 2ac1345
2 parents 7030605 + a541ec7
commit 2ac1345
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cwlts",
-  "version": "1.23.1",
+  "version": "1.23.2",
   "description": "TypeScript data model for Common Workflow Language",
   "scripts": {
     "tsc": "npx tsc",

diff --git a/src/models/generic/ParameterTypeModel.ts b/src/models/generic/ParameterTypeModel.ts
@@ -265,16 +265,6 @@ export class ParameterTypeModel extends ValidationBase implements Serializable<a
             }
         }
 
-        if (this.unionType) {
-            this.setIssue({
-                [this.loc]: {
-                    type: "info",
-                    message: `Union type is not supported yet: ${this.unionType}`,
-                    code: ErrorCode.TYPE_UNSUPPORTED
-                }
-            });
-        }
-
         return Promise.all(promises).then(res => {
             return this.issues;
         });

diff --git a/src/models/helpers/TypeResolver.ts b/src/models/helpers/TypeResolver.ts
@@ -109,7 +109,6 @@ export class TypeResolver {
             }
 
             if (type.length !== 1) {
-                result.type = "array";
                 // check if type has only two remaining values
                 if (type.length === 2) {
                     // resolve types to TypeResolution
@@ -123,12 +122,12 @@ export class TypeResolver {
                         result.isItemOrArray = true;
                     } else {
                         result.unionType = type;
-                        console.warn(`TypeResolverWarning: Union types only partially supported. Found type ${JSON.stringify(type)}`);
+                        return result;
                     }
 
                 } else {
                     result.unionType = type;
-                    console.warn(`TypeResolverWarning: Union types only partially supported! Found type ${JSON.stringify(type)}`);
+                    return result;
                 }
             }
 

diff --git a/src/models/v1.0/V1WorkflowInputParameterModel.ts b/src/models/v1.0/V1WorkflowInputParameterModel.ts
@@ -89,7 +89,7 @@ export class V1WorkflowInputParameterModel extends WorkflowInputParameterModel {
             }
         }
 
-        if (this.type.type) base.type = this.type.serialize("v1.0");
+        if (this.type.type || this.type.unionType) base.type = this.type.serialize("v1.0");
 
         if (this._label) base.label = this._label;
         if (this.description) base.doc = this.description;