@nfdi4plants/arctrl 3.3.0 → 3.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.d.ts +11 -0
  2. package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.d.ts.map +1 -1
  3. package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.js +16 -2
  4. package/package.json +1 -1
package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.d.ts CHANGED
@@ -76,6 +76,14 @@ export declare class LDPropertyValue {
76
76
  static genIdFactorValue(name: string, value?: string, propertyID?: string): string;
77
77
  static genIdFragmentDescriptor(fileName: string): string;
78
78
  static genIdCWLParameter(name: string, values: string[]): string;
79
+ /**
80
+ * The PropertyValue id repeats the id of the FormalParameter that the value realizes, as the Workflow Run Crate
81
+ * examples do. Two PropertyValues of the same FormalParameter get the same id and merge in a flattened crate,
82
+ * whatever their values. ARCtrl gives every run its own FormalParameters (LDFormalParameter.genID with a run name),
83
+ * so runs with an input of the same name keep separate PropertyValues as long as their FormalParameter ids differ.
84
+ * An id without the FormalParameter prefix keeps everything after its leading "#", or the whole id when it has none.
85
+ */
86
+ static genIdCWLParameterFromFormalParameter(formalParameter: LDNode): string;
79
87
  static genIdPrefix(prefix: string): string;
80
88
  static genIdPosition(position: int32): string;
81
89
  static genIdGlob(glob: string): string;
@@ -85,6 +93,9 @@ export declare class LDPropertyValue {
85
93
  static createCharacteristicValue(name: string, value?: string, id?: string, propertyID?: string, unitCode?: string, unitText?: string, valueReference?: string, context?: LDContext): LDNode;
86
94
  static createFactorValue(name: string, value?: string, id?: string, propertyID?: string, unitCode?: string, unitText?: string, valueReference?: string, context?: LDContext): LDNode;
87
95
  static createFragmentDescriptor<$a extends string[], $b extends LDNode>(fileName: string, value?: string, id?: string, unitCode?: string, unitText?: string, valueReference?: string, measurementMethod?: string, description?: string, alternateName?: string, disambiguatingDescriptions?: Option<$a>, subjectOf?: Option<$b>, context?: LDContext): LDNode;
96
+ /**
97
+ * The id comes from exampleOfWork, and the values do not change it.
98
+ */
88
99
  static createCWLParameter(exampleOfWork: LDNode, name: string, values: string[], context?: LDContext): LDNode;
89
100
  static createDOI(value: string, context?: LDContext): LDNode;
90
101
  static createPubMedID(value: string, context?: LDContext): LDNode;
package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PropertyValue.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/ROCrate/LDTypes/PropertyValue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PropertyValue.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/ROCrate/LDTypes/PropertyValue.ts"],"names":[],"mappings":"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"}
package/dist/ts/ts/ROCrate/LDTypes/PropertyValue.js CHANGED
@@ -2,7 +2,7 @@ import { unwrap, value, defaultArg } from '../../../node_modules/@fable-org/fabl
2
2
  import { tryParse } from '../../../node_modules/@fable-org/fable-library-ts/Int32.js';
3
3
  import { LDNode } from '../LDObject.js';
4
4
  import { Exception, stringHash, int32ToString } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
5
- import { concat, join, replace } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
5
+ import { concat, join, replace, substring } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
6
6
  import { ResizeArray_map } from '../../Core/Helper/Collections.js';
7
7
  import { LDFormalParameter } from './FormalParameter.js';
8
8
  import { contains } from '../../../node_modules/@fable-org/fable-library-ts/Array.js';
@@ -609,6 +609,17 @@ class LDPropertyValue {
609
609
  static genIdCWLParameter(name, values) {
610
610
  return concat("#WorkflowParameter_", name, "_", values.length > 0 ? join("_", ResizeArray_map((v) => replace(v, " ", "_"), values)) : "");
611
611
  }
612
+ /**
613
+ * The PropertyValue id repeats the id of the FormalParameter that the value realizes, as the Workflow Run Crate
614
+ * examples do. Two PropertyValues of the same FormalParameter get the same id and merge in a flattened crate,
615
+ * whatever their values. ARCtrl gives every run its own FormalParameters (LDFormalParameter.genID with a run name),
616
+ * so runs with an input of the same name keep separate PropertyValues as long as their FormalParameter ids differ.
617
+ * An id without the FormalParameter prefix keeps everything after its leading "#", or the whole id when it has none.
618
+ */
619
+ static genIdCWLParameterFromFormalParameter(formalParameter) {
620
+ const id = formalParameter.Id;
621
+ return id.startsWith("#FormalParameter_") ? concat("#WorkflowParameter_", substring(id, "#FormalParameter_".length)) : id.startsWith("#") ? concat("#WorkflowParameter_", substring(id, 1)) : concat("#WorkflowParameter_", id);
622
+ }
612
623
  static genIdPrefix(prefix) {
613
624
  return concat("#Prefix_", prefix);
614
625
  }
@@ -688,8 +699,11 @@ class LDPropertyValue {
688
699
  }
689
700
  return fd;
690
701
  }
702
+ /**
703
+ * The id comes from exampleOfWork, and the values do not change it.
704
+ */
691
705
  static createCWLParameter(exampleOfWork, name, values, context) {
692
- const id = LDPropertyValue.genIdCWLParameter(name, values);
706
+ const id = LDPropertyValue.genIdCWLParameterFromFormalParameter(exampleOfWork);
693
707
  const pv = LDPropertyValue.create(name, void 0, id, void 0, void 0, void 0, void 0, unwrap(context));
694
708
  if (values.length > 0) {
695
709
  pv.SetProperty(LDPropertyValue.value, values, unwrap(context));
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "@nfdi4plants/arctrl",
4
- "version": "3.3.0",
4
+ "version": "3.3.1",
5
5
  "description": "Top level ARC DataModel and API function descriptions.",
6
6
  "repository": {
7
7
  "type": "git",