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

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.54+6c8a690",
+  "version": "10.0.21-ng12.59+6ecedfd",
   "author": "Telerik",
   "license": "Apache-2.0",
   "scripts": {
@@ -18,7 +18,7 @@
     "typescript": "^4.3.4"
   },
   "dependencies": {
-    "@progress/kendo-common-tasks": "7.9.5-ng12.54+6c8a690",
+    "@progress/kendo-common-tasks": "7.9.5-ng12.59+6ecedfd",
     "@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": "6c8a690690862d5752a2ac2e54e53a20f72a7cfb"
+  "gitHead": "6ecedfddda739a6ff44b87570e892da1a5ef56b6"
 }

package/src/api/comment.js

@@ -3,7 +3,6 @@
 const template = require('./template-utils.js');
 const slug = require('./slug.js');
 const warn = require('./warn.js');
-const utils = require('./utils.js');
 
 const commentTemplate = template.compileFrom('comment-tags.hbs');
 
@@ -28,7 +27,9 @@ const commentTags = (comment, member) =>
     });
 
 const formatComment = (member, parentName, memberKind) => {
-    const comment = utils.extractComment(member);
+    const signatures = member.type?.declaration?.signatures;
+    const comment = member.comment || signatures && signatures[0]?.comment;
+
     if (!comment) {
         warn(member, parentName, memberKind);
 

package/src/api/generator.js

@@ -155,7 +155,7 @@ const extractMembers = (packageName, modules, config) => {
                 id: child.id,
                 module: moduleRoot(module.name, rootModules),
                 name: child.name,
-                comment: utils.extractComment(child),
+                comment: child.comment,
                 children: child.children,
                 decorators: child.decorators,
                 type: child.type,

package/src/api/map-props.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const comment = require('./comment');
+const getComment = require('./comment');
 const types = require('./type-utils');
 const isConstructor = require('./is-constructor');
 const isEvent = require('./is-event');
@@ -21,6 +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);
         if (prop.type) {
             type = types.typeString(prop);
         } else if (prop.kindString === 'Accessor') {
@@ -28,12 +29,13 @@ const mapProps = (children, parentName) =>
             const setter = prop.setSignature;
 
             // Fingers crossed
-            type = types.typeString(getter ?
-                accessor(getter) :
-                accessor(setter).parameters[0]
+            type = types.typeString(setter ?
+                accessor(setter).parameters[0] :
+                accessor(getter)
             );
         } else if (prop.kindString === 'Method') {
             type = types.callType(prop.signatures[0]);
+            comment = getComment(prop.signatures[0], parentName);
         }
 
         let name = prop.name;
@@ -53,7 +55,7 @@ const mapProps = (children, parentName) =>
             name: name,
             type: type,
             defaultValue: defaultValue(prop),
-            comment: comment(prop, parentName)
+            comment: comment
         };
     });
 

package/src/api/type-utils.js

@@ -92,6 +92,10 @@ const INTERSECTION = ' [intersected](https://www.typescriptlang.org/docs/handboo
 const singleTypeString = (type) => {
     let suffix = '';
 
+    if (type.type === 'literal') {
+        return type.value;
+    }
+
     if (type.type === 'intersection') {
         return unionTypes({ type }).join(INTERSECTION);
     }
@@ -135,8 +139,8 @@ const typeString = (prop) => {
         return unionTypes(prop).join(' | ');
     }
 
-    if (type.type === 'stringLiteral') {
-        return `'${type.value}'`;
+    if (type.type === 'literal') {
+        return `"${type.value}"`;
     }
 
     return singleTypeString(prop.type);

package/src/api/utils.js

@@ -27,8 +27,6 @@ const warn = (type, text) => {
     console.warn(msg);
 };
 
-const extractComment = (member) => member.comment || member.type?.declaration?.signatures[0].comment;
-
 module.exports = {
     groupBy: groupBy,
     flatten: flatten,
@@ -37,7 +35,6 @@ module.exports = {
     warnings: () => WARNINGS,
     not: not,
     ignore: ignore,
-    hasProp: hasProp,
-    extractComment: extractComment
+    hasProp: hasProp
 };
 

package/test/api.js

@@ -162,13 +162,13 @@ describe('API generation', () => {
         it('formats anonymous interfaces', () => {
             const unionData = require('./type-union.json');
             const page = unionPage(unionData);
-            expect(page).toContain("{ allowUnsort?: boolean; mode?: 'single' | 'multiple'; }");
+            expect(page).toContain('{ allowUnsort?: boolean; mode?: "single" | "multiple"; }');
         });
 
         it('formats intersection interfaces', () => {
             const intersectionData = require('./intersection.json');
             const page = unionPage(intersectionData);
-            expect(page).toContain("ColumnSortSettings [intersected](https://www.typescriptlang.org/docs/handbook/advanced-types.html#intersection-types) with { mode?: 'single' | 'multiple'; }");
+            expect(page).toContain('ColumnSortSettings [intersected](https://www.typescriptlang.org/docs/handbook/advanced-types.html#intersection-types) with { mode?: "single" | "multiple"; }');
         });
     });
 

package/test/intersection.json

@@ -46,11 +46,11 @@
                                         "type": "union",
                                         "types": [
                                             {
-                                                "type": "stringLiteral",
+                                                "type": "literal",
                                                 "value": "single"
                                             },
                                             {
-                                                "type": "stringLiteral",
+                                                "type": "literal",
                                                 "value": "multiple"
                                             }
                                         ]

package/test/type-union.json

@@ -52,11 +52,11 @@
                                 "type": "union",
                                 "types": [
                                     {
-                                        "type": "stringLiteral",
+                                        "type": "literal",
                                         "value": "single"
                                     },
                                     {
-                                        "type": "stringLiteral",
+                                        "type": "literal",
                                         "value": "multiple"
                                     }
                                 ]