Merge pull request #1 from Chacaponquin/chaca-dev

Finish version 1.7.2
Chacaponquin · Jan 31, 2024 · c177736 · c177736
2 parents a979409 + b1230ad
commit c177736
Show file tree

Hide file tree

Showing 26 changed files with 176 additions and 138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## chaca@1.7.2
+
+### 🪛 Fix
+
+- Fix problems with zip exportation in `python` and `postgresql` formats
+- Fix `Internet.password` schema
+
 ## chaca@1.7.1
 
 ### 🌚 Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chaca",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Create and export mock data with your rules",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.mjs",

diff --git a/src/core/Export/generators/Python/PythonGenerator.ts b/src/core/Export/generators/Python/PythonGenerator.ts
@@ -49,7 +49,12 @@ export class PythonGenerator extends Generator {
 
     const finalCode = this.buildFinalCode(code);
     await fs.promises.writeFile(this.route, finalCode, "utf-8");
-    return this.route;
+
+    if (this.zip) {
+      return await this.createFileZip();
+    } else {
+      return this.route;
+    }
   }
 
   private buildFinalCode(pythonCode: string): string {

diff --git a/src/core/Export/generators/SQL/SQLGenerator.ts b/src/core/Export/generators/SQL/SQLGenerator.ts
@@ -65,6 +65,42 @@ export class SQLGenerator extends Generator {
     this.zip = Boolean(config.zip);
   }
 
+  public async generateRelationalDataFile(
+    resolvers: MultiGenerateResolver,
+  ): Promise<string> {
+    resolvers.getResolvers().forEach((r) => {
+      const allKeys = r.getKeyNodes();
+      allKeys.forEach((k) => this.schemasPrimaryKeys.push(k));
+
+      const allRefs = r.getRefNodes();
+      allRefs.forEach((r) => this.schemasForeignKeys.push(r));
+
+      const allpossibleNull = r.getPossibleNullNodes();
+      allpossibleNull.forEach((n) => this.schemaspossibleNull.push(n));
+    });
+
+    resolvers.getResolvers().forEach((r) => {
+      this.createData(r.getSchemaName(), r.resolve());
+    });
+
+    // change tables id columns
+    this.allTables.forEach((t) => {
+      t.updateIdColumnName();
+    });
+
+    await fs.promises.writeFile(
+      this.route,
+      this.dataGenerator.getData(),
+      "utf-8",
+    );
+
+    if (this.zip) {
+      return await this.createFileZip();
+    } else {
+      return this.route;
+    }
+  }
+
   public async generateFile(data: any): Promise<string> {
     let sqlData: Array<any> = [];
 
@@ -405,36 +441,4 @@ export class SQLGenerator extends Generator {
       }
     }
   }
-
-  public async generateRelationalDataFile(
-    resolvers: MultiGenerateResolver,
-  ): Promise<string> {
-    resolvers.getResolvers().forEach((r) => {
-      const allKeys = r.getKeyNodes();
-      allKeys.forEach((k) => this.schemasPrimaryKeys.push(k));
-
-      const allRefs = r.getRefNodes();
-      allRefs.forEach((r) => this.schemasForeignKeys.push(r));
-
-      const allpossibleNull = r.getPossibleNullNodes();
-      allpossibleNull.forEach((n) => this.schemaspossibleNull.push(n));
-    });
-
-    resolvers.getResolvers().forEach((r) => {
-      this.createData(r.getSchemaName(), r.resolve());
-    });
-
-    // change tables id columns
-    this.allTables.forEach((t) => {
-      t.updateIdColumnName();
-    });
-
-    await fs.promises.writeFile(
-      this.route,
-      this.dataGenerator.getData(),
-      "utf-8",
-    );
-
-    return this.route;
-  }
 }
diff --git a/src/schemas/internet/InternetSchema.ts b/src/schemas/internet/InternetSchema.ts
@@ -195,25 +195,28 @@ export class InternetSchema {
 
       const len = typeof a.length === "number" && a.length > 0 ? a.length : 15;
       const memorable = typeof a.memorable === "boolean" ? a.memorable : false;
-      const pattern = a.pattern instanceof RegExp ? a.pattern : /w/;
+      const pattern = a.pattern instanceof RegExp ? a.pattern : consonant;
       const prefix = typeof a.prefix === "string" ? a.prefix : "";
 
       const _password = (
         length: number,
         memorable: boolean,
-        pattern: RegExp,
+        i_pattern: RegExp,
         prefix: string,
       ): string => {
         if (prefix.length >= length) {
           return prefix;
         }
+
+        let pattern: RegExp = i_pattern;
         if (memorable) {
           if (prefix.match(consonant)) {
             pattern = vowel;
           } else {
             pattern = consonant;
           }
         }
+
         const n = this.dataTypeSchema.int().getValue({ min: 0, max: 94 }) + 33;
         let char = String.fromCharCode(n);
 

diff --git a/test/library/cases/car.test.ts b/test/library/cases/car.test.ts
@@ -15,14 +15,11 @@ describe("# Car Case Test", () => {
   it("Creation", () => {
     const DATA = chaca.multiGenerate(CASE_SCHEMAS, { verbose: false });
     expect(DATA).toHaveProperty("Pay_Method");
-    expect(DATA).toHaveProperty("Situation");
-    expect(DATA).toHaveProperty("Category");
-    expect(DATA).toHaveProperty("Country");
     expect(DATA).toHaveProperty("Brand");
     expect(DATA).toHaveProperty("Model");
     expect(DATA).toHaveProperty("Car");
     expect(DATA).toHaveProperty("Driver");
-    expect(DATA).toHaveProperty("Turist");
+    expect(DATA).toHaveProperty("Tourist");
     expect(DATA).toHaveProperty("Contract");
   });
 

diff --git a/test/library/export/csv.test.ts b/test/library/export/csv.test.ts
@@ -6,6 +6,7 @@ import { checkFile } from "./utils/export-util";
 
 const fileName = "csvExport";
 const ROOT = "./data/csv";
+const ext = "csv";
 
 describe("#Export CSV test", () => {
   let COMPLETE_SCHEMA_DATA: any;
@@ -26,7 +27,7 @@ describe("#Export CSV test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
   });
 
@@ -70,7 +71,7 @@ describe("#Export CSV test", () => {
         format: "csv",
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
 
     it("Array of similar objects", async () => {

diff --git a/test/library/export/java.test.ts b/test/library/export/java.test.ts
@@ -28,7 +28,7 @@ describe("# Java Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
   });
 
@@ -40,7 +40,7 @@ describe("# Java Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
 
     it("Simple Schema", async () => {
@@ -50,7 +50,7 @@ describe("# Java Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
 
     it("Schema Nested Objects", async () => {
@@ -60,7 +60,7 @@ describe("# Java Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
 
     it("Complete Schema", async () => {
@@ -70,7 +70,7 @@ describe("# Java Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
   });
 });
diff --git a/test/library/export/javascript.test.ts b/test/library/export/javascript.test.ts
@@ -4,6 +4,7 @@ import { checkFile } from "./utils/export-util";
 
 const fileName = "javascript";
 const ROOT = "./data/javascript";
+const ext = "js";
 
 describe("# Javascript Export Test", () => {
   describe("Export configuration", () => {
@@ -17,7 +18,7 @@ describe("# Javascript Export Test", () => {
         },
       );
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext: "zip" })).toBe(true);
     });
   });
 
@@ -29,7 +30,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
 
     it("Export null", async () => {
@@ -39,7 +40,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
 
     it("Export number", async () => {
@@ -49,7 +50,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
 
     it("Export boolean", async () => {
@@ -59,7 +60,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
   });
 
@@ -71,7 +72,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
   });
 
@@ -83,7 +84,7 @@ describe("# Javascript Export Test", () => {
         location: ROOT,
       });
 
-      expect(checkFile(route)).toBe(true);
+      expect(checkFile({ route, ext })).toBe(true);
     });
   });
 
@@ -97,6 +98,6 @@ describe("# Javascript Export Test", () => {
       },
     );
 
-    expect(checkFile(route)).toBe(true);
+    expect(checkFile({ route, ext })).toBe(true);
   });
 });
diff --git a/test/library/export/json.test.ts b/test/library/export/json.test.ts
@@ -19,11 +19,11 @@ describe("# JSON Export Test", () => {
       },
     );
 
-    expect(checkFile(route)).toBe(true);
+    expect(checkFile({ route, ext: "zip" })).toBe(true);
   });
 
   it("Pass separate=false. Should create a single json file", async () => {
-    await chaca.exportFromSchemas(
+    const route = await chaca.exportFromSchemas(
       [
         {
           documents: COUNT_DOCUMENTS,
@@ -43,17 +43,19 @@ describe("# JSON Export Test", () => {
       ],
       {
         fileName: fileName + "NotSeparate",
-        format: { ext: "json", separate: false, zip: false },
+        format: { ext: "json", separate: false, zip: true },
         location: ROOT,
       },
       { verbose: false },
     );
+
+    expect(checkFile({ route, ext: "zip" })).toBe(true);
   });
 
   it("Pass separate=true. Should create multiple files", async () => {
     const file = fileName + "Separate";
 
-    await chaca.exportFromSchemas(
+    const route = await chaca.exportFromSchemas(
       [
         {
           documents: COUNT_DOCUMENTS,
@@ -78,5 +80,7 @@ describe("# JSON Export Test", () => {
       },
       { verbose: false },
     );
+
+    expect(checkFile({ route, ext: "zip" })).toBe(true);
   });
 });