miqro 6.2.13 → 6.3.0

package/build/esm/src/common/arguments.d.ts

@@ -38,6 +38,7 @@ export interface Arguments {
     services: string[];
     editor: boolean;
     hotreload: boolean;
+    watch: boolean;
     https: boolean;
     serverOptions: ServerOptions;
     httpsRedirect?: number;

package/build/esm/src/common/arguments.js

@@ -56,6 +56,7 @@ export function parseArguments() {
         browser: null,
         logFile: null,
         hotreload: null,
+        watch: null,
         miqroJSONPath: null,
         installMiqroJSON: null,
         disableMiqroJSON: null,
@@ -133,6 +134,14 @@ export function parseArguments() {
                 flags.installTSConfig = true;
                 continue;
             case "--watch":
+                if (flags.watch !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.watch = true;
+                continue;
+            case "--hot-reload":
                 if (flags.hotreload !== null) {
                     console.error("bad arguments.");
                     console.error(usage);
@@ -564,19 +573,19 @@ export function parseArguments() {
         console.error("bad arguments. cannot use --editor with--install-types, --install-tsconfig or --install-miqrojson");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.test && (flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
+    if (flags.test && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
         console.error("bad arguments. cannot use --editor with --test");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.migrateUp && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+    if (flags.migrateUp && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
         console.error("bad arguments. cannot use with --migrate-up");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.migrateDown && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+    if (flags.migrateDown && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
         console.error("bad arguments. cannot use with --migrate-down");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.generateDoc && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+    if (flags.generateDoc && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
         console.error("bad arguments. cannot use with --generate-doc");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
@@ -604,6 +613,7 @@ export function parseArguments() {
         logFile: flags.logFile !== null ? flags.logFile : undefined,
         generateDocAll: flags.generateDocAll ? true : false,
         hotreload: flags.hotreload ? true : false,
+        watch: flags.watch ? true : false,
         disableMiqroJSON: flags.disableMiqroJSON !== null ? flags.disableMiqroJSON : false,
         miqroJSONPath: miqroJSONPath ? miqroJSONPath : false,
         installTypes: flags.installTypes ? true : false,

package/build/esm/src/common/help.d.ts

@@ -1,3 +1,3 @@
 export declare const BIN_NAME = "miqro";
 export declare const usage = "usage: miqro [...FLAGS] --service app/\n\n==examples==\n\nmiqro --watch --service front/\nPORT=8181 miqro --service api/ --service front/\nmiqro --test --service front/\nmiqro --inflate --service front/\nmiqro --generate-doc --generate-doc-out API.md --service front/\nCLUSTER_COUNT=10 miqro-cluster --service api/";
-export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--watch\n\tuse to enable the hot-reload functionality.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";
+export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--watch\n\tuse to auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";

package/build/esm/src/common/help.js

@@ -15,7 +15,8 @@ export const help = `
 
 -v, --version\n\toutputs the version number
 -h, --help\n\toutputs this page.
---watch\n\tuse to enable the hot-reload functionality.
+--watch\n\tuse to auto reload the server when files change.
+--hot-reload\n\tenables the hot-reload functionality use with --watch.
 --test\n\trun the tests for a service.
 --migrate-up\n\tmigrations up.
 --migrate-down\n\tmigrations down.

package/build/esm/src/common/watch.js

@@ -43,6 +43,7 @@ export async function watchAndServer(app) {
         }, 2000);
     }
     function watchDir(toWatch) {
+        clearTimeout(timeout);
         const files = existsSync(toWatch) ? readdirSync(toWatch) : [];
         for (const file of files) {
             const filePath = resolve(toWatch, file);
@@ -56,6 +57,7 @@ export async function watchAndServer(app) {
         }
     }
     function stopWatch() {
+        clearTimeout(timeout);
         const toClose = watchers.splice(0, watchers.length);
         for (const watcher of toClose) {
             watcher.close();
@@ -63,6 +65,7 @@ export async function watchAndServer(app) {
     }
     function reWatch() {
         stopWatch();
+        clearTimeout(timeout);
         for (const service of app.options.services) {
             const toWatch = resolve(process.cwd(), service);
             watchDir(toWatch);

package/build/esm/src/main.js

@@ -22,6 +22,7 @@ async function main(args) {
             browser: args.browser,
             logFile: args.logFile,
             hotreload: args.test ? false : args.hotreload,
+            watch: args.test ? false : args.watch,
             https: args.test ? false : args.https,
             serverOptions: args.serverOptions,
             httpRedirect: args.test ? undefined : args.httpsRedirect

package/build/esm/src/services/app.d.ts

@@ -22,6 +22,7 @@ export interface MiqroOptions {
     browser?: string | boolean;
     logFile?: string | boolean;
     hotreload?: boolean;
+    watch?: boolean;
     serverOptions?: ServerOptions<any, any>;
     https?: boolean;
     httpRedirect?: number;

package/build/esm/src/services/app.js

@@ -400,7 +400,7 @@ export class Miqro {
             this.logger?.debug("\t\t==listening on [%s][%s]==", this.options.https ? "https" : "http", this.options.port);
         }
         await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "start");
-        if (this.options.hotreload && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
+        if (this.options.watch && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
             this.watcher = await watchAndServer(this);
         }
         this.logger?.debug("\t\t==start done==");

package/build/lib.cjs

@@ -16468,6 +16468,7 @@ async function watchAndServer(app) {
     }, 2e3);
   }
   function watchDir(toWatch) {
+    clearTimeout(timeout);
     const files = (0, import_node_fs23.existsSync)(toWatch) ? (0, import_node_fs23.readdirSync)(toWatch) : [];
     for (const file of files) {
       const filePath = (0, import_node_path26.resolve)(toWatch, file);
@@ -16479,6 +16480,7 @@ async function watchAndServer(app) {
     }
   }
   function stopWatch() {
+    clearTimeout(timeout);
     const toClose = watchers.splice(0, watchers.length);
     for (const watcher of toClose) {
       watcher.close();
@@ -16486,6 +16488,7 @@ async function watchAndServer(app) {
   }
   function reWatch() {
     stopWatch();
+    clearTimeout(timeout);
     for (const service of app.options.services) {
       const toWatch = (0, import_node_path26.resolve)(process.cwd(), service);
       watchDir(toWatch);
@@ -17213,7 +17216,7 @@ var Miqro = class _Miqro {
       this.logger?.debug("		==listening on [%s][%s]==", this.options.https ? "https" : "http", this.options.port);
     }
     await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "start");
-    if (this.options.hotreload && (import_node_cluster3.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
+    if (this.options.watch && (import_node_cluster3.default.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
       this.watcher = await watchAndServer(this);
     }
     this.logger?.debug("		==start done==");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "6.2.13",
+  "version": "6.3.0",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",

package/src/common/arguments.ts

@@ -85,6 +85,7 @@ export interface Arguments {
   services: string[];
   editor: boolean;
   hotreload: boolean;
+  watch: boolean;
   https: boolean;
   serverOptions: ServerOptions;
   httpsRedirect?: number;
@@ -126,6 +127,7 @@ export function parseArguments(): Arguments {
     editor: boolean | null;
     inflateDir?: string | null;
     hotreload?: boolean | null;
+    watch?: boolean | null;
   } = {
     inflateParallel: null,
     httpsRedirect: null,
@@ -135,6 +137,7 @@ export function parseArguments(): Arguments {
     browser: null,
     logFile: null,
     hotreload: null,
+    watch: null,
     miqroJSONPath: null,
     installMiqroJSON: null,
     disableMiqroJSON: null,
@@ -211,6 +214,14 @@ export function parseArguments(): Arguments {
         flags.installTSConfig = true;
         continue;
       case "--watch":
+        if (flags.watch !== null) {
+          console.error("bad arguments.");
+          console.error(usage);
+          process.exit(EXIT_CODES.BAD_ARGUMENTS);
+        }
+        flags.watch = true;
+        continue;
+      case "--hot-reload":
         if (flags.hotreload !== null) {
           console.error("bad arguments.");
           console.error(usage);
@@ -659,22 +670,22 @@ export function parseArguments(): Arguments {
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.test && (flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
+  if (flags.test && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
     console.error("bad arguments. cannot use --editor with --test");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateUp && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+  if (flags.migrateUp && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-up");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateDown && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+  if (flags.migrateDown && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-down");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.generateDoc && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+  if (flags.generateDoc && (flags.watch || flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
     console.error("bad arguments. cannot use with --generate-doc");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
@@ -708,6 +719,7 @@ export function parseArguments(): Arguments {
     logFile: flags.logFile !== null ? flags.logFile : undefined,
     generateDocAll: flags.generateDocAll ? true : false,
     hotreload: flags.hotreload ? true : false,
+    watch: flags.watch ? true : false,
     disableMiqroJSON: flags.disableMiqroJSON !== null ? flags.disableMiqroJSON : false,
     miqroJSONPath: miqroJSONPath ? miqroJSONPath : false,
     installTypes: flags.installTypes ? true : false,

package/src/common/help.ts

@@ -18,7 +18,8 @@ export const help = `
 
 -v, --version\n\toutputs the version number
 -h, --help\n\toutputs this page.
---watch\n\tuse to enable the hot-reload functionality.
+--watch\n\tuse to auto reload the server when files change.
+--hot-reload\n\tenables the hot-reload functionality use with --watch.
 --test\n\trun the tests for a service.
 --migrate-up\n\tmigrations up.
 --migrate-down\n\tmigrations down.

package/src/common/watch.ts

@@ -47,6 +47,7 @@ export async function watchAndServer(app: Miqro) {
   }
 
   function watchDir(toWatch: string) {
+    clearTimeout(timeout);
     const files = existsSync(toWatch) ? readdirSync(toWatch) : [];
     for (const file of files) {
       const filePath = resolve(toWatch, file);
@@ -60,6 +61,7 @@ export async function watchAndServer(app: Miqro) {
   }
 
   function stopWatch() {
+    clearTimeout(timeout);
     const toClose = watchers.splice(0, watchers.length);
     for (const watcher of toClose) {
       watcher.close();
@@ -69,6 +71,7 @@ export async function watchAndServer(app: Miqro) {
 
   function reWatch() {
     stopWatch();
+    clearTimeout(timeout);
     for (const service of app.options.services) {
       const toWatch = resolve(process.cwd(), service);
       watchDir(toWatch);

package/src/main.ts

@@ -23,6 +23,7 @@ async function main(args: Arguments) {
       browser: args.browser,
       logFile: args.logFile,
       hotreload: args.test ? false : args.hotreload,
+      watch: args.test ? false : args.watch,
       https: args.test ? false : args.https,
       serverOptions: args.serverOptions,
       httpRedirect: args.test ? undefined : args.httpsRedirect

package/src/services/app.ts

@@ -43,6 +43,7 @@ export interface MiqroOptions {
   browser?: string | boolean;
   logFile?: string | boolean;
   hotreload?: boolean;
+  watch?: boolean;
   serverOptions?: ServerOptions<any, any>;
   https?: boolean;
   httpRedirect?: number;
@@ -494,7 +495,7 @@ export class Miqro {
 
     await notifiyServerConfig(this.logger, this.serverInterface, this.adminInterface, this.inflated.serverConfigMap, "start");
 
-    if (this.options.hotreload && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
+    if (this.options.watch && (cluster.isPrimary || process.env["CLUSTER_NODE_NUMBER"] === "0")) {
       this.watcher = await watchAndServer(this);
     }