Made #44 optional

delegateas · Mar 2, 2018 · 25f58ab · 25f58ab
1 parent 6c22f99
commit 25f58ab
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/src/XrmDefinitelyTyped/CommandLine/Arguments.fs b/src/XrmDefinitelyTyped/CommandLine/Arguments.fs
@@ -80,6 +80,11 @@ type Args private () =
       description="Comma-separated list of named semicolon-separated lists of form GUIDs that should be intersected. "
        + "Example: 'MyAccountIntersect: 284FF02B-BDD1-4BB0-9BCF-6CFDBDA130D4;16068A3B-D428-4430-AEF6-397CE2AEFE07, MyContactIntersect: F4B3397C-C1A5-40BE-89DD-CEA5F7064D1D;824CFA3C-3EB4-4746-BA3C-7F1DFCA114C0'"
       required=false }
+
+    { command="generateMappings"
+      altCommands=["gm"]
+      description="Set to true if attribute and control mappings should be generated"
+      required=false }
   ]
 
   static member connectionArgs = [

diff --git a/src/XrmDefinitelyTyped/CommandLine/Program.fs b/src/XrmDefinitelyTyped/CommandLine/Program.fs
@@ -61,6 +61,7 @@ let getGenerationSettings parsedArgs =
     webNs = getArg parsedArgs "web" nsSanitizer
     viewNs = getArg parsedArgs "views" nsSanitizer
     formIntersects = formIntersects 
+    generateMappings = getArg parsedArgs "generateMappings" parseBoolish ?| false
   }
 
 

diff --git a/src/XrmDefinitelyTyped/CreateTypeScript/CreateFormDts.fs b/src/XrmDefinitelyTyped/CreateTypeScript/CreateFormDts.fs
@@ -183,14 +183,18 @@ let getControlFuncs (controls: XrmFormControl list) (crmVersion: Version)=
 
 
 /// Generate internal namespace for keeping track all the collections.
-let getFormNamespace (form: XrmForm) crmVersion =
+let getFormNamespace (form: XrmForm) crmVersion generateMappings =
+  let baseInterfaces =
+    [ getAttributeCollection form.attributes
+      getControlCollection form.controls crmVersion
+      getTabCollection form.tabs ]
   Namespace.Create(form.name,
     interfaces = 
-      [ getAttributeCollection form.attributes 
-        getAttributeCollectionMap form.attributes
-        getControlCollection form.controls crmVersion
-        getControlCollectionMap form.controls crmVersion
-        getTabCollection form.tabs ],
+      (if generateMappings then 
+        baseInterfaces @ 
+        [getAttributeCollectionMap form.attributes
+         getControlCollectionMap form.controls crmVersion] 
+      else baseInterfaces),
     namespaces = 
       [ Namespace.Create("Tabs", interfaces = getSectionCollections form.tabs) ])
 
@@ -209,7 +213,7 @@ let getFormInterface (form: XrmForm) crmVersion =
 
 /// Generate the namespace containing all the form interface and internal 
 /// namespaces for collections.
-let getFormDts (form: XrmForm) crmVersion = 
+let getFormDts (form: XrmForm) crmVersion generateMappings = 
   let nsName = 
     sprintf "Form.%s%s" 
       (form.entityName |> Utility.sanitizeString)
@@ -220,7 +224,7 @@ let getFormDts (form: XrmForm) crmVersion =
   Namespace.Create(
     nsName,
     declare = true,
-    namespaces = [ getFormNamespace form crmVersion],
+    namespaces = [ getFormNamespace form crmVersion generateMappings],
     interfaces = [ getFormInterface form crmVersion]) 
   |> nsToString
 
diff --git a/src/XrmDefinitelyTyped/Domain.fs b/src/XrmDefinitelyTyped/Domain.fs
@@ -31,6 +31,7 @@ type XdtGenerationSettings = {
   webNs: OptionalNamespace
   viewNs: OptionalNamespace
   formIntersects: FormIntersect [] option
+  generateMappings: bool
 }
 
 type EntityName = string

diff --git a/src/XrmDefinitelyTyped/Generation/FileGeneration.fs b/src/XrmDefinitelyTyped/Generation/FileGeneration.fs
@@ -247,7 +247,7 @@ let generateWebEntityDefs ns state =
   defs
 
 /// Generate the Form definitions
-let generateFormDefs state crmVersion = 
+let generateFormDefs state crmVersion generateMappings = 
   printf "Generation Form definitions..."
   let getFormType xrmForm = xrmForm.formType ?|> sprintf "/%s" ?| ""
 
@@ -263,7 +263,7 @@ let generateFormDefs state crmVersion =
     |> Array.concat
     |> Array.Parallel.map (fun xrmForm -> 
          let path = sprintf "%s/Form/%s%s" state.outputDir xrmForm.entityName (getFormType xrmForm)
-         let lines = getFormDts xrmForm crmVersion
+         let lines = getFormDts xrmForm crmVersion generateMappings
          sprintf "%s/%s.d.ts" path xrmForm.name, lines)
 
   printfn "Done!"

diff --git a/src/XrmDefinitelyTyped/Generation/GenerationMain.fs b/src/XrmDefinitelyTyped/Generation/GenerationMain.fs
@@ -39,7 +39,7 @@ let generateFromRaw gSettings rawState =
   let defs = 
     seq {
       yield! generateEnumDefs data
-      if not gSettings.skipForms then yield! generateFormDefs data crmVersion
+      if not gSettings.skipForms then yield! generateFormDefs data crmVersion gSettings.generateMappings
 
       match crmVersion .>= (8,2,0,0) with
       | true -> 

diff --git a/src/XrmDefinitelyTyped/XrmDefinitelyTyped.fs b/src/XrmDefinitelyTyped/XrmDefinitelyTyped.fs
@@ -9,7 +9,7 @@ open GenerationMain
 
 type XrmDefinitelyTyped private () = 
 
-  static member GenerateFromCrm(url, username, password, ?domain, ?ap, ?outDir, ?jsLib, ?tsLib, ?entities, ?solutions, ?crmVersion, ?useDeprecated, ?skipForms, ?oneFile, ?restNs, ?webNs, ?viewNs, ?formIntersects) = 
+  static member GenerateFromCrm(url, username, password, ?domain, ?ap, ?outDir, ?jsLib, ?tsLib, ?entities, ?solutions, ?crmVersion, ?useDeprecated, ?skipForms, ?oneFile, ?restNs, ?webNs, ?viewNs, ?formIntersects, ?generateMappings) = 
     let xrmAuth = 
       { XrmAuthentication.url = Uri(url)
         username = username
@@ -34,6 +34,7 @@ type XrmDefinitelyTyped private () =
         webNs = webNs
         viewNs = viewNs
         formIntersects = formIntersects
+        generateMappings = generateMappings ?| false
        }
 
     XrmDefinitelyTyped.GenerateFromCrm(xrmAuth, rSettings, gSettings)