@appweaver/client 1.1.5 → 1.2.0

package/cjs/clients/modules/account-client.js

@@ -102,7 +102,7 @@ class AccountClient extends base_module_1.BaseModule {
      * @returns A response indicating whether the 2FA verification succeeded.
      */
     async verify2FACode(request, options = {}) {
-        return this.sendRequest('post', `${this.basePath}/account/verify-2fa-code`, {
+        return this.sendRequest('post', `${this.basePath}/verify-2fa-code`, {
             ...options,
             body: request
         });

package/cjs/commands/generate-command.d.ts

@@ -1,3 +1,4 @@
 import { Command } from 'commander';
 export declare function generateCommand(program: Command): void;
 export declare function relativePathFrom(firstPath: string, otherPath: string): string;
+export declare function parseSchema(value: string): string;

package/cjs/commands/generate-command.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCommand = generateCommand;
 exports.relativePathFrom = relativePathFrom;
+exports.parseSchema = parseSchema;
 const node_fs_1 = __importDefault(require("node:fs"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -102,13 +103,7 @@ function relativePathFrom(firstPath, otherPath) {
     return rel.replace(/\\/g, '/');
 }
 function parseSchema(value) {
-    let schemaUrl;
-    try {
-        schemaUrl = new URL(value);
-    }
-    catch {
-        // Schema path is not in URL format
-    }
+    const schemaUrl = (0, utils_1.parseSchemaUrl)(value);
     if (schemaUrl) {
         if (!['http:', 'https:', 'file:'].includes(schemaUrl.protocol)) {
             throw new commander_1.InvalidArgumentError(`Unsupported schema URL protocol: ${schemaUrl.protocol}`);

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

@@ -1,3 +1,13 @@
 import { OpenAPI3 } from 'openapi-typescript';
+/**
+ * Parses a schema location into a URL, treating the locations that are
+ * filesystem paths as such rather than as URLs.
+ *
+ * @param {string} schemaPath The schema location given on the command line,
+ * either a URL or a filesystem path.
+ * @returns {URL | undefined} The parsed URL, or undefined when the location is
+ * a filesystem path, including a Windows path starting with a drive letter.
+ */
+export declare function parseSchemaUrl(schemaPath: string): URL | undefined;
 export declare function readSchemaContent(schemaPath: string): Promise<string>;
 export declare function toSchemaObject(schemaContent: string): Promise<OpenAPI3>;

package/cjs/utils/schema-util.js

@@ -3,16 +3,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSchemaUrl = parseSchemaUrl;
 exports.readSchemaContent = readSchemaContent;
 exports.toSchemaObject = toSchemaObject;
 const promises_1 = __importDefault(require("node:fs/promises"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
-async function readSchemaContent(schemaPath) {
-    let schemaUrl;
+// A Windows path starting with a drive letter (i.e. `C:\schema.json`) parses
+// as a URL whose protocol is a single letter, no real protocol is one letter.
+const WINDOWS_DRIVE_PATH = /^[a-zA-Z]:[\\/]/;
+/**
+ * Parses a schema location into a URL, treating the locations that are
+ * filesystem paths as such rather than as URLs.
+ *
+ * @param {string} schemaPath The schema location given on the command line,
+ * either a URL or a filesystem path.
+ * @returns {URL | undefined} The parsed URL, or undefined when the location is
+ * a filesystem path, including a Windows path starting with a drive letter.
+ */
+function parseSchemaUrl(schemaPath) {
+    if (WINDOWS_DRIVE_PATH.test(schemaPath)) {
+        return undefined;
+    }
     try {
-        schemaUrl = new URL(schemaPath);
+        return new URL(schemaPath);
     }
     catch {
+        // Schema path is not in URL format
+        return undefined;
+    }
+}
+async function readSchemaContent(schemaPath) {
+    const schemaUrl = parseSchemaUrl(schemaPath);
+    if (!schemaUrl) {
         return await promises_1.default.readFile(schemaPath, 'utf8');
     }
     if (schemaUrl.protocol === 'http:' || schemaUrl.protocol === 'https:') {

package/esm/clients/modules/account-client.js

@@ -99,7 +99,7 @@ export class AccountClient extends BaseModule {
      * @returns A response indicating whether the 2FA verification succeeded.
      */
     async verify2FACode(request, options = {}) {
-        return this.sendRequest('post', `${this.basePath}/account/verify-2fa-code`, {
+        return this.sendRequest('post', `${this.basePath}/verify-2fa-code`, {
             ...options,
             body: request
         });

package/esm/commands/generate-command.d.ts

@@ -1,3 +1,4 @@
 import { Command } from 'commander';
 export declare function generateCommand(program: Command): void;
 export declare function relativePathFrom(firstPath: string, otherPath: string): string;
+export declare function parseSchema(value: string): string;

package/esm/commands/generate-command.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import prettier from 'prettier';
 import { InvalidArgumentError, InvalidOptionArgumentError } from 'commander';
 import { generateClient, generateTypes } from '../generators/index.js';
-import { readSchemaContent, toSchemaObject } from '../utils/index.js';
+import { parseSchemaUrl, readSchemaContent, toSchemaObject } from '../utils/index.js';
 import { FRAMEWORKS } from '../constants.js';
 export function generateCommand(program) {
     program
@@ -94,14 +94,8 @@ export function relativePathFrom(firstPath, otherPath) {
     }
     return rel.replace(/\\/g, '/');
 }
-function parseSchema(value) {
-    let schemaUrl;
-    try {
-        schemaUrl = new URL(value);
-    }
-    catch {
-        // Schema path is not in URL format
-    }
+export function parseSchema(value) {
+    const schemaUrl = parseSchemaUrl(value);
     if (schemaUrl) {
         if (!['http:', 'https:', 'file:'].includes(schemaUrl.protocol)) {
             throw new InvalidArgumentError(`Unsupported schema URL protocol: ${schemaUrl.protocol}`);

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

@@ -1,3 +1,13 @@
 import { OpenAPI3 } from 'openapi-typescript';
+/**
+ * Parses a schema location into a URL, treating the locations that are
+ * filesystem paths as such rather than as URLs.
+ *
+ * @param {string} schemaPath The schema location given on the command line,
+ * either a URL or a filesystem path.
+ * @returns {URL | undefined} The parsed URL, or undefined when the location is
+ * a filesystem path, including a Windows path starting with a drive letter.
+ */
+export declare function parseSchemaUrl(schemaPath: string): URL | undefined;
 export declare function readSchemaContent(schemaPath: string): Promise<string>;
 export declare function toSchemaObject(schemaContent: string): Promise<OpenAPI3>;

package/esm/utils/schema-util.js

@@ -1,11 +1,32 @@
 import fsp from 'node:fs/promises';
 import yaml from 'js-yaml';
-export async function readSchemaContent(schemaPath) {
-    let schemaUrl;
+// A Windows path starting with a drive letter (i.e. `C:\schema.json`) parses
+// as a URL whose protocol is a single letter, no real protocol is one letter.
+const WINDOWS_DRIVE_PATH = /^[a-zA-Z]:[\\/]/;
+/**
+ * Parses a schema location into a URL, treating the locations that are
+ * filesystem paths as such rather than as URLs.
+ *
+ * @param {string} schemaPath The schema location given on the command line,
+ * either a URL or a filesystem path.
+ * @returns {URL | undefined} The parsed URL, or undefined when the location is
+ * a filesystem path, including a Windows path starting with a drive letter.
+ */
+export function parseSchemaUrl(schemaPath) {
+    if (WINDOWS_DRIVE_PATH.test(schemaPath)) {
+        return undefined;
+    }
     try {
-        schemaUrl = new URL(schemaPath);
+        return new URL(schemaPath);
     }
     catch {
+        // Schema path is not in URL format
+        return undefined;
+    }
+}
+export async function readSchemaContent(schemaPath) {
+    const schemaUrl = parseSchemaUrl(schemaPath);
+    if (!schemaUrl) {
         return await fsp.readFile(schemaPath, 'utf8');
     }
     if (schemaUrl.protocol === 'http:' || schemaUrl.protocol === 'https:') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appweaver/client",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Appweaver - the backend framework for AI-first development (@client)",
   "author": "Luka Matosevic",
   "license": "MIT",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "commander": "15.0.0",
-    "js-yaml": "5.0.0",
+    "js-yaml": "5.2.3",
     "openapi-fetch": "0.17.0",
     "openapi-typescript": "7.13.0",
     "openapi-typescript-helpers": "0.1.0",