feat: packageDirectory.functions (#57)

* feat: packageDirectory.functions * feat: updates per PR Co-authored-by: Randi Wilson <[email protected]>
forcedotcom · Nov 9, 2022 · 65e11fd · 65e11fd
1 parent fe70589
commit 65e11fd
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 20 deletions.
diff --git a/examples/sfdx-project/package-complex.json b/examples/sfdx-project/package-complex.json
@@ -11,7 +11,11 @@
       "versionName": "Winter ‘20",
       "versionDescription": "Welcome to Winter 2020 Release of Expense Manager Util Package",
       "versionNumber": "4.7.0.NEXT",
-      "definitionFile": "config/scratch-org-def.json"
+      "definitionFile": "config/scratch-org-def.json",
+      "functions": [
+        "functions/myfunction",
+        "functions/anotherfunction"
+      ]
     },
     {
       "path": "exp-core",
@@ -55,4 +59,4 @@
     "External Apex [email protected]": "04tB0000000IB1EIAW",
     "Expense Manager": "0HoB00000004CFuKAM"
   }
-}
+}
diff --git a/sfdx-project.schema.json b/sfdx-project.schema.json
@@ -5,7 +5,9 @@
   "description": "The properties and shape of the SFDX project",
   "type": "object",
   "additionalProperties": false,
-  "required": ["packageDirectories"],
+  "required": [
+    "packageDirectories"
+  ],
   "properties": {
     "packageDirectories": {
       "title": "Package Directories",
@@ -16,22 +18,68 @@
       "items": {
         "type": "object",
         "dependencies": {
-          "ancestorId": ["package", "versionNumber"],
-          "ancestorVersion": ["package", "versionNumber"],
-          "apexTestAccess": ["package", "versionNumber"],
-          "definitionFile": ["package", "versionNumber"],
-          "dependencies": ["package", "versionNumber"],
-          "package": ["versionNumber"],
-          "postInstallScript": ["package", "versionNumber"],
-          "postInstallUrl": ["package", "versionNumber"],
-          "releaseNotesUrl": ["package", "versionNumber"],
-          "uninstallScript": ["package", "versionNumber"],
-          "unpackagedMetadata": ["package", "versionNumber"],
-          "versionDescription": ["package", "versionNumber"],
-          "versionName": ["package", "versionNumber"],
-          "versionNumber": ["package"]
+          "ancestorId": [
+            "package",
+            "versionNumber"
+          ],
+          "ancestorVersion": [
+            "package",
+            "versionNumber"
+          ],
+          "apexTestAccess": [
+            "package",
+            "versionNumber"
+          ],
+          "definitionFile": [
+            "package",
+            "versionNumber"
+          ],
+          "dependencies": [
+            "package",
+            "versionNumber"
+          ],
+          "functions": [
+            "package",
+            "versionNumber"
+          ],
+          "package": [
+            "versionNumber"
+          ],
+          "postInstallScript": [
+            "package",
+            "versionNumber"
+          ],
+          "postInstallUrl": [
+            "package",
+            "versionNumber"
+          ],
+          "releaseNotesUrl": [
+            "package",
+            "versionNumber"
+          ],
+          "uninstallScript": [
+            "package",
+            "versionNumber"
+          ],
+          "unpackagedMetadata": [
+            "package",
+            "versionNumber"
+          ],
+          "versionDescription": [
+            "package",
+            "versionNumber"
+          ],
+          "versionName": [
+            "package",
+            "versionNumber"
+          ],
+          "versionNumber": [
+            "package"
+          ]
         },
-        "required": ["path"],
+        "required": [
+          "path"
+        ],
         "additionalProperties": false,
         "properties": {
           "ancestorId": {
@@ -52,6 +100,9 @@
           "dependencies": {
             "$ref": "#/definitions/packageDirectory.dependencies"
           },
+          "functions": {
+            "$ref": "#/definitions/packageDirectory.functions"
+          },
           "includeProfileUserLicenses": {
             "$ref": "#/definitions/packageDirectory.includeProfileUserLicenses"
           },
@@ -185,7 +236,9 @@
       "description": "To specify dependencies for 2GP within the same Dev Hub, use either the package version alias or a combination of the package name and the version number.",
       "items": {
         "type": "object",
-        "required": ["package"],
+        "required": [
+          "package"
+        ],
         "properties": {
           "package": {
             "type": "string"
@@ -199,6 +252,14 @@
         }
       }
     },
+    "packageDirectory.functions": {
+      "title": "Functions To Package",
+      "type": "array",
+      "description": "Relative path to function directories to be packaged.",
+      "items": {
+        "type": "string"
+      }
+    },
     "packageDirectory.ancestorId": {
       "title": "Ancestor ID",
       "type": "string",
@@ -233,7 +294,9 @@
       "type": "object",
       "title": "Unpackaged Metadata",
       "description": "Metadata not meant to be packaged, but deployed when testing packaged metadata",
-      "required": ["path"],
+      "required": [
+        "path"
+      ],
       "properties": {
         "path": {
           "type": "string",