@uss-stargazer/job-queue 0.0.1 → 0.0.3

package/README.md

@@ -1,4 +1,4 @@
-# Job Queue
+# job-queue
 
 The concept is modeling your todo-list as bite-sized jobs in a First-In, First-Out (FIFO) queue.
 The goal is to increase productivity.
@@ -8,7 +8,7 @@ The goal is to increase productivity.
 
 ## Install
 
-Can be installed system-wide if you have Node/NPM installed:
+Can be installed system-wide if you have NodeJS installed:
 
 ```
 npm install --global @uss-stargazer/job-queue
@@ -22,7 +22,59 @@ job-queue --help
 jobq --help
 ```
 
-## Workflow
+## Usage
+
+***TLDR***: The CLI tries to be user friendly, so just use it...
+
+It's just based on a few files: config.json, jobqueue.json, and projectpool.json. Strives to be
+a bit like Git in the sense that it opens data structures in the user's editor for updating data.
+
+### JSON schemas
+
+It's recommended that you use an editor or editor plugin with some sort of intellisense for JSON 
+schemas, as it makes it much easier to work with.
+
+If this isn't available, the expected structures can be found in the Zod schemas in
+`src/data/$TARGET.ts` (at the top of each).
+
+### Config options
+
+- `editor`: string to edit file when filepath is appended. If not specified, is infered from 
+environment vars or from your Git configuration, if you have that installed.
+- `confirmGistUpdates`: whether it should check before pushing or pulling gists from GitHub, if you
+have any set up (see [here](#syncing-with-gists)).
+- `confirmOffline`: whether to check before going into offline mode when there are gists configured
+and `github.com` cannot be resolved.
+- `showBanner`: whether to show ASCII art banner on start
+
+### Syncing with gists
+
+`job-queue` allows you to sync data files with a gist/gists on your GitHub account. This provides 
+cloud storage and makes the program more portable.
+
+To link to a gist, provide the gist ID and a GitHub access token in config.json, like:
+
+```json
+{
+  "$schema": "/job-queue/schemas/config.schema.json",
+  "jobqueue": {
+    "local": "/job-queue/jobqueue.json",
+    "ghGistId": "00000000000000000000000000000000",
+    "ghAccessToken": "ghp_000000000000000000000000000000000000"
+  },
+  "projectpool": {
+    "local": "/job-queue/projectpool.json",
+    "ghGistId": "00000000000000000000000000000000",
+    "ghAccessToken": "ghp_000000000000000000000000000000000000"
+  },
+  "schemas": "/job-queue/schemas",
+}
+```
+
+Your gist ID can be copied easily from the URL; usually something like `https://gist.github.com/USERNAME/GIST_ID`.
+
+
+## Sample Workflow
 
 - _\[Daemon\]_ Spontaneous, not fleshed out ideas get immediately added to the project pool as "inactive".
 - You should generally have an idea of a few projects you want to focus on at a time. For each, push

package/dist/actions.js

@@ -86,6 +86,7 @@ const actions = {
         });
         reorder(queue, reorderedQueueIdxs.map(({ value: jobIdx }) => jobIdx));
         console.log(chalk.green('✔'), 'Queue reordered.');
+        // Open checked activities for editing
         const checkedActivities = reorderedQueueIdxs
             .map(({ checked }, jobIdx) => ({ checked, jobIdx }))
             .filter(({ checked }) => checked);
@@ -144,6 +145,7 @@ const actions = {
             console.log(chalk.red('[e]'), 'No projects in pool.');
             return;
         }
+        // Get project name to edit
         const projectName = await search({
             message: 'Enter the name of the project to edit',
             source: (partialProjectName) => {
@@ -158,6 +160,7 @@ const actions = {
         if (projectIdx < 0)
             throw new Error('Invalid project name');
         const [project] = pool.splice(projectIdx, 1);
+        // Do the editing
         try {
             const updatedProject = await updateProject(project, projectpool, jobqueue, config.data);
             if (updatedProject !== 'deleted') {
@@ -170,7 +173,7 @@ const actions = {
             await projectpool.sync();
         }
         catch (error) {
-            if (error instanceof AbortError)
+            if (!(error instanceof AbortError))
                 throw error;
             console.log(chalk.red('[e]'), error.message);
             pool.push(project);
@@ -178,3 +181,4 @@ const actions = {
     },
 };
 export default actions;
+//# sourceMappingURL=actions.js.map

package/dist/actions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}

package/dist/data/config.js

@@ -3,13 +3,14 @@ import envPaths from 'env-paths';
 import path from 'path';
 import fs from 'fs/promises';
 import { existsSync } from 'fs';
-import { makeJsonData } from '../utils/jsonData.js';
 import chalk from 'chalk';
 import { JobQueueSchema, JobSchema } from './jobqueue.js';
-import { ProjectPoolSchema, ProjectSchema, } from './projectpool.js';
+import { ProjectPoolSchema, ProjectSchema } from './projectpool.js';
 import { confirm } from '@inquirer/prompts';
 import { fileURLToPath, pathToFileURL } from 'url';
 import pkg from '../../package.json' with { type: 'json' };
+import { getDataTargetNicely } from '../utils/promptUser.js';
+// Types / Schemas
 const jsonSchemaNames = [
     'job',
     'jobqueue',
@@ -18,12 +19,41 @@ const jsonSchemaNames = [
     'config',
 ];
 const NonemptyString = z.string().nonempty();
+// prettier-ignore
+const GistDataObject = z.object({
+    local: NonemptyString.meta({ title: "Local JSON path", description: "Path to local JSON file for data linked to the Gist." }),
+    ghGistId: NonemptyString.regex(/^[A-Fa-f0-9]{32}$/, { error: "Is not valid GitHub gist ID" }).meta({ title: "Gist ID", description: "ID of gist to link (can get from URL of the gist you created)." }),
+    ghAccessToken: NonemptyString.regex(/^(gh[ps]_[a-zA-Z0-9]{36}|github_pat_[a-zA-Z0-9]{22}_[a-zA-Z0-9]{59})$/, { error: "Is not valid GitHub access token" }).meta({ title: "Gist Access Token", description: "GitHub access token for read/write access to your gist." })
+}).meta({ title: "Gist-Linked JSON", description: "Data for a configuration/data file linked to a GitHub gist." });
+// !!! NOTE !!! Whenever you change this schema, PLEASE update package.json version (so JSON schemas will get updated automatically)
+// prettier-ignore
 export const ConfigSchema = z.object({
-    jobqueue: NonemptyString.optional().meta({ title: "Jobqueue path", description: "Path to jobqueue.json." }),
-    projectpool: NonemptyString.optional().meta({ title: "Projectpool path", description: "Path to projectpool.json." }),
-    editor: NonemptyString.optional().meta({ title: "Editor command", description: "Command to run editor. Will be run like `<editor> /some/data.json` so make sure it waits." }),
+    jobqueue: z.union([
+        NonemptyString.meta({ title: "Jobqueue path", description: "Path to local jobqueue.json." }),
+        GistDataObject.meta({ title: "Gist-Linked Jobqueue", description: "Data for jobqueue.json locally and linked to gist on GitHub." })
+    ]),
+    projectpool: z.union([
+        NonemptyString.meta({ title: "Projectpool path", description: "Path to local projectpool.json." }),
+        GistDataObject.meta({ title: "Gist-Linked Jobqueue", description: "Data for projectpool.json locally and linked to gist on GitHub." })
+    ]),
+    // schemas stored as path to schemas dir, but expanded on parse
     schemas: NonemptyString.meta({ title: "Schemas directory", description: `Path to directory containing: ${jsonSchemaNames.map(base => `${base}.schema.json`).join(", ")}.` }).transform((schemasDir) => Object.fromEntries(jsonSchemaNames.map((base) => [base, pathToFileURL(path.resolve(schemasDir, `${base}.schema.json`)).href]))),
+    editor: NonemptyString.optional().meta({ title: "Editor command", description: "Command to run editor. Will be run like `<editor> /some/data.json` so make sure it waits." }),
+    confirmGistUpdates: z.boolean().optional().describe("Whether to prompt before pushing or pulling a gist from GitHub."),
+    confirmOffline: z.boolean().optional().describe("Whether to confirm before using offline (if there are gists in config)."),
+    showBanner: z.boolean().optional().describe("Show ASCII art banner on start.")
 });
+export const toInputConfig = (outputData) => {
+    const schemaDir = Object.values(outputData.schemas).reduce((schemaDir, schemaPath) => {
+        const thisSchemaDir = path.dirname(fileURLToPath(schemaPath));
+        return schemaDir === null || schemaDir === thisSchemaDir
+            ? thisSchemaDir
+            : (() => {
+                throw new Error('Decoded invidual schemas are not in the same directory.');
+            })();
+    }, null);
+    return { ...outputData, schemas: schemaDir };
+};
 const jsonSchemas = {
     job: JobSchema,
     jobqueue: JobQueueSchema,
@@ -31,7 +61,9 @@ const jsonSchemas = {
     projectpool: ProjectPoolSchema,
     config: ConfigSchema,
 };
-const updateNestedObject = async (base, update) => {
+// Methods
+const updateNestedObject = async (// eslint-disable-line @typescript-eslint/no-explicit-any
+base, update) => {
     const keys = [...Object.keys(update)];
     for (const key of keys) {
         if (typeof base[key] === 'object' &&
@@ -48,11 +80,14 @@ const updateNestedObject = async (base, update) => {
         }
     }
 };
+// JSON schema methods
 const getJsonSchemaId = (schemaFileUrl) => path.posix.join(pkg.version, path.basename(fileURLToPath(schemaFileUrl)));
 const versionFromJsonSchemaId = (id) => path.dirname(id);
 const updateJsonSchema = async (schemaSchema, schemaFileUrl) => {
     const schemaPath = fileURLToPath(schemaFileUrl);
-    await fs.mkdir(path.dirname(schemaPath), { recursive: true });
+    const schemaDir = path.dirname(schemaPath);
+    if (!existsSync(schemaDir))
+        await fs.mkdir(schemaDir, { recursive: true });
     return await fs.writeFile(schemaPath, JSON.stringify({
         $id: getJsonSchemaId(schemaFileUrl),
         ...schemaSchema.toJSONSchema({
@@ -61,10 +96,8 @@ const updateJsonSchema = async (schemaSchema, schemaFileUrl) => {
         }),
     }, undefined, '  '));
 };
-const defaultData = {
-    jobqueue: { queue: [] },
-    projectpool: { pool: [] },
-};
+// Config methods
+export const getDataPathFromConfig = (data) => (typeof data === 'string' ? data : data.local);
 const createConfig = async (configDir, override) => {
     const config = {
         jobqueue: path.resolve(configDir, 'jobqueue.json'),
@@ -73,39 +106,20 @@ const createConfig = async (configDir, override) => {
         ...override,
     };
     const decodedConfig = ConfigSchema.decode(config);
-    for (const key of ['jobqueue', 'projectpool']) {
-        if (!existsSync(config[key])) {
-            console.log(chalk.blue('[i]'), `Creating ${path.join('{config}', path.relative(configDir, config[key]))}...`);
-            await fs.writeFile(config[key], JSON.stringify({
-                $schema: decodedConfig.schemas[key],
-                ...defaultData[key],
-            }, undefined, '  '));
-        }
-    }
-    await fs.mkdir(config.schemas);
+    // schemas
+    if (!existsSync(config.schemas))
+        await fs.mkdir(config.schemas);
     for (const schema of jsonSchemaNames) {
         if (!existsSync(decodedConfig.schemas[schema])) {
             console.log(chalk.blue('[i]'), `Creating ${path.join('{config}', path.relative(configDir, fileURLToPath(decodedConfig.schemas[schema])))}...`);
             await updateJsonSchema(jsonSchemas[schema], decodedConfig.schemas[schema]);
         }
     }
-    return { encoded: config, decoded: decodedConfig };
+    return { encoded: config, jsonSchemaUrl: decodedConfig.schemas.config };
 };
-const checkConfig = async (config, configPath) => {
+const checkConfigSchemas = async (config, configPath) => {
     try {
-        for (const key of ['jobqueue', 'projectpool']) {
-            if (!existsSync(config[key]))
-                if (['jobqueue', 'projectpool'].includes(key) &&
-                    (await confirm({
-                        message: `File at config.${key} does not exist. Want to create it?`,
-                    })))
-                    await fs.writeFile(config[key], JSON.stringify({
-                        $schema: config.schemas[key],
-                        ...defaultData[key],
-                    }, undefined, '  '));
-                else
-                    throw new Error(`File '${config[key]}' in config does not exist`);
-        }
+        // Make sure each schema exists and is the correct version
         const outdatedSchemas = [];
         for (const schema of Object.keys(config.schemas)) {
             const schemaPath = fileURLToPath(config.schemas[schema]);
@@ -115,7 +129,7 @@ const checkConfig = async (config, configPath) => {
                 }));
                 const version = schemaJson.$id && versionFromJsonSchemaId(schemaJson.$id);
                 if (!version || !/^\d+\.\d+\.\d+$/.test(version)) {
-                    console.log(chalk.yellow('[w]'), `${path.join('{config}', path.basename(config.schemas[schema]))} is malformed. Overwriting...`);
+                    console.log(chalk.yellow('[w]'), `${path.join('{schemas}', path.basename(config.schemas[schema]))} is malformed. Overwriting...`);
                     await updateJsonSchema(jsonSchemas[schema], config.schemas[schema]);
                 }
                 else if (version !== pkg.version) {
@@ -123,7 +137,7 @@ const checkConfig = async (config, configPath) => {
                 }
             }
             else {
-                console.log(chalk.blue('[i]'), `${path.join('{config}', path.basename(config.schemas[schema]))} does not exist. Creating...`);
+                console.log(chalk.blue('[i]'), `${path.join('{schemas}', path.basename(config.schemas[schema]))} does not exist. Creating...`);
                 await updateJsonSchema(jsonSchemas[schema], config.schemas[schema]);
             }
         }
@@ -142,17 +156,17 @@ const checkConfig = async (config, configPath) => {
 export const getConfig = async (overrideConfigDir, overrideConfig) => {
     const configDir = overrideConfigDir ?? path.resolve(envPaths('job-queue').config);
     const configPath = path.resolve(configDir, 'config.json');
-    await fs.mkdir(configDir, { recursive: true });
-    if (!existsSync(configPath)) {
-        console.log(chalk.blue('[i]'), `Creating config at '${configPath}'...`);
-        const { encoded: config, decoded: decodedConfig } = await createConfig(configDir, overrideConfig);
-        await fs.writeFile(configPath, JSON.stringify({
-            $schema: decodedConfig.schemas['config'],
-            ...config,
-        }, undefined, '  '));
-    }
-    const configData = await makeJsonData(configPath, ConfigSchema);
-    await checkConfig(configData.data, configPath);
+    if (!existsSync(configDir))
+        await fs.mkdir(configDir, { recursive: true });
+    // Get config data
+    const { data: configData, hadToCreate } = await getDataTargetNicely(ConfigSchema, { name: 'config.json', expectedPath: configPath }, () => createConfig(configDir, overrideConfig), false, toInputConfig);
+    // Validate and apply config data contents
     await updateNestedObject(configData.data, ConfigSchema.partial().decode(overrideConfig));
-    return configData;
+    await checkConfigSchemas(configData.data, configPath);
+    return {
+        config: configData,
+        path: configPath,
+        hadToCreate,
+    };
 };
+//# sourceMappingURL=config.js.map

package/dist/data/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/data/config.ts"],"names":[],"mappings":"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"}

package/dist/data/index.js

@@ -1,9 +1,51 @@
 import { JobQueueSchema } from './jobqueue.js';
 import { ProjectPoolSchema } from './projectpool.js';
-import { ConfigSchema } from './config.js';
+import { ConfigSchema, getDataPathFromConfig, toInputConfig, } from './config.js';
+import { select } from '@inquirer/prompts';
+import { ExitPromptError } from '@inquirer/core';
+import { AbortError } from '../utils/index.js';
+import chalk from 'chalk';
+import { haveUserUpdateData } from '../utils/promptUser.js';
 export const dataNames = ['jobqueue', 'projectpool', 'config'];
 export const dataSchemas = {
     jobqueue: JobQueueSchema,
     projectpool: ProjectPoolSchema,
     config: ConfigSchema,
 };
+export async function editData(data, configPath) {
+    try {
+        const target = await select({
+            message: 'Select data to edit',
+            choices: [
+                { name: 'jobqueue.json', value: 'jobqueue' },
+                { name: 'projectpool.json', value: 'projectpool' },
+                { name: 'config.json', value: 'config' },
+            ],
+        });
+        const targetSchema = dataSchemas[target];
+        const targetPath = target === 'config'
+            ? configPath
+            : getDataPathFromConfig(data.config.data[target]);
+        await haveUserUpdateData(targetSchema, target === 'config'
+            ? toInputConfig(data[target].data)
+            : data[target].data, {
+            editor: data.config.data.editor,
+            errorHead: 'Edit data failed',
+            jsonSchemaUrl: data.config.data.schemas[target],
+            file: { type: 'abs', path: targetPath },
+        }, {
+            preparse(raw) {
+                return raw.trim().length === 0
+                    ? { errMessage: 'Cannot delete data file.' }
+                    : 'continue';
+            },
+        });
+    }
+    catch (error) {
+        if (error instanceof AbortError || error instanceof ExitPromptError)
+            console.log(chalk.red('[e]'), error.message);
+        else
+            throw error;
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/data/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,aAAa,GACd,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAU,CAAC;AAExE,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,iBAAiB;IAC9B,MAAM,EAAE,YAAY;CAC6B,CAAC;AAWpD,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,IAAiB,EACjB,UAAkB;IAElB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;YAC1B,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE;gBAC5C,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,aAAa,EAAE;gBAClD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE;aAChC;SACX,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,UAAU,GACd,MAAM,KAAK,QAAQ;YACjB,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAEtD,MAAM,kBAAkB,CACtB,YAAY,EACZ,MAAM,KAAK,QAAQ;YACjB,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EACrB;YACE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM;YAC/B,SAAS,EAAE,kBAAkB;YAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/C,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE;SACxC,EACD;YACE,QAAQ,CAAC,GAAG;gBACV,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;oBAC5B,CAAC,CAAC,EAAE,UAAU,EAAE,0BAA0B,EAAE;oBAC5C,CAAC,CAAC,UAAU,CAAC;YACjB,CAAC;SACF,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,eAAe;YACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;;YAC1C,MAAM,KAAK,CAAC;IACnB,CAAC;AACH,CAAC"}

package/dist/data/jobqueue.js

@@ -1,17 +1,25 @@
 import * as z from 'zod';
-import { makeJsonData } from '../utils/jsonData.js';
 import { checkProjectName } from './projectpool.js';
-import { haveUserUpdateData } from '../utils/index.js';
+import { makeGistData } from '../utils/gistData.js';
+import { getDataTargetNicely, handleInvalidGist, haveUserUpdateData, makeGistConflictHandler, } from '../utils/promptUser.js';
+// Types / Schemas
+// prettier-ignore
 export const JobSchema = z.object({
     name: z.string().trim().nonempty().meta({ title: 'Job name', description: 'Short name of the job (think a single commit message). Used as job identifier.' }),
     objectivies: z.array(z.string().trim().nonempty()).meta({ title: 'Job objectivies', description: 'A list of objectives to complete for this job. Purely for your benefit.' }),
     updates: z.string().optional().meta({ title: 'Job updates', description: "Put any notes/updates to the job here while you're working. Optional." }),
     project: z.string().trim().nonempty().meta({ title: 'Associated project', description: 'Corresponding project ID in projectpool.json.' }),
 }).meta({ title: 'Job', description: 'A single job entry for JobQueue.' });
+// prettier-ignore
 export const JobQueueSchema = z.object({
     queue: z.array(JobSchema).meta({ title: 'Job queue' }),
 }).meta({ title: 'Job queue root', description: 'Root object for jobs/tasks FIFO queue model.' });
-export const getJobQueue = async (jsonPath) => await makeJsonData(jsonPath, JobQueueSchema);
+const defaultJobQueue = { queue: [] };
+// Methods
+export const getJobQueue = async (jsonPath, jsonSchemaUrl, autoCreateFiles = false, editor) => {
+    const { data } = await getDataTargetNicely(JobQueueSchema, { name: 'jobqueue.json', expectedPath: jsonPath, jsonSchemaUrl }, async () => ({ encoded: defaultJobQueue }), autoCreateFiles);
+    return await makeGistData(JobQueueSchema, data, 'jobqueue.json', makeGistConflictHandler(JobQueueSchema, editor), handleInvalidGist, "JSON to keep track of `jobqueue` data for this user's job-queue implementation (this is probably autogenerated).");
+};
 export const updateJob = async (job, projectPool, config) => {
     const pool = projectPool.data.pool;
     let userDeletedJob = false;
@@ -26,6 +34,7 @@ export const updateJob = async (job, projectPool, config) => {
         jsonSchemaUrl: config.schemas.job,
     }, {
         preparse(rawContents) {
+            // Check if user deleted the job
             if (rawContents.trim().length === 0) {
                 userDeletedJob = true;
                 return 'pass';
@@ -41,6 +50,7 @@ export const updateJob = async (job, projectPool, config) => {
         },
     });
     if (!userDeletedJob) {
+        // Make sure corresponding project is set to active
         const jobProject = pool.find((project) => project.name === updatedJob.project);
         if (jobProject.status !== 'active') {
             jobProject.status = 'active';
@@ -49,3 +59,4 @@ export const updateJob = async (job, projectPool, config) => {
     }
     return userDeletedJob ? 'deleted' : updatedJob;
 };
+//# sourceMappingURL=jobqueue.js.map

package/dist/data/jobqueue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jobqueue.js","sourceRoot":"","sources":["../../src/data/jobqueue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAe,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAY,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAEhC,kBAAkB;AAElB,kBAAkB;AAClB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,gFAAgF,EAAC,CAAC;IAC3J,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,yEAAyE,EAAC,CAAC;IAC3K,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,uEAAuE,EAAC,CAAC;IACjJ,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,+CAA+C,EAAC,CAAC;CACxI,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kCAAkC,EAAE,CAAC,CAAC;AAE3E,kBAAkB;AAClB,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;CACvD,CAAC,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,8CAA8C,EAAC,CAAC,CAAC;AAGhG,MAAM,eAAe,GAAa,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAEhD,UAAU;AAEV,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,QAAgB,EAChB,aAAqB,EACrB,kBAA2B,KAAK,EAChC,MAAe,EACc,EAAE;IAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,mBAAmB,CACxC,cAAc,EACd,EAAE,IAAI,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,EAChE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,EAC1C,eAAe,CAChB,CAAC;IACF,OAAO,MAAM,YAAY,CACvB,cAAc,EACd,IAAI,EACJ,eAAe,EACf,uBAAuB,CAAC,cAAc,EAAE,MAAM,CAAC,EAC/C,iBAAiB,EACjB,kHAAkH,CACnH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,GAAQ,EACR,WAAkC,EAClC,MAAc,EACY,EAAE;IAC5B,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IAEnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,kBAAkB,CACzC,SAAS,EACT,GAAG,EACH;QACE,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,SAAS,EAAE,cAAc;QACzB,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE;QAC7C,QAAQ,EAAE;YACR,yCAAyC;YACzC,yCAAyC;SAC1C;QACD,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG;KAClC,EACD;QACE,QAAQ,CAAC,WAAW;YAClB,gCAAgC;YAChC,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpC,cAAc,GAAG,IAAI,CAAC;gBACtB,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC;gBACxC,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC;oBACE,UAAU,EAAE,0BAA0B,GAAG,CAAC,OAAO,uBAAuB;iBACzE,CAAC;QACR,CAAC;KACF,CACF,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,mDAAmD;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,CACjD,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACnC,UAAU,CAAC,MAAM,GAAG,QAAQ,CAAC;YAC7B,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;AACjD,CAAC,CAAC"}

package/dist/data/projectpool.js

@@ -1,17 +1,25 @@
 import { confirm } from '@inquirer/prompts';
 import * as z from 'zod';
-import { makeJsonData } from '../utils/jsonData.js';
-import { haveUserUpdateData } from '../utils/index.js';
+import { makeGistData } from '../utils/gistData.js';
+import { getDataTargetNicely, handleInvalidGist, haveUserUpdateData, makeGistConflictHandler, } from '../utils/promptUser.js';
+// Types / Schemas
+// prettier-ignore
 export const ProjectSchema = z.object({
     name: z.string().trim().nonempty().meta({ title: 'Project name', description: 'Name of the project. Used as identifier.' }),
     description: z.string().optional().meta({ title: 'Project description', description: 'Longer description of the project. For your benefit, optional.' }),
     repo: z.url().optional().meta({ title: 'Project repository', description: 'URL to project repository. For your benefit, optional.' }),
     status: z.enum(['active', 'inactive', 'complete']).meta({ title: 'Project status', description: "Status of this project. 'active': they are referenced in jobqueue.json, 'inactive': they aren't referenced anywhere and aren't done, 'complete': they're done." }),
 }).meta({ title: 'Project', description: 'A single project entry for JobQueue (usually matches up with a GitHub repo, if you use that).' });
+// prettier-ignore
 export const ProjectPoolSchema = z.object({
     pool: z.array(ProjectSchema).meta({ description: 'Set of projects, works in progress or just ideas.' }),
 }).meta({ title: 'Root project pool', description: 'Root object for pool of projects.' });
-export const getProjectPool = async (jsonPath) => await makeJsonData(jsonPath, ProjectPoolSchema);
+const defaultProjectPool = { pool: [] };
+// Methods
+export const getProjectPool = async (jsonPath, jsonSchemaUrl, autoCreateFiles = false, editor) => {
+    const { data } = await getDataTargetNicely(ProjectPoolSchema, { name: 'projectpool.json', expectedPath: jsonPath, jsonSchemaUrl }, async () => ({ encoded: defaultProjectPool }), autoCreateFiles);
+    return await makeGistData(ProjectPoolSchema, data, 'projectpool.json', makeGistConflictHandler(ProjectPoolSchema, editor), handleInvalidGist, "JSON to keep track of `projectpool` data for this user's job-queue implementation (this is probably autogenerated).");
+};
 export const checkProjectName = (name, projects) => projects.some((project) => project.name === name);
 export const updateProject = async (project, projectPool, jobQueue, config) => {
     const pool = projectPool.data.pool;
@@ -28,6 +36,7 @@ export const updateProject = async (project, projectPool, jobQueue, config) => {
         jsonSchemaUrl: config.schemas.project,
     }, {
         preparse(rawContents) {
+            // Check if user deleted the project
             if (rawContents.trim().length === 0) {
                 userDeletedProject = true;
                 return 'pass';
@@ -48,6 +57,7 @@ export const updateProject = async (project, projectPool, jobQueue, config) => {
             return 'continue';
         },
     });
+    // Check if user wants to rename referencing jobs
     if (!userDeletedProject &&
         updatedProject.name !== project.name &&
         jobsReferencingProject.length > 0) {
@@ -61,5 +71,16 @@ export const updateProject = async (project, projectPool, jobQueue, config) => {
             await jobQueue.sync();
         }
     }
+    // Check if user wants to delete referencing jobs
+    if (userDeletedProject && jobsReferencingProject.length > 0) {
+        const deleteJobReferences = await confirm({
+            message: `You are deleting this project. Would you like to delete all referencing jobs, too?`,
+        });
+        if (deleteJobReferences) {
+            jobQueue.data.queue = jobQueue.data.queue.filter((job) => job.project !== project.name);
+            await jobQueue.sync();
+        }
+    }
     return userDeletedProject ? 'deleted' : updatedProject;
 };
+//# sourceMappingURL=projectpool.js.map

package/dist/data/projectpool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectpool.js","sourceRoot":"","sources":["../../src/data/projectpool.ts"],"names":[],"mappings":"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"}