Merge pull request #110 from fearthecowboy/master

make sure flattener is called right, add x-ms-skip-url-encoding for p…
Azure · Jan 9, 2020 · 40935bd · 40935bd
2 parents 45f999e + 5c90b78
commit 40935bd
Show file tree

Hide file tree

Showing 53 changed files with 98,617 additions and 2 deletions.
diff --git a/modelerfour/flattener/flattener.ts b/modelerfour/flattener/flattener.ts
@@ -96,7 +96,8 @@ export class Flattener {
  // support '--payload-flattening-threshold:X' global setting
 
  if (this.options['flatten-models'] !== false) {
- return;
+ //return this.codeModel;
+
  for (const schema of values(this.codeModel.schemas.objects)) {
  this.flattenSchema(schema);
  }

diff --git a/modelerfour/main.ts b/modelerfour/main.ts
@@ -6,7 +6,7 @@ import { processRequest as flattener } from './flattener/plugin-flattener';
 export async function initializePlugins(pluginHost: AutoRestExtension) {
  pluginHost.Add('modelerfour', modelerfour);
  pluginHost.Add('pre-namer', preNamer);
- pluginHost.Add('flatten', flattener);
+ pluginHost.Add('flattener', flattener);
 }
 
 async function main() {

diff --git a/modelerfour/modeler/modelerfour.ts b/modelerfour/modeler/modelerfour.ts
@@ -1036,6 +1036,12 @@ export class ModelerFour {
  }
  }));
 
+ // if allowReserved is present, add the extension attribute too.
+ if (parameter.allowReserved) {
+ newParam.extensions = newParam.extensions ?? {};
+ newParam.extensions['x-ms-skip-url-encoding'] = true;
+ }
+
  if (implementation === ImplementationLocation.Client) {
  this.codeModel.addGlobalParameter(newParam);
  }