rework product parameters directories

src/v2/product/classification/classification.ts

@@ -1,5 +1,5 @@
 import { ClassificationResponse } from "./classificationResponse.js";
-import { ClassificationParameters } from "./classificationParameters.js";
+import { ClassificationParameters } from "./params/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 export class Classification extends BaseProduct {

src/v2/product/classification/index.ts

@@ -1,5 +1,5 @@
 export { Classification } from "./classification.js";
-export { ClassificationParameters } from "./classificationParameters.js";
+export { ClassificationParameters } from "./params/index.js";
 export { ClassificationResponse } from "./classificationResponse.js";
 export { ClassificationInference } from "./classificationInference.js";
 export { ClassificationResult } from "./classificationResult.js";

src/v2/product/classification/params/index.ts

@@ -0,0 +1 @@
+export { ClassificationParameters } from "./classificationParameters.js";

src/v2/product/crop/crop.ts

@@ -1,5 +1,5 @@
 import { CropResponse } from "./cropResponse.js";
-import { CropParameters } from "./cropParameters.js";
+import { CropParameters } from "./params/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 export class Crop extends BaseProduct {

src/v2/product/crop/index.ts

@@ -1,5 +1,5 @@
 export { Crop } from "./crop.js";
-export { CropParameters } from "./cropParameters.js";
+export { CropParameters } from "./params/index.js";
 export { CropInference } from "./cropInference.js";
 export { CropItem } from "./cropItem.js";
 export { CropResponse } from "./cropResponse.js";

src/v2/product/crop/params/index.ts

@@ -0,0 +1 @@
+export { CropParameters } from "./cropParameters.js";

src/v2/product/extraction/extraction.ts

@@ -1,5 +1,5 @@
 import { ExtractionResponse } from "./extractionResponse.js";
-import { ExtractionParameters } from "./extractionParameters.js";
+import { ExtractionParameters } from "./params/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 export class Extraction extends BaseProduct {

src/v2/product/extraction/index.ts

@@ -1,6 +1,6 @@
 export { Extraction } from "./extraction.js";
-export { ExtractionParameters } from "./extractionParameters.js";
-export { DataSchema } from "./dataSchema.js";
+export { ExtractionParameters } from "./params/index.js";
+export * as params from "./params/index.js";
 export { ExtractionInference } from "./extractionInference.js";
 export { ExtractionActiveOptions } from "./extractionActiveOptions.js";
 export { ExtractionResponse } from "./extractionResponse.js";

src/v2/product/extraction/params/dataSchema.ts

@@ -0,0 +1,29 @@
+import { StringDict } from "@/parsing/stringDict.js";
+import { DataSchemaReplace } from "./dataSchemaReplace.js";
+
+/**
+ * Modify the Data Schema.
+ */
+export class DataSchema {
+  /**
+   * If set, completely replaces the data schema of the model.
+   */
+  replace?: DataSchemaReplace;
+
+  constructor(dataSchema: StringDict | string) {
+    if (typeof dataSchema === "string") {
+      this.replace = new DataSchemaReplace(JSON.parse(dataSchema)["replace"]);
+    } else if (dataSchema instanceof DataSchema) {
+      this.replace = dataSchema.replace;
+    } else {
+      this.replace = new DataSchemaReplace(dataSchema["replace"] as StringDict);
+    }
+  }
+
+  toJSON() {
+    return { replace: this.replace?.toJSON() };
+  }
+  toString() {
+    return JSON.stringify(this.toJSON());
+  }
+}

src/v2/product/extraction/dataSchema.ts → src/v2/product/extraction/params/dataSchemaField.ts

@@ -1,5 +1,4 @@
-import { StringDict } from "@/parsing/stringDict.js";
-import { MindeeError } from "@/errors/index.js";
+import { StringDict } from "@/parsing/index.js";
 
 export class DataSchemaField {
   /**
@@ -77,58 +76,3 @@ export class DataSchemaField {
     return JSON.stringify(this.toJSON());
   }
 }
-
-/**
- * The structure to completely replace the data schema of the model.
- */
-export class DataSchemaReplace {
-  /**
-   * List of fields in the Data Schema.
-   */
-  fields: Array<DataSchemaField>;
-
-  constructor(dataSchemaReplace: StringDict) {
-    if (!dataSchemaReplace || !dataSchemaReplace.fields ) {
-      throw new MindeeError("Invalid Data Schema provided.");
-    }
-    if (dataSchemaReplace["fields"].length === 0) {
-      throw new TypeError("Data Schema replacement fields cannot be empty.");
-    }
-    this.fields = dataSchemaReplace["fields"].map((field: StringDict) => (new DataSchemaField(field)));
-  }
-
-  toJSON() {
-    return { fields: this.fields.map(e => e.toJSON()) };
-  }
-
-  toString() {
-    return JSON.stringify(this.toJSON());
-  }
-}
-
-/**
- * Modify the Data Schema.
- */
-export class DataSchema {
-  /**
-   * If set, completely replaces the data schema of the model.
-   */
-  replace?: DataSchemaReplace;
-
-  constructor(dataSchema: StringDict | string) {
-    if (typeof dataSchema === "string") {
-      this.replace = new DataSchemaReplace(JSON.parse(dataSchema)["replace"]);
-    } else if (dataSchema instanceof DataSchema) {
-      this.replace = dataSchema.replace;
-    } else {
-      this.replace = new DataSchemaReplace(dataSchema["replace"] as StringDict);
-    }
-  }
-
-  toJSON() {
-    return { replace: this.replace?.toJSON() };
-  }
-  toString() {
-    return JSON.stringify(this.toJSON());
-  }
-}

src/v2/product/extraction/params/dataSchemaReplace.ts

@@ -0,0 +1,31 @@
+import { StringDict } from "@/parsing/index.js";
+import { DataSchemaField } from "./dataSchemaField.js";
+import { MindeeError } from "@/errors/index.js";
+
+/**
+ * The structure to completely replace the data schema of the model.
+ */
+export class DataSchemaReplace {
+  /**
+   * List of fields in the Data Schema.
+   */
+  fields: Array<DataSchemaField>;
+
+  constructor(dataSchemaReplace: StringDict) {
+    if (!dataSchemaReplace || !dataSchemaReplace.fields ) {
+      throw new MindeeError("Invalid Data Schema provided.");
+    }
+    if (dataSchemaReplace["fields"].length === 0) {
+      throw new TypeError("Data Schema replacement fields cannot be empty.");
+    }
+    this.fields = dataSchemaReplace["fields"].map((field: StringDict) => (new DataSchemaField(field)));
+  }
+
+  toJSON() {
+    return { fields: this.fields.map(e => e.toJSON()) };
+  }
+
+  toString() {
+    return JSON.stringify(this.toJSON());
+  }
+}

src/v2/product/extraction/params/index.ts

@@ -0,0 +1,4 @@
+export { ExtractionParameters } from "./extractionParameters.js";
+export { DataSchema } from "./dataSchema.js";
+export { DataSchemaReplace } from "./dataSchemaReplace.js";
+export { DataSchemaField } from "./dataSchemaField.js";

src/v2/product/ocr/index.ts

@@ -1,5 +1,5 @@
 export { Ocr } from "./ocr.js";
-export { OcrParameters } from "./ocrParameters.js";
+export { OcrParameters } from "./params/index.js";
 export { OcrResponse } from "./ocrResponse.js";
 export { OcrInference } from "./ocrInference.js";
 export { OcrResult } from "./ocrResult.js";

src/v2/product/ocr/ocr.ts

@@ -1,5 +1,5 @@
 import { OcrResponse } from "./ocrResponse.js";
-import { OcrParameters } from "./ocrParameters.js";
+import { OcrParameters } from "./params/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 export class Ocr extends BaseProduct {

src/v2/product/ocr/params/index.ts

@@ -0,0 +1 @@
+export { OcrParameters } from "./ocrParameters.js";

src/v2/product/split/index.ts

@@ -1,5 +1,5 @@
 export { Split } from "./split.js";
-export { SplitParameters } from "./splitParameters.js";
+export { SplitParameters } from "./params/index.js";
 export { SplitResponse } from "./splitResponse.js";
 export { SplitInference } from "./splitInference.js";
 export { SplitRange } from "./splitRange.js";

src/v2/product/split/params/index.ts

@@ -0,0 +1 @@
+export { SplitParameters } from "./splitParameters.js";

src/v2/product/split/split.ts

@@ -1,5 +1,5 @@
 import { SplitResponse } from "./splitResponse.js";
-import { SplitParameters } from "./splitParameters.js";
+import { SplitParameters } from "./params/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 export class Split extends BaseProduct {

tests/v2/product/extractionParameter.spec.ts

@@ -7,7 +7,7 @@ import { extraction } from "@/v2/product/index.js";
 
 let expectedDataSchemaDict: StringDict;
 let expectedDataSchemaString: string;
-let expectedDataSchemaObject: extraction.DataSchema;
+let expectedDataSchemaObject: extraction.params.DataSchema;
 
 describe("MindeeV2 - Extraction Parameter", () => {
   const modelIdValue = "test-model-id";
@@ -34,7 +34,7 @@ describe("MindeeV2 - Extraction Parameter", () => {
       );
       expectedDataSchemaDict = JSON.parse(fileContents.toString());
       expectedDataSchemaString = JSON.stringify(expectedDataSchemaDict);
-      expectedDataSchemaObject = new extraction.DataSchema(expectedDataSchemaDict);
+      expectedDataSchemaObject = new extraction.params.DataSchema(expectedDataSchemaDict);
     });
 
     it("shouldn't replace when unset", () => {