@orion-js/core 3.0.0-alpha.4 → 3.0.0-alpha.5

package/lib/start/runner/index.js

@@ -9,10 +9,7 @@ const writeFile_1 = __importDefault(require("../../helpers/writeFile"));
 const startProcess_1 = require("./startProcess");
 function getRunner(options) {
     let appProcess = null;
-    const restart = () => {
-        if (appProcess) {
-            appProcess.kill();
-        }
+    const start = () => {
         console.log(safe_1.default.bold('=> Starting app...\n'));
         appProcess = (0, startProcess_1.startProcess)(options);
         appProcess.on('exit', function (code, signal) {
@@ -24,6 +21,15 @@ function getRunner(options) {
         });
         (0, writeFile_1.default)('.orion/process', `${appProcess.pid}`);
     };
-    return { restart };
+    const stop = () => {
+        if (appProcess) {
+            appProcess.kill();
+        }
+    };
+    const restart = () => {
+        stop();
+        start();
+    };
+    return { restart, stop };
 }
 exports.getRunner = getRunner;

package/lib/start/watchAndCompile/getHost.js

@@ -7,12 +7,32 @@ exports.getHost = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const getConfigPath_1 = require("./getConfigPath");
 const reports_1 = require("./reports");
-function getHost() {
+const safe_1 = __importDefault(require("colors/safe"));
+const writeIndex_1 = __importDefault(require("./writeIndex"));
+function getHost(runner) {
+    const reportWatchStatusChanged = (diagnostic) => {
+        if (diagnostic.category !== 3)
+            return;
+        if (diagnostic.code === 6032 || diagnostic.code === 6031) {
+            runner.stop();
+        }
+        console.log(safe_1.default.bold(`=> ${diagnostic.messageText}`));
+        if (diagnostic.code === 6194) {
+            /**
+             * Sometimes diagnostic code is 6194 even with errors
+             */
+            if (/^Found .+ errors?/.test(diagnostic.messageText.toString())) {
+                if (!diagnostic.messageText.toString().includes('Found 0 errors.')) {
+                    return;
+                }
+            }
+            (0, writeIndex_1.default)();
+            runner.restart();
+        }
+    };
     const configPath = (0, getConfigPath_1.getConfigPath)();
     const createProgram = typescript_1.default.createEmitAndSemanticDiagnosticsBuilderProgram;
-    // Note that there is another overload for `createWatchCompilerHost` that takes
-    // a set of root files.
-    const host = typescript_1.default.createWatchCompilerHost(configPath, {}, typescript_1.default.sys, createProgram, reports_1.reportDiagnostic, reports_1.reportWatchStatusChanged);
+    const host = typescript_1.default.createWatchCompilerHost(configPath, {}, typescript_1.default.sys, createProgram, reports_1.reportDiagnostic, reportWatchStatusChanged);
     return host;
 }
 exports.getHost = getHost;

package/lib/start/watchAndCompile/index.js

@@ -6,22 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const typescript_1 = __importDefault(require("typescript"));
 const getHost_1 = require("./getHost");
 const cleanDirectory_1 = __importDefault(require("./cleanDirectory"));
-const writeIndex_1 = __importDefault(require("./writeIndex"));
 async function watchAndCompile(runner) {
     await (0, cleanDirectory_1.default)();
-    const host = (0, getHost_1.getHost)();
-    const origCreateProgram = host.createProgram;
-    host.createProgram = (rootNames, options, host, oldProgram) => {
-        return origCreateProgram(rootNames, options, host, oldProgram);
-    };
-    const origPostProgramCreate = host.afterProgramCreate;
-    host.afterProgramCreate = program => {
-        origPostProgramCreate(program);
-        (0, writeIndex_1.default)();
-        runner.restart();
-    };
-    // `createWatchProgram` creates an initial program, watches files, and updates
-    // the program over time.
+    const host = (0, getHost_1.getHost)(runner);
     typescript_1.default.createWatchProgram(host);
 }
 exports.default = watchAndCompile;

package/lib/start/watchAndCompile/reports.js

@@ -3,20 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reportWatchStatusChanged = exports.reportDiagnostic = void 0;
+exports.reportDiagnostic = void 0;
 const typescript_1 = __importDefault(require("typescript"));
-const formatHost = {
-    getCanonicalFileName: path => path,
-    getCurrentDirectory: typescript_1.default.sys.getCurrentDirectory,
+const format = {
+    getCanonicalFileName: fileName => fileName,
+    getCurrentDirectory: () => process.cwd(),
     getNewLine: () => typescript_1.default.sys.newLine
 };
 function reportDiagnostic(diagnostic) {
-    console.error('Error', diagnostic.code, ':', typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, formatHost.getNewLine()));
+    console.log(typescript_1.default.formatDiagnosticsWithColorAndContext([diagnostic], format));
 }
 exports.reportDiagnostic = reportDiagnostic;
-/**
- * Prints a diagnostic every time the watch status changes.
- * This is mainly for messages like "Starting compilation" or "Compilation completed".
- */
-function reportWatchStatusChanged(diagnostic) { }
-exports.reportWatchStatusChanged = reportWatchStatusChanged;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/core",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "main": "index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -32,5 +32,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "d7d9933b0c9b8098f44db5f5225eea7433e9946a"
+  "gitHead": "3c2d957f111c94a1dc271feb6ae04f42eb7aed76"
 }