lucid-package 0.0.19 → 0.0.22

package/package.json

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

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)}`,
         };
     })));
 }