@reporting-bi/cli 0.1.9 → 0.1.11

package/dist/index.js

@@ -4776,9 +4776,9 @@ var require_keyword = __commonJS({
       if (Array.isArray(def2.keyword) ? !def2.keyword.includes(keyword) : def2.keyword !== keyword) {
         throw new Error("ajv implementation error");
       }
-      const deps = def2.dependencies;
-      if (deps === null || deps === void 0 ? void 0 : deps.some((kwd) => !Object.prototype.hasOwnProperty.call(schema, kwd))) {
-        throw new Error(`parent schema must have dependencies of ${keyword}: ${deps.join(",")}`);
+      const deps2 = def2.dependencies;
+      if (deps2 === null || deps2 === void 0 ? void 0 : deps2.some((kwd) => !Object.prototype.hasOwnProperty.call(schema, kwd))) {
+        throw new Error(`parent schema must have dependencies of ${keyword}: ${deps2.join(",")}`);
       }
       if (def2.validateSchema) {
         const valid = def2.validateSchema(schema[keyword]);
@@ -8198,14 +8198,14 @@ var require_dependencies = __commonJS({
     var util_1 = require_util();
     var code_1 = require_code2();
     exports2.error = {
-      message: ({ params: { property, depsCount, deps } }) => {
+      message: ({ params: { property, depsCount, deps: deps2 } }) => {
         const property_ies = depsCount === 1 ? "property" : "properties";
-        return (0, codegen_1.str)`must have ${property_ies} ${deps} when property ${property} is present`;
+        return (0, codegen_1.str)`must have ${property_ies} ${deps2} when property ${property} is present`;
       },
-      params: ({ params: { property, depsCount, deps, missingProperty } }) => (0, codegen_1._)`{property: ${property},
+      params: ({ params: { property, depsCount, deps: deps2, missingProperty } }) => (0, codegen_1._)`{property: ${property},
     missingProperty: ${missingProperty},
     depsCount: ${depsCount},
-    deps: ${deps}}`
+    deps: ${deps2}}`
       // TODO change to reference
     };
     var def2 = {
@@ -8225,8 +8225,8 @@ var require_dependencies = __commonJS({
       for (const key in schema) {
         if (key === "__proto__")
           continue;
-        const deps = Array.isArray(schema[key]) ? propertyDeps : schemaDeps;
-        deps[key] = schema[key];
+        const deps2 = Array.isArray(schema[key]) ? propertyDeps : schemaDeps;
+        deps2[key] = schema[key];
       }
       return [propertyDeps, schemaDeps];
     }
@@ -8236,23 +8236,23 @@ var require_dependencies = __commonJS({
         return;
       const missing = gen.let("missing");
       for (const prop in propertyDeps) {
-        const deps = propertyDeps[prop];
-        if (deps.length === 0)
+        const deps2 = propertyDeps[prop];
+        if (deps2.length === 0)
           continue;
         const hasProperty = (0, code_1.propertyInData)(gen, data, prop, it.opts.ownProperties);
         cxt.setParams({
           property: prop,
-          depsCount: deps.length,
-          deps: deps.join(", ")
+          depsCount: deps2.length,
+          deps: deps2.join(", ")
         });
         if (it.allErrors) {
           gen.if(hasProperty, () => {
-            for (const depProp of deps) {
+            for (const depProp of deps2) {
               (0, code_1.checkReportMissingProp)(cxt, depProp);
             }
           });
         } else {
-          gen.if((0, codegen_1._)`${hasProperty} && (${(0, code_1.checkMissingProp)(cxt, deps, missing)})`);
+          gen.if((0, codegen_1._)`${hasProperty} && (${(0, code_1.checkMissingProp)(cxt, deps2, missing)})`);
           (0, code_1.reportMissingProp)(cxt, missing);
           gen.else();
         }
@@ -10551,6 +10551,35 @@ function writeFileSync4(filePath, content4) {
 function isInternalPath(relPath) {
   return relPath === RPBI_DIR || relPath.startsWith(`${RPBI_DIR}/`);
 }
+function optimizeForLlm(data) {
+  if (data === null || data === void 0) return void 0;
+  if (Array.isArray(data)) {
+    const result = data.map((item) => optimizeForLlm(item)).filter((item) => item !== void 0);
+    return result.length > 0 ? result : void 0;
+  }
+  if (typeof data === "object") {
+    const result = {};
+    let hasKeys = false;
+    for (const [key, value] of Object.entries(data)) {
+      const optimized = optimizeForLlm(value);
+      if (optimized !== void 0) {
+        result[key] = optimized;
+        hasKeys = true;
+      }
+    }
+    return hasKeys ? result : void 0;
+  }
+  return data;
+}
+function stripFields(obj, excludeFields) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (!excludeFields.includes(key)) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 function isNestedWorkspace(dir) {
   return fs4.existsSync(path3.join(dir, RPBI_DIR, CONFIG_FILE));
 }
@@ -11261,26 +11290,6 @@ var CONTEXT_SCHEMA_DIRS = {
   "schema/db_super/procedures": { db: "db_super", objectType: "procedures" },
   "schema/db_super/functions": { db: "db_super", objectType: "functions" }
 };
-function optimizeForLlm(data) {
-  if (data === null || data === void 0) return void 0;
-  if (Array.isArray(data)) {
-    const result = data.map((item) => optimizeForLlm(item)).filter((item) => item !== void 0);
-    return result.length > 0 ? result : void 0;
-  }
-  if (typeof data === "object") {
-    const result = {};
-    let hasKeys = false;
-    for (const [key, value] of Object.entries(data)) {
-      const optimized = optimizeForLlm(value);
-      if (optimized !== void 0) {
-        result[key] = optimized;
-        hasKeys = true;
-      }
-    }
-    return hasKeys ? result : void 0;
-  }
-  return data;
-}
 function getFilePath(description, extension = ".sql") {
   const parts = description.split("/");
   const name = parts.pop();
@@ -11309,15 +11318,6 @@ function threadToMetaPath(thread) {
   const segments = getFilePath(thread.description || "", ".yaml");
   return [".rpbi", "threads", typeToDirName(thread.type), ...segments].join("/");
 }
-function stripFields(obj, excludeFields) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    if (!excludeFields.includes(key)) {
-      result[key] = value;
-    }
-  }
-  return result;
-}
 async function pull2(flags) {
   const dir = path5.resolve(flags.dir || ".");
   const conn = getActiveConnection(dir);
@@ -12199,7 +12199,9 @@ var path7 = __toESM(require("node:path"));
 var QUERIES_DIR = "queries";
 var RESOURCE_FIELDS = ["id_custom_resource", "id_custom_page", "name", "date_created"];
 var QUERY_FIELDS = ["id_thread", "id_custom_page", "description", "type", "date_created"];
-var PROJECT_FIELDS = ["id_custom_page", "name"];
+var PROJECT_FIELDS = ["id_custom_page", "name", "description", "version"];
+var META_EXCLUDE_FIELDS = ["accounting", "id_custom_page", "idz", "validate_flag", "date_created", "who_created", "date_deleted", "who_deleted"];
+var PARAM_META_EXCLUDE_FIELDS = [...META_EXCLUDE_FIELDS, "id_thread", "content"];
 function resourceToRelPath(projectName, resource) {
   return `${projectName}/${resource.name}`;
 }
@@ -12216,6 +12218,45 @@ function splitProjectPath(relPath) {
 async function fetchProjects(service) {
   return await service.get("projects", { fields: PROJECT_FIELDS }) || [];
 }
+async function refreshProjectMeta(service, dir, project, queries2) {
+  if (!project.id_custom_page || !project.name) return;
+  const id = project.id_custom_page;
+  try {
+    if (!queries2) {
+      queries2 = await service.get("queries", { fields: QUERY_FIELDS, where: { id_custom_page: id } }) || [];
+    }
+    const parameters = await service.get(`projects/${id}/parameters`) || [];
+    const externalResources = await service.get(`externalResources/${id}`) || [];
+    const dependencies = await service.get("queryDependencies", { where: { id_custom_page: id } }) || [];
+    const paramsByThread = /* @__PURE__ */ new Map();
+    for (const param of parameters) {
+      if (!param.id_thread) continue;
+      const list8 = paramsByThread.get(param.id_thread) || [];
+      list8.push(stripFields(param, PARAM_META_EXCLUDE_FIELDS));
+      paramsByThread.set(param.id_thread, list8);
+    }
+    const meta3 = {
+      id_custom_page: id,
+      name: project.name,
+      description: project.description,
+      version: project.version,
+      queries: queries2.filter((q) => q.id_thread).map((q) => ({
+        id_thread: q.id_thread,
+        description: q.description,
+        type: q.type,
+        file: queryToRelPath(project.name, q),
+        parameters: paramsByThread.get(q.id_thread)
+      })),
+      external_resources: externalResources.map((e) => stripFields(e, META_EXCLUDE_FIELDS)),
+      dependencies: dependencies.map((d) => stripFields(d, META_EXCLUDE_FIELDS))
+    };
+    const optimized = optimizeForLlm(meta3);
+    if (!optimized) return;
+    writeFileSync4(path7.join(dir, ".rpbi", "projects", `${project.name}.yaml`), toYaml(optimized) + "\n");
+  } catch (err) {
+    console.error(`  Failed to pull metadata for ${project.name}: ${err instanceof Error ? err.message : err}`);
+  }
+}
 function buildProjectMap(projects2) {
   const map2 = /* @__PURE__ */ new Map();
   const seen = /* @__PURE__ */ new Set();
@@ -12308,6 +12349,11 @@ async function pull4(flags) {
     }
   }
   console.log(`  Pulled ${pulledQueries} queries`);
+  console.log("Pulling project metadata...");
+  for (const project of projects2) {
+    if (!project.id_custom_page || !project.name) continue;
+    await refreshProjectMeta(service, dir, project, queries2.filter((q) => q.id_custom_page === project.id_custom_page));
+  }
   writeConfig(dir, {
     domain: conn.domain,
     accounting: conn.tokens.accounting,
@@ -12561,21 +12607,89 @@ async function content3(id, flags) {
   const text2 = await service.get(endpoint, void 0, { parseResponse: false });
   process.stdout.write(text2 || "");
 }
+async function refreshMetaForProject(service, flags, idProject) {
+  if (!idProject) return;
+  const root = findProjectRoot(flags.dir || ".");
+  if (!root || readConfig(root)?.type !== "ext") return;
+  try {
+    const project = await service.get(`projects/${idProject}`);
+    if (!project?.name) return;
+    await refreshProjectMeta(service, root, project);
+    console.error(`Updated .rpbi/projects/${project.name}.yaml`);
+  } catch {
+  }
+}
 async function params2(id, flags) {
   const service = await createService("extensions", { cwd: flags.dir || "." });
+  const refreshMeta = async () => {
+    try {
+      const query = await service.get(`queries/${id}`, { fields: ["id_custom_page"] });
+      await refreshMetaForProject(service, flags, query?.id_custom_page);
+    } catch {
+    }
+  };
   if (flags.save) {
     const data = JSON.parse(fs12.readFileSync(flags.save, "utf-8"));
     data.id_thread ??= parseInt(id);
     const result = await service.post("parameters", data);
+    await refreshMeta();
     output(result, flags);
   } else if (flags.delete) {
     await service.delete(`parameters/${flags.delete}`);
+    await refreshMeta();
     console.log(`Parameter ${flags.delete} deleted.`);
   } else {
     const result = await service.get(`queries/${id}/parameters`);
     output(result || [], flags);
   }
 }
+var DEFAULT_DEP_FIELDS = ["idz", "id_custom_page", "id_custom_resource", "resource_name", "id_thread", "thread_name"];
+async function deps(flags) {
+  const service = await createService("extensions", { cwd: flags.dir || "." });
+  if (flags.add) {
+    if (!flags.query && !flags.resource) {
+      console.error("Usage: rpbi ext deps --query <id> --add <resource_id>  |  --resource <id> --add <query_id>");
+      process.exit(1);
+    }
+    const idThread = flags.query ? parseInt(flags.query) : parseInt(flags.add);
+    const idResource = flags.resource ? parseInt(flags.resource) : parseInt(flags.add);
+    const created = await service.post("queryDependencies", {
+      id_thread: idThread,
+      id_custom_resource: idResource
+    });
+    try {
+      const query = await service.get(`queries/${idThread}`, { fields: ["id_custom_page"] });
+      await refreshMetaForProject(service, flags, query?.id_custom_page);
+    } catch {
+    }
+    output(created, flags);
+  } else if (flags.remove) {
+    let idProject;
+    try {
+      const rows = await service.get("queryDependencies", { where: { idz: parseInt(flags.remove) } });
+      idProject = rows?.[0]?.id_custom_page;
+    } catch {
+    }
+    await service.delete(`queryDependencies/${flags.remove}`);
+    await refreshMetaForProject(service, flags, idProject);
+    console.log(`Dependency ${flags.remove} deleted.`);
+  } else {
+    let where = null;
+    if (flags.query) where = { id_thread: parseInt(flags.query) };
+    else if (flags.resource) where = { id_custom_resource: parseInt(flags.resource) };
+    else if (flags.project) where = { id_custom_page: parseInt(flags.project) };
+    if (!where) {
+      console.error("Usage: rpbi ext deps --project <id> | --query <id> | --resource <id> [--add <id>] [--remove <idz>]");
+      process.exit(1);
+    }
+    const result = await service.get("queryDependencies", {
+      ...getListParams(flags, DEFAULT_DEP_FIELDS),
+      where,
+      order: [["resource_name", "asc"], ["thread_name", "asc"]]
+    });
+    output(result || [], flags);
+  }
+}
 async function exec4(id, flags) {
   const service = await createService("extensions", { cwd: flags.dir || "." });
   let body = void 0;
@@ -12631,6 +12745,8 @@ async function ext(args) {
         process.exit(1);
       }
       return params2(rest[0], flags);
+    case "deps":
+      return deps(flags);
     case "pull":
       return pull4(flags);
     case "push":
@@ -12640,7 +12756,7 @@ async function ext(args) {
     case "watch":
       return watch6(flags);
     default:
-      console.log("Usage: rpbi ext <projects|resources|queries|content|exec|params|pull|push|status|watch> [options]");
+      console.log("Usage: rpbi ext <projects|resources|queries|content|exec|params|deps|pull|push|status|watch> [options]");
       break;
   }
 }
@@ -36169,7 +36285,7 @@ function text(data) {
 async function mcp() {
   const server = new McpServer({
     name: "reporting-bi",
-    version: "0.1.9"
+    version: "0.1.11"
   });
   server.tool(
     "status",
@@ -36715,8 +36831,8 @@ async function checkForUpdate() {
     saveUpdateCheck({ lastCheck: now });
     const latest = await fetchLatestVersion();
     if (!latest) return;
-    if (!isNewer(latest, "0.1.9")) return;
-    console.log(`\x1B[33mUpdating ${PACKAGE_NAME} ${"0.1.9"} \u2192 ${latest}...\x1B[0m`);
+    if (!isNewer(latest, "0.1.11")) return;
+    console.log(`\x1B[33mUpdating ${PACKAGE_NAME} ${"0.1.11"} \u2192 ${latest}...\x1B[0m`);
     (0, import_node_child_process3.execSync)(npmInstallCmd(latest), { stdio: "inherit" });
     console.log(`\x1B[32mUpdated to ${latest}.\x1B[0m`);
   } catch {
@@ -36728,11 +36844,11 @@ async function forceUpdate() {
     console.error("Could not fetch latest version from npm.");
     process.exit(1);
   }
-  if (!isNewer(latest, "0.1.9")) {
-    console.log(`Already up to date (${"0.1.9"}).`);
+  if (!isNewer(latest, "0.1.11")) {
+    console.log(`Already up to date (${"0.1.11"}).`);
     return;
   }
-  console.log(`Updating ${PACKAGE_NAME} ${"0.1.9"} \u2192 ${latest}...`);
+  console.log(`Updating ${PACKAGE_NAME} ${"0.1.11"} \u2192 ${latest}...`);
   (0, import_node_child_process3.execSync)(npmInstallCmd(latest), { stdio: "inherit" });
   console.log(`\x1B[32mUpdated to ${latest}.\x1B[0m`);
   saveUpdateCheck({ lastCheck: Date.now() });
@@ -36786,7 +36902,10 @@ Extensions (requires the "custom.define" right):
   ext content <id> [--query]            Get resource content (--query for query SQL)
   ext exec <query_id> [--sql "..."|--file f]  Execute query (optionally with custom SQL)
   ext params <query_id> [--save <json>|--delete <idz>]  List, save or delete query parameters
-  ext pull [--dir <path>]               Pull all projects (resources & queries) to local files
+  ext deps --project <id>|--query <id>|--resource <id>  List SQL dependencies (resource \u2194 query links)
+  ext deps --query <id> --add <resource_id>   Link a query to a resource (or --resource <id> --add <query_id>)
+  ext deps --remove <idz>                     Unlink a dependency
+  ext pull [--dir <path>]               Pull all projects (resources, queries & project metadata) to local files
   ext push [files...] [--dir <path>] [--force]  Push modified/new files back to server
   ext status [--dir <path>] [--remote] [--json]  Show local changes (--remote compares with server)
   ext watch [--dir <path>] [--debounce <ms>]  Watch for file changes and auto-push
@@ -36906,7 +37025,7 @@ Examples:
 (async () => {
   const [command, ...args] = process.argv.slice(2);
   if (command === "--version" || command === "-v") {
-    console.log("0.1.9");
+    console.log("0.1.11");
     return;
   }
   await checkForUpdate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reporting-bi/cli",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "license": "UNLICENSED",
   "description": "Reporting.bi CLI — command-line interface for the Reporting.bi platform",
   "main": "./dist/index.js",