@qaecy/cue-cli 0.0.42 → 0.0.44

package/main.js

@@ -8347,6 +8347,9 @@ WHERE {
       { relativePath: file.relativePath, md5: file.md5, size: file.size, providerId, fileContentExists: false }
     );
   }
+  async getTierNames() {
+    return this._fetchTierNames();
+  }
   async _fetchTierNames() {
     try {
       const text = await this._blob.downloadPublic("tier-names.json");
@@ -9202,7 +9205,7 @@ function askConfirm(question) {
   });
 }
 async function syncHandler(options) {
-  const { space, path, verbose, provider, emulators, zip, legacy, metadataOnly } = options;
+  const { path, verbose, provider, emulators, zip, legacy, metadataOnly } = options;
   try {
     const cue = new CueNode({
       apiKey: FIREBASE_CONFIG().apiKey,
@@ -9218,6 +9221,45 @@ async function syncHandler(options) {
       );
       process.exit(1);
     }
+    let space = options.space;
+    if (!space) {
+      const tempUser = await cue.auth.signInWithApiKey(key).catch((err) => {
+        const cause = err instanceof Error ? err.message : String(err);
+        console.error(`Couldn't authenticate. ${cause}`);
+        process.exit(1);
+      });
+      const allProjects = await cue.projects.listProjects();
+      const syncable = allProjects.filter(
+        (p) => p.syncers?.includes(tempUser.uid) || p.admins?.includes(tempUser.uid)
+      );
+      if (syncable.length === 0) {
+        console.error("You do not have syncer or admin rights on any project.");
+        process.exit(1);
+      }
+      if (syncable.length === 1) {
+        space = syncable[0].id;
+        console.info(`Using project: ${syncable[0].name} (${space})`);
+      } else {
+        console.log("\nProjects you can sync to:");
+        syncable.forEach((p, i) => console.log(`  ${i + 1}. ${p.name} (${p.id})`));
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        space = await new Promise((resolveInput) => {
+          rl.question(`Enter number (1-${syncable.length}): `, (answer) => {
+            rl.close();
+            const idx = parseInt(answer.trim(), 10) - 1;
+            if (idx >= 0 && idx < syncable.length) {
+              resolveInput(syncable[idx].id);
+            } else {
+              console.error("Invalid selection.");
+              process.exit(1);
+            }
+          });
+        });
+      }
+    }
+    if (!space) {
+      process.exit(1);
+    }
     if (verbose)
       console.info("Building sync base \u23F3");
     const resolvedPath = (0, import_path3.resolve)(path);
@@ -9546,39 +9588,66 @@ Triples only in file 2 (${result.triplesOnlyInFile2.size}):`);
 
 // apps/desktop/cue-cli/src/cue-cli-create-project.ts
 var readline2 = __toESM(require("readline"));
-function ask(rl, question) {
-  return new Promise((resolve2, reject) => {
-    try {
-      rl.question(question, (answer) => resolve2(answer.trim()));
-    } catch (err) {
-      if (err.code === "ERR_USE_AFTER_CLOSE") {
-        reject(new Error("INPUT_CLOSED"));
-      } else {
-        reject(err);
+function createAsker(rl) {
+  const lineQueue = [];
+  const waiters = [];
+  let closed = false;
+  rl.on("line", (line) => {
+    if (waiters.length > 0) {
+      const waiter = waiters.shift();
+      if (waiter) {
+        process.stdout.write(line + "\n");
+        waiter.resolve(line.trim());
       }
+    } else {
+      lineQueue.push(line);
     }
   });
+  rl.on("close", () => {
+    closed = true;
+    for (const waiter of waiters.splice(0)) {
+      waiter.reject(new Error("INPUT_CLOSED"));
+    }
+  });
+  return (question) => {
+    process.stdout.write(question);
+    if (lineQueue.length > 0) {
+      const answer = lineQueue.shift() ?? "";
+      process.stdout.write(answer + "\n");
+      return Promise.resolve(answer.trim());
+    }
+    if (closed) {
+      return Promise.reject(new Error("INPUT_CLOSED"));
+    }
+    return new Promise((resolve2, reject) => {
+      waiters.push({ resolve: resolve2, reject });
+    });
+  };
 }
-async function pickOne(rl, label, items, display) {
+async function pickOne(ask, label, items, display) {
   console.log(`
 ${label}`);
   items.forEach((item, i) => console.log(`  ${i + 1}. ${display(item)}`));
-  while (true) {
-    const answer = await ask(rl, `Enter number (1-${items.length}): `);
+  let selected = [];
+  while (selected.length === 0 || items.length === 1) {
+    const answer = await ask(`Enter number (1-${items.length}): `);
     const idx = parseInt(answer, 10) - 1;
-    if (idx >= 0 && idx < items.length)
-      return items[idx];
+    if (idx >= 0 && idx < items.length) {
+      selected = [items[idx]];
+      break;
+    }
     console.log("  Invalid selection, try again.");
   }
+  return selected[0];
 }
-async function pickMultipleOrAll(rl, label, items, display) {
+async function pickMultipleOrAll(ask, label, items, display) {
   if (items.length === 0)
     return [];
   console.log(`
 ${label}`);
   items.forEach((item, i) => console.log(`  ${i + 1}. ${display(item)}`));
   console.log(`  0. All`);
-  const answer = await ask(rl, `Enter comma-separated numbers or 0 for all: `);
+  const answer = await ask(`Enter comma-separated numbers or 0 for all: `);
   if (answer === "0")
     return items;
   const indices = answer.split(",").map((s) => parseInt(s.trim(), 10) - 1).filter((i) => i >= 0 && i < items.length);
@@ -9586,7 +9655,8 @@ ${label}`);
 }
 async function createProjectHandler(options) {
   const { emulators, verbose } = options;
-  const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+  const rl = readline2.createInterface({ input: process.stdin, terminal: process.stdout.isTTY });
+  const ask = createAsker(rl);
   try {
     const key = options.key ?? process.env.CUE_API_KEY;
     if (!key) {
@@ -9623,7 +9693,7 @@ async function createProjectHandler(options) {
         console.error("No organisations found on the platform.");
         process.exit(1);
       }
-      const picked = await pickOne(rl, "Select organisation:", allOrgs, (o) => `${o.name} (${o.id})`);
+      const picked = await pickOne(ask, "Select organisation:", allOrgs, (o) => `${o.name} (${o.id})`);
       orgId = picked.id;
       orgName = picked.name;
       callerIsOrgAdmin = picked.admins?.includes(user.uid) ?? false;
@@ -9637,7 +9707,7 @@ async function createProjectHandler(options) {
         console.error("You are not an admin of any organisation. Cannot create a project.");
         process.exit(1);
       }
-      const picked = await pickOne(rl, "Select organisation:", adminOrgs, (o) => `${o.name} (${o.id})`);
+      const picked = await pickOne(ask, "Select organisation:", adminOrgs, (o) => `${o.name} (${o.id})`);
       orgId = picked.id;
       orgName = picked.name;
       callerIsOrgAdmin = true;
@@ -9645,13 +9715,18 @@ async function createProjectHandler(options) {
     }
     console.log(`
 Organisation: ${orgName} (${orgId})`);
-    const projectName = await ask(rl, "\nProject name: ");
+    const projectName = await ask("\nProject name: ");
     if (!projectName) {
       console.error("Project name is required.");
       process.exit(1);
     }
+    const tierNames = await cue.api.sync.getTierNames().catch(() => ({}));
+    const tierLabel = (key2, fallback, isDefault = false) => {
+      const name = tierNames[key2] ?? fallback;
+      return isDefault ? `${name} (default)` : name;
+    };
     const graphType = await pickOne(
-      rl,
+      ask,
       "Select graph backend (default: QLever):",
       [
         { value: "qlever", label: "QLever (recommended)" },
@@ -9660,12 +9735,12 @@ Organisation: ${orgName} (${orgId})`);
       (item) => item.label
     ).then((item) => item.value);
     const tier = await pickOne(
-      rl,
-      "Select processing tier (default: L \u2014 Large):",
+      ask,
+      "Select processing tier:",
       [
-        { value: "l", label: "L \u2014 Large (default)" },
-        { value: "m", label: "M \u2014 Medium" },
-        { value: "s", label: "S \u2014 Small" }
+        { value: "l", label: tierLabel("l", "Large", true) },
+        { value: "m", label: tierLabel("m", "Medium") },
+        { value: "s", label: tierLabel("s", "Small") }
       ],
       (item) => item.label
     ).then((item) => item.value);
@@ -9680,7 +9755,7 @@ Organisation: ${orgName} (${orgId})`);
       }
       while (selectedAdmins.length === 0) {
         selectedAdmins = await pickMultipleOrAll(
-          rl,
+          ask,
           "Select project admin(s) \u2014 at least one required:",
           orgAdmins,
           (m) => `${m.name} <${m.email}>`
@@ -9692,20 +9767,20 @@ Organisation: ${orgName} (${orgId})`);
     const nonAdminMembers = orgMembers.filter((m) => !selectedAdmins.some((a5) => a5.uid === m.uid));
     if (nonAdminMembers.length > 0) {
       selectedMembers = await pickMultipleOrAll(
-        rl,
+        ask,
         "Select project members:",
         nonAdminMembers,
         (m) => `${m.name} <${m.email}>${m.isAdmin ? " (org admin)" : ""}`
       );
     }
     if (selectedMembers.length > 0) {
-      const answer = await ask(rl, `
+      const answer = await ask(`
 Set all selected members as syncers as well? (Y/n): `);
       if (answer.toLowerCase() !== "n") {
         selectedSyncers = selectedMembers;
       } else {
         selectedSyncers = await pickMultipleOrAll(
-          rl,
+          ask,
           "Select project syncers:",
           selectedMembers,
           (m) => `${m.name} <${m.email}>`
@@ -9725,7 +9800,7 @@ Set all selected members as syncers as well? (Y/n): `);
     console.log(`  Members      : ${selectedMembers.length === 0 ? "(none)" : selectedMembers.map((m) => m.email).join(", ")}`);
     console.log(`  Syncers      : ${selectedSyncers.length === 0 ? "(none)" : selectedSyncers.map((m) => m.email).join(", ")}`);
     console.log("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-    const confirm = await ask(rl, "\nCreate project? (Y/n): ");
+    const confirm = await ask("\nCreate project? (Y/n): ");
     if (confirm.toLowerCase() === "n") {
       console.log("Aborted.");
       process.exit(0);
@@ -9770,10 +9845,18 @@ Project created \u2705`);
     console.log(`  ID   : ${created["id"]}`);
     console.log(`  Name : ${created["name"]}`);
   } catch (err) {
-    if (err.message === "INPUT_CLOSED") {
+    if (err instanceof Error && err.message === "INPUT_CLOSED") {
       console.error("Aborted: input stream closed before all prompts were answered.");
       process.exit(1);
     }
+    if (err instanceof Error && err.message.includes("403")) {
+      console.error("You do not have permission to create a project. Only organization admins can create projects.");
+      process.exit(1);
+    }
+    if (err instanceof Error && /\b5\d\d\b/.test(err.message)) {
+      console.error(`Server error: Project creation failed. Contact your administrator.`);
+      process.exit(1);
+    }
     throw err;
   } finally {
     rl.close();
@@ -9794,7 +9877,7 @@ try {
 }
 var program = new import_commander.Command();
 program.name("cue-cli").description("Cue Command Line Interface").version(packageJson.version);
-program.command("sync").description("Sync files to Cue").requiredOption("-s, --space <id>", "Specify the space ID (required)").requiredOption("-p, --path <id>", "Specify the folder path (required)").option("-k, --key <api-key>", "Specify the API key (or set CUE_API_KEY env variable)").option("--provider <provider ID>", "Specify the provider ID (eg. sharepoint, drive, dropbox) or leave empty for default provider", "").option("-v, --verbose", "Enable verbose output", false).option("-e, --emulators", "Uses emulators for sync", false).option("-z, --zip", 'Include zipped content (will be unzipped to path "<zip_path>_unzipped". Max uncompressed size: 500 MB, max recursion depth: 3)', false).option("--legacy", "Write RDF as BLOBs to the processed bucket instead of patching the graph directly", false).option("--metadata-only", "Push filesystem-structure metadata for all local files without checking credits or remote state", false).action(syncHandler);
+program.command("sync").description("Sync files to Cue").option("-s, --space <id>", "Specify the space ID (omit to pick interactively)").requiredOption("-p, --path <id>", "Specify the folder path (required)").option("-k, --key <api-key>", "Specify the API key (or set CUE_API_KEY env variable)").option("--provider <provider ID>", "Specify the provider ID (eg. sharepoint, drive, dropbox) or leave empty for default provider", "").option("-v, --verbose", "Enable verbose output", false).option("-e, --emulators", "Uses emulators for sync", false).option("-z, --zip", 'Include zipped content (will be unzipped to path "<zip_path>_unzipped". Max uncompressed size: 500 MB, max recursion depth: 3)', false).option("--legacy", "Write RDF as BLOBs to the processed bucket instead of patching the graph directly", false).option("--metadata-only", "Push filesystem-structure metadata for all local files without checking credits or remote state", false).action(syncHandler);
 program.command("dump").description("Dump Cue Knowledge Graph data to file\n				Examples:\n				$ cue-cli dump -s <space_id> -l -v\n				$ cue-cli dump -s <space_id> -j -v").requiredOption("-s, --space <id>", "Specify the space ID (required)").option("-k, --key <api-key>", "Specify the API key (or set CUE_API_KEY env variable)").option("-v, --verbose", "Enable verbose output", false).option("-e, --emulators", "Uses emulators for sync", false).option("-q, --query", "Uses a construct query to get the dump rather than using the /data endpoint", false).option("-j, --jelly", "Downloads a Jelly file rather than the standard Gzipped NQuads format", false).option("-l, --load", "Loads the dumped file into a local triplestore (requires emulators)", false).action(dumpHandler);
 program.command("compare").description("Compares folder content to files already updated to Cue").requiredOption("-s, --space <id>", "Specify the space ID (required)").requiredOption("-p, --path <id>", "Specify the folder path (required)").option("-k, --key <api-key>", "Specify the API key (or set CUE_API_KEY env variable)").option("--provider <provider ID>", "Specify the provider ID (eg. sharepoint, drive, dropbox) or leave empty for default provider", "").option("-v, --verbose", "Enable verbose output", false).option("-e, --emulators", "Uses emulators for sync", false).option("-z, --zip", "Include zipped content (will temporarily unzip files with same logic as when syncing and delete them again after the comparison)", false).action(compareHandler);
 program.command("dump-processed").description("Dump processed files to local folder").requiredOption("-s, --space <id>", "Specify the space ID (required)").requiredOption("-p, --processor <id>", "Id of the processor to dump processed files from (required) [eg. writers-blob, processors-cad-files]").option("-k, --key <api-key>", "Specify the API key (or set CUE_API_KEY env variable)").option("-v, --verbose", "Enable verbose output", false).option("-e, --emulators", "Uses emulators for sync", false).action(dumpProcessedHandler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qaecy/cue-cli",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "Cue CLI for QAECY platform",
   "main": "main.js",
   "bin": {