@progress/kendo-typescript-tasks 10.0.17 → 10.0.18-ng12.42

package/api.config.js

@@ -1,22 +1,8 @@
-const os = require('os');
 const path = require('path');
 
-const jsonPath = path.join(os.tmpdir(), `api-${process.pid}.json`);
+const jsonPath = path.resolve('./api.json');
 const typedoc = {
-    // TypeScript options
-    module: 'commonjs',
-    target: 'es6',
-    types: [],
-    experimentalDecorators: true,
-    jsx: 'react', // support for tsx files
-
-    // Output options
-    json: jsonPath,
-
-    // Typedoc options
-    excludeExternals: true,
-    ignoreCompilerErrors: false,
-    includeDeclarations: true
+    excludeExternals: true
 };
 
 module.exports = {

package/api.js

@@ -2,8 +2,9 @@
 
 const execSync = require('child_process').execSync;
 const path = require('path');
-const typedoc = require('gulp-typedoc');
 const { merge } = require('lodash');
+const typedoc = require('typedoc');
+const glob = require('glob');
 
 const api = require('./src/api/generator.js');
 const apiConfig = require('./api.config.js');
@@ -12,11 +13,30 @@ module.exports = (gulp, userConfig) => {
     const series = gulp.series;
 
     const config = merge({}, apiConfig, userConfig);
-    const DECLARATIONS = ["typings/index.d.ts", "node_modules/@types/core-js/index.d.ts"];
 
-    gulp.task('api-json', () => {
-        return gulp.src(["src/**/*.{ts,tsx}", ...DECLARATIONS, ...(config.externalApi || [])], { "allowEmpty": true })
-            .pipe(typedoc(config.typedoc));
+    gulp.task('api-json', async (done) => {
+        const entryPoints = [
+            ...glob.sync("src/**/*.{ts,tsx}"),
+            ...(config.externalApi || [])
+        ];
+
+        const app = new typedoc.Application();
+        app.options.addReader(new typedoc.TSConfigReader());
+        app.bootstrap({ ...config.typedoc, entryPoints });
+
+        const project = app.convert();
+        if (!project) {
+            done(new Error('Unable to initialize TypeDoc.'));
+            return;
+        }
+
+        await app.generateJson(project, apiConfig.jsonPath);
+        if (app.logger.hasErrors()) {
+            done(new Error('Unable to generate API reference, see messages above.'));
+            return;
+        }
+
+        done();
     });
 
     gulp.task('api-clean', (done) => {

package/gulp-tasks.js

@@ -3,11 +3,10 @@
 const del = require('del');
 const childProcess = require('child_process');
 const path = require('path');
-const gulpTsLint = require('gulp-tslint');
-const tslint = require('tslint');
 
 const apiTasks = require('./api.js');
 const commonTasks = require('@progress/kendo-common-tasks');
+const linter = require('./src/linter');
 
 const webpackConfig = require('./webpack.config.js');
 const tscPath = path.join(process.cwd(), 'node_modules', '.bin', 'tsc');
@@ -37,29 +36,15 @@ module.exports = (gulp, libraryName, compilerPath, options, webpackConfigPath) =
         done()
     });
 
-    gulp.task('lint', series('check-compilation', (done) => {
-        const program = tslint.Linter.createProgram('./tsconfig.json', '.');
+    gulp.task('lint', series(
+        'check-compilation',
+        linter([ 'src/**/*.{ts,tsx}', 'test/**/*.{ts,tsx}', 'e2e/**/*.{ts,tsx}' ])
+    ));
 
-        return gulp.src([ 'src/**/*.{ts,tsx}', 'test/**/*.{ts,tsx}', 'e2e/**/*.{ts,tsx}' ])
-            .pipe(gulpTsLint({
-                program: program,
-                formatter: 'verbose'
-            }))
-            .pipe(gulpTsLint.report());
+    gulp.task('lint-docs', linter([ 'docs/examples/**/*.{ts,tsx}' ], {
+        overrideConfigFile: '.eslintrc.docs.json'
     }));
 
-    gulp.task('lint-docs', () => {
-        const program = tslint.Linter.createProgram('./tsconfig.docs.json', '.');
-
-        return gulp.src([ 'docs/examples/**/*.{ts,tsx}'])
-            .pipe(gulpTsLint({
-                formatter: 'prose',
-                program: program,
-                configuration: './tslint.docs.json'
-            }))
-            .pipe(gulpTsLint.report());
-    });
-
     gulp.task('start', (done) => {
         const webpackPort = 8888;
         const host = listenAddress;

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.17",
+  "version": "10.0.18-ng12.42+14cf13d",
   "author": "Telerik",
   "license": "Apache-2.0",
   "scripts": {
@@ -15,29 +15,31 @@
     "API Generation"
   ],
   "peerDependencies": {
-    "typescript": "^3.4.5"
+    "typescript": "^4.3.4"
   },
   "dependencies": {
-    "@progress/kendo-common-tasks": "^7.9.1",
-    "core-js": "^2.2.2",
+    "@progress/kendo-common-tasks": "ng12",
+    "@typescript-eslint/eslint-plugin": "4.28.2",
+    "@typescript-eslint/parser": "4.28.2",
+    "core-js": "^3.18.0",
     "del": "2.2.2",
+    "eslint": "7.32.0",
+    "eslint-plugin-import": "2.25.2",
+    "eslint-plugin-rxjs": "3.3.7",
+    "glob": "^7.2.0",
     "gulp": "^4.0.0",
     "gulp-add-src": "^1.0.0",
-    "gulp-tslint": "^8.0.0",
-    "gulp-typedoc": "~2.2.2",
     "handlebars": "^4.0.5",
     "highlight.js": "9.14.2",
     "lodash": "^4.6.0",
     "mkdirp": "^0.5.0",
     "source-map-loader": "^0.1.5",
     "ts-loader": "4.1.0",
-    "tslint": "^5.0.0",
-    "tslint-defocus": "^2.0.6",
-    "typedoc": "0.15.0"
+    "typedoc": "~0.22.5"
   },
   "devDependencies": {
     "gulp-jasmine": "^2.4.2",
-    "typescript": "~3.4.5"
+    "typescript": "~4.3.4"
   },
   "repository": {
     "type": "git",
@@ -46,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d312b6e9168c3b21c723d72374782822c0e33f2d"
+  "gitHead": "14cf13dc84645a4c8f02c02d33de2db9f654e056"
 }

package/src/api/component-page.js

@@ -22,7 +22,7 @@ const findDecorator = (decorators) => ((decorators || []).find(d =>
 const decoratorProp = (prop) => (decorators) => {
     const compDecorator = findDecorator(decorators);
 
-if (compDecorator) {
+    if (compDecorator) {
         const regExp = new RegExp(`${prop}:\\s?['"](.+?)['"]`);
         const match = compDecorator.arguments.obj.match(regExp);
 

package/src/api/generator.js

@@ -110,6 +110,11 @@ const normalizeMembers = (members) => {
                 }
             }
         }
+
+        if (!element.comment && element.kindString === 'Accessor') {
+            const accessor = element.getSignature || element.setSignature || [];
+            element.comment = accessor[0].comment;
+        }
     });
 }
 
@@ -148,7 +153,7 @@ const extractMembers = (packageName, modules, config) => {
 
     const models = nonEmptyModules.map(module => module
         .children
-        .filter(child => child.flags.isExported)
+        .filter(child => child.kindString !== "Reference")
         .filter(child => child.name !== 'core')
         .map(child => {
             const fullName = moduleFullName(module.name, packageName, rootModules);
@@ -195,7 +200,6 @@ const namespacesAsModules = data => {
     const modules = [];
     data.filter(moduleFilter).forEach(module => module
         .children
-        .filter(child => child.flags.isExported)
         .filter(child => child.name !== 'core')
         .forEach(child => {
             if (child.kindString === 'Module' && child.children) {

package/src/api/map-constructors.js

@@ -9,8 +9,13 @@ const utils = require('./utils');
 const isConstructor = (prop) =>
     prop.kindString && prop.kindString === 'Constructor' && isPublic(prop);
 
-const mapConstructors = (member) =>
-    utils.flatten(member.children.filter(isConstructor).map(ctr => {
+const mapConstructors = (member) => {
+    if (member.decorators && member.decorators.find(d => d.name === 'NgModule')) {
+        // Ignore NgModule constructors
+        return [];
+    }
+
+    return utils.flatten(member.children.filter(isConstructor).map(ctr => {
         const name = ctr.name;
         const source = `${member.name}.constructor`;
 
@@ -21,6 +26,7 @@ const mapConstructors = (member) =>
             params: types.params(signature, source)
         }));
     }));
+};
 
 module.exports = mapConstructors;
 

package/src/api/type-utils.js

@@ -5,7 +5,7 @@ const comment = require('./comment');
 const unionTypes = (member) =>
     member.type.types.map(type => {
         switch (type.type) {
-        case 'stringLiteral':
+        case 'literal':
             return `"${type.value}"`;
         default:
             return typeString({ type });

package/src/linter.js

@@ -0,0 +1,18 @@
+const { ESLint } = require('eslint');
+
+const linter = (files, options = {}) => async function lint(done) {
+    const eslint = new ESLint(options);
+    const results = await eslint.lintFiles(files);
+    const formatter = await eslint.loadFormatter('stylish');
+    const errors = ESLint.getErrorResults(results)
+    const resultText = formatter.format(results);
+    console.log(resultText);
+
+    if (errors.length > 0) {
+        done(new Error('Lint failed.'));
+    } else {
+        done();
+    }
+}
+
+module.exports = linter;