@decaf-ts/for-fabric 0.1.32 → 0.1.34

package/lib/shared/model/index.d.ts

@@ -1,2 +1,4 @@
+export * from "./FabricBaseModel";
+export * from "./FabricIdentifiedBaseModel";
 export * from "./Identity";
 export * from "./IdentityCredentials";

package/lib/shared/model/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/model/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA2B;AAC3B,4DAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/model/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAkC;AAClC,kEAA4C;AAC5C,iDAA2B;AAC3B,4DAAsC"}

package/lib/shared/utils.d.ts

@@ -43,7 +43,7 @@ export declare class CoreUtils {
      * @param {string|Buffer} contentOrPath - Path to a file on disk or an already-loaded Buffer
      * @return {Promise<string|Uint8Array|Buffer>} The file content as a Buffer/string depending on reader
      */
-    static readFile(contentOrPath: string | Buffer): Promise<NonSharedBuffer>;
+    static readFile(contentOrPath: string | Buffer): Promise<Buffer<ArrayBufferLike>>;
     /**
      * @description Create a Fabric CA User object with enrollment
      * @summary Constructs a fabric-common User, sets a crypto suite, imports the provided private key, and sets enrollment with certificate and MSP ID.

package/lib/version.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_NAME = exports.VERSION = void 0;
 const decoration_1 = require("@decaf-ts/decoration");
-exports.VERSION = "0.1.31";
+exports.VERSION = "0.1.33";
 exports.PACKAGE_NAME = "@decaf-ts/for-fabric";
 decoration_1.Metadata.registerLibrary(exports.PACKAGE_NAME, exports.VERSION);
 //# sourceMappingURL=version.js.map

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.31";
+export declare const VERSION = "0.1.33";
 export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/for-fabric",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Abstracts fabric logic",
   "type": "module",
   "exports": {
@@ -25,6 +25,9 @@
       "types": "./lib/shared/index.d.ts"
     }
   },
+  "bin": {
+    "for-fabric": "./lib/bin/cli.cjs"
+  },
   "types": "lib/index.d.ts",
   "typesVersions": {
     "*": {
@@ -51,7 +54,6 @@
     "flash-forward": "npx npm-check-updates -u && npm run do-install",
     "reset": "rm -rf * && git checkout . && git pull && npm run do-install",
     "build": "npx build-scripts --dev && sed -i -e '1i#!/usr/bin/env node\\' lib/bin/*.cjs",
-    "build:contracts": "node ./lib/bin/build-contracts.cjs compile-contract --dev",
     "build:prod": "npx build-scripts --prod",
     "test": "jest --runInBand --coverage --detectOpenHandles",
     "test:unit": "jest --testPathPattern=\"/tests/unit\" --passWithNoTests --detectOpenHandles",
@@ -60,7 +62,6 @@
     "test:circular": "dpdm -T --no-warning --no-tree ./src/index.ts",
     "coverage": "rimraf ./workdocs/reports/data/*.json && npm run test:unit -- --coverage --config=./workdocs/reports/jest.coverage.config.ts",
     "lint": "eslint .",
-    "build:contract": "node ./lib/bin/build-contract.cjs compile-global-contract --dev --debug",
     "lint-fix": "eslint --fix .",
     "prepare-pr": "npm run lint-fix && npm run build:prod && npm run coverage && npm run docs",
     "prepare-release": "npm run build:prod && npm run coverage && npm run docs",
@@ -69,11 +70,15 @@
     "drawings": "for FILE in workdocs/drawings/*.drawio; do echo \"converting $FILE to image...\" && docker run --rm -v $(pwd):/data rlespinasse/drawio-export --format png $FILE; done && cp -rf workdocs/drawings/export/* workdocs/resources/",
     "uml": "cd workdocs/uml && for FILE in ./*.puml; do docker run --rm -v $(pwd):/work -w /work miy4/plantuml -DPLANTUML_LIMIT_SIZE=8192 -tpng $FILE; done && cd ../.. && cp -fr workdocs/uml/*.png workdocs/resources/",
     "docs": "npx rimraf ./docs && mkdir docs && npx build-scripts --docs",
-    "extract:indexes": "node ./lib/bin/compile-indexes.cjs compile-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/global",
+    "extract:indexes": "LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/GlobalContract",
     "infrastructure:up": "docker compose -f ./docker/infrastructure/docker-compose.yaml up -d",
     "infrastructure:down": "docker compose -f ./docker/infrastructure/docker-compose.yaml down --rmi local -v && rm -rf ./docker/docker-data && rm -f ./tests/integration/chaincodeTrackers/*.count",
     "infrastructure-hsm:up": "docker compose -f ./docker/infrastructure/docker-compose-hsm.yaml up -d",
     "infrastructure-hsm:down": "docker compose -f ./docker/infrastructure/docker-compose-hsm.yaml down --rmi local -v",
+    "build:contract2": "npx decaf fabric compile-contract --debug --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
+    "update:contract": "npm run build:contract && npm run deploy:contract",
+    "build:contract": "node ./lib/bin/cli.cjs compile-contract --dev --debug --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
+    "deploy:contract": "node ./lib/bin/cli.cjs deploy-contract --name ${CONTRACT_NAME:-GlobalContract} --input ${CONTRACT_NAME:-GlobalContract}",
     "publish-docs": "docker run -it --rm --user $(id -u):$(id -g) -v \"$(pwd)/workdocs/confluence:/content\" -e ATLASSIAN_API_TOKEN=$(cat .confluence-token) ghcr.io/markdown-confluence/publish:latest",
     "copy-storage": "sudo cp -R docker/infrastructure/storage docker/docker-data/ && sudo chmod -R 755 docker/docker-data",
     "repo:init": "codex exec \"$(cat ./.codex/prompts/repo-setup.md)\nbase_path is `./`, initialize the repository\" -s workspace-write",
@@ -115,6 +120,7 @@
   },
   "homepage": "https://github.com/decaf-ts/for-fabric#readme",
   "devDependencies": {
+    "@decaf-ts/cli": "latest",
     "@decaf-ts/fabric-weaver": "latest",
     "@decaf-ts/utils": "latest"
   },

package/lib/bin/build-contracts2.cjs

@@ -1,73 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const rollup_1 = require("rollup");
-const plugin_replace_1 = __importDefault(require("@rollup/plugin-replace"));
-const plugin_typescript_1 = __importDefault(require("@rollup/plugin-typescript"));
-const commander_1 = require("commander");
-const child_process_1 = require("child_process");
-const program = new commander_1.Command();
-program
-    .command("compile-contract")
-    .description("Creates a global contract")
-    .option("--dev", "compiles contracts without minification", false)
-    .option("--debug", "makes attaching debugger possible", false)
-    .option("--name <String>", "contract name", "contract")
-    .option("--output <String>", "output", undefined)
-    .action(async (options) => {
-    const dev = options.dev;
-    (0, child_process_1.execSync)("rm -rf ./contracts");
-    const pkg = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, "../../package.json"), "utf-8"));
-    const version = pkg.version;
-    const bundle = await (0, rollup_1.rollup)({
-        input: "./src/contracts/index.ts",
-        plugins: [
-            (0, plugin_replace_1.default)({
-                preventAssignment: true,
-                delimiters: ["", ""],
-                values: { "##VERSION##": version, "##PACKAGE##": pkg.name },
-            }),
-            (0, plugin_typescript_1.default)({
-                tsconfig: "./tsconfig.json",
-                compilerOptions: {
-                    outDir: "contracts",
-                },
-                module: "esnext",
-                declaration: false,
-            }),
-        ],
-    });
-    await bundle.write({
-        file: "./contracts/GlobalContract.js",
-        format: "umd",
-        name: "GlobalContract.js",
-    });
-    const scripts = {
-        start: options.debug
-            ? "node --inspect=0.0.0.0:9229 /usr/local/src/node_modules/.bin/fabric-chaincode-node start"
-            : "fabric-chaincode-node start",
-        "start:dev": 'fabric-chaincode-node start --peer.address "127.0.0.1:8541" --chaincode-id-name "chaincode1:0.0.1" --tls.enabled false',
-        "start:watch": 'nodemon --exec "npm run start:dev"',
-        build: 'echo "No need to build the chaincode"',
-        lint: "eslint . --fix --ext .js",
-    };
-    const contractPackage = pkg;
-    contractPackage.name = "global-contract";
-    contractPackage.description = "Global contract implementation";
-    contractPackage.scripts = scripts;
-    delete contractPackage.type;
-    delete contractPackage.types;
-    delete contractPackage.exports;
-    contractPackage.main = "GlobalContract.js";
-    fs_1.default.writeFileSync(path_1.default.join(__dirname, "../../contracts/package.json"), JSON.stringify(contractPackage));
-    (0, child_process_1.execSync)("cd ./contracts && npm install");
-    (0, child_process_1.execSync)("cd ./contracts && npm shrinkwrap");
-    (0, child_process_1.execSync)("cd ./contracts && rm -rf node_modules");
-    (0, child_process_1.execSync)("rm -rf ./contracts/lib && rm -rf ./contracts/dist");
-});
-program.parse(process.argv);
-//# sourceMappingURL=build-contracts2.js.map

package/lib/bin/build-contracts2.js.map

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

package/lib/esm/bin/build-contracts2.js

@@ -1,68 +0,0 @@
-import path from "path";
-import fs from "fs";
-import { rollup } from "rollup";
-import replace from "@rollup/plugin-replace";
-import typescript from "@rollup/plugin-typescript";
-import { Command } from "commander";
-import { execSync } from "child_process";
-const program = new Command();
-program
-    .command("compile-contract")
-    .description("Creates a global contract")
-    .option("--dev", "compiles contracts without minification", false)
-    .option("--debug", "makes attaching debugger possible", false)
-    .option("--name <String>", "contract name", "contract")
-    .option("--output <String>", "output", undefined)
-    .action(async (options) => {
-    const dev = options.dev;
-    execSync("rm -rf ./contracts");
-    const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"), "utf-8"));
-    const version = pkg.version;
-    const bundle = await rollup({
-        input: "./src/contracts/index.ts",
-        plugins: [
-            replace({
-                preventAssignment: true,
-                delimiters: ["", ""],
-                values: { "##VERSION##": version, "##PACKAGE##": pkg.name },
-            }),
-            typescript({
-                tsconfig: "./tsconfig.json",
-                compilerOptions: {
-                    outDir: "contracts",
-                },
-                module: "esnext",
-                declaration: false,
-            }),
-        ],
-    });
-    await bundle.write({
-        file: "./contracts/GlobalContract.js",
-        format: "umd",
-        name: "GlobalContract.js",
-    });
-    const scripts = {
-        start: options.debug
-            ? "node --inspect=0.0.0.0:9229 /usr/local/src/node_modules/.bin/fabric-chaincode-node start"
-            : "fabric-chaincode-node start",
-        "start:dev": 'fabric-chaincode-node start --peer.address "127.0.0.1:8541" --chaincode-id-name "chaincode1:0.0.1" --tls.enabled false',
-        "start:watch": 'nodemon --exec "npm run start:dev"',
-        build: 'echo "No need to build the chaincode"',
-        lint: "eslint . --fix --ext .js",
-    };
-    const contractPackage = pkg;
-    contractPackage.name = "global-contract";
-    contractPackage.description = "Global contract implementation";
-    contractPackage.scripts = scripts;
-    delete contractPackage.type;
-    delete contractPackage.types;
-    delete contractPackage.exports;
-    contractPackage.main = "GlobalContract.js";
-    fs.writeFileSync(path.join(__dirname, "../../contracts/package.json"), JSON.stringify(contractPackage));
-    execSync("cd ./contracts && npm install");
-    execSync("cd ./contracts && npm shrinkwrap");
-    execSync("cd ./contracts && rm -rf node_modules");
-    execSync("rm -rf ./contracts/lib && rm -rf ./contracts/dist");
-});
-program.parse(process.argv);
-//# sourceMappingURL=build-contracts2.js.map

package/lib/esm/bin/build-contracts2.js.map

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