@progress/kendo-typescript-tasks 10.0.21-ng12.59 → 10.0.21-ng12.62

package/package.json

@@ -2,7 +2,7 @@
   "name": "@progress/kendo-typescript-tasks",
   "description": "Kendo UI TypeScript package gulp tasks",
   "main": "gulp-tasks.js",
-  "version": "10.0.21-ng12.59+6ecedfd",
+  "version": "10.0.21-ng12.62+9f7c207",
   "author": "Telerik",
   "license": "Apache-2.0",
   "scripts": {
@@ -18,7 +18,7 @@
     "typescript": "^4.3.4"
   },
   "dependencies": {
-    "@progress/kendo-common-tasks": "7.9.5-ng12.59+6ecedfd",
+    "@progress/kendo-common-tasks": "7.9.5-ng12.62+9f7c207",
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",
     "core-js": "^3.18.0",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6ecedfddda739a6ff44b87570e892da1a5ef56b6"
+  "gitHead": "9f7c207c0db3a8464daf0da1c65c7da1da87f851"
 }

package/src/api/map-props.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const getComment = require('./comment');
+const comment = require('./comment');
 const types = require('./type-utils');
 const isConstructor = require('./is-constructor');
 const isEvent = require('./is-event');
@@ -21,7 +21,7 @@ const isProp = (prop) => isPublic(prop) && !isConstructor(prop) && !isMethod(pro
 const mapProps = (children, parentName) =>
     children.filter(isProp).map(prop => {
         let type;
-        let comment = getComment(prop, parentName);
+        let commentProp = prop;
         if (prop.type) {
             type = types.typeString(prop);
         } else if (prop.kindString === 'Accessor') {
@@ -35,7 +35,7 @@ const mapProps = (children, parentName) =>
             );
         } else if (prop.kindString === 'Method') {
             type = types.callType(prop.signatures[0]);
-            comment = getComment(prop.signatures[0], parentName);
+            commentProp = prop.signatures[0];
         }
 
         let name = prop.name;
@@ -55,7 +55,7 @@ const mapProps = (children, parentName) =>
             name: name,
             type: type,
             defaultValue: defaultValue(prop),
-            comment: comment
+            comment: comment(commentProp, parentName)
         };
     });
 

package/src/api/template-utils.js

@@ -10,6 +10,9 @@ hbs.registerHelper('capitalize',
 hbs.registerHelper('contains',
     (s, chars, options) => (s.includes(chars) ? options.fn(s) : options.inverse(s)));
 
+hbs.registerHelper('equals',
+    (s, comparer, options) => (s === comparer ? options.fn(s) : options.inverse(s)));
+
 const readLocal = (src) =>
     fs.readFileSync(path.join(__dirname, src), { encoding: 'utf-8' });
 

package/src/api/union-page.hbs

@@ -6,7 +6,7 @@
 `type` {{name}} =
   {{~#each types~}}
     {{~#contains this 'slug'}} {{this}}
-      {{~else contains this 'null'}} `null`
+      {{~else equals this '"null"'}} `null`
       {{~else contains this '"'}} {{this}}
       {{~else}} `{{this}}`
     {{~/contains~}}

package/test/api.js

@@ -170,6 +170,12 @@ describe('API generation', () => {
             const page = unionPage(intersectionData);
             expect(page).toContain('ColumnSortSettings [intersected](https://www.typescriptlang.org/docs/handbook/advanced-types.html#intersection-types) with { mode?: "single" | "multiple"; }');
         });
+
+        it('formats values conatining or equaling "null"', () => {
+            const unionData = require('./type-union-operators.json');
+            const page = unionPage(unionData);
+            expect(page).toContain('`type` FilterOperator = "gt" | "gte" | "isnull" | "isnotnull" | `null`');
+        });
     });
 
     describe('for components', () => {

package/test/type-union-operators.json

@@ -0,0 +1,42 @@
+{
+    "id": 416,
+    "name": "FilterOperator",
+    "kind": 4194304,
+    "kindString": "Type alias",
+    "flags": {},
+    "comment": {
+        "shortText": "Represents the FilterOperator type."
+    },
+    "sources": [
+        {
+            "fileName": "src/model/filter-expression.ts",
+            "line": 5,
+            "character": 12
+        }
+    ],
+    "type": {
+        "type": "union",
+        "types": [
+            {
+                "type": "literal",
+                "value": "gt"
+            },
+            {
+                "type": "literal",
+                "value": "gte"
+            },
+            {
+                "type": "literal",
+                "value": "isnull"
+            },
+            {
+                "type": "literal",
+                "value": "isnotnull"
+            },
+            {
+                "type": "literal",
+                "value": null
+            }
+        ]
+    }
+}