lucid-package 0.0.93 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.93",
+    "version": "0.0.95",
     "description": "",
     "main": "index.js",
     "bin": {
@@ -31,7 +31,7 @@
         "express": "^4.17.1",
         "hjson": "^3.2.2",
         "image-size": "^1.0.2",
-        "jszip": "^3.7.1",
+        "jszip": "3.10.1",
         "lucid-extension-sdk": "^0.0.112",
         "password-prompt": "^1.1.2",
         "ts-loader": "^9.2.6",

package/src/package.js

@@ -60,6 +60,11 @@ exports.updateAllExtensionSDK = updateAllExtensionSDK;
  */
 async function writePackage(quiet = false, manifestOverrideEnv) {
     const zip = new JSZip();
+    const quietableConsoleLog = (...data) => {
+        if (!quiet) {
+            console.log(data);
+        }
+    };
     //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']))) {
@@ -82,7 +87,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
             const parts = extension['codePath'].split(path.sep);
             if (parts[0] === 'editorextensions') {
                 //Can't just call the method, as the WebpackCLI class does process.exit(2) :facepalm:
-                console.log((0, theme_1.success)(`Compiling editor extension ${parts[1]}`));
+                quietableConsoleLog((0, theme_1.success)(`Compiling editor extension ${parts[1]}`));
                 // Quotes are needed around every use of a path to deal with spaces
                 const cmd = '"' +
                     process.argv[0] +
@@ -93,8 +98,8 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
                     '"' +
                     parts[1] +
                     '"';
-                console.log(cmd);
-                console.log((0, shellutil_1.execSyncLoggingOutputOnError)(cmd).toString());
+                quietableConsoleLog(cmd);
+                quietableConsoleLog((0, shellutil_1.execSyncLoggingOutputOnError)(cmd, quiet = quiet).toString());
             }
             zip.file(extension['codePath'], await fs.readFile(extension['codePath']));
         }
@@ -102,8 +107,8 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
         for (const library of manifest['shapeLibraries'] || []) {
             const parts = library['lcszPath'].split(path.sep);
             if (parts[0] === 'shapelibraries') {
-                console.log((0, theme_1.success)(`Building shape library ${parts[1]}`));
-                await (0, shapelibrary_1.buildShapeLibrary)(parts[1].replace('.lcsz', ''));
+                quietableConsoleLog((0, theme_1.success)(`Building shape library ${parts[1]}`));
+                await (0, shapelibrary_1.buildShapeLibrary)(parts[1].replace('.lcsz', ''), quiet);
             }
             zip.file(library['lcszPath'], await fs.readFile(library['lcszPath']));
         }
@@ -121,7 +126,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
                         zipPath = zipDirectory + filePath.substring(directory.length);
                     }
                     const normalizedZipPath = (0, filesystemutil_1.getNormalizedZipPath)(zipPath);
-                    console.log('Adding resource file: ' + filePath + ' -> ' + normalizedZipPath);
+                    quietableConsoleLog('Adding resource file: ' + filePath + ' -> ' + normalizedZipPath);
                     zip.file(normalizedZipPath, await fs.readFile(filePath));
                 }
                 else if (stat.isDirectory()) {
@@ -144,7 +149,7 @@ async function writePackage(quiet = false, manifestOverrideEnv) {
             compression: 'DEFLATE',
             compressionOptions: { level: 9 },
         });
-        console.log((0, theme_1.success)('Writing file package.zip'));
+        quietableConsoleLog((0, theme_1.success)('Writing file package.zip'));
         const fileName = `package${manifestOverrideEnv ? `-${manifestOverrideEnv}` : ''}.zip`;
         await fs.writeFile(fileName, zipBytes);
     }, manifestOverrideEnv);

package/src/shapelibrary.d.ts

@@ -6,5 +6,5 @@ export interface ImageShapeConfig {
 export declare function createEmptyShapeLibrary(name: string): Promise<void>;
 export declare function createImageShapeLibrary(name: string, imagePath: string, config: ImageShapeConfig): Promise<void>;
 export declare function getShapeListJson(name: string, packagePath: string, port?: number): Promise<string>;
-export declare function buildShapeLibrary(name: string): Promise<void>;
+export declare function buildShapeLibrary(name: string, quiet: boolean): Promise<void>;
 export declare function debugShapeLibraries(packagePath?: string, pickAnyPort?: boolean): Promise<void>;

package/src/shapelibrary.js

@@ -232,10 +232,12 @@ async function getShapeListJson(name, packagePath, port = 9901) {
     })));
 }
 exports.getShapeListJson = getShapeListJson;
-async function buildShapeLibrary(name) {
+async function buildShapeLibrary(name, quiet) {
     const zip = new JSZip();
     const addToZip = async (source) => {
-        console.log(source);
+        if (!quiet) {
+            console.log(source);
+        }
         const stat = await fs.lstat(source);
         if (stat.isDirectory()) {
             const dir = await fs.readdir(source);
@@ -250,7 +252,9 @@ async function buildShapeLibrary(name) {
     };
     await addToZip(`shapelibraries/${name}`);
     const zipBytes = await zip.generateAsync({ type: 'uint8array' });
-    console.log((0, theme_1.success)(`Writing file ${name}.lcsz`));
+    if (!quiet) {
+        console.log((0, theme_1.success)(`Writing file ${name}.lcsz`));
+    }
     await fs.writeFile(`shapelibraries/${name}.lcsz`, zipBytes);
 }
 exports.buildShapeLibrary = buildShapeLibrary;

package/src/shellutil.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="node" />
-export declare function execSyncLoggingOutputOnError(cmd: string): Buffer;
+export declare function execSyncLoggingOutputOnError(cmd: string, quiet?: boolean): Buffer;

package/src/shellutil.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.execSyncLoggingOutputOnError = void 0;
 const child_process = require("child_process");
 const theme_1 = require("./theme");
-function execSyncLoggingOutputOnError(cmd) {
+function execSyncLoggingOutputOnError(cmd, quiet = false) {
     try {
-        return child_process.execSync(cmd);
+        return child_process.execSync(cmd, quiet ? { stdio: [0, 'pipe', 'pipe'] } : {});
     }
     catch (e) {
         console.log((0, theme_1.error)(String(e.stdout)));