@lumpcode/core 0.0.10 → 0.0.12

package/dist/helpers/executeStepsForContextList/main.d.ts

@@ -6,7 +6,7 @@ export type ExecuteStepsForContextListParams = Required<Pick<RunLumpInput, 'base
 };
 export declare function executeStepsForContextList({ baseBranch, branchFn, lumpVariables, contextList, gitAddCommandFn, gitCommitCommandFn, gitPushCommandFn, gitCommitMessageFn, projectRoot, steps, setupFn, setupWorkspaceFn, teardownFn, teardownWorkspaceFn, getKeepHistoryFilePathFn, logger: loggerInput, }: ExecuteStepsForContextListParams): Promise<Failure<{
     message: string;
-}> | import("../../types").Success<{
+}> | import("../..").Success<{
     branchName: string;
     contextNames: string[];
     contextRunStateList: ContextRunState[];

package/dist/helpers/executeStepsForContextList/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/executeStepsForContextList/main.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,WAAW,EACX,eAAe,EACf,OAAO,EACP,MAAM,EAIT,MAAM,aAAa,CAAC;AAUrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CACxD,YAAY,EACV,YAAY,GACZ,UAAU,GACV,eAAe,GACf,OAAO,GACP,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,GAClB,qBAAqB,GACrB,0BAA0B,CAC/B,CAAC,GAAG;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,wBAAsB,0BAA0B,CAAC,EAC7C,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,KAAK,EACL,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,mBAAmB,EACnB,wBAAwB,EACxB,MAAM,EAAE,WAAW,GACtB,EAAE,gCAAgC;aAqEa,MAAM;;;;;IAmOrD;AAED,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/executeStepsForContextList/main.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,WAAW,EACX,eAAe,EACf,OAAO,EACP,MAAM,EAIT,MAAM,aAAa,CAAC;AAUrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,gCAAgC,GAAG,QAAQ,CAAC,IAAI,CACxD,YAAY,EACV,YAAY,GACZ,UAAU,GACV,eAAe,GACf,OAAO,GACP,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,GAClB,qBAAqB,GACrB,0BAA0B,CAC/B,CAAC,GAAG;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,wBAAsB,0BAA0B,CAAC,EAC7C,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,KAAK,EACL,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,mBAAmB,EACnB,wBAAwB,EACxB,MAAM,EAAE,WAAW,GACtB,EAAE,gCAAgC;aAqEa,MAAM;;;;;IAqOrD;AAED,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC,CAAC"}

package/dist/helpers/getCodeBasePaths/main.d.ts

@@ -2,7 +2,7 @@ import { CodeBasePath, Logger } from '../../types';
 export declare function getCodeBasePaths({ cwd, logger: loggerInput, }: {
     cwd: string;
     logger?: Logger;
-}): Promise<import("../../types").Failure<{
+}): Promise<import("../..").Failure<{
     message: string;
-}> | import("../../types").Success<CodeBasePath[]>>;
+}> | import("../..").Success<CodeBasePath[]>>;
 //# sourceMappingURL=main.d.ts.map

package/dist/helpers/getCodeBasePaths/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getCodeBasePaths/main.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,EACnC,GAAG,EACH,MAAM,EAAE,WAAW,GACtB,EAAE;IACC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;;oDAoBA"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getCodeBasePaths/main.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,EACnC,GAAG,EACH,MAAM,EAAE,WAAW,GACtB,EAAE;IACC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;;8CAoBA"}

package/dist/helpers/getContextStatus/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getContextStatus/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAIpE,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,aAAa,CAAC,CA6EzB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getContextStatus/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAIpE,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,aAAa,CAAC,CAmEzB"}

package/dist/helpers/getToDoContextList/main.d.ts

@@ -7,7 +7,7 @@ export declare function getToDoContextList(params: {
     projectRoot: string;
     baseBranch: string;
     logger?: Logger;
-}): Promise<import("../../types").Failure<{
+}): Promise<import("../..").Failure<{
     message: string;
-}> | import("../../types").Success<import("../../types").Context<Record<string, string | number | boolean>>[]>>;
+}> | import("../..").Success<import("../..").Context<Record<string, string | number | boolean>>[]>>;
 //# sourceMappingURL=main.d.ts.map

package/dist/helpers/getToDoContextList/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getToDoContextList/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC7C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;;gHA8DA"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/helpers/getToDoContextList/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAGpE,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC7C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;;oGA8DA"}

package/dist/index.cjs

@@ -59,18 +59,6 @@ function failure(data) {
     };
 }
 
-function decision(possibilities, defaultValue) {
-    for (const [condition, result] of possibilities) {
-        if (condition()) {
-            return result();
-        }
-    }
-    if (defaultValue) {
-        return defaultValue;
-    }
-    throw new Error('No value found in decision');
-}
-
 /**
  * Wrap an arbitrary string in quotes so it can be safely embedded in
  * a shell command (e.g. the command string passed to `execAsync`).
@@ -85,18 +73,6 @@ function shellSingleQuote(value) {
     return `'${value.split("'").join(`'\\''`)}'`;
 }
 
-/**
- * Wrap a shell fragment so failure does not break a surrounding `&&` chain.
- *
- * Unix: `cmd || true`. Windows cmd.exe: `(cmd || cd .)`.
- */
-function shellBestEffort(command) {
-    if (process.platform === 'win32') {
-        return `(${command} || cd .)`;
-    }
-    return `${command} || true`;
-}
-
 const DEFAULT_WINDOWS_PATHEXT = [
     '.COM',
     '.EXE',
@@ -247,14 +223,6 @@ function createConsoleLogger(input) {
     return makeLogger(prefix);
 }
 
-const noopLogger = {
-    error: () => { },
-    warn: () => { },
-    info: () => { },
-    verbose: () => { },
-    child: () => noopLogger,
-};
-
 function firstNonEmptyLine(value) {
     if (value == null)
         return undefined;
@@ -3186,6 +3154,49 @@ function dump(input, options = {}) {
 	});
 }
 
+/** Returns whether `filePath` is accessible to this process (typically exists). */
+async function pathExists(filePath) {
+    try {
+        await fs__namespace$1.access(filePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+
+/** Strip terminal ANSI escapes and other C0 controls js-yaml rejects in literal blocks. */
+function sanitizeHistoryText(value) {
+    return value
+        .replace(/\x1b\[[0-9;]*[A-Za-z]/g, '')
+        .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, '');
+}
+function parseHistoryYamlContent(content) {
+    const parsed = load(content, { schema: YAML11_SCHEMA });
+    if (!Array.isArray(parsed)) {
+        throw new Error('History file must contain a YAML sequence');
+    }
+    return parsed;
+}
+function tryParseHistoryContent(content) {
+    try {
+        return parseHistoryYamlContent(content);
+    }
+    catch (firstError) {
+        const sanitized = sanitizeHistoryText(content);
+        if (sanitized === content) {
+            throw firstError;
+        }
+        return parseHistoryYamlContent(sanitized);
+    }
+}
+function sanitizeHistoryEntry(entry) {
+    return {
+        ...entry,
+        prompt: sanitizeHistoryText(entry.prompt),
+        commandResult: sanitizeHistoryText(entry.commandResult),
+    };
+}
 function historyFormatFromPath(filePath) {
     const ext = path.extname(filePath).toLowerCase();
     if (ext === '.yaml' || ext === '.yml') {
@@ -3223,7 +3234,8 @@ function dumpHistoryEntries(entries) {
     if (entries.length === 0) {
         return '[]\n';
     }
-    return dump(entries, {
+    const sanitizedEntries = entries.map(sanitizeHistoryEntry);
+    return dump(sanitizedEntries, {
         schema: YAML11_SCHEMA,
         lineWidth: 0,
         noRefs: true,
@@ -3241,11 +3253,7 @@ async function readHistoryFile({ filePath, }) {
     }
     try {
         const content = await fs$1.readFile(filePath, 'utf-8');
-        const parsed = load(content, { schema: YAML11_SCHEMA });
-        if (!Array.isArray(parsed)) {
-            return failure(`History file ${filePath} must contain a YAML sequence`);
-        }
-        return success(parsed);
+        return success(tryParseHistoryContent(content));
     }
     catch (error) {
         const detail = error instanceof Error ? error.message : String(error);
@@ -3272,7 +3280,7 @@ async function appendHistoryEntry({ filePath, entry, }) {
     if (!formatResult.success) {
         return formatResult;
     }
-    const exists = await fs$1.stat(filePath).then(() => true).catch(() => false);
+    const exists = await pathExists(filePath);
     let entries;
     if (exists) {
         const readResult = await readHistoryFile({ filePath });
@@ -3285,10 +3293,25 @@ async function appendHistoryEntry({ filePath, entry, }) {
         await fs$1.mkdir(path.dirname(filePath), { recursive: true });
         entries = [];
     }
-    entries.push(entry);
+    entries.push(sanitizeHistoryEntry(entry));
     return writeHistoryFile({ filePath, entries });
 }
 
+/** Parses `git log --format='%H %s'` lines into commit hash and subject pairs. */
+function parseGitLogHashSubjectLines(stdout) {
+    return stdout
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean)
+        .map((line) => {
+        const sp = line.indexOf(' ');
+        return {
+            hash: sp === -1 ? line : line.slice(0, sp),
+            subject: sp === -1 ? '' : line.slice(sp + 1),
+        };
+    });
+}
+
 const execAsyncBase = node_util.promisify(node_child_process.exec);
 async function execAsync(command, options) {
     const { stdout, stderr, hasErrored } = await execAsyncBase(command, { cwd: options?.cwd })
@@ -3584,8 +3607,8 @@ async function executeStepsForContextList({ baseBranch, branchFn, lumpVariables,
                         entry: postCommandExecFnInput,
                     });
                     if (!appendResult.success) {
-                        stepWalkFailure = failure({ message: appendResult.data });
-                        return;
+                        // TODO: sanitize history appending to avoid this warning for certain commands outputs
+                        logger.warn(`Failed to append history entry to ${keepHistoryFilePath}: ${appendResult.data}`);
                     }
                 }
                 if (postCommandExecFn) {
@@ -3675,7 +3698,7 @@ async function getGitignoresMap({ startDir, stopAtDir }) {
     const stopAtDirParent = path__namespace.dirname(stopAtDir);
     while (currentDir !== stopAtDirParent) {
         const gitignorePath = path__namespace.join(currentDir, '.gitignore');
-        const hasGitignore = await fs__namespace$1.access(gitignorePath).then(() => true).catch(() => false);
+        const hasGitignore = await pathExists(gitignorePath);
         if (hasGitignore) {
             const gitignoreContent = await fs__namespace$1.readFile(gitignorePath, 'utf-8');
             gitignores.set(currentDir, ignore().add(gitignoreContent));
@@ -3742,19 +3765,9 @@ async function getContextStatus(params) {
         return 'toDo';
     logger?.verbose(`logResult ${JSON.stringify(logResult.data)}`);
     const logResultOutput = logResult.data.stdout || logResult.data.stderr || '';
-    const matchingHashes = logResultOutput
-        .split('\n')
-        .map((line) => line.trim())
-        .filter((line) => !!line)
-        .map((line) => {
-        const sp = line ? line.indexOf(' ') : -1;
-        return {
-            hash: sp === -1 ? line : line.slice(0, sp),
-            subject: sp === -1 ? '' : line.slice(sp + 1),
-        };
-    })
-        .filter((c) => c.subject === commitMessage)
-        .map((c) => c.hash);
+    const matchingHashes = parseGitLogHashSubjectLines(logResultOutput)
+        .filter((entry) => entry.subject === commitMessage)
+        .map((entry) => entry.hash);
     logger?.verbose(`remoteName ${remoteName}`);
     logger?.verbose(`baseBranch ${baseBranch}`);
     logger?.verbose(`commitMessage ${commitMessage}`);
@@ -3967,7 +3980,6 @@ exports.collectStepsForContext = collectStepsForContext;
 exports.contextStatus = contextStatus;
 exports.contextStatusSchema = contextStatusSchema;
 exports.createConsoleLogger = createConsoleLogger;
-exports.decision = decision;
 exports.defaultGitAddCommandFn = defaultGitAddCommandFn;
 exports.defaultGitCommitCommandFn = defaultGitCommitCommandFn;
 exports.defaultGitCommitMessageFn = defaultGitCommitMessageFn;
@@ -3985,12 +3997,12 @@ exports.getCodeBasePaths = getCodeBasePaths;
 exports.getContextStatus = getContextStatus;
 exports.getToDoContextList = getToDoContextList;
 exports.historyFormatFromPath = historyFormatFromPath;
-exports.noopLogger = noopLogger;
+exports.parseGitLogHashSubjectLines = parseGitLogHashSubjectLines;
+exports.pathExists = pathExists;
 exports.readHistoryFile = readHistoryFile;
 exports.resolveSpawnExecutable = resolveSpawnExecutable;
 exports.runLump = runLump;
 exports.set = set;
-exports.shellBestEffort = shellBestEffort;
 exports.shellSingleQuote = shellSingleQuote;
 exports.success = success;
 exports.validateContextListNames = validateContextListNames;