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

package/{dist → lib}/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-specifier-resolution=node --no-warnings
+#!/usr/bin/env node
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -8,7 +8,6 @@ const commander_1 = __importDefault(require("commander"));
 const start_1 = __importDefault(require("./start"));
 const build_1 = __importDefault(require("./build"));
 const safe_1 = __importDefault(require("colors/safe"));
-const create_1 = __importDefault(require("./create"));
 const test_1 = __importDefault(require("./test"));
 require("./handleErrors");
 const version_1 = __importDefault(require("./version"));
@@ -33,12 +32,6 @@ commander_1.default
     .description('Compiles an Orionjs app and exports it to a simple nodejs app')
     .option('-o, --output [output]', 'Output directory')
     .action(run(build_1.default));
-commander_1.default
-    .command('create')
-    .description('Creates a new Orionjs project')
-    .option('--name [name]', 'Name of the project')
-    .option('--kit [kit]', 'Which starter kit to use')
-    .action(run(create_1.default));
 commander_1.default.version(version_1.default, '-v --version');
 commander_1.default.parse(process.argv);
 if (!process.argv.slice(2).length) {

package/{dist → 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

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHost = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const getConfigPath_1 = require("./getConfigPath");
+const reports_1 = require("./reports");
+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;
+    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

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const typescript_1 = __importDefault(require("typescript"));
+const getHost_1 = require("./getHost");
+const cleanDirectory_1 = __importDefault(require("./cleanDirectory"));
+async function watchAndCompile(runner) {
+    await (0, cleanDirectory_1.default)();
+    const host = (0, getHost_1.getHost)(runner);
+    typescript_1.default.createWatchProgram(host);
+}
+exports.default = watchAndCompile;

package/lib/start/watchAndCompile/reports.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reportDiagnostic = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const format = {
+    getCanonicalFileName: fileName => fileName,
+    getCurrentDirectory: () => process.cwd(),
+    getNewLine: () => typescript_1.default.sys.newLine
+};
+function reportDiagnostic(diagnostic) {
+    console.log(typescript_1.default.formatDiagnosticsWithColorAndContext([diagnostic], format));
+}
+exports.reportDiagnostic = reportDiagnostic;

package/{dist → lib}/start/watchAndCompile/writeIndex/index.js

@@ -6,18 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const writeFile_1 = __importDefault(require("../../../helpers/writeFile"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const libPath = path_1.default.resolve(__dirname, '../../../../moduleAlias.js.txt');
-const libContent = fs_1.default.readFileSync(libPath).toString();
 function default_1() {
     const basePath = `${process.cwd()}/.orion/build`;
     const libPath = `${basePath}/moduleAliasLib.js`;
+    const libContentPath = path_1.default.resolve(__dirname, '../../../../moduleAlias.js.txt');
+    const libContent = fs_1.default.readFileSync(libContentPath).toString();
     (0, writeFile_1.default)(libPath, libContent);
     const aliasPath = `${basePath}/moduleAlias.js`;
     (0, writeFile_1.default)(aliasPath, `"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const moduleAlias = require('./moduleAliasLib')
 const path =  __dirname + '/app'
-console.log('registering alias',  path)
 moduleAlias.addAlias('app', path)
   `);
     const indexPath = `${basePath}/index.js`;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@orion-js/core",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.5",
   "main": "index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
   "bin": {
-    "orion": "./dist/index.js"
+    "orion": "./lib/index.js"
   },
   "scripts": {
     "test": "exit 0",
@@ -32,5 +32,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "e5f09ad60d33a2f5d860dbc8f54a2efa7971b3e7"
+  "gitHead": "3c2d957f111c94a1dc271feb6ae04f42eb7aed76"
 }

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "strict": false,
-    "outDir": "./dist",
+    "outDir": "./lib",
     "rootDir": "./src",
     "module": "commonjs",
     "target": "es2020",

package/dist/start/watchAndCompile/getHost.js

@@ -1,18 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHost = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const getConfigPath_1 = require("./getConfigPath");
-const reports_1 = require("./reports");
-function getHost() {
-    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);
-    return host;
-}
-exports.getHost = getHost;

package/dist/start/watchAndCompile/index.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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.
-    typescript_1.default.createWatchProgram(host);
-}
-exports.default = watchAndCompile;

package/dist/start/watchAndCompile/reports.js

@@ -1,22 +0,0 @@
-"use strict";
-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;
-const typescript_1 = __importDefault(require("typescript"));
-const formatHost = {
-    getCanonicalFileName: path => path,
-    getCurrentDirectory: typescript_1.default.sys.getCurrentDirectory,
-    getNewLine: () => typescript_1.default.sys.newLine
-};
-function reportDiagnostic(diagnostic) {
-    console.error('Error', diagnostic.code, ':', typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, formatHost.getNewLine()));
-}
-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;