@geolonia/geonicdb-cli 0.1.0 → 0.2.0

package/dist/index.js

@@ -1052,7 +1052,6 @@ async function clientCredentialsGrant(options) {
 }
 
 // src/commands/auth.ts
-import chalk3 from "chalk";
 function createLoginCommand() {
   return new Command("login").description("Authenticate and save token").option("--client-credentials", "Use OAuth 2.0 Client Credentials flow").option("--client-id <id>", "OAuth client ID").option("--client-secret <secret>", "OAuth client secret").option("--scope <scopes>", "OAuth scopes (space-separated)").option("--tenant-id <id>", "Tenant ID for scoped authentication").action(
     withErrorHandler(async (...args) => {
@@ -1163,7 +1162,7 @@ function createMeAction() {
       const status = getTokenStatus(latestConfig.token);
       if (status.expiresAt) {
         if (status.isExpired) {
-          console.log(chalk3.red(`Token expires: ${status.expiresAt.toISOString()} (expired)`));
+          printError(`Token expires: ${status.expiresAt.toISOString()} (expired)`);
         } else if (status.isExpiringSoon) {
           printWarning(
             `Token expires: ${status.expiresAt.toISOString()} (${formatDuration(status.remainingMs)} remaining)`
@@ -1537,15 +1536,13 @@ function registerEntitiesCommand(program2) {
       if (opts.attrs) params.attrs = String(opts.attrs);
       if (opts.georel) params.georel = String(opts.georel);
       if (opts.geometry) params.geometry = String(opts.geometry);
-      if (opts.coords) params.coords = String(opts.coords);
+      if (opts.coords) params.coordinates = String(opts.coords);
       if (opts.spatialId) params.spatialId = String(opts.spatialId);
       if (opts.limit !== void 0) params.limit = String(opts.limit);
       if (opts.offset !== void 0) params.offset = String(opts.offset);
       if (opts.orderBy) params.orderBy = String(opts.orderBy);
-      if (opts.count) params.options = "count";
-      if (opts.keyValues) {
-        params.options = params.options ? `${params.options},keyValues` : "keyValues";
-      }
+      if (opts.count) params.count = "true";
+      if (opts.keyValues) params.options = "keyValues";
       const response = await client.get("/entities", params);
       outputResponse(response, format, !!opts.count);
     })
@@ -1861,7 +1858,7 @@ function registerSubscriptionsCommand(program2) {
       const params = {};
       if (cmdOpts.limit !== void 0) params["limit"] = String(cmdOpts.limit);
       if (cmdOpts.offset !== void 0) params["offset"] = String(cmdOpts.offset);
-      if (cmdOpts.count) params["options"] = "count";
+      if (cmdOpts.count) params["count"] = "true";
       const response = await client.get("/subscriptions", params);
       outputResponse(response, format, !!cmdOpts.count);
     })
@@ -1965,8 +1962,8 @@ function registerRegistrationsCommand(program2) {
       const params = {};
       if (cmdOpts.limit !== void 0) params["limit"] = String(cmdOpts.limit);
       if (cmdOpts.offset !== void 0) params["offset"] = String(cmdOpts.offset);
-      if (cmdOpts.count) params["options"] = "count";
-      const response = await client.get("/registrations", params);
+      if (cmdOpts.count) params["count"] = "true";
+      const response = await client.get("/csourceRegistrations", params);
       outputResponse(response, format, !!cmdOpts.count);
     })
   );
@@ -1985,7 +1982,7 @@ function registerRegistrationsCommand(program2) {
       const client = createClient(cmd);
       const format = getFormat(cmd);
       const response = await client.get(
-        `/registrations/${encodeURIComponent(String(id))}`
+        `/csourceRegistrations/${encodeURIComponent(String(id))}`
       );
       outputResponse(response, format);
     })
@@ -2001,7 +1998,7 @@ function registerRegistrationsCommand(program2) {
       const client = createClient(cmd);
       const format = getFormat(cmd);
       const data = await parseJsonInput(json);
-      const response = await client.post("/registrations", data);
+      const response = await client.post("/csourceRegistrations", data);
       outputResponse(response, format);
       printSuccess("Registration created.");
     })
@@ -2019,7 +2016,7 @@ function registerRegistrationsCommand(program2) {
         const format = getFormat(cmd);
         const data = await parseJsonInput(json);
         const response = await client.patch(
-          `/registrations/${encodeURIComponent(String(id))}`,
+          `/csourceRegistrations/${encodeURIComponent(String(id))}`,
           data
         );
         outputResponse(response, format);
@@ -2037,7 +2034,7 @@ function registerRegistrationsCommand(program2) {
     withErrorHandler(async (id, _opts, cmd) => {
       const client = createClient(cmd);
       await client.delete(
-        `/registrations/${encodeURIComponent(String(id))}`
+        `/csourceRegistrations/${encodeURIComponent(String(id))}`
       );
       printSuccess("Registration deleted.");
     })
@@ -2102,14 +2099,14 @@ function createListAction() {
     if (cmdOpts.query) params["q"] = cmdOpts.query;
     if (cmdOpts.georel) params["georel"] = cmdOpts.georel;
     if (cmdOpts.geometry) params["geometry"] = cmdOpts.geometry;
-    if (cmdOpts.coords) params["coords"] = cmdOpts.coords;
+    if (cmdOpts.coords) params["coordinates"] = cmdOpts.coords;
     if (cmdOpts.timeRel) params["timerel"] = cmdOpts.timeRel;
     if (cmdOpts.timeAt) params["timeAt"] = cmdOpts.timeAt;
     if (cmdOpts.endTimeAt) params["endTimeAt"] = cmdOpts.endTimeAt;
     if (cmdOpts.lastN !== void 0) params["lastN"] = String(cmdOpts.lastN);
     if (cmdOpts.limit !== void 0) params["limit"] = String(cmdOpts.limit);
     if (cmdOpts.offset !== void 0) params["offset"] = String(cmdOpts.offset);
-    if (cmdOpts.count) params["options"] = "count";
+    if (cmdOpts.count) params["count"] = "true";
     const response = await client.get("/temporal/entities", params);
     outputResponse(response, format, cmdOpts.count);
   });
@@ -3238,8 +3235,8 @@ function generateCompletions(program2, line, point) {
     i++;
   }
   if (currentCmd.name() === "help" && currentCmd.parent === program2) {
-    const helpIdx = walkTokens.findIndex((t) => t === "help");
-    const rawArgs = helpIdx >= 0 ? walkTokens.slice(helpIdx + 1) : [];
+    const helpIdx = walkTokens.indexOf("help");
+    const rawArgs = walkTokens.slice(helpIdx + 1);
     const helpArgs = [];
     for (let j = 0; j < rawArgs.length; j++) {
       const t = rawArgs[j];
@@ -3407,7 +3404,141 @@ function createProgram() {
   return program2;
 }
 
+// src/update-notifier.ts
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { join as join2 } from "path";
+import chalk3 from "chalk";
+var PACKAGE_NAME = "@geolonia/geonicdb-cli";
+var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var FETCH_TIMEOUT_MS = 5e3;
+var CI_ENV_VARS = [
+  "CI",
+  "CONTINUOUS_INTEGRATION",
+  "BUILD_NUMBER",
+  "GITHUB_ACTIONS",
+  "GITLAB_CI",
+  "CIRCLECI",
+  "JENKINS_URL",
+  "HUDSON_URL",
+  "TRAVIS"
+];
+function getCacheFile() {
+  return join2(getConfigDir(), "update-check.json");
+}
+function isCheckDisabled() {
+  if (process.env.NO_UPDATE_NOTIFIER) return true;
+  if (!process.stdout.isTTY) return true;
+  for (const envVar of CI_ENV_VARS) {
+    if (process.env[envVar]) return true;
+  }
+  return false;
+}
+function loadCache() {
+  try {
+    const raw = readFileSync3(getCacheFile(), "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function saveCache(cache) {
+  try {
+    ensureConfigDir();
+    writeFileSync2(getCacheFile(), JSON.stringify(cache), "utf-8");
+  } catch {
+  }
+}
+function shouldCheck(cache) {
+  if (!cache) return true;
+  return Date.now() - cache.lastCheck >= CHECK_INTERVAL_MS;
+}
+function compareSemver(current, latest) {
+  const parse = (v) => v.replace(/^v/, "").split(".").map(Number);
+  const [cMajor, cMinor, cPatch] = parse(current);
+  const [lMajor, lMinor, lPatch] = parse(latest);
+  if (lMajor !== cMajor) return lMajor > cMajor;
+  if (lMinor !== cMinor) return lMinor > cMinor;
+  return lPatch > cPatch;
+}
+async function fetchLatestVersion() {
+  try {
+    const res = await fetch(REGISTRY_URL, {
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.version ?? null;
+  } catch {
+    return null;
+  }
+}
+function getCurrentVersion() {
+  return process.env.npm_package_version ?? "0.0.0";
+}
+function formatUpdateBox(current, latest) {
+  const message = `Update available: ${current} \u2192 ${latest}`;
+  const install = `Run ${chalk3.cyan(`npm i -g ${PACKAGE_NAME}`)} to update`;
+  const lines = [message, install];
+  const maxLen = Math.max(
+    ...lines.map((l) => stripAnsi(l).length)
+  );
+  const pad = (line) => {
+    const visible = stripAnsi(line).length;
+    return line + " ".repeat(maxLen - visible);
+  };
+  const empty = " ".repeat(maxLen);
+  const top = `\u256D${"\u2500".repeat(maxLen + 4)}\u256E`;
+  const bottom = `\u2570${"\u2500".repeat(maxLen + 4)}\u256F`;
+  const boxLines = [
+    top,
+    `\u2502  ${empty}  \u2502`,
+    ...lines.map((l) => `\u2502  ${pad(l)}  \u2502`),
+    `\u2502  ${empty}  \u2502`,
+    bottom
+  ];
+  return chalk3.yellow(boxLines.join("\n"));
+}
+function stripAnsi(str) {
+  return str.replace(/\x1b\[[0-9;]*m/g, "");
+}
+async function startUpdateCheck() {
+  if (isCheckDisabled()) return null;
+  let currentVersion;
+  try {
+    const pkgPath = new URL("../package.json", import.meta.url);
+    const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
+    currentVersion = pkg.version;
+  } catch {
+    currentVersion = getCurrentVersion();
+  }
+  const cache = loadCache();
+  if (!shouldCheck(cache)) {
+    if (cache?.latestVersion && compareSemver(currentVersion, cache.latestVersion)) {
+      return { currentVersion, latestVersion: cache.latestVersion };
+    }
+    return null;
+  }
+  const latestVersion = await fetchLatestVersion();
+  saveCache({
+    lastCheck: Date.now(),
+    latestVersion: latestVersion ?? cache?.latestVersion
+  });
+  if (latestVersion && compareSemver(currentVersion, latestVersion)) {
+    return { currentVersion, latestVersion };
+  }
+  return null;
+}
+function printUpdateNotification(result) {
+  if (!result) return;
+  const box = formatUpdateBox(result.currentVersion, result.latestVersion);
+  process.stderr.write("\n" + box + "\n");
+}
+
 // src/index.ts
+var updateCheckPromise = startUpdateCheck();
 var program = createProgram();
-program.parse();
+await program.parseAsync();
+var updateResult = await updateCheckPromise;
+printUpdateNotification(updateResult);
 //# sourceMappingURL=index.js.map