@suitegeezus/suitecloud-stacker 25.2.131 → 25.2.132-2

package/.claude/settings.local.json

@@ -0,0 +1,6 @@
+{
+  "enabledMcpjsonServers": [
+    "linear"
+  ],
+  "enableAllProjectMcpServers": true
+}

package/commands/accountManageauth.d.ts

@@ -75,7 +75,7 @@ type BetterAccountList = {
  */
 export declare const fetchAccountList: () => Promise<BetterAccountList[]>;
 export declare const betterList: () => SdfCommand;
-export declare const getEnvironment: (authid: string) => Promise<"PRODUCTION" | "SANDBOX" | "RELEASE_PREVIEW" | "TESTDRIVE" | "UNKNOWN">;
+export declare const getEnvironment: <R extends "PRODUCTION" | "SANDBOX" | "RELEASE_PREVIEW" | "TESTDRIVE" | "UNKNOWN">(authid: string) => Promise<R>;
 /**
  * @description - Prompts for account choice. This provides both verification and literal choice. If the choice does not match the current
  * context then an error is forced -- this is because SDF does not recognize a change in the account after launching.

package/commands/accountManageauth.js

@@ -106,20 +106,28 @@ const getEnvironment = async (authid) => {
     const list = await (0, exports.fetchAccountList)();
     const match = list.find((item) => (item.authid === authid));
     const companyId = match?.accountInfo?.companyId;
+    let environment;
     switch (true) {
         case typeof companyId === 'undefined':
-            return 'UNKNOWN';
+            environment = 'UNKNOWN';
+            break;
         case /^td/.test(companyId):
-            return 'TESTDRIVE';
+            environment = 'TESTDRIVE';
+            break;
         case /^\d+$/.test(companyId):
-            return 'PRODUCTION';
+            environment = 'PRODUCTION';
+            break;
         case /_SB\d+$/.test(companyId):
-            return 'SANDBOX';
+            environment = 'SANDBOX';
+            break;
         case /_RP\d*$/.test(companyId):
-            return 'RELEASE_PREVIEW';
+            environment = 'RELEASE_PREVIEW';
+            break;
         default:
-            return 'UNKNOWN';
+            environment = 'UNKNOWN';
+            break;
     }
+    return environment;
 };
 exports.getEnvironment = getEnvironment;
 /**
@@ -129,11 +137,13 @@ exports.getEnvironment = getEnvironment;
  */
 const promptForAccountChoice = () => {
     const origin = 'promptForAccountChoice';
+    let isQuiet = false;
     return {
         _origin: origin,
         beforeExecuting: async (options) => {
             process.stdout.write((0, promptHelpers_1.goColor)('HIGHLIGHT', '\n', options));
-            if (options?.arguments?.runhooks === 'quiet')
+            isQuiet = options?.arguments?.runhooks === 'quiet';
+            if (isQuiet)
                 return options;
             if (!Reflect.has({ ...options?.arguments }, 'authid')) {
                 throw onErrorHelper.makeError(origin, new Error(`${options.command} is missing authid. Perhaps you should not stack ${origin} here`));
@@ -208,9 +218,9 @@ const promptForAccountChoice = () => {
             }
         },
         onError: async (error) => {
-            console.log(error);
-            await (0, promptHelpers_1.promptUser)({ message: 'pause oc' });
-            return onErrorHelper.detectOriginAndReturn(origin, error, (error) => {
+            return onErrorHelper.detectOriginAndReturn(origin, error, async (error) => {
+                if (!isQuiet)
+                    await (0, promptHelpers_1.promptUser)({ message: 'pause' });
                 if (`${error}`?.includes('This error is a necessary evil')) {
                     process.stdout.write((0, promptHelpers_1.goColor)('GOOD', '\n', error, '\n'));
                 }

package/commands/fileImport.js

@@ -261,7 +261,8 @@ const fixFileImportPaths = () => {
                 await (0, promptHelpers_1.promptUser)({
                     message: JSON.stringify({
                         executionPath, ...options, ischild: spawnSuitecloud.isChildProcess()
-                    })
+                    }),
+                    timeout: 500
                 });
             // deal with relative paths, etc 1️⃣
             const shortenedPathOrGlobs = options.arguments.paths.map((path) => {
@@ -291,8 +292,7 @@ const fixFileImportPaths = () => {
             }, ['--folder', '/SuiteScripts']);
             if (options.authId)
                 childArgs.push('--authid', options.authId);
-            if (!isQuiet)
-                await (0, promptHelpers_1.promptUser)({ message: 'pause' });
+            // if (!isQuiet) await promptUser({message: 'pause'});
             // globbing has to be done here before we clean 2️⃣
             const exitCode = await spawnSuitecloud.createAsync({
                 command: 'file:list',
@@ -473,16 +473,18 @@ const detectManifest = () => {
         isStackable: true,
         beforeExecuting: async (options) => {
             // not needed when...
-            if (options.arguments?.paths?.length === 0)
-                return options;
-            if (options.arguments.calledfromcomparefiles)
+            if (
+            // no paths
+            options.arguments?.paths?.length === 0 ||
+                // not diffing
+                options.arguments.calledfromcomparefiles)
                 return options;
             const isQuiet = options?.arguments?.runhooks === 'quiet';
             // check if manifest exists
             const hasManifest = await (0, pathHelpers_1.hasFile)([options.projectPath, 'manifest.xml']);
             const choices = { 'Y': 'Yes' };
-            let answer = choices['Y'];
             if (!hasManifest) {
+                let answer = choices['Y'];
                 if (!isQuiet) {
                     // prompt to create one
                     answer = await (0, promptHelpers_1.promptChoices)({

package/commands/fileUpload.d.ts

@@ -11,12 +11,14 @@ export declare const promptForPath: (opts?: {
     message?: string;
 }) => SdfCommand;
 /**
- * @description - deploy.xml files are filtered out of an upload allowed in the upload, buuut...
- * - If you provide one as the only file to upload then it will load the files listed in it
+ * @description - deploy.xml files are filtered out of an upload because they are not allowed in the upload, buuut...
+ * - If you provide one as the only file to upload then it will instead parse the `<files>` tag and load the <path> listed in it
  *
  * - they are allowed in an import BUT that is rare so if an import see this path then it will not import
  * it but treat it like an import instructions
  *
+ * Supports file:import -- including diffing
+ *
  */
 export declare const getFilesFromDeployXml: () => SdfCommand;
 /**

package/commands/fileUpload.js

@@ -72,12 +72,14 @@ const promptForPath = (opts) => {
 };
 exports.promptForPath = promptForPath;
 /**
- * @description - deploy.xml files are filtered out of an upload allowed in the upload, buuut...
- * - If you provide one as the only file to upload then it will load the files listed in it
+ * @description - deploy.xml files are filtered out of an upload because they are not allowed in the upload, buuut...
+ * - If you provide one as the only file to upload then it will instead parse the `<files>` tag and load the <path> listed in it
  *
  * - they are allowed in an import BUT that is rare so if an import see this path then it will not import
  * it but treat it like an import instructions
  *
+ * Supports file:import -- including diffing
+ *
  */
 const getFilesFromDeployXml = () => {
     const origin = 'getFilesFromDeployXml';
@@ -87,25 +89,38 @@ const getFilesFromDeployXml = () => {
         beforeExecuting: async (options) => {
             if (spawnSuitecloud.isChildProcess())
                 return options;
-            // ignore this combo
-            if (options.command === 'file:import' &&
-                // @ts-expect-error it is in file:import
-                options.arguments?.calledfromcomparefiles)
-                return options;
-            const arrayKey = options.command === 'object:import' ? 'scriptid' : 'paths';
-            if (!Array.isArray(Reflect.get(options.arguments, arrayKey)))
+            const argumentFlagNameForArray = options.command === 'object:import' ? 'scriptid' : 'paths';
+            if (!Array.isArray(Reflect.get(options.arguments, argumentFlagNameForArray)))
                 return options;
-            const [first] = Reflect.get(options.arguments, arrayKey);
-            if (!/\bdeploy\b.*\bxml\b$/.test(first))
+            const [firstEntry] = Reflect.get(options.arguments, argumentFlagNameForArray);
+            if (!/\bdeploy\b.*\bxml\b$/.test(firstEntry))
                 return options;
-            //zero-out the array
-            Reflect.set(options.arguments, arrayKey, []);
+            //zero-out the array so it can be filled with new paths
+            Reflect.set(options.arguments, argumentFlagNameForArray, []);
+            // fix paths
+            const correctedPath = pathHelpers.getAbsolutePath({
+                projectPath: options.projectPath,
+                filePath: firstEntry
+            });
             // open the file and get all the paths from it
             // relies upon the xml being in a good structure
             try {
-                const fromXml = await (0, deployFileHelper_1.extractFilePathsFromDeployXmlFile)(options.projectPath, first, options.command === 'object:import' ? 'Objects' : 'SuiteScripts');
+                if (!await pathHelpers.hasFile(correctedPath)) {
+                    promptHelpers.promptUser({
+                        message: `Problem finding ${correctedPath} in ${origin}`,
+                        timeout: options.arguments.runhooks === 'quiet' ? 0 : null
+                    }).then(() => []);
+                    throw 'oops';
+                }
+                const fromXml = await (0, deployFileHelper_1.extractFilePathsFromDeployXmlFile)(options.projectPath, correctedPath, options.command === 'object:import' ? 'Objects' : 'SuiteScripts').catch((e) => {
+                    // non-fatal
+                    return promptHelpers.promptUser({
+                        message: 'Problem reading contents of deploy.xml in ' + origin,
+                        timeout: options.arguments.runhooks === 'quiet' ? 0 : null
+                    }).then(() => []);
+                });
                 if (options.command === 'object:import') {
-                    Reflect.set(options.arguments, arrayKey, 
+                    Reflect.set(options.arguments, argumentFlagNameForArray, 
                     // add the type prefix that doesn't exist in the deploy file
                     // TODO: guessing the prefix from the record folder
                     fromXml.map((x) => [
@@ -115,7 +130,7 @@ const getFilesFromDeployXml = () => {
                     ].join(':')));
                 }
                 else {
-                    Reflect.set(options.arguments, arrayKey, 
+                    Reflect.set(options.arguments, argumentFlagNameForArray, 
                     // add the type prefix
                     fromXml);
                 }
@@ -145,36 +160,37 @@ const confirmFileList = () => {
             const isQuiet = options.arguments.runhooks === 'quiet';
             const arrayKey = options.command === 'object:import' ? 'scriptid' : 'paths';
             const noFiles = Reflect.get(options.arguments, arrayKey)?.length === 0;
-            if (noFiles && !isQuiet) {
-                let answer = await promptHelpers.promptChoices({
-                    choices: [],
-                    displayChoices: [],
-                    question: `Nothing to do?`,
-                    default: null
-                });
-                return options;
-            }
-            if (noFiles && isQuiet) {
-                process.stdout.write(promptHelpers.goColor('INFO', 'Nothing to do'));
-                return options;
-            }
             const premessage = Reflect.get(options.arguments, arrayKey)
                 .map((p) => promptHelpers.goColor('HIGHLIGHT', '   ', p)).join('\n');
-            if (isQuiet) {
-                process.stdout.write((0, promptHelpers_1.goColor)('SUBTLE', '\n', premessage));
-            }
-            else {
-                const choices = { 'Y': 'Yes', 'N': 'No' };
-                let answer = await promptHelpers.promptChoices({
-                    choices: choices,
-                    displayChoices: choices,
-                    question: `Are you good with this list?`,
-                    premessage,
-                    default: null
-                });
-                // force it empty which will quit
-                if (answer === choices['N'])
-                    Reflect.set(options.arguments, arrayKey, []);
+            switch (true) {
+                case (noFiles && !isQuiet): {
+                    await promptHelpers.promptUser({
+                        message: `Found Nothing to do`,
+                        timeout: 500,
+                    });
+                    return options;
+                }
+                case noFiles && isQuiet: {
+                    process.stdout.write(promptHelpers.goColor('INFO', 'Nothing to do'));
+                    return options;
+                }
+                case isQuiet:
+                    process.stdout.write((0, promptHelpers_1.goColor)('SUBTLE', '\n', premessage));
+                    break;
+                default: {
+                    const choices = { 'Y': 'Yes', 'N': 'No' };
+                    let answer = await promptHelpers.promptChoices({
+                        choices: choices,
+                        displayChoices: choices,
+                        question: `Are you good with this list?`,
+                        premessage,
+                        default: null
+                    });
+                    // force it empty which will quit
+                    if (answer === choices['N'])
+                        Reflect.set(options.arguments, arrayKey, []);
+                    break;
+                }
             }
             return options;
         }

package/lib/makeManifestXml.d.ts

@@ -2,5 +2,5 @@
  * @file sdf/lib/makeManifestXml.ts
  * @author Gerald Gillespie <gerald.gillespie@fullscript.com>
  */
-declare const makeManifest: (path: string, folder: string, fileName?: string) => Promise<void>;
+declare const makeManifest: (path: string, projectName: string, fileName?: string) => Promise<void>;
 export = makeManifest;

package/lib/makeManifestXml.js

@@ -5,16 +5,16 @@
  */
 const fs = require("node:fs/promises");
 const nodePath = require("node:path");
-const makeManifest = async (path, folder, fileName = 'manifest.xml') => {
+const makeManifest = async (path, projectName, fileName = 'manifest.xml') => {
     const generic = `<manifest projecttype="ACCOUNTCUSTOMIZATION">
-  <projectname>${folder}</projectname>
+  <projectname>${projectName}</projectname>
   <frameworkversion>1.0</frameworkversion>
 </manifest>`;
     try {
         return fs.writeFile(nodePath.join(path, fileName), generic, { encoding: 'utf-8' });
     }
     catch {
-        console.error('Error writing manifest ***************************', folder);
+        console.error('Error writing manifest ***************************', projectName);
     }
 };
 module.exports = makeManifest;

package/lib/pathHelpers.js

@@ -230,7 +230,7 @@ exports.removeTempDirForSdf = removeTempDirForSdf;
 const removeFile = async (pathBits) => {
     const newPath = nodePath.join(...pathBits);
     await fs.rm(newPath, { force: true }).catch((e) => {
-        console.error(e);
+        console.info('non-fatal error deleting manifest', e);
     });
     return newPath;
 };

package/lib/promptHelpers.js

@@ -74,7 +74,10 @@ const promptUser = async ({ message, timeout }, callback) => {
         output: process.stdout,
         prompt: QuestionPrompt
     });
-    console.log(`\n${(0, exports.goColor)('BOLD', message || 'Hit Enter to continue')}`);
+    if (typeof timeout === 'number')
+        console.log(`\n${(0, exports.goColor)('BOLD', message || `Hit Enter to continue (or wait ${timeout / 1000} seconds) `)}`);
+    else
+        console.log(`\n${(0, exports.goColor)('BOLD', message || 'Hit Enter to continue ')}`);
     // Display the prompt
     rl.prompt();
     return new Promise((resolve, reject) => {
@@ -82,16 +85,16 @@ const promptUser = async ({ message, timeout }, callback) => {
             console.log((0, exports.goColor)('SUBTLE', 'You pressed:', line, false));
             resolve(line);
         });
-        if (typeof timeout === 'number') {
-            setTimeout(() => {
-                resolve(null);
-            }, timeout);
-        }
         rl.once('close', (e) => {
             console.log((0, exports.goColor)('SUBTLE', 'Exiting'));
             if (e)
                 reject(e);
         });
+        if (typeof timeout === 'number') {
+            setTimeout(() => {
+                resolve(null);
+            }, timeout);
+        }
     }).then((answer) => {
         rl.close();
         return (typeof callback === 'function' ? callback(answer) : answer);
@@ -109,23 +112,26 @@ const promptUserSync = ({ message, timeout }, callback) => {
         output: process.stdout,
         prompt: (0, exports.goColor)('SUBTLE', '> ')
     });
-    console.log(`\n${(0, exports.goColor)('BOLD', message || 'Hit Enter to continue')}`);
+    if (typeof timeout === 'number')
+        console.log(`\n${(0, exports.goColor)('BOLD', message || `Hit Enter to continue (or wait ${timeout / 1000} seconds) `)}`);
+    else
+        console.log(`\n${(0, exports.goColor)('BOLD', message || 'Hit Enter to continue ')}`);
     // Display the prompt
     rl.prompt();
     rl.once('line', (line) => {
         console.log((0, exports.goColor)('SUBTLE', 'You pressed:', line, false));
         rl.close();
     });
-    if (typeof timeout === 'number') {
-        setTimeout(() => {
-            rl.close();
-        }, timeout);
-    }
     rl.once('close', (e) => {
         console.log((0, exports.goColor)('SUBTLE', 'Exiting'));
         if (e)
             throw e;
     });
+    if (typeof timeout === 'number') {
+        setTimeout(() => {
+            rl.close();
+        }, timeout);
+    }
 };
 exports.promptUserSync = promptUserSync;
 /**

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@suitegeezus/suitecloud-stacker",
-  "version": "25.2.131",
+  "version": "25.2.132-2",
   "description": "SuiteCloud Stacker",
   "main": "safeCommands.js",
   "scripts": {
     "test": "test",
     "build:sdf": "tsc -p ./tsconfig.json",
-    "update:module": "node ./bin/updateModule.js"
+    "update:module": "node ./bin/updateModule.js",
+    "prepack": "npm run build:sdf"
   },
   "type": "commonjs",
   "imports": {
@@ -33,6 +34,6 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "minimatch": "^10.0.1"
+    "minimatch": "10.2.3"
   }
 }

package/safeCommands.js

@@ -893,6 +893,11 @@ exports.caseCommands = {
  * @param {module} module
  */
 const makeSafeExports = (options, extra, module) => {
+    const preExistingFiles = [];
+    ['deploy.xml', '.project.json'].forEach(async (f) => {
+        if (await pathHelpers.hasFile([process.cwd(), f]))
+            preExistingFiles.push(f);
+    });
     try {
         // if launched by something like:
         //  nodemon ./suitecloud.config.js watch -e ts --ignore module.d.ts
@@ -909,8 +914,10 @@ const makeSafeExports = (options, extra, module) => {
             process.once('exit', async (e) => {
                 // console.log('close');
                 // do not delete 'tsconfig.json'
-                const toClean = Array.isArray(extra.clean) ? extra.clean : ['deploy.xml', '.project.json'];
-                process.stdout.write(exports.promptHelpers.goColor('SUBTLE', '\ncleaning up '));
+                const toClean = Array.isArray(extra.clean)
+                    ? extra.clean
+                    : ['deploy.xml', '.project.json'].filter((f) => !preExistingFiles.includes(f));
+                process.stdout.write(exports.promptHelpers.goColor('SUBTLE', '\ncleaning up files that were created by SDF '));
                 cleanup(toClean, process.cwd());
                 if (!e)
                     process.stdout.write('\n✅');