@quatronic/qore 0.1.10 → 0.1.11-test.266fd68

package/README.md

@@ -24,6 +24,7 @@ qore version            # CLI + portal version info
 qore env pull           # write this module's local secrets into an env file
 qore run -- <command>   # run a command with those secrets in its environment
 qore roles list         # roles in your code, on local, and yours there
+qore roles sync         # announce your code's roles for local, keep yours
 qore roles use <role…>  # announce your code's roles for local and take these
 
 qore errors --env stag                              # recent unresolved errors
@@ -34,8 +35,8 @@ qore logs --env stag --level error                  # error logs
 
 ### Portals
 
-`qore` talks to `prod` by default. Pass `--portal staging` to use the
-staging portal, or `--portal https://your-portal.example` for anything
+`qore` talks to `prod` by default. Pass `--portal staging` or
+`--portal testing` to use those portals, or `--portal https://your-portal.example` for anything
 else (only accepted on `qore login`, which then pins the identity provider
 it reports).
 
@@ -149,7 +150,9 @@ the portal's own audit trail, which records key names only (see
 
 #### `qore roles`
 
-Run in the app's frontend module. `qore roles use inspector` reads the roles in
+Run in the app's frontend module. `qore roles sync` does the announcing alone:
+local learns every role in `permissions.ts` and your own roles stay as they are.
+`qore roles use inspector` reads the roles in
 `src/lib/permissions.ts`, tells the portal they exist on `local` (only there —
 staging and production learn roles from the code that environment deploys:
 `main` for staging, the `production` branch for production), and makes exactly

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2eacac78-c916-5f6b-825a-d5af2c955f32")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="4be6a705-edee-51df-8b0e-e26c3410dcc4")}catch(e){}}();
 import { createRequire as __qoreCreateRequire } from "node:module"; const require = __qoreCreateRequire(import.meta.url);
 import {
   addSecretValues,
@@ -450,7 +450,7 @@ async function withProxyHint(deps2, e) {
   return proxy ? withSystemProxy(e, proxy, deps2.platform) : e;
 }
 function buildProgram(deps2, io2, signal, register, setExitCode) {
-  const program = new Command("qore").description("Qore developer CLI").option("--portal <name|url>", "prod, staging, or a portal URL (default: the portal you last logged in to, else prod)").option("--json", "print exactly one JSON document on stdout").option("--no-input", "never prompt").option("--verbose", "log request lines (never secrets)").option("--no-color", "disable colours").exitOverride().configureOutput({ writeOut: (s) => io2.out(s.trimEnd()), writeErr: (s) => io2.err(s.trimEnd()) });
+  const program = new Command("qore").description("Qore developer CLI").option("--portal <name|url>", "prod, staging, testing, or a portal URL (default: the portal you last logged in to, else prod)").option("--json", "print exactly one JSON document on stdout").option("--no-input", "never prompt").option("--verbose", "log request lines (never secrets)").option("--no-color", "disable colours").exitOverride().configureOutput({ writeOut: (s) => io2.out(s.trimEnd()), writeErr: (s) => io2.err(s.trimEnd()) });
   const ctx = { deps: deps2, io: io2, signal, opts: () => program.opts(), setExitCode };
   for (const r of register) r(program, ctx);
   return program;
@@ -609,6 +609,10 @@ var BUILTIN_PORTALS = {
   staging: {
     apiOrigin: "https://p01--portal-api-staging--hcywmtb2vksv.code.run",
     pinnedIssuer: "https://auth-staging.quatronic.app/realms/platform-staging"
+  },
+  testing: {
+    apiOrigin: "https://api.qore-testing.quatronic.app",
+    pinnedIssuer: "https://auth-testing.quatronic.app/realms/platform-testing"
   }
 };
 function builtinFor(origin) {
@@ -623,7 +627,7 @@ function toOrigin(raw) {
     url = new URL(raw);
   } catch {
     throw new QoreError("QORE_CONTEXT_INVALID", `Not a portal name or URL: ${raw}`, {
-      hint: "Use --portal prod, --portal staging or --portal https://\u2026"
+      hint: "Use --portal prod, --portal staging, --portal testing or --portal https://\u2026"
     });
   }
   const loopback = url.hostname === "localhost" || url.hostname === "127.0.0.1";
@@ -636,6 +640,7 @@ function resolvePortal(arg, defaultProfile) {
   const chosen = arg ?? defaultProfile;
   if (chosen === void 0 || chosen === "prod") return { ...BUILTIN_PORTALS.prod, builtin: "prod" };
   if (chosen === "staging") return { ...BUILTIN_PORTALS.staging, builtin: "staging" };
+  if (chosen === "testing") return { ...BUILTIN_PORTALS.testing, builtin: "testing" };
   const origin = toOrigin(chosen);
   return builtinFor(origin) ?? { apiOrigin: origin, pinnedIssuer: null, builtin: null };
 }
@@ -1990,7 +1995,7 @@ async function workspaceRoot(deps2) {
 }
 function profileOrder(cfg, cachedOrigins, portalArg, wsPortal) {
   if (portalArg) return [resolvePortal(portalArg, cfg.defaultProfile)];
-  const rank = (o) => o === BUILTIN_PORTALS.prod.apiOrigin ? 0 : o === BUILTIN_PORTALS.staging.apiOrigin ? 1 : 2;
+  const rank = (o) => o === BUILTIN_PORTALS.prod.apiOrigin ? 0 : o === BUILTIN_PORTALS.staging.apiOrigin ? 1 : o === BUILTIN_PORTALS.testing.apiOrigin ? 2 : 3;
   const rest = Object.keys(cfg.profiles).sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
   const cached2 = cachedOrigins.filter((c) => cfg.profiles[c]);
   const origins = [...wsPortal ? [wsPortal.apiOrigin] : [], ...cached2, resolvePortal(void 0, cfg.defaultProfile).apiOrigin, ...rest];
@@ -3164,12 +3169,25 @@ async function wholeAppWanted(ctx) {
   const ws = await findWorkspace(ctx.deps.cwd, ctx.deps.home);
   const repo = ws && await findRepoRoot(ctx.deps.cwd);
   if (!ws || !repo || repo === ws.root || !isInside(ws.root, repo)) return null;
+  if (await appModuleCount(ctx, ws) === 1) return null;
   const pick2 = await ctx.io.select("Which data model?", [
     { name: "the whole app", value: "app" },
     { name: `only ${basename3(repo)}`, value: "module" }
   ]);
   return pick2 === "app" ? ws : null;
 }
+async function appModuleCount(ctx, ws) {
+  const g = ctx.opts();
+  try {
+    const portal = await flagPortal(ctx.deps, g.portal, ws);
+    const session = await openSession(ctx.deps, portal, "db erd", g.verbose ? (l) => ctx.io.err(l) : void 0);
+    await ensureCapability(ctx.deps, portal.apiOrigin, "app.modules");
+    return (await workspaceAppModules(session, portal, ws)).modules.length;
+  } catch (e) {
+    if (e instanceof CancelledError) throw e;
+    return null;
+  }
+}
 async function serve(ctx, f, server) {
   try {
     const url = `http://127.0.0.1:${server.port}`;
@@ -5541,7 +5559,7 @@ async function checkRepoNode(deps2, m, recipe, pkg, signal, ms2) {
   return ok(`Node ${found ?? "?"} (engines ${pkg.engines.node})`);
 }
 async function loggedInPortals(deps2, profiles) {
-  const rank = (o) => o === BUILTIN_PORTALS.prod.apiOrigin ? 0 : o === BUILTIN_PORTALS.staging.apiOrigin ? 1 : 2;
+  const rank = (o) => o === BUILTIN_PORTALS.prod.apiOrigin ? 0 : o === BUILTIN_PORTALS.staging.apiOrigin ? 1 : o === BUILTIN_PORTALS.testing.apiOrigin ? 2 : 3;
   const out = [];
   for (const origin of Object.keys(profiles).sort((a, b) => rank(a) - rank(b) || a.localeCompare(b))) {
     const p = profiles[origin];
@@ -6716,6 +6734,11 @@ async function useLocalRoles(deps2, mc, app, roles, use) {
   await ensureCapability(deps2, mc.portal.apiOrigin, CAPABILITY);
   return explained(mc, () => mc.session.api.post(path(mc, app), { roles, use }));
 }
+var ANNOUNCE_CAPABILITY = "module.local-roles-announce";
+async function announceLocalRoles(deps2, mc, app, roles) {
+  await ensureCapability(deps2, mc.portal.apiOrigin, ANNOUNCE_CAPABILITY);
+  return explained(mc, () => mc.session.api.post(path(mc, app), { roles }));
+}
 async function explained(mc, call) {
   try {
     return await call();
@@ -6846,9 +6869,27 @@ function registerRoles(program, ctx) {
     c.io.out(`Known on local   ${[...known].join(", ") || "\u2014"}`);
     c.io.out(`Yours on local   ${local.effective.join(", ") || "\u2014"}`);
     if (fresh.length) {
-      c.io.out(`New in your code: ${fresh.join(", ")} \u2014 \`qore roles use <role...>\` announces them and makes them yours on local.`);
+      c.io.out(`New in your code: ${fresh.join(", ")} \u2014 \`qore roles sync\` makes local know them; \`qore roles use <role...>\` also makes them yours.`);
     }
   });
+  withFlags(roles.command("sync").description("Announce your code's roles for local; your own roles stay as they are")).action(async (f) => {
+    const { c, mc, app, code } = await rolesContext(ctx, f, "roles sync");
+    const res = await announceLocalRoles(c.deps, mc, app, code);
+    if (c.opts().json) {
+      renderJson(c.io, {
+        context: contextJson(mc, app),
+        added: res.added,
+        local: res.roles.map((r) => r.slug),
+        direct: res.direct,
+        effective: res.effective
+      });
+      return;
+    }
+    c.io.err(contextLine(mc, app));
+    c.io.out(`\u2713 Known on local: ${res.roles.map((r) => r.slug).join(", ")}`);
+    if (res.added.length) c.io.out(`  New on local: ${res.added.join(", ")} \u2014 teammates can pick it in the Access tab too.`);
+    c.io.out(`  Your roles on local: ${res.effective.join(", ") || "\u2014"} (unchanged; \`qore roles use <role...>\` to change them)`);
+  });
   withFlags(roles.command("use").description("Announce your code's roles for local and make exactly these yours there").argument("<role...>", "the roles you want on local")).action(async (wanted, f) => {
     const { c, mc, app, code } = await rolesContext(ctx, f, "roles use");
     const inCode = new Set(code.map((r) => r.slug));
@@ -7921,7 +7962,12 @@ async function connectPostgres(url, o) {
 
 // src/buildInfo.ts
 var SENTRY_DSN = true ? "https://50b592efb53dbc1a31cb10d3945c6d52@o4512129906049024.ingest.de.sentry.io/4512174341750864" : "";
-var SENTRY_ENVIRONMENT = true ? "production" : "development";
+function sentryEnvironment(version) {
+  if (version === "0.0.0-dev") return "development";
+  if (version.includes("-rc.")) return "next";
+  if (version.includes("-test.")) return "test";
+  return "production";
+}
 
 // src/platform/proxy.ts
 import { execFile as execFile3 } from "child_process";
@@ -7985,7 +8031,16 @@ function systemProxy(platform = process.platform) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.1.10" : "0.0.0-dev";
+import { readFileSync } from "fs";
+function readVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : "0.0.0-dev";
+  } catch {
+    return "0.0.0-dev";
+  }
+}
+var VERSION = readVersion();
 
 // src/cli.ts
 if (process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY) setGlobalDispatcher(new EnvHttpProxyAgent());
@@ -8032,7 +8087,7 @@ var deps = {
     telemetry.registerSecrets(values);
   },
   sentryDsn: SENTRY_DSN,
-  sentryEnvironment: SENTRY_ENVIRONMENT,
+  sentryEnvironment: sentryEnvironment(VERSION),
   systemProxy: () => systemProxy(process.platform),
   viewerDir: fileURLToPath(new URL("../viewer/dist/", import.meta.url)),
   postgres: connectPostgres
@@ -8065,4 +8120,4 @@ if (!drained) {
   process.exit();
 }
 //# sourceMappingURL=cli.js.map
-//# debugId=2eacac78-c916-5f6b-825a-d5af2c955f32
+//# debugId=4be6a705-edee-51df-8b0e-e26c3410dcc4

package/dist/qore-capabilities.json

@@ -0,0 +1,11 @@
+{
+  "capabilities": [
+    "app.modules",
+    "module.local-env",
+    "module.local-roles",
+    "module.local-roles-announce",
+    "module.observability",
+    "module.status",
+    "repo.resolve"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatronic/qore",
-  "version": "0.1.10",
+  "version": "0.1.11-test.266fd68",
   "description": "Qore developer CLI",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "files": [
     "dist/**/*.js",
+    "dist/qore-capabilities.json",
     "schema",
     "viewer/dist",
     "README.md"
@@ -25,7 +26,7 @@
     "url": "git+https://github.com/Quatronic-IT/qore-cli.git"
   },
   "scripts": {
-    "build": "tsup && vite build --config viewer/vite.config.ts",
+    "build": "tsup && vite build --config viewer/vite.config.ts && node scripts/capabilities.mjs > dist/qore-capabilities.json",
     "build:viewer": "vite build --config viewer/vite.config.ts",
     "test": "vitest run",
     "test:watch": "vitest",