oca_package 1.4.0 → 1.6.0

package/dist/esm/oca_extensions/state/overlays/example.js

@@ -1,11 +1,15 @@
 import { saidify } from 'saidify';
 import canonicalize from '../../../utils/canonical.js';
 class ExampleOverlay {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('A dynamic extension overlay is required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     get language() {
         return this.dynOverlay.language;
@@ -19,6 +23,7 @@ class ExampleOverlay {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/example/1.1',
             language: this.language,
             attribute_examples: this.GetAttributeExamples(),
@@ -32,7 +37,7 @@ class ExampleOverlay {
     GenerateExampleOverlay() {
         return JSON.stringify(this.Saidifying());
     }
-    static GenerateOverlay(dynOverlay) {
+    static GenerateOverlay(dynOverlay, capture_base_digest) {
         if (!dynOverlay || typeof dynOverlay !== 'object' || !Array.isArray(dynOverlay['example_overlays'])) {
             throw new Error('Invalid dynOverlay structure. Expected an object with an "example_overlays" array.');
         }
@@ -40,7 +45,7 @@ class ExampleOverlay {
         const overlays = dynOverlay['example_overlays'];
         for (let example_ov of overlays) {
             try {
-                const example_overlay = new ExampleOverlay(example_ov);
+                const example_overlay = new ExampleOverlay(example_ov, capture_base_digest);
                 example_overlays.push(JSON.parse(example_overlay.GenerateExampleOverlay()));
             }
             catch (error) {

package/dist/esm/oca_extensions/state/overlays/framing/attribute_framing.js

@@ -1,11 +1,15 @@
 import { saidify } from 'saidify';
 import canonicalize from '../../../../utils/canonical.js';
 class AttributeFraming {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('a dynamic extension overlay are required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     GetFramedAttributes() {
         const attributes = this.dynOverlay.attributes;
@@ -36,6 +40,7 @@ class AttributeFraming {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/attribute_framing/1.1',
             framing_metadata: this.GetFramingMetadata(),
             attributes: this.GetFramedAttributes(),

package/dist/esm/oca_extensions/state/overlays/framing/unit_framing.js

@@ -1,11 +1,15 @@
 import { saidify } from 'saidify';
 import canonicalize from '../../../../utils/canonical.js';
 class UnitFraming {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('a dynamic extension overlay are required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     GetUnits() {
         const units = this.dynOverlay.units;
@@ -28,6 +32,7 @@ class UnitFraming {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/unit_framing/1.1',
             framing_metadata: {
                 id: this.GetId(),

package/dist/esm/oca_extensions/state/overlays/ordering.js

@@ -1,10 +1,14 @@
 import { saidify } from 'saidify';
 class Ordering {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('a dynamic extension overlay are required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     GetAttributeOrdering() {
         return this.dynOverlay.attribute_ordering;
@@ -15,6 +19,7 @@ class Ordering {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/ordering/1.1',
             attribute_ordering: this.GetAttributeOrdering(),
             entry_code_ordering: this.GetEntryCodeOrdering(),

package/dist/esm/oca_extensions/state/overlays/range.js

@@ -1,11 +1,15 @@
 import { saidify } from 'saidify';
 import canonicalize from '../../../utils/canonical.js';
 class Range {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('a dynamic extension overlay are required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     GetAttributes() {
         const range_overlay_attributes = this.dynOverlay.attributes;
@@ -16,6 +20,7 @@ class Range {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/range/1.1',
             attributes: this.GetAttributes(),
         };

package/dist/esm/oca_extensions/state/overlays/sensitive.js

@@ -1,10 +1,14 @@
 import { saidify } from 'saidify';
 class Sensitive {
-    constructor(dynOverlay) {
+    constructor(dynOverlay, capture_base_digest) {
         if (!dynOverlay) {
             throw new Error('a dynamic extension overlay are required');
         }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
         this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
     GetSensitiveAttributes() {
         const sensitive_overlay_attributes = this.dynOverlay.sensitive_attributes;
@@ -15,6 +19,7 @@ class Sensitive {
     toJSON() {
         return {
             d: '',
+            capture_base: this.capture_base_digest,
             type: 'community/overlays/adc/sensitive/1.1',
             sensitive_attributes: this.GetSensitiveAttributes(),
         };

package/dist/esm/oca_extensions/state/overlays/separator.js

@@ -28,60 +28,45 @@ Canoncial rules:
 }
 */
 import { saidify } from 'saidify';
-import { getDigest, isPresent } from '../../../utils/helpers.js';
-import { OverlayTypes } from '../../../types/types.js';
+import canonicalize from '../../../utils/canonical.js';
 class Separator {
-    constructor(separators, oca_bundle) {
-        this.said = '';
-        this.type = OverlayTypes.Separator;
-        this.separators = separators;
-        this.oca_bundle = oca_bundle;
-        this.capture_base = getDigest(this.oca_bundle);
+    constructor(dynOverlay, capture_base_digest) {
+        if (!dynOverlay) {
+            throw new Error('a dynamic extension overlay are required');
+        }
+        if (!capture_base_digest) {
+            throw new Error('capture_base_digest is required');
+        }
+        this.dynOverlay = dynOverlay;
+        this.capture_base_digest = capture_base_digest;
     }
-    overlay_type() {
-        return this.type;
+    GetAttributesSeparators() {
+        const separator_overlay_attributes = this.dynOverlay.attribute_separators;
+        const canonicalized_attributes = canonicalize(separator_overlay_attributes);
+        const sortedAttributes = JSON.parse(canonicalized_attributes);
+        return sortedAttributes;
     }
-    attributes() {
-        const sorted_attribute_separators = [];
-        if (this.separators.attribute_separators) {
-            for (const key in this.separators.attribute_separators) {
-                if (Object.prototype.hasOwnProperty.call(this.separators.attribute_separators, key)) {
-                    if (!isPresent(key, this.oca_bundle)) {
-                        throw new Error(`Attribute ${key} not found in OCA bundle Capture Base.`);
-                    }
-                    sorted_attribute_separators.push({ key, value: this.separators.attribute_separators[key] });
-                }
-            }
-            // Sort the attribute separators by key
-            sorted_attribute_separators.sort((a, b) => a.key.localeCompare(b.key));
-        }
-        return sorted_attribute_separators;
+    GetDatasetSeparator() {
+        const separator_overlay_dataset = this.dynOverlay.dataset_separator;
+        const canonicalized_dataset = canonicalize(separator_overlay_dataset);
+        const sortedDataset = JSON.parse(canonicalized_dataset);
+        return sortedDataset;
     }
-    // serialize the separator overlay
     toJSON() {
-        const serialized_attribute_separators = {};
-        for (const attr of this.attributes()) {
-            serialized_attribute_separators[attr.key] = attr.value;
-        }
         return {
-            d: this.said,
-            type: 'community/adc/overlays/separator/1.0',
-            capture_base: this.capture_base,
-            dataset_separator: this.separators.dataset_separator,
-            attribute_separators: serialized_attribute_separators,
+            d: '',
+            capture_base: this.capture_base_digest,
+            type: 'community/overlays/adc/separator/1.1',
+            attribute_separators: this.GetAttributesSeparators(),
+            dataset_separator: this.GetDatasetSeparator(),
         };
     }
-    saidifying() {
+    Saidifying() {
         const [, sad] = saidify(this.toJSON());
         return sad;
     }
-    generate_overlay() {
-        return JSON.stringify(this.saidifying());
-    }
-    // TODO: find out if it neccessary to implement this methood for all overlays
-    static deser(separator_ov_json_string) {
-        const separator_ov_json = JSON.parse(separator_ov_json_string);
-        return new Separator(separator_ov_json, separator_ov_json.capture_base);
+    GenerateOverlay() {
+        return JSON.stringify(this.Saidifying());
     }
 }
 export default Separator;

package/dist/esm/oca_package.js

@@ -3,8 +3,8 @@ import ExtensionBox from './oca_extensions/extensions.js';
 import { saidify, verify, SAIDDex, Serials } from 'saidify';
 class OcaPackage {
     constructor(extension_input_json, oca_bundle) {
-        this.extensions_box = new ExtensionBox(extension_input_json, oca_bundle);
         this.oca_bundle = oca_bundle;
+        this.extensions_box = new ExtensionBox(extension_input_json, oca_bundle);
     }
     Saidifying() {
         const [, sad] = saidify(this.toJSON());

package/dist/types/oca_extensions/extensions.d.ts

@@ -24,7 +24,8 @@ export interface DynOverlay {
 }
 export declare class Overlay implements DynOverlay {
     [key: string]: any;
-    constructor(community_overlay: DynOverlay);
+    private _capture_base_digest;
+    constructor(community_overlay: DynOverlay, capture_base_digest: string);
     GenerateOverlay(): Required<DynOverlay>;
 }
 export interface IExtension {
@@ -38,7 +39,8 @@ export declare class Extension implements IExtension {
     readonly type: string;
     _exensions: DynOverlay;
     readonly overlays: {};
-    constructor(_extensions_input: DynOverlay, community: string);
+    private capture_base_digest;
+    constructor(_extensions_input: DynOverlay, community: string, capture_base_digest: string);
     private GenerateOverlays;
     private toJSON;
     private Saidifying;

package/dist/types/oca_extensions/extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/oca_extensions/extensions.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAQzC,MAAM,WAAW,kBAAkB;IACjC,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,aAAa,EAAE,IAAI,GAAG,UAAU,EAAE,CAAC;KACrC,CAAC;CACH;AAGD,MAAM,WAAW,eAAe;IAC9B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,aAAa,EAAE,IAAI,GAAG,UAAU,CAAC;KACnC,CAAC;CACH;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,qBAAqB,CAAqB;IAC3C,eAAe,EAAE,eAAe,CAAC;gBAE5B,kBAAkB,EAAE,kBAAkB;IAKlD,OAAO,CAAC,mBAAmB;IAiB3B,IAAW,WAAW,IAAI,eAAe,CAExC;CACF;AAKD,MAAM,WAAW,UAAU;IACzB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,qBAAa,OAAQ,YAAW,UAAU;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;gBAEP,iBAAiB,EAAE,UAAU;IAIlC,eAAe,IAAI,QAAQ,CAAC,UAAU,CAAC;CA0C/C;AAiFD,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,IAAI,CAAC;IACR,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAM;IACf,UAAU,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,QAAQ,KAAM;gBAEX,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM;IAU5D,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,UAAU;IAKX,iBAAiB,IAAI,GAAG;CAGhC;AAED,KAAK,gBAAgB,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC;AAE9F,cAAM,YAAY;IACT,eAAe,EAAE,gBAAgB,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,cAAc,CAAC;gBAE3B,oBAAoB,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG;IAMrE,IAAW,kBAAkB,IAAI,gBAAgB,CA4BhD;CACF;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/oca_extensions/extensions.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAQzC,MAAM,WAAW,kBAAkB;IACjC,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,aAAa,EAAE,IAAI,GAAG,UAAU,EAAE,CAAC;KACrC,CAAC;CACH;AAOD,MAAM,WAAW,eAAe;IAC9B,CAAC,SAAS,EAAE,MAAM,GAAG;QACnB,CAAC,aAAa,EAAE,IAAI,GAAG,UAAU,CAAC;KACnC,CAAC;CACH;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,qBAAqB,CAAqB;IAC3C,eAAe,EAAE,eAAe,CAAC;gBAE5B,kBAAkB,EAAE,kBAAkB;IAKlD,OAAO,CAAC,mBAAmB;IAiB3B,IAAW,WAAW,IAAI,eAAe,CAExC;CACF;AAKD,MAAM,WAAW,UAAU;IACzB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,qBAAa,OAAQ,YAAW,UAAU;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,OAAO,CAAC,oBAAoB,CAAS;gBAEzB,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAQ/D,eAAe,IAAI,QAAQ,CAAC,UAAU,CAAC;CAiD/C;AAiFD,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,IAAI,CAAC;IACR,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAM;IACf,UAAU,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,QAAQ,KAAM;IACvB,OAAO,CAAC,mBAAmB,CAAS;gBAExB,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM;IAczF,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,UAAU;IAKX,iBAAiB,IAAI,GAAG;CAGhC;AAED,KAAK,gBAAgB,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC;AAE9F,cAAM,YAAY;IACT,eAAe,EAAE,gBAAgB,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,cAAc,CAAC;gBAE3B,oBAAoB,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG;IAMrE,IAAW,kBAAkB,IAAI,gBAAgB,CA4BhD;CACF;AAED,eAAe,YAAY,CAAC"}

package/dist/types/oca_extensions/state/attribute.d.ts

@@ -1,13 +1 @@
-import { SeparatorValues } from '../state/overlays/separator.js';
-interface IAttribute {
-    name: string;
-    attribute_separators: SeparatorValues;
-}
-declare class Attribute implements IAttribute {
-    name: string;
-    attribute_separators: SeparatorValues;
-    constructor(attribute: string);
-    setAttributeSeparators(attribute_separators: SeparatorValues): void;
-}
-export default Attribute;
 //# sourceMappingURL=attribute.d.ts.map

package/dist/types/oca_extensions/state/attribute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribute.d.ts","sourceRoot":"","sources":["../../../../src/oca_extensions/state/attribute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,EAAE,eAAe,CAAC;CACvC;AAED,cAAM,SAAU,YAAW,UAAU;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,EAAE,eAAe,CAAC;gBAEjC,SAAS,EAAE,MAAM;IAKtB,sBAAsB,CAAC,oBAAoB,EAAE,eAAe,GAAG,IAAI;CAG3E;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"attribute.d.ts","sourceRoot":"","sources":["../../../../src/oca_extensions/state/attribute.ts"],"names":[],"mappings":""}

package/dist/types/oca_extensions/state/overlays/example.d.ts

@@ -5,7 +5,8 @@ export interface IExampleOverlay {
 }
 declare class ExampleOverlay implements IExampleOverlay {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     get language(): any;
     private GetAttributeExamples;
     private toJSON;
@@ -13,7 +14,7 @@ declare class ExampleOverlay implements IExampleOverlay {
     GenerateExampleOverlay(): string;
     static GenerateOverlay(dynOverlay: {
         example_overlays: any[];
-    }): string;
+    }, capture_base_digest: string): string;
 }
 export default ExampleOverlay;
 //# sourceMappingURL=example.d.ts.map

package/dist/types/oca_extensions/state/overlays/example.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"example.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/example.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,sBAAsB,IAAI,MAAM,CAAC;CAClC;AAED,cAAM,cAAe,YAAW,eAAe;IACtC,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAOlC,IAAW,QAAQ,IAAI,GAAG,CAEzB;IAED,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAMX,sBAAsB,IAAI,MAAM;WAIzB,eAAe,CAAC,UAAU,EAAE;QAAE,gBAAgB,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,MAAM;CAqB/E;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"example.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/example.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,sBAAsB,IAAI,MAAM,CAAC;CAClC;AAED,cAAM,cAAe,YAAW,eAAe;IACtC,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAW/D,IAAW,QAAQ,IAAI,GAAG,CAEzB;IAED,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,UAAU;IAMX,sBAAsB,IAAI,MAAM;WAIzB,eAAe,CAAC,UAAU,EAAE;QAAE,gBAAgB,EAAE,GAAG,EAAE,CAAA;KAAE,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;CAqB5G;AAED,eAAe,cAAc,CAAC"}

package/dist/types/oca_extensions/state/overlays/framing/attribute_framing.d.ts

@@ -5,7 +5,8 @@ export interface IAttributeFraming {
 }
 declare class AttributeFraming implements IAttributeFraming {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     private GetFramedAttributes;
     private GetId;
     private GetLabel;

package/dist/types/oca_extensions/state/overlays/framing/attribute_framing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribute_framing.d.ts","sourceRoot":"","sources":["../../../../../../src/oca_extensions/state/overlays/framing/attribute_framing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,gBAAiB,YAAW,iBAAiB;IAC1C,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAQlC,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,KAAK;IAGb,OAAO,CAAC,QAAQ;IAGhB,OAAO,CAAC,WAAW;IAGnB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"attribute_framing.d.ts","sourceRoot":"","sources":["../../../../../../src/oca_extensions/state/overlays/framing/attribute_framing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,gBAAiB,YAAW,iBAAiB;IAC1C,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,KAAK;IAGb,OAAO,CAAC,QAAQ;IAGhB,OAAO,CAAC,WAAW;IAGnB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,gBAAgB,CAAC"}

package/dist/types/oca_extensions/state/overlays/framing/unit_framing.d.ts

@@ -5,7 +5,8 @@ export interface IUnitFraming {
 }
 declare class UnitFraming implements IUnitFraming {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     private GetUnits;
     private GetId;
     private GetLabel;

package/dist/types/oca_extensions/state/overlays/framing/unit_framing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unit_framing.d.ts","sourceRoot":"","sources":["../../../../../../src/oca_extensions/state/overlays/framing/unit_framing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOpD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,WAAY,YAAW,YAAY;IAChC,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAQlC,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,KAAK;IAGb,OAAO,CAAC,QAAQ;IAGhB,OAAO,CAAC,WAAW;IAGnB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,MAAM;IAad,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"unit_framing.d.ts","sourceRoot":"","sources":["../../../../../../src/oca_extensions/state/overlays/framing/unit_framing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOpD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,WAAY,YAAW,YAAY;IAChC,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,KAAK;IAGb,OAAO,CAAC,QAAQ;IAGhB,OAAO,CAAC,WAAW;IAGnB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,MAAM;IAcd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,WAAW,CAAC"}

package/dist/types/oca_extensions/state/overlays/ordering.d.ts

@@ -5,7 +5,8 @@ export interface IOrdering {
 }
 declare class Ordering implements IOrdering {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     private GetAttributeOrdering;
     private GetEntryCodeOrdering;
     private toJSON;

package/dist/types/oca_extensions/state/overlays/ordering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ordering.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/ordering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,QAAS,YAAW,SAAS;IAC1B,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAQlC,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAKX,eAAe,IAAI,MAAM;CAGjC;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"ordering.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/ordering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,QAAS,YAAW,SAAS;IAC1B,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,UAAU;IAKX,eAAe,IAAI,MAAM;CAGjC;AAED,eAAe,QAAQ,CAAC"}

package/dist/types/oca_extensions/state/overlays/range.d.ts

@@ -5,7 +5,8 @@ export interface IRange {
 }
 declare class Range implements IRange {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     private GetAttributes;
     private toJSON;
     private Saidifying;

package/dist/types/oca_extensions/state/overlays/range.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"range.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/range.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,MAAM,WAAW,MAAM;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,KAAM,YAAW,MAAM;IACpB,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAQlC,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,MAAM;IAOd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"range.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/range.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,MAAM,WAAW,MAAM;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,KAAM,YAAW,MAAM;IACpB,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AACD,eAAe,KAAK,CAAC"}

package/dist/types/oca_extensions/state/overlays/sensitive.d.ts

@@ -5,7 +5,8 @@ export interface ISensitive {
 }
 declare class Sensitive implements ISensitive {
     dynOverlay: DynOverlay;
-    constructor(dynOverlay: DynOverlay);
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
     private GetSensitiveAttributes;
     private toJSON;
     private Saidifying;

package/dist/types/oca_extensions/state/overlays/sensitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sensitive.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/sensitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,SAAU,YAAW,UAAU;IAC5B,UAAU,EAAE,UAAU,CAAC;gBAElB,UAAU,EAAE,UAAU;IAQlC,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,UAAU;IAKX,eAAe,IAAI,MAAM;CAGjC;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"sensitive.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/sensitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,SAAU,YAAW,UAAU;IAC5B,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAKX,eAAe,IAAI,MAAM;CAGjC;AAED,eAAe,SAAS,CAAC"}

package/dist/types/oca_extensions/state/overlays/separator.d.ts

@@ -1,48 +1,17 @@
-import { Said, OverlayTypes } from '../../../types/types.js';
-export interface SeparatorOverlayInput {
-    type: string;
-    dataset_separator: SeparatorValues;
-    attribute_separators: {
-        [key: string]: SeparatorValues;
-    };
+import { DynOverlay } from '../../extensions.js';
+interface Iseparator {
+    dynOverlay: DynOverlay;
+    GenerateOverlay(): string;
 }
-export interface SeparatorsInput {
-    type: string;
-    dataset_separator?: SeparatorValues;
-    attribute_separators?: {
-        [key: string]: SeparatorValues;
-    };
-}
-export interface ISeparatorOverlay {
-    said?: Said;
-    type: OverlayTypes.Separator;
-    capture_base: Said;
-    dataset_separator?: SeparatorsInput['dataset_separator'];
-    attribute_separators?: SeparatorsInput['attribute_separators'];
-    overlay_type(): string;
-}
-export interface SeparatorValues {
-    delimiter: string;
-    escape: string;
-}
-declare class Separator implements ISeparatorOverlay {
-    said?: Said;
-    type: OverlayTypes.Separator;
-    capture_base: Said;
-    dataset_separator?: SeparatorsInput['dataset_separator'];
-    attribute_separators?: SeparatorsInput['attribute_separators'];
-    separators: SeparatorsInput;
-    oca_bundle: any;
-    constructor(separators: SeparatorsInput, oca_bundle: any);
-    overlay_type(): string;
-    attributes(): {
-        key: string;
-        value: SeparatorValues;
-    }[];
+declare class Separator implements Iseparator {
+    dynOverlay: DynOverlay;
+    private capture_base_digest;
+    constructor(dynOverlay: DynOverlay, capture_base_digest: string);
+    private GetAttributesSeparators;
+    private GetDatasetSeparator;
     private toJSON;
-    private saidifying;
-    generate_overlay(): string;
-    static deser(separator_ov_json_string: string): Separator;
+    private Saidifying;
+    GenerateOverlay(): string;
 }
 export default Separator;
 //# sourceMappingURL=separator.d.ts.map

package/dist/types/oca_extensions/state/overlays/separator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"separator.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/separator.ts"],"names":[],"mappings":"AAgCA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,eAAe,CAAC;IACnC,oBAAoB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAC;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,eAAe,CAAC;IACpC,oBAAoB,CAAC,EAAE;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;KAChC,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;IAC7B,YAAY,EAAE,IAAI,CAAC;IACnB,iBAAiB,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;IACzD,oBAAoB,CAAC,EAAE,eAAe,CAAC,sBAAsB,CAAC,CAAC;IAC/D,YAAY,IAAI,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,cAAM,SAAU,YAAW,iBAAiB;IAC1C,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;IAC7B,YAAY,EAAE,IAAI,CAAC;IACnB,iBAAiB,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;IACzD,oBAAoB,CAAC,EAAE,eAAe,CAAC,sBAAsB,CAAC,CAAC;IAC/D,UAAU,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,GAAG,CAAC;gBAEJ,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG;IAQjD,YAAY,IAAI,MAAM;IAItB,UAAU,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE,EAAE;IAmB9D,OAAO,CAAC,MAAM;IAgBd,OAAO,CAAC,UAAU;IAKX,gBAAgB,IAAI,MAAM;IAKjC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,MAAM,GAAG,SAAS;CAI1D;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"separator.d.ts","sourceRoot":"","sources":["../../../../../src/oca_extensions/state/overlays/separator.ts"],"names":[],"mappings":"AAwIA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,UAAU,UAAU;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,IAAI,MAAM,CAAC;CAC3B;AAED,cAAM,SAAU,YAAW,UAAU;IAC5B,UAAU,EAAE,UAAU,CAAC;IAC9B,OAAO,CAAC,mBAAmB,CAAS;gBAExB,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM;IAY/D,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,UAAU;IAIX,eAAe,IAAI,MAAM;CAGjC;AAED,eAAe,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oca_package",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "The wrapper of OCA bundle to generate OCA Package at ADC",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -38,7 +38,6 @@
     "url": "https://github.com/agrifooddatacanada/OCA_Package"
   },
   "author": "Steven Mugisha Mizero <smugisha@uoguelph.ca>",
-  "license": "EUPL-1.2",
   "devDependencies": {
     "@eslint/js": "^9.11.1",
     "@types/node": "^22.7.3",