refactor(packaging): remove peer dependencies where not needed

demos/taco-demo/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@nucypher/taco": "^0.1.0-rc.6",
+    "@nucypher/shared": "^0.1.0-rc.4",
     "@usedapp/core": "^1.2.13",
     "buffer": "^6.0.3",
     "ethers": "^5.7.1",
@@ -22,10 +23,6 @@
     "react-dom": "^18.2.0",
     "react-spinners": "^0.13.6"
   },
-  "peerDependencies": {
-    "@nucypher/taco": "workspace:*",
-    "@nucypher/shared": "workspace:*"
-  },
   "devDependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@types/react": "^18.2.33",

demos/taco-nft-demo/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@nucypher/taco": "^0.1.0-rc.6",
+    "@nucypher/shared": "^0.1.0-rc.4",
     "@usedapp/core": "^1.2.13",
     "buffer": "^6.0.3",
     "ethers": "^5.7.1",
@@ -22,10 +23,6 @@
     "react-dom": "^18.2.0",
     "react-spinners": "^0.13.6"
   },
-  "peerDependencies": {
-    "@nucypher/taco": "workspace:*",
-    "@nucypher/shared": "workspace:*"
-  },
   "devDependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@types/react": "^18.2.33",

examples/pre/nextjs/package.json

@@ -19,11 +19,6 @@
     "ethers": "^5.7.2",
     "next": "13.5.6",
     "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "typescript": "5.2.2"
-  },
-  "peerDependencies": {
-    "ethers": "^5.7.2",
-    "typescript": "5.2.2"
+    "react-dom": "18.2.0"
   }
 }

examples/pre/nodejs/package.json

@@ -11,9 +11,7 @@
   },
   "dependencies": {
     "@nucypher/pre": "workspace:*",
-    "dotenv": "^16.3.1"
-  },
-  "peerDependencies": {
+    "dotenv": "^16.3.1",
     "ethers": "^5.7.2"
   }
 }

examples/pre/react/package.json

@@ -25,15 +25,13 @@
   "dependencies": {
     "@nucypher/pre": "workspace:*",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "ethers": "^5.7.2"
   },
   "devDependencies": {
     "@types/node": "^16.18.50",
     "@types/react": "^18.2.33",
     "@types/react-dom": "^18.2.14",
     "react-scripts": "^5.0.1"
-  },
-  "peerDependencies": {
-    "ethers": "^5.7.2"
   }
 }

examples/pre/webpack-5/package.json

@@ -19,9 +19,7 @@
     "esbuild-loader": "^2.11.0",
     "webpack": "^5.4.0",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.7.4"
-  },
-  "peerDependencies": {
+    "webpack-dev-server": "^4.7.4",
     "ethers": "^5.7.2"
   }
 }

examples/pre/webpack-5/src/index.ts

@@ -7,7 +7,7 @@ import {
   SecretKey,
 } from '@nucypher/pre';
 import { ethers } from 'ethers';
-import { hexlify } from "ethers/lib/utils";
+import { hexlify } from 'ethers/lib/utils';
 
 declare global {
   interface Window {

examples/taco/nextjs/package.json

@@ -21,9 +21,5 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "5.2.2"
-  },
-  "peerDependencies": {
-    "ethers": "^5.7.2",
-    "typescript": "5.2.2"
   }
 }

examples/taco/nodejs/package.json

@@ -11,9 +11,7 @@
   },
   "dependencies": {
     "@nucypher/taco": "workspace:*",
-    "dotenv": "^16.3.1"
-  },
-  "peerDependencies": {
+    "dotenv": "^16.3.1",
     "ethers": "^5.7.2"
   }
 }

examples/taco/webpack-5/src/index.ts

@@ -9,7 +9,7 @@ import {
   toBytes,
 } from '@nucypher/taco';
 import { ethers } from 'ethers';
-import { hexlify } from "ethers/lib/utils";
+import { hexlify } from 'ethers/lib/utils';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const window: any;

package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@changesets/cli": "^2.26.2",
-    "@nucypher/nucypher-core": "0.13.0-alpha.1"
+    "@nucypher/nucypher-core": "^0.13.0-alpha.1"
   },
   "devDependencies": {
     "@skypack/package-check": "^0.2.2",

packages/pre/package.json

@@ -39,14 +39,12 @@
   },
   "dependencies": {
     "@nucypher/nucypher-core": "^0.13.0-alpha.1",
-    "@nucypher/shared": "workspace:*"
+    "@nucypher/shared": "workspace:*",
+    "ethers": "^5.7.2"
   },
   "devDependencies": {
     "@nucypher/test-utils": "workspace:*"
   },
-  "peerDependencies": {
-    "ethers": "^5.7.2"
-  },
   "engines": {
     "node": ">=18",
     "pnpm": ">=8.0.0"

packages/shared/package.json

@@ -43,7 +43,7 @@
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@nucypher/nucypher-contracts": "^0.9.0",
-    "@nucypher/nucypher-core": "0.13.0-alpha.1",
+    "@nucypher/nucypher-core": "^0.13.0-alpha.1",
     "axios": "^1.5.0",
     "deep-equal": "^2.2.1",
     "ethers": "^5.7.2",

packages/shared/scripts/typechain.ts

@@ -11,7 +11,6 @@ import {
 import * as tmp from 'tmp';
 import { glob, runTypeChain } from 'typechain';
 
-
 const parseContractRegistry = (registry: ContractRegistry): Contract[] =>
   Object.keys(registry)
     .map((chainId) => {

packages/shared/src/contracts/agents/coordinator.ts

@@ -1,4 +1,4 @@
-import { getContract } from '@nucypher/nucypher-contracts'
+import { getContract } from '@nucypher/nucypher-contracts';
 import {
   DkgPublicKey,
   SessionStaticKey,

packages/taco/package.json

@@ -40,8 +40,9 @@
   },
   "dependencies": {
     "@ethersproject/abstract-signer": "^5.7.0",
-    "@nucypher/nucypher-core": "0.13.0-alpha.1",
+    "@nucypher/nucypher-core": "^0.13.0-alpha.1",
     "@nucypher/shared": "^0.1.0-rc.4",
+    "ethers": "^5.7.2",
     "semver": "^7.5.2",
     "zod": "^3.22.4"
   },
@@ -50,8 +51,7 @@
     "@types/semver": "^7.5.4"
   },
   "peerDependencies": {
-    "@nucypher/shared": "workspace:*",
-    "ethers": "^5.7.2"
+    "@nucypher/shared": "workspace:*"
   },
   "engines": {
     "node": ">=18",

packages/taco/src/conditions/compound-condition.ts

@@ -40,11 +40,10 @@ export const compoundConditionSchema: z.ZodSchema = z
       // We test positive cases exhaustively, so we return false here:
       return false;
     },
-    ({ operands, operator  }) => ({
-        message: `Invalid number of operands ${operands.length} for operator "${operator}"`,
-        path: ['operands'],
-    })
+    ({ operands, operator }) => ({
+      message: `Invalid number of operands ${operands.length} for operator "${operator}"`,
+      path: ['operands'],
+    }),
   );
 
-
 export type CompoundConditionProps = z.infer<typeof compoundConditionSchema>;

packages/taco/test/conditions/compound-condition.test.ts

@@ -17,16 +17,20 @@ import {
 } from '../test-utils';
 
 describe('validation', () => {
-  it.each([{
-    operator: 'and',
-    operands: [testContractConditionObj, testTimeConditionObj]
-  }, {
-    operator: 'or',
-    operands: [testContractConditionObj, testTimeConditionObj]
-  }, {
-    operator: 'not',
-    operands: [testContractConditionObj]
-  }])('accepts "$operator" operator', ({operator, operands}) => {
+  it.each([
+    {
+      operator: 'and',
+      operands: [testContractConditionObj, testTimeConditionObj],
+    },
+    {
+      operator: 'or',
+      operands: [testContractConditionObj, testTimeConditionObj],
+    },
+    {
+      operator: 'not',
+      operands: [testContractConditionObj],
+    },
+  ])('accepts "$operator" operator', ({ operator, operands }) => {
     const conditionObj: CompoundConditionProps = {
       conditionType: CompoundConditionType,
       operator,
@@ -61,31 +65,38 @@ describe('validation', () => {
     });
   });
 
-  it.each([{
-    operator: 'and',
-    nrOfOperands: 1,
-  }, {
-    operator: 'or',
-    nrOfOperands: 1,
-  }, {
-    operator: 'not',
-    nrOfOperands: 2,
-  }])('rejects invalid number of operands $nrOfOperands for operator $operator', ({operator, nrOfOperands}) => {
-    const result = CompoundCondition.validate(compoundConditionSchema, {
-      operator,
-      operands: Array(nrOfOperands).fill(testRpcConditionObj)
-    });
-
-    expect(result.error).toBeDefined();
-    expect(result.data).toBeUndefined();
-    expect(result.error?.format()).toMatchObject({
-      operands: {
-        _errors: [
-          `Invalid number of operands ${nrOfOperands} for operator "${operator}"`,
-        ],
-      },
-    });
-  });
+  it.each([
+    {
+      operator: 'and',
+      nrOfOperands: 1,
+    },
+    {
+      operator: 'or',
+      nrOfOperands: 1,
+    },
+    {
+      operator: 'not',
+      nrOfOperands: 2,
+    },
+  ])(
+    'rejects invalid number of operands $nrOfOperands for operator $operator',
+    ({ operator, nrOfOperands }) => {
+      const result = CompoundCondition.validate(compoundConditionSchema, {
+        operator,
+        operands: Array(nrOfOperands).fill(testRpcConditionObj),
+      });
+
+      expect(result.error).toBeDefined();
+      expect(result.data).toBeUndefined();
+      expect(result.error?.format()).toMatchObject({
+        operands: {
+          _errors: [
+            `Invalid number of operands ${nrOfOperands} for operator "${operator}"`,
+          ],
+        },
+      });
+    },
+  );
 
   it('accepts recursive compound conditions', () => {
     const conditionObj = {
@@ -185,9 +196,9 @@ describe('validation', () => {
   ])('accepts shorthand for "%s" operator', (operator, operands, expected) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const compoundConditionShorthands: Record<string, any> = {
-      'and': CompoundCondition.and,
-      'or': CompoundCondition.or,
-      'not': CompoundCondition.not,
+      and: CompoundCondition.and,
+      or: CompoundCondition.or,
+      not: CompoundCondition.not,
     };
     const compoundCondition = compoundConditionShorthands[operator](operands);
 

packages/taco/test/conditions/context.test.ts

@@ -67,13 +67,16 @@ describe('context', () => {
     const context = conditionExpr.buildContext(provider, {}, signer);
 
     describe('custom parameters', () => {
-      it("serializes bytes as hex strings", async () => {
+      it('serializes bytes as hex strings', async () => {
         const customParamsWithBytes: Record<string, CustomContextParam> = {};
         const customParam = toBytes('hello');
         // Uint8Array is not a valid CustomContextParam, override the type:
-        customParamsWithBytes[customParamKey] = customParam as unknown as string;
+        customParamsWithBytes[customParamKey] =
+          customParam as unknown as string;
 
-        const asJson = await context.withCustomParams(customParamsWithBytes).toJson();
+        const asJson = await context
+          .withCustomParams(customParamsWithBytes)
+          .toJson();
         const asObj = JSON.parse(asJson);
         expect(asObj).toBeDefined();
         expect(asObj[customParamKey]).toEqual(`0x${toHexString(customParam)}`);
@@ -216,24 +219,27 @@ describe('context', () => {
         expect(asObj[USER_ADDRESS_PARAM]).toBeDefined();
       });
 
-      it.each([0, ''])('accepts on a falsy parameter value: %s', async (falsyParam) => {
-        const customParamKey = ':customParam';
-        const customContractCondition = new ContractCondition({
-          ...contractConditionObj,
-          parameters: [USER_ADDRESS_PARAM, customParamKey],
-        });
-        const customParameters: Record<string, CustomContextParam> = {};
-        customParameters[customParamKey] = falsyParam;
-        const conditionContext = new ConditionExpression(
-          customContractCondition,
-        ).buildContext(provider, customParameters, signer);
-
-        const asObj = await conditionContext.toObj();
-        expect(asObj).toBeDefined();
-        expect(asObj[USER_ADDRESS_PARAM]).toBeDefined();
-        expect(asObj[customParamKey]).toBeDefined();
-        expect(asObj[customParamKey]).toEqual(falsyParam);
-      });
+      it.each([0, ''])(
+        'accepts on a falsy parameter value: %s',
+        async (falsyParam) => {
+          const customParamKey = ':customParam';
+          const customContractCondition = new ContractCondition({
+            ...contractConditionObj,
+            parameters: [USER_ADDRESS_PARAM, customParamKey],
+          });
+          const customParameters: Record<string, CustomContextParam> = {};
+          customParameters[customParamKey] = falsyParam;
+          const conditionContext = new ConditionExpression(
+            customContractCondition,
+          ).buildContext(provider, customParameters, signer);
+
+          const asObj = await conditionContext.toObj();
+          expect(asObj).toBeDefined();
+          expect(asObj[USER_ADDRESS_PARAM]).toBeDefined();
+          expect(asObj[customParamKey]).toBeDefined();
+          expect(asObj[customParamKey]).toEqual(falsyParam);
+        },
+      );
     });
   });
 });

packages/test-utils/package.json

@@ -29,7 +29,7 @@
     "lint:fix": "pnpm lint --fix"
   },
   "dependencies": {
-    "@nucypher/nucypher-core": "0.13.0-alpha.1",
+    "@nucypher/nucypher-core": "^0.13.0-alpha.1",
     "@nucypher/shared": "workspace:*",
     "axios": "^1.5.0",
     "ethers": "^5.7.2",