1.0.19

.gitlab-ci.yml

@@ -109,10 +109,10 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

assets/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "es2017",
+    "module": "commonjs",
+    "esModuleInterop": true
+  }
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsdoc",
-  "version": "1.0.13",
+  "version": "1.0.19",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -61,19 +61,19 @@
       }
     },
     "@gitzone/tstest": {
-      "version": "1.0.20",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.20.tgz",
-      "integrity": "sha512-nEHRDpmPOns47/LIJQ+y+CJDzjiS17UKJpl7PYok4EgNJJGqJUN5ilz2KVLPDcRd/7JiB7JYKujlf2UgFKadgQ==",
+      "version": "1.0.24",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.24.tgz",
+      "integrity": "sha512-HFHLxhXFhhY7nn7H7dxfjy/6WiUGCw35L5Do/ZajCAn/xAWiqnppW1aIp0LOOaWeZ7J5fH7xP88TjsGpwR+MRA==",
       "dev": true,
       "requires": {
-        "@gitzone/tsrun": "^1.2.5",
+        "@gitzone/tsrun": "^1.2.6",
         "@pushrocks/consolecolor": "^2.0.1",
         "@pushrocks/smartfile": "^7.0.2",
         "@pushrocks/smartlog": "^2.0.19",
         "@pushrocks/smartpromise": "^3.0.2",
-        "@pushrocks/smartshell": "^2.0.13",
-        "@types/figures": "^2.0.0",
-        "figures": "^2.0.0"
+        "@pushrocks/smartshell": "^2.0.22",
+        "@types/figures": "^3.0.1",
+        "figures": "^3.0.0"
       }
     },
     "@pushrocks/consolecolor": {
@@ -166,11 +166,13 @@
       }
     },
     "@pushrocks/smartexit": {
-      "version": "1.0.7",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.7.tgz",
-      "integrity": "sha512-G/gBbYWRAZs/O7YPUKTeEpCFvvfH7fayYvP3jqeHbZFFwILmaweLXDw/ns6R3bkI5w+lnlCoj26aXCtUWfqMtA==",
+      "version": "1.0.15",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexit/-/smartexit-1.0.15.tgz",
+      "integrity": "sha512-pvJBmF13spcDN+O8rSpYlKBOObyfW+omZKQr3hhSMT1VHMEYV8e/njsA19Cg4C2DfLPv+cRFFgPn27zJpleRsQ==",
       "requires": {
-        "@pushrocks/lik": "^3.0.5"
+        "@pushrocks/lik": "^3.0.5",
+        "@pushrocks/smartdelay": "^2.0.3",
+        "@pushrocks/smartlog-source-ora": "^1.0.7"
       }
     },
     "@pushrocks/smartfile": {
@@ -220,6 +222,15 @@
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog-interfaces/-/smartlog-interfaces-2.0.5.tgz",
       "integrity": "sha512-eLNlRpDwy3E+6v/B6fo/NiAo+UxBO3SxKgIIsgUGbWfVpsyUi0PG2xfVCdhJlhL1AsRRvKglfHSOB8qKE+XCLw=="
     },
+    "@pushrocks/smartlog-source-ora": {
+      "version": "1.0.7",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog-source-ora/-/smartlog-source-ora-1.0.7.tgz",
+      "integrity": "sha512-lgpZ2rBLt9UGIdMb43cB9rxwtbu4RaNmdQnAYfNGxizGPuNtXw3WAzdHyS5tEJFZAbvMOiwNguQ6Bk1i2gaedw==",
+      "requires": {
+        "@pushrocks/smartlog-interfaces": "^2.0.5",
+        "ora": "^3.4.0"
+      }
+    },
     "@pushrocks/smartparam": {
       "version": "1.0.4",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartparam/-/smartparam-1.0.4.tgz",
@@ -276,11 +287,12 @@
       }
     },
     "@pushrocks/smartshell": {
-      "version": "2.0.15",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.15.tgz",
-      "integrity": "sha512-yLkNRYiQTyTamQl3N8bXAiFkew1VK1IJusVfy+OLp456amY8byAg6JI89HHzsSJkK7QnK0+4hcK4fUbkijevsA==",
+      "version": "2.0.22",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.22.tgz",
+      "integrity": "sha512-ChlRBOAhvSmxA6xfNoc1BHISV78IjvKwBP3w70r80rpQ09Bw/9ajlmGLmCDqe9aDqlaHe9HNTEPp68gNg69NBA==",
       "requires": {
-        "@pushrocks/smartexit": "^1.0.7",
+        "@pushrocks/smartdelay": "^2.0.3",
+        "@pushrocks/smartexit": "^1.0.15",
         "@pushrocks/smartpromise": "^3.0.2",
         "@types/which": "^1.3.1",
         "which": "^1.3.1"
@@ -350,10 +362,13 @@
       "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
     },
     "@types/figures": {
-      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2ffigures/-/figures-2.0.0.tgz",
-      "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2ffigures/-/figures-3.0.1.tgz",
+      "integrity": "sha512-2OXodKWdNhYl+S+wCvlafqJbfMIVDfQZYX2wRyUOcRiEQpeJ9zU6cT7d+RbMpjS+/vmQ2cAUUL8gyGy1YxtLPw==",
+      "dev": true,
+      "requires": {
+        "figures": "*"
+      }
     },
     "@types/form-data": {
       "version": "2.2.1",
@@ -768,9 +783,9 @@
       }
     },
     "figures": {
-      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "version": "3.0.0",
+      "resolved": "https://verdaccio.lossless.one/figures/-/figures-3.0.0.tgz",
+      "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
@@ -1514,16 +1529,24 @@
       "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
     },
     "ts-node": {
-      "version": "8.1.0",
-      "resolved": "https://verdaccio.lossless.one/ts-node/-/ts-node-8.1.0.tgz",
-      "integrity": "sha512-34jpuOrxDuf+O6iW1JpgTRDFynUZ1iEqtYruBqh35gICNjN8x+LpVcPAcwzLPi9VU6mdA3ym+x233nZmZp445A==",
+      "version": "8.2.0",
+      "resolved": "https://verdaccio.lossless.one/ts-node/-/ts-node-8.2.0.tgz",
+      "integrity": "sha512-m8XQwUurkbYqXrKqr3WHCW310utRNvV5OnRVeISeea7LoCWVcdfeB/Ntl8JYWFh+WRoUAdBgESrzKochQt7sMw==",
       "dev": true,
       "requires": {
         "arg": "^4.1.0",
-        "diff": "^3.1.0",
+        "diff": "^4.0.1",
         "make-error": "^1.1.1",
         "source-map-support": "^0.5.6",
         "yn": "^3.0.0"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "4.0.1",
+          "resolved": "https://verdaccio.lossless.one/diff/-/diff-4.0.1.tgz",
+          "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+          "dev": true
+        }
       }
     },
     "tslib": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsdoc",
-  "version": "1.0.13",
+  "version": "1.0.19",
   "private": false,
   "description": "a tool for better documentation",
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.24",
     "@pushrocks/tapbundle": "^3.0.7",
     "@types/node": "^12.0.2",
     "tslint": "^5.11.0",
@@ -30,8 +30,18 @@
     "@pushrocks/smartfile": "^7.0.2",
     "@pushrocks/smartlog": "^2.0.19",
     "@pushrocks/smartlog-destination-local": "^7.0.5",
-    "@pushrocks/smartshell": "^2.0.15",
+    "@pushrocks/smartshell": "^2.0.22",
     "typedoc": "^0.14.2",
     "typescript": "^3.4.5"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

ts/tsdoc.classes.typedoc.ts

@@ -23,7 +23,7 @@ export class TypeDoc {
 
   public async compile() {
     await this.smartshellInstance.exec(
-      `typedoc --module "commonjs" --target "ES2016" --out public/ ts/`
+      `typedoc --tsconfig ${paths.tsconfigFile} --out public/ ts/`
     );
   }
 }

ts/tsdoc.cli.ts

@@ -32,5 +32,12 @@ export const run = async () => {
     }
   });
 
+  tsdocCli.addCommand('test').subscribe(argvArg => {
+    tsdocCli.trigger('typedoc');
+    process.on('exit', async () => {
+      await plugins.smartfile.fs.remove(paths.publicDir);
+    });
+  });
+
   tsdocCli.startParse();
 };

ts/tsdoc.paths.ts

@@ -1,5 +1,11 @@
 import * as plugins from './tsdoc.plugins';
 
+// dirs
 export const packageDir = plugins.path.join(__dirname, '../');
 export const cwd = process.cwd();
 export const binDir = plugins.path.join(packageDir, './node_modules/.bin');
+export const assetsDir = plugins.path.join(packageDir, './assets');
+export const publicDir = plugins.path.join(packageDir, './public');
+
+// files
+export const tsconfigFile = plugins.path.join(assetsDir, './tsconfig.json');