move Collection model to common package

fleet-sdk · Jun 24, 2023 · 92d8477 · 92d8477
1 parent 3e1df5a
commit 92d8477
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/.changeset/bright-plums-clean.md b/.changeset/bright-plums-clean.md
@@ -0,0 +1,6 @@
+---
+"@fleet-sdk/common": patch
+"@fleet-sdk/core": patch
+---
+
+Move `Collection` model from core to common package.
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -1,2 +1,3 @@
 export * from "./utils";
 export * from "./types";
+export * from "./models";
diff --git a/...src/models/collections/collection.spec.ts → ...ages/common/src/models/collection.spec.ts b/...src/models/collections/collection.spec.ts → ...ages/common/src/models/collection.spec.ts
diff --git a/...core/src/models/collections/collection.ts → packages/common/src/models/collection.ts b/...core/src/models/collections/collection.ts → packages/common/src/models/collection.ts
@@ -1,4 +1,5 @@
-import { isDefined, OneOrMore } from "@fleet-sdk/common";
+import { OneOrMore } from "../types";
+import { isDefined } from "../utils";
 
 export type CollectionAddOptions = { index?: number };
 

diff --git a/packages/common/src/models/index.ts b/packages/common/src/models/index.ts
@@ -0,0 +1 @@
+export * from "./collection";
diff --git a/packages/core/src/models/collections/inputsCollection.ts b/packages/core/src/models/collections/inputsCollection.ts
@@ -1,8 +1,7 @@
-import { Amount, Box, BoxId, OneOrMore } from "@fleet-sdk/common";
+import { Amount, Box, BoxId, Collection, OneOrMore } from "@fleet-sdk/common";
 import { isDefined } from "@fleet-sdk/common";
 import { DuplicateInputError, NotFoundError } from "../../errors";
 import { ErgoUnsignedInput } from "../ergoUnsignedInput";
-import { Collection } from "./collection";
 
 export class InputsCollection extends Collection<ErgoUnsignedInput, Box<Amount>> {
   constructor();

diff --git a/packages/core/src/models/collections/outputsCollection.ts b/packages/core/src/models/collections/outputsCollection.ts
@@ -1,8 +1,15 @@
-import { _0n, BoxSummary, isDefined, isUndefined, OneOrMore, some } from "@fleet-sdk/common";
+import {
+  _0n,
+  BoxSummary,
+  Collection,
+  isDefined,
+  isUndefined,
+  OneOrMore,
+  some
+} from "@fleet-sdk/common";
 import { OutputBuilder } from "../../builder/outputBuilder";
 import { SelectionTarget } from "../../builder/selector/boxSelector";
 import { NotFoundError } from "../../errors";
-import { Collection } from "./collection";
 
 export class OutputsCollection extends Collection<OutputBuilder, OutputBuilder> {
   constructor(outputs?: OneOrMore<OutputBuilder>) {

diff --git a/packages/core/src/models/collections/tokensCollection.ts b/packages/core/src/models/collections/tokensCollection.ts
@@ -1,9 +1,17 @@
-import { Amount, isDefined, isUndefined, OneOrMore, TokenAmount, TokenId } from "@fleet-sdk/common";
+import {
+  Amount,
+  Collection,
+  CollectionAddOptions,
+  isDefined,
+  isUndefined,
+  OneOrMore,
+  TokenAmount,
+  TokenId
+} from "@fleet-sdk/common";
 import { ensureBigInt } from "@fleet-sdk/common";
 import { NotFoundError } from "../../errors";
 import { InsufficientTokenAmount } from "../../errors/insufficientTokenAmount";
 import { MaxTokensOverflow } from "../../errors/maxTokensOverflow";
-import { Collection, CollectionAddOptions } from "./collection";
 
 export const MAX_TOKENS_PER_BOX = 120;