@suitegeezus/suitecloud-stacker 25.2.127 → 25.2.128

package/commands/fileImport.js

@@ -10,6 +10,7 @@ const cp = require("node:child_process");
 const nodePath = require("node:path");
 const promptHelpers_1 = require("../lib/promptHelpers");
 const tempFileHelper = require("../lib/tempFileHelper");
+const os = require("node:os");
 const pathHelpers_1 = require("../lib/pathHelpers");
 const onErrorHelper = require("../lib/onErrorHelper");
 const minimatch_1 = require("minimatch");
@@ -59,63 +60,63 @@ const downloadForDiff = () => {
                 // single length array
                 if (options.arguments.paths.length === 0)
                     throw onErrorHelper.makeError(origin, new Error('Diff compare supports exactly 1 file at a time currently.'));
-                // use the first file
-                const [file] = options.arguments.paths;
-                // normalize to file system
-                // e.g. /User/geraldgillespie/project/src/FileCabinet/SuiteScripts/blah.js
-                let fixed = (0, pathHelpers_1.getAbsolutePath)({
-                    projectPath: options.projectPath,
-                    executionPath: options.executionPath,
-                    filePath: file,
-                });
-                //  await promptUser({message: 'pause'});
-                // check if you have it locally
-                if (!await (0, pathHelpers_1.hasFile)(fixed) && !/\btemp\b.FileCabinet/.test(fixed)) {
-                    throw onErrorHelper.makeError(origin, new Error('You do not have this file locally ' + fixed));
-                }
-                // finish the fix for SDF
-                // e.g. /SuiteScripts/blah.js
-                fixed = fixed.replace(/^.*(.\bSuiteScripts.*)$/, '$1');
+                // fixed lists
+                const candidates = await Promise.all([...options.arguments.paths].map(async (candidate) => {
+                    // normalize to file system
+                    // e.g. /User/geraldgillespie/project/src/FileCabinet/SuiteScripts/blah.js
+                    let fixed = (0, pathHelpers_1.getAbsolutePath)({
+                        projectPath: options.projectPath,
+                        executionPath: options.executionPath,
+                        filePath: candidate,
+                    });
+                    //  await promptUser({message: 'pause'});
+                    // check if you have it locally
+                    if (!await (0, pathHelpers_1.hasFile)(fixed)) {
+                        throw onErrorHelper.makeError(origin, new Error('You do not have this file locally ' + fixed));
+                    }
+                    // finish the fix for SDF
+                    // e.g. /SuiteScripts/blah.js
+                    return fixed.replace(/^.*(.\bSuiteScripts.*)$/, '$1');
+                }));
+                options.arguments.paths = [];
+                const tempLocations = [];
+                const auths = [options.authId, secondAuth].filter(Boolean);
+                // the temp import can happen all at once
+                await auths.reduce(async (linkedPromises, auth) => {
+                    await linkedPromises;
+                    const rootFolder = auth;
+                    tempLocations.push(await (0, pathHelpers_1.makeTempDirForSdf)({ root: rootFolder }));
+                    const childArgs = [
+                        '--paths', ...candidates,
+                        '--calledfromcomparefiles',
+                        '--runhooks none',
+                        '--excludeproperties',
+                        '--project', rootFolder,
+                        // run with noconfig to disconnect from existing project
+                        '--noconfig',
+                    ];
+                    if (auth)
+                        childArgs.push('--authid', auth);
+                    // arguments to keep?
+                    [].forEach((keep) => {
+                        if (Reflect.has(options.arguments, keep))
+                            childArgs.push(`--${keep}`, Reflect.get(options.arguments, keep));
+                    });
+                    // trigger the import for it in the temp folder
+                    const errorCode = await spawnSuitecloud.createAsync({
+                        command: 'file:import',
+                        args: childArgs,
+                        interact: true,
+                        cwd: os.tmpdir()
+                        // spawns in a separate location but is still a child process
+                    });
+                    if (errorCode !== 0)
+                        process.exit(errorCode);
+                    // the file location is the
+                    return linkedPromises;
+                }, Promise.resolve(true));
+                let diffTool = process.env.SUITECLOUD_DIFF_TOOL;
                 {
-                    // child process will save to temp
-                    // mktemp for the file
-                    // reset this array
-                    options.arguments.paths = [];
-                    // copy suitecloud there
-                    const tempLocation = await (0, pathHelpers_1.makeTempDirForSdf)(options.projectPath);
-                    const tempProjectFolder = (0, pathHelpers_1.getRelativeOf)(process.cwd(), tempLocation);
-                    const [newFile, secondFile] = await Promise.all([
-                        options.authId, secondAuth
-                    ]
-                        .filter(Boolean)
-                        .map(async (auth) => {
-                        const childArgs = [
-                            '--paths', fixed,
-                            '--calledfromcomparefiles',
-                            '--excludeproperties',
-                            '--project', tempProjectFolder,
-                            '--noconfig',
-                        ];
-                        if (auth)
-                            childArgs.push('--authid', auth);
-                        ['config'].forEach((keep) => {
-                            if (Reflect.has(options.arguments, keep))
-                                childArgs.push(`--${keep}`, Reflect.get(options.arguments, keep));
-                        });
-                        // trigger the import for it in the temp folder
-                        const errorCode = await spawnSuitecloud.createAsync({
-                            command: 'file:import',
-                            args: childArgs,
-                            interact: true,
-                            // spawns in a separate location but is still a child process
-                        });
-                        if (errorCode !== 0)
-                            process.exit(errorCode);
-                        const dataJson = await (0, tempFileHelper_1.consumeTempFile)(tempFile);
-                        const parsedData = JSON.parse(dataJson);
-                        return parsedData.fullPath;
-                    }));
-                    let diffTool = process.env.SUITECLOUD_DIFF_TOOL;
                     // console.log(process.env);
                     const nag = async () => {
                         process.stdout.write((0, promptHelpers_1.goColor)('INFO', `\nSet your environment variable ${(0, promptHelpers_1.goColor)('HIGHLIGHT', 'SUITECLOUD_DIFF_TOOL')}${(0, promptHelpers_1.goColor)('INFO', ' to avoid this prompt in the future')}`));
@@ -125,13 +126,16 @@ const downloadForDiff = () => {
                     while (!diffTool && !isQuiet) {
                         await nag();
                     }
-                    const currentFile = (0, pathHelpers_1.joinPaths)(options.projectPath, 'FileCabinet', fixed);
-                    // const thirdFile =
-                    // launch diff tool
-                    // Spawn a new process (e.g., launching another Node script)
-                    console.log([diffTool, ['diff', currentFile, newFile, secondFile]]);
-                    const fileArgs = [newFile, currentFile, secondFile].filter(Boolean).map((f) => `"${f}"`);
-                    const diffChildProc = cp.spawn(diffTool, ['diff', ...fileArgs], {
+                }
+                // iterate over ALL the files to create diff commands
+                const diffCombos = candidates.map((file) => {
+                    return [...tempLocations, options.projectPath].map((location) => {
+                        return (0, pathHelpers_1.joinPaths)(location, 'FileCabinet', file);
+                    }).filter(Boolean).map((f) => `"${f}"`);
+                });
+                await diffCombos.reduce(async (linked, combo) => {
+                    await linked;
+                    const diffChildProc = cp.spawn(diffTool, ['diff', ...combo], {
                         detached: true, // Allows the child to run independently
                         stdio: 'inherit',
                         shell: true // Optional: ignore parent's stdio (or use 'inherit' to share)
@@ -150,22 +154,27 @@ const downloadForDiff = () => {
                     // Exit the current process
                     await diffPromise;
                     diffChildProc.unref();
-                    // do not prompt when in quiet mode
-                    const choices = { 'Y': 'Yes', 'N': 'No' };
-                    let answer = choices['N'];
-                    options.arguments.paths = [];
-                    if (!isQuiet) {
-                        answer = await (0, promptHelpers_1.promptChoices)({
-                            choices,
-                            displayChoices: choices,
-                            // premessage:,
-                            question: 'Would you like to continue with the import?',
-                            default: choices['N'],
-                        });
+                    const toGet = combo.pop();
+                    if (toGet) {
+                        const fixedToGet = toGet.replace(/^.*(.\bSuiteScripts.*)$/, '$1');
+                        // do not prompt when in quiet mode
+                        const choices = { 'Y': 'Yes', 'N': 'No' };
+                        let answer = choices['N'];
+                        options.arguments.paths = [];
+                        if (!isQuiet) {
+                            answer = await (0, promptHelpers_1.promptChoices)({
+                                choices,
+                                displayChoices: choices,
+                                premessage: fixedToGet,
+                                question: 'Would you like to continue with the import?',
+                                default: choices['N'],
+                            });
+                        }
                         if (answer === choices['Y'])
-                            options.arguments.paths = [fixed];
+                            options.arguments.paths.push(fixedToGet);
                     }
-                }
+                    return linked;
+                }, Promise.resolve(true));
             }
             catch (e) {
                 console.error(e);
@@ -474,7 +483,8 @@ const detectManifest = () => {
             if (deleteManifest && options?._commandParameters?.project) {
                 const unquotedProject = await Promise.resolve(options?._commandParameters?.project)
                     .then((p) => JSON.parse(p))
-                    .catch(() => { });
+                    .catch(() => {
+                });
                 if (unquotedProject) {
                     process.stdout.write((0, promptHelpers_1.goColor)('INFO', '\n', 'Deleting temporary manifest in ', unquotedProject));
                     await (0, pathHelpers_1.removeFile)([unquotedProject, 'manifest.xml']);

package/lib/pathHelpers.d.ts

@@ -77,12 +77,16 @@ export declare const removeTempDirForSdf: (projectPath: string) => Promise<strin
  */
 export declare const removeFile: (pathBits: string[]) => Promise<string>;
 /**
- * @description - makes a `temp` directory in the same account root
+ * @description - makes a `temp` directory that behaves like a project file
  * - no need to copy anything over
- * @param {string} projectPath
+ * @param {string} [options.projectPath] - Default to OS tmpdir
+ * @param {string} [options.root] - Defaults to sdf-like dir
  * @returns {Promise<string>}
  */
-export declare const makeTempDirForSdf: (projectPath: string) => Promise<string>;
+export declare const makeTempDirForSdf: (options: {
+    projectPath?: string;
+    root?: string;
+}) => Promise<string>;
 /**
  * @description - Figures out the path
  * - if you have a relative path then compare it against cwd

package/lib/pathHelpers.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFileExtensions = exports.removeIllegalObjectFiles = exports.removeIllegalFileCabinetFiles = exports.getAllFilesRecursively = exports.findMatchingDirectories = exports.getAccountFolders = exports.getAbsolutePath = exports.makeTempDirForSdf = exports.removeFile = exports.removeTempDirForSdf = exports.getAccountDir = exports.getRelativeOf = exports.getDifferenceFromProjectRootToFileCabinet = exports.getFolderHoldingFileCabinetPlus = exports.getRootOfAccount = exports.getSuiteCloudConfigPath = exports.joinPaths = exports.combineOverLappingPaths = exports.getRootOfProject = exports.hasFile = exports.CONSTANTS = void 0;
 const nodePath = require("node:path");
 const fs = require("node:fs/promises");
+const nodeOs = require("node:os");
 const validators_1 = require("./validators");
 const minimatch_1 = require("minimatch");
 const makeManifest = require("./makeManifestXml");
@@ -235,15 +236,23 @@ const removeFile = async (pathBits) => {
 };
 exports.removeFile = removeFile;
 /**
- * @description - makes a `temp` directory in the same account root
+ * @description - makes a `temp` directory that behaves like a project file
  * - no need to copy anything over
- * @param {string} projectPath
+ * @param {string} [options.projectPath] - Default to OS tmpdir
+ * @param {string} [options.root] - Defaults to sdf-like dir
  * @returns {Promise<string>}
  */
-const makeTempDirForSdf = async (projectPath) => {
-    const newPath = nodePath.join(projectPath, '..', exports.CONSTANTS.SDF_TEMP_ROOT);
-    // clean up old files first
-    await (0, exports.removeTempDirForSdf)(projectPath);
+const makeTempDirForSdf = async (options) => {
+    let newPath;
+    const { projectPath, root } = options;
+    if (!projectPath) {
+        newPath = nodePath.join(nodeOs.tmpdir(), root || exports.CONSTANTS.SDF_DEFAULT_ROOT);
+        await (0, exports.removeTempDirForSdf)(nodeOs.tmpdir());
+    }
+    else {
+        newPath = nodePath.join(projectPath, '..', root || exports.CONSTANTS.SDF_TEMP_ROOT);
+        // clean up old files first
+    }
     await fs.mkdir(newPath, { recursive: true });
     // make manifest file
     await makeManifest(newPath, 'temp');

package/lib/tempFileHelper.js

@@ -45,7 +45,7 @@ const consumeTempFile = async (fileName) => {
     const path = nodePath.join(process.cwd(), [prefix, fileName].join('_'));
     const contents = await fs.readFile(path, { encoding: 'utf-8' });
     // await fs.rm(path).catch(e => console.error(e));
-    process.stdout.write(promptHelpers.goColor('SUBTLE', '\nTemp file consumed (DISBALED)', path));
+    process.stdout.write(promptHelpers.goColor('SUBTLE', '\nTemp file read', path));
     return contents;
 };
 exports.consumeTempFile = consumeTempFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suitegeezus/suitecloud-stacker",
-  "version": "25.2.127",
+  "version": "25.2.128",
   "description": "SuiteCloud Stacker",
   "main": "safeCommands.js",
   "scripts": {

package/safeCommands.js

@@ -768,11 +768,11 @@ exports.caseCommands = {
             message: 'Enter a file or Glob to import (e.g. ./**/*.js)'
         }))
             .stack(printOptions({ messageType: 'INFO', confirm: true }))
-            .stack(fileImports.downloadForDiff())
             // could be an xml
             .stack(fileUpload.getFilesFromDeployXml())
             // or could be a glob or partial
             .stack(fileImports.fixFileImportPaths())
+            .stack(fileImports.downloadForDiff())
             .stack(fileUpload.confirmFileList())
             .stack(fileImports.detectManifest())
             // .stack(printOptions({messageType: 'SUBTLE'}))