lucid-package 0.0.17 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.17",
+    "version": "0.0.21",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/editorextension.d.ts

@@ -1,4 +1,15 @@
 export declare function createEditorExtension(name: string, isInternalTesting: boolean): Promise<void>;
 export declare function buildEditorExtension(name: string, quiet?: boolean): Promise<void>;
 export declare function updateExtensionSDK(name: string): Promise<void>;
-export declare function debugEditorExtension(name: string, quiet?: boolean): Promise<void>;
+/**
+ * Uses webpack to watch for changes in the editor extension
+ * @param name The editor extension name
+ * @param quiet If true, will only show errors in output
+ */
+export declare function watchEditorExtension(name: string, quiet?: boolean): Promise<void>;
+/**
+ * Runs the editor extensions and shape libraries in debug mode, including watching code for changes.
+ * @param extensionNames The names of the editor extensions
+ * @param quiet If true, will only show errors in output
+ */
+export declare function debugEditorExtension(extensionNames: string[], quiet?: boolean): Promise<void>;

package/src/editorextension.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugEditorExtension = exports.updateExtensionSDK = exports.buildEditorExtension = exports.createEditorExtension = void 0;
+exports.debugEditorExtension = exports.watchEditorExtension = exports.updateExtensionSDK = exports.buildEditorExtension = exports.createEditorExtension = void 0;
 const fs = require("fs/promises");
 const oldFs = require("fs");
 const filesystemutil_1 = require("./filesystemutil");
@@ -52,53 +52,85 @@ async function updateExtensionSDK(name) {
     console.log(child_process.execSync('npm install lucid-extension-sdk@latest').toString());
 }
 exports.updateExtensionSDK = updateExtensionSDK;
-async function debugEditorExtension(name, quiet = false) {
-    process.chdir('editorextensions/' + name);
+/**
+ * Uses webpack to watch for changes in the editor extension
+ * @param name The editor extension name
+ * @param quiet If true, will only show errors in output
+ */
+async function watchEditorExtension(name, quiet = false) {
+    process.chdir(`editorextensions/${name}`);
     const cli = new WebPackCLI();
     cli.run(['node', 'webpack', '--watch', ...(quiet ? ['--stats', 'errors-only'] : [])]);
+}
+exports.watchEditorExtension = watchEditorExtension;
+/**
+ * Runs the editor extensions and shape libraries in debug mode, including watching code for changes.
+ * @param extensionNames The names of the editor extensions
+ * @param quiet If true, will only show errors in output
+ */
+async function debugEditorExtension(extensionNames, quiet = false) {
+    await Promise.all(extensionNames.map(async (name) => {
+        const child = child_process.spawn(`${process.argv[0]} ${process.argv[1]} watch-editor-extension ${name} ${quiet ? '--quiet ' : ''}`, {
+            stdio: 'inherit',
+            shell: true,
+        });
+        return child;
+    }));
     const app = express();
     app.use((req, res, next) => {
         res.header('Access-Control-Allow-Origin', '*');
         res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');
         next();
     });
-    app.get('/extension.js', async (req, res) => {
+    app.get(['/extension.js', '/editorextension/:name/extension.js'], async (req, res) => {
+        var _a;
+        const name = (_a = req.params['name']) !== null && _a !== void 0 ? _a : extensionNames[0];
         //Give it several seconds for the extension to finish generating before failing.
         const before = Date.now();
-        while (!oldFs.existsSync('bin/extension.js') && Date.now() - before < 5000) {
+        while (!oldFs.existsSync(`editorextensions/${name}/bin/extension.js`) && Date.now() - before < 5000) {
             await new Promise((resolve) => setTimeout(resolve, 50));
         }
-        res.send((await fs.readFile('bin/extension.js')).toString());
+        res.send((await fs.readFile(`editorextensions/${name}/bin/extension.js`)).toString());
     });
-    app.get('/scopes', async (req, res) => {
-        var _a, _b;
-        const manifest = await (0, packagemanifest_1.readManifest)('../../');
-        res.send(JSON.stringify((_b = (_a = manifest['extensions']) === null || _a === void 0 ? void 0 : _a.find((extension) => extension['name'] === name)) === null || _b === void 0 ? void 0 : _b.scopes));
+    app.get(['/scopes', '/editorextension/:name/scopes'], async (req, res) => {
+        var _a, _b, _c;
+        const name = (_a = req.params['name']) !== null && _a !== void 0 ? _a : extensionNames[0];
+        const manifest = await (0, packagemanifest_1.readManifest)();
+        res.send(JSON.stringify((_c = (_b = manifest['extensions']) === null || _b === void 0 ? void 0 : _b.find((extension) => extension['name'] === name)) === null || _c === void 0 ? void 0 : _c.scopes));
     });
     app.get('/packageId', async (req, res) => {
         var _a;
-        const manifest = await (0, packagemanifest_1.readManifest)('../../');
+        const manifest = await (0, packagemanifest_1.readManifest)();
         res.send((_a = manifest['id']) !== null && _a !== void 0 ? _a : '__local__');
     });
-    app.get('/editorextension', async (req, res) => {
-        var _a, _b, _c, _d;
-        const manifest = await (0, packagemanifest_1.readManifest)('../../');
-        const extensionManifest = (_a = manifest['extensions']) === null || _a === void 0 ? void 0 : _a.find((one) => one['name'] === name);
-        res.send({
-            id: '__local__',
-            packageId: (_b = manifest['id']) !== null && _b !== void 0 ? _b : '__local__',
-            packageVersionId: '__local__',
-            version: manifest['version'],
-            name: name,
-            title: (_c = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['title']) !== null && _c !== void 0 ? _c : 'Local dev extension',
-            product: (_d = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['product']) !== null && _d !== void 0 ? _d : 'chart',
-            scopes: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['scopes'],
-            codeUrl: 'http://localhost:9900/extension.js',
-        });
+    app.get(['/editorextension', '/editorextension/:name'], async (req, res) => {
+        var _a;
+        const name = (_a = req.params['name']) !== null && _a !== void 0 ? _a : extensionNames[0];
+        const rawExtension = await getRawEditorExtension(name);
+        res.send(rawExtension);
+    });
+    app.get('/editorextensions', async (req, res) => {
+        res.send(await Promise.all(extensionNames.map((name) => getRawEditorExtension(name))));
     });
     app.listen(9900, 'localhost', () => {
         console.log('Listening at http://localhost:9900/extension.js');
     });
-    (0, shapelibrary_1.debugShapeLibraries)('../..');
+    (0, shapelibrary_1.debugShapeLibraries)();
 }
 exports.debugEditorExtension = debugEditorExtension;
+async function getRawEditorExtension(name) {
+    var _a, _b, _c, _d;
+    const manifest = await (0, packagemanifest_1.readManifest)();
+    const extensionManifest = (_a = manifest['extensions']) === null || _a === void 0 ? void 0 : _a.find((one) => one['name'] === name);
+    return {
+        id: '__local__',
+        packageId: (_b = manifest['id']) !== null && _b !== void 0 ? _b : '__local__',
+        packageVersionId: '__local__',
+        version: manifest['version'],
+        name: name,
+        title: (_c = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['title']) !== null && _c !== void 0 ? _c : 'Local dev extension',
+        product: (_d = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['product']) !== null && _d !== void 0 ? _d : 'chart',
+        scopes: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['scopes'],
+        codeUrl: `http://localhost:9900/editorextension/${name}/extension.js`,
+    };
+}

package/src/index.js

@@ -46,14 +46,23 @@ class LucidSuiteExtensionCLI {
             help: argparse_1.SUPPRESS,
         });
         const testExtensionParser = subparsers.add_parser('test-editor-extension', {
-            help: 'Compile an editor extension in debug mode, and serve it at localhost:9900, along with any shape libraries in this package at localhost:9901. Watch for changes to the code and recompile as needed',
+            help: 'Compile one or more editor extensions in debug mode, and serve them at localhost:9900, along with any shape libraries in this package at localhost:9901. Watch for changes to the code and recompile as needed',
         });
-        testExtensionParser.add_argument('name');
+        testExtensionParser.add_argument('name', { nargs: '*' });
         testExtensionParser.add_argument('--quiet', {
             default: false,
             action: 'store_true',
             help: argparse_1.SUPPRESS,
         });
+        const watchExtensionParser = subparsers.add_parser('watch-editor-extension', {
+            help: 'Compile an editor extension in debug mode',
+        });
+        watchExtensionParser.add_argument('name');
+        watchExtensionParser.add_argument('--quiet', {
+            default: false,
+            action: 'store_true',
+            help: argparse_1.SUPPRESS,
+        });
         const testShapeLibraries = subparsers.add_parser('test-shape-libraries', {
             help: 'Serve any shape libraries in this package at localhost:9901. Watch for changes to the code and live-update as needed',
         });
@@ -135,6 +144,14 @@ class LucidSuiteExtensionCLI {
                     console.error('Not currently in a Lucid extension package folder');
                 }
                 break;
+            case 'watch-editor-extension':
+                if ((0, package_1.currentlyInPackage)()) {
+                    await (0, editorextension_1.watchEditorExtension)(parsed['name'], parsed['quiet']);
+                }
+                else {
+                    console.error('Not currently in a Lucid extension package folder');
+                }
+                break;
             default:
                 parser.print_help();
         }

package/src/package.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writePackage = exports.updateAllExtensionSDK = exports.modifyManifest = exports.currentlyInPackage = exports.createEmptyPackage = void 0;
-const fs = require("fs/promises");
-const fsOld = require("fs");
-const filesystemutil_1 = require("./filesystemutil");
-const editorextension_1 = require("./editorextension");
 const child_process = require("child_process");
+const fsOld = require("fs");
+const fs = require("fs/promises");
 const JSZip = require("jszip");
-const shapelibrary_1 = require("./shapelibrary");
+const editorextension_1 = require("./editorextension");
+const filesystemutil_1 = require("./filesystemutil");
 const packagemanifest_1 = require("./packagemanifest");
+const shapelibrary_1 = require("./shapelibrary");
 async function createEmptyPackage(root) {
     console.log('Creating empty Lucid Suite package in ' + root);
     (0, filesystemutil_1.copyFolderRecursiveSync)(__dirname + '/../templates/package', root);
@@ -55,12 +55,16 @@ async function writePackage(quiet = false) {
             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]}`);
-                const cmd = process.argv[0] +
-                    ' ' +
+                // Quotes are needed around every use of a path to deal with spaces
+                const cmd = '"' +
+                    process.argv[0] +
+                    '" "' +
                     process.argv[1] +
-                    ' build-editor-extension ' +
+                    '" build-editor-extension ' +
                     (quiet ? '--quiet ' : '') +
-                    parts[1];
+                    '"' +
+                    parts[1] +
+                    '"';
                 console.log(cmd);
                 console.log(child_process.execSync(cmd).toString());
             }

package/src/packagemanifest.js

@@ -72,6 +72,10 @@ function validateManifestOrThrow(manifest) {
             if (!(0, checks_1.isTypedArray)(checks_1.isString)(provider['domainWhitelist'])) {
                 throw new Error('manifest.json: OAuth provider "domainWhitelist" must be a string array');
             }
+            if (provider['clientAuthentication'] !== 'basic' &&
+                provider['clientAuthentication'] !== 'clientParameters') {
+                throw new Error('manifest.json: OAuth provider "clientAuthentication" must be "basic" or "clientParameters"');
+            }
         }
     }
     if (manifest['dataConnectors']) {

package/src/shapelibrary.js

@@ -41,10 +41,21 @@ async function getShapeListJson(name, packagePath) {
     const packageManifest = await (0, packagemanifest_1.readManifest)(packagePath + '/');
     const rawManifest = await fs.readFile(packagePath + `/shapelibraries/${name}/library.manifest`);
     const manifest = hjson.parse(rawManifest.toString());
+    const usedNames = new Set(manifest['shapes'].map((shape) => shape['key']).filter((key) => key !== undefined));
     return JSON.stringify(await Promise.all(manifest['shapes'].map(async (shapeManifest, index) => {
         var _a, _b;
         const rawShapeData = await fs.readFile(packagePath + `/shapelibraries/${name}/shapes/${shapeManifest['shape']}.shape`);
         const shapeData = hjson.parse(rawShapeData.toString());
+        let shapeName = shapeManifest['key'];
+        if (shapeName === undefined) {
+            shapeName = shapeManifest['shape'];
+            let suffixNumber = 1;
+            while (usedNames.has(shapeName)) {
+                suffixNumber++;
+                shapeName = shapeManifest['shape'] + '_' + suffixNumber;
+            }
+            usedNames.add(shapeName);
+        }
         const properties = {
             'Base': { 'x': shapeManifest['defaults']['width'] / 2, 'y': shapeManifest['defaults']['height'] / 2 },
             'BoundingBox': {
@@ -59,13 +70,14 @@ async function getShapeListJson(name, packagePath) {
             },
             'Stencil': {
                 'lcszVersion': '1',
-                'name': shapeManifest['name'],
+                'name': shapeName,
                 'i18n': {},
                 'sourcePackage': {
                     'packageId': (_a = packageManifest['id']) !== null && _a !== void 0 ? _a : '__local__',
                     'version': packageManifest['version'],
                     'library': name,
                     'shape': shapeManifest['shape'],
+                    'name': shapeName,
                 },
             },
         };
@@ -110,7 +122,7 @@ async function getShapeListJson(name, packagePath) {
             'order': index,
             'properties': JSON.stringify(properties),
             'shapeLibrary': 'http://localhost:9901/shapeLibraries/' + encodeURIComponent(name),
-            'uri': `http://localhost:9901/shapeLibraries/${encodeURIComponent(name)}/shapes/${encodeURIComponent(shapeManifest['shape'])}`,
+            'uri': `http://localhost:9901/shapeLibraries/${encodeURIComponent(name)}/shapes/${encodeURIComponent(shapeName)}`,
         };
     })));
 }