lucid-package 0.0.91 → 0.0.93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.91",
+    "version": "0.0.93",
     "description": "",
     "main": "index.js",
     "bin": {
@@ -26,6 +26,7 @@
         "@inquirer/input": "^1.2.14",
         "@inquirer/select": "^1.3.1",
         "argparse": "^2.0.1",
+        "chalk": "4.1.2",
         "chokidar": "^3.5.3",
         "express": "^4.17.1",
         "hjson": "^3.2.2",

package/src/angularframeworkutils.js

@@ -6,13 +6,14 @@ const path = require("path");
 const editorextension_1 = require("./editorextension");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
+const theme_1 = require("./theme");
 async function createAngularEditorExtension(name, isInternalTesting, skipSDKDependency) {
     await (0, editorextension_1.createEditorExtension)(name, isInternalTesting, skipSDKDependency, path.join('angular', 'skeleton'), [
         'webpack-shell-plugin-next',
     ]);
     const angularProjectName = name;
     const angularEditorExtensionTargetFolder = path.join(process.cwd(), angularProjectName);
-    console.log('Creating Angular project in ' + angularEditorExtensionTargetFolder);
+    console.log((0, theme_1.success)('Creating Angular project in ' + angularEditorExtensionTargetFolder));
     (0, installationutil_1.installAngularProject)(angularProjectName);
     const webpackConfig = (await fs.readFile('webpack.config.js', 'utf8')).replace('<<dynamicname>>', angularProjectName);
     const extensionTemplateCode = (await fs.readFile(path.join('src', 'extension.ts'), 'utf8')).replace('<<dynamicname>>', angularProjectName);

package/src/dataconnector.js

@@ -5,8 +5,9 @@ const path = require("path");
 const filesystemutil_1 = require("./filesystemutil");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
+const theme_1 = require("./theme");
 async function createDataConnector(name, isInternalTesting, skipSDKDependency) {
-    console.log('Creating data connector in dataconnectors/' + name);
+    console.log((0, theme_1.success)('Creating data connector in dataconnectors/' + name));
     const source = path.join(__dirname, '..', 'templates', 'dataconnector');
     const targetFolder = path.join('dataconnectors', name);
     (0, filesystemutil_1.copyFolderRecursiveSync)(source, targetFolder);

package/src/editorextension.d.ts

@@ -17,3 +17,4 @@ export declare function watchEditorExtension(name: string, isInternalTesting: bo
  * @param quiet If true, will only show errors in output
  */
 export declare function debugEditorExtension(extensionNames: string[], isInternalTesting: boolean, quiet?: boolean, pickAnyPort?: boolean): Promise<void>;
+export declare function getAllExtensionNames(): Promise<string[]>;

package/src/editorextension.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugEditorExtension = exports.watchEditorExtension = exports.updateExtensionSDK = exports.buildEditorExtension = exports.createEditorExtension = void 0;
+exports.getAllExtensionNames = exports.debugEditorExtension = exports.watchEditorExtension = exports.updateExtensionSDK = exports.buildEditorExtension = exports.createEditorExtension = void 0;
 const express = require("express");
 const oldFs = require("fs");
 const fs = require("fs/promises");
@@ -13,6 +13,8 @@ const packagemanifest_1 = require("./packagemanifest");
 const shapelibrary_1 = require("./shapelibrary");
 const shellutil_1 = require("./shellutil");
 const supportedproduct_1 = require("./supportedproduct");
+const child_process_1 = require("child_process");
+const theme_1 = require("./theme");
 const webpack = require('webpack');
 const WebPackCLI = require('webpack-cli');
 const ws = require('ws');
@@ -23,7 +25,7 @@ async function createEditorExtension(name, isInternalTesting, skipSDKDependency,
     const publicSource = path.join(__dirname, '..', 'templates', 'public');
     const publicTargetFolder = 'public';
     const codePath = path.join('editorextensions', name, 'bin', 'extension.js');
-    console.log('Creating empty editor extension in ' + editorExtensionTargetFolder);
+    console.log((0, theme_1.success)('Creating empty editor extension in ' + editorExtensionTargetFolder));
     (0, filesystemutil_1.copyFolderRecursiveSync)(editorExtensionSource, editorExtensionTargetFolder);
     (0, filesystemutil_1.copyFolderRecursiveSync)(publicSource, publicTargetFolder);
     await (0, package_1.modifyManifest)((manifest) => {
@@ -54,7 +56,7 @@ exports.buildEditorExtension = buildEditorExtension;
 async function updateExtensionSDK(name) {
     const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
-    console.log('Installing latest SDK in extension ' + name);
+    console.log((0, theme_1.success)('Installing latest SDK in extension ' + name));
     console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install lucid-extension-sdk@latest').toString());
 }
 exports.updateExtensionSDK = updateExtensionSDK;
@@ -91,6 +93,7 @@ exports.watchEditorExtension = watchEditorExtension;
 async function debugEditorExtension(extensionNames, isInternalTesting, quiet = false, pickAnyPort = false) {
     const port = 9900;
     const watchers = await Promise.all(extensionNames.map(async (name) => watchEditorExtension(name, isInternalTesting, quiet)));
+    startCustomUIServers(extensionNames);
     const app = express();
     const server = listen(app, port, pickAnyPort);
     setupWebSockets(server);
@@ -203,7 +206,7 @@ exports.debugEditorExtension = debugEditorExtension;
 function listen(app, port, pickAnyPort) {
     return app
         .listen(port, 'localhost', () => {
-        console.log('Listening at http://localhost:' + port + '/extension.js');
+        console.log((0, theme_1.success)('Listening at http://localhost:' + port + '/extension.js'));
         (0, shapelibrary_1.debugShapeLibraries)(undefined, pickAnyPort);
     })
         .on('error', (err) => {
@@ -309,3 +312,53 @@ function getExtensionProducts(product, products) {
     }
     throw new Error('Either "product" or "products" must be spcified for the editor extension in the package manifest');
 }
+async function getAllExtensionNames() {
+    const manifest = await (0, packagemanifest_1.readManifest)('local');
+    if (manifest.extensions) {
+        return manifest.extensions.map(extn => extn.name);
+    }
+    else {
+        return [];
+    }
+}
+exports.getAllExtensionNames = getAllExtensionNames;
+async function startCustomUIServers(extensionNames) {
+    for (let extensionName of extensionNames) {
+        const extensionCodePath = path.resolve(path.join('editorextensions', await getExtensionCodeDirectoryName(extensionName)));
+        const potentialCustomUIServer = (await fs.readdir(extensionCodePath, { withFileTypes: true })).filter(dirent => dirent.isDirectory()).map(dirent => path.join(extensionCodePath, dirent.name));
+        for (let potentialPaths of potentialCustomUIServer) {
+            runNpmStartIfExists(potentialPaths);
+        }
+    }
+}
+async function runNpmStartIfExists(directoryPath) {
+    try {
+        // Read the package.json file
+        const packageJsonPath = path.join(directoryPath, 'package.json');
+        if (oldFs.existsSync(packageJsonPath)) {
+            const packageJson = await fs.readFile(packageJsonPath, 'utf-8');
+            const packageData = JSON.parse(packageJson);
+            // Check if package.json has "scripts" object and it contains "start"
+            if (packageData && packageData.scripts && packageData.scripts.start) {
+                console.log((0, theme_1.success)(`Found npm start script in ${directoryPath}.`));
+                // Execute npm start
+                const npmStart = (0, child_process_1.spawn)('npm', ['start'], { cwd: directoryPath, stdio: ['inherit', 'pipe', 'pipe'] });
+                npmStart.stdout.on('data', (data) => {
+                    process.stdout.write(data);
+                });
+                npmStart.stderr.on('data', (data) => {
+                    process.stderr.write(data);
+                });
+                npmStart.on('exit', (code) => {
+                    console.log(`npm start process exited with code ${code}`);
+                });
+            }
+            else {
+                console.log(`No npm start script found in ${directoryPath}.`);
+            }
+        }
+    }
+    catch (error) {
+        console.error(error(`Error occurred: ${error.message}`));
+    }
+}

package/src/index.js

@@ -219,6 +219,9 @@ class LucidSuiteExtensionCLI {
                             await (0, shapelibrary_1.debugShapeLibraries)();
                             break;
                         case 'test-editor-extension':
+                            if (parsed['name'].length === 0) {
+                                parsed['name'] = await (0, editorextension_1.getAllExtensionNames)();
+                            }
                             await (0, editorextension_1.debugEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet'], parsed['anyport']);
                             break;
                         case 'watch-editor-extension':

package/src/installationutil.js

@@ -4,6 +4,7 @@ exports.installAngularProject = exports.installReactProject = exports.installDep
 const oldFs = require("fs");
 const path = require("path");
 const shellutil_1 = require("./shellutil");
+const theme_1 = require("./theme");
 function installDependenciesIfNeeded(isInternalTesting, skipSDKDependency = false, additionalDependencies = []) {
     if (!oldFs.existsSync('node_modules')) {
         console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --silent').toString());
@@ -14,7 +15,7 @@ function installDependenciesIfNeeded(isInternalTesting, skipSDKDependency = fals
         oldFs.rmSync(sdkDir, { recursive: true, force: true });
     }
     else if (!oldFs.existsSync(sdkDir) && !skipSDKDependency) {
-        console.log('Adding dependency on SDK');
+        console.log((0, theme_1.success)('Adding dependency on SDK'));
         console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --save lucid-extension-sdk').toString());
     }
     if (additionalDependencies.length) {

package/src/package.js

@@ -11,8 +11,9 @@ const filesystemutil_1 = require("./filesystemutil");
 const packagemanifest_1 = require("./packagemanifest");
 const shapelibrary_1 = require("./shapelibrary");
 const shellutil_1 = require("./shellutil");
+const theme_1 = require("./theme");
 async function createEmptyPackage(root) {
-    console.log('Creating Lucid Suite package in ' + root);
+    console.log((0, theme_1.success)('Creating Lucid Suite package in ' + root));
     const source = path.join(__dirname, '..', 'templates', 'package');
     (0, filesystemutil_1.copyFolderRecursiveSync)(source, root);
 }
@@ -81,7 +82,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
             const parts = extension['codePath'].split(path.sep);
             if (parts[0] === 'editorextensions') {
                 //Can't just call the method, as the WebpackCLI class does process.exit(2) :facepalm:
-                console.log(`Compiling editor extension ${parts[1]}`);
+                console.log((0, theme_1.success)(`Compiling editor extension ${parts[1]}`));
                 // Quotes are needed around every use of a path to deal with spaces
                 const cmd = '"' +
                     process.argv[0] +
@@ -101,7 +102,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
         for (const library of manifest['shapeLibraries'] || []) {
             const parts = library['lcszPath'].split(path.sep);
             if (parts[0] === 'shapelibraries') {
-                console.log(`Building shape library ${parts[1]}`);
+                console.log((0, theme_1.success)(`Building shape library ${parts[1]}`));
                 await (0, shapelibrary_1.buildShapeLibrary)(parts[1].replace('.lcsz', ''));
             }
             zip.file(library['lcszPath'], await fs.readFile(library['lcszPath']));
@@ -143,7 +144,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
             compression: 'DEFLATE',
             compressionOptions: { level: 9 },
         });
-        console.log('Writing file package.zip');
+        console.log((0, theme_1.success)('Writing file package.zip'));
         const fileName = `package${manifestOverrideEnv ? `-${manifestOverrideEnv}` : ''}.zip`;
         await fs.writeFile(fileName, zipBytes);
     }, manifestOverrideEnv);

package/src/reactframeworkutils.js

@@ -6,6 +6,7 @@ const path = require("path");
 const editorextension_1 = require("./editorextension");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
+const theme_1 = require("./theme");
 async function createReactEditorExtension(name, flavor, isInternalTesting, skipSDKDependency) {
     await (0, editorextension_1.createEditorExtension)(name, isInternalTesting, skipSDKDependency, path.join('react', 'skeleton'), [
         'webpack-shell-plugin-next',
@@ -18,13 +19,13 @@ async function createReactEditorExtension(name, flavor, isInternalTesting, skipS
         typescript = true;
     }
     else {
-        console.log('Unexpected flavor type');
+        console.log((0, theme_1.error)('Unexpected flavor type'));
         return;
     }
     const reactProjectName = name;
     const reactEditorExtensionTargetFolder = path.join(process.cwd(), reactProjectName);
     const publicTargetFolder = path.join(process.cwd(), '..', '..', 'public');
-    console.log('Creating React project in ' + reactEditorExtensionTargetFolder);
+    console.log((0, theme_1.success)('Creating React project in ' + reactEditorExtensionTargetFolder));
     (0, installationutil_1.installReactProject)(reactProjectName, typescript);
     await fs.mkdir(path.join(publicTargetFolder, name));
     await copyFilesTo(path.join(reactEditorExtensionTargetFolder, 'public'), path.join(publicTargetFolder, name), [

package/src/shapelibrary.js

@@ -10,6 +10,7 @@ const cors_1 = require("./cors");
 const filesystemutil_1 = require("./filesystemutil");
 const package_1 = require("./package");
 const packagemanifest_1 = require("./packagemanifest");
+const theme_1 = require("./theme");
 const hjson = require('hjson');
 const ws = require('ws');
 const chokidar = require('chokidar');
@@ -17,7 +18,7 @@ const sizeOf = require('image-size');
 async function createEmptyShapeLibrary(name) {
     const source = path.join(__dirname, '..', 'templates', 'shapelibrary');
     const targetFolder = path.join('shapelibraries', name);
-    console.log('Creating shape library in ' + targetFolder);
+    console.log((0, theme_1.success)('Creating shape library in ' + targetFolder));
     (0, filesystemutil_1.copyFolderRecursiveSync)(source, targetFolder);
     await (0, package_1.modifyManifest)((manifest) => {
         if (!manifest['shapeLibraries']) {
@@ -32,7 +33,7 @@ async function createEmptyShapeLibrary(name) {
 }
 exports.createEmptyShapeLibrary = createEmptyShapeLibrary;
 async function createImageShapeLibrary(name, imagePath, config) {
-    console.log('Creating image shape library in ' + path.join('shapelibraries', name));
+    console.log((0, theme_1.success)('Creating image shape library in ' + path.join('shapelibraries', name)));
     if (!fsSync.lstatSync(imagePath).isDirectory()) {
         console.error('The provided path `' + imagePath + '` is not a folder');
         return;
@@ -58,7 +59,7 @@ async function createImageShapeLibrary(name, imagePath, config) {
                 console.log('dimen of ' + file + ': ' + dimen + ' - ' + JSON.stringify(dimen));
             }
             catch (e) {
-                console.log('No dimensions found for ' + file);
+                console.log((0, theme_1.error)('No dimensions found for ' + file));
             }
         }
         const lockedArray = [];
@@ -249,7 +250,7 @@ async function buildShapeLibrary(name) {
     };
     await addToZip(`shapelibraries/${name}`);
     const zipBytes = await zip.generateAsync({ type: 'uint8array' });
-    console.log(`Writing file ${name}.lcsz`);
+    console.log((0, theme_1.success)(`Writing file ${name}.lcsz`));
     await fs.writeFile(`shapelibraries/${name}.lcsz`, zipBytes);
 }
 exports.buildShapeLibrary = buildShapeLibrary;
@@ -305,7 +306,7 @@ async function debugShapeLibraries(packagePath = '.', pickAnyPort = false) {
     });
     const listen = () => {
         const server = app.listen(port, 'localhost', () => {
-            console.log('Listening at http://localhost:' + port + '/shapeLibraries');
+            console.log((0, theme_1.success)('Listening at http://localhost:' + port + '/shapeLibraries'));
             //Watch for any shape library changes, and inform watchers that they need to refresh them.
             const wss = new ws.Server({ server, path: '/shapeLibraries/changes' });
             const sockets = [];

package/src/shellutil.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execSyncLoggingOutputOnError = void 0;
 const child_process = require("child_process");
+const theme_1 = require("./theme");
 function execSyncLoggingOutputOnError(cmd) {
     try {
         return child_process.execSync(cmd);
     }
     catch (e) {
-        console.log(String(e.stdout));
-        console.error(String(e.stderr));
+        console.log((0, theme_1.error)(String(e.stdout)));
+        console.error((0, theme_1.error)(String(e.stderr)));
         throw e;
     }
 }

package/src/theme.d.ts

@@ -0,0 +1,3 @@
+export declare const error: any;
+export declare const warning: any;
+export declare const success: any;

package/src/theme.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.success = exports.warning = exports.error = void 0;
+const chalk = require("chalk");
+exports.error = chalk.bold.red;
+exports.warning = chalk.hex('#FFA500');
+exports.success = chalk.greenBright;

package/templates/editorextension/angular/skeleton/package.json

@@ -2,7 +2,7 @@
     "devDependencies": {
         "raw-loader": "^4.0.2",
         "ts-loader": "^9.2.6",
-        "typescript": "^4.5.2",
+        "typescript": "^5.1.6",
         "webpack": "^5.64.4"
     }
 }

package/templates/editorextension/react/skeleton/package.json

@@ -2,7 +2,7 @@
     "devDependencies": {
         "raw-loader": "^4.0.2",
         "ts-loader": "^9.2.6",
-        "typescript": "^4.5.2",
+        "typescript": "^5.1.6",
         "webpack": "^5.64.4"
     }
 }

package/templates/package/package.json

@@ -0,0 +1,16 @@
+{
+    "scripts": {
+        "create-editor-extension":"npx lucid-package create-editor-extension",
+        "create-shape-library":"npx lucid-package create-shape-library",
+        "create-data-connector":"npx lucid-package create-data-connector",
+        "create-image-shape-library":"npx lucid-package create-image-shape-library",
+
+        "test-editor-extension":"npx lucid-package test-editor-extension",
+        "test-shape-libraries":"npx lucid-package test-shape-libraries",
+        "test": "npx lucid-package test-editor-extension",
+
+        "start": "npx lucid-package test-editor-extension",
+
+        "bundle":"npx lucid-package bundle"
+       }
+}