@shaclmate/shacl-ast 4.0.23 → 4.0.25

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.
@@ -129,16 +129,16 @@ export class AbstractShapesGraph {
129
129
  for (const object of objects) {
130
130
  switch (object.$type) {
131
131
  case "NodeShape":
132
- this.nodeShapesByIdentifier.set(object.$identifier, object);
132
+ this.nodeShapesByIdentifier.set(object.$identifier(), object);
133
133
  break;
134
134
  case "Ontology":
135
- this.ontologiesByIdentifier.set(object.$identifier, object);
135
+ this.ontologiesByIdentifier.set(object.$identifier(), object);
136
136
  break;
137
137
  case "PropertyGroup":
138
- this.propertyGroupsByIdentifier.set(object.$identifier, object);
138
+ this.propertyGroupsByIdentifier.set(object.$identifier(), object);
139
139
  break;
140
140
  case "PropertyShape":
141
- this.propertyShapesByIdentifier.set(object.$identifier, object);
141
+ this.propertyShapesByIdentifier.set(object.$identifier(), object);
142
142
  break;
143
143
  }
144
144
  }
@@ -89,7 +89,7 @@ export type $ToRdfResourceValuesFunction<ValueT, ReturnT extends BlankNode | Lit
89
89
  resourceSet: ResourceSet;
90
90
  }) => ReturnT[];
91
91
  export interface PropertyShape {
92
- readonly $identifier: PropertyShape.$Identifier;
92
+ readonly $identifier: () => PropertyShape.$Identifier;
93
93
  readonly $type: "PropertyShape";
94
94
  readonly and: Maybe<readonly (BlankNode | NamedNode)[]>;
95
95
  readonly classes: readonly NamedNode[];
@@ -126,7 +126,7 @@ export interface PropertyShape {
126
126
  }
127
127
  export declare namespace PropertyShape {
128
128
  function $create(parameters: {
129
- readonly $identifier?: (BlankNode | NamedNode) | string;
129
+ readonly $identifier?: (() => PropertyShape.$Identifier) | (BlankNode | NamedNode) | string;
130
130
  readonly and?: Maybe<readonly (BlankNode | NamedNode)[]> | readonly (BlankNode | NamedNode)[] | readonly string[];
131
131
  readonly classes?: readonly NamedNode[] | readonly string[];
132
132
  readonly comment?: Maybe<string> | string;
@@ -595,14 +595,14 @@ export declare namespace PropertyShape {
595
595
  function $toString(_propertyShape: PropertyShape): string;
596
596
  }
597
597
  export interface PropertyGroup {
598
- readonly $identifier: PropertyGroup.$Identifier;
598
+ readonly $identifier: () => PropertyGroup.$Identifier;
599
599
  readonly $type: "PropertyGroup";
600
600
  readonly comment: Maybe<string>;
601
601
  readonly label: Maybe<string>;
602
602
  }
603
603
  export declare namespace PropertyGroup {
604
604
  function $create(parameters?: {
605
- readonly $identifier?: (BlankNode | NamedNode) | string;
605
+ readonly $identifier?: (() => PropertyGroup.$Identifier) | (BlankNode | NamedNode) | string;
606
606
  readonly comment?: Maybe<string> | string;
607
607
  readonly label?: Maybe<string> | string;
608
608
  }): PropertyGroup;
@@ -670,14 +670,14 @@ export declare namespace PropertyGroup {
670
670
  function $toString(_propertyGroup: PropertyGroup): string;
671
671
  }
672
672
  export interface Ontology {
673
- readonly $identifier: Ontology.$Identifier;
673
+ readonly $identifier: () => Ontology.$Identifier;
674
674
  readonly $type: "Ontology";
675
675
  readonly comment: Maybe<string>;
676
676
  readonly label: Maybe<string>;
677
677
  }
678
678
  export declare namespace Ontology {
679
679
  function $create(parameters?: {
680
- readonly $identifier?: (BlankNode | NamedNode) | string;
680
+ readonly $identifier?: (() => Ontology.$Identifier) | (BlankNode | NamedNode) | string;
681
681
  readonly comment?: Maybe<string> | string;
682
682
  readonly label?: Maybe<string> | string;
683
683
  }): Ontology;
@@ -745,7 +745,7 @@ export declare namespace Ontology {
745
745
  function $toString(_ontology: Ontology): string;
746
746
  }
747
747
  export interface NodeShape {
748
- readonly $identifier: NodeShape.$Identifier;
748
+ readonly $identifier: () => NodeShape.$Identifier;
749
749
  readonly $type: "NodeShape";
750
750
  readonly and: Maybe<readonly (BlankNode | NamedNode)[]>;
751
751
  readonly classes: readonly NamedNode[];
@@ -780,7 +780,7 @@ export interface NodeShape {
780
780
  }
781
781
  export declare namespace NodeShape {
782
782
  function $create(parameters?: {
783
- readonly $identifier?: (BlankNode | NamedNode) | string;
783
+ readonly $identifier?: (() => NodeShape.$Identifier) | (BlankNode | NamedNode) | string;
784
784
  readonly and?: Maybe<readonly (BlankNode | NamedNode)[]> | readonly (BlankNode | NamedNode)[] | readonly string[];
785
785
  readonly classes?: readonly NamedNode[] | readonly string[];
786
786
  readonly closed?: Maybe<boolean> | boolean;
@@ -3176,14 +3176,14 @@ export declare class $RdfjsDatasetObjectSet implements $ObjectSet {
3176
3176
  objects(query?: $ObjectSet.Query<$Object.$Filter, $Object.$Identifier>): Promise<Either<Error, readonly $Object[]>>;
3177
3177
  objectsSync(query?: $ObjectSet.Query<$Object.$Filter, $Object.$Identifier>): Either<Error, readonly $Object[]>;
3178
3178
  protected $objectsSync<ObjectT extends {
3179
- readonly $identifier: ObjectIdentifierT;
3179
+ readonly $identifier: () => ObjectIdentifierT;
3180
3180
  }, ObjectFilterT, ObjectIdentifierT extends BlankNode | NamedNode>(namedObjectType: {
3181
3181
  $filter: (filter: ObjectFilterT, value: ObjectT) => boolean;
3182
3182
  $fromRdfResource: $FromRdfResourceFunction<ObjectT>;
3183
3183
  $fromRdfTypes: readonly NamedNode[];
3184
3184
  }, query?: $ObjectSet.Query<ObjectFilterT, ObjectIdentifierT>): Either<Error, readonly ObjectT[]>;
3185
3185
  protected $objectUnionsSync<ObjectT extends {
3186
- readonly $identifier: ObjectIdentifierT;
3186
+ readonly $identifier: () => ObjectIdentifierT;
3187
3187
  }, ObjectFilterT, ObjectIdentifierT extends BlankNode | NamedNode>(namedObjectTypes: readonly {
3188
3188
  $filter: (filter: ObjectFilterT, value: ObjectT) => boolean;
3189
3189
  $fromRdfResource: $FromRdfResourceFunction<ObjectT>;
package/dist/generated.js CHANGED
@@ -247,18 +247,23 @@ function $shaclPropertyFromRdf({ graph, propertySchema, resource, typeFromRdf, }
247
247
  export var PropertyShape;
248
248
  (function (PropertyShape) {
249
249
  function $create(parameters) {
250
+ const $identifierParameter = parameters.$identifier;
250
251
  let $identifier;
251
- if (typeof parameters.$identifier === "object") {
252
- $identifier = parameters.$identifier;
252
+ if (typeof $identifierParameter === "function") {
253
+ $identifier = $identifierParameter;
253
254
  }
254
- else if (typeof parameters.$identifier === "string") {
255
- $identifier = dataFactory.namedNode(parameters.$identifier);
255
+ else if (typeof $identifierParameter === "object") {
256
+ $identifier = () => $identifierParameter;
256
257
  }
257
- else if (parameters.$identifier === undefined) {
258
- $identifier = dataFactory.blankNode();
258
+ else if (typeof $identifierParameter === "string") {
259
+ $identifier = () => dataFactory.namedNode($identifierParameter);
260
+ }
261
+ else if ($identifierParameter === undefined) {
262
+ const $eagerIdentifier = dataFactory.blankNode();
263
+ $identifier = () => $eagerIdentifier;
259
264
  }
260
265
  else {
261
- $identifier = parameters.$identifier;
266
+ $identifier = $identifierParameter;
262
267
  }
263
268
  const $type = "PropertyShape";
264
269
  let and;
@@ -823,7 +828,7 @@ export var PropertyShape;
823
828
  })($Identifier = PropertyShape.$Identifier || (PropertyShape.$Identifier = {}));
824
829
  function $filter(filter, value) {
825
830
  if (filter.$identifier !== undefined &&
826
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
831
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
827
832
  return false;
828
833
  }
829
834
  if (filter.and !== undefined &&
@@ -968,7 +973,7 @@ export var PropertyShape;
968
973
  ignoreRdfType,
969
974
  objectSet,
970
975
  preferredLanguages,
971
- });
976
+ }).map($create);
972
977
  };
973
978
  PropertyShape.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
974
979
  .toResource()
@@ -1976,7 +1981,7 @@ export var PropertyShape;
1976
1981
  dataFactory: dataFactory,
1977
1982
  dataset: datasetFactory.dataset(),
1978
1983
  });
1979
- const resource = resourceSet.resource(_propertyShape.$identifier);
1984
+ const resource = resourceSet.resource(_propertyShape.$identifier());
1980
1985
  if (!options?.ignoreRdfType) {
1981
1986
  resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyShape"), options?.graph);
1982
1987
  }
@@ -1987,7 +1992,7 @@ export var PropertyShape;
1987
1992
  currentSubListResource = listResource;
1988
1993
  }
1989
1994
  else {
1990
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
1995
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
1991
1996
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
1992
1997
  currentSubListResource = newSubListResource;
1993
1998
  }
@@ -1998,7 +2003,7 @@ export var PropertyShape;
1998
2003
  return { currentSubListResource, listResource };
1999
2004
  }, {
2000
2005
  currentSubListResource: null,
2001
- listResource: resourceSet.resource(dataFactory.blankNode()),
2006
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
2002
2007
  }).listResource.identifier
2003
2008
  : $RdfVocabularies.rdf.nil,
2004
2009
  ]), options?.graph);
@@ -2026,7 +2031,7 @@ export var PropertyShape;
2026
2031
  currentSubListResource = listResource;
2027
2032
  }
2028
2033
  else {
2029
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
2034
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
2030
2035
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
2031
2036
  currentSubListResource = newSubListResource;
2032
2037
  }
@@ -2037,7 +2042,7 @@ export var PropertyShape;
2037
2042
  return { currentSubListResource, listResource };
2038
2043
  }, {
2039
2044
  currentSubListResource: null,
2040
- listResource: resourceSet.resource(dataFactory.blankNode()),
2045
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
2041
2046
  }).listResource.identifier
2042
2047
  : $RdfVocabularies.rdf.nil,
2043
2048
  ]), options?.graph);
@@ -2052,7 +2057,7 @@ export var PropertyShape;
2052
2057
  currentSubListResource = listResource;
2053
2058
  }
2054
2059
  else {
2055
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
2060
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
2056
2061
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
2057
2062
  currentSubListResource = newSubListResource;
2058
2063
  }
@@ -2063,7 +2068,7 @@ export var PropertyShape;
2063
2068
  return { currentSubListResource, listResource };
2064
2069
  }, {
2065
2070
  currentSubListResource: null,
2066
- listResource: resourceSet.resource(dataFactory.blankNode()),
2071
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
2067
2072
  }).listResource.identifier
2068
2073
  : $RdfVocabularies.rdf.nil,
2069
2074
  ]), options?.graph);
@@ -2104,7 +2109,7 @@ export var PropertyShape;
2104
2109
  currentSubListResource = listResource;
2105
2110
  }
2106
2111
  else {
2107
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
2112
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
2108
2113
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
2109
2114
  currentSubListResource = newSubListResource;
2110
2115
  }
@@ -2115,7 +2120,7 @@ export var PropertyShape;
2115
2120
  return { currentSubListResource, listResource };
2116
2121
  }, {
2117
2122
  currentSubListResource: null,
2118
- listResource: resourceSet.resource(dataFactory.blankNode()),
2123
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
2119
2124
  }).listResource.identifier
2120
2125
  : $RdfVocabularies.rdf.nil,
2121
2126
  ]), options?.graph);
@@ -2143,7 +2148,7 @@ export var PropertyShape;
2143
2148
  currentSubListResource = listResource;
2144
2149
  }
2145
2150
  else {
2146
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
2151
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
2147
2152
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
2148
2153
  currentSubListResource = newSubListResource;
2149
2154
  }
@@ -2154,7 +2159,7 @@ export var PropertyShape;
2154
2159
  return { currentSubListResource, listResource };
2155
2160
  }, {
2156
2161
  currentSubListResource: null,
2157
- listResource: resourceSet.resource(dataFactory.blankNode()),
2162
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
2158
2163
  }).listResource.identifier
2159
2164
  : $RdfVocabularies.rdf.nil,
2160
2165
  ]), options?.graph);
@@ -2163,7 +2168,7 @@ export var PropertyShape;
2163
2168
  PropertyShape.$toRdfResource = $toRdfResource;
2164
2169
  function $propertiesToStrings(_propertyShape) {
2165
2170
  return $compactRecord({
2166
- $identifier: _propertyShape.$identifier.toString(),
2171
+ $identifier: _propertyShape.$identifier().toString(),
2167
2172
  label: _propertyShape.label.map((item) => item.toString()).extract(),
2168
2173
  name: _propertyShape.name.map((item) => item.toString()).extract(),
2169
2174
  path: $PropertyPath.$toString(_propertyShape.path),
@@ -2178,18 +2183,23 @@ export var PropertyShape;
2178
2183
  export var PropertyGroup;
2179
2184
  (function (PropertyGroup) {
2180
2185
  function $create(parameters) {
2186
+ const $identifierParameter = parameters?.$identifier;
2181
2187
  let $identifier;
2182
- if (typeof parameters?.$identifier === "object") {
2183
- $identifier = parameters?.$identifier;
2188
+ if (typeof $identifierParameter === "function") {
2189
+ $identifier = $identifierParameter;
2184
2190
  }
2185
- else if (typeof parameters?.$identifier === "string") {
2186
- $identifier = dataFactory.namedNode(parameters?.$identifier);
2191
+ else if (typeof $identifierParameter === "object") {
2192
+ $identifier = () => $identifierParameter;
2187
2193
  }
2188
- else if (parameters?.$identifier === undefined) {
2189
- $identifier = dataFactory.blankNode();
2194
+ else if (typeof $identifierParameter === "string") {
2195
+ $identifier = () => dataFactory.namedNode($identifierParameter);
2196
+ }
2197
+ else if ($identifierParameter === undefined) {
2198
+ const $eagerIdentifier = dataFactory.blankNode();
2199
+ $identifier = () => $eagerIdentifier;
2190
2200
  }
2191
2201
  else {
2192
- $identifier = parameters?.$identifier;
2202
+ $identifier = $identifierParameter;
2193
2203
  }
2194
2204
  const $type = "PropertyGroup";
2195
2205
  let comment;
@@ -2228,7 +2238,7 @@ export var PropertyGroup;
2228
2238
  })($Identifier = PropertyGroup.$Identifier || (PropertyGroup.$Identifier = {}));
2229
2239
  function $filter(filter, value) {
2230
2240
  if (filter.$identifier !== undefined &&
2231
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
2241
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
2232
2242
  return false;
2233
2243
  }
2234
2244
  if (filter.comment !== undefined &&
@@ -2253,7 +2263,7 @@ export var PropertyGroup;
2253
2263
  ignoreRdfType,
2254
2264
  objectSet,
2255
2265
  preferredLanguages,
2256
- });
2266
+ }).map($create);
2257
2267
  };
2258
2268
  PropertyGroup.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
2259
2269
  .toResource()
@@ -2362,7 +2372,7 @@ export var PropertyGroup;
2362
2372
  dataFactory: dataFactory,
2363
2373
  dataset: datasetFactory.dataset(),
2364
2374
  });
2365
- const resource = resourceSet.resource(_propertyGroup.$identifier);
2375
+ const resource = resourceSet.resource(_propertyGroup.$identifier());
2366
2376
  if (!options?.ignoreRdfType) {
2367
2377
  resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#PropertyGroup"), options?.graph);
2368
2378
  }
@@ -2377,7 +2387,7 @@ export var PropertyGroup;
2377
2387
  PropertyGroup.$toRdfResource = $toRdfResource;
2378
2388
  function $propertiesToStrings(_propertyGroup) {
2379
2389
  return $compactRecord({
2380
- $identifier: _propertyGroup.$identifier.toString(),
2390
+ $identifier: _propertyGroup.$identifier().toString(),
2381
2391
  label: _propertyGroup.label.map((item) => item.toString()).extract(),
2382
2392
  });
2383
2393
  }
@@ -2390,18 +2400,23 @@ export var PropertyGroup;
2390
2400
  export var Ontology;
2391
2401
  (function (Ontology) {
2392
2402
  function $create(parameters) {
2403
+ const $identifierParameter = parameters?.$identifier;
2393
2404
  let $identifier;
2394
- if (typeof parameters?.$identifier === "object") {
2395
- $identifier = parameters?.$identifier;
2405
+ if (typeof $identifierParameter === "function") {
2406
+ $identifier = $identifierParameter;
2396
2407
  }
2397
- else if (typeof parameters?.$identifier === "string") {
2398
- $identifier = dataFactory.namedNode(parameters?.$identifier);
2408
+ else if (typeof $identifierParameter === "object") {
2409
+ $identifier = () => $identifierParameter;
2399
2410
  }
2400
- else if (parameters?.$identifier === undefined) {
2401
- $identifier = dataFactory.blankNode();
2411
+ else if (typeof $identifierParameter === "string") {
2412
+ $identifier = () => dataFactory.namedNode($identifierParameter);
2413
+ }
2414
+ else if ($identifierParameter === undefined) {
2415
+ const $eagerIdentifier = dataFactory.blankNode();
2416
+ $identifier = () => $eagerIdentifier;
2402
2417
  }
2403
2418
  else {
2404
- $identifier = parameters?.$identifier;
2419
+ $identifier = $identifierParameter;
2405
2420
  }
2406
2421
  const $type = "Ontology";
2407
2422
  let comment;
@@ -2440,7 +2455,7 @@ export var Ontology;
2440
2455
  })($Identifier = Ontology.$Identifier || (Ontology.$Identifier = {}));
2441
2456
  function $filter(filter, value) {
2442
2457
  if (filter.$identifier !== undefined &&
2443
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
2458
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
2444
2459
  return false;
2445
2460
  }
2446
2461
  if (filter.comment !== undefined &&
@@ -2465,7 +2480,7 @@ export var Ontology;
2465
2480
  ignoreRdfType,
2466
2481
  objectSet,
2467
2482
  preferredLanguages,
2468
- });
2483
+ }).map($create);
2469
2484
  };
2470
2485
  Ontology.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
2471
2486
  .toResource()
@@ -2574,7 +2589,7 @@ export var Ontology;
2574
2589
  dataFactory: dataFactory,
2575
2590
  dataset: datasetFactory.dataset(),
2576
2591
  });
2577
- const resource = resourceSet.resource(_ontology.$identifier);
2592
+ const resource = resourceSet.resource(_ontology.$identifier());
2578
2593
  if (!options?.ignoreRdfType) {
2579
2594
  resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/2002/07/owl#Ontology"), options?.graph);
2580
2595
  }
@@ -2589,7 +2604,7 @@ export var Ontology;
2589
2604
  Ontology.$toRdfResource = $toRdfResource;
2590
2605
  function $propertiesToStrings(_ontology) {
2591
2606
  return $compactRecord({
2592
- $identifier: _ontology.$identifier.toString(),
2607
+ $identifier: _ontology.$identifier().toString(),
2593
2608
  label: _ontology.label.map((item) => item.toString()).extract(),
2594
2609
  });
2595
2610
  }
@@ -2602,18 +2617,23 @@ export var Ontology;
2602
2617
  export var NodeShape;
2603
2618
  (function (NodeShape) {
2604
2619
  function $create(parameters) {
2620
+ const $identifierParameter = parameters?.$identifier;
2605
2621
  let $identifier;
2606
- if (typeof parameters?.$identifier === "object") {
2607
- $identifier = parameters?.$identifier;
2622
+ if (typeof $identifierParameter === "function") {
2623
+ $identifier = $identifierParameter;
2608
2624
  }
2609
- else if (typeof parameters?.$identifier === "string") {
2610
- $identifier = dataFactory.namedNode(parameters?.$identifier);
2625
+ else if (typeof $identifierParameter === "object") {
2626
+ $identifier = () => $identifierParameter;
2611
2627
  }
2612
- else if (parameters?.$identifier === undefined) {
2613
- $identifier = dataFactory.blankNode();
2628
+ else if (typeof $identifierParameter === "string") {
2629
+ $identifier = () => dataFactory.namedNode($identifierParameter);
2630
+ }
2631
+ else if ($identifierParameter === undefined) {
2632
+ const $eagerIdentifier = dataFactory.blankNode();
2633
+ $identifier = () => $eagerIdentifier;
2614
2634
  }
2615
2635
  else {
2616
- $identifier = parameters?.$identifier;
2636
+ $identifier = $identifierParameter;
2617
2637
  }
2618
2638
  const $type = "NodeShape";
2619
2639
  let and;
@@ -3149,7 +3169,7 @@ export var NodeShape;
3149
3169
  })($Identifier = NodeShape.$Identifier || (NodeShape.$Identifier = {}));
3150
3170
  function $filter(filter, value) {
3151
3171
  if (filter.$identifier !== undefined &&
3152
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
3172
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
3153
3173
  return false;
3154
3174
  }
3155
3175
  if (filter.and !== undefined &&
@@ -3286,7 +3306,7 @@ export var NodeShape;
3286
3306
  ignoreRdfType,
3287
3307
  objectSet,
3288
3308
  preferredLanguages,
3289
- });
3309
+ }).map($create);
3290
3310
  };
3291
3311
  NodeShape.$fromRdfResourceValues = (values, options) => values.chain((values) => values.chainMap((value) => value
3292
3312
  .toResource()
@@ -4225,7 +4245,7 @@ export var NodeShape;
4225
4245
  dataFactory: dataFactory,
4226
4246
  dataset: datasetFactory.dataset(),
4227
4247
  });
4228
- const resource = resourceSet.resource(_nodeShape.$identifier);
4248
+ const resource = resourceSet.resource(_nodeShape.$identifier());
4229
4249
  if (!options?.ignoreRdfType) {
4230
4250
  resource.add($RdfVocabularies.rdf.type, dataFactory.namedNode("http://www.w3.org/ns/shacl#NodeShape"), options?.graph);
4231
4251
  }
@@ -4236,7 +4256,7 @@ export var NodeShape;
4236
4256
  currentSubListResource = listResource;
4237
4257
  }
4238
4258
  else {
4239
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4259
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4240
4260
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4241
4261
  currentSubListResource = newSubListResource;
4242
4262
  }
@@ -4247,7 +4267,7 @@ export var NodeShape;
4247
4267
  return { currentSubListResource, listResource };
4248
4268
  }, {
4249
4269
  currentSubListResource: null,
4250
- listResource: resourceSet.resource(dataFactory.blankNode()),
4270
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4251
4271
  }).listResource.identifier
4252
4272
  : $RdfVocabularies.rdf.nil,
4253
4273
  ]), options?.graph);
@@ -4275,7 +4295,7 @@ export var NodeShape;
4275
4295
  currentSubListResource = listResource;
4276
4296
  }
4277
4297
  else {
4278
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4298
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4279
4299
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4280
4300
  currentSubListResource = newSubListResource;
4281
4301
  }
@@ -4286,7 +4306,7 @@ export var NodeShape;
4286
4306
  return { currentSubListResource, listResource };
4287
4307
  }, {
4288
4308
  currentSubListResource: null,
4289
- listResource: resourceSet.resource(dataFactory.blankNode()),
4309
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4290
4310
  }).listResource.identifier
4291
4311
  : $RdfVocabularies.rdf.nil,
4292
4312
  ]), options?.graph);
@@ -4297,7 +4317,7 @@ export var NodeShape;
4297
4317
  currentSubListResource = listResource;
4298
4318
  }
4299
4319
  else {
4300
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4320
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4301
4321
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4302
4322
  currentSubListResource = newSubListResource;
4303
4323
  }
@@ -4308,7 +4328,7 @@ export var NodeShape;
4308
4328
  return { currentSubListResource, listResource };
4309
4329
  }, {
4310
4330
  currentSubListResource: null,
4311
- listResource: resourceSet.resource(dataFactory.blankNode()),
4331
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4312
4332
  }).listResource.identifier
4313
4333
  : $RdfVocabularies.rdf.nil,
4314
4334
  ]), options?.graph);
@@ -4323,7 +4343,7 @@ export var NodeShape;
4323
4343
  currentSubListResource = listResource;
4324
4344
  }
4325
4345
  else {
4326
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4346
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4327
4347
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4328
4348
  currentSubListResource = newSubListResource;
4329
4349
  }
@@ -4334,7 +4354,7 @@ export var NodeShape;
4334
4354
  return { currentSubListResource, listResource };
4335
4355
  }, {
4336
4356
  currentSubListResource: null,
4337
- listResource: resourceSet.resource(dataFactory.blankNode()),
4357
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4338
4358
  }).listResource.identifier
4339
4359
  : $RdfVocabularies.rdf.nil,
4340
4360
  ]), options?.graph);
@@ -4372,7 +4392,7 @@ export var NodeShape;
4372
4392
  currentSubListResource = listResource;
4373
4393
  }
4374
4394
  else {
4375
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4395
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4376
4396
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4377
4397
  currentSubListResource = newSubListResource;
4378
4398
  }
@@ -4383,7 +4403,7 @@ export var NodeShape;
4383
4403
  return { currentSubListResource, listResource };
4384
4404
  }, {
4385
4405
  currentSubListResource: null,
4386
- listResource: resourceSet.resource(dataFactory.blankNode()),
4406
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4387
4407
  }).listResource.identifier
4388
4408
  : $RdfVocabularies.rdf.nil,
4389
4409
  ]), options?.graph);
@@ -4398,7 +4418,7 @@ export var NodeShape;
4398
4418
  currentSubListResource = listResource;
4399
4419
  }
4400
4420
  else {
4401
- const newSubListResource = resourceSet.resource(dataFactory.blankNode());
4421
+ const newSubListResource = resourceSet.resource((() => dataFactory.blankNode())());
4402
4422
  currentSubListResource.add($RdfVocabularies.rdf.rest, newSubListResource.identifier, options?.graph);
4403
4423
  currentSubListResource = newSubListResource;
4404
4424
  }
@@ -4409,7 +4429,7 @@ export var NodeShape;
4409
4429
  return { currentSubListResource, listResource };
4410
4430
  }, {
4411
4431
  currentSubListResource: null,
4412
- listResource: resourceSet.resource(dataFactory.blankNode()),
4432
+ listResource: resourceSet.resource((() => dataFactory.blankNode())()),
4413
4433
  }).listResource.identifier
4414
4434
  : $RdfVocabularies.rdf.nil,
4415
4435
  ]), options?.graph);
@@ -4418,7 +4438,7 @@ export var NodeShape;
4418
4438
  NodeShape.$toRdfResource = $toRdfResource;
4419
4439
  function $propertiesToStrings(_nodeShape) {
4420
4440
  return $compactRecord({
4421
- $identifier: _nodeShape.$identifier.toString(),
4441
+ $identifier: _nodeShape.$identifier().toString(),
4422
4442
  label: _nodeShape.label.map((item) => item.toString()).extract(),
4423
4443
  });
4424
4444
  }
@@ -4432,7 +4452,7 @@ export var Shape;
4432
4452
  (function (Shape) {
4433
4453
  Shape.$filter = (filter, value) => {
4434
4454
  if (filter.$identifier !== undefined &&
4435
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
4455
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
4436
4456
  return false;
4437
4457
  }
4438
4458
  if (filter.on?.["NodeShape"] !== undefined &&
@@ -4766,7 +4786,7 @@ export var $Object;
4766
4786
  (function ($Object) {
4767
4787
  $Object.$filter = (filter, value) => {
4768
4788
  if (filter.$identifier !== undefined &&
4769
- !$filterIdentifier(filter.$identifier, value.$identifier)) {
4789
+ !$filterIdentifier(filter.$identifier, value.$identifier())) {
4770
4790
  return false;
4771
4791
  }
4772
4792
  if (filter.on?.["NodeShape"] !== undefined &&
@@ -4992,7 +5012,7 @@ export class $RdfjsDatasetObjectSet {
4992
5012
  return this.nodeShapeIdentifiersSync(query);
4993
5013
  }
4994
5014
  nodeShapeIdentifiersSync(query) {
4995
- return this.nodeShapesSync(query).map((objects) => objects.map((object) => object.$identifier));
5015
+ return this.nodeShapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
4996
5016
  }
4997
5017
  async nodeShapes(query) {
4998
5018
  return this.nodeShapesSync(query);
@@ -5023,7 +5043,7 @@ export class $RdfjsDatasetObjectSet {
5023
5043
  return this.ontologyIdentifiersSync(query);
5024
5044
  }
5025
5045
  ontologyIdentifiersSync(query) {
5026
- return this.ontologiesSync(query).map((objects) => objects.map((object) => object.$identifier));
5046
+ return this.ontologiesSync(query).map((objects) => objects.map((object) => object.$identifier()));
5027
5047
  }
5028
5048
  async ontologies(query) {
5029
5049
  return this.ontologiesSync(query);
@@ -5054,7 +5074,7 @@ export class $RdfjsDatasetObjectSet {
5054
5074
  return this.propertyGroupIdentifiersSync(query);
5055
5075
  }
5056
5076
  propertyGroupIdentifiersSync(query) {
5057
- return this.propertyGroupsSync(query).map((objects) => objects.map((object) => object.$identifier));
5077
+ return this.propertyGroupsSync(query).map((objects) => objects.map((object) => object.$identifier()));
5058
5078
  }
5059
5079
  async propertyGroups(query) {
5060
5080
  return this.propertyGroupsSync(query);
@@ -5085,7 +5105,7 @@ export class $RdfjsDatasetObjectSet {
5085
5105
  return this.propertyShapeIdentifiersSync(query);
5086
5106
  }
5087
5107
  propertyShapeIdentifiersSync(query) {
5088
- return this.propertyShapesSync(query).map((objects) => objects.map((object) => object.$identifier));
5108
+ return this.propertyShapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
5089
5109
  }
5090
5110
  async propertyShapes(query) {
5091
5111
  return this.propertyShapesSync(query);
@@ -5116,7 +5136,7 @@ export class $RdfjsDatasetObjectSet {
5116
5136
  return this.shapeIdentifiersSync(query);
5117
5137
  }
5118
5138
  shapeIdentifiersSync(query) {
5119
- return this.shapesSync(query).map((objects) => objects.map((object) => object.$identifier));
5139
+ return this.shapesSync(query).map((objects) => objects.map((object) => object.$identifier()));
5120
5140
  }
5121
5141
  async shapes(query) {
5122
5142
  return this.shapesSync(query);
@@ -5154,7 +5174,7 @@ export class $RdfjsDatasetObjectSet {
5154
5174
  return this.objectIdentifiersSync(query);
5155
5175
  }
5156
5176
  objectIdentifiersSync(query) {
5157
- return this.objectsSync(query).map((objects) => objects.map((object) => object.$identifier));
5177
+ return this.objectsSync(query).map((objects) => objects.map((object) => object.$identifier()));
5158
5178
  }
5159
5179
  async objects(query) {
5160
5180
  return this.objectsSync(query);
package/package.json CHANGED
@@ -44,5 +44,5 @@
44
44
  },
45
45
  "type": "module",
46
46
  "types": "./dist/index.d.ts",
47
- "version": "4.0.23"
47
+ "version": "4.0.25"
48
48
  }