SDK regeneration (#40)

Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>

Author: fern-api[bot]

Diff for: jest.config.js renamed to jest.config.mjs

@@ -1,5 +1,8 @@
 /** @type {import('jest').Config} */
-module.exports = {
+export default {
     preset: "ts-jest",
     testEnvironment: "node",
+    moduleNameMapper: {
+        "(.+)\.js$": "$1",
+    },
 };

Diff for: package.json

@@ -1,6 +1,6 @@
 {
     "name": "@credal/sdk",
-    "version": "0.0.24",
+    "version": "0.0.25",
     "private": false,
     "repository": "https://github.com/credal-ai/credal-typescript-sdk",
     "main": "./index.js",
@@ -15,26 +15,25 @@
         "url-join": "4.0.1",
         "form-data": "^4.0.0",
         "formdata-node": "^6.0.3",
-        "node-fetch": "2.7.0",
-        "qs": "6.11.2",
+        "node-fetch": "^2.7.0",
+        "qs": "^6.13.1",
         "readable-stream": "^4.5.2",
-        "js-base64": "3.7.2"
+        "js-base64": "3.7.7"
     },
     "devDependencies": {
         "@types/url-join": "4.0.1",
-        "@types/qs": "6.9.8",
-        "@types/node-fetch": "2.6.9",
-        "@types/readable-stream": "^4.0.15",
-        "fetch-mock-jest": "^1.5.1",
-        "webpack": "^5.94.0",
-        "ts-loader": "^9.3.1",
-        "jest": "29.7.0",
-        "@types/jest": "29.5.5",
-        "ts-jest": "29.1.1",
-        "jest-environment-jsdom": "29.7.0",
-        "@types/node": "17.0.33",
-        "prettier": "2.7.1",
-        "typescript": "4.6.4"
+        "@types/qs": "^6.9.17",
+        "@types/node-fetch": "^2.6.12",
+        "@types/readable-stream": "^4.0.18",
+        "webpack": "^5.97.1",
+        "ts-loader": "^9.5.1",
+        "jest": "^29.7.0",
+        "@types/jest": "^29.5.14",
+        "ts-jest": "^29.1.1",
+        "jest-environment-jsdom": "^29.7.0",
+        "@types/node": "^18.19.70",
+        "prettier": "^3.4.2",
+        "typescript": "~5.7.2"
     },
     "browser": {
         "fs": false,

Diff for: scripts/rename-to-esm-files.js

@@ -0,0 +1,115 @@
+#!/usr/bin/env node
+
+const fs = require("fs").promises;
+const path = require("path");
+
+const extensionMap = {
+    ".js": ".mjs",
+    ".d.ts": ".d.mts",
+};
+const oldExtensions = Object.keys(extensionMap);
+
+async function findFiles(rootPath) {
+    const files = [];
+
+    async function scan(directory) {
+        const entries = await fs.readdir(directory, { withFileTypes: true });
+
+        for (const entry of entries) {
+            const fullPath = path.join(directory, entry.name);
+
+            if (entry.isDirectory()) {
+                if (entry.name !== "node_modules" && !entry.name.startsWith(".")) {
+                    await scan(fullPath);
+                }
+            } else if (entry.isFile()) {
+                if (oldExtensions.some((ext) => entry.name.endsWith(ext))) {
+                    files.push(fullPath);
+                }
+            }
+        }
+    }
+
+    await scan(rootPath);
+    return files;
+}
+
+async function updateFiles(files) {
+    const updatedFiles = [];
+    for (const file of files) {
+        const updated = await updateFileContents(file);
+        updatedFiles.push(updated);
+    }
+
+    console.log(`Updated imports in ${updatedFiles.length} files.`);
+}
+
+async function updateFileContents(file) {
+    const content = await fs.readFile(file, "utf8");
+
+    let newContent = content;
+    // Update each extension type defined in the map
+    for (const [oldExt, newExt] of Object.entries(extensionMap)) {
+        const regex = new RegExp(`(import|export)(.+from\\s+['"])(\\.\\.?\\/[^'"]+)(\\${oldExt})(['"])`, "g");
+        newContent = newContent.replace(regex, `$1$2$3${newExt}$5`);
+    }
+
+    if (content !== newContent) {
+        await fs.writeFile(file, newContent, "utf8");
+        return true;
+    }
+    return false;
+}
+
+async function renameFiles(files) {
+    let counter = 0;
+    for (const file of files) {
+        const ext = oldExtensions.find((ext) => file.endsWith(ext));
+        const newExt = extensionMap[ext];
+
+        if (newExt) {
+            const newPath = file.slice(0, -ext.length) + newExt;
+            await fs.rename(file, newPath);
+            counter++;
+        }
+    }
+
+    console.log(`Renamed ${counter} files.`);
+}
+
+async function main() {
+    try {
+        const targetDir = process.argv[2];
+        if (!targetDir) {
+            console.error("Please provide a target directory");
+            process.exit(1);
+        }
+
+        const targetPath = path.resolve(targetDir);
+        const targetStats = await fs.stat(targetPath);
+
+        if (!targetStats.isDirectory()) {
+            console.error("The provided path is not a directory");
+            process.exit(1);
+        }
+
+        console.log(`Scanning directory: ${targetDir}`);
+
+        const files = await findFiles(targetDir);
+
+        if (files.length === 0) {
+            console.log("No matching files found.");
+            process.exit(0);
+        }
+
+        console.log(`Found ${files.length} files.`);
+        await updateFiles(files);
+        await renameFiles(files);
+        console.log("\nDone!");
+    } catch (error) {
+        console.error("An error occurred:", error.message);
+        process.exit(1);
+    }
+}
+
+main();

Diff for: src/Client.ts

@@ -12,57 +12,56 @@ import { Search } from "./api/resources/search/client/Client";
 import { Users } from "./api/resources/users/client/Client";
 
 export declare namespace CredalClient {
-    interface Options {
+    export interface Options {
         environment?: core.Supplier<environments.CredalEnvironment | string>;
+        /** Specify a custom URL to connect the client to. */
+        baseUrl?: core.Supplier<string>;
         apiKey?: core.Supplier<core.BearerToken | undefined>;
         fetcher?: core.FetchFunction;
     }
 
-    interface RequestOptions {
+    export interface RequestOptions {
         /** The maximum time to wait for a response in seconds. */
         timeoutInSeconds?: number;
         /** The number of times to retry the request. Defaults to 2. */
         maxRetries?: number;
         /** A hook to abort the request. */
         abortSignal?: AbortSignal;
+        /** Additional headers to include in the request. */
+        headers?: Record<string, string>;
     }
 }
 
 export class CredalClient {
-    constructor(protected readonly _options: CredalClient.Options = {}) {}
-
     protected _copilots: Copilots | undefined;
+    protected _documentCatalog: DocumentCatalog | undefined;
+    protected _documentCollections: DocumentCollections | undefined;
+    protected _permissionsService: PermissionsService | undefined;
+    protected _search: Search | undefined;
+    protected _users: Users | undefined;
+
+    constructor(protected readonly _options: CredalClient.Options = {}) {}
 
     public get copilots(): Copilots {
         return (this._copilots ??= new Copilots(this._options));
     }
 
-    protected _documentCatalog: DocumentCatalog | undefined;
-
     public get documentCatalog(): DocumentCatalog {
         return (this._documentCatalog ??= new DocumentCatalog(this._options));
     }
 
-    protected _documentCollections: DocumentCollections | undefined;
-
     public get documentCollections(): DocumentCollections {
         return (this._documentCollections ??= new DocumentCollections(this._options));
     }
 
-    protected _permissionsService: PermissionsService | undefined;
-
     public get permissionsService(): PermissionsService {
         return (this._permissionsService ??= new PermissionsService(this._options));
     }
 
-    protected _search: Search | undefined;
-
     public get search(): Search {
         return (this._search ??= new Search(this._options));
     }
 
-    protected _users: Users | undefined;
-
     public get users(): Users {
         return (this._users ??= new Users(this._options));
     }

Diff for: src/api/resources/common/types/Operator.ts

@@ -3,7 +3,6 @@
  */
 
 export type Operator = "<" | ">" | "<=" | ">=" | "!=" | "==" | "contains";
-
 export const Operator = {
     LessThan: "<",
     GreaterThan: ">",

Diff for: src/api/resources/common/types/ResourceIdentifier.ts

@@ -6,12 +6,12 @@ import * as Credal from "../../../index";
 
 export type ResourceIdentifier = Credal.ResourceIdentifier.ExternalResourceId | Credal.ResourceIdentifier.Url;
 
-export declare namespace ResourceIdentifier {
-    interface ExternalResourceId extends Credal.ExternalResourceId {
+export namespace ResourceIdentifier {
+    export interface ExternalResourceId extends Credal.ExternalResourceId {
         type: "external-resource-id";
     }
 
-    interface Url extends Credal.Url {
+    export interface Url extends Credal.Url {
         type: "url";
     }
 }

Diff for: src/api/resources/common/types/ResourceType.ts

@@ -22,7 +22,6 @@ export type ResourceType =
     | "SLACK_CHANNEL"
     | "MONGO_COLLECTION_SYNC"
     | "UNKNOWN";
-
 export const ResourceType = {
     GoogleDriveItem: "GOOGLE_DRIVE_ITEM",
     MicrosoftDriveItem: "MICROSOFT_DRIVE_ITEM",

Diff for: src/api/resources/common/types/Role.ts

@@ -3,7 +3,6 @@
  */
 
 export type Role = "viewer" | "editor";
-
 export const Role = {
     Viewer: "viewer",
     Editor: "editor",