diff --git a/type-script-helper-1.3.10.vsix b/type-script-helper-1.3.10.vsix new file mode 100644 index 0000000..2ba7a9c Binary files /dev/null and b/type-script-helper-1.3.10.vsix differ diff --git a/type-script-helper/README.md b/type-script-helper/README.md index dfa9e48..c22ca61 100644 --- a/type-script-helper/README.md +++ b/type-script-helper/README.md @@ -93,7 +93,7 @@ Quick Fix - Public (Expression Body) Quick Fix - Instance Field to Calisthenics -## 1.3.5, 1.3.6, 1.3.7, 1.3.8 +## 1.3.5, 1.3.6, 1.3.7, 1.3.8, 1.3.9, 1.3.10 ----------------------------------------------------------------------------------------------------------- Code Generator - Quick Pick {promiseLinesHelper.codeGeneratorQuickPick} diff --git a/type-script-helper/package-lock.json b/type-script-helper/package-lock.json index 3b1bae6..1314e33 100644 --- a/type-script-helper/package-lock.json +++ b/type-script-helper/package-lock.json @@ -1,12 +1,12 @@ { "name": "type-script-helper", - "version": "1.3.5", + "version": "1.3.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "type-script-helper", - "version": "1.3.5", + "version": "1.3.10", "devDependencies": { "@types/glob": "^7.1.1", "@types/mocha": "^5.2.7", @@ -244,10 +244,16 @@ } }, "node_modules/chokidar": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", - "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -461,9 +467,9 @@ } }, "node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -806,32 +812,32 @@ } }, "node_modules/mocha": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", - "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz", + "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==", "dev": true, "dependencies": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.5.2", - "debug": "4.3.2", + "chokidar": "3.5.3", + "debug": "4.3.3", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.1.7", + "glob": "7.2.0", "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "3.0.4", "ms": "2.1.3", - "nanoid": "3.1.25", + "nanoid": "3.2.0", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", "which": "2.0.2", - "workerpool": "6.1.5", + "workerpool": "6.2.0", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" @@ -855,9 +861,9 @@ "dev": true }, "node_modules/mocha/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -914,9 +920,9 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -1281,9 +1287,9 @@ } }, "node_modules/workerpool": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", - "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", + "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", "dev": true }, "node_modules/wrap-ansi": { @@ -1595,9 +1601,9 @@ } }, "chokidar": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", - "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -1759,9 +1765,9 @@ "dev": true }, "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2017,32 +2023,32 @@ } }, "mocha": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", - "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz", + "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.5.2", - "debug": "4.3.2", + "chokidar": "3.5.3", + "debug": "4.3.3", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.1.7", + "glob": "7.2.0", "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "3.0.4", "ms": "2.1.3", - "nanoid": "3.1.25", + "nanoid": "3.2.0", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", "which": "2.0.2", - "workerpool": "6.1.5", + "workerpool": "6.2.0", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" @@ -2055,9 +2061,9 @@ "dev": true }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -2101,9 +2107,9 @@ "dev": true }, "nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "dev": true }, "normalize-path": { @@ -2355,9 +2361,9 @@ } }, "workerpool": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", - "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", + "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", "dev": true }, "wrap-ansi": { diff --git a/type-script-helper/package.json b/type-script-helper/package.json index 07ecffb..92f4078 100644 --- a/type-script-helper/package.json +++ b/type-script-helper/package.json @@ -4,7 +4,7 @@ "description": "Helper for VS Code in TypeScript", "publisher": "IFX", "repository": "https://github.com/mikepharesjr/YO-VSCode/tree/master/type-script-helper", - "version": "1.3.8", + "version": "1.3.10", "engines": { "vscode": "^1.40.0" }, diff --git a/type-script-helper/src/promiseLinesHelper.ts b/type-script-helper/src/promiseLinesHelper.ts index 1d890ce..dff3b51 100644 --- a/type-script-helper/src/promiseLinesHelper.ts +++ b/type-script-helper/src/promiseLinesHelper.ts @@ -9,53 +9,17 @@ function codeGeneratorQuickPickLogic(): undefined { let thenable = vscode.window.showQuickPick( [ { - label: "Namespace", - detail: "Namespace", - output: "%namespace%" - }, { label: "Class name", detail: "Segments Minus One (Object || Array)", output: "%ClassName%" - }, { - label: "Type", - detail: "Segments Minus One (!Object && !Array)", - output: "%Type%" - }, { - label: "Suggested Type", - detail: "Type based on values in *.json file", - output: "%SuggestedType%" - }, { - label: "Full Path", - detail: "Full Path and name in padded format", - output: "%Debug%" - }, { - label: "Name", - detail: "Segments Last only name (no path)", - output: "%Name%" - }, { - label: "Name for Suggested Type", - detail: "Segments name (full)", - output: "%FullName%" }, { label: "Class name (Camel-Cased)", detail: "Segments Minus One (Object || Array)", output: "%ClassNameCamelCased%" }, { - label: "xType (Camel-Cased)", - detail: "Segments Minus One (!Object && !Array)", - output: "%xTypeCamelCased%" - }, { - label: "xSuggested Type (Camel-Cased)", - detail: "Type based on values in *.json file", - output: "%xSuggestedTypeCamelCased%" - }, { - label: "Full Path (Camel-Cased)", - detail: "Full Path and name in padded format", - output: "%DebugCamelCased%" - }, { - label: "Name (Humanized)", + label: "Name", detail: "Segments Last only name (no path)", - output: "%NameHumanized%" + output: "%Name%" }, { label: "Name (Camel-Cased)", detail: "Segments Last only name (no path)", @@ -63,27 +27,47 @@ function codeGeneratorQuickPickLogic(): undefined { }, { label: "Name (Camel-Cased and Plural)", detail: "Segments Last only name (no path)", - output: "%NameCamelPlural%" + output: "%NameCamelCasedPlural%" }, { - label: "Name for Suggested Type (Humanized)", + label: "Name (Plural)", detail: "Segments Last only name (no path)", - output: "%FullNameHumanized%" + output: "%NamePlural%" }, { - label: "Name for Suggested Type (Camel-Cased)", + label: "Name (Humanized)", detail: "Segments Last only name (no path)", - output: "%FullNameCamelCased%" + output: "%NameHumanized%" }, { - label: "Name for Suggested Type (Camel-Cased and Plural)", - detail: "Segments Last only name (no path)", - output: "%FullNameCamelPlural%" + label: "Namespace", + detail: "Namespace", + output: "%namespace%" }, { - label: "Partial Name for Suggested Type (Humanized)", - detail: "Segments Last only name (no path)", - output: "%PartialNameHumanized%" + label: "Suggested Type", + detail: "Type based on values in *.json file", + output: "%SuggestedType%" }, { - label: "Collection Partial Name for Suggested Type (Humanized)", - detail: "Segments Last only name (no path)", - output: "%CollectionPartialNameHumanized%" + label: "Type", + detail: "Segments Minus One (!Object && !Array)", + output: "%Type%" + }, { + label: "Type (Camel-Cased)", + detail: "Segments Minus One (!Object && !Array)", + output: "%TypeCamelCased%" + }, { + label: "TypeSkipOne", + detail: "Segments Minus One (!Object && !Array)", + output: "%TypeSkipOne%" + }, { + label: "TypeSkipOne (Camel-Cased)", + detail: "Segments Minus One (!Object && !Array)", + output: "%TypeSkipOneCamelCased%" + }, { + label: "TypeSkipOne (Humanized)", + detail: "Segments Minus One (!Object && !Array)", + output: "%TypeSkipOneHumanized%" + }, { + label: "TypeSkipOne (Humanized) *Collection", + detail: "Segments Minus One (!Object && !Array)", + output: "%TypeSkipOneHumanizedCollection%" } ] ).then(item => {