@omnia/tooling 7.11.32 → 7.12.1

package/composers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnia/tooling/composers",
-  "version": "7.11.31",
+  "version": "7.12.0-dev.661",
   "description": "Omnia fx events",
   "typings": "./index.d.ts",
   "author": "Omnia Digital Workplace AB",

package/internal-do-not-import-from-here/core.d.ts

@@ -38,7 +38,6 @@ declare function getRegisteredBuildTasks(): Task[];
 declare function getExtensionInfo(): any;
 declare function getTSConfig(): TSConfig;
 declare function getWebpackResolveModules(): Array<string>;
-declare function getWebpackResolveAlias(): Object;
 declare function getEnviromentInfo(): any;
 declare function getConfig(path: any): any;
 declare function loadFile(path: any): any;
@@ -55,4 +54,4 @@ export declare class ResolvablePromise<T> {
     get resolved(): boolean;
     get rejected(): boolean;
 }
-export { registerTSConfig, registerTsNode, getConfig, getExtensionInfo, getEnviromentInfo, registerServeTask, getRegisteredServeTasks, getCleanTasks, registerBuildTask, getRegisteredBuildTasks, registerCleanTask, loadFile, getTSConfig, getWebpackResolveModules, getWebpackResolveAlias };
+export { registerTSConfig, registerTsNode, getConfig, getExtensionInfo, getEnviromentInfo, registerServeTask, getRegisteredServeTasks, getCleanTasks, registerBuildTask, getRegisteredBuildTasks, registerCleanTask, loadFile, getTSConfig, getWebpackResolveModules };

package/internal-do-not-import-from-here/core.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWebpackResolveAlias = exports.getWebpackResolveModules = exports.getTSConfig = exports.loadFile = exports.registerCleanTask = exports.getRegisteredBuildTasks = exports.registerBuildTask = exports.getCleanTasks = exports.getRegisteredServeTasks = exports.registerServeTask = exports.getEnviromentInfo = exports.getExtensionInfo = exports.getConfig = exports.registerTsNode = exports.registerTSConfig = exports.ResolvablePromise = exports.TaskStage = void 0;
+exports.getWebpackResolveModules = exports.getTSConfig = exports.loadFile = exports.registerCleanTask = exports.getRegisteredBuildTasks = exports.registerBuildTask = exports.getCleanTasks = exports.getRegisteredServeTasks = exports.registerServeTask = exports.getEnviromentInfo = exports.getExtensionInfo = exports.getConfig = exports.registerTsNode = exports.registerTSConfig = exports.ResolvablePromise = exports.TaskStage = void 0;
 const tslib_1 = require("tslib");
 var fs = require('fs'), path = require('path');
 const utils = tslib_1.__importStar(require("./utils"));
@@ -21,12 +21,11 @@ var TaskStage;
     TaskStage["AfterGenerateManifestsMetadata"] = "AfterGenerateManifestsMetadata";
 })(TaskStage = exports.TaskStage || (exports.TaskStage = {}));
 ;
-var _registeredServeTasks = [];
-var _registeredBuildTasks = [];
-var _registeredCleanTasks = [];
-var _tsconfig = null;
-var _webpackResolveModules = null;
-var _webpackResolveAlias = null;
+let _registeredServeTasks = [];
+let _registeredBuildTasks = [];
+let _registeredCleanTasks = [];
+let _tsconfig = null;
+let _webpackResolveModules = null;
 function registerServeTask(serveTask) {
     _registeredServeTasks.push(serveTask);
 }
@@ -94,26 +93,6 @@ function getWebpackResolveModules() {
     return _webpackResolveModules;
 }
 exports.getWebpackResolveModules = getWebpackResolveModules;
-function getWebpackResolveAlias() {
-    if (_webpackResolveAlias === null) {
-        _webpackResolveAlias = {};
-        let tsconfigInfo = getTSConfig();
-        if (tsconfigInfo && tsconfigInfo.compilerOptions && tsconfigInfo.compilerOptions.baseUrl && tsconfigInfo.compilerOptions.paths) {
-            Object.keys(tsconfigInfo.compilerOptions.paths).forEach(path => {
-                if (path === "*") {
-                    throw new Error(`Error, tsconfig.json -> tooling not support config path format '*':  ${path} : ${tsconfigInfo.compilerOptions.paths[path]}`);
-                }
-                if (tsconfigInfo.compilerOptions.paths[path].length > 1) {
-                    throw new Error(`Error, tsconfig.json -> tooling not support multiple paths in array: ${path} : ${tsconfigInfo.compilerOptions.paths[path]}`);
-                }
-                let alias = path.indexOf("/*") > -1 ? path.replace("/*", "") : path + "$";
-                _webpackResolveAlias[alias] = utils.root(`${tsconfigInfo.compilerOptions.baseUrl}/${tsconfigInfo.compilerOptions.paths[path][0].replace("/*", "").replace("*", "")}`);
-            });
-        }
-    }
-    return _webpackResolveAlias;
-}
-exports.getWebpackResolveAlias = getWebpackResolveAlias;
 function getEnviromentInfo() {
     var result = {};
     var filePath = utils.root('environment.json');

package/internal-do-not-import-from-here/index.js

@@ -16,7 +16,7 @@ const TYPESCRIPT_VERSION = '4.9.4';
 const argv = (0, minimist_1.default)(process.argv.slice(2));
 const command = argv._[0];
 const path = require('path'), semver = require("semver"), fs = require('fs'), processPath = process.cwd().replace(/\\/g, "/"), nodeSupportedVersion = '>=12.18.4';
-var isExtensionEnv = fs.existsSync(process.cwd() + "/node_modules/@omnia/tooling/package.json");
+var isOmniaNpm = fs.existsSync(process.cwd() + "/node_modules/@omnia/tooling/package.json");
 function validateNodeSupportVersion() {
     if (!semver.satisfies(process.version, nodeSupportedVersion)) {
         throw new Error(`Your dev environment is running NodeJS version ${process.version} which does`
@@ -41,7 +41,7 @@ function triggerBuild(cb) {
 }
 function loadTasks() {
     var scanTasks = [];
-    if (!isExtensionEnv) {
+    if (!isOmniaNpm) {
         utils.getDirectories(path.resolve(__dirname, "..")).forEach(name => {
             scanTasks.push(path.resolve(__dirname, "..") + "/" + name + "/task");
         });
@@ -86,7 +86,7 @@ function initTasks() {
 }
 function build(cb) {
     printLogo();
-    if (isExtensionEnv) {
+    if (isOmniaNpm) {
         console.log(chalk_1.default.cyan(`Version ${require('@omnia/tooling/package.json').version}`));
     }
     initTasks();
@@ -97,7 +97,7 @@ function clean(greeting = true) {
     return new Promise((resolve, reject) => {
         if (greeting) {
             printLogo();
-            if (isExtensionEnv) {
+            if (isOmniaNpm) {
                 console.log(chalk_1.default.cyan(`Version ${require('@omnia/tooling/package.json').version}`));
             }
         }
@@ -112,7 +112,7 @@ function clean(greeting = true) {
 exports.clean = clean;
 function serve() {
     printLogo();
-    if (isExtensionEnv) {
+    if (isOmniaNpm) {
         console.log(chalk_1.default.cyan(`Version ${require('@omnia/tooling/package.json').version}`));
     }
     utils.log('Creating hosting...');
@@ -138,7 +138,7 @@ Build System
 }
 function help() {
     printLogo();
-    if (isExtensionEnv) {
+    if (isOmniaNpm) {
         console.log(chalk_1.default.cyan(`Version ${require('@omnia/tooling/package.json').version}`));
     }
     console.log(chalk_1.default.cyan(`

package/internal-do-not-import-from-here/utils.d.ts

@@ -13,6 +13,7 @@ declare function root(args: any): any;
 */
 export declare function generateGuid(): string;
 declare function isValidGuid(value: any): boolean;
+declare function extractGuid(value: string): string;
 declare function isNull(obj: any): boolean;
 declare function isNullOrEmpty(obj: any): boolean;
 declare function getDirectories(path: any): any;
@@ -22,4 +23,4 @@ declare function log(message: any, type?: LogTypes, writeToClient?: boolean): vo
 declare function logTime(message: string, start: number): void;
 declare function registerLogToClient(handler: (message: string, logType?: LogTypes) => void): void;
 declare function ensureTraillingSlash(path: string): string;
-export { ensureTraillingSlash, registerLogToClient, rewriteFile, getCurrentDateTime, timeWatch, root, isValidGuid, isNull, isNullOrEmpty, getDirectories, getGuidValue, getFileName, logTime, log, LogTypes };
+export { ensureTraillingSlash, registerLogToClient, rewriteFile, getCurrentDateTime, timeWatch, extractGuid, root, isValidGuid, isNull, isNullOrEmpty, getDirectories, getGuidValue, getFileName, logTime, log, LogTypes };

package/internal-do-not-import-from-here/utils.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogTypes = exports.log = exports.logTime = exports.getFileName = exports.getGuidValue = exports.getDirectories = exports.isNullOrEmpty = exports.isNull = exports.isValidGuid = exports.root = exports.timeWatch = exports.getCurrentDateTime = exports.rewriteFile = exports.registerLogToClient = exports.ensureTraillingSlash = exports.generateGuid = void 0;
+exports.LogTypes = exports.log = exports.logTime = exports.getFileName = exports.getGuidValue = exports.getDirectories = exports.isNullOrEmpty = exports.isNull = exports.isValidGuid = exports.root = exports.extractGuid = exports.timeWatch = exports.getCurrentDateTime = exports.rewriteFile = exports.registerLogToClient = exports.ensureTraillingSlash = exports.generateGuid = void 0;
 let path = require('path'), fs = require('fs'), timestamp = require('console-timestamp'), chalk = require('chalk'), _timer = {};
 let _logToClientHandler = null;
 var LogTypes;
@@ -110,6 +110,15 @@ function isValidGuid(value) {
     return false;
 }
 exports.isValidGuid = isValidGuid;
+function extractGuid(value) {
+    if (value) {
+        const matchs = value.match(/([A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12})/i);
+        if (matchs)
+            return matchs[0];
+    }
+    return null;
+}
+exports.extractGuid = extractGuid;
 function isNull(obj) {
     if (obj === 0 || obj === false)
         return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling",
   "license": "SEE LICENSE IN LICENSE.txt",
-  "version": "7.11.32",
+  "version": "7.12.1",
   "description": "Provide basic stuffs extensible for omnia extension.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -26,7 +26,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@omnia/types": "7.11.32",
+    "@omnia/types": "7.12.1",
     "tslib": "2.3.1",
     "typescript": "4.9.4",
     "semver": "6.3.1",