Polymorphism split multiple times (#113)

* polymorphism split multiple times * poly as resource * polymorphism fix * reserve work * reserve work * mark discriminator value after poly flatten * some fixes of cli operations references * try fix test * poly gen for tree set poly resourced * version 0.6.2 * clean code Co-authored-by: Changlong Liu <[email protected]>
Azure · May 27, 2021 · 24a9313 · 24a9313
1 parent 8074010
commit 24a9313
Show file tree

Hide file tree

Showing 81 changed files with 115,738 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -45,18 +45,28 @@ pipeline:
         input: clicommon/cli-flatten-setter
         output-artifact: clicommon-flatten-modifier-pre
 
-    clicommon/cli-poly-as-resource-modifier:
+    clicommon/pre/cli-poly-as-resource-modifier:
         input: clicommon/pre/cli-flatten-modifier
-        output-artifact: clicommon-poly-as-resource-modifier
+        output-artifact: clicommon-poly-as-resource-modifier-pre
 
     clicommon/cli-flatten-modifier:
-        input: clicommon/cli-poly-as-resource-modifier
+        input: clicommon/pre/cli-poly-as-resource-modifier
         output-artifact: clicommon-flatten-modifier
 
-    clicommon/cli-modifier:
+    clicommon/cli-poly-as-resource-modifier:
         input: clicommon/cli-flatten-modifier
+        output-artifact: clicommon-poly-as-resource-modifier
+
+    clicommon/post/cli-flatten-modifier:
+        input: clicommon/cli-poly-as-resource-modifier
+        output-artifact: clicommon-flatten-modifier-post
+
+    clicommon/cli-modifier:
+        input: clicommon/post/cli-flatten-modifier
         output-artifact: clicommon-modifier-output
 
+
+
     clicommon/cli-namer:
         input: clicommon/cli-modifier
         output-artifact: clicommon-namer-output

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@autorest/clicommon",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "Autorest Azure Cli Common Module",
     "main": "dist/index.js",
     "engines": {

diff --git a/src/copyHelper.ts b/src/copyHelper.ts
@@ -1,6 +1,6 @@
 import { Request, Parameter, Operation, Schema, Languages } from '@azure-tools/codemodel';
 import { isNullOrUndefined } from 'util';
-import { NodeCliHelper } from './nodeHelper';
+import { NodeCliHelper, NodeExtensionHelper } from './nodeHelper';
 
 export class CopyHelper {
     public static copyOperation(source: Operation, globalParameters?: Parameter[], customizedReqCopy?: (req: Request) => Request, customizedParamCopy?: (srcParam: Parameter) => Parameter): Operation {
@@ -45,6 +45,10 @@ export class CopyHelper {
             }
         }
 
+        if (!isNullOrUndefined(NodeExtensionHelper.getCliDiscriminatorValue(source))) {
+            NodeExtensionHelper.setCliDiscriminatorValue(copy, NodeExtensionHelper.getCliDiscriminatorValue(source));
+        }
+
         return copy;
     }
 

diff --git a/src/flattenHelper.ts b/src/flattenHelper.ts
@@ -58,6 +58,9 @@ export class FlattenHelper {
                 vp.language.default.name = FlattenHelper.createFlattenedParameterDefaultName(property, prefix);
                 NodeExtensionHelper.setCliFlattenOrigin(vp, property);
                 NodeExtensionHelper.setCliFlattenPrefix(vp, prefix);
+                if (property.isDiscriminator) {
+                    NodeExtensionHelper.setCliDiscriminatorValue(vp, parameter.schema['discriminatorValue']);
+                }
                 arr.push(vp);
 
                 // if prop is inherit, update path

diff --git a/src/flattener.ts b/src/flattener.ts
@@ -346,7 +346,8 @@ export class Flattener {
 
     private isCliOperation(desc: CliCommonSchema.CodeModel.NodeDescriptor): boolean {
         // CliOperation is not in group.operations. So its index is equal or bigger than operation array(desc.parent)'s length
-        return desc.targetIndex >= desc.parent.length;
+        const operation = desc.target as Operation;
+        return !isNullOrUndefined(NodeExtensionHelper.getPolyAsResourceOriginalOperation(operation));
     }
 
     private fixPropertyCollisions() {

diff --git a/src/helper.ts b/src/helper.ts
@@ -538,14 +538,11 @@ export class Helper {
 
         // collect operations in cli-operations
         const operations = [];
-        const cliOps = [];
         group.operations.forEach((op) => {
             operations.push(op);
-            cliOps.push(...NodeExtensionHelper.getCliOperation((op), () => []));
         });
 
         // put all cli operations at the end of array. So we can use targetIndex and parent.length to know whehter this operation is in cli.
-        operations.push(...cliOps);
 
         for (let j = operations.length - 1; j >= 0; j--) {
             const op = operations[j];

diff --git a/src/nodeHelper.ts b/src/nodeHelper.ts
@@ -8,6 +8,7 @@ export class NodeCliHelper {
 
     // TODO: Consider add specific class for directive keys
     public static readonly POLY_RESOURCE: string = 'poly-resource';
+    public static readonly POLY_RESOURCED: string = 'poly-resourced';
     public static readonly CLI_FLATTEN: string = 'cli-flatten';
     public static readonly CLI_FLATTENED: string = 'cli-flattened';
     public static readonly CLI_M4_FLATTEN: string = 'cli-m4-flatten';
@@ -179,6 +180,14 @@ export class NodeCliHelper {
         return NodeCliHelper.getCliProperty(node, NodeCliHelper.POLY_RESOURCE, () => false);
     }
 
+    public static isPolyAsResourced(node: Parameter): boolean {
+        return NodeCliHelper.getCliProperty(node, NodeCliHelper.POLY_RESOURCED, () => false);
+    }
+
+    public static setPolyAsResourced(node: Parameter, value: boolean): void {
+        return NodeCliHelper.setCliProperty(node, NodeCliHelper.POLY_RESOURCED, value);
+    }
+
     public static setPolyAsParamExpanded(param: Parameter, value: boolean): void {
         NodeCliHelper.setCliProperty(param, NodeCliHelper.POLY_AS_PARAM_EXPANDED, value);
     }
@@ -313,6 +322,7 @@ export class NodeExtensionHelper {
 
     private static readonly CLI_FLATTEN_ORIGIN = 'cli-flatten-origin';
     private static readonly CLI_FLATTEN_PREFIX = 'cli-flatten-prefix';
+    private static readonly CLI_DISCRIMINATOR_VALUE = 'cli-discriminator-value';
 
     /**
      * return the value of node.extensions['x-ms-client-flatten']
@@ -341,6 +351,14 @@ export class NodeExtensionHelper {
         return NodeExtensionHelper.getExtensionsProperty(param, NodeExtensionHelper.CLI_FLATTEN_PREFIX, () => null);
     }
 
+    public static setCliDiscriminatorValue(node: M4Node, value: string): void{
+        return NodeExtensionHelper.setExtensionsProperty(node, NodeExtensionHelper.CLI_DISCRIMINATOR_VALUE, value);
+    }
+
+    public static getCliDiscriminatorValue(param: Parameter): string {
+        return NodeExtensionHelper.getExtensionsProperty(param, NodeExtensionHelper.CLI_DISCRIMINATOR_VALUE, () => null);
+    }
+
     public static setPolyAsResourceParam(op: Operation, polyParam: Parameter): void {
         NodeExtensionHelper.setExtensionsProperty(op, NodeExtensionHelper.POLY_AS_RESOURCE_SUBCLASS_PARAM, polyParam);
     }
@@ -361,7 +379,7 @@ export class NodeExtensionHelper {
         NodeExtensionHelper.setExtensionsProperty(op, NodeExtensionHelper.POLY_AS_RESOURCE_ORIGINAL_OPERATION, ori);
     }
 
-    public static getPolyAsResourceOriginalOperation(op: Operation): Schema {
+    public static getPolyAsResourceOriginalOperation(op: Operation): Operation {
         return NodeExtensionHelper.getExtensionsProperty(op, NodeExtensionHelper.POLY_AS_RESOURCE_ORIGINAL_OPERATION, null);
     }
 
@@ -397,16 +415,6 @@ export class NodeExtensionHelper {
         return NodeExtensionHelper.getExtensionsProperty(param, NodeExtensionHelper.POLY_AS_PARAM_ORIGINIAL_PARAMETER, null);
     }
 
-    public static addCliOperation(originalOperation: Operation, cliOperation: Operation): void {
-        const v: Operation[] = NodeExtensionHelper.getExtensionsProperty(originalOperation, NodeExtensionHelper.CLI_OPERATIONS, () => []);
-        v.push(cliOperation);
-        NodeExtensionHelper.setExtensionsProperty(originalOperation, NodeExtensionHelper.CLI_OPERATIONS, v);
-    }
-
-    public static getCliOperation(originalOperation: Operation, defaultValue: () => Operation[]): Operation[] {
-        return NodeExtensionHelper.getExtensionsProperty(originalOperation, NodeExtensionHelper.CLI_OPERATIONS, defaultValue);
-    }
-
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
     public static setExtensionsProperty(node: M4Node, key: string, value: any): void {
         if (isNullOrUndefined(node.extensions))

diff --git a/src/plugins/namer.ts b/src/plugins/namer.ts
@@ -140,13 +140,14 @@ export class CommonNamer {
         // To be backward compatiable, reassign poly operations and parameters' default name and cli name
         for (const operationGroup of values(this.codeModel.operationGroups)) {
             for (const operation of values(operationGroup.operations)) {
-                for (const op of values(NodeExtensionHelper.getCliOperation(operation, () => []))) {
-                    this.applyNamingConventionOnCliOperation(operation, op);
-                    for (const parameter of values(op.parameters)) {
+                const polyOriginOp = NodeExtensionHelper.getPolyAsResourceOriginalOperation(operation);
+                if (!isNullOrUndefined(polyOriginOp)) {
+                    this.applyNamingConventionOnCliOperation(polyOriginOp, operation);
+                    for (const parameter of values(operation.parameters)) {
                         this.applyNamingConvention(parameter);
                     }
 
-                    for (const request of values(op.requests)) {
+                    for (const request of values(operation.requests)) {
                         if (!isNullOrUndefined(request.parameters)) {
                             for (const parameter of values(request.parameters)) {
                                 this.applyNamingConventionOnCliParameter(parameter);

diff --git a/src/plugins/polyAsResourceModifier.ts b/src/plugins/polyAsResourceModifier.ts
@@ -1,5 +1,5 @@
 import { Host, Session, startSession } from "@azure-tools/autorest-extension-base";
-import { CodeModel, Request, ObjectSchema, Operation, OperationGroup, Parameter, codeModelSchema } from "@azure-tools/codemodel";
+import { CodeModel, Request, ObjectSchema, Operation, OperationGroup, Parameter, codeModelSchema, getAllProperties } from "@azure-tools/codemodel";
 import { isNullOrUndefined } from "util";
 import { Helper } from "../helper";
 import { NodeHelper, NodeCliHelper, NodeExtensionHelper } from "../nodeHelper";
@@ -93,22 +93,37 @@ export class PolyAsResourceModifier {
                     return;
                 }
                 if (allPolyParam.length > 1) {
-                    throw Error('multiple polymorphism parameter as resource found: ' + allPolyParam.map(p => p.language['cli']));
+                    throw Error('multiple polymorphism parameter as resource found: op: ' + NodeCliHelper.getCliKey(op, null) + ' dup parameters: ' + allPolyParam.map(p => NodeCliHelper.getCliKey(p, null)));
                 }
 
                 const polyParam = allPolyParam[0];
                 const baseSchema = polyParam.schema as ObjectSchema;
-
-                for (const subClass of NodeHelper.getSubClasses(baseSchema, true)) {
+                const baseDiscriminatorValue = NodeCliHelper.getCliDiscriminatorValue(baseSchema);
+                const subClasses = NodeHelper.getSubClasses(baseSchema, false);
+
+                if (!isNullOrUndefined(baseDiscriminatorValue) && NodeCliHelper.isPolyAsResourced(polyParam)) {
+                    return;
+                }
+
+                for (const subClass of subClasses) {
 
                     const discriminatorValue = NodeCliHelper.getCliDiscriminatorValue(subClass);
 
                     const op2: Operation = this.cloneOperationForSubclass(op, baseSchema, subClass);
 
                     Helper.logDebug(this.session, `${g.language.default.name}/${op.language.default.name} cloned for subclass ${discriminatorValue}`);
-                    NodeExtensionHelper.addCliOperation(op, op2);
+                    if (g.operations.indexOf(op2) === -1) {
+                        g.operations.push(op2);
+                        for (const p2 of this.findPolyParameters(this.getDefaultRequest(op2))) {
+                            if (NodeCliHelper.isPolyAsResource(p2) && NodeExtensionHelper.getPolyAsResourceBaseSchema(p2) === baseSchema) {
+                                NodeCliHelper.setPolyAsResourced(p2, true);
+                            }
+                        }
+                    }
                 }
 
+                NodeCliHelper.setPolyAsResourced(polyParam, true);
+
                 NodeCliHelper.setHidden(op, true);
             });
         });
@@ -126,7 +141,7 @@ export class PolyAsResourceModifier {
             return [];
         }
         return request.parameters?.filter(p =>
-            Helper.isObjectSchema(p.schema) && (p.schema as ObjectSchema).discriminator && NodeCliHelper.isPolyAsResource(p));
+            Helper.isObjectSchema(p.schema) && (p.schema as ObjectSchema).discriminator && NodeCliHelper.isPolyAsResource(p) && !NodeCliHelper.isPolyAsResourced(p));
     }
 
     private getDefaultRequest(operation: Operation): Request {

diff --git a/...ommon-000210-modifier-pre-simplified.yaml → ...0210-poly-as-resource-pre-simplified.yaml b/...ommon-000210-modifier-pre-simplified.yaml → ...0210-poly-as-resource-pre-simplified.yaml
diff --git a/...output/clicommon-000210-modifier-pre.yaml → ...licommon-000210-poly-as-resource-pre.yaml b/...output/clicommon-000210-modifier-pre.yaml → ...licommon-000210-poly-as-resource-pre.yaml
diff --git a/...mmon-000220-modifier-post-simplified.yaml → ...220-poly-as-resource-post-simplified.yaml b/...mmon-000220-modifier-post-simplified.yaml → ...220-poly-as-resource-post-simplified.yaml
diff --git a/...utput/clicommon-000220-modifier-post.yaml → ...icommon-000220-poly-as-resource-post.yaml b/...utput/clicommon-000220-modifier-post.yaml → ...icommon-000220-poly-as-resource-post.yaml
diff --git a/...licommon-000230-namer-pre-simplified.yaml → ...common-000230-flatten-pre-simplified.yaml b/...licommon-000230-namer-pre-simplified.yaml → ...common-000230-flatten-pre-simplified.yaml
diff --git a/...on/output/clicommon-000230-namer-pre.yaml → .../output/clicommon-000230-flatten-pre.yaml b/...on/output/clicommon-000230-namer-pre.yaml → .../output/clicommon-000230-flatten-pre.yaml