ts-json-schema-generator 2.5.0-next.8 → 2.5.0

package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js

@@ -19,6 +19,7 @@ class LiteralUnionTypeFormatter {
         let allStrings = true;
         let hasNull = false;
         const literals = unionType.getFlattenedTypes();
+        // filter out String types since we need to be more careful about them
         const types = literals.filter((literal) => {
             if (literal instanceof StringType_js_1.StringType) {
                 hasString = true;
@@ -67,6 +68,9 @@ function isLiteralUnion(type) {
         item instanceof StringType_js_1.StringType ||
         item instanceof EnumType_js_1.EnumType);
 }
+/**
+ * Appends all possible type names of a type to the given set.
+ */
 function appendTypeNames(type, names) {
     if (type instanceof EnumType_js_1.EnumType) {
         for (const value of type.getValues()) {
@@ -80,6 +84,9 @@ function appendTypeNames(type, names) {
     }
     names.add((0, typeName_js_1.typeName)(null));
 }
+/**
+ * Appends all possible values of a type to the given set.
+ */
 function appendTypeValues(type, values) {
     if (type instanceof EnumType_js_1.EnumType) {
         for (const value of type.getValues()) {

package/dist/src/TypeFormatter/LiteralUnionTypeFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"LiteralUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/LiteralUnionTypeFormatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LiteralUnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/LiteralUnionTypeFormatter.ts"],"names":[],"mappings":";;;AA4EA,wCAUC;AAlFD,qDAA+C;AAC/C,2DAAwE;AACxE,qDAA+C;AAC/C,yDAAmD;AACnD,uDAAiD;AACjD,sDAAgD;AAChD,iEAAoD;AAEpD,MAAa,yBAAyB;IAC3B,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,wBAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3F,CAAC;IAEM,aAAa,CAAC,SAAoB;QACrC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAE/C,sEAAsE;QACtE,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,IAAI,OAAO,YAAY,0BAAU,EAAE,CAAC;gBAChC,SAAS,GAAG,IAAI,CAAC;gBACjB,gBAAgB,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC;gBACnD,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,IAAI,OAAO,YAAY,sBAAQ,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,IAAI,OAAO,YAAY,4BAAW,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACxD,UAAU,GAAG,KAAK,CAAC;YACvB,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,IAAI,SAAS,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC/C,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACvE,CAAC;QAED,MAAM,UAAU,GAA6B,IAAI,GAAG,EAAE,CAAC;QACvD,MAAM,SAAS,GAAqB,IAAI,GAAG,EAAE,CAAC;QAE9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACjC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,MAAM,GACR,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC;YACzC,CAAC,CAAC;gBACI,IAAI,EAAE,IAAA,iCAAU,EAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aACnC;YACH,CAAC,CAAC;gBACI,IAAI,EAAE,IAAA,iCAAU,EAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;aAC/B,CAAC;QAEZ,OAAO,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACxE,CAAC;IAEM,WAAW;QACd,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AA9DD,8DA8DC;AAED,SAAgB,cAAc,CAAC,IAAe;IAC1C,OAAO,IAAI;SACN,iBAAiB,EAAE;SACnB,KAAK,CACF,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,YAAY,4BAAW;QAC3B,IAAI,YAAY,sBAAQ;QACxB,IAAI,YAAY,0BAAU;QAC1B,IAAI,YAAY,sBAAQ,CAC/B,CAAC;AACV,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,IAAc,EAAE,KAAuB;IAC5D,IAAI,IAAI,YAAY,sBAAQ,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACnC,KAAK,CAAC,GAAG,CAAC,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO;IACX,CAAC;IAED,IAAI,IAAI,YAAY,4BAAW,EAAE,CAAC;QAC9B,KAAK,CAAC,GAAG,CAAC,IAAA,sBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACrC,OAAO;IACX,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAA,sBAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,IAAc,EAAE,MAAgC;IACtE,IAAI,IAAI,YAAY,sBAAQ,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAED,OAAO;IACX,CAAC;IAED,IAAI,IAAI,YAAY,4BAAW,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5B,OAAO;IACX,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC"}

package/dist/src/TypeFormatter/ReferenceTypeFormatter.js

@@ -20,8 +20,14 @@ class ReferenceTypeFormatter {
     getChildren(type) {
         const referredType = type.getType();
         if (referredType instanceof DefinitionType_js_1.DefinitionType) {
+            // We probably already have the definitions for the children created so we could return `[]`.
+            // There are cases where we may not have (in particular intersections of unions with recursion).
+            // To make sure we create the necessary definitions, we return the children of the referred type here.
+            // Because we cache definitions, this should not incur any performance impact.
             return this.childTypeFormatter.getChildren(referredType);
         }
+        // this means that the referred interface is protected
+        // so we have to expose it in the schema definitions
         return this.childTypeFormatter.getChildren(new DefinitionType_js_1.DefinitionType(type.getName(), type.getType()));
     }
 }

package/dist/src/TypeFormatter/ReferenceTypeFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReferenceTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/ReferenceTypeFormatter.ts"],"names":[],"mappings":";;;AAGA,iEAA2D;AAC3D,+DAAyD;AAGzD,MAAa,sBAAsB;IAEjB;IACA;IAFd,YACc,kBAAiC,EACjC,UAAmB;QADnB,uBAAkB,GAAlB,kBAAkB,CAAe;QACjC,eAAU,GAAV,UAAU,CAAS;IAC9B,CAAC;IAEG,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,gCAAa,CAAC;IACzC,CAAC;IACM,aAAa,CAAC,IAAmB;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,iBAAiB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;IACxF,CAAC;IACM,WAAW,CAAC,IAAmB;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,YAAY,YAAY,kCAAc,EAAE,CAAC;YAKzC,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC;QAID,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,kCAAc,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC;CACJ;AA3BD,wDA2BC"}
+{"version":3,"file":"ReferenceTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/ReferenceTypeFormatter.ts"],"names":[],"mappings":";;;AAGA,iEAA2D;AAC3D,+DAAyD;AAGzD,MAAa,sBAAsB;IAEjB;IACA;IAFd,YACc,kBAAiC,EACjC,UAAmB;QADnB,uBAAkB,GAAlB,kBAAkB,CAAe;QACjC,eAAU,GAAV,UAAU,CAAS;IAC9B,CAAC;IAEG,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,gCAAa,CAAC;IACzC,CAAC;IACM,aAAa,CAAC,IAAmB;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,iBAAiB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;IACxF,CAAC;IACM,WAAW,CAAC,IAAmB;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,YAAY,YAAY,kCAAc,EAAE,CAAC;YACzC,6FAA6F;YAC7F,gGAAgG;YAChG,sGAAsG;YACtG,8EAA8E;YAC9E,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC;QAED,sDAAsD;QACtD,oDAAoD;QACpD,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,kCAAc,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC;CACJ;AA3BD,wDA2BC"}

package/dist/src/TypeFormatter/TupleTypeFormatter.js

@@ -32,12 +32,19 @@ class TupleTypeFormatter {
         const subTypes = type.getTypes().filter(notNever_js_1.notNever);
         const requiredElements = subTypes.filter((t) => !(t instanceof OptionalType_js_1.OptionalType) && !(t instanceof RestType_js_1.RestType));
         const optionalElements = subTypes.filter((t) => t instanceof OptionalType_js_1.OptionalType);
+        // NOTE: A maximum of one rest type is assumed.
         const restType = subTypes.find((t) => t instanceof RestType_js_1.RestType);
         const firstItemType = requiredElements.length > 0 ? requiredElements[0] : optionalElements[0]?.getType();
+        // Check whether the tuple is of any of the following forms:
+        //   [A, A, A]
+        //   [A, A, A?]
+        //   [A?, A?]
+        //   [A, A, A, ...A[]],
         const isUniformArray = firstItemType &&
             requiredElements.every((item) => item.getId() === firstItemType.getId()) &&
             optionalElements.every((item) => item.getType().getId() === firstItemType.getId()) &&
             (!restType || uniformRestType(restType, firstItemType));
+        // If so, generate a simple array with minItems (and possibly maxItems) instead.
         if (isUniformArray) {
             return {
                 type: "array",
@@ -53,13 +60,13 @@ class TupleTypeFormatter {
         return {
             type: "array",
             minItems: requiredDefinitions.length,
-            ...(itemsTotal ? { items: requiredDefinitions.concat(optionalDefinitions) } : {}),
-            ...(!itemsTotal && additionalItems ? { items: additionalItems } : {}),
-            ...(!itemsTotal && !additionalItems ? { maxItems: 0 } : {}),
+            ...(itemsTotal ? { items: requiredDefinitions.concat(optionalDefinitions) } : {}), // with items
+            ...(!itemsTotal && additionalItems ? { items: additionalItems } : {}), // with only rest param
+            ...(!itemsTotal && !additionalItems ? { maxItems: 0 } : {}), // empty
             ...(additionalItems && !Array.isArray(additionalItems) && itemsTotal
                 ? { additionalItems: additionalItems }
-                : {}),
-            ...(!additionalItems && itemsTotal ? { maxItems: itemsTotal } : {}),
+                : {}), // with rest items
+            ...(!additionalItems && itemsTotal ? { maxItems: itemsTotal } : {}), // without rest
         };
     }
     getChildren(type) {

package/dist/src/TypeFormatter/TupleTypeFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"TupleTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/TupleTypeFormatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TupleTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/TupleTypeFormatter.ts"],"names":[],"mappings":";;;AAEA,uDAAiD;AAEjD,6DAAuD;AACvD,qDAA+C;AAC/C,uDAAiD;AAEjD,sDAAgD;AAChD,4DAAsD;AAEtD,SAAS,eAAe,CAAC,IAAc,EAAE,UAAoB;IACzD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,OAAO,CACH,CAAC,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9E,CAAC,KAAK,YAAY,wBAAS;YACvB,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClC,IAAI,UAAU,YAAY,sBAAQ,EAAE,CAAC;oBACjC,OAAO,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACJ,OAAO,UAAU,EAAE,KAAK,EAAE,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtD,CAAC;YACL,CAAC,CAAC,CAAC,CACV,CAAC;AACN,CAAC;AAED,MAAa,kBAAkB;IACE;IAA7B,YAA6B,kBAAiC;QAAjC,uBAAkB,GAAlB,kBAAkB,CAAe;IAAG,CAAC;IAE3D,YAAY,CAAC,IAAc;QAC9B,OAAO,IAAI,YAAY,wBAAS,CAAC;IACrC,CAAC;IAEM,aAAa,CAAC,IAAe;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,sBAAQ,CAAC,CAAC;QAElD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,8BAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,sBAAQ,CAAC,CAAC,CAAC;QAC1G,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,YAAY,8BAAY,CAAC,CAAC;QAC9F,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAiB,EAAE,CAAC,CAAC,YAAY,sBAAQ,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;QAEzG,4DAA4D;QAC5D,cAAc;QACd,eAAe;QACf,aAAa;QACb,uBAAuB;QACvB,MAAM,cAAc,GAChB,aAAa;YACb,gBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,aAAa,CAAC,KAAK,EAAE,CAAC;YACxE,gBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,aAAa,CAAC,KAAK,EAAE,CAAC;YAClF,CAAC,CAAC,QAAQ,IAAI,eAAe,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;QAE5D,gFAAgF;QAChF,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,aAAa,CAAC;gBAC3D,QAAQ,EAAE,gBAAgB,CAAC,MAAM;gBACjC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC;aACvF,CAAC;QACN,CAAC;QAED,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACxG,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACxG,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC;QAC3E,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAErG,OAAO;YACH,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,mBAAmB,CAAC,MAAM;YACpC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa;YAChG,GAAG,CAAC,CAAC,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,uBAAuB;YAC9F,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ;YACrE,GAAG,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,UAAU;gBAChE,CAAC,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE;gBACtC,CAAC,CAAC,EAAE,CAAC,EAAE,kBAAkB;YAC7B,GAAG,CAAC,CAAC,eAAe,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe;SACvF,CAAC;IACN,CAAC;IAEM,WAAW,CAAC,IAAe;QAC9B,OAAO,IAAA,4BAAW,EACd,IAAI;aACC,QAAQ,EAAE;aACV,MAAM,CAAC,sBAAQ,CAAC;aAChB,MAAM,CAAC,CAAC,MAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAC3G,CAAC;IACN,CAAC;CACJ;AA/DD,gDA+DC"}

package/dist/src/TypeFormatter/UnionTypeFormatter.js

@@ -84,6 +84,7 @@ class UnionTypeFormatter {
         }
         const definitions = this.getTypeDefinitions(type);
         const flattenedDefinitions = [];
+        // Flatten anyOf inside anyOf unless the anyOf has an annotation
         for (const def of definitions) {
             const keys = Object.keys(def);
             if (keys.length === 1 && keys[0] === "anyOf") {

package/dist/src/TypeFormatter/UnionTypeFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/UnionTypeFormatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UnionTypeFormatter.js","sourceRoot":"","sources":["../../../src/TypeFormatter/UnionTypeFormatter.ts"],"names":[],"mappings":"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"}

package/dist/src/Utils/allOfDefinition.js

@@ -4,7 +4,10 @@ exports.getAllOfDefinitionReducer = getAllOfDefinitionReducer;
 const uniqueArray_js_1 = require("./uniqueArray.js");
 const deepMerge_js_1 = require("./deepMerge.js");
 const derefType_js_1 = require("./derefType.js");
+// TODO: Can we do this at parse time? See heritage clause in interfaces.
+// TODO: We really only need this if the children use additionalProperties: false.
 function getAllOfDefinitionReducer(childTypeFormatter) {
+    // combine object instead of using allOf because allOf does not work well with additional properties
     return (definition, baseType) => {
         const other = childTypeFormatter.getDefinition((0, derefType_js_1.derefType)(baseType));
         definition.properties = (0, deepMerge_js_1.deepMerge)(other.properties || {}, definition.properties || {});
@@ -13,6 +16,8 @@ function getAllOfDefinitionReducer(childTypeFormatter) {
         }
         if (additionalPropsDefinition(definition.additionalProperties) &&
             additionalPropsDefinition(other.additionalProperties)) {
+            // additional properties is false only if all children also set additional properties to false
+            // collect additional properties and merge into a single definition
             let additionalProps = [];
             let additionalTypes = [];
             const addAdditionalProps = (addProps) => {

package/dist/src/Utils/allOfDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"allOfDefinition.js","sourceRoot":"","sources":["../../../src/Utils/allOfDefinition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"allOfDefinition.js","sourceRoot":"","sources":["../../../src/Utils/allOfDefinition.ts"],"names":[],"mappings":"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"}

package/dist/src/Utils/deepMerge.d.ts

@@ -1,4 +1,12 @@
 import type { JSONSchema7Definition } from "json-schema";
+/**
+ * Merges nested objects and arrays.
+ *
+ * @param a - lhs to merge.
+ * @param b - rhs to merge.
+ * @param intersectArrays - compute intersection of arrays (otherwise take the array from b).
+ * @returns a and b merged together.
+ */
 export declare function deepMerge(a: {
     [key: string]: JSONSchema7Definition;
 }, b: {

package/dist/src/Utils/deepMerge.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepMerge = deepMerge;
 const intersectionOfArrays_js_1 = require("./intersectionOfArrays.js");
+/**
+ * Merges nested objects and arrays.
+ *
+ * @param a - lhs to merge.
+ * @param b - rhs to merge.
+ * @param intersectArrays - compute intersection of arrays (otherwise take the array from b).
+ * @returns a and b merged together.
+ */
 function deepMerge(a, b) {
     const output = { ...structuredClone(a), ...structuredClone(b) };
     for (const key in a) {
@@ -28,6 +36,7 @@ function deepMerge(a, b) {
     return output;
 }
 function mergeConstsAndEnums(a, b) {
+    // NOTE: const is basically a syntactic sugar for an enum with a single element.
     const enumA = a.const !== undefined ? [a.const] : a.enum;
     const enumB = b.const !== undefined ? [b.const] : b.enum;
     if (enumA == null && enumB != null) {

package/dist/src/Utils/deepMerge.js.map

@@ -1 +1 @@
-{"version":3,"file":"deepMerge.js","sourceRoot":"","sources":["../../../src/Utils/deepMerge.ts"],"names":[],"mappings":";;AAaA,8BAgCC;AA1CD,uEAAiE;AAUjE,SAAgB,SAAS,CACrB,CAA2C,EAC3C,CAA2C;IAE3C,MAAM,MAAM,GAAG,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhE,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAuB,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAuB,CAAC,CAAC;YAE5C,IACI,QAAQ,IAAI,IAAI;gBAChB,QAAQ,IAAI,IAAI;gBAChB,OAAO,QAAQ,KAAK,QAAQ;gBAC5B,OAAO,QAAQ,KAAK,QAAQ;gBAC5B,MAAM,IAAI,QAAQ;gBAClB,MAAM,IAAI,QAAQ,EACpB,CAAC;gBACC,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACjC,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBACtD,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;wBAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;wBACnC,MAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;wBAChF,OAAQ,MAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBAC7D,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAa,EAAE,CAAa;IAErD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzD,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,IAAA,8CAAoB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC"}
+{"version":3,"file":"deepMerge.js","sourceRoot":"","sources":["../../../src/Utils/deepMerge.ts"],"names":[],"mappings":";;AAaA,8BAgCC;AA1CD,uEAAiE;AAEjE;;;;;;;GAOG;AACH,SAAgB,SAAS,CACrB,CAA2C,EAC3C,CAA2C;IAE3C,MAAM,MAAM,GAAG,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhE,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAuB,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAuB,CAAC,CAAC;YAE5C,IACI,QAAQ,IAAI,IAAI;gBAChB,QAAQ,IAAI,IAAI;gBAChB,OAAO,QAAQ,KAAK,QAAQ;gBAC5B,OAAO,QAAQ,KAAK,QAAQ;gBAC5B,MAAM,IAAI,QAAQ;gBAClB,MAAM,IAAI,QAAQ,EACpB,CAAC;gBACC,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACjC,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBACtD,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;wBAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;wBACnC,MAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;wBAChF,OAAQ,MAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBAC7D,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAa,EAAE,CAAa;IACrD,gFAAgF;IAChF,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzD,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,IAAA,8CAAoB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC"}

package/dist/src/Utils/derefType.d.ts

@@ -1,6 +1,12 @@
 import type { BaseType } from "../Type/BaseType.js";
+/**
+ * Dereference the type as far as possible.
+ */
 export declare function derefType(type: BaseType): BaseType;
 export declare function derefAnnotatedType(type: BaseType): BaseType;
 export declare function isHiddenType(type: BaseType): boolean;
+/**
+ * Recursively checks whether the given type is a union composed entirely of literal types.
+ */
 export declare function isDeepLiteralUnion(type: BaseType): boolean;
 export declare function derefAliasedType(type: BaseType): BaseType;

package/dist/src/Utils/derefType.js

@@ -13,6 +13,9 @@ const LiteralType_js_1 = require("../Type/LiteralType.js");
 const NeverType_js_1 = require("../Type/NeverType.js");
 const ReferenceType_js_1 = require("../Type/ReferenceType.js");
 const UnionType_js_1 = require("../Type/UnionType.js");
+/**
+ * Dereference the type as far as possible.
+ */
 function derefType(type) {
     if (type instanceof DefinitionType_js_1.DefinitionType || type instanceof AliasType_js_1.AliasType || type instanceof AnnotatedType_js_1.AnnotatedType) {
         return derefType(type.getType());
@@ -37,6 +40,9 @@ function isHiddenType(type) {
     }
     return false;
 }
+/**
+ * Recursively checks whether the given type is a union composed entirely of literal types.
+ */
 function isDeepLiteralUnion(type) {
     const resolved = derefType(type);
     if (resolved instanceof LiteralType_js_1.LiteralType) {

package/dist/src/Utils/derefType.js.map

@@ -1 +1 @@
-{"version":3,"file":"derefType.js","sourceRoot":"","sources":["../../../src/Utils/derefType.ts"],"names":[],"mappings":";;AAaA,8BASC;AAED,gDAMC;AAED,oCAQC;AAKD,gDAYC;AAED,4CAMC;AAjED,uDAAiD;AACjD,+DAAyD;AAEzD,iEAA2D;AAC3D,yDAAmD;AACnD,2DAAqD;AACrD,uDAAiD;AACjD,+DAAyD;AACzD,uDAAiD;AAKjD,SAAgB,SAAS,CAAC,IAAc;IACpC,IAAI,IAAI,YAAY,kCAAc,IAAI,IAAI,YAAY,wBAAS,IAAI,IAAI,YAAY,gCAAa,EAAE,CAAC;QAC/F,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,IAAI,YAAY,gCAAa,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QAClD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAc;IAC7C,IAAI,IAAI,YAAY,gCAAa,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC7D,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,YAAY,CAAC,IAAc;IACvC,IAAI,IAAI,YAAY,0BAAU,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,YAAY,kCAAc,IAAI,IAAI,YAAY,wBAAS,IAAI,IAAI,YAAY,gCAAa,EAAE,CAAC;QACtG,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAKD,SAAgB,kBAAkB,CAAC,IAAc;IAC7C,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,QAAQ,YAAY,4BAAW,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ,YAAY,wBAAS,EAAE,CAAC;QAChC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAc;IAC3C,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC5B,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"derefType.js","sourceRoot":"","sources":["../../../src/Utils/derefType.ts"],"names":[],"mappings":";;AAaA,8BASC;AAED,gDAMC;AAED,oCAQC;AAKD,gDAYC;AAED,4CAMC;AAjED,uDAAiD;AACjD,+DAAyD;AAEzD,iEAA2D;AAC3D,yDAAmD;AACnD,2DAAqD;AACrD,uDAAiD;AACjD,+DAAyD;AACzD,uDAAiD;AAEjD;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAc;IACpC,IAAI,IAAI,YAAY,kCAAc,IAAI,IAAI,YAAY,wBAAS,IAAI,IAAI,YAAY,gCAAa,EAAE,CAAC;QAC/F,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,IAAI,YAAY,gCAAa,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QAClD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAc;IAC7C,IAAI,IAAI,YAAY,gCAAa,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC7D,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,YAAY,CAAC,IAAc;IACvC,IAAI,IAAI,YAAY,0BAAU,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IAChB,CAAC;SAAM,IAAI,IAAI,YAAY,kCAAc,IAAI,IAAI,YAAY,wBAAS,IAAI,IAAI,YAAY,gCAAa,EAAE,CAAC;QACtG,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAc;IAC7C,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,QAAQ,YAAY,4BAAW,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ,YAAY,wBAAS,EAAE,CAAC;QAChC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAc;IAC3C,IAAI,IAAI,YAAY,wBAAS,EAAE,CAAC;QAC5B,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/dist/src/Utils/intersectionOfArrays.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.intersectionOfArrays = intersectionOfArrays;
 const tslib_1 = require("tslib");
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 const safe_stable_stringify_1 = tslib_1.__importDefault(require("safe-stable-stringify"));
 function intersectionOfArrays(a, b) {
     const output = [];

package/dist/src/Utils/intersectionOfArrays.js.map

@@ -1 +1 @@
-{"version":3,"file":"intersectionOfArrays.js","sourceRoot":"","sources":["../../../src/Utils/intersectionOfArrays.ts"],"names":[],"mappings":";;AAGA,oDASC;;AAXD,0FAA8C;AAE9C,SAAgB,oBAAoB,CAAI,CAAM,EAAE,CAAM;IAClD,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,GAAG,GAAgB,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,EAAE,CAAC,IAAA,+BAAS,EAAC,IAAK,CAAC,CAAC,CAAC,CAAC;IACvE,KAAK,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;QACpB,IAAI,GAAG,CAAC,GAAG,CAAC,IAAA,+BAAS,EAAC,KAAM,CAAC,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"intersectionOfArrays.js","sourceRoot":"","sources":["../../../src/Utils/intersectionOfArrays.ts"],"names":[],"mappings":";;AAGA,oDASC;;AAZD,qEAAqE;AACrE,0FAA8C;AAE9C,SAAgB,oBAAoB,CAAI,CAAM,EAAE,CAAM;IAClD,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,GAAG,GAAgB,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,EAAE,CAAC,IAAA,+BAAS,EAAC,IAAK,CAAC,CAAC,CAAC,CAAC;IACvE,KAAK,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;QACpB,IAAI,GAAG,CAAC,GAAG,CAAC,IAAA,+BAAS,EAAC,KAAM,CAAC,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/dist/src/Utils/isAssignableTo.d.ts

@@ -1,2 +1,14 @@
 import type { BaseType } from "../Type/BaseType.js";
+/**
+ * Checks if given source type is assignable to given target type.
+ *
+ * The logic of this function is heavily inspired by
+ * https://github.com/runem/ts-simple-type/blob/master/src/is-assignable-to-simple-type.ts
+ *
+ * @param source      - The source type.
+ * @param target      - The target type.
+ * @param inferMap    - Optional parameter that keeps track of the inferred types.
+ * @param insideTypes - Optional parameter used internally to solve circular dependencies.
+ * @return True if source type is assignable to target type.
+ */
 export declare function isAssignableTo(target: BaseType, source: BaseType, inferMap?: Map<string, BaseType>, insideTypes?: Set<BaseType>): boolean;

package/dist/src/Utils/isAssignableTo.js

@@ -21,6 +21,13 @@ const BooleanType_js_1 = require("../Type/BooleanType.js");
 const InferType_js_1 = require("../Type/InferType.js");
 const RestType_js_1 = require("../Type/RestType.js");
 const NeverType_js_1 = require("../Type/NeverType.js");
+/**
+ * Returns the combined types from the given intersection. Currently only object types are combined. Maybe more
+ * types needs to be combined to properly support complex intersections.
+ *
+ * @param intersection - The intersection type to combine.
+ * @return The combined types within the intersection.
+ */
 function combineIntersectingTypes(intersection) {
     const objectTypes = [];
     const combined = intersection.getTypes().filter((type) => {
@@ -40,6 +47,13 @@ function combineIntersectingTypes(intersection) {
     }
     return combined;
 }
+/**
+ * Returns all object properties of the given type and all its base types.
+ *
+ * @param type - The type for which to return the properties. If type is not an object type or object has no properties
+ *               Then an empty list ist returned.
+ * @return All object properties of the type. Empty if none.
+ */
 function getObjectProperties(type) {
     type = (0, derefType_js_1.derefType)(type);
     const properties = [];
@@ -61,15 +75,31 @@ function getPrimitiveType(value) {
             return new BooleanType_js_1.BooleanType();
     }
 }
+/**
+ * Checks if given source type is assignable to given target type.
+ *
+ * The logic of this function is heavily inspired by
+ * https://github.com/runem/ts-simple-type/blob/master/src/is-assignable-to-simple-type.ts
+ *
+ * @param source      - The source type.
+ * @param target      - The target type.
+ * @param inferMap    - Optional parameter that keeps track of the inferred types.
+ * @param insideTypes - Optional parameter used internally to solve circular dependencies.
+ * @return True if source type is assignable to target type.
+ */
 function isAssignableTo(target, source, inferMap = new Map(), insideTypes = new Set()) {
+    // Dereference source and target
     source = (0, derefType_js_1.derefType)(source);
     target = (0, derefType_js_1.derefType)(target);
+    // Type "never" can be assigned to anything
     if (source instanceof NeverType_js_1.NeverType) {
         return true;
     }
+    // Nothing can be assigned to "never"
     if (target instanceof NeverType_js_1.NeverType) {
         return false;
     }
+    // Infer type can become anything
     if (target instanceof InferType_js_1.InferType) {
         const key = target.getName();
         const infer = inferMap.get(key);
@@ -81,27 +111,36 @@ function isAssignableTo(target, source, inferMap = new Map(), insideTypes = new
         }
         return true;
     }
+    // Check for simple type equality
     if (source.getId() === target.getId()) {
         return true;
     }
+    /** Don't check types when already inside them. This solves circular dependencies. */
     if (insideTypes.has(source) || insideTypes.has(target)) {
         return true;
     }
+    // Assigning from or to any-type is always possible
     if (source instanceof AnyType_js_1.AnyType || target instanceof AnyType_js_1.AnyType) {
         return true;
     }
+    // assigning to unknown type is always possible
     if (target instanceof UnknownType_js_1.UnknownType) {
         return true;
     }
+    // 'null', or 'undefined' can be assigned to the void
     if (target instanceof VoidType_js_1.VoidType) {
         return source instanceof NullType_js_1.NullType || source instanceof UndefinedType_js_1.UndefinedType;
     }
+    // Union and enum type is assignable to target when all types in the union/enum are assignable to it
     if (source instanceof UnionType_js_1.UnionType || source instanceof EnumType_js_1.EnumType) {
         return source.getTypes().every((type) => isAssignableTo(target, type, inferMap, insideTypes));
     }
+    // When source is an intersection type then it can be assigned to target if any of the sub types matches. Object
+    // types within the intersection must be combined first
     if (source instanceof IntersectionType_js_1.IntersectionType) {
         return combineIntersectingTypes(source).some((type) => isAssignableTo(target, type, inferMap, insideTypes));
     }
+    // For arrays check if item types are assignable
     if (target instanceof ArrayType_js_1.ArrayType) {
         const targetItemType = target.getItem();
         if (source instanceof ArrayType_js_1.ArrayType) {
@@ -114,28 +153,36 @@ function isAssignableTo(target, source, inferMap = new Map(), insideTypes = new
             return false;
         }
     }
+    // When target is a union or enum type then check if source type can be assigned to any variant
     if (target instanceof UnionType_js_1.UnionType || target instanceof EnumType_js_1.EnumType) {
         return target.getTypes().some((type) => isAssignableTo(type, source, inferMap, insideTypes));
     }
+    // When target is an intersection type then source can be assigned to it if it matches all sub types. Object
+    // types within the intersection must be combined first
     if (target instanceof IntersectionType_js_1.IntersectionType) {
         return combineIntersectingTypes(target).every((type) => isAssignableTo(type, source, inferMap, insideTypes));
     }
+    // Check literal types
     if (source instanceof LiteralType_js_1.LiteralType) {
         return isAssignableTo(target, getPrimitiveType(source.getValue()), inferMap);
     }
     if (target instanceof ObjectType_js_1.ObjectType) {
+        // primitives are not assignable to `object`
         if (target.getNonPrimitive() &&
             (source instanceof NumberType_js_1.NumberType || source instanceof StringType_js_1.StringType || source instanceof BooleanType_js_1.BooleanType)) {
             return false;
         }
         const targetMembers = getObjectProperties(target);
         if (targetMembers.length === 0) {
+            // When target object is empty then anything except null and undefined can be assigned to it
             return !isAssignableTo(new UnionType_js_1.UnionType([new UndefinedType_js_1.UndefinedType(), new NullType_js_1.NullType()]), source, inferMap, insideTypes);
         }
         else if (source instanceof ObjectType_js_1.ObjectType) {
             const sourceMembers = getObjectProperties(source);
+            // Check if target has properties in common with source
             const inCommon = targetMembers.some((targetMember) => sourceMembers.some((sourceMember) => targetMember.getName() === sourceMember.getName()));
             return (targetMembers.every((targetMember) => {
+                // Make sure that every required property in target type is present
                 const sourceMember = sourceMembers.find((member) => targetMember.getName() === member.getName());
                 return sourceMember == null ? inCommon && !targetMember.isRequired() : true;
             }) &&
@@ -164,10 +211,14 @@ function isAssignableTo(target, source, inferMap = new Map(), insideTypes = new
             }
         }
     }
+    // Check if tuple types are compatible
     if (target instanceof TupleType_js_1.TupleType) {
         if (source instanceof TupleType_js_1.TupleType) {
             const sourceMembers = source.getTypes();
             const targetMembers = target.getTypes();
+            // TODO: Currently, the final element of the target tuple may be a
+            // rest type. However, since TypeScript 4.0, a tuple may contain
+            // multiple rest types at arbitrary locations.
             return targetMembers.every((targetMember, i) => {
                 const numTarget = targetMembers.length;
                 const numSource = sourceMembers.length;
@@ -180,6 +231,9 @@ function isAssignableTo(target, source, inferMap = new Map(), insideTypes = new
                             }
                             return isAssignableTo(targetMember.getType(), new TupleType_js_1.TupleType(remaining), inferMap, insideTypes);
                         }
+                        // The type cannot be assigned if more than one source
+                        // member is remaining and the final target type is not
+                        // a rest type.
                         else if (numTarget < numSource) {
                             return false;
                         }

package/dist/src/Utils/isAssignableTo.js.map

@@ -1 +1 @@
-{"version":3,"file":"isAssignableTo.js","sourceRoot":"","sources":["../../../src/Utils/isAssignableTo.ts"],"names":[],"mappings":";;AA2FA,wCAyNC;AApTD,mDAA6C;AAC7C,uDAAiD;AAEjD,qDAA+C;AAC/C,qEAA+D;AAC/D,qDAA+C;AAE/C,yDAAmD;AACnD,6DAAuD;AACvD,uDAAiD;AACjD,+DAAyD;AACzD,uDAAiD;AACjD,2DAAqD;AACrD,qDAA+C;AAC/C,iDAA2C;AAE3C,2DAAqD;AACrD,yDAAmD;AACnD,yDAAmD;AACnD,2DAAqD;AACrD,uDAAiD;AACjD,qDAA+C;AAC/C,uDAAiD;AASjD,SAAS,wBAAwB,CAAC,YAA8B;IAC5D,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACrD,IAAI,IAAI,YAAY,0BAAU,EAAE,CAAC;YAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;SAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,0BAAU,CAAC,oBAAoB,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AASD,SAAS,mBAAmB,CAAC,IAAc;IACvC,IAAI,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAE,CAAC;IACxB,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,IAAI,IAAI,YAAY,0BAAU,EAAE,CAAC;QAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACzC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzC,UAAU,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAmB;IACzC,QAAQ,OAAO,KAAK,EAAE,CAAC;QACnB,KAAK,QAAQ;YACT,OAAO,IAAI,0BAAU,EAAE,CAAC;QAC5B,KAAK,QAAQ;YACT,OAAO,IAAI,0BAAU,EAAE,CAAC;QAC5B,KAAK,SAAS;YACV,OAAO,IAAI,4BAAW,EAAE,CAAC;IACjC,CAAC;AACL,CAAC;AAcD,SAAgB,cAAc,CAC1B,MAAgB,EAChB,MAAgB,EAChB,WAAkC,IAAI,GAAG,EAAE,EAC3C,cAA6B,IAAI,GAAG,EAAE;IAGtC,MAAM,GAAG,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,GAAG,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC;IAG3B,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,wBAAS,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,MAAM,YAAY,oBAAO,IAAI,MAAM,YAAY,oBAAO,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,MAAM,YAAY,4BAAW,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,IAAI,MAAM,YAAY,sBAAQ,EAAE,CAAC;QAC7B,OAAO,MAAM,YAAY,sBAAQ,IAAI,MAAM,YAAY,gCAAa,CAAC;IACzE,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,IAAI,MAAM,YAAY,sBAAQ,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAClG,CAAC;IAID,IAAI,MAAM,YAAY,sCAAgB,EAAE,CAAC;QACrC,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAChH,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;YAC9B,OAAO,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACnF,CAAC;aAAM,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;YACrC,OAAO,cAAc,CAAC,cAAc,EAAE,IAAI,wBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACnG,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,IAAI,MAAM,YAAY,sBAAQ,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACjG,CAAC;IAID,IAAI,MAAM,YAAY,sCAAgB,EAAE,CAAC;QACrC,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IACjH,CAAC;IAGD,IAAI,MAAM,YAAY,4BAAW,EAAE,CAAC;QAChC,OAAO,cAAc,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,MAAM,YAAY,0BAAU,EAAE,CAAC;QAE/B,IACI,MAAM,CAAC,eAAe,EAAE;YACxB,CAAC,MAAM,YAAY,0BAAU,IAAI,MAAM,YAAY,0BAAU,IAAI,MAAM,YAAY,4BAAW,CAAC,EACjG,CAAC;YACC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAE7B,OAAO,CAAC,cAAc,CAAC,IAAI,wBAAS,CAAC,CAAC,IAAI,gCAAa,EAAE,EAAE,IAAI,sBAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAChH,CAAC;aAAM,IAAI,MAAM,YAAY,0BAAU,EAAE,CAAC;YACtC,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAGlD,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CACjD,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC,CAC1F,CAAC;YAEF,OAAO,CACH,aAAa,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,EAAE;gBAEjC,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjG,OAAO,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,CAAC,CAAC;gBACF,aAAa,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,EAAE;oBACjC,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;oBACjG,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;wBACvB,OAAO,IAAI,CAAC;oBAChB,CAAC;oBACD,OAAO,cAAc,CACjB,YAAY,CAAC,OAAO,EAAE,EACtB,YAAY,CAAC,OAAO,EAAE,EACtB,QAAQ,EACR,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAC/C,CAAC;gBACN,CAAC,CAAC,CACL,CAAC;QACN,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,YAAY,wBAAS,IAAI,MAAM,YAAY,wBAAS,CAAC;QACnF,IAAI,eAAe,EAAE,CAAC;YAClB,MAAM,cAAc,GAAG,aAAa;iBAC/B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjE,EAAE,OAAO,EAAE,CAAC;YAEhB,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;gBAC9B,OAAO,cAAc,YAAY,0BAAU,CAAC;YAChD,CAAC;YAED,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;gBAC9B,IAAI,cAAc,YAAY,4BAAW,EAAE,CAAC;oBACxC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAChC,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;oBAClD,OAAO,KAAK,CAAC,MAAM,KAAK,eAAe,CAAC;gBAC5C,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAGD,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;QAC9B,IAAI,MAAM,YAAY,wBAAS,EAAE,CAAC;YAC9B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAKxC,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE;gBAC3C,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;gBACvC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;gBAEvC,IAAI,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;oBACrB,IAAI,SAAS,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;wBAC7B,IAAI,YAAY,YAAY,sBAAQ,EAAE,CAAC;4BACnC,MAAM,SAAS,GAAoB,EAAE,CAAC;4BACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;gCACjC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;4BACrC,CAAC;4BACD,OAAO,cAAc,CACjB,YAAY,CAAC,OAAO,EAAE,EACtB,IAAI,wBAAS,CAAC,SAAS,CAAC,EACxB,QAAQ,EACR,WAAW,CACd,CAAC;wBACN,CAAC;6BAII,IAAI,SAAS,GAAG,SAAS,EAAE,CAAC;4BAC7B,OAAO,KAAK,CAAC;wBACjB,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBACtC,IAAI,YAAY,YAAY,8BAAY,EAAE,CAAC;oBACvC,IAAI,YAAY,EAAE,CAAC;wBACf,OAAO,CACH,cAAc,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC;4BACjE,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9E,CAAC;oBACN,CAAC;yBAAM,CAAC;wBACJ,OAAO,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;wBAC7B,OAAO,KAAK,CAAC;oBACjB,CAAC;oBACD,OAAO,cAAc,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC7E,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}
+{"version":3,"file":"isAssignableTo.js","sourceRoot":"","sources":["../../../src/Utils/isAssignableTo.ts"],"names":[],"mappings":"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"}

package/dist/src/Utils/modifiers.d.ts

@@ -1,4 +1,23 @@
 import ts from "typescript";
+/**
+ * Checks if given node has the given modifier.
+ *
+ * @param node     - The node to check.
+ * @param modifier - The modifier to look for.
+ * @return True if node has the modifier, false if not.
+ */
 export declare function hasModifier(node: ts.HasModifiers, modifier: ts.SyntaxKind): boolean;
+/**
+ * Checks if given node is public. A node is public if it has the public modifier or has no modifiers at all.
+ *
+ * @param node - The node to check.
+ * @return True if node is public, false if not.
+ */
 export declare function isPublic(node: ts.HasModifiers): boolean;
+/**
+ * Checks if given node has the static modifier.
+ *
+ * @param node - The node to check.
+ * @return True if node is static, false if not.
+ */
 export declare function isStatic(node: ts.HasModifiers): boolean;

package/dist/src/Utils/modifiers.js

@@ -5,6 +5,13 @@ exports.isPublic = isPublic;
 exports.isStatic = isStatic;
 const tslib_1 = require("tslib");
 const typescript_1 = tslib_1.__importDefault(require("typescript"));
+/**
+ * Checks if given node has the given modifier.
+ *
+ * @param node     - The node to check.
+ * @param modifier - The modifier to look for.
+ * @return True if node has the modifier, false if not.
+ */
 function hasModifier(node, modifier) {
     const nodeModifiers = node.modifiers;
     if (nodeModifiers == null) {
@@ -14,9 +21,21 @@ function hasModifier(node, modifier) {
         return nodeModifiers.some((nodeModifier) => nodeModifier.kind === modifier);
     }
 }
+/**
+ * Checks if given node is public. A node is public if it has the public modifier or has no modifiers at all.
+ *
+ * @param node - The node to check.
+ * @return True if node is public, false if not.
+ */
 function isPublic(node) {
     return !(hasModifier(node, typescript_1.default.SyntaxKind.PrivateKeyword) || hasModifier(node, typescript_1.default.SyntaxKind.ProtectedKeyword));
 }
+/**
+ * Checks if given node has the static modifier.
+ *
+ * @param node - The node to check.
+ * @return True if node is static, false if not.
+ */
 function isStatic(node) {
     return hasModifier(node, typescript_1.default.SyntaxKind.StaticKeyword);
 }

package/dist/src/Utils/modifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"modifiers.js","sourceRoot":"","sources":["../../../src/Utils/modifiers.ts"],"names":[],"mappings":";;AASA,kCAOC;AAQD,4BAEC;AAQD,4BAEC;;AApCD,oEAA4B;AAS5B,SAAgB,WAAW,CAAC,IAAqB,EAAE,QAAuB;IACtE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,CAAC;QACJ,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAChF,CAAC;AACL,CAAC;AAQD,SAAgB,QAAQ,CAAC,IAAqB;IAC1C,OAAO,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACnH,CAAC;AAQD,SAAgB,QAAQ,CAAC,IAAqB;IAC1C,OAAO,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"modifiers.js","sourceRoot":"","sources":["../../../src/Utils/modifiers.ts"],"names":[],"mappings":";;AASA,kCAOC;AAQD,4BAEC;AAQD,4BAEC;;AApCD,oEAA4B;AAE5B;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,IAAqB,EAAE,QAAuB;IACtE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;SAAM,CAAC;QACJ,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAChF,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,IAAqB;IAC1C,OAAO,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACnH,CAAC;AAED;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,IAAqB;IAC1C,OAAO,WAAW,CAAC,IAAI,EAAE,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC1D,CAAC"}

package/dist/src/Utils/narrowType.d.ts

@@ -1,2 +1,14 @@
 import type { BaseType } from "../Type/BaseType.js";
+/**
+ * Narrows the given type by passing all variants to the given predicate function. So when type is a union type then
+ * the predicate function is called for each type within the union and only the types for which this function returns
+ * true will remain in the returned type. Union types with only one sub type left are replaced by this one-and-only
+ * type. Empty union types are removed completely. Definition types are kept if possible. When in the end none of
+ * the type candidates match the predicate then undefined is returned.
+ *
+ * @param type      - The type to narrow down.
+ * @param predicate - The predicate function to filter the type variants. If it returns true then the type variant is
+ *                    kept, when returning false it is removed.
+ * @return The narrowed down type.
+ */
 export declare function narrowType(type: BaseType, predicate: (type: BaseType) => boolean): BaseType;