@major-tech/resource-client 0.2.36 → 0.2.40

package/bin/generate-clients.mjs

@@ -4,14 +4,17 @@
  * Part of @major-tech/resource-client
  * 
  * Usage:
- *   npx @major-tech/resource-client add <resource_id> <name> <type> <description> <application_id>
- *   npx @major-tech/resource-client remove <name>
+ *   npx @major-tech/resource-client add <resource_id> <name> <type> <description> <application_id> [--mode app]
+ *   npx @major-tech/resource-client add <resource_id> <name> <type> <description> --mode tool
+ *   npx @major-tech/resource-client remove <name> [--mode <app|tool>]
  *   npx @major-tech/resource-client list
- * 
+ *
+ * Modes: app (default) | tool
  * Types: postgresql | mssql | dynamodb | cosmosdb | snowflake | bigquery | neo4j | hubspot | googlesheets | outreach | custom | graphql | lambda | salesforce | s3 | slack | majorauth | googleanalytics | quickbooks
- * 
+ *
  * Examples:
  *   npx @major-tech/resource-client add "abc-123" "orders-db" "postgresql" "Orders database" "app-123"
+ *   npx @major-tech/resource-client add "abc-123" "orders-db" "postgresql" "Orders database" --mode tool
  *   npx @major-tech/resource-client add "xyz-789" "payment-api" "custom" "Payment API" "app-456"
  *   npx @major-tech/resource-client remove "orders-db"
  *   npx @major-tech/resource-client list
@@ -37,9 +40,9 @@ function getClientsDir() {
 }
 
 /**
- * Client template
+ * Client template for app mode
  */
-function clientTemplate(data, framework) {
+function clientTemplateApp(data, framework) {
   const isNextJs = framework === 'nextjs';
 
   const imports = [
@@ -59,11 +62,11 @@ function clientTemplate(data, framework) {
 
 /**
  * ${data.description}
- * 
+ *
  * Type: ${data.type}
  * Resource ID: ${data.resourceId}
  * Application ID: ${data.applicationId}
- * 
+ *
  * DO NOT EDIT - Auto-generated by @major-tech/resource-client
  */
 
@@ -91,6 +94,50 @@ export const ${data.clientName} = ${data.clientName}Singleton.getInstance();
 `;
 }
 
+/**
+ * Client template for tool mode
+ */
+function clientTemplateTool(data) {
+  const factoryName = 'create' + data.clientName.charAt(0).toUpperCase() + data.clientName.slice(1);
+  return `import { ${data.clientClass} } from '@major-tech/resource-client';
+
+/**
+ * ${data.description}
+ *
+ * Type: ${data.type}
+ * Resource ID: ${data.resourceId}
+ * Tool ID: ${data.toolId}
+ *
+ * DO NOT EDIT - Auto-generated by @major-tech/resource-client (tool mode)
+ */
+
+interface ToolContext {
+  resourceApiUrl: string;
+  majorJwtToken: string;
+}
+
+export function ${factoryName}(context: ToolContext): ${data.clientClass} {
+  return new ${data.clientClass}({
+    baseUrl: context.resourceApiUrl,
+    majorJwtToken: context.majorJwtToken,
+    toolId: '${data.toolId}',
+    resourceId: '${data.resourceId}',
+    fetch: (...args: Parameters<typeof fetch>) => fetch(...args),
+  });
+}
+`;
+}
+
+/**
+ * Client template dispatcher
+ */
+function clientTemplate(data, framework, mode) {
+  if (mode === 'tool') {
+    return clientTemplateTool(data);
+  }
+  return clientTemplateApp(data, framework);
+}
+
 /**
  * Index template
  */
@@ -163,18 +210,39 @@ function getClientClass(type) {
   return typeMap[type] || 'PostgresResourceClient';
 }
 
-function generateClientFile(resource, framework) {
+function readToolId() {
+  const toolJsonPath = path.join(projectRoot, 'tool.json');
+  if (!fs.existsSync(toolJsonPath)) {
+    console.error('❌ tool.json not found in project root. Run this from your tool directory.');
+    process.exit(1);
+  }
+  const toolJson = JSON.parse(fs.readFileSync(toolJsonPath, 'utf-8'));
+  if (!toolJson.id) {
+    console.error('❌ tool.json is missing an "id" field.');
+    process.exit(1);
+  }
+  return toolJson.id;
+}
+
+function generateClientFile(resource, framework, mode) {
   const clientName = toCamelCase(resource.name) + 'Client';
   const clientClass = getClientClass(resource.type);
+  const effectiveMode = resource.mode === 'tool' ? 'tool' : mode;
 
-  return clientTemplate({
+  const data = {
     clientClass,
     description: resource.description,
     type: resource.type,
     resourceId: resource.id,
     applicationId: resource.applicationId,
     clientName,
-  }, framework);
+  };
+
+  if (effectiveMode === 'tool') {
+    data.toolId = readToolId();
+  }
+
+  return clientTemplate(data, framework, effectiveMode);
 }
 
 function generateIndexFile(resources) {
@@ -185,13 +253,17 @@ function generateIndexFile(resources) {
   const exports = resources.map(resource => {
     const clientName = toCamelCase(resource.name) + 'Client';
     const fileName = toCamelCase(resource.name);
+    if (resource.mode === 'tool') {
+      const factoryName = 'create' + clientName.charAt(0).toUpperCase() + clientName.slice(1);
+      return `export { ${factoryName} } from './${fileName}';`;
+    }
     return `export { ${clientName} } from './${fileName}';`;
   });
 
   return indexTemplate({ exports });
 }
 
-function addResource(resourceId, name, type, description, applicationId, framework) {
+function addResource(resourceId, name, type, description, applicationId, framework, mode) {
   const validTypes = ['postgresql', 'mssql', 'dynamodb', 'cosmosdb', 'snowflake', 'bigquery', 'neo4j', 'hubspot', 'googlesheets', 'outreach', 'custom', 'graphql', 'lambda', 'salesforce', 's3', 'slack', 'majorauth', 'googleanalytics', 'quickbooks'];
   if (!validTypes.includes(type)) {
     console.error(`❌ Invalid type: ${type}`);
@@ -200,7 +272,7 @@ function addResource(resourceId, name, type, description, applicationId, framewo
     process.exit(1);
   }
 
-  if (!applicationId) {
+  if (mode !== 'tool' && !applicationId) {
     console.error('❌ Application ID is required');
     process.exit(1);
   }
@@ -218,7 +290,7 @@ function addResource(resourceId, name, type, description, applicationId, framewo
     name,
     type,
     description,
-    applicationId
+    ...(mode === 'tool' ? { mode: 'tool' } : { applicationId }),
   };
 
   resources.push(newResource);
@@ -228,13 +300,13 @@ function addResource(resourceId, name, type, description, applicationId, framewo
   console.log(`   Type: ${type}`);
   console.log(`   ID: ${resourceId}`);
 
-  regenerateClients(resources, framework);
+  regenerateClients(resources, framework, mode);
 }
 
 /**
  * Remove a resource by name
  */
-function removeResource(name, framework) {
+function removeResource(name, framework, mode) {
   const resources = loadResources();
   const index = resources.findIndex(r => r.name === name);
 
@@ -249,7 +321,7 @@ function removeResource(name, framework) {
   console.log(`✅ Removed resource: ${removed.name}`);
   console.log(`   ID: ${removed.id}`);
 
-  regenerateClients(resources, framework);
+  regenerateClients(resources, framework, mode);
 }
 
 /**
@@ -275,7 +347,7 @@ function listResources() {
 /**
  * Regenerate all client files
  */
-function regenerateClients(resources, framework) {
+function regenerateClients(resources, framework, mode) {
   const clientsDir = getClientsDir();
 
   // Ensure clients directory exists
@@ -293,7 +365,7 @@ function regenerateClients(resources, framework) {
   resources.forEach(resource => {
     const fileName = toCamelCase(resource.name) + '.ts';
     const filePath = path.join(clientsDir, fileName);
-    const code = generateClientFile(resource, framework);
+    const code = generateClientFile(resource, framework, mode);
     fs.writeFileSync(filePath, code, 'utf-8');
   });
 
@@ -324,24 +396,52 @@ function main() {
     args.splice(frameworkIndex, 2);
   }
 
+  // Extract --mode flag (app | tool, default: app)
+  const modeIndex = args.indexOf('--mode');
+  let mode = 'app';
+  if (modeIndex !== -1 && args[modeIndex + 1]) {
+    mode = args[modeIndex + 1];
+    // Remove --mode and its value from args
+    args.splice(modeIndex, 2);
+  }
+
+  if (mode !== 'app' && mode !== 'tool') {
+    console.error(`❌ Invalid mode: ${mode}. Must be "app" or "tool".`);
+    process.exit(1);
+  }
+
   if (!command) {
     console.log('Usage:');
-    console.log('  npx @major-tech/resource-client add <resource_id> <name> <type> <description> <application_id> [--framework <nextjs|vite>]');
-    console.log('  npx @major-tech/resource-client remove <name> [--framework <nextjs|vite>]');
+    console.log('  npx @major-tech/resource-client add <resource_id> <name> <type> <description> <application_id> [--framework <nextjs|vite>] [--mode <app|tool>]');
+    console.log('  npx @major-tech/resource-client add <resource_id> <name> <type> <description> --mode tool');
+    console.log('  npx @major-tech/resource-client remove <name> [--framework <nextjs|vite>] [--mode <app|tool>]');
     console.log('  npx @major-tech/resource-client list');
+    console.log('\nModes: app (default) | tool');
+    console.log('  app  — requires <application_id>, reads MAJOR_API_BASE_URL');
+    console.log('  tool — embeds toolId from tool.json at generation time, reads RESOURCE_API_URL');
     console.log('\nTypes: postgresql | mssql | dynamodb | cosmosdb | snowflake | bigquery | neo4j | hubspot | googlesheets | outreach | custom | graphql | lambda | salesforce | s3 | slack | majorauth | googleanalytics | quickbooks');
     return;
   }
 
   switch (command) {
     case 'add': {
-      const [, resourceId, name, type, description, applicationId] = args;
-      if (!resourceId || !name || !type || !description || !applicationId) {
-        console.error('❌ Missing arguments');
-        console.log('Usage: add <resource_id> <name> <type> <description> <application_id> [--framework <nextjs|vite>]');
-        process.exit(1);
+      if (mode === 'tool') {
+        const [, resourceId, name, type, description] = args;
+        if (!resourceId || !name || !type || !description) {
+          console.error('❌ Missing arguments');
+          console.log('Usage: add <resource_id> <name> <type> <description> --mode tool');
+          process.exit(1);
+        }
+        addResource(resourceId, name, type, description, null, framework, mode);
+      } else {
+        const [, resourceId, name, type, description, applicationId] = args;
+        if (!resourceId || !name || !type || !description || !applicationId) {
+          console.error('❌ Missing arguments');
+          console.log('Usage: add <resource_id> <name> <type> <description> <application_id> [--framework <nextjs|vite>]');
+          process.exit(1);
+        }
+        addResource(resourceId, name, type, description, applicationId, framework, mode);
       }
-      addResource(resourceId, name, type, description, applicationId, framework);
       break;
     }
 
@@ -351,7 +451,7 @@ function main() {
         console.error('❌ Missing name');
         process.exit(1);
       }
-      removeResource(name, framework);
+      removeResource(name, framework, mode);
       break;
     }
 

package/dist/base.cjs

@@ -29,17 +29,23 @@ class BaseResourceClient {
   }
   config;
   constructor(config) {
+    if (!config.applicationId && !config.toolId) {
+      throw new Error("BaseResourceClient requires either applicationId or toolId");
+    }
     this.config = {
       baseUrl: config.baseUrl.replace(/\/$/, ""),
       majorJwtToken: config.majorJwtToken,
       applicationId: config.applicationId,
+      toolId: config.toolId,
       resourceId: config.resourceId,
       fetch: config.fetch || globalThis.fetch,
       getHeaders: config.getHeaders
     };
   }
   async invokeRaw(payload, invocationKey) {
-    const url = `${this.config.baseUrl}/internal/apps/v1/${this.config.applicationId}/resource/${this.config.resourceId}/invoke`;
+    const entityType = this.config.toolId ? "tools" : "apps";
+    const entityId = this.config.toolId || this.config.applicationId;
+    const url = `${this.config.baseUrl}/internal/${entityType}/v1/${entityId}/resource/${this.config.resourceId}/invoke`;
     const body = {
       payload,
       invocationKey

package/dist/base.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/base.ts"],
-  "sourcesContent": ["import type {\n  ResourceInvokePayload,\n  InvokeResponse,\n  InvokeRequest,\n} from \"./schemas\";\nimport { ResourceInvokeError } from \"./errors\";\n\nexport interface BaseClientConfig {\n  baseUrl: string;\n  majorJwtToken?: string;\n  applicationId: string;\n  resourceId: string;\n  fetch?: typeof fetch;\n  /**\n   * Optional function to get additional headers (e.g. for auth)\n   * Useful for Next.js Server Components where headers() must be called dynamically\n   */\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>;\n}\n\nexport abstract class BaseResourceClient {\n  protected readonly config: {\n    baseUrl: string;\n    majorJwtToken?: string;\n    applicationId: string;\n    resourceId: string;\n    fetch: typeof fetch;\n    getHeaders?: () => Promise<Record<string, string>> | Record<string, string>;\n  };\n\n  constructor(config: BaseClientConfig) {\n    this.config = {\n      baseUrl: config.baseUrl.replace(/\\/$/, \"\"),\n      majorJwtToken: config.majorJwtToken,\n      applicationId: config.applicationId,\n      resourceId: config.resourceId,\n      fetch: config.fetch || globalThis.fetch,\n      getHeaders: config.getHeaders,\n    };\n  }\n\n  protected async invokeRaw(\n    payload: ResourceInvokePayload,\n    invocationKey: string,\n  ): Promise<InvokeResponse> {\n    const url = `${this.config.baseUrl}/internal/apps/v1/${this.config.applicationId}/resource/${this.config.resourceId}/invoke`;\n    \n    const body: InvokeRequest = {\n      payload,\n      invocationKey,\n    };\n\n    let headers: Record<string, string> = {\n      \"Content-Type\": \"application/json\",\n    };\n\n    if (this.config.majorJwtToken) {\n      headers[\"x-major-jwt\"] = this.config.majorJwtToken;\n    }\n\n    if (this.config.getHeaders) {\n      const extraHeaders = await this.config.getHeaders();\n      headers = { ...headers, ...extraHeaders };\n    }\n\n    try {\n      const response = await this.config.fetch(url, {\n        method: \"POST\",\n        headers,\n        credentials: \"include\",\n        body: JSON.stringify(body),\n      });\n\n      const data = await response.json();\n      return data as InvokeResponse;\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error);\n      throw new ResourceInvokeError(`Failed to invoke resource: ${message}`);\n    }\n  }\n}\n\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAKA;;;;;AAAA,oBAAoC;AAe9B,MAAgB,mBAAkB;EAfxC,OAewC;;;EACnB;EASnB,YAAY,QAAwB;AAClC,SAAK,SAAS;MACZ,SAAS,OAAO,QAAQ,QAAQ,OAAO,EAAE;MACzC,eAAe,OAAO;MACtB,eAAe,OAAO;MACtB,YAAY,OAAO;MACnB,OAAO,OAAO,SAAS,WAAW;MAClC,YAAY,OAAO;;EAEvB;EAEU,MAAM,UACd,SACA,eAAqB;AAErB,UAAM,MAAM,GAAG,KAAK,OAAO,OAAO,qBAAqB,KAAK,OAAO,aAAa,aAAa,KAAK,OAAO,UAAU;AAEnH,UAAM,OAAsB;MAC1B;MACA;;AAGF,QAAI,UAAkC;MACpC,gBAAgB;;AAGlB,QAAI,KAAK,OAAO,eAAe;AAC7B,cAAQ,aAAa,IAAI,KAAK,OAAO;IACvC;AAEA,QAAI,KAAK,OAAO,YAAY;AAC1B,YAAM,eAAe,MAAM,KAAK,OAAO,WAAU;AACjD,gBAAU,EAAE,GAAG,SAAS,GAAG,aAAY;IACzC;AAEA,QAAI;AACF,YAAM,WAAW,MAAM,KAAK,OAAO,MAAM,KAAK;QAC5C,QAAQ;QACR;QACA,aAAa;QACb,MAAM,KAAK,UAAU,IAAI;OAC1B;AAED,YAAM,OAAO,MAAM,SAAS,KAAI;AAChC,aAAO;IACT,SAAS,OAAO;AACd,YAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AACrE,YAAM,IAAI,kCAAoB,8BAA8B,OAAO,EAAE;IACvE;EACF;;",
+  "sourcesContent": ["import type {\n  ResourceInvokePayload,\n  InvokeResponse,\n  InvokeRequest,\n} from \"./schemas\";\nimport { ResourceInvokeError } from \"./errors\";\n\nexport interface BaseClientConfig {\n  baseUrl: string;\n  majorJwtToken?: string;\n  applicationId?: string;  // For app mode\n  toolId?: string;         // For tool mode \u2014 mutually exclusive with applicationId\n  resourceId: string;\n  fetch?: typeof fetch;\n  /**\n   * Optional function to get additional headers (e.g. for auth)\n   * Useful for Next.js Server Components where headers() must be called dynamically\n   */\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>;\n}\n\nexport abstract class BaseResourceClient {\n  protected readonly config: {\n    baseUrl: string;\n    majorJwtToken?: string;\n    applicationId?: string;\n    toolId?: string;\n    resourceId: string;\n    fetch: typeof fetch;\n    getHeaders?: () => Promise<Record<string, string>> | Record<string, string>;\n  };\n\n  constructor(config: BaseClientConfig) {\n    if (!config.applicationId && !config.toolId) {\n      throw new Error(\"BaseResourceClient requires either applicationId or toolId\");\n    }\n\n    this.config = {\n      baseUrl: config.baseUrl.replace(/\\/$/, \"\"),\n      majorJwtToken: config.majorJwtToken,\n      applicationId: config.applicationId,\n      toolId: config.toolId,\n      resourceId: config.resourceId,\n      fetch: config.fetch || globalThis.fetch,\n      getHeaders: config.getHeaders,\n    };\n  }\n\n  protected async invokeRaw(\n    payload: ResourceInvokePayload,\n    invocationKey: string,\n  ): Promise<InvokeResponse> {\n    const entityType = this.config.toolId ? \"tools\" : \"apps\";\n    const entityId = this.config.toolId || this.config.applicationId;\n    const url = `${this.config.baseUrl}/internal/${entityType}/v1/${entityId}/resource/${this.config.resourceId}/invoke`;\n    \n    const body: InvokeRequest = {\n      payload,\n      invocationKey,\n    };\n\n    let headers: Record<string, string> = {\n      \"Content-Type\": \"application/json\",\n    };\n\n    if (this.config.majorJwtToken) {\n      headers[\"x-major-jwt\"] = this.config.majorJwtToken;\n    }\n\n    if (this.config.getHeaders) {\n      const extraHeaders = await this.config.getHeaders();\n      headers = { ...headers, ...extraHeaders };\n    }\n\n    try {\n      const response = await this.config.fetch(url, {\n        method: \"POST\",\n        headers,\n        credentials: \"include\",\n        body: JSON.stringify(body),\n      });\n\n      const data = await response.json();\n      return data as InvokeResponse;\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error);\n      throw new ResourceInvokeError(`Failed to invoke resource: ${message}`);\n    }\n  }\n}\n\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAKA;;;;;AAAA,oBAAoC;AAgB9B,MAAgB,mBAAkB;EAhBxC,OAgBwC;;;EACnB;EAUnB,YAAY,QAAwB;AAClC,QAAI,CAAC,OAAO,iBAAiB,CAAC,OAAO,QAAQ;AAC3C,YAAM,IAAI,MAAM,4DAA4D;IAC9E;AAEA,SAAK,SAAS;MACZ,SAAS,OAAO,QAAQ,QAAQ,OAAO,EAAE;MACzC,eAAe,OAAO;MACtB,eAAe,OAAO;MACtB,QAAQ,OAAO;MACf,YAAY,OAAO;MACnB,OAAO,OAAO,SAAS,WAAW;MAClC,YAAY,OAAO;;EAEvB;EAEU,MAAM,UACd,SACA,eAAqB;AAErB,UAAM,aAAa,KAAK,OAAO,SAAS,UAAU;AAClD,UAAM,WAAW,KAAK,OAAO,UAAU,KAAK,OAAO;AACnD,UAAM,MAAM,GAAG,KAAK,OAAO,OAAO,aAAa,UAAU,OAAO,QAAQ,aAAa,KAAK,OAAO,UAAU;AAE3G,UAAM,OAAsB;MAC1B;MACA;;AAGF,QAAI,UAAkC;MACpC,gBAAgB;;AAGlB,QAAI,KAAK,OAAO,eAAe;AAC7B,cAAQ,aAAa,IAAI,KAAK,OAAO;IACvC;AAEA,QAAI,KAAK,OAAO,YAAY;AAC1B,YAAM,eAAe,MAAM,KAAK,OAAO,WAAU;AACjD,gBAAU,EAAE,GAAG,SAAS,GAAG,aAAY;IACzC;AAEA,QAAI;AACF,YAAM,WAAW,MAAM,KAAK,OAAO,MAAM,KAAK;QAC5C,QAAQ;QACR;QACA,aAAa;QACb,MAAM,KAAK,UAAU,IAAI;OAC1B;AAED,YAAM,OAAO,MAAM,SAAS,KAAI;AAChC,aAAO;IACT,SAAS,OAAO;AACd,YAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AACrE,YAAM,IAAI,kCAAoB,8BAA8B,OAAO,EAAE;IACvE;EACF;;",
   "names": []
 }

package/dist/base.d.ts

@@ -2,7 +2,8 @@ import type { ResourceInvokePayload, InvokeResponse } from "./schemas";
 export interface BaseClientConfig {
     baseUrl: string;
     majorJwtToken?: string;
-    applicationId: string;
+    applicationId?: string;
+    toolId?: string;
     resourceId: string;
     fetch?: typeof fetch;
     /**
@@ -15,7 +16,8 @@ export declare abstract class BaseResourceClient {
     protected readonly config: {
         baseUrl: string;
         majorJwtToken?: string;
-        applicationId: string;
+        applicationId?: string;
+        toolId?: string;
         resourceId: string;
         fetch: typeof fetch;
         getHeaders?: () => Promise<Record<string, string>> | Record<string, string>;

package/dist/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,cAAc,EAEf,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7E;AAED,8BAAsB,kBAAkB;IACtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE;QACzB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,OAAO,KAAK,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC7E,CAAC;gBAEU,MAAM,EAAE,gBAAgB;cAWpB,SAAS,CACvB,OAAO,EAAE,qBAAqB,EAC9B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;CAoC3B"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,cAAc,EAEf,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7E;AAED,8BAAsB,kBAAkB;IACtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE;QACzB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,OAAO,KAAK,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC7E,CAAC;gBAEU,MAAM,EAAE,gBAAgB;cAgBpB,SAAS,CACvB,OAAO,EAAE,qBAAqB,EAC9B,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;CAsC3B"}

package/dist/base.js

@@ -2,17 +2,23 @@ import { ResourceInvokeError } from "./errors";
 export class BaseResourceClient {
     config;
     constructor(config) {
+        if (!config.applicationId && !config.toolId) {
+            throw new Error("BaseResourceClient requires either applicationId or toolId");
+        }
         this.config = {
             baseUrl: config.baseUrl.replace(/\/$/, ""),
             majorJwtToken: config.majorJwtToken,
             applicationId: config.applicationId,
+            toolId: config.toolId,
             resourceId: config.resourceId,
             fetch: config.fetch || globalThis.fetch,
             getHeaders: config.getHeaders,
         };
     }
     async invokeRaw(payload, invocationKey) {
-        const url = `${this.config.baseUrl}/internal/apps/v1/${this.config.applicationId}/resource/${this.config.resourceId}/invoke`;
+        const entityType = this.config.toolId ? "tools" : "apps";
+        const entityId = this.config.toolId || this.config.applicationId;
+        const url = `${this.config.baseUrl}/internal/${entityType}/v1/${entityId}/resource/${this.config.resourceId}/invoke`;
         const body = {
             payload,
             invocationKey,

package/dist/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAe/C,MAAM,OAAgB,kBAAkB;IACnB,MAAM,CAOvB;IAEF,YAAY,MAAwB;QAClC,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YAC1C,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,OAA8B,EAC9B,aAAqB;QAErB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,qBAAqB,IAAI,CAAC,MAAM,CAAC,aAAa,aAAa,IAAI,CAAC,MAAM,CAAC,UAAU,SAAS,CAAC;QAE7H,MAAM,IAAI,GAAkB;YAC1B,OAAO;YACP,aAAa;SACd,CAAC;QAEF,IAAI,OAAO,GAA2B;YACpC,cAAc,EAAE,kBAAkB;SACnC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC9B,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QACrD,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACpD,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,IAAsB,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,MAAM,IAAI,mBAAmB,CAAC,8BAA8B,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAgB/C,MAAM,OAAgB,kBAAkB;IACnB,MAAM,CAQvB;IAEF,YAAY,MAAwB;QAClC,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YAC1C,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,SAAS,CACvB,OAA8B,EAC9B,aAAqB;QAErB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QACjE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,aAAa,UAAU,OAAO,QAAQ,aAAa,IAAI,CAAC,MAAM,CAAC,UAAU,SAAS,CAAC;QAErH,MAAM,IAAI,GAAkB;YAC1B,OAAO;YACP,aAAa;SACd,CAAC;QAEF,IAAI,OAAO,GAA2B;YACpC,cAAc,EAAE,kBAAkB;SACnC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC9B,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QACrD,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACpD,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,IAAsB,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,MAAM,IAAI,mBAAmB,CAAC,8BAA8B,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@major-tech/resource-client",
-  "version": "0.2.36",
+  "version": "0.2.40",
   "description": "TypeScript client library for invoking Major resources (PostgreSQL, Custom APIs, HubSpot, S3)",
   "type": "module",
   "sideEffects": false,