diff --git a/package-lock.json b/package-lock.json index 345d0d9..4f23b2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1337,6 +1337,33 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, + "@open-wc/dedupe-mixin": { + "version": "1.3.0", + "resolved": "https://verdaccio.lossless.one/@open-wc%2fdedupe-mixin/-/dedupe-mixin-1.3.0.tgz", + "integrity": "sha512-UfdK1MPnR6T7f3svzzYBfu3qBkkZ/KsPhcpc3JYhsUY4hbpwNF9wEQtD4Z+/mRqMTJrKg++YSxIxE0FBhY3RIw==", + "dev": true + }, + "@open-wc/scoped-elements": { + "version": "1.3.3", + "resolved": "https://verdaccio.lossless.one/@open-wc%2fscoped-elements/-/scoped-elements-1.3.3.tgz", + "integrity": "sha512-vFIQVYYjFw67odUE4JzZOpctnF7S/2DX+S+clrL3bQPql7HvEnV0wMFwOWUavQTuCJi0rfU8GTcNMiUybio+Yg==", + "dev": true, + "requires": { + "@open-wc/dedupe-mixin": "^1.3.0", + "lit-html": "^1.0.0" + } + }, + "@open-wc/testing-helpers": { + "version": "1.8.12", + "resolved": "https://verdaccio.lossless.one/@open-wc%2ftesting-helpers/-/testing-helpers-1.8.12.tgz", + "integrity": "sha512-+4exEHYvnFqI1RGDDIKFHPZ7Ws5NK1epvEku3zLaOYN3zc+huX19SndNc5+X++v8A+quN/iXbHlh80ROyNaYDA==", + "dev": true, + "requires": { + "@open-wc/scoped-elements": "^1.2.4", + "lit-element": "^2.2.1", + "lit-html": "^1.0.0" + } + }, "@parcel/fs": { "version": "1.11.0", "resolved": "https://verdaccio.lossless.one/@parcel%2ffs/-/fs-1.11.0.tgz", @@ -2046,11 +2073,12 @@ } }, "@pushrocks/tapbundle": { - "version": "3.2.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.10.tgz", - "integrity": "sha512-EPFSiFMx6uxWcZgANT1yDigTknVl1FCRIaiuf2AEkpg4vR5ZIZQKDIWkrFZY0ajUWJ6vCM631TmIcJvUnyWJXw==", + "version": "3.2.14", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.14.tgz", + "integrity": "sha512-Hu7SHFww6i17mZ3F8orvzXV7B8nPBRY6PB2Lw2sRfq9+ZbrvUvz7qmbc7d7mXkTGcLx7/7wbH3NHo1V5mplMCQ==", "dev": true, "requires": { + "@open-wc/testing-helpers": "^1.8.12", "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartenv": "^4.0.16", "@pushrocks/smartpromise": "^3.1.3", @@ -2190,9 +2218,9 @@ "integrity": "sha512-nFKOrY93Tvv5Tobws+YbkGlPOJsn1nVpZah3BlSyQ4EniFm97KLvSr54tZ5xQp8mlf/XxbYwskNCYQB9EdrPlQ==" }, "@types/chai": { - "version": "4.2.14", - "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.14.tgz", - "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==", + "version": "4.2.15", + "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.15.tgz", + "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==", "dev": true }, "@types/chai-as-promised": { @@ -2355,9 +2383,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.14.22", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.14.22.tgz", - "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==" + "version": "14.14.31", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.14.31.tgz", + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==" }, "@types/parcel-bundler": { "version": "1.12.3", @@ -3394,16 +3422,16 @@ "dev": true }, "chai": { - "version": "4.2.0", - "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "version": "4.3.3", + "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.3.3.tgz", + "integrity": "sha512-MPSLOZwxxnA0DhLE84klnGPojWFK5KuhP7/j5dTsxpr2S3XlkqJP5WbyYl1gCTWvG2Z5N+HD4F472WsbEZL6Pw==", "dev": true, "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", "deep-eql": "^3.0.1", "get-func-name": "^2.0.0", - "pathval": "^1.1.0", + "pathval": "^1.1.1", "type-detect": "^4.0.5" } }, @@ -6110,9 +6138,9 @@ } }, "handlebars": { - "version": "4.7.6", - "resolved": "https://verdaccio.lossless.one/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "version": "4.7.7", + "resolved": "https://verdaccio.lossless.one/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", "requires": { "minimist": "^1.2.5", "neo-async": "^2.6.0", @@ -7017,6 +7045,7 @@ "version": "2.1.3", "resolved": "https://verdaccio.lossless.one/json5/-/json5-2.1.3.tgz", "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, "requires": { "minimist": "^1.2.5" } @@ -7067,6 +7096,21 @@ "type-check": "~0.3.2" } }, + "lit-element": { + "version": "2.4.0", + "resolved": "https://verdaccio.lossless.one/lit-element/-/lit-element-2.4.0.tgz", + "integrity": "sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==", + "dev": true, + "requires": { + "lit-html": "^1.1.1" + } + }, + "lit-html": { + "version": "1.3.0", + "resolved": "https://verdaccio.lossless.one/lit-html/-/lit-html-1.3.0.tgz", + "integrity": "sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==", + "dev": true + }, "locate-path": { "version": "5.0.0", "resolved": "https://verdaccio.lossless.one/locate-path/-/locate-path-5.0.0.tgz", @@ -7078,7 +7122,8 @@ "lodash": { "version": "4.17.20", "resolved": "https://verdaccio.lossless.one/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true }, "lodash._baseassign": { "version": "3.2.0", @@ -7318,9 +7363,9 @@ } }, "marked": { - "version": "1.2.8", - "resolved": "https://verdaccio.lossless.one/marked/-/marked-1.2.8.tgz", - "integrity": "sha512-lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ==" + "version": "2.0.1", + "resolved": "https://verdaccio.lossless.one/marked/-/marked-2.0.1.tgz", + "integrity": "sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==" }, "matcher": { "version": "3.0.0", @@ -10071,30 +10116,11 @@ } }, "shiki": { - "version": "0.2.7", - "resolved": "https://verdaccio.lossless.one/shiki/-/shiki-0.2.7.tgz", - "integrity": "sha512-bwVc7cdtYYHEO9O+XJ8aNOskKRfaQd5Y4ovLRfbQkmiLSUaR+bdlssbZUUhbQ0JAFMYcTcJ5tjG5KtnufttDHQ==", + "version": "0.9.2", + "resolved": "https://verdaccio.lossless.one/shiki/-/shiki-0.9.2.tgz", + "integrity": "sha512-BjUCxVbxMnvjs8jC4b+BQ808vwjJ9Q8NtLqPwXShZ307HdXiDFYP968ORSVfaTNNSWYDBYdMnVKJ0fYNsoZUBA==", "requires": { "onigasm": "^2.2.5", - "shiki-languages": "^0.2.7", - "shiki-themes": "^0.2.7", - "vscode-textmate": "^5.2.0" - } - }, - "shiki-languages": { - "version": "0.2.7", - "resolved": "https://verdaccio.lossless.one/shiki-languages/-/shiki-languages-0.2.7.tgz", - "integrity": "sha512-REmakh7pn2jCn9GDMRSK36oDgqhh+rSvJPo77sdWTOmk44C5b0XlYPwJZcFOMJWUZJE0c7FCbKclw4FLwUKLRw==", - "requires": { - "vscode-textmate": "^5.2.0" - } - }, - "shiki-themes": { - "version": "0.2.7", - "resolved": "https://verdaccio.lossless.one/shiki-themes/-/shiki-themes-0.2.7.tgz", - "integrity": "sha512-ZMmboDYw5+SEpugM8KGUq3tkZ0vXg+k60XX6NngDK7gc1Sv6YLUlanpvG3evm57uKJvfXsky/S5MzSOTtYKLjA==", - "requires": { - "json5": "^2.1.0", "vscode-textmate": "^5.2.0" } }, @@ -11154,32 +11180,39 @@ "dev": true }, "typedoc": { - "version": "0.20.19", - "resolved": "https://verdaccio.lossless.one/typedoc/-/typedoc-0.20.19.tgz", - "integrity": "sha512-9FjQ1xQGtxpXm8R5QKvU8wFBaaYe8RW3NzrhGWB8RigbOALwG+4ywJ/EyArPGWXvmXYB7I8h2YHzeyFvZ2s0ow==", + "version": "0.20.30", + "resolved": "https://verdaccio.lossless.one/typedoc/-/typedoc-0.20.30.tgz", + "integrity": "sha512-A4L6JDShPFwZDt9qp7FBsEpW7C6rA5fRv6ywgBuxGxZnT2wuF5afbWzmrwqHR3Xw38V1H2L4v/VJ0S/llBwV6Q==", "requires": { "colors": "^1.4.0", - "fs-extra": "^9.0.1", - "handlebars": "^4.7.6", - "lodash": "^4.17.20", + "fs-extra": "^9.1.0", + "handlebars": "^4.7.7", + "lodash": "^4.17.21", "lunr": "^2.3.9", - "marked": "^1.2.5", + "marked": "^2.0.1", "minimatch": "^3.0.0", "progress": "^2.0.3", "shelljs": "^0.8.4", - "shiki": "^0.2.7", - "typedoc-default-themes": "^0.12.5" + "shiki": "^0.9.2", + "typedoc-default-themes": "^0.12.8" + }, + "dependencies": { + "lodash": { + "version": "4.17.21", + "resolved": "https://verdaccio.lossless.one/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + } } }, "typedoc-default-themes": { - "version": "0.12.5", - "resolved": "https://verdaccio.lossless.one/typedoc-default-themes/-/typedoc-default-themes-0.12.5.tgz", - "integrity": "sha512-JQ2O9laZ/EhfWUWYp/8EyuShYhtXLhIa6DU8eZNUfaurMhEgKdffbadKNv6HMmTfOxAcgiePg06OCxNX8EyP3g==" + "version": "0.12.8", + "resolved": "https://verdaccio.lossless.one/typedoc-default-themes/-/typedoc-default-themes-0.12.8.tgz", + "integrity": "sha512-tyjyDTKy/JLnBSwvhoqd99VIjrP33SdOtwcMD32b+OqnrjZWe8HmZECbfBoacqoxjHd58gfeNw6wA7uvqWFa4w==" }, "typescript": { - "version": "4.1.3", - "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-4.1.3.tgz", - "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==" + "version": "4.2.3", + "resolved": "https://verdaccio.lossless.one/typescript/-/typescript-4.2.3.tgz", + "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==" }, "uglify-js": { "version": "3.12.5", diff --git a/package.json b/package.json index 8d6d7ab..e2f1d02 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "devDependencies": { "@gitzone/tsbuild": "^2.1.25", "@gitzone/tstest": "^1.0.52", - "@pushrocks/tapbundle": "^3.2.10", - "@types/node": "^14.14.22", + "@pushrocks/tapbundle": "^3.2.14", + "@types/node": "^14.14.31", "tslint": "^6.1.3", "tslint-config-prettier": "^1.15.0" }, @@ -31,8 +31,8 @@ "@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartlog-destination-local": "^8.0.8", "@pushrocks/smartshell": "^2.0.26", - "typedoc": "^0.20.19", - "typescript": "^4.1.3" + "typedoc": "^0.20.30", + "typescript": "^4.2.3" }, "files": [ "ts/**/*", @@ -49,4 +49,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index cb284f4..8cc580a 100644 --- a/readme.md +++ b/readme.md @@ -25,6 +25,7 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W ## Usage +Use TypeScript for best in class intellisense. ## Contribution diff --git a/ts/tsdoc.classes.typedoc.ts b/ts/tsdoc.classes.typedoc.ts index d21e395..c227ba7 100644 --- a/ts/tsdoc.classes.typedoc.ts +++ b/ts/tsdoc.classes.typedoc.ts @@ -21,9 +21,7 @@ export class TypeDoc { this.typedocDirectory = dirPathArg; } - public async compile(options?: { - publicSubdir?: string; - }) { + public async compile(options?: { publicSubdir?: string }) { const data = { compilerOptions: { target: 'es2017', @@ -33,7 +31,10 @@ export class TypeDoc { }, include: [], }; - data.include = [plugins.path.join(paths.cwd, './ts/**/*')]; + data.include = [ + plugins.path.join(paths.cwd, './ts/**/*'), + plugins.path.join(paths.cwd, './ts_web/**/*'), + ]; await plugins.smartfile.memory.toFs(JSON.stringify(data), paths.tsconfigFile); let targetDir = paths.publicDir; if (options?.publicSubdir) { diff --git a/ts/tsdoc.cli.ts b/ts/tsdoc.cli.ts index 20873c3..ac03a9e 100644 --- a/ts/tsdoc.cli.ts +++ b/ts/tsdoc.cli.ts @@ -22,7 +22,7 @@ export const run = async () => { tsdocCli.addCommand('typedoc').subscribe(async (argvArg) => { const typeDocInstance = new TypeDoc(paths.cwd); await typeDocInstance.compile({ - publicSubdir: argvArg.publicSubdir + publicSubdir: argvArg.publicSubdir, }); });