Merge pull request #5328 from hexojs/v7.0.0

merge v7.0.0 branch

.eslintrc.json

@@ -1,4 +1,13 @@
-{
-  "extends": "hexo",
-  "root": true
-}
+{
+  "root": true,
+  "extends": "hexo/ts.js",
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2020
+  },
+  "rules": {
+    "@typescript-eslint/no-explicit-any": 0,
+    "@typescript-eslint/no-var-requires": 0,
+    "node/no-missing-require": 0
+  }
+}

.gitignore

@@ -5,7 +5,9 @@ tmp/
 .idea/
 yarn.lock
 package-lock.json
+pnpm-lock.yaml
 .nyc_output/
 coverage/
 .tmp*
 .vscode
+dist/

.lintstagedrc.json

@@ -0,0 +1,4 @@
+{
+  "*.js": "eslint --fix",
+  "*.ts": "eslint --fix"
+}

lib/box/file.js → lib/box/file.ts

@@ -1,8 +1,15 @@
-'use strict';
-
-const { readFile, readFileSync, stat, statSync } = require('hexo-fs');
+import { readFile, readFileSync, stat, statSync } from 'hexo-fs';
 
 class File {
+  public source: any;
+  public path: any;
+  public params: any;
+  public type: any;
+  static TYPE_CREATE: 'create';
+  static TYPE_UPDATE: 'update';
+  static TYPE_SKIP: 'skip';
+  static TYPE_DELETE: 'delete';
+
   constructor({ source, path, params, type }) {
     this.source = source;
     this.path = path;
@@ -32,4 +39,4 @@ File.TYPE_UPDATE = 'update';
 File.TYPE_SKIP = 'skip';
 File.TYPE_DELETE = 'delete';
 
-module.exports = File;
+export = File;

lib/box/index.js → lib/box/index.ts

@@ -1,18 +1,35 @@
-'use strict';
-
-const { join, sep } = require('path');
-const Promise = require('bluebird');
-const File = require('./file');
-const { Pattern, createSha1Hash } = require('hexo-util');
-const { createReadStream, readdir, stat, watch } = require('hexo-fs');
-const { magenta } = require('picocolors');
-const { EventEmitter } = require('events');
-const { isMatch, makeRe } = require('micromatch');
+import { join, sep } from 'path';
+import BlueBirdPromise from 'bluebird';
+import File from './file';
+import { Pattern, createSha1Hash } from 'hexo-util';
+import { createReadStream, readdir, stat, watch } from 'hexo-fs';
+import { magenta } from 'picocolors';
+import { EventEmitter } from 'events';
+import { isMatch, makeRe } from 'micromatch';
 
 const defaultPattern = new Pattern(() => ({}));
 
+interface Processor {
+  pattern: Pattern;
+  process: (file: File) => void;
+}
+
 class Box extends EventEmitter {
-  constructor(ctx, base, options) {
+  public options: any;
+  public context: any;
+  public base: any;
+  public processors: Processor[];
+  public _processingFiles: any;
+  public watcher: any;
+  public Cache: any;
+  // TODO: replace runtime class _File
+  public File: any;
+  public ignore: any;
+  public source: any;
+  public emit: any;
+  public ctx: any;
+
+  constructor(ctx, base, options?: object) {
     super();
 
     this.options = Object.assign({
@@ -40,10 +57,13 @@ class Box extends EventEmitter {
     this.ignore = targets;
     this.options.ignored = targets.map(s => toRegExp(ctx, s)).filter(x => x);
   }
+
   _createFileClass() {
     const ctx = this.context;
 
     class _File extends File {
+      public box: Box;
+
       render(options) {
         return ctx.render.render({
           path: this.source
@@ -100,7 +120,7 @@ class Box extends EventEmitter {
     }));
   }
 
-  process(callback) {
+  process(callback?) {
     const { base, Cache, context: ctx } = this;
 
     return stat(base).then(stats => {
@@ -121,7 +141,7 @@ class Box extends EventEmitter {
 
   _processFile(type, path) {
     if (this._processingFiles[path]) {
-      return Promise.resolve();
+      return BlueBirdPromise.resolve();
     }
 
     this._processingFiles[path] = true;
@@ -133,7 +153,7 @@ class Box extends EventEmitter {
       path
     });
 
-    return Promise.reduce(this.processors, (count, processor) => {
+    return BlueBirdPromise.reduce(this.processors, (count, processor) => {
       const params = processor.pattern.match(path);
       if (!params) return count;
 
@@ -144,7 +164,7 @@ class Box extends EventEmitter {
         type
       });
 
-      return Reflect.apply(Promise.method(processor.process), ctx, [file])
+      return Reflect.apply(BlueBirdPromise.method(processor.process), ctx, [file])
         .thenReturn(count + 1);
     }, 0).then(count => {
       if (count) {
@@ -162,9 +182,9 @@ class Box extends EventEmitter {
     }).thenReturn(path);
   }
 
-  watch(callback) {
+  watch(callback?) {
     if (this.isWatching()) {
-      return Promise.reject(new Error('Watcher has already started.')).asCallback(callback);
+      return BlueBirdPromise.reject(new Error('Watcher has already started.')).asCallback(callback);
     }
 
     const { base } = this;
@@ -218,7 +238,7 @@ function getHash(path) {
   const src = createReadStream(path);
   const hasher = createSha1Hash();
 
-  const finishedPromise = new Promise((resolve, reject) => {
+  const finishedPromise = new BlueBirdPromise((resolve, reject) => {
     src.once('error', reject);
     src.once('end', resolve);
   });
@@ -247,9 +267,9 @@ function isIgnoreMatch(path, ignore) {
 }
 
 function readDirWalker(ctx, base, results, ignore, prefix) {
-  if (isIgnoreMatch(base, ignore)) return Promise.resolve();
+  if (isIgnoreMatch(base, ignore)) return BlueBirdPromise.resolve();
 
-  return Promise.map(readdir(base).catch(err => {
+  return BlueBirdPromise.map(readdir(base).catch(err => {
     ctx.log.error({ err }, 'Failed to read directory: %s', base);
     if (err && err.code === 'ENOENT') return [];
     throw err;
@@ -260,16 +280,16 @@ function readDirWalker(ctx, base, results, ignore, prefix) {
       if (err && err.code === 'ENOENT') return null;
       throw err;
     });
-    const prefixdPath = `${prefix}${path}`;
+    const prefixPath = `${prefix}${path}`;
     if (stats) {
       if (stats.isDirectory()) {
-        return readDirWalker(ctx, fullpath, results, ignore, `${prefixdPath}/`);
+        return readDirWalker(ctx, fullpath, results, ignore, `${prefixPath}/`);
       }
       if (!isIgnoreMatch(fullpath, ignore)) {
-        results.push(prefixdPath);
+        results.push(prefixPath);
       }
     }
   });
 }
 
-module.exports = Box;
+export = Box;

lib/extend/console.js → lib/extend/console.ts

@@ -1,17 +1,41 @@
-'use strict';
+import Promise from 'bluebird';
+import abbrev from 'abbrev';
 
-const Promise = require('bluebird');
-const abbrev = require('abbrev');
+type Option = Partial<{
+  usage: string;
+  desc: string;
+  init: boolean;
+  arguments: {
+      name: string;
+      desc: string;
+    }[];
+  options: {
+    name: string;
+    desc: string;
+  }[];
+}>
 
-/**
- * Console plugin option
- * @typedef {Object} Option
- * @property {String} usage - The usage of a console command
- * @property {{name: String, desc: String}[]} arguments - The description of each argument of a console command
- * @property {{name: String, desc: String}[]} options - The description of each option of a console command
- */
+interface Args {
+  _: string[];
+  [key: string]: string | boolean | string[];
+}
+type AnyFn = (args: Args) => any;
+interface StoreFunction extends AnyFn {
+  desc?: string;
+  options?: Option;
+}
+
+interface Store {
+  [key: string]: StoreFunction
+}
+interface Alias {
+  [key: string]: string
+}
 
 class Console {
+  public store: Store;
+  public alias: Alias;
+
   constructor() {
     this.store = {};
     this.alias = {};
@@ -20,9 +44,9 @@ class Console {
   /**
    * Get a console plugin function by name
    * @param {String} name - The name of the console plugin
-   * @returns {Function} - The console plugin function
+   * @returns {StoreFunction} - The console plugin function
    */
-  get(name) {
+  get(name: string): StoreFunction {
     name = name.toLowerCase();
     return this.store[this.alias[name]];
   }
@@ -36,9 +60,13 @@ class Console {
    * @param {String} name - The name of console plugin to be registered
    * @param {String} desc - More detailed information about a console command
    * @param {Option} options - The description of each option of a console command
-   * @param {Function} fn - The console plugin to be registered
+   * @param {AnyFn} fn - The console plugin to be registered
    */
-  register(name, desc, options, fn) {
+  register(name: string, fn: AnyFn): void
+  register(name: string, desc: string, fn: AnyFn): void
+  register(name: string, options: Option, fn: AnyFn): void
+  register(name: string, desc: string, options: Option, fn: AnyFn): void
+  register(name: string, desc: string | Option | AnyFn, options?: Option | AnyFn, fn?: AnyFn) {
     if (!name) throw new TypeError('name is required');
 
     if (!fn) {
@@ -73,13 +101,13 @@ class Console {
       fn = Promise.method(fn);
     }
 
-    const c = fn;
+    const c = fn as StoreFunction;
     this.store[name.toLowerCase()] = c;
-    c.options = options;
-    c.desc = desc;
+    c.options = options as Option;
+    c.desc = desc as string;
 
     this.alias = abbrev(Object.keys(this.store));
   }
 }
 
-module.exports = Console;
+export = Console;

lib/extend/deployer.js → lib/extend/deployer.ts

@@ -1,8 +1,18 @@
-'use strict';
+import Promise from 'bluebird';
 
-const Promise = require('bluebird');
+interface StoreFunction {
+  (deployArg: {
+    type: string;
+    [key: string]: any
+  }) : any;
+}
+interface Store {
+  [key: string]: StoreFunction
+}
 
 class Deployer {
+  public store: Store;
+
   constructor() {
     this.store = {};
   }
@@ -11,11 +21,11 @@ class Deployer {
     return this.store;
   }
 
-  get(name) {
+  get(name: string) {
     return this.store[name];
   }
 
-  register(name, fn) {
+  register(name: string, fn: StoreFunction) {
     if (!name) throw new TypeError('name is required');
     if (typeof fn !== 'function') throw new TypeError('fn must be a function');
 
@@ -29,4 +39,4 @@ class Deployer {
   }
 }
 
-module.exports = Deployer;
+export = Deployer;