@lde/pipeline-shacl-sampler 0.7.3 → 0.7.4

package/dist/sampleStages.d.ts

@@ -1,30 +1,8 @@
-import { Stage, type StageOptions, type Validator } from '@lde/pipeline';
+import { Stage, type NamespaceAlias, type StageOptions, type Validator } from '@lde/pipeline';
 import type { NamedNode } from '@rdfjs/types';
 import { type TargetShape } from './pathExtractor.js';
 type OnInvalid = NonNullable<StageOptions['validation']>['onInvalid'];
-/**
- * Declares that two namespaces should be treated as equivalent when
- * sampling and validating, working around vocabularies that publish under
- * both HTTP and HTTPS variants of the same IRI (notably schema.org).
- *
- * The sampler accepts subjects typed under the {@link alias} namespace in
- * addition to the SHACL `sh:targetClass` IRI under {@link canonical}, and
- * rewrites alias-namespace IRIs to canonical ones in the sampled quads
- * before validation so SHACL `sh:targetClass` and `sh:path` patterns
- * match.
- */
-export interface NamespaceAlias {
-    /**
-     * The namespace declared in the SHACL shapes file (e.g.
-     * `https://schema.org/`).
-     */
-    canonical: string;
-    /**
-     * The equivalent namespace that may appear in source data (e.g.
-     * `http://schema.org/`).
-     */
-    alias: string;
-}
+export type { NamespaceAlias } from '@lde/pipeline';
 /** Options for {@link shaclSampleStages}. */
 export interface ShaclSampleStagesOptions {
     /** URL or local path to the SHACL shapes file. */
@@ -128,5 +106,4 @@ export declare function buildSampleQuery(shape: TargetShape): string;
  * producing vacuously-conformant reports.
  */
 export declare function wrapValidatorWithAliasNormalization(inner: Validator, namespaceAliases: NamespaceAlias[]): Validator;
-export {};
 //# sourceMappingURL=sampleStages.d.ts.map

package/dist/sampleStages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleStages.d.ts","sourceRoot":"","sources":["../src/sampleStages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAIL,KAAK,YAAY,EAGjB,KAAK,SAAS,EACf,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAI3E,KAAK,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAEtE;;;;;;;;;;GAUG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,6CAA6C;AAC7C,MAAM,WAAW,wBAAwB;IACvC,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,KAAK,MAAM,CAAC;CACvD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,KAAK,EAAE,CAAC,CAkClB;AA6BD,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IAC1C,uCAAuC;IACvC,WAAW,EAAE,SAAS,CAAC;IACvB,kFAAkF;IAClF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,aAAa,EACb,UAAU,EACV,gBAAqB,EACrB,aAAa,GACd,EAAE,2BAA2B,GAAG,MAAM,CAYtC;AA+BD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAuB3D;AAED;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,cAAc,EAAE,GACjC,SAAS,CAeX"}
+{"version":3,"file":"sampleStages.d.ts","sourceRoot":"","sources":["../src/sampleStages.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAIL,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,SAAS,EACf,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAI3E,KAAK,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAEtE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,6CAA6C;AAC7C,MAAM,WAAW,wBAAwB;IACvC,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC;;;;;;;;;;;;;OAaG;IACH,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,KAAK,MAAM,CAAC;CACvD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,KAAK,EAAE,CAAC,CAkClB;AA6BD,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IAC1C,uCAAuC;IACvC,WAAW,EAAE,SAAS,CAAC;IACvB,kFAAkF;IAClF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,aAAa,EACb,UAAU,EACV,gBAAqB,EACrB,aAAa,GACd,EAAE,2BAA2B,GAAG,MAAM,CAYtC;AAsBD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAuB3D;AAED;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,cAAc,EAAE,GACjC,SAAS,CAeX"}

package/dist/sampleStages.js

@@ -1,4 +1,4 @@
-import { Stage, SparqlConstructReader, SparqlItemSelector, } from '@lde/pipeline';
+import { aliasVariants, Stage, SparqlConstructReader, SparqlItemSelector, } from '@lde/pipeline';
 import { assertSafeIri } from '@lde/dataset';
 import { DataFactory } from 'n3';
 import { extractTargetShapes } from './pathExtractor.js';
@@ -86,16 +86,7 @@ function buildTypePattern(targetClass, namespaceAliases) {
     return `?s a ?type . FILTER(?type IN (${iriList}))`;
 }
 function expandTargetClass(targetClass, namespaceAliases) {
-    const iri = targetClass.value;
-    for (const { canonical, alias } of namespaceAliases) {
-        if (iri.startsWith(canonical)) {
-            return [iri, alias + iri.slice(canonical.length)];
-        }
-        if (iri.startsWith(alias)) {
-            return [iri, canonical + iri.slice(alias.length)];
-        }
-    }
-    return [iri];
+    return aliasVariants(targetClass.value, namespaceAliases);
 }
 export function buildSampleQuery(shape) {
     for (const chain of shape.pathChains) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/pipeline-shacl-sampler",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Per-class sampling stages for @lde/pipeline, derived from SHACL shapes",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
@@ -33,6 +33,6 @@
   },
   "peerDependencies": {
     "@lde/dataset": "^0.7.8",
-    "@lde/pipeline": "^0.33.3"
+    "@lde/pipeline": "^0.33.4"
   }
 }