miqro 1.7.12 → 1.7.16

package/dist/cli.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//@miqro/core
 const utils_1 = require("./utils");
 const start_1 = require("./cmds/start");
 const watch_1 = require("./cmds/watch");
@@ -16,7 +15,6 @@ const handler_apiroute_new_1 = require("./cmds/handler-apiroute-new");
 const new_test_1 = require("./cmds/new-test");
 const serve_1 = require("./cmds/serve");
 const handler_main_new_1 = require("./cmds/handler-main-new");
-//@miqro/database
 const db_init_1 = require("./cmds/db-init");
 const db_makemigrations_1 = require("./cmds/db-makemigrations");
 const db_sync_makemigrations_1 = require("./cmds/db-sync-makemigrations");
@@ -24,6 +22,7 @@ const db_console_1 = require("./cmds/db-console");
 const db_createmodel_1 = require("./cmds/db-createmodel");
 const db_push_data_1 = require("./cmds/db-push-data");
 const db_dump_data_1 = require("./cmds/db-dump-data");
+const db_migrate_1 = require("./cmds/db-migrate");
 // noinspection SpellCheckingInspection
 (0, utils_1.mainCMD)({
     ["new"]: { section: "quick start", cb: new_1.mainJS, tabs: 5, description: `create a new project. ${new_1.usageJS}` },
@@ -69,6 +68,11 @@ const db_dump_data_1 = require("./cmds/db-dump-data");
         tabs: 6,
         cb: serve_1.main, description: `serve static files. ${serve_1.usage}`
     },
+    /*["generate:html:cache"]: {
+      section: "web components",
+      tabs: 6,
+      cb: generateTemplatesCache, description: `generate cache.js for webcomponents. ${generateTemplatesCacheUsage}`
+    },*/
     ["doc"]: {
         section: "api documentation",
         tabs: 5,
@@ -103,6 +107,7 @@ const db_dump_data_1 = require("./cmds/db-dump-data");
         tabs: 1,
         description: `regenerate _current.json in the migrations folder to force the 'local' migration state to be the same as the current models. ${db_sync_makemigrations_1.usage}`
     },
+    ["db:migrate"]: { cb: db_migrate_1.main, tabs: 4, description: `loads config/<NODE_ENV>/*.env config and runs npx sequelize-cli db:migrate <...args>. ${db_migrate_1.usage}` },
     ["db:init"]: { cb: db_init_1.main, tabs: 5, description: `init sequelize configuration. ${db_init_1.usage}` },
     ["db:create:model"]: { cb: db_createmodel_1.main, tabs: 4, description: `creates an example model. ${db_createmodel_1.usage}` }
 }, "npx miqro <command> [args]", console);

package/dist/cmds/db-createmodel.js

@@ -9,18 +9,17 @@ const db_1 = require("../utils/db");
 exports.usage = "usage: [NODE_ENV=development] npx miqro db:create:model <modelname>";
 const main = () => {
     const logger = console;
-    const modelname = process.argv[3];
+    const modelName = process.argv[3];
     if (process.argv.length !== 4) {
         throw new Error(exports.usage);
     }
-    if (typeof modelname !== "string") {
+    if (typeof modelName !== "string") {
         throw new Error(`<modelname> must be a string!`);
     }
     (0, core_1.loadConfig)();
     const config = (0, db_1.loadSequelizeRC)();
     // disable experimental typescript support
-    const typescript = false; //existsSync(resolve(ConfigPathResolver.getBaseDirname(), "tsconfig.json")) ? true : false;
-    const modelsFolder = typescript ? (0, path_1.resolve)(core_1.ConfigPathResolver.getBaseDirname(), "src", "models") : config["models-path"];
+    const modelsFolder = config["models-path"];
     if (!(0, fs_1.existsSync)(modelsFolder)) {
         logger.warn(`models folder [${modelsFolder}] doesnt exists!`);
         logger.warn(`creating [${modelsFolder}]!`);
@@ -28,11 +27,11 @@ const main = () => {
             recursive: true
         });
     }
-    const modelPath = (0, path_1.resolve)(modelsFolder, `${modelname.toLowerCase()}${typescript ? ".ts" : ".js"}`);
+    const modelPath = (0, path_1.resolve)(modelsFolder, `${modelName.toLowerCase()}.js`);
     if ((0, fs_1.existsSync)(modelPath)) {
         throw new Error(`${modelPath} already exists!`);
     }
     logger.info(`creating [${modelPath}]!`);
-    (0, fs_1.writeFileSync)(modelPath, templates_1.templates.exampleModel(modelname, typescript));
+    (0, fs_1.writeFileSync)(modelPath, templates_1.templates.exampleModel(modelName));
 };
 exports.main = main;

package/dist/cmds/db-init.js

@@ -33,7 +33,6 @@ const main = () => {
         }
         initEnvFile((0, path_1.resolve)(configPath, `db.env`), templates_1.templates.dbEnvFile);
         (0, utils_1.execSync)(`npm install sequelize --save`);
-        (0, utils_1.execSync)(`npm install @miqro/core --save`);
     }
 };
 exports.main = main;

package/dist/cmds/db-migrate.d.ts

@@ -0,0 +1,2 @@
+export declare const usage = "usage: [NODE_ENV=development] npx miqro db:migrate [...args]";
+export declare const main: () => void;

package/dist/cmds/db-migrate.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = exports.usage = void 0;
+const utils_1 = require("../utils");
+const core_1 = require("@miqro/core");
+exports.usage = "usage: [NODE_ENV=development] npx miqro db:migrate [...args]";
+const main = () => {
+    (0, core_1.loadConfig)();
+    const args = process.argv.slice(3).join(" ");
+    (0, utils_1.execSync)(`npx sequelize-cli db:migrate${args ? ` ${args}` : ""}`);
+};
+exports.main = main;

package/dist/cmds/new-test.d.ts

@@ -1,2 +1,2 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro new:test <identifier ex: SRC_MAIN>";
+export declare const usage = "usage: [NODE_ENV=development] npx miqro new:test <identifier ex: TEST_SOMEFILE>";
 export declare const main: () => void;

package/dist/cmds/new-test.js

@@ -4,7 +4,7 @@ exports.main = exports.usage = void 0;
 const core_1 = require("@miqro/core");
 const fs_1 = require("fs");
 const path_1 = require("path");
-exports.usage = `usage: [NODE_ENV=development] npx miqro new:test <identifier ex: SRC_MAIN>`;
+exports.usage = `usage: [NODE_ENV=development] npx miqro new:test <identifier ex: TEST_SOMEFILE>`;
 const testTemplates = {
     js: (category) => `const options = {
 	category: "${category}",

package/dist/cmds/new.js

@@ -120,7 +120,7 @@ const mainJS = (typescript = false) => {
     (0, fs_1.mkdirSync)((0, path_1.resolve)(appFolder, "test"), {
         recursive: true
     });
-    (0, utils_1.execSync)(`npx miqro test:new test_api_health`, {
+    (0, utils_1.execSync)(`npx miqro new:test test_api_health`, {
         cwd: appFolder
     });
     console.log(`new project created on ${appFolder}`);

package/dist/cmds/serve.js

@@ -10,6 +10,9 @@ exports.usage = `usage: [NODE_ENV=development] npx miqro serve [directory=./] [p
 const main = () => {
     const flags = (0, utils_1.extractFlags)(process.argv.slice(3), {
         flags: {
+            "index404Status": {
+                description: "status to handle index404 status", hasValue: true
+            },
             "index404": {
                 description: "file to handle 404", hasValue: true
             }, "proxy": {
@@ -62,7 +65,10 @@ const main = () => {
         }
     }
     app.use((0, core_1.Static)({
-        directory, list: true, index404: flags.flags.index404 ? flags.flags.index404 : undefined
+        directory,
+        list: true,
+        index404: flags.flags.index404 ? flags.flags.index404 : undefined,
+        index404Status: flags.flags.index404Status ? parseInt(flags.flags.index404Status, 10) : undefined
     }), path);
     app.listen(PORT, () => {
         console.log("serving " + directory + " on " + path + " on port " + PORT);

package/dist/cmds/watch.js

@@ -9,7 +9,9 @@ function setupWatch(directory, cmd, timeout = 1000) {
     (0, fs_1.watchFile)(directory, () => {
         queueRunCMD(cmd, timeout);
     });
-    (0, fs_1.watch)(directory, () => {
+    (0, fs_1.watch)(directory, {
+        recursive: true
+    }, () => {
         queueRunCMD(cmd, timeout);
     });
 }
@@ -24,10 +26,15 @@ function queueRunCMD(cmd, timeout) {
     }
     cmdTimeout = setTimeout(() => {
         running = true;
-        (0, utils_1.execSync)(cmd, {
-            cwd: process.cwd(),
-            env: process.env
-        });
+        try {
+            (0, utils_1.execSync)(cmd, {
+                cwd: process.cwd(),
+                env: process.env
+            });
+        }
+        catch (e) {
+            console.error(e);
+        }
         running = false;
     }, timeout);
 }

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

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

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = exports.usage = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const util_1 = require("util");
+function recursiveSearch(path, found = []) {
+    const files = (0, fs_1.readdirSync)(path);
+    for (const file of files) {
+        const filePath = (0, path_1.resolve)(path, file);
+        if ((0, fs_1.statSync)(filePath).isDirectory()) {
+            recursiveSearch(filePath, found);
+        }
+        else {
+            const ext = (0, path_1.extname)(filePath);
+            if (ext === ".html" || ext === ".htm") {
+                found.push(filePath);
+            }
+        }
+    }
+    return found;
+}
+exports.usage = "npx miqro generate:template:cache <src> <out.js>";
+const main = async () => {
+    if (process.argv.length !== 5 || process.argv[3].length < 1 || process.argv[4].length < 1) {
+        throw new Error(exports.usage);
+    }
+    const directory = process.argv[3].toLocaleLowerCase();
+    const outfile = process.argv[4].toLocaleLowerCase();
+    const path = (0, path_1.resolve)(process.cwd(), directory);
+    const outFilePath = (0, path_1.resolve)(process.cwd(), outfile);
+    if (!(0, fs_1.statSync)(path).isDirectory()) {
+        throw new Error((0, util_1.format)("%s not a directory", path));
+    }
+    const foundTemplates = recursiveSearch(path);
+    console.log("caching %o", foundTemplates);
+    console.log("to %s", outFilePath);
+    const cache = {};
+    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
+            };
+        }
+    }
+    (0, fs_1.writeFileSync)(outFilePath, `module.exports = ${JSON.stringify(cache, undefined, 0)};`);
+};
+exports.main = main;

package/dist/index.js

@@ -1,2 +1,2 @@
 "use strict";
-// this package is just a development cli
+console.warn("this package is just a development cli");

package/dist/utils/index.js

@@ -22,7 +22,7 @@ const routeCMDModule = async (cmdArg, cmds, logger, exit = true) => {
             }
             catch (e) {
                 if (e && e.message) {
-                    logger.error(e);
+                    logger.error("Error running command. " + e.message);
                 }
                 if (exit) {
                     process.exit(1);

package/dist/utils/templates.d.ts

@@ -1,12 +1,12 @@
 export declare const logEnvFile = "####################\n## logging\nLOG_LEVEL=info\nLOG_LEVEL_Database=error\n#LOG_FILE=./logs/dev.log\n";
 export declare const featuresEnvFile = "####################\n## features\n#MY_CUSTOM_FEATURE=false\n";
-export declare const dbEnvFile = "####################\n## db\nDB_URI=sqlite://user:password@localhost:3306/devdb\nDB_DIALECT_SSL=true\nDB_POOL_MAX=5\nDB_POOL_MIN=0\nDB_POOL_ACQUIRE=30000\nDB_POOL_IDDLE=10000\nDB_STORAGE=./dev.sqlite3\n";
+export declare const dbEnvFile = "####################\n## db\nDB_URI=sqlite://user:password@localhost:3306/devdb\nDB_POOL=false\nDB_DIALECT_SSL=true\nDB_POOL_MAX=5\nDB_POOL_MIN=0\nDB_POOL_ACQUIRE=30000\nDB_POOL_IDLE=10000\nDB_STORAGE=./dev.sqlite3\n";
 export declare const authEnvFile = "####################\n## Auth\nTOKEN_LOCATION=header\n#TOKEN_LOCATION=query\nTOKEN_VERIFY_LOCATION=header\n#TOKEN_VERIFY_LOCATION=query\nTOKEN_HEADER=Authorization\n#TOKEN_QUERY=Authorization\n#TOKEN_VERIFY_ENDPOINT=\nTOKEN_VERIFY_ENDPOINT_METHOD=GET\n";
 export declare const templates: {
     modelsIndex: string;
     dbConfig: string;
     sequelizerc: (typescript?: boolean | undefined) => string;
-    exampleModel: (modelName: string, typescript?: boolean | undefined) => string;
+    exampleModel: (modelName: string) => string;
     logEnvFile: string;
     authEnvFile: string;
     dbEnvFile: string;

package/dist/utils/templates.js

@@ -15,11 +15,12 @@ exports.featuresEnvFile = `####################
 exports.dbEnvFile = `####################
 ## db
 DB_URI=sqlite://user:password@localhost:3306/devdb
+DB_POOL=false
 DB_DIALECT_SSL=true
 DB_POOL_MAX=5
 DB_POOL_MIN=0
 DB_POOL_ACQUIRE=30000
-DB_POOL_IDDLE=10000
+DB_POOL_IDLE=10000
 DB_STORAGE=./dev.sqlite3
 `;
 exports.authEnvFile = `####################
@@ -76,18 +77,19 @@ module.exports.Sequelize = Sequelize;
 
 `;
 // noinspection SpellCheckingInspection
-const dbConfig = `const { loadConfig, checkEnvVariables } = require("@miqro/core");
+const dbConfig = `const { URL } = require("url");
 
-loadConfig();
-
-const { URL } = require("url");
-
-const [DB_URI] = checkEnvVariables(["DB_URI"]);
-const [DB_POOL, DB_POOL_ACQUIRE, DB_POOL_IDDLE, DB_POOL_MAX, DB_POOL_MIN] = checkEnvVariables(["DB_POOL", "DB_POOL_ACQUIRE", "DB_POOL_IDDLE", "DB_POOL_MAX", "DB_POOL_MIN"], ["false", "30000", "10000", "5", "0"]);
+const DB_URI = process.env.DB_URI;
+const DB_POOL = process.env.DB_POOL ? process.env.DB_POOL : "false";
+const DB_POOL_ACQUIRE = process.env.DB_POOL_ACQUIRE ? process.env.DB_POOL_ACQUIRE : "30000";
+const DB_POOL_IDLE = process.env.DB_POOL_IDLE ? process.env.DB_POOL_IDLE : "10000";
+const DB_POOL_MAX = process.env.DB_POOL_MAX ? process.env.DB_POOL_MAX : "5";
+const DB_POOL_MIN = process.env.DB_POOL_MIN ? process.env.DB_POOL_MIN : "0";
+const DB_DIALECT_SSL = process.env.DB_DIALECT_SSL === "true" || process.env.DB_DIALECT_SSL === undefined ? true : false;
 
 const pool = DB_POOL === "true" ? {
   acquire: parseInt(DB_POOL_ACQUIRE, 10),
-  idle: parseInt(DB_POOL_IDDLE, 10),
+  idle: parseInt(DB_POOL_IDLE, 10),
   max: parseInt(DB_POOL_MAX, 10),
   min: parseInt(DB_POOL_MIN, 10)
 } : undefined;
@@ -102,7 +104,7 @@ module.exports = {
   password: parsed.password,
   dialect: parsed.protocol.substring(0, parsed.protocol.length - 1),
   dialectOptions: {
-    ssl: process.env.DB_DIALECT_SSL === "true" || process.env.DB_DIALECT_SSL === undefined ? true : false
+    ssl: DB_DIALECT_SSL
   },
   pool,
   storage: process.env.DB_STORAGE
@@ -118,40 +120,8 @@ module.exports = {
   ${typescript ? `"models-path": path.resolve(__dirname, "dist", "models")` : `"models-path": path.resolve(__dirname, "db", "models")`},
 };
 `;
-const exampleModel = (modelName, typescript) => {
-    return typescript ? `import { Sequelize, DataTypes, ModelCtor, Model } from "sequelize";
-  
-export interface ${modelName.charAt(0).toUpperCase()}${modelName.substring(1)} { 
-  name: string; 
-  timestamp: number; 
-};
-export type ${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}Model = Model<${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}>;
-export type ${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}ModelCtor = ModelCtor<${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}Model>;
-
-module.exports = (sequelize: Sequelize): ${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}ModelCtor => {
-  const ${modelName} = sequelize.define<${modelName.charAt(0).toUpperCase()}${modelName.substring(1)}Model>("${modelName}", {
-    name: {
-      type: DataTypes.STRING,
-      allowNull: false,
-      defaultValue: ""
-    },
-    timestamp: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0
-    }
-  }, {});
-  /* eslint-disable  @typescript-eslint/ban-ts-comment */
-  // @ts-ignore
-  ${modelName}.associate = function (models) {
-    // associations can be defined here
-    // ${modelName}.belongsTo(models.....)
-  };
-  return ${modelName};
-  };
-
-
-  ` : `module.exports = (sequelize, DataTypes) => {
+const exampleModel = (modelName) => {
+    return `module.exports = (sequelize, DataTypes) => {
   const ${modelName} = sequelize.define("${modelName}", {
     name: {
       type: DataTypes.STRING,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "1.7.12",
+  "version": "1.7.16",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,17 +17,17 @@
   "author": "claukers",
   "license": "ISC",
   "dependencies": {
-    "@miqro/core": "^1.5.11",
-    "@miqro/parser": "^0.0.5",
-    "@miqro/runner": "^1.2.5",
-    "@miqro/test": "^0.0.11",
+    "@miqro/core": "^1.5.13",
+    "@miqro/parser": "^0.0.7",
+    "@miqro/runner": "^1.2.6",
     "deep-diff": "1.0.2"
   },
   "devDependencies": {
-    "@types/cookie": "^0.4.1",
+    "@miqro/test": "0.0.12",
+    "@types/cookie": "0.4.1",
     "@types/deep-diff": "1.0.1",
-    "@types/node": "^16.7.10",
-    "typescript": "^4.5.4"
+    "@types/node": "17.0.23",
+    "typescript": "4.6.3"
   },
   "engines": {
     "node": ">=14.0.0",