miqro 1.7.16 → 1.7.19

package/dist/cli.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("./utils");
 const start_1 = require("./cmds/start");
+const test_1 = require("./cmds/test");
 const watch_1 = require("./cmds/watch");
 const new_1 = require("./cmds/new");
 const doc_json_1 = require("./cmds/doc-json");
@@ -65,7 +66,7 @@ const db_migrate_1 = require("./cmds/db-migrate");
     },
     ["serve"]: {
         //section: "serve static files",
-        tabs: 6,
+        tabs: 5,
         cb: serve_1.main, description: `serve static files. ${serve_1.usage}`
     },
     /*["generate:html:cache"]: {
@@ -84,7 +85,8 @@ const db_migrate_1 = require("./cmds/db-migrate");
         tabs: 5,
         description: `outputs to a file an api folder auto doc as a markdown. ${doc_md_1.usage}`
     },
-    ["new:test"]: { section: "testing", cb: new_test_1.main, tabs: 4, description: `create new test.js file. ${new_test_1.usage}` },
+    ["test"]: { section: "testing", cb: test_1.main, tabs: 5, description: `run test files. ${test_1.usage}` },
+    ["new:test"]: { cb: new_test_1.main, tabs: 4, description: `create new test.js file. ${new_test_1.usage}` },
     ["db:console"]: {
         section: "sequelize helpers",
         cb: db_console_1.main,
@@ -99,7 +101,7 @@ const db_migrate_1 = require("./cmds/db-migrate");
     ["db:push:data"]: { cb: db_push_data_1.main, tabs: 4, description: `push a dump to the database. ${db_push_data_1.usage}` },
     ["db:make:migration"]: {
         cb: db_makemigrations_1.main,
-        tabs: 2,
+        tabs: 3,
         description: `seeks changes in your models and creates migrations. ${db_makemigrations_1.usage}`
     },
     ["db:make:migration:force:clean:state"]: {

package/dist/cmds/new-test.js

@@ -6,19 +6,9 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 exports.usage = `usage: [NODE_ENV=development] npx miqro new:test <identifier ex: TEST_SOMEFILE>`;
 const testTemplates = {
-    js: (category) => `const options = {
-	category: "${category}",
-	before: async () => {
+    js: (category) => `it("happy path", async () => {
 
-	},
-	after: async () => {
-
-	}
-};
-
-it("happy path", async () => {
-
-}, options)
+})
 `
 };
 const main = () => {

package/dist/cmds/test.d.ts

@@ -0,0 +1,2 @@
+export declare const usage = "usage: npx miqro test <test_files> [-r <folder>] [-i] [-n testname]";
+export declare const main: () => void;

package/dist/cmds/test.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = exports.usage = void 0;
+const utils_1 = require("../utils");
+const test_1 = require("@miqro/test");
+const core_1 = require("@miqro/core");
+exports.usage = "usage: npx miqro test <test_files> [-r <folder>] [-i] [-n testname]";
+const main = () => {
+    if (process.argv.length <= 3) {
+        throw new Error(`invalid number of args\n${exports.usage}`);
+    }
+    (0, core_1.loadConfig)();
+    (0, utils_1.execSync)(`${process.argv[0]} ${(0, test_1.mainPath)()} ${process.argv.slice(3).join(" ")}`);
+};
+exports.main = main;

package/dist/cmds/wc-cache-templates.d.ts

@@ -1,2 +1,2 @@
-export declare const usage = "npx miqro generate:template:cache <src> <out.js>";
+export declare const usage = "npx miqro generate:template:cache <src> <out.json>";
 export declare const main: () => Promise<void>;

package/dist/cmds/wc-cache-templates.js

@@ -20,7 +20,7 @@ function recursiveSearch(path, found = []) {
     }
     return found;
 }
-exports.usage = "npx miqro generate:template:cache <src> <out.js>";
+exports.usage = "npx miqro generate:template:cache <src> <out.json>";
 const main = async () => {
     if (process.argv.length !== 5 || process.argv[3].length < 1 || process.argv[4].length < 1) {
         throw new Error(exports.usage);
@@ -39,15 +39,9 @@ const main = async () => {
     for (const template of foundTemplates) {
         if (template) {
             const url = (0, path_1.relative)(path, template);
-            const content = (0, fs_1.readFileSync)(template).toString("utf-8");
-            cache[url] = {
-                location: {
-                    url
-                },
-                content
-            };
+            cache[url] = (0, fs_1.readFileSync)(template).toString("utf-8");
         }
     }
-    (0, fs_1.writeFileSync)(outFilePath, `module.exports = ${JSON.stringify(cache, undefined, 0)};`);
+    (0, fs_1.writeFileSync)(outFilePath, `${JSON.stringify(cache, undefined, 0)}`);
 };
 exports.main = main;

package/dist/utils/index.js

@@ -81,13 +81,14 @@ const mainCMD = (cmds, usage, logger, cmdArg = process.argv[2], exit = true) =>
             logger.info(`${usage}`);
             logger.info(`Available commands:\n`);
             for (const cmd of Object.keys(cmds)) {
-                /*if (cmds[cmd].section) {
-                  logger.info(`\n${cmds[cmd].section}\n`);
-                }*/
+                if (cmds[cmd].section) {
+                    logger.info(`\n${cmds[cmd].section}\n`);
+                }
                 //const description = cmds[cmd].description.split("\n").map(s => `${getTabs(/*cmds[cmd].tabs*/2)}${s}`).join("\n");
-                const description = cmds[cmd].description.split("\n").map(s => `${getTabs(/*cmds[cmd].tabs*/ 1)}${s}`).join("\n");
-                //logger.info(`\t${cmd}\n${description}`);
-                logger.info(`${cmd}\n${description}`);
+                //const description = cmds[cmd].description.split("\n").map(s => `${getTabs(/*cmds[cmd].tabs*/1)}${s}`).join("\n");
+                const description = cmds[cmd].description.split("\n").map(s => `${getTabs(cmds[cmd].tabs)}${s}`).join("\n");
+                logger.info(`\t${cmd}${description}`);
+                //logger.info(`${cmd}\n${description}`);
             }
             logger.info("");
             if (exit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "1.7.16",
+  "version": "1.7.19",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,13 +17,13 @@
   "author": "claukers",
   "license": "ISC",
   "dependencies": {
-    "@miqro/core": "^1.5.13",
-    "@miqro/parser": "^0.0.7",
-    "@miqro/runner": "^1.2.6",
+    "@miqro/core": "^1.5.16",
+    "@miqro/parser": "^0.1.2",
+    "@miqro/runner": "^1.2.7",
+    "@miqro/test": "^0.2.0",
     "deep-diff": "1.0.2"
   },
   "devDependencies": {
-    "@miqro/test": "0.0.12",
     "@types/cookie": "0.4.1",
     "@types/deep-diff": "1.0.1",
     "@types/node": "17.0.23",