@decaf-ts/for-fabric 0.1.2 → 0.1.5

package/lib/contracts/crud/crud-contract.cjs

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FabricCrudContract = void 0;
 const ContractAdapter_1 = require("./../ContractAdapter.cjs");
 const fabric_contract_api_1 = require("fabric-contract-api");
+const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const core_1 = require("@decaf-ts/core");
 const DeterministicSerializer_1 = require("./../../shared/DeterministicSerializer.cjs");
-const logging_1 = require("@decaf-ts/logging");
-const private_data_1 = require("./../private-data.cjs");
-const ContractPrivateDataAdapter_1 = require("./../ContractPrivateDataAdapter.cjs");
-const constants_1 = require("./../../shared/constants.cjs");
+const ContractContext_1 = require("./../ContractContext.cjs");
+const db_decorators_1 = require("@decaf-ts/db-decorators");
 /**
  * @description Base contract class for CRUD operations in Fabric chaincode
  * @summary Provides standard create, read, update, and delete operations for models in Fabric chaincode
@@ -58,6 +57,10 @@ const constants_1 = require("./../../shared/constants.cjs");
  *   Contract-->>Client: model
  */
 class FabricCrudContract extends fabric_contract_api_1.Contract {
+    /**
+     * @description Shared adapter instance for all contract instances
+     */
+    static { this.adapter = new ContractAdapter_1.FabricContractAdapter(); }
     static { this.serializer = new DeterministicSerializer_1.DeterministicSerializer(); }
     /**
      * @description Creates a new FabricCrudContract instance
@@ -69,28 +72,7 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
         super(name);
         this.clazz = clazz;
         this.initialized = false;
-        FabricCrudContract.adapter = this.getAdapter(clazz);
-        this.repo = core_1.Repository.forModel(clazz, FabricCrudContract.adapter.alias);
-    }
-    getAdapter(clazz) {
-        const instance = new clazz();
-        if ((0, private_data_1.isModelPrivate)(instance)) {
-            const pvt = (0, private_data_1.modelToPrivate)(instance);
-            const collections = Object.keys(pvt.private);
-            return new ContractPrivateDataAdapter_1.FabricContractPrivateDataAdapter(undefined, "fabric-private-data-adapter", collections);
-        }
-        else {
-            return new ContractAdapter_1.FabricContractAdapter(undefined, [constants_1.FabricFlavour, clazz.name].join("_"));
-        }
-    }
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx) {
-        return logging_1.Logging.for(FabricCrudContract.name, {}, ctx);
+        this.repo = core_1.Repository.forModel(clazz);
     }
     /**
      * @description Creates a single model in the state database
@@ -101,14 +83,14 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M>} Promise resolving to the created model
      */
     async create(ctx, model, ...args) {
-        const log = this.logFor(ctx).for(this.create);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.create);
         if (typeof model === "string")
             model = this.deserialize(model);
         log.info(`Creating model: ${JSON.stringify(model)}`);
         const transient = this.getTransientData(ctx);
         log.info(`Merging transient data...`);
-        model = this.repo.merge(model, transient);
-        return this.repo.create(model, ctx, ...args);
+        model = decorator_validation_1.Model.merge(model, transient, this.clazz);
+        return this.repo.create(model, ...ctxArgs);
     }
     /**
      * @description Reads a single model from the state database
@@ -119,9 +101,9 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M>} Promise resolving to the retrieved model
      */
     async read(ctx, key, ...args) {
-        const log = this.logFor(ctx).for(this.read);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.read);
         log.info(`reading entry with pk ${key} `);
-        return this.repo.read(key, ctx, ...args);
+        return this.repo.read(key, ...ctxArgs);
     }
     getTransientData(ctx) {
         const transientMap = ctx.stub.getTransient();
@@ -140,14 +122,14 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M>} Promise resolving to the updated model
      */
     async update(ctx, model, ...args) {
-        const log = this.logFor(ctx).for(this.update);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.update);
         if (typeof model === "string")
             model = this.deserialize(model);
         log.info(`Updating model: ${JSON.stringify(model)}`);
         const transient = this.getTransientData(ctx);
         log.info(`Merging transient data...`);
-        model = this.repo.merge(model, transient);
-        return this.repo.update(model, ctx, ...args);
+        model = decorator_validation_1.Model.merge(model, transient, this.clazz);
+        return this.repo.update(model, ...ctxArgs);
     }
     /**
      * @description Deletes a single model from the state database
@@ -158,9 +140,9 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M>} Promise resolving to the deleted model
      */
     async delete(ctx, key, ...args) {
-        const log = this.logFor(ctx).for(this.delete);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.delete);
         log.info(`deleting entry with pk ${key} `);
-        return this.repo.delete(String(key), ctx, ...args);
+        return this.repo.delete(String(key), ...ctxArgs);
     }
     /**
      * @description Deletes multiple models from the state database
@@ -171,9 +153,10 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M[]>} Promise resolving to the deleted models
      */
     async deleteAll(ctx, keys, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.readAll);
         if (typeof keys === "string")
             keys = JSON.parse(keys);
-        return this.repo.deleteAll(keys, ctx, ...args);
+        return this.repo.deleteAll(keys, ...ctxArgs);
     }
     /**
      * @description Reads multiple models from the state database
@@ -184,9 +167,10 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M[]>} Promise resolving to the retrieved models
      */
     async readAll(ctx, keys, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.readAll);
         if (typeof keys === "string")
             keys = JSON.parse(keys);
-        return this.repo.readAll(keys, ctx, ...args);
+        return this.repo.readAll(keys, ...ctxArgs);
     }
     /**
      * @description Updates multiple models in the state database
@@ -197,13 +181,13 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M[]>} Promise resolving to the updated models
      */
     async updateAll(ctx, models, ...args) {
-        const log = this.logFor(ctx).for(this.updateAll);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.updateAll);
         if (typeof models === "string")
             models = JSON.parse(models)
                 .map((m) => this.deserialize(m))
                 .map((m) => new this.clazz(m));
         log.info(`updating ${models.length} entries to the table`);
-        return this.repo.updateAll(models, ctx, ...args);
+        return this.repo.updateAll(models, ...ctxArgs);
     }
     /**
      * @description Executes a raw query against the state database
@@ -215,9 +199,10 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<any>} Promise resolving to the query results
      */
     async raw(ctx, rawInput, docsOnly, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.raw);
         if (typeof rawInput === "string")
             rawInput = JSON.parse(rawInput);
-        return this.repo.raw(rawInput, docsOnly, ctx, ...args);
+        return FabricCrudContract.adapter.raw(rawInput, docsOnly, ...ctxArgs);
     }
     serialize(model) {
         return FabricCrudContract.serializer.serialize(model);
@@ -226,13 +211,13 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
         return FabricCrudContract.serializer.deserialize(str);
     }
     async init(ctx) {
-        const log = this.logFor(ctx).for(this.init);
+        const { log } = await this.logCtx([ctx], this.init);
         log.info(`Running contract initialization...`);
         this.initialized = true;
         log.info(`Contract initialization completed.`);
     }
     async healthcheck(ctx) {
-        const log = this.logFor(ctx).for(this.healthcheck);
+        const { log } = await this.logCtx([ctx], this.healthcheck);
         log.info(`Running Healthcheck: ${this.initialized}...`);
         return { healthcheck: this.initialized };
     }
@@ -245,7 +230,7 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
      * @return {Promise<M[]>} Promise resolving to the created models
      */
     async createAll(ctx, models, ...args) {
-        const log = this.logFor(ctx).for(this.createAll);
+        const { log } = await this.logCtx([...args, ctx], this.createAll);
         if (typeof models === "string")
             models = JSON.parse(models)
                 .map((m) => this.deserialize(m))
@@ -253,6 +238,51 @@ class FabricCrudContract extends fabric_contract_api_1.Contract {
         log.info(`adding ${models.length} entries to the table`);
         return this.repo.createAll(models, ctx, ...args);
     }
+    async logCtx(args, method) {
+        return FabricCrudContract.logCtx.bind(this)(args, method);
+    }
+    static async logCtx(args, method) {
+        if (args.length < 1)
+            throw new db_decorators_1.InternalError("No context provided");
+        const ctx = args.pop();
+        if (ctx instanceof ContractContext_1.FabricContractContext)
+            return {
+                ctx,
+                log: ctx.logger.clear().for(this).for(method),
+                ctxArgs: [...args, ctx],
+            };
+        if (!(ctx instanceof fabric_contract_api_1.Context))
+            throw new db_decorators_1.InternalError("No valid context provided");
+        function getOp() {
+            if (typeof method === "string")
+                return method;
+            switch (method.name) {
+                case db_decorators_1.OperationKeys.CREATE:
+                case db_decorators_1.OperationKeys.READ:
+                case db_decorators_1.OperationKeys.UPDATE:
+                case db_decorators_1.OperationKeys.DELETE:
+                case db_decorators_1.BulkCrudOperationKeys.CREATE_ALL:
+                case db_decorators_1.BulkCrudOperationKeys.READ_ALL:
+                case db_decorators_1.BulkCrudOperationKeys.UPDATE_ALL:
+                case db_decorators_1.BulkCrudOperationKeys.DELETE_ALL:
+                    return method.name;
+                default:
+                    return method.name;
+            }
+        }
+        const overrides = {
+            correlationId: ctx.stub.getTxID(),
+        };
+        const context = await FabricCrudContract.adapter.context(getOp(), overrides, this.clazz, ctx);
+        const log = (this
+            ? context.logger.for(this).for(method)
+            : context.logger.clear().for(this).for(method));
+        return {
+            ctx: context,
+            log: log,
+            ctxArgs: [...args, context],
+        };
+    }
 }
 exports.FabricCrudContract = FabricCrudContract;
 //# sourceMappingURL=crud-contract.js.map

package/lib/contracts/crud/crud-contract.d.ts

@@ -1,12 +1,13 @@
 import { FabricContractAdapter } from "../ContractAdapter";
-import { Context, Contract, Context as Ctx } from "fabric-contract-api";
+import { Contract, Context as Ctx } from "fabric-contract-api";
 import { Model } from "@decaf-ts/decorator-validation";
+import { ContextualizedArgs } from "@decaf-ts/core";
 import { FabricContractRepository } from "../FabricContractRepository";
 import { DeterministicSerializer } from "../../shared/DeterministicSerializer";
 import { MangoQuery } from "@decaf-ts/for-couchdb";
 import { Checkable, healthcheck } from "../../shared/interfaces/Checkable";
-import { ContractLogger } from "../logging";
 import { Constructor } from "@decaf-ts/decoration";
+import { FabricContractContext } from "../ContractContext";
 /**
  * @description Base contract class for CRUD operations in Fabric chaincode
  * @summary Provides standard create, read, update, and delete operations for models in Fabric chaincode
@@ -71,14 +72,6 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @param {Constructor<M>} clazz - The model constructor
      */
     protected constructor(name: string, clazz: Constructor<M>);
-    protected getAdapter(clazz: Constructor<M>): FabricContractAdapter;
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx: Context): ContractLogger;
     /**
      * @description Creates a single model in the state database
      * @summary Delegates to the repository's create method
@@ -152,7 +145,7 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @param {...any[]} args - Additional arguments
      * @return {Promise<any>} Promise resolving to the query results
      */
-    raw(ctx: Ctx, rawInput: MangoQuery | string, docsOnly: boolean, ...args: any[]): Promise<any | string>;
+    raw(ctx: Ctx | FabricContractContext, rawInput: MangoQuery | string, docsOnly: boolean, ...args: any[]): Promise<any | string>;
     protected serialize(model: M): string;
     protected deserialize<M extends Model>(str: string): M;
     protected init(ctx: Ctx): Promise<void>;
@@ -166,4 +159,7 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @return {Promise<M[]>} Promise resolving to the created models
      */
     createAll(ctx: Ctx, models: string | M[], ...args: any[]): Promise<string | M[]>;
+    logCtx<ARGS extends any[]>(args: ARGS, method: ((...args: any[]) => any) | string): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
+    protected static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: string): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
+    protected static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: (...args: any[]) => any): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
 }

package/lib/contracts/crud/crud-contract.js.map

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

package/lib/contracts/crud/serialized-crud-contract.cjs

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializedCrudContract = void 0;
 const crud_contract_1 = require("./crud-contract.cjs");
 const fabric_contract_api_1 = require("fabric-contract-api");
-const logging_1 = require("@decaf-ts/logging");
 /**
  * @description CRUD contract variant that serializes/deserializes payloads
  * @summary Exposes the same CRUD operations as FabricCrudContract but takes and returns JSON strings to facilitate simple client interactions.
@@ -29,51 +28,42 @@ class SerializedCrudContract extends crud_contract_1.FabricCrudContract {
     constructor(name, clazz) {
         super(name, clazz);
     }
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx) {
-        return logging_1.Logging.for(SerializedCrudContract, {}, ctx);
-    }
     async create(ctx, model) {
-        const log = this.logFor(ctx).for(this.create);
+        const { log } = await this.logCtx([ctx], this.create);
         log.info(`Creating model: ${model}`);
         const m = this.deserialize(model);
         log.info(`Model deserialized: ${JSON.stringify(m)}`);
         return this.serialize((await super.create(ctx, m)));
     }
     async read(ctx, key) {
-        const log = this.logFor(ctx).for(this.read);
+        const { log } = await this.logCtx([ctx], this.read);
         log.info(`Reading id: ${key}`);
         return this.serialize((await super.read(ctx, key)));
     }
     async update(ctx, model) {
-        const log = this.logFor(ctx).for(this.update);
+        const { log } = await this.logCtx([ctx], this.update);
         log.info(`Updating model: ${model}`);
         return this.serialize((await super.update(ctx, model)));
     }
     async delete(ctx, key) {
-        const log = this.logFor(ctx).for(this.delete);
+        const { log } = await this.logCtx([ctx], this.delete);
         log.info(`Deleting id: ${key}`);
         return this.serialize((await super.delete(ctx, key)));
     }
     async deleteAll(ctx, keys) {
         const parsedKeys = JSON.parse(keys);
-        const log = this.logFor(ctx).for(this.deleteAll);
+        const { log } = await this.logCtx([ctx], this.deleteAll);
         log.info(`deleting ${parsedKeys.length} entries from the table`);
         return JSON.stringify((await super.deleteAll(ctx, parsedKeys)).map((m) => this.serialize(m)));
     }
     async readAll(ctx, keys) {
         const parsedKeys = JSON.parse(keys);
-        const log = this.logFor(ctx).for(this.readAll);
+        const { log } = await this.logCtx([ctx], this.readAll);
         log.info(`reading ${parsedKeys.length} entries from the table`);
         return JSON.stringify((await super.readAll(ctx, parsedKeys)).map((m) => this.serialize(m)));
     }
     async updateAll(ctx, models) {
-        const log = this.logFor(ctx).for(this.updateAll);
+        const { log } = await this.logCtx([ctx], this.updateAll);
         const list = JSON.parse(models);
         const modelList = list
             .map((m) => this.deserialize(m))
@@ -81,7 +71,8 @@ class SerializedCrudContract extends crud_contract_1.FabricCrudContract {
         log.info(`Updating ${modelList.length} entries to the table`);
         return JSON.stringify((await super.updateAll(ctx, modelList)).map((m) => this.serialize(m)));
     }
-    async raw(ctx, rawInput, docsOnly) {
+    async raw(context, rawInput, docsOnly) {
+        const { ctx } = await this.logCtx([context], this.raw);
         const parsedInput = JSON.parse(rawInput);
         return super.raw(ctx, parsedInput, docsOnly);
     }
@@ -92,14 +83,14 @@ class SerializedCrudContract extends crud_contract_1.FabricCrudContract {
         //TODO: TRIM NOT WORKING CHECK LATER
         return JSON.stringify(await super.healthcheck(ctx));
     }
-    async createAll(ctx, models) {
-        const log = this.logFor(ctx).for(this.createAll);
+    async createAll(context, models) {
+        const { log } = await this.logCtx([context], this.createAll);
         const list = JSON.parse(models);
         const modelList = list
             .map((m) => this.deserialize(m))
             .map((m) => new this.clazz(m));
         log.info(`Adding ${modelList.length} entries to the table`);
-        return JSON.stringify((await super.createAll(ctx, modelList)).map((m) => this.serialize(m)));
+        return JSON.stringify((await super.createAll(context, modelList)).map((m) => this.serialize(m)));
     }
 }
 exports.SerializedCrudContract = SerializedCrudContract;

package/lib/contracts/crud/serialized-crud-contract.d.ts

@@ -1,7 +1,6 @@
 import { FabricCrudContract } from "./crud-contract";
 import { Model } from "@decaf-ts/decorator-validation";
-import { Context, Context as Ctx } from "fabric-contract-api";
-import { ContractLogger } from "../logging";
+import { Context as Ctx } from "fabric-contract-api";
 import { Constructor } from "@decaf-ts/decoration";
 /**
  * @description CRUD contract variant that serializes/deserializes payloads
@@ -17,13 +16,6 @@ import { Constructor } from "@decaf-ts/decoration";
  */
 export declare class SerializedCrudContract<M extends Model> extends FabricCrudContract<M> {
     constructor(name: string, clazz: Constructor<M>);
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx: Context): ContractLogger;
     create(ctx: Ctx, model: string): Promise<string>;
     read(ctx: Ctx, key: string): Promise<string>;
     update(ctx: Ctx, model: string): Promise<string>;
@@ -31,8 +23,8 @@ export declare class SerializedCrudContract<M extends Model> extends FabricCrudC
     deleteAll(ctx: Ctx, keys: string): Promise<string>;
     readAll(ctx: Ctx, keys: string): Promise<string>;
     updateAll(ctx: Ctx, models: string): Promise<string>;
-    raw(ctx: Ctx, rawInput: string, docsOnly: boolean): Promise<any>;
+    raw(context: Ctx, rawInput: string, docsOnly: boolean): Promise<any>;
     init(ctx: Ctx): Promise<void>;
     healthcheck(ctx: Ctx): Promise<string>;
-    createAll(ctx: Ctx, models: string): Promise<string>;
+    createAll(context: Ctx, models: string): Promise<string>;
 }

package/lib/contracts/crud/serialized-crud-contract.js.map

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