lucid-package 0.0.49 → 0.0.50

package/package.json

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

package/src/package.js

@@ -4,6 +4,7 @@ exports.writePackage = exports.updateAllExtensionSDK = exports.modifyManifest =
 const fsOld = require("fs");
 const fs = require("fs/promises");
 const JSZip = require("jszip");
+const lucid_extension_sdk_1 = require("lucid-extension-sdk");
 const editorextension_1 = require("./editorextension");
 const filesystemutil_1 = require("./filesystemutil");
 const packagemanifest_1 = require("./packagemanifest");
@@ -19,6 +20,7 @@ function currentlyInPackage() {
 }
 exports.currentlyInPackage = currentlyInPackage;
 const allScopes = new Set(['DOWNLOAD', 'NETWORK', 'READ', 'SHOW_MODAL', 'CUSTOM_UI', 'WRITE']);
+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);
     await callback(manifest);
@@ -43,6 +45,9 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
     const zip = new JSZip();
     //Increment the patch number automatically on each build
     await modifyManifest(async (manifest) => {
+        if (manifest['id'] !== undefined && (!(0, lucid_extension_sdk_1.isString)(manifest['id']) || !uuidRegex.test(manifest['id']))) {
+            throw new Error('manifest.json: If "id" is specified, must be a UUID matching the package ID from the Lucid developer portal');
+        }
         const parts = manifest['version'].split('.');
         parts[parts.length - 1] = String(parseInt(parts[parts.length - 1], 10) + 1);
         manifest['version'] = parts.join('.');

package/src/packagemanifest.js

@@ -10,14 +10,10 @@ var SettingType;
     SettingType["STRING"] = "string";
 })(SettingType = exports.SettingType || (exports.SettingType = {}));
 const versionRegex = /^\d+\.\d+\.\d+$/;
-const uuidRegex = /^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i;
 function validateManifestOrThrow(manifest) {
     if (!(0, lucid_extension_sdk_1.isObject)(manifest)) {
         throw new Error('manifest.json must be a valid JSON object');
     }
-    if (manifest['id'] !== undefined && (!(0, lucid_extension_sdk_1.isString)(manifest['id']) || !uuidRegex.test(manifest['id']))) {
-        throw new Error('manifest.json: If "id" is specified, must be a UUID matching the package ID from the Lucid developer portal');
-    }
     if (!(0, lucid_extension_sdk_1.isString)(manifest['version']) || !versionRegex.test(manifest['version'])) {
         throw new Error('manifest.json: "version" must be a string in the format <major>.<minor>.<patch>');
     }

package/src/shapelibrary.js

@@ -138,7 +138,12 @@ async function buildShapeLibrary(name) {
             }
         }
         else {
-            zip.file(source.replace(`shapelibraries/${name}/`, ''), await fs.readFile(source));
+            /**
+             * On Windows machines '\' is used as the file separator. To ensure that we correctly zip files on Windows
+             * machines we replace '\' with '/'.
+             */
+            const normalizedSource = path.sep === '\\' ? source.replace(/\\/g, '/') : source;
+            zip.file(normalizedSource.replace(`shapelibraries/${name}/`, ''), await fs.readFile(source));
         }
     };
     await addToZip(`shapelibraries/${name}`);