lucid-package 0.0.13 → 0.0.15

package/package.json

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

package/src/editorextension.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debugEditorExtension = exports.updateExtensionSDK = exports.buildEditorExtension = exports.createEditorExtension = void 0;
 const fs = require("fs/promises");
+const oldFs = require("fs");
 const filesystemutil_1 = require("./filesystemutil");
 const package_1 = require("./package");
 const express = require("express");
@@ -62,6 +63,11 @@ async function debugEditorExtension(name) {
         next();
     });
     app.get('/extension.js', async (req, res) => {
+        //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) {
+            await new Promise((resolve) => setTimeout(resolve, 50));
+        }
         res.send((await fs.readFile('bin/extension.js')).toString());
     });
     app.get('/scopes', async (req, res) => {

package/src/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const argparse_1 = require("argparse");
 const editorextension_1 = require("./editorextension");
 const package_1 = require("./package");
-const argparse_1 = require("argparse");
 const shapelibrary_1 = require("./shapelibrary");
 class LucidSuiteExtensionCLI {
-    run(args) {
+    async run(args) {
         const parser = new argparse_1.ArgumentParser({
             description: 'Create and manage Lucid extension packages',
         });
@@ -66,7 +66,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'bundle':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, package_1.writePackage)();
+                    await (0, package_1.writePackage)();
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -74,7 +74,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'update-sdk':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, package_1.updateAllExtensionSDK)();
+                    await (0, package_1.updateAllExtensionSDK)();
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -82,7 +82,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'create-editor-extension':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, editorextension_1.createEditorExtension)(parsed['name'], isInternalTesting);
+                    await (0, editorextension_1.createEditorExtension)(parsed['name'], isInternalTesting);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -90,7 +90,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'build-editor-extension':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, editorextension_1.buildEditorExtension)(parsed['name']);
+                    await (0, editorextension_1.buildEditorExtension)(parsed['name']);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -98,7 +98,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'create-shape-library':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, shapelibrary_1.createEmptyShapeLibrary)(parsed['name']);
+                    await (0, shapelibrary_1.createEmptyShapeLibrary)(parsed['name']);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -106,7 +106,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'test-shape-libraries':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, shapelibrary_1.debugShapeLibraries)();
+                    await (0, shapelibrary_1.debugShapeLibraries)();
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -114,7 +114,7 @@ class LucidSuiteExtensionCLI {
                 break;
             case 'test-editor-extension':
                 if ((0, package_1.currentlyInPackage)()) {
-                    (0, editorextension_1.debugEditorExtension)(parsed['name']);
+                    await (0, editorextension_1.debugEditorExtension)(parsed['name']);
                 }
                 else {
                     console.error('Not currently in a Lucid extension package folder');
@@ -125,4 +125,6 @@ class LucidSuiteExtensionCLI {
         }
     }
 }
-new LucidSuiteExtensionCLI().run(process.argv.slice(2));
+new LucidSuiteExtensionCLI()
+    .run(process.argv.slice(2))
+    .catch((reason) => console.error('Error running Lucid Suite Extension CLI', reason));

package/src/packagemanifest.js

@@ -85,11 +85,11 @@ function validateManifestOrThrow(manifest) {
             if (!(0, checks_1.isString)(provider['oauthProviderName'])) {
                 throw new Error('manifest.json: Data connector "oauthProviderName" must be a string');
             }
-            if (!(0, checks_1.isString)(provider['callbackUrl'])) {
-                throw new Error('manifest.json: Data connector "callbackUrl" must be a string');
+            if (!(0, checks_1.isString)(provider['callbackBaseUrl'])) {
+                throw new Error('manifest.json: Data connector "callbackBaseUrl" must be a string');
             }
-            if (!(0, checks_1.isTypedArray)(checks_1.isString)(provider['callbackEvents'])) {
-                throw new Error('manifest.json: Data connector "callbackEvents" must be a string array');
+            if (!(0, checks_1.isRecord)(checks_1.isString)(provider['callbackEvents'])) {
+                throw new Error('manifest.json: Data connector "callbackEvents" must be a record from strings to strings');
             }
         }
     }