Cleanup operation defintions

input/fsh/operation-definitions/data-requirements-operation.fsh

@@ -93,8 +93,7 @@ The version of the canonical resource to analyze
 * parameter[=].documentation = """
 A business identifier of the canonical resource to be analyzed.
 """
-* parameter[=].type = #string
-* parameter[=].searchType = #token
+* parameter[=].type = #Identifier
 
 * parameter[+].name = #expression
 * parameter[=].use = #in
@@ -186,7 +185,22 @@ in the manifest library have the same meaning as specifying that code system or
 canonical version in the `system-version` parameter of an expand or the `canonicalVersion` 
 parameter.
 """
-* parameter[=].type = #uri
+* parameter[=].type = #Library
+
+* parameter[+].name = #manifestReference
+* parameter[=].use = #in
+* parameter[=].min = 0
+* parameter[=].max = "1"
+* parameter[=].documentation = """
+Specifies a reference to an asset-collection library that defines version bindings for code
+systems and other canonical resources referenced by the value set(s) being expanded
+and other canonical resources referenced by the artifact. When specified, code
+systems and other canonical resources identified as `depends-on` related artifacts 
+in the manifest library have the same meaning as specifying that code system or other
+canonical version in the `system-version` parameter of an expand or the `canonicalVersion` 
+parameter.
+"""
+* parameter[=].type = #canonical
 
 * parameter[+]
  * name = #include

input/fsh/operation-definitions/package-operation.fsh

@@ -86,8 +86,7 @@ TODO: More documentation about the operation, including inline examples:
  * min = 0
  * max = "1"
  * use = #in
- * type = #string
- * searchType = #token 
+ * type = #Identifier
  * documentation = "A business identifier of the Resource."
 
 * parameter[+]
@@ -155,7 +154,7 @@ including code systems.
  * min = 0
  * max = "1"
  * use = #in
- * type = #uri
+ * type = #Library
  * documentation = """
 Specifies an asset-collection library that defines version bindings for code
 systems and other canonical resources referenced by the value set(s) being expanded
@@ -166,6 +165,22 @@ canonical version in the `system-version` parameter of an expand or the `canonic
 parameter.
 """
 
+* parameter[+]
+ * name = #manifestReference
+ * min = 0
+ * max = "1"
+ * use = #in
+ * type = #canonical
+ * documentation = """
+Specifies a reference to an asset-collection library that defines version
+bindings for code systems and other canonical resources referenced by the value
+set(s) being expanded and other canonical resources referenced by the artifact.
+When specified, code systems and other canonical resources identified as
+`depends-on` related artifacts in the manifest library have the same meaning as
+specifying that code system or other canonical version in the `system-version`
+parameter of an expand or the `canonicalVersion` parameter.
+"""
+
 * parameter[+]
  * name = #offset
  * min = 0

input/fsh/operation-profiles/artifact-endpoint-configurable-profile.fsh

@@ -31,7 +31,6 @@ Rank each `artifactEndpointConfiguration` such that:
 
 NOTE: For evenly ranked `artifactEndpointConfiguration`s, order as defined in the
 OperationDefinition.
-
 """
 
 * parameter

input/fsh/operation-profiles/artifact-operation-profile.fsh

@@ -1,3 +1,8 @@
+Invariant: crmi-artifact-operation-1
+Description: "Parameter url type is uri or canonical"
+Expression: "type='uri' or type='canonical'"
+Severity: #error
+
 Profile: ArtifactOperation
 Id: crmi-artifact-operation
 Parent: OperationDefinition
@@ -33,7 +38,7 @@ NOTE: When involking canonical operations using any combination of `url`,
  * use = #in
  * min = 0
  * max = "1"
- * type = #uri
+ * obeys crmi-artifact-operation-1
 
 * parameter contains version 0..1 MS
 * parameter[version]
@@ -49,8 +54,7 @@ NOTE: When involking canonical operations using any combination of `url`,
  * use = #in
  * min = 0
  * max = "1"
- * type = #string
- * searchType = #token
+ * type = #Identifier
 
 * parameter contains resource 0..1 MS
 * parameter[resource]

input/fsh/operation-profiles/canonical-version-bindable-operation-profile.fsh

@@ -21,20 +21,20 @@ NOTE: This profile is here for backwards compatibility, see ArtifactVersionBinda
  * min = 0
  * max = "*"
  * use = #in
- * type = #uri
+ * type = #canonical
 
 * parameter contains checkCanonicalVersion 0..* MS
 * parameter[checkCanonicalVersion]
  * name = #checkCanonicalVersion (exactly)
  * min = 0
  * max = "*"
  * use = #in
- * type = #uri
+ * type = #canonical
 
 * parameter contains forceCanonicalVersion 0..* MS
 * parameter[forceCanonicalVersion]
  * name = #forceCanonicalVersion (exactly)
  * min = 0
  * max = "*"
  * use = #in
- * type = #uri
+ * type = #canonical

input/fsh/operation-profiles/data-configurable-profile.fsh

@@ -7,15 +7,11 @@ Operation where data endpoint configuration can be specified
 
 * `useServerData`: Whether to use data from the server performing the evaluation, exclusive with `dataEndpoint`.
 * `dataEndpoint`: An endpoint to use to access data referenced by retrieve operations in libraries, exclusive with `useServerData`.
-
 """
 
 * parameter
  * insert SliceOnName
 
-
-// TODO: Add invariant to allow one or the other of the following:
-
 * parameter contains useServerData 0..1 MS
 * parameter[useServerData]
  * name = #useServerData (exactly)

input/fsh/operation-profiles/manifestable-operation-profile.fsh

@@ -6,7 +6,7 @@ Description: """
 Operation where default manifest to resolve canonicals can be specified
 
 * `manifest`: Library resource where related-artifacts are used to define the versions of canonical resources.
-
+* `manifestReference`: Canonical reference to existing manifest Library.
 """
 
 * parameter
@@ -18,4 +18,13 @@ Operation where default manifest to resolve canonicals can be specified
  * min = 0
  * max = "1"
  * use = #in
- * type = #uri
+ * type = #Library
+
+* parameter contains manifestReference 0..1 MS
+* parameter[manifestReference]
+ * name = #manifestReference (exactly)
+ * min = 0
+ * max = "1"
+ * use = #in
+ * type = #canonical
+ * searchType = #reference