ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Swapping Record usage to Map in SQL Projects (#22758)

Browse Source 
* Changing SqlCmdVars from Record to Map

* Converting the rest

* Updating tests

* more cleanup

* Updating test to use new test creation API
This commit is contained in:
Benjin Dubishar
2023-04-17 12:56:39 -07:00
committed by GitHub
parent 4a4580e9ef
commit 02e61d1598
21 changed files with 132 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/sql-database-projects/src/templates/templates.ts
View File

@@ -13,14 +13,14 @@ export let newSdkSqlProjectTemplate: string;
// Object maps
let scriptTypeMap: Record<string, ProjectScriptType> = {};
let scriptTypeMap: Map<string, ProjectScriptType> = new Map();
export function get(key: string): ProjectScriptType {
if (Object.keys(scriptTypeMap).length === 0) {
if (scriptTypeMap.size === 0) {
throw new Error('Templates must be loaded from file before attempting to use.');
}
return scriptTypeMap[key.toLocaleLowerCase()];
return scriptTypeMap.get(key.toLocaleLowerCase())!;
}
let scriptTypes: ProjectScriptType[] = [];
@@ -52,26 +52,26 @@ export async function loadTemplates(templateFolderPath: string) {
]);
for (const scriptType of scriptTypes) {
if (Object.keys(scriptTypeMap).find(s => s === scriptType.type.toLocaleLowerCase() || s === scriptType.friendlyName.toLocaleLowerCase())) {
if (scriptTypeMap.has(scriptType.type.toLocaleLowerCase()) || scriptTypeMap.has(scriptType.friendlyName.toLocaleLowerCase())) {
throw new Error(`Script type map already contains ${scriptType.type} or its friendlyName.`);
}
scriptTypeMap[scriptType.type.toLocaleLowerCase()] = scriptType;
scriptTypeMap[scriptType.friendlyName.toLocaleLowerCase()] = scriptType;
scriptTypeMap.set(scriptType.type.toLocaleLowerCase(), scriptType);
scriptTypeMap.set(scriptType.friendlyName.toLocaleLowerCase(), scriptType);
}
}
export function macroExpansion(template: string, macroDict: Record<string, string>): string {
export function macroExpansion(template: string, macroDict: Map<string, string>): string {
const macroIndicator = '@@';
let output = template;
for (const macro in macroDict) {
// check if value contains the macroIndicator, which could break expansion for successive macros
if (macroDict[macro].includes(macroIndicator)) {
throw new Error(`Macro value ${macroDict[macro]} is invalid because it contains ${macroIndicator}`);
if (macroDict.get(macro)!.includes(macroIndicator)) {
throw new Error(`Macro value ${macroDict.get(macro)} is invalid because it contains ${macroIndicator}`);
}
output = output.replace(new RegExp(macroIndicator + macro + macroIndicator, 'g'), macroDict[macro]);
output = output.replace(new RegExp(macroIndicator + macro + macroIndicator, 'g'), macroDict.get(macro)!);
}
return output;
@@ -104,6 +104,6 @@ export class ProjectScriptType {
* For testing purposes only
*/
export function reset() {
scriptTypeMap = {};
scriptTypeMap = new Map();
scriptTypes = [];
}