lucid-package 0.0.68 → 0.0.69

package/package.json

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

package/src/cors.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corsAllowLucid = void 0;
 function corsAllowLucid(req, res, next) {
-    var _a, _b;
-    if ((_b = (_a = req.headers) === null || _a === void 0 ? void 0 : _a.origin) === null || _b === void 0 ? void 0 : _b.match(/.lucid(dev|staging|preprod|).app$/)) {
+    if (req.headers?.origin?.match(/.lucid(dev|staging|preprod|).app$/)) {
         res.header('Access-Control-Allow-Origin', req.headers.origin);
         res.header('Vary', 'Origin');
         res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');

package/src/editorextension.js

@@ -101,8 +101,7 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
     const app = express();
     app.use(cors_1.corsAllowLucid);
     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];
+        const name = req.params['name'] ?? extensionNames[0];
         const directory = await getExtensionCodeDirectoryName(name);
         //Give it several seconds for the extension to finish generating before failing.
         const before = Date.now();
@@ -112,19 +111,16 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
         res.send((await fs.readFile(`editorextensions/${directory}/bin/extension.js`)).toString());
     });
     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 name = req.params['name'] ?? extensionNames[0];
         const manifest = await (0, packagemanifest_1.readManifest)('local');
-        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));
+        res.send(JSON.stringify(manifest['extensions']?.find((extension) => extension['name'] === name)?.scopes));
     });
     app.get('/packageId', async (req, res) => {
-        var _a;
         const manifest = await (0, packagemanifest_1.readManifest)('local');
-        res.send((_a = manifest['id']) !== null && _a !== void 0 ? _a : '__local__');
+        res.send(manifest['id'] ?? '__local__');
     });
     app.get(['/editorextension', '/editorextension/:name'], async (req, res) => {
-        var _a;
-        const name = (_a = req.params['name']) !== null && _a !== void 0 ? _a : extensionNames[0];
+        const name = req.params['name'] ?? extensionNames[0];
         const rawExtension = await getRawEditorExtension(name, port);
         res.send(rawExtension);
     });
@@ -132,9 +128,8 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
         res.send(await Promise.all(extensionNames.map((name) => getRawEditorExtension(name, port))));
     });
     app.get('/settings', async (req, res) => {
-        var _a;
         const manifest = await (0, packagemanifest_1.readManifest)('local');
-        const settings = (_a = manifest.settings) !== null && _a !== void 0 ? _a : [];
+        const settings = manifest.settings ?? [];
         res.send(JSON.stringify(settings.map((setting, index) => {
             return {
                 'Id': '__local__' + index,
@@ -148,11 +143,10 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
         })));
     });
     app.get('/dataConnector/:name', async (req, res) => {
-        var _a;
         const name = req.params['name'];
         if (name) {
             const manifest = await (0, packagemanifest_1.readManifest)('local');
-            const connector = (_a = manifest['dataConnectors']) === null || _a === void 0 ? void 0 : _a.find((one) => one.name === name);
+            const connector = manifest['dataConnectors']?.find((one) => one.name === name);
             if (connector) {
                 res.send(JSON.stringify(connector));
             }
@@ -165,14 +159,13 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
         }
     });
     app.get('/oauthCredentials/:name', async (req, res) => {
-        var _a;
         const name = req.params['name'];
         if (name) {
             const manifest = await (0, packagemanifest_1.readManifest)('local');
-            const provider = (_a = manifest['oauthProviders']) === null || _a === void 0 ? void 0 : _a.find((one) => one.name === name);
+            const provider = manifest['oauthProviders']?.find((one) => one.name === name);
             if (provider && oldFs.existsSync(`${name}.credentials.local`)) {
                 const credentials = JSON.parse((await fs.readFile(`${name}.credentials.local`)).toString());
-                res.send(JSON.stringify(Object.assign(Object.assign({}, provider), credentials)));
+                res.send(JSON.stringify({ ...provider, ...credentials }));
             }
             else {
                 res.sendStatus(404);
@@ -208,9 +201,8 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
 }
 exports.debugEditorExtension = debugEditorExtension;
 async function getExtensionManifest(name) {
-    var _a;
     const manifest = await (0, packagemanifest_1.readManifest)('local');
-    return { manifest, extensionManifest: (_a = manifest['extensions']) === null || _a === void 0 ? void 0 : _a.find((one) => one['name'] === name) };
+    return { manifest, extensionManifest: manifest['extensions']?.find((one) => one['name'] === name) };
 }
 /**
  * We allow the creation of editor extensions that use the same code as a different editor extension in the same
@@ -219,40 +211,37 @@ async function getExtensionManifest(name) {
  * the same codePath for the chart extension as the spark extension.
  */
 async function getExtensionCodeDirectoryName(name) {
-    var _a;
     const extensionManifest = (await getExtensionManifest(name)).extensionManifest;
-    const codePath = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['codePath'];
-    return codePath ? (_a = (await getExtensionCodeDirectoryNameFromCodePath(codePath))) !== null && _a !== void 0 ? _a : name : name;
+    const codePath = extensionManifest?.['codePath'];
+    return codePath ? (await getExtensionCodeDirectoryNameFromCodePath(codePath)) ?? name : name;
 }
 /**
  * Our codePath has the form '/editorextensions/{extensionName}/bin/extension.js'. This function returns the
  * extensionName.
  */
 async function getExtensionCodeDirectoryNameFromCodePath(codePath) {
-    var _a;
-    const parts = (_a = codePath.split('/')) !== null && _a !== void 0 ? _a : [];
+    const parts = codePath.split('/') ?? [];
     if (parts[0] === 'editorextensions' && parts[1]) {
         return `${parts[1]}`;
     }
     return undefined;
 }
 async function getRawEditorExtension(name, port) {
-    var _a, _b, _c;
     const { manifest, extensionManifest } = await getExtensionManifest(name);
-    const codePath = extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['codePath'];
-    const directory = codePath ? (_a = (await getExtensionCodeDirectoryNameFromCodePath(codePath))) !== null && _a !== void 0 ? _a : name : name;
+    const codePath = extensionManifest?.['codePath'];
+    const directory = codePath ? (await getExtensionCodeDirectoryNameFromCodePath(codePath)) ?? name : name;
     const products = extensionManifest
         ? getExtensionProducts(extensionManifest['product'], extensionManifest['products'])
         : [supportedproduct_1.SupportedProduct.Chart];
     return {
         id: '__local__',
-        packageId: (_b = manifest['id']) !== null && _b !== void 0 ? _b : '__local__',
+        packageId: manifest['id'] ?? '__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',
+        title: extensionManifest?.['title'] ?? 'Local dev extension',
         products: products,
-        scopes: extensionManifest === null || extensionManifest === void 0 ? void 0 : extensionManifest['scopes'],
+        scopes: extensionManifest?.['scopes'],
         codeUrl: `http://localhost:${port}/editorextension/${directory}/extension.js`,
     };
 }

package/src/index.js

@@ -6,7 +6,6 @@ const package_1 = require("./package");
 const shapelibrary_1 = require("./shapelibrary");
 class LucidSuiteExtensionCLI {
     async run(args) {
-        var _a, _b;
         const parser = new argparse_1.ArgumentParser({
             description: 'Create and manage Lucid extension packages',
         });
@@ -167,8 +166,8 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'create-image-shape-library':
                 if ((0, package_1.currentlyInPackage)()) {
-                    const width = (_a = Number(parsed['width'])) !== null && _a !== void 0 ? _a : undefined;
-                    const height = (_b = Number(parsed['height'])) !== null && _b !== void 0 ? _b : undefined;
+                    const width = Number(parsed['width']) ?? undefined;
+                    const height = Number(parsed['height']) ?? undefined;
                     const config = {
                         width: width,
                         height: height,

package/src/shapelibrary.js

@@ -139,7 +139,6 @@ async function getShapeListJson(name, packagePath, port = 9901) {
     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, _c, _d;
         const rawShapeData = await fs.readFile(packagePath + `/shapelibraries/${name}/shapes/${shapeManifest['shape']}.shape`);
         const shapeData = hjson.parse(rawShapeData.toString());
         let shapeName = shapeManifest['key'];
@@ -170,7 +169,7 @@ async function getShapeListJson(name, packagePath, port = 9901) {
                 'i18n': {},
                 'locked': shapeData['locked'],
                 'sourcePackage': {
-                    'packageId': (_a = packageManifest['id']) !== null && _a !== void 0 ? _a : '__local__',
+                    'packageId': packageManifest['id'] ?? '__local__',
                     'version': packageManifest['version'],
                     'library': name,
                     'shape': shapeManifest['shape'],
@@ -208,13 +207,13 @@ async function getShapeListJson(name, packagePath, port = 9901) {
         }
         for (var key in shapeManifest['defaults']) {
             if (key !== 'width' && key !== 'height') {
-                const outName = (_b = defaultNameMap.get(key)) !== null && _b !== void 0 ? _b : key;
+                const outName = defaultNameMap.get(key) ?? key;
                 properties[outName] = shapeManifest['defaults'][key];
             }
         }
-        if (((_c = shapeData['locked']) === null || _c === void 0 ? void 0 : _c.includes('aspectRatio')) && !properties['AspectRatio']) {
+        if (shapeData['locked']?.includes('aspectRatio') && !properties['AspectRatio']) {
             properties['AspectRatio'] =
-                (_d = shapeManifest['defaults']['width'] / shapeManifest['defaults']['height']) !== null && _d !== void 0 ? _d : 1;
+                shapeManifest['defaults']['width'] / shapeManifest['defaults']['height'] ?? 1;
         }
         return {
             'class': 'CustomBlock',
@@ -263,9 +262,8 @@ async function debugShapeLibraries(packagePath = '.', pickAnyPort = false) {
     //shape library, the toolbox doesn't update.
     let shapeLibraryVersion = Date.now();
     app.get('/shapeLibraries', async (req, res) => {
-        var _a;
         const manifest = await (0, packagemanifest_1.readManifest)('local', packagePath + '/');
-        const libraries = (_a = manifest['shapeLibraries']) !== null && _a !== void 0 ? _a : [];
+        const libraries = manifest['shapeLibraries'] ?? [];
         const output = await Promise.all(libraries.map(async (libraryManifest) => {
             const libraryDefinitionContent = await fs.readFile(packagePath + '/shapelibraries/' + libraryManifest['name'] + '/library.manifest');
             const libraryDefinition = JSON.parse(libraryDefinitionContent.toString());