@appweaver/client 1.0.22 → 1.0.24

package/esm/generators/generate-types.js

@@ -0,0 +1,486 @@
+import openapiTS, { astToString } from 'openapi-typescript';
+import ts from 'typescript';
+import { toSchemaObject } from '../utils/index.js';
+import { ACCOUNT_MODULE_TYPE, ACCOUNT_TYPES, AUTH_MODULE_TYPE, AUTH_TYPES, CONFIG_FIELD, HEALTH_MODULE_TYPE, HEALTH_TYPES, RESOURCE_MODULE_TYPE, RESOURCE_TYPES } from '../constants.js';
+/**
+ * Generates TypeScript types based on an OpenAPI V3 schema content.
+ *
+ * @param {string | OpenAPI3} schema - The OpenAPI V3 schema to generate types from. The value can be a string
+ * representing JSON or YAML format, or already parsed OpenAPI3 object.
+ * @return {Promise<string>} A promise that resolves to a string containing the generated TypeScript types.
+ */
+export async function generateTypes(schema) {
+    const schemaObject = typeof schema === 'string' ? await toSchemaObject(schema) : schema;
+    const ast = await openapiTS(schemaObject, {
+        exportType: true,
+        emptyObjectsUnknown: true,
+        enum: true,
+        enumValues: true,
+        transformProperty: (property, schemaObject) => {
+            const validationTags = [];
+            // Add validation JSDoc tags based on schema constraints
+            if (schemaObject['minLength'] !== undefined) {
+                validationTags.push(`@minLength ${schemaObject['minLength']}`);
+            }
+            if (schemaObject['maxLength'] !== undefined) {
+                validationTags.push(`@maxLength ${schemaObject['maxLength']}`);
+            }
+            if (schemaObject['minimum'] !== undefined) {
+                validationTags.push(`@minimum ${schemaObject['minimum']}`);
+            }
+            if (schemaObject['maximum'] !== undefined) {
+                validationTags.push(`@maximum ${schemaObject['maximum']}`);
+            }
+            if (schemaObject['pattern'] !== undefined) {
+                validationTags.push(`@pattern ${schemaObject['pattern']}`);
+            }
+            if (schemaObject['format'] !== undefined) {
+                validationTags.push(`@format ${schemaObject['format']}`);
+            }
+            if (validationTags.length > 0) {
+                const newProperty = ts.factory.updatePropertySignature(property, property.modifiers, property.name, property.questionToken, property.type);
+                const jsDocText = `*\n * ${validationTags.join('\n * ')}\n `;
+                ts.addSyntheticLeadingComment(newProperty, ts.SyntaxKind.MultiLineCommentTrivia, jsDocText, true);
+                return newProperty;
+            }
+            return property;
+        }
+    });
+    let typesContent = astToString(deduplicateUnionConstituents(ast));
+    typesContent = extractSchemaTypes(typesContent);
+    typesContent = combineModuleTypes(typesContent, schemaObject);
+    typesContent = deduplicateExportedTypes(typesContent);
+    return replaceFileUploadTypes(typesContent);
+}
+/**
+ * Extracts inline schema types from the generated `schemas` block.
+ *
+ * Finds entries like:
+ *   /** SomeTypeName *\/
+ *   "def-N": { ... };
+ *
+ * Lifts each one into:
+ *   export type SomeTypeName = { ... };
+ *
+ * And replaces the inline body in `schemas` with a reference to the new type.
+ *
+ * @param {string} typeContent - The generated TypeScript type content as a string.
+ * @return {string} The transformed types content with extracted schema types.
+ */
+function extractSchemaTypes(typeContent) {
+    // Matches the header: /** TypeName */ "def-N": <cursor here before the opening brace>
+    const extractedTypes = [];
+    const typeNames = new Set();
+    const entries = [];
+    // Maps "def-N" key → extracted type name, used to replace cross-references
+    const defToTypeName = new Map();
+    // Replace Record<...> types with object types so schema type can be extracted
+    const normalizedTypes = typeContent.replace(/(\/\*\*\s*\w+\s*\*\/\s*"def-\d+"):\s*Record<(\w+), (\w+)>;/g, `$1: { [key: $2]: $3 };`);
+    let m;
+    // Also capture the "def-N" key from the header
+    const headerPatternWithKey = /\/\*\*\s*(\w+)\s*\*\/\s*("def-\d+"):\s*(?=\{)/g;
+    while ((m = headerPatternWithKey.exec(normalizedTypes)) !== null) {
+        const typeName = m[1];
+        const defKey = m[2]; // e.g. "def-89"
+        const headerEnd = m.index + m[0].length; // points at '{'
+        // Walk forward counting braces to find the matching closing '}'
+        let depth = 0;
+        let i = headerEnd;
+        for (; i < normalizedTypes.length; i++) {
+            if (normalizedTypes[i] === '{') {
+                depth++;
+            }
+            else if (normalizedTypes[i] === '}') {
+                depth--;
+                if (depth === 0) {
+                    break;
+                }
+            }
+        }
+        // Variable i is now the index of the closing '}'
+        // The entry ends after '}' followed by ';'
+        const bodyEnd = i; // index of closing '}'
+        const entryEnd = normalizedTypes[bodyEnd + 1] === ';' ? bodyEnd + 2 : bodyEnd + 1;
+        defToTypeName.set(defKey, typeName);
+        entries.push({
+            start: m.index,
+            headerEnd,
+            typeName,
+            body: normalizedTypes.slice(headerEnd, bodyEnd + 1),
+            end: entryEnd
+        });
+    }
+    if (entries.length === 0) {
+        return normalizedTypes;
+    }
+    // Build updated content by replacing each entry's body with the type name reference
+    let updatedBaseContent = '';
+    let cursor = 0;
+    for (const entry of entries) {
+        // Append everything up to the opening brace of the body
+        updatedBaseContent += normalizedTypes.slice(cursor, entry.headerEnd);
+        // Replace body with the extracted type name
+        updatedBaseContent += entry.typeName + ';';
+        cursor = entry.end;
+        // Collect the exported type (deduplicate)
+        if (!typeNames.has(entry.typeName)) {
+            typeNames.add(entry.typeName);
+            extractedTypes.push(`export type ${entry.typeName} = ${entry.body}\n`);
+        }
+    }
+    updatedBaseContent += normalizedTypes.slice(cursor);
+    const enumDefPrefixType = {};
+    // Replace all cross-references like components["schemas"]["def-89"] with the type name
+    // Also, extract all enum prefixes in a list
+    for (const [defKey, typeName] of defToTypeName) {
+        // The defKey already includes surrounding quotes, e.g. "def-89"
+        const refPattern = new RegExp(`components\\["schemas"]\\[${defKey}\\]`, 'g');
+        updatedBaseContent = updatedBaseContent.replace(refPattern, typeName);
+        extractedTypes.forEach((t, idx) => {
+            extractedTypes[idx] = t.replace(refPattern, typeName);
+        });
+        // Extract defKey prefix for enums to be replaced them with type name
+        const defKeyPrefix = defKey
+            .replace(/"/g, '')
+            .replace(/(^|-)([a-z])/g, (_, __, ch) => ch.toUpperCase())
+            .replace(/-(\d+)/g, '$1');
+        enumDefPrefixType[defKeyPrefix] = typeName;
+    }
+    const getFirstNumber = (value) => {
+        const match = value.match(/\d+/);
+        return match ? Number(match[0]) : -Infinity;
+    };
+    // Sort keys descending by definition ID number if present. This is required
+    // to prevent replacing the prefix 'Def125' with 'Def12' or 'Def1' sub-prefix.
+    const sortedEnumKeys = Object.keys(enumDefPrefixType).sort((a, b) => getFirstNumber(b) - getFirstNumber(a));
+    // Replace enum definition prefixes with corresponding type names
+    for (const prefix of sortedEnumKeys) {
+        const typeName = enumDefPrefixType[prefix];
+        const exportEnumPattern = new RegExp(`export enum ${prefix}(.*){`, 'g');
+        updatedBaseContent = updatedBaseContent.replace(exportEnumPattern, `export enum ${typeName}$1{`);
+        const referenceEnumPattern = new RegExp(`: ${prefix}(.*);`, 'g');
+        extractedTypes.forEach((t, idx) => {
+            extractedTypes[idx] = t.replace(referenceEnumPattern, `: ${typeName}$1;`);
+        });
+    }
+    // Remove redundant "Format: ..." prose lines since the @format tag already captures this.
+    // If the line ends with */ (end-of-comment), preserve the closing; otherwise remove entirely.
+    const redundantFormatRegex = /\n(\s*)\* Format: [^\n]*/g;
+    const stripFormat = (s) => s.replace(redundantFormatRegex, (m, g) => m.endsWith('*/') ? `\n${g}*/` : '');
+    // Merge consecutive multiline comment endings and openings: */ \n /** → *
+    const doubleCommentsRegex = /(\s*)\*\/\s*\n\s*\/\*\*/g;
+    updatedBaseContent = stripFormat(updatedBaseContent.replace(doubleCommentsRegex, '$1*'));
+    const joined = extractedTypes.join('\n');
+    const mergedExtractedTypes = stripFormat(joined.replace(doubleCommentsRegex, '$1*'));
+    return updatedBaseContent + '\n' + mergedExtractedTypes;
+}
+/**
+ * Deduplicates and simplifies union type constituents in the provided TypeScript Abstract Syntax Tree (AST).
+ * Ensures that duplicate constituents are removed and shared types across parenthesized union branches are hoisted.
+ *
+ * @param {ts.Node[]} ast - An array of TypeScript nodes representing the AST to process and deduplicate.
+ * @return {ts.Node[]} An array of transformed TypeScript nodes with union type constituents deduplicated and simplified.
+ */
+function deduplicateUnionConstituents(ast) {
+    const printer = ts.createPrinter();
+    const dummyFile = ts.createSourceFile('_.ts', '', ts.ScriptTarget.Latest);
+    const printType = (node) => printer.printNode(ts.EmitHint.Unspecified, node, dummyFile);
+    const transformer = (context) => {
+        const visit = (node) => {
+            // Bottom-up: fix nested unions before outer ones
+            node = ts.visitEachChild(node, visit, context);
+            if (!ts.isUnionTypeNode(node))
+                return node;
+            const types = Array.from(node.types);
+            // Deduplicate direct top-level members
+            const seenDirect = new Set();
+            const deduped = [];
+            for (const t of types) {
+                const key = printType(t);
+                if (!seenDirect.has(key)) {
+                    seenDirect.add(key);
+                    deduped.push(t);
+                }
+            }
+            // Hoist types shared across at least 2 parenthesized union branches
+            const parenBranches = deduped
+                .map((t, i) => ({ i, t }))
+                .filter(({ t }) => ts.isParenthesizedTypeNode(t) && ts.isUnionTypeNode(t.type));
+            if (parenBranches.length < 2) {
+                // Nothing to hoist, still emit step-1 deduplication result if it changed
+                if (deduped.length === types.length)
+                    return node;
+                return ts.factory.createUnionTypeNode(deduped);
+            }
+            // Count how many branches each inner type key appears in
+            const countInBranches = new Map();
+            for (const { t } of parenBranches) {
+                const innerUnion = t
+                    .type;
+                const seenInBranch = new Set();
+                for (const inner of innerUnion.types) {
+                    const key = printType(inner);
+                    if (!seenInBranch.has(key)) {
+                        seenInBranch.add(key);
+                        if (countInBranches.has(key)) {
+                            countInBranches.get(key).count++;
+                        }
+                        else {
+                            countInBranches.set(key, { count: 1, node: inner });
+                        }
+                    }
+                }
+            }
+            // Types that appear in at least 2 branches, or already exist directly in the outer union
+            const toHoist = new Map();
+            for (const [key, { count, node: n }] of countInBranches) {
+                if (count >= 2 || seenDirect.has(key)) {
+                    toHoist.set(key, n);
+                }
+            }
+            if (toHoist.size === 0) {
+                if (deduped.length === types.length)
+                    return node;
+                return ts.factory.createUnionTypeNode(deduped);
+            }
+            // Rebuild the union
+            const result = [];
+            const hoistedKeys = new Set(toHoist.keys());
+            for (const t of deduped) {
+                if (ts.isParenthesizedTypeNode(t) && ts.isUnionTypeNode(t.type)) {
+                    const innerUnion = t.type;
+                    const remaining = innerUnion.types.filter((inner) => !hoistedKeys.has(printType(inner)));
+                    if (remaining.length === 0) {
+                        // Branch fully absorbed — discard
+                    }
+                    else if (remaining.length === 1) {
+                        result.push(remaining[0]); // unwrap
+                    }
+                    else {
+                        result.push(ts.factory.createParenthesizedType(ts.factory.createUnionTypeNode(remaining)));
+                    }
+                }
+                else {
+                    result.push(t);
+                }
+            }
+            // Append each hoisted type once (skip if already present directly)
+            for (const [key, hoistedNode] of toHoist) {
+                if (!seenDirect.has(key)) {
+                    result.push(hoistedNode);
+                }
+            }
+            return ts.factory.createUnionTypeNode(result);
+        };
+        return (root) => ts.visitNode(root, visit);
+    };
+    return ast.map((node) => ts.transform(node, [transformer]).transformed[0]);
+}
+/**
+ * Combines various module types into a single schema definition by analyzing the provided type content.
+ * The combined types are then appended to the original type content and used by the client to allow type
+ * inference for client modules (e.g., AuthClient<AuthModuleType>, ResourceClient<UserResourceModuleType>, etc.)
+ *
+ * @param {string} typeContent The TypeScript content containing type definitions to be processed.
+ * @param {OpenAPI3} schema The OpenAPI v3 schema object.
+ * @return {string} A string representing the modified type content with additional module type definitions.
+ */
+function combineModuleTypes(typeContent, schema) {
+    // Map of resource names with corresponding used types
+    // (e.g., User -> { single: UserSingle, ...})
+    const resourceTypes = {};
+    // Map of used auth types in generated schema
+    // (e.g., { loginRequest: LoginRequest })
+    const authTypes = {};
+    // Map of used auth types in generated schema
+    // (e.g., { statusResponse: AccountStatusResponse })
+    const accountTypes = {};
+    // Map of used health types in generated schema
+    // (e.g., { checkResponse: HealthCheckResponse })
+    const healthTypes = {};
+    // Utility function for capitalizing type names
+    const capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
+    // Utility function for collecting used types
+    const collectUsedTypes = (sourceTypes, targetObj, getTypeName, typesContent) => {
+        for (const type of sourceTypes) {
+            const typeName = getTypeName(type);
+            const resourcePattern = new RegExp(`export type ${typeName} = {`, 'g');
+            if (resourcePattern.test(typesContent)) {
+                targetObj[type] = typeName;
+            }
+            else {
+                targetObj[type] = 'never';
+            }
+        }
+    };
+    // Utility function for building TypeScript type from used values
+    const buildModuleType = (name, types) => {
+        const typeValues = Object.entries(types).map(([key, value]) => `${key}: ${value}`);
+        return `export type ${name} = { ${typeValues.join(';')} };`;
+    };
+    // Find all resource types with used schema types
+    for (const type of RESOURCE_TYPES) {
+        const typeSuffix = capitalize(type);
+        const resourcePattern = new RegExp(`export type (.+)${typeSuffix} = {`, 'g');
+        let match;
+        while ((match = resourcePattern.exec(typeContent)) !== null) {
+            const resourceName = match[1];
+            resourceTypes[resourceName] ??= {};
+            resourceTypes[resourceName][type] = `${resourceName}${typeSuffix}`;
+        }
+    }
+    // Resource types that are not found in schema are set to 'never' type to
+    // prevent their usage by generated client
+    for (const type of RESOURCE_TYPES) {
+        for (const resourceType of Object.values(resourceTypes)) {
+            if (!resourceType[type]) {
+                resourceType[type] = 'never';
+            }
+        }
+    }
+    // Find all used auth types
+    collectUsedTypes(AUTH_TYPES, authTypes, (type) => capitalize(type), typeContent);
+    // Extract identity type from authentication '/me' success response
+    const config = schema[CONFIG_FIELD];
+    authTypes['identity'] =
+        extractResponseType(typeContent, `${config?.routePrefixes?.auth ?? '/auth'}/me`, 'get') ?? 'never';
+    // Find all used account types
+    collectUsedTypes(ACCOUNT_TYPES, accountTypes, (type) => `Account${capitalize(type)}`, typeContent);
+    // Find all used health types
+    collectUsedTypes(HEALTH_TYPES, healthTypes, (type) => `Health${capitalize(type)}`, typeContent);
+    // Combine all module types into a single string and append to the type content
+    const moduleTypes = [
+        buildModuleType(AUTH_MODULE_TYPE, authTypes),
+        buildModuleType(ACCOUNT_MODULE_TYPE, accountTypes),
+        buildModuleType(HEALTH_MODULE_TYPE, healthTypes),
+        ...Object.entries(resourceTypes).map(([name, types]) => buildModuleType(`${name}${RESOURCE_MODULE_TYPE}`, types))
+    ];
+    return typeContent + `\n${moduleTypes.join('\n\n')}`;
+}
+/**
+ * Deduplicates exported type and enum names in the provided TypeScript content.
+ * Ensures no naming conflicts between types and enums with the same name and resolves duplicate type names.
+ *
+ * @param {string} content The string content of the TypeScript file to process.
+ * @return {string} A modified string with deduplicated names for exported types and enums.
+ */
+function deduplicateExportedTypes(content) {
+    const escapeRegExp = (s) => {
+        return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    };
+    // Collect type names (detect duplicates) and enum names
+    const typePattern = /\bexport type (\w+)/g;
+    const enumPattern = /\bexport enum (\w+)\s*\{/g;
+    const seenTypes = new Set();
+    const duplicateTypes = new Set();
+    const enumNames = new Set();
+    let m;
+    while ((m = typePattern.exec(content)) !== null) {
+        const name = m[1];
+        if (seenTypes.has(name)) {
+            duplicateTypes.add(name);
+        }
+        else {
+            seenTypes.add(name);
+        }
+    }
+    while ((m = enumPattern.exec(content)) !== null) {
+        enumNames.add(m[1]);
+    }
+    // Handle type-enum collisions
+    const typeEnumCollisions = [...seenTypes].filter((n) => enumNames.has(n));
+    for (const name of typeEnumCollisions) {
+        const escaped = escapeRegExp(name);
+        const placeholder = `__DEDUP_${name}__`;
+        // Protect enum declaration from the global replacement
+        content = content.replace(new RegExp(`\\bexport enum ${escaped}\\s*\\{`, 'g'), `export enum ${placeholder} {`);
+        // Rename all type-position occurrences (declaration + references) → NameType
+        content = content.replace(new RegExp(`\\b${escaped}\\b`, 'g'), `${name}Type`);
+        // Finalize enum name → NameEnum
+        content = content.replace(new RegExp(`\\bexport enum ${escapeRegExp(placeholder)}\\s*\\{`, 'g'), `export enum ${name}Enum {`);
+    }
+    // Handle duplicate type names (rename second occurrence only)
+    for (const name of duplicateTypes) {
+        if (typeEnumCollisions.includes(name)) {
+            // already handled above
+            continue;
+        }
+        const escaped = escapeRegExp(name);
+        let firstSeen = false;
+        content = content.replace(new RegExp(`\\bexport type ${escaped}\\b`, 'g'), (match) => {
+            if (!firstSeen) {
+                firstSeen = true;
+                return match;
+            }
+            return `export type ${name}Type`;
+        });
+    }
+    return content;
+}
+/**
+ * Replaces the `string` and `string[]` types with `File` and `File[]` respectively
+ * in TypeScript type definitions related to file uploads, only if the type body
+ * includes the annotation `@format binary`.
+ *
+ * This function processes a TypeScript file content string, identifies type definitions
+ * with names matching the pattern `export type <name>FileUpload = {...}`, and updates their
+ * definitions to reflect file-like objects instead of plain strings for better type safety.
+ *
+ * @param {string} typeContent - The TypeScript file content as a string, which
+ *     contains the type definitions to be inspected and replaced.
+ * @return {string} The updated TypeScript file content, with the modified type
+ *     definitions that reflect `File` and `File[]` for annotated file upload types.
+ */
+function replaceFileUploadTypes(typeContent) {
+    const fileUploadPattern = /export type \w+FileUpload = \{/g;
+    let result = typeContent;
+    let offset = 0;
+    let match;
+    while ((match = fileUploadPattern.exec(typeContent)) !== null) {
+        const bodyStart = match.index + match[0].length - 1; // index of opening '{'
+        // Extract body using brace-depth counting
+        let depth = 0;
+        let i = bodyStart;
+        for (; i < typeContent.length; i++) {
+            if (typeContent[i] === '{')
+                depth++;
+            else if (typeContent[i] === '}') {
+                depth--;
+                if (depth === 0)
+                    break;
+            }
+        }
+        const body = typeContent.slice(bodyStart, i + 1);
+        // Guard: only transform if the body contains @format binary
+        if (!body.includes('@format binary')) {
+            continue;
+        }
+        // Replace string[] before string to avoid double-replacement
+        const newBody = body
+            .replace(/\bstring\[]/g, 'File[]')
+            .replace(/\bstring\b/g, 'File');
+        // Splice the replacement into the result, accounting for prior replacements
+        const absoluteStart = match.index + match[0].length - 1 + offset;
+        const absoluteEnd = absoluteStart + body.length;
+        result =
+            result.slice(0, absoluteStart) + newBody + result.slice(absoluteEnd);
+        offset += newBody.length - body.length;
+    }
+    return result;
+}
+/**
+ * Extracts the response type from a provided string of types based on the specified path, method, and status code.
+ *
+ * @param {string} types - The string containing type definitions.
+ * @param {string} path - The full API path to match in the type definitions.
+ * @param {string} method - The HTTP method to look for (e.g., get, post, put, delete).
+ * @param {string} [code=200] - The HTTP response status code to match.
+ * @param {string} [mimeType='application/json'] - The HTTP response mime type to match.
+ * @return {string | undefined} The extracted response type if a match is found, otherwise undefined.
+ */
+function extractResponseType(types, path, method, code = '200', mimeType = 'application/json') {
+    const escapedPath = path.replace(/[/[\]{}.*+?^$|()\\]/g, '\\$&');
+    const escapedMimeType = mimeType.replace(/[/[\]{}.*+?^$|()\\]/g, '\\$&');
+    const regex = new RegExp(`"${escapedPath}":\\s*\\{.*?${method}:\\s*\\{.*?"?${code}"?:\\s*\\{.*?"${escapedMimeType}":\\s*(\\w+)`, 's');
+    return types.match(regex)?.[1];
+}

package/esm/generators/index.d.ts

@@ -0,0 +1,2 @@
+export * from './generate-client.js';
+export * from './generate-types.js';

package/esm/generators/index.js

@@ -0,0 +1,2 @@
+export * from './generate-client.js';
+export * from './generate-types.js';

package/esm/index.d.ts

@@ -0,0 +1,2 @@
+export * from './clients/index.js';
+export * from './errors/index.js';

package/esm/index.js

@@ -0,0 +1,2 @@
+export * from './clients/index.js';
+export * from './errors/index.js';

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/esm/types/index.d.ts

@@ -0,0 +1 @@
+export * from './routes.js';

package/esm/types/index.js

@@ -0,0 +1 @@
+export * from './routes.js';

package/esm/types/routes.d.ts

@@ -0,0 +1,15 @@
+export type RoutePathConfig = {
+    resourcePaths: {
+        name: string;
+        basePath: string;
+    }[];
+    routePrefixes: {
+        api: string;
+        static: string;
+        health: string;
+        auth: string;
+        account: string;
+        files: string;
+    };
+};
+export type RouteType = 'resource' | 'auth' | 'account' | 'health' | 'files' | 'custom';

package/esm/types/routes.js

@@ -0,0 +1 @@
+export {};

package/esm/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './schema-util.js';

package/esm/utils/index.js

@@ -0,0 +1 @@
+export * from './schema-util.js';

package/esm/utils/schema-util.d.ts

@@ -0,0 +1,3 @@
+import { OpenAPI3 } from 'openapi-typescript';
+export declare function readSchemaContent(schemaPath: string): Promise<string>;
+export declare function toSchemaObject(schemaContent: string): Promise<OpenAPI3>;

package/esm/utils/schema-util.js

@@ -0,0 +1,39 @@
+import fsp from 'node:fs/promises';
+import yaml from 'js-yaml';
+export async function readSchemaContent(schemaPath) {
+    let schemaUrl;
+    try {
+        schemaUrl = new URL(schemaPath);
+    }
+    catch {
+        return await fsp.readFile(schemaPath, 'utf8');
+    }
+    if (schemaUrl.protocol === 'http:' || schemaUrl.protocol === 'https:') {
+        let res;
+        try {
+            res = await fetch(schemaUrl.toString());
+        }
+        catch {
+            throw new Error(`Cannot access schema URL: ${schemaUrl}`);
+        }
+        if (!res.ok) {
+            throw new Error(`Fetching schema ${schemaUrl} failed: ${res.statusText}`);
+        }
+        return await res.text();
+    }
+    return await fsp.readFile(schemaUrl, 'utf8');
+}
+export async function toSchemaObject(schemaContent) {
+    try {
+        return JSON.parse(schemaContent);
+    }
+    catch {
+        // not JSON, try YAML
+    }
+    try {
+        return yaml.load(schemaContent);
+    }
+    catch {
+        throw Error('Unable to parse schema object in JSON or YAML format.');
+    }
+}

package/package.json

@@ -1,13 +1,37 @@
 {
   "name": "@appweaver/client",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Appweaver - the backend framework for AI-first development (@client)",
   "author": "Luka Matosevic",
   "license": "MIT",
-  "main": "./index.js",
-  "types": "./index.d.ts",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./cjs/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./esm/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./cjs/index.d.ts",
+        "default": "./cjs/index.js"
+      }
+    },
+    "./angular": {
+      "import": {
+        "types": "./esm/angular/index.d.ts",
+        "default": "./esm/angular/index.js"
+      },
+      "require": {
+        "types": "./cjs/angular/index.d.ts",
+        "default": "./cjs/angular/index.js"
+      }
+    },
+    "./package.json": "./package.json"
+  },
   "bin": {
-    "weaver-client": "./weaver-client.js"
+    "weaver-client": "./cjs/weaver-client.js"
   },
   "repository": {
     "type": "git",
@@ -28,7 +52,7 @@
     "node": ">= 20"
   },
   "scripts": {
-    "weaver-client": "node ./dist/weaver-client.js"
+    "weaver-client": "node ./dist/cjs/weaver-client.js"
   },
   "dependencies": {
     "commander": "15.0.0",
@@ -37,10 +61,18 @@
     "openapi-typescript": "7.13.0",
     "openapi-typescript-helpers": "0.1.0",
     "prettier": "3.8.4",
-    "rxjs": "^7.8.0",
     "typescript": "5.9.3"
   },
   "devDependencies": {
-    "@types/js-yaml": "4.0.9"
+    "@types/js-yaml": "4.0.9",
+    "rxjs": "^7.8.0"
+  },
+  "peerDependencies": {
+    "rxjs": "^7.8.0"
+  },
+  "peerDependenciesMeta": {
+    "rxjs": {
+      "optional": true
+    }
   }
 }