lucid-package 0.0.22 → 0.0.25

package/package.json

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

package/src/editorextension.d.ts

@@ -1,12 +1,12 @@
 export declare function createEditorExtension(name: string, isInternalTesting: boolean): Promise<void>;
-export declare function buildEditorExtension(name: string, quiet?: boolean): Promise<void>;
+export declare function buildEditorExtension(name: string, isInternalTesting: boolean, quiet?: boolean): Promise<void>;
 export declare function updateExtensionSDK(name: string): 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>;
+export declare function watchEditorExtension(name: string, isInternalTesting: boolean, 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

package/src/editorextension.js

@@ -10,6 +10,30 @@ const child_process = require("child_process");
 const shapelibrary_1 = require("./shapelibrary");
 const packagemanifest_1 = require("./packagemanifest");
 const WebPackCLI = require('webpack-cli');
+function linkInternalTestingSDK() {
+    if (!oldFs.existsSync('node_modules/lucid-extension-sdk')) {
+        const cwd = process.cwd();
+        const rootSearch = 'lucid/main/extensibility/';
+        const pos = cwd.indexOf(rootSearch);
+        const sdkPath = cwd.substr(0, pos + rootSearch.length) + 'lucid-extension-sdk';
+        console.log('Using symlink for dependency on SDK for internal testing');
+        console.log(child_process.execSync(`ln -s ${sdkPath} node_modules/lucid-extension-sdk`).toString());
+    }
+}
+function installDependenciesIfNeeded(isInternalTesting) {
+    if (!oldFs.existsSync('node_modules')) {
+        console.log(child_process.execSync('npm install --silent').toString());
+    }
+    if (!oldFs.existsSync('node_modules/lucid-extension-sdk')) {
+        if (isInternalTesting) {
+            linkInternalTestingSDK();
+        }
+        else {
+            console.log('Adding dependency on SDK');
+            console.log(child_process.execSync('npm install --save lucid-extension-sdk').toString());
+        }
+    }
+}
 async function createEditorExtension(name, isInternalTesting) {
     console.log('Creating empty editor extension in editorextensions/' + name);
     (0, filesystemutil_1.copyFolderRecursiveSync)(__dirname + '/../templates/editorextension', 'editorextensions/' + name);
@@ -27,21 +51,12 @@ async function createEditorExtension(name, isInternalTesting) {
     });
     console.log(`Installing dependencies`);
     process.chdir('editorextensions/' + name);
-    console.log(child_process.execSync('npm install --silent').toString());
-    if (isInternalTesting) {
-        console.log('Using symlink for dependency on SDK for internal testing');
-        console.log(child_process
-            .execSync('ln -s ../../../../lucid-extension-sdk node_modules/lucid-extension-sdk ')
-            .toString());
-    }
-    else {
-        console.log('Adding dependency on SDK');
-        console.log(child_process.execSync('npm install --save lucid-extension-sdk').toString());
-    }
+    installDependenciesIfNeeded(isInternalTesting);
 }
 exports.createEditorExtension = createEditorExtension;
-async function buildEditorExtension(name, quiet = false) {
+async function buildEditorExtension(name, isInternalTesting, quiet = false) {
     process.chdir('editorextensions/' + name);
+    installDependenciesIfNeeded(isInternalTesting);
     const cli = new WebPackCLI();
     await cli.run(['node', 'webpack', '--mode', 'production', ...(quiet ? ['--stats', 'errors-only'] : [])]);
 }
@@ -57,8 +72,9 @@ exports.updateExtensionSDK = updateExtensionSDK;
  * @param name The editor extension name
  * @param quiet If true, will only show errors in output
  */
-async function watchEditorExtension(name, quiet = false) {
+async function watchEditorExtension(name, isInternalTesting, quiet = false) {
     process.chdir(`editorextensions/${name}`);
+    installDependenciesIfNeeded(isInternalTesting);
     const cli = new WebPackCLI();
     cli.run(['node', 'webpack', '--watch', ...(quiet ? ['--stats', 'errors-only'] : [])]);
 }
@@ -112,6 +128,21 @@ async function debugEditorExtension(extensionNames, quiet = false) {
     app.get('/editorextensions', async (req, res) => {
         res.send(await Promise.all(extensionNames.map((name) => getRawEditorExtension(name))));
     });
+    app.get('/oauthCredentials/:name', async (req, res) => {
+        var _a;
+        const name = req.params['name'];
+        if (name) {
+            const manifest = await (0, packagemanifest_1.readManifest)();
+            const provider = (_a = manifest['oauthProviders']) === null || _a === void 0 ? void 0 : _a.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)));
+            }
+        }
+        else {
+            res.sendStatus(404);
+        }
+    });
     app.listen(9900, 'localhost', () => {
         console.log('Listening at http://localhost:9900/extension.js');
     });

package/src/filesystemutil.js

@@ -18,7 +18,7 @@ function copyFolderRecursiveSync(source, targetFolder) {
     var files = [];
     // Check if folder needs to be created or integrated
     if (!fs.existsSync(targetFolder)) {
-        fs.mkdirSync(targetFolder);
+        fs.mkdirSync(targetFolder, { recursive: true });
     }
     // Copy
     if (fs.lstatSync(source).isDirectory()) {

package/src/index.js

@@ -114,7 +114,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'build-editor-extension':
                 if ((0, package_1.currentlyInPackage)()) {
-                    await (0, editorextension_1.buildEditorExtension)(parsed['name'], parsed['quiet']);
+                    await (0, editorextension_1.buildEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet']);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -146,7 +146,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'watch-editor-extension':
                 if ((0, package_1.currentlyInPackage)()) {
-                    await (0, editorextension_1.watchEditorExtension)(parsed['name'], parsed['quiet']);
+                    await (0, editorextension_1.watchEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet']);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -157,6 +157,10 @@ class LucidSuiteExtensionCLI {
         }
     }
 }
-new LucidSuiteExtensionCLI()
-    .run(process.argv.slice(2))
-    .catch((reason) => console.error('Error running Lucid Suite Extension CLI', reason));
+new LucidSuiteExtensionCLI().run(process.argv.slice(2)).catch((reason) => {
+    let reasonMessage = reason;
+    if (reason instanceof Object && reason.toString) {
+        reasonMessage = reason.toString();
+    }
+    console.error('Error running Lucid Suite Extension CLI', reasonMessage);
+});

package/src/shapelibrary.js

@@ -117,7 +117,7 @@ async function getShapeListJson(name, packagePath) {
         }
         return {
             'class': 'CustomBlock',
-            'created': new Date().toString(),
+            'created': new Date().toISOString(),
             'name': shapeManifest['name'],
             'order': index,
             'properties': JSON.stringify(properties),