last set of namer changes

2020-02-12 10:05:44 -08:00 · 2020-02-12 10:05:44 -08:00 · 74ad814f66
--- a/modelerfour/prenamer/prenamer.ts
+++ b/modelerfour/prenamer/prenamer.ts
@ -60,7 +60,7 @@ export class PreNamer {
    // get our configuration for this run.
    this.options = await this.session.getValue('modelerfour', {});
    const naming = this.options.naming || {};
-    const maxPreserve = Number(naming['preserve-uppercase-max-length']) || 0;
+    const maxPreserve = Number(naming['preserve-uppercase-max-length']) || 3;
    this.format = {

      parameter: Style.select(naming.parameter, Style.camel, maxPreserve),
--- a/modelerfour/readme.md
+++ b/modelerfour/readme.md
@ -5,6 +5,7 @@
  - add additional checks for empty names, collisions
  - fix errant processing on APString => Apstring 
  - x-ms-client-name fixes on parameters
+  - added setting for `preserve-uppercase-max-length` to preserve uppercase words up to a certain length.

 #### 4.5.x
  - static linking libraries for stability
@ -22,6 +23,7 @@ modelerfour:
  # you can prefix
  # default is the first one in the list below:
  naming: 
+    preserve-uppercase-max-length: 0 # length of uppercase words to preserve in identifier names
    parameter: camel # camel|pascal|snake|upper|kebab|space
    property: camel # camel|pascal|snake|upper|kebab|space
    operation: pascal # pascal|camel|snake|upper|kebab|space
@ -31,9 +33,11 @@ modelerfour:
    constant:  pascal # pascal|camel|snake|upper|kebab|space
    type:  pascal # pascal|camel|snake|upper|kebab|space
    local: _ + camel # pascal|camel|snake|upper|kebab|space
+    global: camel
    override:  # a key/value mapping of names to force to a certain value 
      cmyk : CMYK
      $host: $host  
+    
 ```
  - support overrides in namer 
  - static linked dependency
--- a/modelerfour/test/scenarios/a-playground/namer.yaml
+++ b/modelerfour/test/scenarios/a-playground/namer.yaml
@ -1509,7 +1509,7 @@ schemas: !<!Schemas>
          version: '2016-02-29'
        language: !<!Languages> 
          default:
-            name: MyBaseHelperTypePropBh1
+            name: MyBaseHelperTypePropBH1
            description: ''
        protocol: !<!Protocols> {}
      flattenedNames:
@ -1519,7 +1519,7 @@ schemas: !<!Schemas>
      serializedName: propBH1
      language: !<!Languages> 
        default:
-          name: propBh1
+          name: propBH1
          description: ''
      protocol: !<!Protocols> {}
    language: !<!Languages> 
@ -1539,7 +1539,7 @@ schemas: !<!Schemas>
      serializedName: propBH1
      language: !<!Languages> 
        default:
-          name: propBh1
+          name: propBH1
          description: ''
      protocol: !<!Protocols> {}
    extensions:
--- a/modelerfour/test/scenarios/blob-storage/namer.yaml
+++ b/modelerfour/test/scenarios/blob-storage/namer.yaml
@ -1614,14 +1614,14 @@ schemas: !<!Schemas>
                        version: '2019-02-02'
                      language: !<!Languages> 
                        default:
-                          name: BlobPropertiesContentMd5
+                          name: BlobPropertiesContentMD5
                          description: ''
                      protocol: !<!Protocols> {}
                    required: false
                    serializedName: Content-MD5
                    language: !<!Languages> 
                      default:
-                        name: contentMd5
+                        name: contentMD5
                        description: ''
                    protocol: !<!Protocols> {}
                  - !<!Property> 
@ -11055,7 +11055,7 @@ schemas: !<!Schemas>
        implementation: Method
        language: !<!Languages> 
          default:
-            name: _blobContentMd5
+            name: _blobContentMD5
            description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
            serializedName: x-ms-blob-content-md5
        protocol: !<!Protocols> 
@ -11067,7 +11067,7 @@ schemas: !<!Schemas>
        implementation: Method
        language: !<!Languages> 
          default:
-            name: _blobContentMd5
+            name: _blobContentMD5
            description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
            serializedName: x-ms-blob-content-md5
        protocol: !<!Protocols> 
@ -11079,7 +11079,7 @@ schemas: !<!Schemas>
        implementation: Method
        language: !<!Languages> 
          default:
-            name: _blobContentMd5
+            name: _blobContentMD5
            description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
            serializedName: x-ms-blob-content-md5
        protocol: !<!Protocols> 
@ -11091,7 +11091,7 @@ schemas: !<!Schemas>
        implementation: Method
        language: !<!Languages> 
          default:
-            name: _blobContentMd5
+            name: _blobContentMD5
            description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
            serializedName: x-ms-blob-content-md5
        protocol: !<!Protocols> 
@ -11103,7 +11103,7 @@ schemas: !<!Schemas>
        implementation: Method
        language: !<!Languages> 
          default:
-            name: _blobContentMd5
+            name: _blobContentMD5
            description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
            serializedName: x-ms-blob-content-md5
        protocol: !<!Protocols> 
@ -11112,7 +11112,7 @@ schemas: !<!Schemas>
      serializedName: blobContentMD5
      language: !<!Languages> 
        default:
-          name: blobContentMd5
+          name: blobContentMD5
          description: 'Optional. An MD5 hash of the blob content. Note that this hash is not validated, as the hashes for the individual blocks were validated when each was uploaded.'
      protocol: !<!Protocols> {}
    - !<!Property> 
@ -11957,13 +11957,13 @@ schemas: !<!Schemas>
      value: Standard_LRS
      language:
        default:
-          name: StandardLrs
+          name: StandardLRS
          description: ''
    - !<!ChoiceValue> 
      value: Standard_GRS
      language:
        default:
-          name: StandardGrs
+          name: StandardGRS
          description: ''
    - !<!ChoiceValue> 
      value: Standard_RAGRS
@ -11975,13 +11975,13 @@ schemas: !<!Schemas>
      value: Standard_ZRS
      language:
        default:
-          name: StandardZrs
+          name: StandardZRS
          description: ''
    - !<!ChoiceValue> 
      value: Premium_LRS
      language:
        default:
-          name: PremiumLrs
+          name: PremiumLRS
          description: ''
    type: sealed-choice
    apiVersions:
@ -21291,7 +21291,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: rangeGetContentMd5
+            name: rangeGetContentMD5
            description: 'When set to true and specified together with the Range, the service returns the MD5 hash for the range, as long as the range is less than or equal to 4 MB in size.'
            serializedName: x-ms-range-get-content-md5
        protocol: !<!Protocols> 
@ -21302,7 +21302,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: rangeGetContentCrc64
+            name: rangeGetContentCRC64
            description: 'When set to true and specified together with the Range, the service returns the CRC64 hash for the range, as long as the range is less than or equal to 4 MB in size.'
            serializedName: x-ms-range-get-content-crc64
        protocol: !<!Protocols> 
@ -23915,7 +23915,7 @@ operationGroups:
          - default
    language: !<!Languages> 
      default:
-        name: StartCopyFromUrl
+        name: StartCopyFromURL
        description: The Start Copy From URL operation copies a blob or an internet resource to a new blob.
    protocol: !<!Protocols> {}
  - !<!Operation> 
@ -24017,7 +24017,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: sourceContentMd5
+            name: sourceContentMD5
            description: Specify the md5 calculated for the range of bytes that must be read from the copy source.
            serializedName: x-ms-source-content-md5
        protocol: !<!Protocols> 
@ -24106,7 +24106,7 @@ operationGroups:
          - default
    language: !<!Languages> 
      default:
-        name: CopyFromUrl
+        name: CopyFromURL
        description: The Copy From URL operation copies a blob or an internet resource to a new blob. It will not return a response until the copy is complete.
    protocol: !<!Protocols> {}
  - !<!Operation> 
@ -24236,7 +24236,7 @@ operationGroups:
          - default
    language: !<!Languages> 
      default:
-        name: AbortCopyFromUrl
+        name: AbortCopyFromURL
        description: 'The Abort Copy From URL operation aborts a pending Copy From URL operation, and leaves a destination blob with zero length and full metadata.'
    protocol: !<!Protocols> {}
  - !<!Operation> 
@ -24758,7 +24758,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
@ -25196,7 +25196,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: sourceContentMd5
+            name: sourceContentMD5
            description: Specify the md5 calculated for the range of bytes that must be read from the copy source.
            serializedName: x-ms-source-content-md5
        protocol: !<!Protocols> 
@ -25378,7 +25378,7 @@ operationGroups:
          - default
    language: !<!Languages> 
      default:
-        name: UploadPagesFromUrl
+        name: UploadPagesFromURL
        description: The Upload Pages operation writes a range of pages to a page blob where the contents are read from a URL
    protocol: !<!Protocols> {}
  - !<!Operation> 
@ -26366,7 +26366,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
@ -26579,7 +26579,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: sourceContentMd5
+            name: sourceContentMD5
            description: Specify the md5 calculated for the range of bytes that must be read from the copy source.
            serializedName: x-ms-source-content-md5
        protocol: !<!Protocols> 
@ -26626,7 +26626,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
@ -26812,7 +26812,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
@ -27052,7 +27052,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
@ -27281,7 +27281,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: sourceContentMd5
+            name: sourceContentMD5
            description: Specify the md5 calculated for the range of bytes that must be read from the copy source.
            serializedName: x-ms-source-content-md5
        protocol: !<!Protocols> 
@ -27422,7 +27422,7 @@ operationGroups:
          - default
    language: !<!Languages> 
      default:
-        name: StageBlockFromUrl
+        name: StageBlockFromURL
        description: The Stage Block operation creates a new block to be committed as part of a blob where the contents are read from a URL.
    protocol: !<!Protocols> {}
  - !<!Operation> 
@ -27467,7 +27467,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: transactionalContentMd5
+            name: transactionalContentMD5
            description: 'Specify the transactional md5 for the body, to be validated by the service.'
            serializedName: Content-MD5
        protocol: !<!Protocols> 
--- a/modelerfour/test/scenarios/body-complex/namer.yaml
+++ b/modelerfour/test/scenarios/body-complex/namer.yaml
@ -1521,7 +1521,7 @@ schemas: !<!Schemas>
          version: '2016-02-29'
        language: !<!Languages> 
          default:
-            name: MyBaseHelperTypePropBh1
+            name: MyBaseHelperTypePropBH1
            description: ''
        protocol: !<!Protocols> {}
      flattenedNames:
@ -1531,7 +1531,7 @@ schemas: !<!Schemas>
      serializedName: propBH1
      language: !<!Languages> 
        default:
-          name: propBh1
+          name: propBH1
          description: ''
      protocol: !<!Protocols> {}
    language: !<!Languages> 
@ -1551,7 +1551,7 @@ schemas: !<!Schemas>
      serializedName: propBH1
      language: !<!Languages> 
        default:
-          name: propBh1
+          name: propBH1
          description: ''
      protocol: !<!Protocols> {}
    extensions:
--- a/modelerfour/test/scenarios/datalake-storage/namer.yaml
+++ b/modelerfour/test/scenarios/datalake-storage/namer.yaml
@ -3924,7 +3924,7 @@ operationGroups:
        implementation: Method
        language: !<!Languages> 
          default:
-            name: contentMd5
+            name: contentMD5
            description: >-
              Optional. An MD5 hash of the request content. This header is valid on "Append" and "Flush" operations. This hash is used to verify the integrity of the request content during transport. When this header is specified, the
              storage service compares the hash of the content that has arrived with this header value. If the two hashes do not match, the operation will fail with error code 400 (Bad Request). Note that this MD5 hash is not stored with
@ -5473,7 +5473,7 @@ operationGroups:
  protocol: !<!Protocols> {}
 language: !<!Languages> 
  default:
-    name: AzureDataLakeStorageRestApi
+    name: AzureDataLakeStorageRestAPI
    description: ''
 protocol: !<!Protocols> 
  http: !<!HttpModel> {}
--- a/modelerfour/test/scenarios/keyvault/namer.yaml
+++ b/modelerfour/test/scenarios/keyvault/namer.yaml
@ -20,19 +20,19 @@ schemas: !<!Schemas>
          value: EC-HSM
          language:
            default:
-              name: ECHsm
+              name: ECHSM
              description: Elliptic Curve with a private key which is not exportable from the HSM.
        - !<!ChoiceValue> 
          value: RSA
          language:
            default:
-              name: Rsa
+              name: RSA
              description: 'RSA (https://tools.ietf.org/html/rfc3447)'
        - !<!ChoiceValue> 
          value: RSA-HSM
          language:
            default:
-              name: RsaHsm
+              name: RSAHSM
              description: RSA with a private key which is not exportable from the HSM.
        - !<!ChoiceValue> 
          value: oct
@ -1289,19 +1289,19 @@ schemas: !<!Schemas>
          value: RSA-OAEP
          language:
            default:
-              name: RsaOaep
+              name: RSAOaep
              description: ''
        - !<!ChoiceValue> 
          value: RSA-OAEP-256
          language:
            default:
-              name: RsaOaep256
+              name: RSAOaep256
              description: ''
        - !<!ChoiceValue> 
          value: RSA1_5
          language:
            default:
-              name: Rsa15
+              name: RSA15
              description: ''
        type: choice
        apiVersions:
@ -1407,37 +1407,37 @@ schemas: !<!Schemas>
          value: PS256
          language:
            default:
-              name: Ps256
+              name: PS256
              description: 'RSASSA-PSS using SHA-256 and MGF1 with SHA-256, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: PS384
          language:
            default:
-              name: Ps384
+              name: PS384
              description: 'RSASSA-PSS using SHA-384 and MGF1 with SHA-384, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: PS512
          language:
            default:
-              name: Ps512
+              name: PS512
              description: 'RSASSA-PSS using SHA-512 and MGF1 with SHA-512, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: RS256
          language:
            default:
-              name: Rs256
+              name: RS256
              description: 'RSASSA-PKCS1-v1_5 using SHA-256, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: RS384
          language:
            default:
-              name: Rs384
+              name: RS384
              description: 'RSASSA-PKCS1-v1_5 using SHA-384, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: RS512
          language:
            default:
-              name: Rs512
+              name: RS512
              description: 'RSASSA-PKCS1-v1_5 using SHA-512, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: RSNULL
@ -1449,25 +1449,25 @@ schemas: !<!Schemas>
          value: ES256
          language:
            default:
-              name: Es256
+              name: ES256
              description: 'ECDSA using P-256 and SHA-256, as described in https://tools.ietf.org/html/rfc7518.'
        - !<!ChoiceValue> 
          value: ES384
          language:
            default:
-              name: Es384
+              name: ES384
              description: 'ECDSA using P-384 and SHA-384, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: ES512
          language:
            default:
-              name: Es512
+              name: ES512
              description: 'ECDSA using P-521 and SHA-512, as described in https://tools.ietf.org/html/rfc7518'
        - !<!ChoiceValue> 
          value: ES256K
          language:
            default:
-              name: Es256K
+              name: ES256K
              description: 'ECDSA using P-256K and SHA-256, as described in https://tools.ietf.org/html/rfc7518'
        type: choice
        apiVersions:
--- a/modelerfour/test/scenarios/lro/namer.yaml
+++ b/modelerfour/test/scenarios/lro/namer.yaml
@ -4093,7 +4093,7 @@ operationGroups:
    protocol: !<!Protocols> {}
  language: !<!Languages> 
    default:
-      name: LroRetrys
+      name: LRORetrys
      description: ''
  protocol: !<!Protocols> {}
 - !<!OperationGroup> 
--- a/modelerfour/test/scenarios/paging/namer.yaml
+++ b/modelerfour/test/scenarios/paging/namer.yaml
@ -1738,7 +1738,7 @@ operationGroups:
        nextLinkName: nextLink
    language: !<!Languages> 
      default:
-        name: GetMultiplePagesLro
+        name: GetMultiplePagesLRO
        description: A long-running paging operation that includes a nextLink that has 10 pages
        paging:
          itemName: values
--- a/modelerfour/test/scenarios/storage/namer.yaml
+++ b/modelerfour/test/scenarios/storage/namer.yaml
@ -155,19 +155,19 @@ schemas: !<!Schemas>
              value: Standard_LRS
              language:
                default:
-                  name: StandardLrs
+                  name: StandardLRS
                  description: ''
            - !<!ChoiceValue> 
              value: Standard_ZRS
              language:
                default:
-                  name: StandardZrs
+                  name: StandardZRS
                  description: ''
            - !<!ChoiceValue> 
              value: Standard_GRS
              language:
                default:
-                  name: StandardGrs
+                  name: StandardGRS
                  description: ''
            - !<!ChoiceValue> 
              value: Standard_RAGRS
@ -179,7 +179,7 @@ schemas: !<!Schemas>
              value: Premium_LRS
              language:
                default:
-                  name: PremiumLrs
+                  name: PremiumLRS
                  description: ''
            type: sealed-choice
            apiVersions:
@ -230,7 +230,7 @@ schemas: !<!Schemas>
              value: ResolvingDNS
              language:
                default:
-                  name: ResolvingDns
+                  name: ResolvingDNS
                  description: ''
            - !<!ChoiceValue> 
              value: Succeeded
--- a/modelerfour/test/scenarios/xml-service/namer.yaml
+++ b/modelerfour/test/scenarios/xml-service/namer.yaml
@ -1782,14 +1782,14 @@ schemas: !<!Schemas>
                        version: 1.0.0
                      language: !<!Languages> 
                        default:
-                          name: BlobPropertiesContentMd5
+                          name: BlobPropertiesContentMD5
                          description: ''
                      protocol: !<!Protocols> {}
                    required: false
                    serializedName: Content-MD5
                    language: !<!Languages> 
                      default:
-                        name: contentMd5
+                        name: contentMD5
                        description: ''
                    protocol: !<!Protocols> {}
                  - !<!Property> 
--- a/modelerfour/test/test-modeler.ts
+++ b/modelerfour/test/test-modeler.ts
@ -262,7 +262,7 @@ async function createPassThruSession(config: any, input: string, inputArtifactTy
              'cmyk': 'CMYK'
            },
            local: "_ + camel",
-            'preserve-uppercase-max-length': 2,
+            // 'preserve-uppercase-max-length': 3,
            /*
            for when playing with python style settings :