Fix error validators and parsing UserPrompts

Author: nturinski

src/commands/addBinding/settingSteps/LocalAppSettingCreateStep.ts

@@ -11,7 +11,7 @@ import { localize } from '../../../localize';
 import { type IBindingSetting } from '../../../templates/IBindingTemplate';
 import { type ParsedInput } from '../../../templates/script/parseScriptTemplatesV2';
 import { nonNullProp, nonNullValue } from '../../../utils/nonNull';
-import { getBindingSetting } from '../../createFunction/IFunctionWizardContext';
+import { getBindingSetting, setBindingSetting } from '../../createFunction/IFunctionWizardContext';
 import { type IBindingWizardContext } from '../IBindingWizardContext';
 
 export class LocalAppSettingCreateStep extends AzureWizardExecuteStep<IBindingWizardContext> {
@@ -30,6 +30,10 @@ export class LocalAppSettingCreateStep extends AzureWizardExecuteStep<IBindingWi
         progress.report({ message: localize('updatingLocalSettings', 'Updating {0}...', localSettingsFileName) });
         const appSettingName = String(nonNullValue(getBindingSetting(context, this._setting), this._setting.name));
         await setLocalAppSetting(context, context.projectPath, appSettingName, nonNullProp(context, this._valueKey as keyof IBindingWizardContext) as string);
+        // if the binding isn't already set then a new one was created
+        if (!getBindingSetting(context, this._setting)) {
+            setBindingSetting(context, this._setting, nonNullProp(context, this._valueKey as keyof IBindingWizardContext) as string);
+        }
     }
 
     public shouldExecute(context: IBindingWizardContext): boolean {

src/commands/createFunction/JobsListStep.ts

@@ -36,7 +36,7 @@ export class JobsListStep extends AzureWizardPromptStep<IFunctionWizardContext>
             const executeSteps: AzureWizardExecuteStep<FunctionV2WizardContext>[] = [];
             context.job.parsedActions.map((pa, index) => {
                 // add index to increment the priority number
-                executeSteps.push(actionStepFactory(pa, index));
+                executeSteps.push(actionStepFactory(pa, index + 500));
             });
 
             return { promptSteps, executeSteps };

src/commands/createFunction/promptStepsV2/PromptSchemaStepBase.ts

@@ -20,15 +20,16 @@ export abstract class PromptSchemaStepBase<T extends FunctionV2WizardContext> ex
 
     protected abstract promptAction(context: T): Promise<unknown>;
 
-    protected validateInput(input: string | undefined): string | undefined {
-        if (!input && this.input.required) {
+    protected validateInput(value: string | undefined, parsedInput: ParsedInput): string | undefined {
+        if (!value && parsedInput.required) {
             return localize('promptV2StepEmpty', 'The input cannot be empty.');
         }
 
-        const validators = this.input.validators || [];
+        const validators = parsedInput.validators || [];
         for (const validator of validators) {
-            if (input) {
-                if (new RegExp(validator.expression).test(input)) {
+            if (value) {
+                if (!new RegExp(validator.expression).test(value)) {
+                    // TODO: get the errorText properly
                     return validator.errorText;
                 }
             }

src/commands/createFunction/promptStepsV2/StringInputStep.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { type AzExtInputBoxOptions } from "@microsoft/vscode-azext-utils";
-import { localize } from "../../../localize";
 import { type ParsedInput } from "../../../templates/script/parseScriptTemplatesV2";
 import { type FunctionV2WizardContext } from "../IFunctionWizardContext";
 import { PromptSchemaStepBase } from "./PromptSchemaStepBase";
@@ -20,26 +19,9 @@ export class StringInputStep<T extends FunctionV2WizardContext> extends PromptSc
             title: this.input.label,
             prompt: this.input.help,
             value: this.input.defaultValue,
-            validateInput: this.validateInput
+            validateInput: value => { return this.validateInput(value, this.input); }
         };
 
         return await context.ui.showInputBox(options);
     }
-
-    protected validateInput(input: string | undefined): string | undefined {
-        if (!input && this.input.required) {
-            return localize('promptV2StepEmpty', 'The input cannot be empty.');
-        }
-
-        const validators = this.input.validators || [];
-        for (const validator of validators) {
-            if (input) {
-                if (!new RegExp(validator.expression).test(input)) {
-                    return validator.errorText;
-                }
-            }
-        }
-
-        return undefined;
-    }
 }

src/templates/script/parseScriptTemplatesV2.ts

@@ -5,9 +5,11 @@
 
 import { nonNullValue } from '@microsoft/vscode-azext-utils';
 import { type ActionType, type ProjectLanguage } from '../../constants';
+import { localize } from '../../localize';
 import { type ResourceType } from '../IBindingTemplate';
 import { type FunctionV2Template } from '../IFunctionTemplate';
 import { TemplateSchemaVersion } from '../TemplateProviderBase';
+import { getResourceValue } from './parseScriptTemplates';
 
 /**
  * Describes script template resources to be used for parsing
@@ -72,11 +74,7 @@ interface RawUserPrompt {
     name: string;
     label: string;
     help?: string;
-    validators?: {
-        // string representation of a regex
-        expression: string;
-        errorText: string;
-    }[];
+    validators?: UserPromptValidator[];
     value: 'string' | 'enum' | 'boolean';
     enum?: {
         value: string;
@@ -86,6 +84,11 @@ interface RawUserPrompt {
     placeHolder?: string;
 }
 
+type UserPromptValidator = {
+    expression: string;
+    errorText: string;
+};
+
 export interface ParsedInput extends RawUserPrompt, RawInput {
 
 }
@@ -139,14 +142,22 @@ export function parseUserPrompts(rawUserPrompts: object[], resources: Resources)
             // all of the properties in the rawResources are in the format of "param_name" but the keys in the rawUserPrompt are in the format of "param-name"
             const paramName = userPrompt[key] as unknown;
             if (typeof paramName === 'string' && paramName.startsWith('$')) {
-                const resourceKey = paramName.substring(1);
-                // TODO: handle localization
-                userPrompt[key] = resources['en'][resourceKey];
+                userPrompt[key] = getResourceValue(resources, paramName, true) || paramName;
+            } else if (key === 'validators' && Array.isArray(rawUserPrompt[key])) {
+                const validators: UserPromptValidator[] = rawUserPrompt[key] as UserPromptValidator[];
+                for (const validator of validators) {
+                    // there are a few edge cases with tokens where the format is [variables('param_name')] instead of $param_name
+                    const matches: RegExpMatchArray | null = validator.errorText.match(/\[variables\(\'(.*)\'\)\]/);
+                    // but in the resources key is $variables_paramName
+                    validator.errorText = getResourceValue(resources, matches ? '$variables_' + matches[1] : validator.errorText, true)
+                        || localize('validatorError', 'Invalid input');
+                }
+
+                userPrompt[key] = validators;
             }
         }
 
         userPrompts.push(userPrompt);
     }
     return userPrompts;
 }
-