@unisphere/cli 1.44.1 → 1.44.3

package/bundler/package/rollup.js

@@ -87,9 +87,9 @@ module.exports = (unisphereConfig) => {
   const projectJson = JSON.parse(fs.readFileSync(projectJsonPath, 'utf8'));
   const sourcePath = projectJson.sourceRoot.replace(/\/src$/, '').split('/');
   if (sourcePath.length !== 3 || sourcePath[0] !== 'unisphere' || sourcePath[1] !== 'packages') {
-    throw new Error('sourcePath follow pattern unisphere/packages/<package-name>')
+    throw new Error('sourcePath must follow pattern unisphere/packages/<package-name>')
   }
-  const outputPath = `../../../dist/${sourcePath.join('/')}`;
+  const outputPath = path.join('..', '..', '..', 'dist', ...sourcePath);
 
 
   return withUnisphere(withNx(

package/bundler/runtime/rollup.js

@@ -56,8 +56,8 @@ const getWithNx = (unisphereConfig) => {
 
   const relativeSourcePath = path.relative(unisphereConfig.cwd, unisphereConfig.workspaceConfiguration.cwd);
 
-  const outputPath = `${relativeSourcePath}/dist/${unisphereConfig.sourcePath.join('/')}`;
-  
+  const outputPath = path.join(relativeSourcePath, 'dist', ...unisphereConfig.sourcePath);
+
   const firstArgument = {
     main: './src/index.ts',
     outputPath,
@@ -80,10 +80,10 @@ const getWithNx = (unisphereConfig) => {
     }),
     ]
   }
-  
+
   if (isDeployingRuntime) {
     const unispherePackagesDistList = getUnispherePackagesDistList(unisphereConfig.workspaceConfiguration.cwd);
-      
+
     secondArgument.unisphere = getUnisphereTSInterceptorsConfig(unispherePackagesDistList);
     return withUnisphere(withNx(
       firstArgument,
@@ -99,8 +99,12 @@ const getWithNx = (unisphereConfig) => {
 
 function getUnispherePackagesDistList(cwd) {
 
-  const folderPattern = path.resolve(cwd, 'dist/unisphere/packages/*');
-  
+  let folderPattern = path.join(cwd, 'dist', 'unisphere', 'packages', '*');
+
+  if (process.platform === 'win32') {
+    console.log('[unisphere] running on Windows');
+    folderPattern = folderPattern.replace(/\//g, '\\');
+  }
   console.log('[unisphere] looking for packages in', folderPattern);  
   const folderPaths = glob.sync(folderPattern);
   const result = [];
@@ -125,24 +129,24 @@ function getUnispherePackagesDistList(cwd) {
 }
 
 const  withUnisphere = (rollupConfig, unispherePackagesDistList) => {
-  
+
     console.log('[unisphere] removing unisphere config used to monkey patch @nw/rollup');
     delete rollupConfig.unisphere;
-  
+
     rollupConfig.onwarn = (warning, warn) => {
       if (warning.code === 'THIS_IS_UNDEFINED') return;
       if (warning.code === 'MODULE_LEVEL_DIRECTIVE') return;
       warn(warning); // this requires Rollup 0.46
     };
-  
+
     rollupConfig.external =  [];
-  
+
     if (isProduction) {
       rollupConfig.output[0].entryFileNames = 'index.esm.js'
     } else {
       rollupConfig.output[0].entryFileNames = 'index.dev.esm.js'
     }
-  
+
     rollupConfig.plugins.push(
       alias({
         entries: unispherePackagesDistList.map(item => {
@@ -162,24 +166,24 @@ const  withUnisphere = (rollupConfig, unispherePackagesDistList) => {
       }),
       isProduction ? terser() : undefined
     );
-  
-  
+
+
     return rollupConfig;
   };
-  
-  
+
+
 
 
 module.exports = (unisphereConfig) => {
 
   console.log('[unisphere] unisphere rollup args before stripping', unisphereConfig);
-  
+
   const workspaceConfiguration = getUnisphereWorkspaceFile(unisphereConfig.cwd);
 
   if (!workspaceConfiguration) {
     throw new Error('the library must be run from the root of the unisphere workspace');
   }
-  
+
   const projectJsonPath = path.join(unisphereConfig.cwd, 'project.json');
 
   const projectJson = JSON.parse(fs.readFileSync(projectJsonPath, 'utf8'));
@@ -190,7 +194,7 @@ module.exports = (unisphereConfig) => {
   if (!pathCheck || sourcePath[0] !== 'unisphere' || sourcePath[1] !== expectedType) {
     throw new Error(`sourcePath must follow pattern unisphere/${expectedType}/<runtime-name>, got ${sourcePath.join('/')}`)
   }
-  
+
   // todo can improve code readability by moving the calculation of the 'outputPath' here instead of in getWithNx
   return getWithNx(
     {
@@ -199,4 +203,4 @@ module.exports = (unisphereConfig) => {
       sourcePath
     }
   );
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisphere/cli",
-  "version": "1.44.1",
+  "version": "1.44.3",
   "bin": {
     "unisphere": "./src/cli.js"
   },

package/src/index.d.ts

@@ -2,3 +2,4 @@ export * from './lib/utils/unisphere/workspace';
 export * from './lib/utils';
 export * from './lib/utils/get-cli-version';
 export * from './lib/utils/unisphere/get-global-file';
+export * from './lib/utils/unisphere/get-widget-name';

package/src/index.js

@@ -5,4 +5,5 @@ tslib_1.__exportStar(require("./lib/utils/unisphere/workspace"), exports);
 tslib_1.__exportStar(require("./lib/utils"), exports);
 tslib_1.__exportStar(require("./lib/utils/get-cli-version"), exports);
 tslib_1.__exportStar(require("./lib/utils/unisphere/get-global-file"), exports);
+tslib_1.__exportStar(require("./lib/utils/unisphere/get-widget-name"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/unisphere-cli/src/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,sDAA4B;AAC5B,sEAA4C;AAC5C,gFAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/unisphere-cli/src/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,sDAA4B;AAC5B,sEAA4C;AAC5C,gFAAsD;AACtD,gFAAsD"}

package/src/lib/commands/init/command.js

@@ -13,6 +13,7 @@ const colorette_3 = require("colorette");
 const prompts_1 = require("../../utils/prompts/prompts");
 const fs = require("fs");
 const workspace_1 = require("../../utils/unisphere/workspace");
+const build_widget_name_from_workspace_info_1 = require("../../utils/build-widget-name-from-workspace-info");
 const debug = (0, debug_1.default)('unisphere:init');
 const createInitCommand = () => {
     const initCommand = new commander_1.Command('init');
@@ -33,7 +34,7 @@ const createInitCommand = () => {
         if (!workspaceFile) {
             (0, prompts_1.logErrorAndRethrow)(`No .unisphere file found in the widget directory`);
         }
-        const widgetName = `${workspaceFile.config.company}.${workspaceFile.config.type || 'widget'}.${workspaceFile.config.name}`;
+        const widgetName = (0, build_widget_name_from_workspace_info_1.buildWidgetNameFromWorkspaceInfo)(workspaceFile);
         const globalFile = (0, get_global_file_1.getGlobalFile)();
         globalFile.projects[widgetName] = { cwd };
         (0, get_global_file_1.setGlobalFile)(globalFile);

package/src/lib/commands/init/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/init/command.ts"],"names":[],"mappings":";;;;AAAA,yCAAoC;AACpC,6CAAqD;AACrD,mCAAmC;AACnC,iCAA0B;AAC1B,2EAG+C;AAC/C,yCAAuC;AACvC,yCAAiC;AACjC,yCAAgC;AAChC,yDAA2E;AAC3E,yBAAyB;AACzB,+DAAwE;AAExE,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,gBAAgB,CAAC,CAAC;AAE/B,MAAM,iBAAiB,GAAG,GAAY,EAAE;IAC7C,MAAM,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC,CAAC;IAExC,WAAW;SACR,WAAW,CAAC,gCAAgC,CAAC;SAC7C,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,KAAK,CAAC;SAC/C,MAAM,CAAC,cAAc,EAAE,8BAA8B,CAAC;SACtD,IAAI,CAAC,WAAW,EAAE,wBAAgB,CAAC;SACnC,MAAM,CAAC,CAAO,OAAO,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAA,eAAG,EAAC,2BAA2B,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,IAAA,4BAAkB,EAAC,6BAA6B,GAAG,EAAE,CAAC,CAAC;SACxD;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAqB,EAAC,GAAG,EAAE;YACrD,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE;YAClB,IAAA,4BAAkB,EAAC,kDAAkD,CAAC,CAAC;SACxE;QAED,MAAM,UAAU,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,IAChD,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI,QAC/B,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAEhC,MAAM,UAAU,GAAG,IAAA,+BAAa,GAAE,CAAC;QACnC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QAC1C,IAAA,+BAAa,EAAC,UAAU,CAAC,CAAC;QAE1B,OAAO,CAAC,GAAG,CACT,GAAG,IAAA,iBAAK,EAAC,GAAG,CAAC,IAAI,IAAA,gBAAI,EAAC,uBAAuB,UAAU,GAAG,CAAC,IAAI,IAAA,kBAAQ,EACrE,IAAI,CACL,IAAI,IAAA,eAAG,EAAC,GAAG,CAAC,EAAE,CAChB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEL,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAxCW,QAAA,iBAAiB,qBAwC5B"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/init/command.ts"],"names":[],"mappings":";;;;AAAA,yCAAoC;AACpC,6CAAqD;AACrD,mCAAmC;AACnC,iCAA0B;AAC1B,2EAG+C;AAC/C,yCAAuC;AACvC,yCAAiC;AACjC,yCAAgC;AAChC,yDAA2E;AAC3E,yBAAyB;AACzB,+DAAwE;AACxE,6GAAqG;AAErG,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,gBAAgB,CAAC,CAAC;AAE/B,MAAM,iBAAiB,GAAG,GAAY,EAAE;IAC7C,MAAM,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC,CAAC;IAExC,WAAW;SACR,WAAW,CAAC,gCAAgC,CAAC;SAC7C,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,KAAK,CAAC;SAC/C,MAAM,CAAC,cAAc,EAAE,8BAA8B,CAAC;SACtD,IAAI,CAAC,WAAW,EAAE,wBAAgB,CAAC;SACnC,MAAM,CAAC,CAAO,OAAO,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAA,eAAG,EAAC,2BAA2B,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,IAAA,4BAAkB,EAAC,6BAA6B,GAAG,EAAE,CAAC,CAAC;SACxD;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAqB,EAAC,GAAG,EAAE;YACrD,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE;YAClB,IAAA,4BAAkB,EAAC,kDAAkD,CAAC,CAAC;SACxE;QAED,MAAM,UAAU,GAAG,IAAA,wEAAgC,EAAC,aAAa,CAAC,CAAC;QAEnE,MAAM,UAAU,GAAG,IAAA,+BAAa,GAAE,CAAC;QACnC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QAC1C,IAAA,+BAAa,EAAC,UAAU,CAAC,CAAC;QAE1B,OAAO,CAAC,GAAG,CACT,GAAG,IAAA,iBAAK,EAAC,GAAG,CAAC,IAAI,IAAA,gBAAI,EAAC,uBAAuB,UAAU,GAAG,CAAC,IAAI,IAAA,kBAAQ,EACrE,IAAI,CACL,IAAI,IAAA,eAAG,EAAC,GAAG,CAAC,EAAE,CAChB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEL,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAtCW,QAAA,iBAAiB,qBAsC5B"}

package/src/lib/utils/build-widget-name-from-workspace-info.d.ts

@@ -0,0 +1,2 @@
+import { UnisphereWorkspace } from "./unisphere/types";
+export declare const buildWidgetNameFromWorkspaceInfo: (workspaceFile: UnisphereWorkspace) => string;

package/src/lib/utils/build-widget-name-from-workspace-info.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildWidgetNameFromWorkspaceInfo = void 0;
+const buildWidgetNameFromWorkspaceInfo = (workspaceFile) => {
+    return `${workspaceFile.config.company}.${workspaceFile.config.type || 'widget'}.${workspaceFile.config.name}`;
+};
+exports.buildWidgetNameFromWorkspaceInfo = buildWidgetNameFromWorkspaceInfo;
+//# sourceMappingURL=build-widget-name-from-workspace-info.js.map

package/src/lib/utils/build-widget-name-from-workspace-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-widget-name-from-workspace-info.js","sourceRoot":"","sources":["../../../../../../packages/unisphere-cli/src/lib/utils/build-widget-name-from-workspace-info.ts"],"names":[],"mappings":";;;AAEO,MAAM,gCAAgC,GAAG,CAAC,aAAiC,EAAU,EAAE;IAC5F,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,IACpC,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI,QAC/B,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,gCAAgC,oCAI3C"}

package/src/lib/utils/unisphere/get-widget-name.d.ts

@@ -0,0 +1 @@
+export declare const getWidgetName: (cwd: string) => Promise<string>;

package/src/lib/utils/unisphere/get-widget-name.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWidgetName = void 0;
+const tslib_1 = require("tslib");
+const build_widget_name_from_workspace_info_1 = require("../build-widget-name-from-workspace-info");
+const workspace_1 = require("./workspace");
+const getWidgetName = (cwd) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const workspaceFile = yield (0, workspace_1.getUnisphereWorkspace)(cwd, {
+        suspendRecursion: true,
+    });
+    if (!workspaceFile) {
+        throw new Error('No .unisphere file found in the widget directory');
+    }
+    return (0, build_widget_name_from_workspace_info_1.buildWidgetNameFromWorkspaceInfo)(workspaceFile);
+});
+exports.getWidgetName = getWidgetName;
+//# sourceMappingURL=get-widget-name.js.map

package/src/lib/utils/unisphere/get-widget-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-widget-name.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/get-widget-name.ts"],"names":[],"mappings":";;;;AAAI,oGAA4F;AAChG,2CAAoD;AAE7C,MAAM,aAAa,GAAG,CAAO,GAAW,EAAmB,EAAE;IAClE,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAqB,EAAC,GAAG,EAAE;QACrD,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,IAAA,wEAAgC,EAAC,aAAa,CAAC,CAAC;AACzD,CAAC,CAAA,CAAC;AAVW,QAAA,aAAa,iBAUxB"}