Move model renaming before the csharp namer plugin for SDK (#1228)

powershell/autorest-configuration-for-sdk.md

@@ -63,9 +63,12 @@ pipeline:
   createSdkInlinedPropertiesPlugin:
     input: modelerfour/identity
 
-  csnamerSdk:
+  applyModelNameModifiersSdk:
     input: createSdkInlinedPropertiesPlugin
 
+  csnamerSdk:
+    input: applyModelNameModifiersSdk
+
   applyModifiersSdk:
     input: csnamerSdk
 

powershell/main.ts

@@ -19,7 +19,7 @@ import { generate } from './plugins/sdk-generate';
 import { tweakSdkModelPlugin } from './plugins/sdk-tweak-model';
 import { simplifierPlugin } from './plugins/sdk-cs-simplifier';
 import { csnamerSdk } from './plugins/sdk-cs-namer';
-import { applyModifiersSdk } from './plugins/sdk-modifiers';
+import { applyModifiersSdk, applyModelNameModifiersSdk } from './plugins/sdk-modifiers';
 import { createSdkInlinedPropertiesPlugin } from './plugins/sdk-create-inline-properties';
 
 require('source-map-support').install();
@@ -43,6 +43,7 @@ export async function main() {
   pluginHost.Add('simplifierPlugin', simplifierPlugin);
   pluginHost.Add('csnamerSdk', csnamerSdk);
   pluginHost.Add('applyModifiersSdk', applyModifiersSdk);
+  pluginHost.Add('applyModelNameModifiersSdk', applyModelNameModifiersSdk);
   pluginHost.Add('createSdkInlinedPropertiesPlugin', createSdkInlinedPropertiesPlugin);
 
   await pluginHost.Run();

powershell/plugins/sdk-modifiers.ts

@@ -123,19 +123,67 @@ async function tweakModel(state: State): Promise<SdkModel> {
           }
         }
 
+      } else if (models) {
+        // comment out below to disable model name change, which will be added in the tweakModelName before the plugin csnamerSdk
+        // for (const model of values(models)) {
+        //   const prevName = model.language.csharp?.name;
+        //   if (model.language.csharp) {
+        //     model.language.default.fullname = model.language.csharp.fullname = model.language.default.name = model.language.csharp.name = modelNameReplacer ? modelNameRegex ? model.language.csharp.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.csharp.name;
+        //   }
+        //   state.message({
+        //     Channel: Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${model.language.csharp?.name}.`
+        //   });
+        // }
+      }
+    }
+  }
+
+  return state.model;
+}
+
+async function tweakModelName(state: State): Promise<SdkModel> {
+  // only look at directives without the `transform` node.
+  for (const directive of directives.filter(each => !each.transform)) {
+    const getPatternToMatch = (selector: string | undefined): RegExp | undefined => {
+      return selector ? !hasSpecialChars(selector) ? new RegExp(`^${selector}$`, 'gi') : new RegExp(selector, 'gi') : undefined;
+    };
+
+    if (isWhereModelDirective(directive)) {
+      const selectType = directive.select;
+      const modelNameRegex = getPatternToMatch(directive.where['model-name']);
+      const propertyNameRegex = getPatternToMatch(directive.where['property-name']);
+
+      const modelNameReplacer = directive.set['model-name'];
+      const propertyNameReplacer = directive.set['property-name'];
+
+      // select all models
+      let models = [...state.model.schemas.objects ?? []];
+      // let models = values(state.model.schemas).toArray();
+      if (modelNameRegex) {
+        models = values(models)
+          .where(model =>
+            !!`${model.language.default.name}`.match(modelNameRegex))
+          .toArray();
+      }
+
+      if (propertyNameRegex && selectType === 'model') {
+        models = values(models)
+          .where(model => values(allVirtualProperties(model.language.default.virtualProperties))
+            .any(property => !!`${property.name}`.match(propertyNameRegex)))
+          .toArray();
+      }
+
+      if (propertyNameRegex && (selectType === undefined || selectType === 'property')) {
+        // skip directive for property
       } else if (models) {
         for (const model of values(models)) {
-          const prevName = model.language.csharp?.name;
-          if (model.language.csharp) {
-            model.language.default.fullname = model.language.csharp.fullname = model.language.default.name = model.language.csharp.name = modelNameReplacer ? modelNameRegex ? model.language.csharp.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.csharp.name;
-          }
+          const prevName = model.language.default.name;
+          model.language.default.name = modelNameReplacer ? modelNameRegex ? model.language.default.name.replace(modelNameRegex, modelNameReplacer) : modelNameReplacer : model.language.default.name;
           state.message({
-            Channel: Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${model.language.csharp?.name}.`
+            Channel: Channel.Debug, Text: `[DIRECTIVE] Changed model-name from ${prevName} to ${model.language.default.name}.`
           });
         }
       }
-
-      continue;
     }
   }
 
@@ -155,3 +203,17 @@ export async function applyModifiersSdk(service: Host) {
 
   await service.writeFile({ filename: 'code-model-v4-modifiers-sdk.yaml', content: serialize(result), sourceMap: undefined, artifactType: 'code-model-sdk' });
 }
+
+export async function applyModelNameModifiersSdk(service: Host) {
+  // dolauli implement directives
+  const allDirectives = await service.getValue<any>('directive');
+  directives = values(allDirectives)
+    // .select(directive => directive)
+    .where(directive => isWhereModelDirective(directive))
+    .toArray();
+
+  const state = await new ModelState<SdkModel>(service).init();
+  const result = await tweakModelName(state);
+
+  await service.writeFile({ filename: 'code-model-v4-model-name-modifiers-sdk.yaml', content: serialize(result), sourceMap: undefined, artifactType: 'code-model-sdk' });
+}