[WIP] migrating discovery.ts

@hyperledger-twgc/fabric-formatter: 0.0.0-dev.11
fix path.js

Signed-off-by: david <[email protected]>

Author: davidkhala

ts/formatter/lib/index.ts

@@ -1,11 +1,14 @@
 export * as chaincode from './chaincode.js';
 export * from './constants.js';
+export * from './ca/constants.js'
 export * as discovery from './discovery.js';
 export * as gatePolicy from './gate-policy.js';
 export * from './helper.js';
+export * from './fs/path.js'
 export * as mspPrincipal from './msp-principal.js';
 export * from './names.js';
 export * from './pretty-parser.js';
 export * as collection from './side-db.js';
 export * from './types.js';
-export * from './user.js';
+export * from './user.js';
+export * as proto from './proto/index.js'

ts/formatter/lib/proto/index.ts

@@ -0,0 +1,5 @@
+export * from './channel-builder.js'
+export * from './common-builder.js'
+export * from './common-parser.js'
+export * from './proposal-builder.js'
+export * as signaturePolicy from './signature-policy.js'

ts/formatter/lib/proto/signature-policy.ts

@@ -1,10 +1,10 @@
-import {common} from '@hyperledger/fabric-protos';
+import {common, msp} from '@hyperledger/fabric-protos';
 import SignaturePolicy = common.SignaturePolicy
+import SignaturePolicyEnvelope = common.SignaturePolicyEnvelope
 import NOutOf = SignaturePolicy.NOutOf;
 import {IndexDigit, isIndex} from "../types.js";
 import assert from 'assert'
-
-const {SignaturePolicyEnvelope} = common
+import MSPPrincipal = msp.MSPPrincipal
 
 
 /**
@@ -14,12 +14,11 @@ export const SignaturePolicyType = "Signature"
 export const TypeCase = ['TYPE_NOT_SET', 'SIGNED_BY', 'N_OUT_OF']
 
 /**
- *
  * @param {NOutOf} [n_out_of] exclusive with signed_by
- * @param {IndexDigit} [signed_by] exclusive with n_out_of
+ * @param [signed_by] exclusive with n_out_of
  * @return {SignaturePolicy}
  */
-export function build({n_out_of, signed_by}: { n_out_of?: NOutOf; signed_by?: IndexDigit }) {
+export function build({n_out_of, signed_by}: { n_out_of?: NOutOf; signed_by?: IndexDigit }): SignaturePolicy {
     const signaturePolicy = new SignaturePolicy();
     if (n_out_of) {
         signaturePolicy.setNOutOf(n_out_of)
@@ -29,21 +28,18 @@ export function build({n_out_of, signed_by}: { n_out_of?: NOutOf; signed_by?: In
     return signaturePolicy;
 }
 
-/**
- *
- * @param {IndexDigit} n
- * @param {SignaturePolicy[]} rules
- * @return {NOutOf}
- */
-export function buildNOutOf({n, rules}: { n: IndexDigit, rules: SignaturePolicy[] }) {
+export function buildNOutOf({n, rules}: { n: IndexDigit, rules: SignaturePolicy[] }): NOutOf {
     const nOutOf = new SignaturePolicy.NOutOf()
     assert.ok(isIndex(n))
     nOutOf.setN(n)
     nOutOf.setRulesList(rules)
     return nOutOf
 }
 
-export function buildEnvelope({identities, rule}) {
+export function buildEnvelope({identities, rule}: {
+    identities: MSPPrincipal[],
+    rule: SignaturePolicy
+}): SignaturePolicyEnvelope {
     const envelope = new SignaturePolicyEnvelope();
     envelope.setVersion(0);
     envelope.setRule(rule);

ts/formatter/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@hyperledger-twgc/fabric-formatter",
-  "version": "0.0.0-dev.9",
+  "version": "0.0.0-dev.11",
   "description": "Hyperledger Fabric formatter",
   "repository": {
     "type": "git",
     "url": "https://github.com/Hyperledger/fabric-admin-sdk"
   },
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "author": {
     "name": "hyperledger-twgc",
     "url": "https://github.com/Hyperledger-TWGC/Hyperledger-TWGC"

ts/formatter/test-required/index.js

@@ -1,3 +1,7 @@
 import "@hyperledger/fabric-protos"
 import "@hyperledger-twgc/fabric-formatter/dist/index.js"
-import "@hyperledger-twgc/fabric-formatter"
+import "@hyperledger-twgc/fabric-formatter"
+
+it('ok', function () {
+
+})

ts/formatter/test-required/package.json

@@ -1,11 +1,14 @@
 {
   "scripts": {
-    "test": "node index.js"
+    "test": "mocha index.js"
   },
   "dependencies": {
-    "@hyperledger-twgc/fabric-formatter": "unstable",
+    "@hyperledger-twgc/fabric-formatter": "^0.0.0-dev.11",
     "@hyperledger/fabric-protos": "latest"
   },
+  "devDependencies": {
+    "mocha": "latest"
+  },
   "private": true,
   "type": "module"
 }

ts/formatter/test/syntax.mjs

@@ -10,6 +10,9 @@ import "../dist/msp-principal.js"
 import "../dist/policy.js"
 import "../dist/pretty-parser.js"
 import "../dist/side-db.js"
-it('OK', ()=>{
+import "../dist/proto/index.js"
+import "../dist/index.js"
+
+it('OK', () => {
 
 })