lucid-package 0.0.76 → 0.0.78

package/package.json

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

package/src/editorextension.js

@@ -164,6 +164,13 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
         res.send(req.query['source']);
     });
     // Static resources in the "public" directory of the package
+    const manifest = await (0, packagemanifest_1.readManifest)('local');
+    if (manifest['public']) {
+        for (const url in manifest['public']) {
+            const source = manifest['public'][url];
+            app.use('/resources/' + url, express.static(source));
+        }
+    }
     app.use('/resources', express.static('public'));
     const listen = () => {
         app.listen(port, 'localhost', () => {

package/src/package.js

@@ -17,10 +17,20 @@ async function createEmptyPackage(root) {
 }
 exports.createEmptyPackage = createEmptyPackage;
 function currentlyInPackage() {
-    return ((fsOld.existsSync('editorextensions') || fsOld.existsSync('shapelibraries')) && fsOld.existsSync('manifest.json'));
+    return ((fsOld.existsSync('editorextensions') || fsOld.existsSync('shapelibraries')) &&
+        fsOld.existsSync('manifest.json'));
 }
 exports.currentlyInPackage = currentlyInPackage;
-const allScopes = new Set(['DOWNLOAD', 'NETWORK', 'READ', 'SHOW_MODAL', 'CUSTOM_UI', 'WRITE', 'USER_INFO', 'OAUTH_TOKEN']);
+const allScopes = new Set([
+    'DOWNLOAD',
+    'NETWORK',
+    'READ',
+    'SHOW_MODAL',
+    'CUSTOM_UI',
+    'WRITE',
+    'USER_INFO',
+    'OAUTH_TOKEN',
+]);
 const uuidRegex = /^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i;
 async function modifyManifest(callback, manifestOverrideEnv) {
     const manifest = await (0, packagemanifest_1.readManifest)(manifestOverrideEnv);
@@ -90,7 +100,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
             zip.file(library['lcszPath'], await fs.readFile(library['lcszPath']));
         }
         //Add any static resources
-        const checkDirForResources = async (directory) => {
+        const checkDirForResources = async (directory, zipDirectory) => {
             if (!fsOld.existsSync(directory)) {
                 return;
             }
@@ -98,15 +108,25 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
                 const filePath = path.join(directory, fileName);
                 const stat = await fs.stat(filePath);
                 if (stat.isFile()) {
-                    console.log('Adding resource file: ', filePath);
-                    zip.file(filePath, await fs.readFile(filePath));
+                    let zipPath = filePath;
+                    if (zipDirectory != null) {
+                        zipPath = zipDirectory + filePath.substring(directory.length);
+                    }
+                    console.log('Adding resource file: ' + filePath + ' -> ' + zipPath);
+                    zip.file(zipPath, await fs.readFile(filePath));
                 }
                 else if (stat.isDirectory()) {
-                    await checkDirForResources(filePath);
+                    await checkDirForResources(filePath, zipDirectory ? path.join(zipDirectory, fileName) : undefined);
                 }
             }
         };
         await checkDirForResources('public');
+        if (manifest['public']) {
+            for (const url in manifest['public']) {
+                const source = manifest['public'][url];
+                await checkDirForResources(source, path.join('public', url));
+            }
+        }
         //Add the manifest itself
         zip.file('manifest.json', JSON.stringify(manifest, undefined, 2));
         //Write out the zip file

package/src/packagemanifest.d.ts

@@ -22,6 +22,7 @@ export type PackageManifest = {
         'name': string;
         'title': string;
         'tokenUrl': string;
+        'refreshTokenUrl'?: string;
         'authorizationUrl': string;
         'scopes': string[];
         'domainWhitelist': string[];
@@ -45,6 +46,7 @@ export type PackageManifest = {
         'description': string;
         'type': SettingType;
     }[];
+    'public'?: Record<string, string>;
 };
 /**
  * @param manifestOverrideEnv The environment to override the manifest with

package/src/packagemanifest.js

@@ -124,6 +124,9 @@ function validateManifestOrThrow(manifest) {
             if (!(0, lucid_extension_sdk_1.isString)(provider['tokenUrl'])) {
                 throw new Error('manifest.json: OAuth provider "tokenUrl" must be a string');
             }
+            if (provider['refreshTokenUrl'] && !(0, lucid_extension_sdk_1.isString)(provider['refreshTokenUrl'])) {
+                throw new Error('manifest.json: OAuth provider "refreshTokenUrl" must be a string');
+            }
             if (!(0, lucid_extension_sdk_1.isTypedArray)(lucid_extension_sdk_1.isString)(provider['scopes'])) {
                 throw new Error('manifest.json: OAuth provider "scopes" must be a string array');
             }
@@ -184,6 +187,11 @@ function validateManifestOrThrow(manifest) {
             }
         }
     }
+    if (manifest['public']) {
+        if (!(0, lucid_extension_sdk_1.objectOfValidator)(lucid_extension_sdk_1.isString)(manifest['public'])) {
+            throw new Error('manifest.json: "public" must be an object of strings');
+        }
+    }
 }
 function deepMixin(target, mixin) {
     if ((0, lucid_extension_sdk_1.isArray)(target) && (0, lucid_extension_sdk_1.isArray)(mixin)) {