Support Typescript 4.1, dependency upgrade.

This commit is contained in:
Daniel Scalzi
2020-11-28 15:23:42 -05:00
parent 0d46a529fc
commit 9ead2ca219
4 changed files with 75 additions and 75 deletions

122
package-lock.json generated
View File

@@ -139,9 +139,9 @@
} }
}, },
"@types/fs-extra": { "@types/fs-extra": {
"version": "9.0.2", "version": "9.0.4",
"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.2.tgz", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.4.tgz",
"integrity": "sha512-jp0RI6xfZpi5JL8v7WQwpBEQTq63RqW2kxwTZt+m27LcJqQdPVU1yGnT1ZI4EtCDynQQJtIGyQahkiCGCS7e+A==", "integrity": "sha512-50GO5ez44lxK5MDH90DYHFFfqxH7+fTqEEnvguQRzJ/tY9qFrMSHLiYHite+F3SNmf7+LHC1eMXojuD+E3Qcyg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
@@ -178,9 +178,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "14.14.6", "version": "14.14.10",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
"integrity": "sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==" "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="
}, },
"@types/responselike": { "@types/responselike": {
"version": "1.0.0", "version": "1.0.0",
@@ -197,9 +197,9 @@
"dev": true "dev": true
}, },
"@types/yargs": { "@types/yargs": {
"version": "15.0.9", "version": "15.0.10",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz",
"integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==", "integrity": "sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/yargs-parser": "*" "@types/yargs-parser": "*"
@@ -212,13 +212,13 @@
"dev": true "dev": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.2.tgz",
"integrity": "sha512-1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg==", "integrity": "sha512-gQ06QLV5l1DtvYtqOyFLXD9PdcILYqlrJj2l+CGDlPtmgLUzc1GpqciJFIRvyfvgLALpnxYINFuw+n9AZhPBKQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/experimental-utils": "4.6.0", "@typescript-eslint/experimental-utils": "4.8.2",
"@typescript-eslint/scope-manager": "4.6.0", "@typescript-eslint/scope-manager": "4.8.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"regexpp": "^3.0.0", "regexpp": "^3.0.0",
@@ -227,55 +227,55 @@
} }
}, },
"@typescript-eslint/experimental-utils": { "@typescript-eslint/experimental-utils": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz",
"integrity": "sha512-pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw==", "integrity": "sha512-hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/json-schema": "^7.0.3", "@types/json-schema": "^7.0.3",
"@typescript-eslint/scope-manager": "4.6.0", "@typescript-eslint/scope-manager": "4.8.2",
"@typescript-eslint/types": "4.6.0", "@typescript-eslint/types": "4.8.2",
"@typescript-eslint/typescript-estree": "4.6.0", "@typescript-eslint/typescript-estree": "4.8.2",
"eslint-scope": "^5.0.0", "eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0" "eslint-utils": "^2.0.0"
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.8.2.tgz",
"integrity": "sha512-Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q==", "integrity": "sha512-u0leyJqmclYr3KcXOqd2fmx6SDGBO0MUNHHAjr0JS4Crbb3C3d8dwAdlazy133PLCcPn+aOUFiHn72wcuc5wYw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "4.6.0", "@typescript-eslint/scope-manager": "4.8.2",
"@typescript-eslint/types": "4.6.0", "@typescript-eslint/types": "4.8.2",
"@typescript-eslint/typescript-estree": "4.6.0", "@typescript-eslint/typescript-estree": "4.8.2",
"debug": "^4.1.1" "debug": "^4.1.1"
} }
}, },
"@typescript-eslint/scope-manager": { "@typescript-eslint/scope-manager": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz",
"integrity": "sha512-uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang==", "integrity": "sha512-qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "4.6.0", "@typescript-eslint/types": "4.8.2",
"@typescript-eslint/visitor-keys": "4.6.0" "@typescript-eslint/visitor-keys": "4.8.2"
} }
}, },
"@typescript-eslint/types": { "@typescript-eslint/types": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz",
"integrity": "sha512-5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA==", "integrity": "sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==",
"dev": true "dev": true
}, },
"@typescript-eslint/typescript-estree": { "@typescript-eslint/typescript-estree": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz",
"integrity": "sha512-s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA==", "integrity": "sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "4.6.0", "@typescript-eslint/types": "4.8.2",
"@typescript-eslint/visitor-keys": "4.6.0", "@typescript-eslint/visitor-keys": "4.8.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"globby": "^11.0.1", "globby": "^11.0.1",
"is-glob": "^4.0.1", "is-glob": "^4.0.1",
@@ -285,12 +285,12 @@
} }
}, },
"@typescript-eslint/visitor-keys": { "@typescript-eslint/visitor-keys": {
"version": "4.6.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz",
"integrity": "sha512-38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg==", "integrity": "sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "4.6.0", "@typescript-eslint/types": "4.8.2",
"eslint-visitor-keys": "^2.0.0" "eslint-visitor-keys": "^2.0.0"
} }
}, },
@@ -548,9 +548,9 @@
} }
}, },
"debug": { "debug": {
"version": "4.2.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
@@ -644,9 +644,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "7.12.1", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz",
"integrity": "sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==", "integrity": "sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@@ -1274,9 +1274,9 @@
"dev": true "dev": true
}, },
"node-stream-zip": { "node-stream-zip": {
"version": "1.11.4", "version": "1.12.0",
"resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.4.tgz", "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.12.0.tgz",
"integrity": "sha512-Mnl/AOz64eJlfMpMb7cvk31OWtMbfHzwTLg87C5JhePALzVGn3Fp52dqNdb3e2p+7PvA1chGriHSm90Ikf+HJQ==" "integrity": "sha512-HZ3XehqShTFj9gHauRJ3Bri9eiCTOII7/crtXzURtT14NdnOFs9Ia5E82W7z3izVBNx760tqwddxrBJVG52Y1Q=="
}, },
"normalize-url": { "normalize-url": {
"version": "4.5.0", "version": "4.5.0",
@@ -1651,16 +1651,15 @@
"integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
}, },
"ts-json-schema-generator": { "ts-json-schema-generator": {
"version": "0.77.0", "version": "0.79.0",
"resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-0.77.0.tgz", "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-0.79.0.tgz",
"integrity": "sha512-cM+9NfO/jFVEQNLog1XAYmBk9k5fRwTqP7rp1c2IMBREuOjIpiSkgv3/QjoH89UXhh8Ik6Wc8FT0mg7wssazcw==", "integrity": "sha512-lODFOSy7lyY0xvFarxLfZZ+w45GZ8TG0OMjTCslGn+EKK69+WhNvl0ZEe5+5nT/gWe9Uo7Xfj9QmDmH4nh0U7Q==",
"requires": { "requires": {
"@types/json-schema": "^7.0.6", "@types/json-schema": "^7.0.6",
"commander": "^6.1.0", "commander": "^6.2.0",
"fast-json-stable-stringify": "^2.1.0", "fast-json-stable-stringify": "^2.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"json-stable-stringify": "^1.0.1", "json-stable-stringify": "^1.0.1"
"typescript": "~4.0.3"
} }
}, },
"tslib": { "tslib": {
@@ -1694,9 +1693,10 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "4.0.5", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz",
"integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==" "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==",
"dev": true
}, },
"universalify": { "universalify": {
"version": "1.0.0", "version": "1.0.0",

View File

@@ -26,17 +26,17 @@
}, },
"homepage": "https://github.com/dscalzi/Nebula#readme", "homepage": "https://github.com/dscalzi/Nebula#readme",
"devDependencies": { "devDependencies": {
"@types/fs-extra": "^9.0.2", "@types/fs-extra": "^9.0.4",
"@types/luxon": "^1.25.0", "@types/luxon": "^1.25.0",
"@types/minimatch": "^3.0.3", "@types/minimatch": "^3.0.3",
"@types/node": "^14.14.6", "@types/node": "^14.14.10",
"@types/triple-beam": "^1.3.2", "@types/triple-beam": "^1.3.2",
"@types/yargs": "^15.0.9", "@types/yargs": "^15.0.10",
"@typescript-eslint/eslint-plugin": "^4.6.0", "@typescript-eslint/eslint-plugin": "^4.8.2",
"@typescript-eslint/parser": "^4.6.0", "@typescript-eslint/parser": "^4.8.2",
"eslint": "^7.12.1", "eslint": "^7.14.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"typescript": "^4.0.5" "typescript": "^4.1.2"
}, },
"dependencies": { "dependencies": {
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
@@ -45,10 +45,10 @@
"helios-distribution-types": "^1.0.0-rc.1", "helios-distribution-types": "^1.0.0-rc.1",
"luxon": "^1.25.0", "luxon": "^1.25.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"node-stream-zip": "^1.11.4", "node-stream-zip": "^1.12.0",
"toml": "^3.0.0", "toml": "^3.0.0",
"triple-beam": "^1.3.0", "triple-beam": "^1.3.0",
"ts-json-schema-generator": "^0.77.0", "ts-json-schema-generator": "^0.79.0",
"winston": "^3.3.3", "winston": "^3.3.3",
"yargs": "^16.1.0" "yargs": "^16.1.0"
} }

View File

@@ -14,6 +14,6 @@ export abstract class BaseModelStructure<T> extends BaseFileStructure implements
super(absoluteRoot, relativeRoot, structRoot) super(absoluteRoot, relativeRoot, structRoot)
} }
public abstract async getSpecModel(): Promise<T[]> public abstract getSpecModel(): Promise<T[]>
} }

View File

@@ -86,10 +86,10 @@ export abstract class ModuleStructure extends BaseModelStructure<Module> {
return null return null
} }
protected async abstract getModuleId(name: string, path: string): Promise<string> protected abstract getModuleId(name: string, path: string): Promise<string>
protected async abstract getModuleName(name: string, path: string): Promise<string> protected abstract getModuleName(name: string, path: string): Promise<string>
protected async abstract getModuleUrl(name: string, path: string, stats: Stats): Promise<string> protected abstract getModuleUrl(name: string, path: string, stats: Stats): Promise<string>
protected async abstract getModulePath(name: string, path: string, stats: Stats): Promise<string | null> protected abstract getModulePath(name: string, path: string, stats: Stats): Promise<string | null>
protected async parseModule(file: string, filePath: string, stats: Stats): Promise<Module> { protected async parseModule(file: string, filePath: string, stats: Stats): Promise<Module> {