tnp 13.1.148 → 13.1.149

package/app.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dummy1673242324704 = void 0;
-function dummy1673242324704() { }
-exports.dummy1673242324704 = dummy1673242324704;
+exports.dummy1673248234358 = void 0;
+function dummy1673248234358() { }
+exports.dummy1673248234358 = dummy1673248234358;
 //# sourceMappingURL=app.js.map

package/bin/start.js

@@ -92,7 +92,7 @@ if (procType === 'child-of-root' || debugMode) {
 //   startSpinner = !isNodeDebuggerEnabled;
 // }
 
-if (frameworkName === 'tnp') {
+if (frameworkName === 'tnp' || global.skipCoreCheck) {
   startSpinner = false;
 }
 
@@ -146,7 +146,7 @@ if (startSpinner) {
   };
 
   const cwd = process.cwd();
-  const argsToCHildProc = (`${orgArgvForChild.slice(2).join(' ')} `
+  const argsToCHildProc = (`${orgArgvForChild.slice(2).join(' ')}  ${global.skipCoreCheck ? '--skipCoreCheck':''} `
     + `${spinnerOnInArgs ? '-spinner' : (spinnerOffInArgs ? '-spinner=off' : '')} ${childprocsecretarg}`).split(' ');
 
   const proc = child_process.fork(crossPlatofrmPath(__filename), argsToCHildProc, {

package/index.js

@@ -362422,15 +362422,13 @@ function pathResolved() {
                 catch (error) {
                     tnp_core_3.Helpers.error("[".concat(frameworkName, "][config] Not able to clone repository: ").concat(urlMorphi, " in:\n           ").concat(morphiPathUserInUserDir), false, true);
                 }
-            }
-            if (!global.skipCoreCheck) {
                 try {
                     tnp_core_1.child_process.execSync("".concat(frameworkName, " init:core --skipCoreCheck"), {
                         stdio: [0, 1, 2]
                     });
                 }
                 catch (error) {
-                    tnp_core_3.Helpers.error("[".concat(frameworkName, "][config] Not able to install local global environment"), false, true);
+                    tnp_core_3.Helpers.error("[".concat(frameworkName, "][config] Not able init core project"), false, true);
                 }
             }
             pathResolved.prototype.resolved = true;
@@ -364090,8 +364088,15 @@ var HelpersCore = /** @class */ (function (_super) {
         return core_imports_1.fse.existsSync(folderOrFilePath);
         //#endregion
     };
+    HelpersCore.prototype._fixCommand = function (command) {
+        if (global.skipCoreCheck && (command.startsWith('tnp ') || command.startsWith('firedev'))) {
+            command = "".concat(command, " --skipCoreCheck");
+        }
+        return command;
+    };
     HelpersCore.prototype.command = function (command) {
         // console.log({ command })
+        command = index_1.Helpers._fixCommand(command);
         return {
             //#region @backend
             getherOutput: function (options) {
@@ -364142,6 +364147,7 @@ var HelpersCore = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        command = index_1.Helpers._fixCommand(command);
                         opt = (options || {});
                         output = '';
                         _a.label = 1;
@@ -364183,6 +364189,7 @@ var HelpersCore = /** @class */ (function (_super) {
     HelpersCore.prototype.commnadOutputAsString = function (command, cwd, options) {
         var _a;
         if (cwd === void 0) { cwd = (0, core_imports_1.crossPlatformPath)(process.cwd()); }
+        command = index_1.Helpers._fixCommand(command);
         var opt = (options || {});
         var output = '';
         try {
@@ -364213,6 +364220,7 @@ var HelpersCore = /** @class */ (function (_super) {
     //#endregion
     //#endregion
     HelpersCore.prototype.run = function (command, options) {
+        command = index_1.Helpers._fixCommand(command);
         // console.log({ command })
         //#region @backend
         if (!options)
@@ -364412,11 +364420,11 @@ var HelpersCore = /** @class */ (function (_super) {
                 });
             }
         }
-        return index_1.Helpers.logProc(proc, detach ? true : output, detach ? void 0 : stdio, outputLineReplace, options.prefix, extractFromLine, command);
+        return index_1.Helpers.logProc(proc, detach ? true : output, detach ? void 0 : stdio, outputLineReplace, options.prefix, extractFromLine);
     };
     //#endregion
     //#region @backend
-    HelpersCore.prototype.logProc = function (proc, output, stdio, outputLineReplace, prefix, extractFromLine, command) {
+    HelpersCore.prototype.logProc = function (proc, output, stdio, outputLineReplace, prefix, extractFromLine) {
         if (output === void 0) { output = true; }
         index_1.Helpers.processes.push(proc);
         if (stdio) {
@@ -364454,9 +364462,11 @@ var HelpersCore = /** @class */ (function (_super) {
         }
         return proc;
     };
-    HelpersCore.prototype.execute = function (childProcess, options) {
+    HelpersCore.prototype.execute = function (command, cwd, options) {
         var _this = this;
         var _a = options || {}, hideOutput = _a.hideOutput, resolvePromiseMsg = _a.resolvePromiseMsg, outputLineReplace = _a.outputLineReplace, prefix = _a.prefix, extractFromLine = _a.extractFromLine, exitOnError = _a.exitOnError, exitOnErrorCallback = _a.exitOnErrorCallback;
+        command = index_1.Helpers._fixCommand(command);
+        var childProcess = core_imports_1.child_process.exec(command, { cwd: cwd });
         // let {
         //   stderMsgForPromiseResolve,
         //   stdoutMsgForPromiseResolve
@@ -368145,7 +368155,7 @@ var ProjectGit = /** @class */ (function () {
                         else {
                             Helpers.log("[".concat(tnp_cli_1.CLI.chalk.underline('Executing shell command'), "]  \"").concat(command, "\" in [").concat(cwd, "]"));
                         }
-                        return [4 /*yield*/, Helpers.execute(tnp_core_1.child_process.exec(command, { cwd: cwd }), options)];
+                        return [4 /*yield*/, Helpers.execute(command, cwd, options)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -371043,36 +371053,6 @@ var HelpersProcess = /** @class */ (function () {
             + '\n/' + tnp_cli_1.CLI.chalk.bold(tnp_core_1.path.basename(pathToFileOrFolder))), "\n").concat(index_1.Helpers.terminalLine(), "\n");
     };
     ;
-    HelpersProcess.prototype.waitForMessegeInStdout = function (proc, message) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var resolved = false;
-                        proc.stdout.on('data', function (data) {
-                            // console.log(`
-                            // [waitForMessegeInStdout] data: ${data}
-                            // [waitForMessegeInStdout] data typeof: ${typeof data}
-                            // `);
-                            if (tnp_core_1._.isObject(data) && tnp_core_1._.isFunction(data.toString)) {
-                                data = data.toString();
-                            }
-                            if (tnp_core_1._.isString(data) && data.search(message) !== -1) {
-                                resolved = true;
-                                resolve(void 0);
-                            }
-                        });
-                        proc.once('exit', function () {
-                            // console.log(`
-                            // [waitForMessegeInStdout] exit: ${code}
-                            // `);
-                            if (!resolved) {
-                                reject();
-                            }
-                        });
-                    })];
-            });
-        });
-    };
     HelpersProcess.prototype.prepareWatchCommand = function (cmd) {
         return tnp_core_1.os.platform() === 'win32' ? "\"".concat(cmd, "\"") : "'".concat(cmd, "'");
     };
@@ -372436,6 +372416,7 @@ var Project = /** @class */ (function (_super) {
         //#region @backendFunc
         var that = this;
         var className = typescript_class_helpers_1.CLASS.getName(classFn);
+        // @ts-ignore
         var prefixedName = "__".concat(variableName);
         Object.defineProperty(this, variableName, {
             get: function () {
@@ -372475,10 +372456,12 @@ var Project = /** @class */ (function (_super) {
         return !this.typeIs.apply(this, tslib_1.__spreadArray([], tslib_1.__read(types), false));
     };
     Project.prototype.forEmptyStructure = function () {
+        //#region @backendFunc
         return [
             { relativePath: tnp_config_1.config.file.package_json, includeContent: true },
             { relativePath: tnp_config_1.config.folder.src },
         ];
+        //#endregion
     };
     Project.projects = [];
     /**
@@ -560188,7 +560171,7 @@ var BackendCompilation = /** @class */ (function (_super) {
                         // console.log({ isStandalone, buildOutDir })
                         //#region normal js build
                         // if (watch) {
-                        return [4 /*yield*/, tnp_helpers_1.Helpers.execute(tnp_core_1.child_process.exec(commandJs, { cwd: cwd }), {
+                        return [4 /*yield*/, tnp_helpers_1.Helpers.execute(commandJs, cwd, {
                                 exitOnError: true,
                                 exitOnErrorCallback: function (code) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                     return tslib_1.__generator(this, function (_a) {
@@ -560229,7 +560212,7 @@ var BackendCompilation = /** @class */ (function (_super) {
                         // if (watch) {
                         _a.sent();
                         tnp_helpers_1.Helpers.info("* Typescirpt compilation first part done (".concat(buildOutDir, " build). ").concat(websql ? '[WEBSQL]' : '', " "));
-                        return [4 /*yield*/, tnp_helpers_1.Helpers.execute(tnp_core_1.child_process.exec(commandMaps, { cwd: cwd }), {
+                        return [4 /*yield*/, tnp_helpers_1.Helpers.execute(commandMaps, cwd, {
                                 hideOutput: {
                                     stderr: true,
                                     stdout: true,
@@ -574359,6 +574342,10 @@ var TestRunner = /** @class */ (function (_super) {
                     if (watchMode) {
                         tnp_helpers_1.Helpers.clearConsole();
                         tnp_helpers_1.Helpers.info("Start of testing... for watch mode");
+                        // Helpers.info(`
+                        // Running command: ${command}
+                        // `)
+                        command = tnp_helpers_1.Helpers._fixCommand(command);
                         result = tnp_core_4.child_process.execSync(command, {
                             stdio: ['pipe', 'pipe', 'pipe'],
                             env: tslib_1.__assign(tslib_1.__assign({}, process.env), { FORCE_COLOR: '1' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tnp",
-  "version": "13.1.148",
+  "version": "13.1.149",
   "bin": {
     "tnp": "bin/tnp",
     "tnp-debug": "bin/tnp-debug",
@@ -9,7 +9,7 @@
   "dependencies": {
     "ora": "3.4.0"
   },
-  "lastBuildTagHash": "8c505d824449c649c300475773858600f6c3bddc",
+  "lastBuildTagHash": "1e6edc9105efcbf23dfc00628fa38ea165573ad4",
   "scripts": {
     "activate": "npm i --force && firedev dedupe && npx tsc && firedev link && tnp bd"
   },

package/tmp-environment.json

@@ -559,7 +559,7 @@
       "private": false
     },
     "name": "tnp",
-    "version": "13.1.148",
+    "version": "13.1.149",
     "bin": {
       "tnp": "bin/tnp",
       "tnp-debug": "bin/tnp-debug",
@@ -572,7 +572,7 @@
       "progress": "2.0.3",
       "tnp-db": "~13.1.7"
     },
-    "lastBuildTagHash": "8c505d824449c649c300475773858600f6c3bddc",
+    "lastBuildTagHash": "1e6edc9105efcbf23dfc00628fa38ea165573ad4",
     "scripts": {
       "activate": "npm i --force && firedev dedupe && npx tsc && firedev link && tnp bd"
     },
@@ -804,9 +804,9 @@
     }
   },
   "build": {
-    "number": 2671,
-    "date": "2023-01-09T05:05:16.000Z",
-    "hash": "bd8e5fa227aff4ddff58d169d6cebe216f2d50ab",
+    "number": 2674,
+    "date": "2023-01-09T05:34:11.000Z",
+    "hash": "87404e7819473e93781bdeb23116f1cf203f2889",
     "options": {}
   },
   "currentProjectName": "tnp",
@@ -814,7 +814,7 @@
   "currentProjectLaunchConfiguration": "{\"version\":\"0.2.0\",\"configurations\":[{\"type\":\"node\",\"request\":\"launch\",\"name\":\"Launch Server standalone\",\"program\":\"${workspaceFolder}/run.js\",\"args\":[\"--ENVoverride=%7B%0A%20%20%20%20%22clientProjectName%22%3A%20%22tnp%22%0A%7D\"],\"runtimeArgs\":[\"--nolazy\",\"-r\",\"ts-node/register\",\"--experimental-worker\"]},{\"name\":\"Debugger with ng serve\",\"type\":\"chrome\",\"request\":\"launch\",\"preLaunchTask\":\"Ng Serve\",\"postDebugTask\":\"terminateall\",\"sourceMaps\":true,\"webRoot\":\"${workspaceFolder}\",\"sourceMapPathOverrides\":{\"webpack:/*\":\"${webRoot}/*\",\"/./*\":\"${webRoot}/*\",\"/tmp-src/*\":\"${webRoot}/*\",\"/*\":\"*\",\"/./~/*\":\"${webRoot}/node_modules/*\"}},{\"type\":\"node\",\"request\":\"attach\",\"name\":\"Attach to global cli tool\",\"port\":9229,\"skipFiles\":[\"<node_internals>/**\"]}],\"compounds\":[{\"name\":\"Debug backend/frontend\",\"configurations\":[\"Launch Server standalone\",\"Debugger with ng serve\"]}]}",
   "currentProjectTasksConfiguration": "{\"version\":\"2.0.0\",\"tasks\":[{\"label\":\"terminateall\",\"command\":\"echo ${input:terminate}\",\"type\":\"shell\",\"problemMatcher\":[]},{\"label\":\"Ng Serve\",\"type\":\"shell\",\"command\":\"tnp build\",\"isBackground\":true,\"presentation\":{\"reveal\":\"always\"},\"group\":{\"kind\":\"build\",\"isDefault\":true},\"problemMatcher\":{\"owner\":\"typescript\",\"source\":\"ts\",\"applyTo\":\"closedDocuments\",\"fileLocation\":[\"relative\",\"${cwd}\"],\"pattern\":\"$tsc\",\"background\":{\"activeOnStart\":true,\"beginsPattern\":{\"regexp\":\"(.*?)\"},\"endsPattern\":{\"regexp\":\"Compiled |Failed to compile.\"}}}}],\"inputs\":[{\"id\":\"terminate\",\"type\":\"command\",\"command\":\"workbench.action.tasks.terminate\",\"args\":\"terminateAll\"}]}",
   "currentProjectType": "isomorphic-lib",
-  "currentFrameworkVersion": "13.1.148",
+  "currentFrameworkVersion": "13.1.149",
   "currentProjectIsStrictSite": false,
   "currentProjectIsDependencySite": false,
   "currentProjectIsStatic": false,