@decaf-ts/for-fabric 0.1.60 → 0.1.62

package/lib/esm/client/collections/generation.js

@@ -1,112 +1,81 @@
-import { Metadata } from "@decaf-ts/decoration";
-import { CouchDBKeys } from "@decaf-ts/for-couchdb";
 import { Model } from "@decaf-ts/decorator-validation";
-function getIndexReference(name, direction, compositions) {
-    return [
-        ...name.map((n) => (n === CouchDBKeys.TABLE ? "table" : n)),
-        ...(compositions || []),
-        ...(direction ? [direction] : []),
-        "index",
-    ].join(Metadata.splitter);
-}
-function addIndex(accum, fields, direction, compositions) {
-    const name = getIndexReference(fields, direction, compositions);
-    let f = [
-        ...fields,
-        ...(compositions || []),
-    ];
-    if (direction)
-        f = f.reduce((accum, el) => {
-            const entry = {};
-            entry[el] = direction;
-            accum.push(entry);
-            return accum;
-        }, []);
-    const index = {
-        index: {
-            fields: f,
-        },
-        name: name,
-        ddoc: name,
-        type: "json",
+import { InternalError } from "@decaf-ts/db-decorators";
+export function collectionFor(collectionName, policy, requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite) {
+    return {
+        name: collectionName,
+        policy: policy,
+        requiredPeerCount,
+        maxPeerCount,
+        blockToLive,
+        memberOnlyRead,
+        memberOnlyWrite,
     };
-    accum[name] = index;
 }
-export function generateModelCollections(m, accum) {
-    const tableName = getIndexReference([CouchDBKeys.TABLE]);
-    const indexes = accum || {};
-    indexes[tableName] = {
-        index: {
-            fields: [CouchDBKeys.TABLE],
-        },
-        name: tableName,
-        ddoc: tableName,
-        type: "json",
+export function privateCollectionFor(mspId, collectionName = `${mspId}Private`, requiredPeerCount = 0, maxPeerCount = 0, blockToLive = 0, memberOnlyRead = true, memberOnlyWrite = true) {
+    return collectionFor(collectionName, `OR('${mspId}.member')`, requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite);
+}
+export function sharedCollectionFor(mspIds, collectionName, requiredPeerCount = 1, maxPeerCount = 2, blockToLive = 0, memberOnlyRead = true, memberOnlyWrite = true) {
+    const c = collectionFor(collectionName, `OR(${mspIds.map((m) => `'${m}.member'`).join(",")})`, requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite);
+    c.endorsementPolicy = {
+        signaturePolicy: `AND(${mspIds.map((m) => `'${m}.peer'`).join(",")})`,
     };
-    const result = {};
-    const modelIndexes = Model.indexes(m);
-    for (const prop of Object.keys(modelIndexes)) {
-        for (const [, dec] of Object.entries(modelIndexes[prop])) {
-            const directions = dec
-                .directions;
-            const compositions = dec.compositions;
-            const fields = [prop, CouchDBKeys.TABLE];
-            addIndex(result, fields);
-            if (compositions && compositions.length)
-                addIndex(result, fields, undefined, compositions);
-            if (directions && directions.length) {
-                directions.forEach((d) => {
-                    addIndex(result, fields, d);
-                    if (compositions && compositions.length)
-                        addIndex(result, fields, d, compositions);
-                });
-            }
-        }
-    }
-    Object.entries(result).forEach(([key, value]) => {
-        indexes[key] = value;
-    });
-    return Object.values(result);
+    return c;
 }
-export function readModelFile(file) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const path = require("path");
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const exports = require(path.join(process.cwd(), file.parentPath, file.name));
-    const values = Object.values(exports).filter((e) => {
+export async function extractCollections(m, mspIds, overrides = {}, mirror = false) {
+    let { privateCols, sharedCols } = Model.collectionsFor(m);
+    function resolveCollection(arg) {
         try {
-            const m = new e();
-            return m instanceof Model;
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            if (typeof arg === "string")
+                return arg;
+            return arg(m, mspIds[0]);
         }
         catch (e) {
-            return false;
-        }
-    });
-    return values;
-}
-export async function readModelFolders(...folders) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const fs = require("fs");
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const path = require("path");
-    // // eslint-disable-next-line @typescript-eslint/no-require-imports
-    // const path = require("path");
-    const result = [];
-    for (const folder of folders) {
-        const files = fs
-            .readdirSync(folder, {
-            withFileTypes: true,
-            recursive: true,
-        })
-            .filter((f) => f.isFile() && f.name.endsWith("js"));
-        for (const file of files) {
-            result.push(...readModelFile(file));
+            throw new InternalError(e);
         }
     }
-    return result;
+    privateCols = privateCols.map(resolveCollection);
+    sharedCols = sharedCols.map(resolveCollection);
+    const privateDefaults = Object.assign({}, {
+        requiredPeerCount: 0,
+        maxPeerCount: 0,
+        blockToLive: 0,
+        memberOnlyRead: true,
+        memberOnlyWrite: true,
+    }, overrides?.privateCols || {});
+    const sharedDefaults = Object.assign({}, {
+        requiredPeerCount: 1,
+        maxPeerCount: 2,
+        blockToLive: 0,
+        memberOnlyRead: true,
+        memberOnlyWrite: true,
+    }, overrides?.sharedCols || {});
+    const mirrorMeta = mirror ? Model.mirroredAt(m) : undefined;
+    const privates = mspIds
+        .map((mspId) => privateCols
+        .filter((p) => {
+        if (!mirrorMeta)
+            return true;
+        const mirroCol = typeof mirrorMeta.resolver === "string"
+            ? mirrorMeta.resolver
+            : mirrorMeta.resolver(m, mspId);
+        return (mirroCol === p &&
+            (mirrorMeta.condition ? mirrorMeta.condition(mspId) : true));
+    })
+        .map((p) => {
+        const { requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite, } = privateDefaults;
+        return privateCollectionFor(mspId, p, requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite);
+    }))
+        .flat();
+    const shared = sharedCols.map((p) => {
+        const { requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite, } = sharedDefaults;
+        return sharedCollectionFor(mspIds, p, requiredPeerCount, maxPeerCount, blockToLive, memberOnlyRead, memberOnlyWrite);
+    });
+    return {
+        privates,
+        shared,
+    };
 }
-export function writeIndexes(indexes, p = process.cwd()) {
+export function writeCollections(cols, p = process.cwd(), fileName = "collections_config") {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const fs = require("fs");
     // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -119,10 +88,8 @@ export function writeIndexes(indexes, p = process.cwd()) {
         ensureDirectoryExistence(dirname);
         fs.mkdirSync(dirname);
     }
-    indexes.forEach((index) => {
-        const file = path.resolve(path.join(p, `./META-INF/statedb/couchdb/indexes/${index.name}.json`));
-        ensureDirectoryExistence(file);
-        fs.writeFileSync(file, JSON.stringify(index, undefined, 2));
-    });
+    const file = path.resolve(path.join(p, `./META-INF/${fileName}.json`));
+    ensureDirectoryExistence(file);
+    fs.writeFileSync(file, JSON.stringify(cols, undefined, 2));
 }
 //# sourceMappingURL=generation.js.map

package/lib/esm/client/collections/generation.js.map

@@ -1 +1 @@
-{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../../src/client/collections/generation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../../src/client/collections/generation.ts"],"names":[],"mappings":"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"}

package/lib/esm/client/indexes/generation.d.ts

@@ -14,4 +14,4 @@ export type Index = {
 export declare function generateModelIndexes<M extends Model>(m: Constructor<M>, accum?: Record<string, any>): Index[];
 export declare function readModelFile(file: any): ModelConstructor<any>[];
 export declare function readModelFolders(...folders: string[]): Promise<ModelConstructor<any>[]>;
-export declare function writeIndexes(indexes: Index[], p?: string): void;
+export declare function writeIndexes(indexes: Index[], p?: string, collection?: string): void;

package/lib/esm/client/indexes/generation.js

@@ -10,6 +10,13 @@ function getIndexReference(name, direction, compositions) {
     ].join(Metadata.splitter);
 }
 function addIndex(accum, fields, direction, compositions) {
+    const tableField = fields.pop();
+    if (tableField && tableField !== CouchDBKeys.TABLE) {
+        fields.push(tableField);
+    }
+    else if (tableField === CouchDBKeys.TABLE) {
+        fields.unshift(tableField);
+    }
     const name = getIndexReference(fields, direction, compositions);
     let f = [
         ...fields,
@@ -88,10 +95,6 @@ export function readModelFile(file) {
 export async function readModelFolders(...folders) {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const fs = require("fs");
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const path = require("path");
-    // // eslint-disable-next-line @typescript-eslint/no-require-imports
-    // const path = require("path");
     const result = [];
     for (const folder of folders) {
         const files = fs
@@ -106,7 +109,7 @@ export async function readModelFolders(...folders) {
     }
     return result;
 }
-export function writeIndexes(indexes, p = process.cwd()) {
+export function writeIndexes(indexes, p = process.cwd(), collection) {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const fs = require("fs");
     // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -120,7 +123,7 @@ export function writeIndexes(indexes, p = process.cwd()) {
         fs.mkdirSync(dirname);
     }
     indexes.forEach((index) => {
-        const file = path.resolve(path.join(p, `./META-INF/statedb/couchdb/indexes/${index.name}.json`));
+        const file = path.resolve(path.join(p, `./META-INF/statedb/couchdb/${collection ? `collections/${collection}/` : ""}indexes/${index.name}.json`));
         ensureDirectoryExistence(file);
         fs.writeFileSync(file, JSON.stringify(index, undefined, 2));
     });

package/lib/esm/client/indexes/generation.js.map

@@ -1 +1 @@
-{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../../src/client/indexes/generation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../../src/client/indexes/generation.ts"],"names":[],"mappings":"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"}

package/lib/esm/contract/OtherProductContract.d.ts

@@ -0,0 +1,5 @@
+import { SerializedCrudContract } from "../contracts/crud/serialized-crud-contract";
+import { OtherProduct } from "./models/OtherProduct";
+export declare class OtherProductContract extends SerializedCrudContract<OtherProduct> {
+    constructor();
+}

package/lib/esm/contract/OtherProductContract.js

@@ -0,0 +1,27 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var OtherProductContract_1;
+import { Info } from "fabric-contract-api";
+import { SerializedCrudContract } from "./../contracts/crud/serialized-crud-contract.js";
+import { OtherProduct } from "./models/OtherProduct.js";
+let OtherProductContract = OtherProductContract_1 = class OtherProductContract extends SerializedCrudContract {
+    constructor() {
+        super(OtherProductContract_1.name, OtherProduct);
+    }
+};
+OtherProductContract = OtherProductContract_1 = __decorate([
+    Info({
+        title: "OtherProductContract",
+        description: "Contract managing the Products",
+    }),
+    __metadata("design:paramtypes", [])
+], OtherProductContract);
+export { OtherProductContract };
+//# sourceMappingURL=OtherProductContract.js.map

package/lib/esm/contract/OtherProductContract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtherProductContract.js","sourceRoot":"","sources":["../../../src/contract/OtherProductContract.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wDAAmD;AACpF,OAAO,EAAE,YAAY,EAAE,iCAA8B;AAM9C,IAAM,oBAAoB,4BAA1B,MAAM,oBAAqB,SAAQ,sBAAoC;IAC5E;QACE,KAAK,CAAC,sBAAoB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAJY,oBAAoB;IAJhC,IAAI,CAAC;QACJ,KAAK,EAAE,sBAAsB;QAC7B,WAAW,EAAE,gCAAgC;KAC9C,CAAC;;GACW,oBAAoB,CAIhC"}

package/lib/esm/contract/OtherProductSharedContract.d.ts

@@ -0,0 +1,5 @@
+import { SerializedCrudContract } from "../contracts/crud/serialized-crud-contract";
+import { OtherProductShared } from "./models/OtherProductShared";
+export declare class OtherProductSharedContract extends SerializedCrudContract<OtherProductShared> {
+    constructor();
+}

package/lib/esm/contract/OtherProductSharedContract.js

@@ -0,0 +1,27 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var OtherProductSharedContract_1;
+import { Info } from "fabric-contract-api";
+import { SerializedCrudContract } from "./../contracts/crud/serialized-crud-contract.js";
+import { OtherProductShared } from "./models/OtherProductShared.js";
+let OtherProductSharedContract = OtherProductSharedContract_1 = class OtherProductSharedContract extends SerializedCrudContract {
+    constructor() {
+        super(OtherProductSharedContract_1.name, OtherProductShared);
+    }
+};
+OtherProductSharedContract = OtherProductSharedContract_1 = __decorate([
+    Info({
+        title: "OtherProductSharedContract",
+        description: "Contract managing the Other Shared Products",
+    }),
+    __metadata("design:paramtypes", [])
+], OtherProductSharedContract);
+export { OtherProductSharedContract };
+//# sourceMappingURL=OtherProductSharedContract.js.map

package/lib/esm/contract/OtherProductSharedContract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtherProductSharedContract.js","sourceRoot":"","sources":["../../../src/contract/OtherProductSharedContract.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wDAAmD;AACpF,OAAO,EAAE,kBAAkB,EAAE,uCAAoC;AAM1D,IAAM,0BAA0B,kCAAhC,MAAM,0BAA2B,SAAQ,sBAA0C;IACxF;QACE,KAAK,CAAC,4BAA0B,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;AAJY,0BAA0B;IAJtC,IAAI,CAAC;QACJ,KAAK,EAAE,4BAA4B;QACnC,WAAW,EAAE,6CAA6C;KAC3D,CAAC;;GACW,0BAA0B,CAItC"}

package/lib/esm/contract/index.js

@@ -4,10 +4,12 @@ import { ProductContract } from "./ProductContract.js";
 import { BatchContract } from "./BatchContract.js";
 import { UserContract } from "./UserContract.js";
 import { AddressContract } from "./AddressContract.js";
+import { OtherProductSharedContract } from "./OtherProductSharedContract.js";
 export const contracts = [
     ProductContract,
     BatchContract,
     UserContract,
     AddressContract,
+    OtherProductSharedContract,
 ];
 //# sourceMappingURL=index.js.map

package/lib/esm/contract/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,6CAAwC;AACrE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAC9C,OAAO,EAAE,eAAe,EAAE,6BAA0B;AAEpD,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C,eAAe;IACf,aAAa;IACb,YAAY;IACZ,eAAe;CAChB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,6CAAwC;AACrE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAC9C,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,0BAA0B,EAAE,wCAAqC;AAE1E,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C,eAAe;IACf,aAAa;IACb,YAAY;IACZ,eAAe;IACf,0BAA0B;CAC3B,CAAC"}

package/lib/esm/contract/models/Audit.d.ts

@@ -5,8 +5,9 @@ export declare class Audit extends BaseModel {
     id: string;
     userId: string;
     userGroup: string;
+    model: string;
     transaction: string;
     action: AuditOperations;
-    diffs?: Record<string, any>;
+    diffs: Record<string, any>;
     constructor(model?: ModelArg<Audit>);
 }

package/lib/esm/contract/models/Audit.js

@@ -8,20 +8,29 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { model, required, type, } from "@decaf-ts/decorator-validation";
-import { BlockOperations, composed, OperationKeys, readonly, serialize, } from "@decaf-ts/db-decorators";
+import { BlockOperations, InternalError, OperationKeys, readonly, serialize, } from "@decaf-ts/db-decorators";
 import { description, uses } from "@decaf-ts/decoration";
-import { table, pk, createdBy, column, OrderDirection, index, } from "@decaf-ts/core";
+import { table, pk, createdBy, column, OrderDirection, index, uuid, } from "@decaf-ts/core";
 import { BaseModel } from "./BaseModel.js";
 import { AuditOperations } from "./constants.js";
 import { FabricFlavour, transactionId } from "./../../shared/index.js";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function uuidSeed(m, ...args) {
+    try {
+        return `${m.model}${m.action}${m.userId}${m.transaction}${JSON.stringify(m.diffs)}`;
+    }
+    catch (e) {
+        throw new InternalError(`Failed to generate deterministic uuid: ${e}`);
+    }
+}
 let Audit = class Audit extends BaseModel {
     constructor(model) {
         super(model);
     }
 };
 __decorate([
-    pk({ type: String, generated: false }),
-    composed(["transaction", "action", "diffs"], ":", false, true),
+    pk(),
+    uuid(uuidSeed),
     description("Unique identifier of the audit record."),
     __metadata("design:type", String)
 ], Audit.prototype, "id", void 0);
@@ -40,6 +49,14 @@ __decorate([
     description("Group or role of the user who performed the action."),
     __metadata("design:type", String)
 ], Audit.prototype, "userGroup", void 0);
+__decorate([
+    column(),
+    required(),
+    readonly(),
+    index([OrderDirection.ASC, OrderDirection.DSC]),
+    description("model/entity affected by the action"),
+    __metadata("design:type", String)
+], Audit.prototype, "model", void 0);
 __decorate([
     column(),
     required(),
@@ -60,6 +77,7 @@ __decorate([
 __decorate([
     column(),
     readonly(),
+    required(),
     serialize(),
     description("the diffs for the action."),
     __metadata("design:type", Object)

package/lib/esm/contract/models/Audit.js.map

@@ -1 +1 @@
-{"version":3,"file":"Audit.js","sourceRoot":"","sources":["../../../../src/contract/models/Audit.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,KAAK,EAEL,QAAQ,EACR,IAAI,GACL,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,KAAK,EACL,EAAE,EACF,SAAS,EAET,MAAM,EAEN,cAAc,EACd,KAAK,GACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,uBAAoB;AACxC,OAAO,EAAE,eAAe,EAAE,uBAAoB;AAC9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,gCAA2B;AAW3D,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,SAAS;IAwClC,YAAY,KAAuB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AAvCC;IAHC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACtC,QAAQ,CAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC;IAC9D,WAAW,CAAC,wCAAwC,CAAC;;iCAC1C;AAMZ;IAJC,MAAM,EAAE;IACR,SAAS,EAAE;IACX,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,kDAAkD,CAAC;;qCAChD;AAOhB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,qDAAqD,CAAC;;wCAChD;AAOnB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,aAAa,EAAE;IACf,WAAW,CAAC,iDAAiD,CAAC;;0CAC1C;AAQrB;IANC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,IAAI,CAAC,MAAM,CAAC;IACZ,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,uCAAuC,CAAC;;qCAC5B;AAMzB;IAJC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,SAAS,EAAE;IACX,WAAW,CAAC,2BAA2B,CAAC;;oCACb;AAtCjB,KAAK;IATjB,WAAW,CAAC,2CAA2C,CAAC;IACxD,eAAe,CAAC;QACf,wBAAwB;QACxB,aAAa,CAAC,MAAM;QACpB,aAAa,CAAC,MAAM;KACrB,CAAC;IACD,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,OAAO,CAAC;IACd,KAAK,EAAE;;GACK,KAAK,CA2CjB"}
+{"version":3,"file":"Audit.js","sourceRoot":"","sources":["../../../../src/contract/models/Audit.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,KAAK,EAEL,QAAQ,EACR,IAAI,GACL,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,aAAa,EACb,aAAa,EACb,QAAQ,EACR,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,KAAK,EACL,EAAE,EACF,SAAS,EACT,MAAM,EACN,cAAc,EACd,KAAK,EACL,IAAI,GAEL,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,uBAAoB;AACxC,OAAO,EAAE,eAAe,EAAE,uBAAoB;AAC9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,gCAA2B;AAElE,6DAA6D;AAC7D,SAAS,QAAQ,CAAC,CAAQ,EAAE,GAAG,IAAyB;IACtD,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;IACtF,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,IAAI,aAAa,CAAC,0CAA0C,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;AAWM,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,SAAS;IAgDlC,YAAY,KAAuB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AA/CC;IAHC,EAAE,EAAE;IACJ,IAAI,CAAC,QAAQ,CAAC;IACd,WAAW,CAAC,wCAAwC,CAAC;;iCAC1C;AAMZ;IAJC,MAAM,EAAE;IACR,SAAS,EAAE;IACX,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,kDAAkD,CAAC;;qCAChD;AAOhB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,qDAAqD,CAAC;;wCAChD;AAOnB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,qCAAqC,CAAC;;oCACpC;AAOf;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,aAAa,EAAE;IACf,WAAW,CAAC,iDAAiD,CAAC;;0CAC1C;AAQrB;IANC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,IAAI,CAAC,MAAM,CAAC;IACZ,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,uCAAuC,CAAC;;qCAC5B;AAOzB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,SAAS,EAAE;IACX,WAAW,CAAC,2BAA2B,CAAC;;oCACb;AA9CjB,KAAK;IATjB,WAAW,CAAC,2CAA2C,CAAC;IACxD,eAAe,CAAC;QACf,wBAAwB;QACxB,aAAa,CAAC,MAAM;QACpB,aAAa,CAAC,MAAM;KACrB,CAAC;IACD,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,OAAO,CAAC;IACd,KAAK,EAAE;;GACK,KAAK,CAmDjB"}

package/lib/esm/contract/models/Batch.js

@@ -76,8 +76,8 @@ let Batch = class Batch extends BaseIdentifiedModel {
     }
 };
 __decorate([
-    pk({ type: String, generated: false }),
-    audit(),
+    pk(),
+    audit(Batch),
     composed(["productCode", "batchNumber"], ":"),
     description("Unique identifier composed of product code and batch number."),
     __metadata("design:type", String)

package/lib/esm/contract/models/Batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"Batch.js","sourceRoot":"","sources":["../../../../src/contract/models/Batch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Batch.js","sourceRoot":"","sources":["../../../../src/contract/models/Batch.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,uBAAoB;AACpE,OAAO,EACL,eAAe,EACf,QAAQ,EACR,aAAa,EACb,QAAQ,GACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,KAAK,EAAE,wBAAqB;AACrC,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,aAAa,EAAE,gCAA2B;AAO5C,IAAM,KAAK,GAAX,MAAM,KAAM,SAAQ,mBAAmB;IAuE5C,YAAY;IACZ,mEAAmE;IACnE,8BAA8B;IAC9B,EAAE;IACF,YAAY;IACZ,yEAAyE;IACzE,8BAA8B;IAC9B,EAAE;IACF,YAAY;IACZ,4DAA4D;IAC5D,8CAA8C;IAC9C,EAAE;IACF,YAAY;IACZ,uDAAuD;IACvD,8CAA8C;IAC9C,EAAE;IACF,YAAY;IACZ,2DAA2D;IAC3D,yBAAyB;IACzB,EAAE;IACF,YAAY;IACZ,qEAAqE;IACrE,iDAAiD;IACjD,EAAE;IACF,YAAY;IACZ,4DAA4D;IAC5D,0BAA0B;IAC1B,EAAE;IACF,YAAY;IACZ,0DAA0D;IAC1D,4CAA4C;IAC5C,EAAE;IACF,YAAY;IACZ,kDAAkD;IAClD,6BAA6B;IAC7B,EAAE;IACF,YAAY;IACZ,mEAAmE;IACnE,6CAA6C;IAC7C,EAAE;IACF,oBAAoB;IACpB,YAAY;IACZ,uEAAuE;IACvE,+BAA+B;IAC/B,EAAE;IACF,YAAY;IACZ,mEAAmE;IACnE,iCAAiC;IAEjC,4BAA4B;IAC5B,yCAAyC;IACzC,gBAAgB;IAChB,8DAA8D;IAC9D,sBAAsB;IAEtB,YAAY,KAAuB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;QA1Df,gBAAW,GAAY,KAAK,CAAC;IA2D7B,CAAC;CACF,CAAA;AA5HC;IAJC,EAAE,EAAE;IACJ,KAAK,CAAC,KAAK,CAAC;IACZ,QAAQ,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC;IAC7C,WAAW,CAAC,8DAA8D,CAAC;;iCAChE;AAWZ;IATC,IAAI,EAAE;IACN,QAAQ,EAAE;IACX,cAAc;IACd,mBAAmB;IACnB,oDAAoD;IACpD,UAAU;IACV,IAAI;;IACH,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,iDAAiD,CAAC;;0CAC1C;AAOrB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,OAAO,CAAC,YAAY,CAAC;IACrB,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,uCAAuC,CAAC;;0CAChC;AAOrB;IALC,QAAQ,EAAE;IACV,IAAI,CAAC,WAAW,CAAC;IACjB,MAAM,EAAE;IACR,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,8BAA8B,CAAC;8BAC/B,IAAI;yCAAC;AAIlB;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,uCAAuC,CAAC;;kDACxB;AAK7B;IAHC,MAAM,EAAE;IACR,IAAI,CAAC,WAAW,CAAC;IACjB,WAAW,CAAC,uCAAuC,CAAC;;kDACxB;AAK7B;IAHC,MAAM,EAAE;IACR,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,mCAAmC,CAAC;;+CACvB;AAI1B;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,8BAA8B,CAAC;;mDACd;AAI9B;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,8BAA8B,CAAC;;mDACd;AAI9B;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,8BAA8B,CAAC;;mDACd;AAI9B;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,8BAA8B,CAAC;;mDACd;AAI9B;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,8BAA8B,CAAC;;mDACd;AAK9B;IAHC,MAAM,EAAE;IACR,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,iDAAiD,CAAC;;0CAClC;AArElB,KAAK;IALjB,WAAW,CAAC,4BAA4B,CAAC;IACzC,IAAI,CAAC,aAAa,CAAC;IACnB,eAAe,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;IACvB,KAAK,EAAE;;GACK,KAAK,CAiIjB"}

package/lib/esm/contract/models/Leaflet.js

@@ -24,8 +24,8 @@ let Leaflet = class Leaflet extends BaseIdentifiedModel {
     }
 };
 __decorate([
-    audit(),
-    pk({ type: "String", generated: false }),
+    audit(Leaflet),
+    pk(),
     composed(["productCode", "batchNumber", "lang", "countryMarket"], ":", [
         "batchNumber",
         "countryMarket",

package/lib/esm/contract/models/Leaflet.js.map

@@ -1 +1 @@
-{"version":3,"file":"Leaflet.js","sourceRoot":"","sources":["../../../../src/contract/models/Leaflet.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,yBAAsB;AAC5C,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,UAAU,EAAE,uBAAoB;AACzC,OAAO,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,SAAS,EACT,SAAS,EACT,cAAc,EACd,EAAE,EACF,KAAK,GACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,qBAAkB;AACpC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,KAAK,EAAE,wBAAqB;AACrC,OAAO,EAAE,aAAa,EAAE,gCAA2B;AAQ5C,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,mBAAmB;IA+D9C,YAAY,KAAyB;QACnC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AAxDC;IATC,KAAK,EAAE;IACP,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACxC,QAAQ,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE;QACtE,aAAa;QACb,eAAe;KAChB,CAAC;IACD,WAAW,CACV,yEAAyE,CAC1E;;mCACW;AAYZ;IAVC,IAAI,EAAE;IACN,SAAS,CACR,GAAG,EAAE,CAAC,OAAO,EACb,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,EACpD,KAAK,CACN;IACA,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,wDAAwD,CAAC;;4CACjD;AAYrB;IAVC,MAAM,EAAE;IACT,iFAAiF;IACjF,cAAc;IACd,iBAAiB;IACjB,0DAA0D;IAC1D,UAAU;IACV,IAAI;;IACH,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,oDAAoD,CAAC;;4CAC7C;AAOrB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,wDAAwD,CAAC;;qCACxD;AAKd;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;;8CACY;AAKvB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,WAAW,CAAC,6CAA6C,CAAC;;+CACnC;AAUxB;IARC,SAAS,CACR,GAAG,EAAE,CAAC,WAAW,EACjB,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,EACpD,KAAK,CACN;IACA,WAAW,CACV,yEAAyE,CAC1E;;kDAC4B;AA7DlB,OAAO;IANnB,WAAW,CACV,iFAAiF,CAClF;IACA,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;IACzB,KAAK,EAAE;;GACK,OAAO,CAkEnB"}
+{"version":3,"file":"Leaflet.js","sourceRoot":"","sources":["../../../../src/contract/models/Leaflet.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,yBAAsB;AAC5C,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,UAAU,EAAE,uBAAoB;AACzC,OAAO,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,SAAS,EACT,SAAS,EACT,cAAc,EACd,EAAE,EACF,KAAK,GACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,qBAAkB;AACpC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,KAAK,EAAE,wBAAqB;AACrC,OAAO,EAAE,aAAa,EAAE,gCAA2B;AAQ5C,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,mBAAmB;IA+D9C,YAAY,KAAyB;QACnC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AAxDC;IATC,KAAK,CAAC,OAAO,CAAC;IACd,EAAE,EAAE;IACJ,QAAQ,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE;QACtE,aAAa;QACb,eAAe;KAChB,CAAC;IACD,WAAW,CACV,yEAAyE,CAC1E;;mCACW;AAYZ;IAVC,IAAI,EAAE;IACN,SAAS,CACR,GAAG,EAAE,CAAC,OAAO,EACb,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,EACpD,KAAK,CACN;IACA,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,wDAAwD,CAAC;;4CACjD;AAYrB;IAVC,MAAM,EAAE;IACT,iFAAiF;IACjF,cAAc;IACd,iBAAiB;IACjB,0DAA0D;IAC1D,UAAU;IACV,IAAI;;IACH,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,oDAAoD,CAAC;;4CAC7C;AAOrB;IALC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CAAC,wDAAwD,CAAC;;qCACxD;AAKd;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,QAAQ,EAAE;;8CACY;AAKvB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,WAAW,CAAC,6CAA6C,CAAC;;+CACnC;AAUxB;IARC,SAAS,CACR,GAAG,EAAE,CAAC,WAAW,EACjB,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,EACpD,KAAK,CACN;IACA,WAAW,CACV,yEAAyE,CAC1E;;kDAC4B;AA7DlB,OAAO;IANnB,WAAW,CACV,iFAAiF,CAClF;IACA,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;IACzB,KAAK,EAAE;;GACK,OAAO,CAkEnB"}

package/lib/esm/contract/models/OtherProduct.d.ts

@@ -0,0 +1,12 @@
+import type { ModelArg } from "@decaf-ts/decorator-validation";
+import { BaseIdentifiedModel } from "./BaseIdentifiedModel";
+export declare class OtherProduct extends BaseIdentifiedModel {
+    productCode: string;
+    inventedName: string;
+    nameMedicinalProduct: string;
+    internalMaterialCode?: string;
+    productRecall: boolean;
+    counter?: number;
+    ownedBy?: string;
+    constructor(args?: ModelArg<OtherProduct>);
+}

package/lib/esm/contract/models/OtherProduct.js

@@ -0,0 +1,71 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { model, required } from "@decaf-ts/decorator-validation";
+import { column, index, OrderDirection, pk, table, } from "@decaf-ts/core";
+// import {BlockOperations, OperationKeys, readonly} from "@decaf-ts/db-decorators";
+import { uses } from "@decaf-ts/decoration";
+import { BaseIdentifiedModel } from "./BaseIdentifiedModel.js";
+import { gtin } from "./gtin.js";
+import { audit } from "./decorators.js";
+import { FabricFlavour, ownedBy, privateData } from "./../../shared/index.js";
+import { version } from "@decaf-ts/db-decorators";
+let OtherProduct = class OtherProduct extends BaseIdentifiedModel {
+    constructor(args) {
+        super(args);
+        this.productRecall = false;
+    }
+};
+__decorate([
+    pk(),
+    gtin(),
+    audit(OtherProduct),
+    __metadata("design:type", String)
+], OtherProduct.prototype, "productCode", void 0);
+__decorate([
+    column(),
+    required(),
+    index([OrderDirection.ASC, OrderDirection.DSC]),
+    __metadata("design:type", String)
+], OtherProduct.prototype, "inventedName", void 0);
+__decorate([
+    column(),
+    required(),
+    index([OrderDirection.ASC, OrderDirection.DSC]),
+    __metadata("design:type", String)
+], OtherProduct.prototype, "nameMedicinalProduct", void 0);
+__decorate([
+    column(),
+    __metadata("design:type", String)
+], OtherProduct.prototype, "internalMaterialCode", void 0);
+__decorate([
+    column(),
+    index([OrderDirection.ASC, OrderDirection.DSC]),
+    __metadata("design:type", Boolean)
+], OtherProduct.prototype, "productRecall", void 0);
+__decorate([
+    version(),
+    __metadata("design:type", Number)
+], OtherProduct.prototype, "counter", void 0);
+__decorate([
+    column(),
+    ownedBy(),
+    __metadata("design:type", String)
+], OtherProduct.prototype, "ownedBy", void 0);
+OtherProduct = __decorate([
+    privateData(),
+    uses(FabricFlavour)
+    // @BlockOperations([OperationKeys.DELETE])
+    ,
+    table("other_product"),
+    model(),
+    __metadata("design:paramtypes", [Object])
+], OtherProduct);
+export { OtherProduct };
+//# sourceMappingURL=OtherProduct.js.map