@sdkgen/node-runtime 2.1.0 → 2.3.1

package/dist/spec/simple/legacyNodeClient.d.ts

@@ -2,7 +2,7 @@ export interface User {
     name: string;
     age: number;
 }
-export declare type ErrorType = "Fatal" | "Connection";
+export type ErrorType = "Fatal" | "Connection";
 export declare class ApiClient {
     private baseUrl;
     private useStaging;

package/dist/spec/simple/simple.spec.js

@@ -17,6 +17,7 @@ const fs_1 = require("fs");
 const parser_1 = require("@sdkgen/parser");
 const typescript_generator_1 = require("@sdkgen/typescript-generator");
 const axios_1 = __importDefault(require("axios"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const src_1 = require("../../src");
 const ast = new parser_1.Parser(`${__dirname}/api.sdkgen`).parse();
 (0, fs_1.writeFileSync)(`${__dirname}/api.ts`, (0, typescript_generator_1.generateNodeServerSource)(ast).replace(/@sdkgen\/node-runtime/gu, "../../src"));
@@ -37,6 +38,9 @@ api.fn.identity = async (ctx, { types }) => {
 api.fn.throwsError = async () => {
     throw new SomeError("Some message");
 };
+api.fn.decimalAdd = async (_ctx, { a, b }) => {
+    return a.add(b);
+};
 // ExecSync(`../../cubos/sdkgen/sdkgen ${__dirname + "/api.sdkgen"} -o ${__dirname + "/legacyNodeClient.ts"} -t typescript_nodeclient`);
 const { ApiClient: NodeLegacyApiClient } = require(`${__dirname}/legacyNodeClient.ts`);
 const nodeLegacyClient = new NodeLegacyApiClient("http://localhost:34367");
@@ -102,4 +106,8 @@ describe("Simple API", () => {
             type: "SomeError",
         });
     });
+    test("Can handle decimals", async () => {
+        const result = await nodeClient.decimalAdd(null, { a: new decimal_js_1.default("0.1"), b: new decimal_js_1.default("0.2") });
+        expect(result.eq(new decimal_js_1.default("0.3"))).toEqual(true);
+    });
 });

package/dist/src/api-config.d.ts

@@ -1,14 +1,12 @@
 import type { AstJson, AstRoot } from "@sdkgen/parser";
 import type { Context, ContextReply } from "./context";
 import type { DeepReadonly } from "./utils";
-declare type Middleware<ExtraContextT> = (ctx: Context & ExtraContextT, next: () => Promise<ContextReply>) => Promise<ContextReply>;
-export declare abstract class BaseApiConfig<ExtraContextT = unknown> {
+type Middleware<ExtraContextT> = (ctx: Context & ExtraContextT, next: () => Promise<ContextReply>) => Promise<ContextReply>;
+export declare class BaseApiConfig<ExtraContextT = unknown> {
     private _ast;
     get ast(): AstRoot;
     astJson: DeepReadonly<AstJson>;
-    fn: {
-        [name: string]: ((ctx: Context & ExtraContextT, args: any) => Promise<any>) | undefined;
-    };
+    fn: Record<string, ((ctx: Context & ExtraContextT, args: any) => Promise<any>) | undefined>;
     readonly middlewares: Array<Middleware<ExtraContextT>>;
     use(middleware: Middleware<ExtraContextT>): void;
 }

package/dist/src/api-config.js

@@ -4,6 +4,7 @@ exports.BaseApiConfig = void 0;
 const parser_1 = require("@sdkgen/parser");
 class BaseApiConfig {
     constructor() {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.fn = {};
         this.middlewares = [];
     }

package/dist/src/context.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingHttpHeaders, OutgoingHttpHeader } from "http";
 import type { Readable } from "stream";
 export interface ContextRequest {

package/dist/src/encode-decode.d.ts

@@ -1,31 +1,32 @@
 /// <reference types="node" />
 import type { AstJson, TypeDescription } from "@sdkgen/parser";
+import { Decimal } from "decimal.js";
 import type { DeepReadonly } from "./utils";
-declare type TypeTable = AstJson["typeTable"];
-declare type ExpandRecursively<T> = T extends object ? (T extends infer O ? {
+type TypeTable = AstJson["typeTable"];
+type ExpandRecursively<T> = T extends object ? (T extends infer O ? {
     [K in keyof O]: ExpandRecursively<O[K]>;
 } : never) : T;
-declare type JsonType = number | string | boolean | null | JsonType[] | {
+type JsonType = number | string | boolean | null | JsonType[] | {
     [Key in string]: JsonType;
 };
-declare type AnyDecodedType = number | string | boolean | null | bigint | Buffer | Date | AnyDecodedType[] | {
+type AnyDecodedType = number | string | boolean | null | bigint | Decimal | Buffer | Date | AnyDecodedType[] | {
     [Key in string]: AnyDecodedType;
 };
-declare type DecodedType<Type, Table extends object> = TypeDescription extends Type ? AnyDecodedType : Type extends "string" | "email" | "html" | "xml" | "url" | "hex" | "uuid" | "base64" | "cpf" | "cnpj" ? string : Type extends "json" ? JsonType : Type extends "bool" ? boolean : Type extends "void" ? null : Type extends "int" | "uint" | "float" | "money" ? number : Type extends "bigint" ? bigint : Type extends "bytes" ? Buffer : Type extends "date" | "datetime" ? Date : Type extends `${infer X}?` ? DecodedType<X, Table> | null : Type extends `${infer X}[]` ? Array<DecodedType<X, Table>> : Type extends Array<string | [string, string]> ? DecodedEnumType<Type, Table> : Type extends ReadonlyArray<string | readonly [string, string]> ? DecodedEnumType<Type, Table> : Type extends object ? {
+export type DecodedType<Type, Table extends object = {}> = TypeDescription extends Type ? AnyDecodedType : Type extends "string" | "email" | "html" | "xml" | "url" | "hex" | "uuid" | "base64" | "cpf" | "cnpj" ? string : Type extends "json" ? JsonType : Type extends "bool" ? boolean : Type extends "void" ? null : Type extends "int" | "uint" | "float" | "money" ? number : Type extends "bigint" ? bigint : Type extends "bytes" ? Buffer : Type extends "decimal" ? Decimal : Type extends "date" | "datetime" ? Date : Type extends `${infer X}?` ? DecodedType<X, Table> | null : Type extends `${infer X}[]` ? Array<DecodedType<X, Table>> : Type extends Array<string | [string, string]> ? DecodedEnumType<Type, Table> : Type extends ReadonlyArray<string | readonly [string, string]> ? DecodedEnumType<Type, Table> : Type extends object ? {
     -readonly [Key in keyof Type]: DecodedType<Type[Key], Table>;
 } : object extends Table ? never : Type extends keyof Table ? DecodedType<Table[Type], Table> : never;
-declare type DecodedEnumType<Type extends Array<string | [string, string]> | ReadonlyArray<string | readonly [string, string]>, Table extends object> = Type[number] extends string ? Type[number] : DecodeTaggedEnumValueType<Type[number], Table>;
-declare type DecodeTaggedEnumValueType<ValueType extends string | [string, string] | readonly [string, string], Table extends object> = ValueType extends string ? {
+type DecodedEnumType<Type extends Array<string | [string, string]> | ReadonlyArray<string | readonly [string, string]>, Table extends object> = Type[number] extends string ? Type[number] : DecodeTaggedEnumValueType<Type[number], Table>;
+type DecodeTaggedEnumValueType<ValueType extends string | [string, string] | readonly [string, string], Table extends object> = ValueType extends string ? {
     tag: ValueType;
 } : ValueType extends [infer Tag, infer Struct] ? ExpandRecursively<{
     tag: Tag;
 } & DecodedType<Struct, Table>> : ValueType extends readonly [infer Tag, infer Struct] ? ExpandRecursively<{
     tag: Tag;
 } & DecodedType<Struct, Table>> : never;
-declare type EncodedType<Type, Table extends object> = TypeDescription extends Type ? JsonType : Type extends "string" | "email" | "html" | "xml" | "url" | "hex" | "uuid" | "base64" | "cpf" | "cnpj" ? string : Type extends "json" ? JsonType : Type extends "bool" ? boolean : Type extends "void" ? null : Type extends "int" | "uint" | "float" | "money" ? number : Type extends "bigint" | "bytes" | "date" | "datetime" ? string : Type extends `${infer X}?` ? EncodedType<X, Table> | null : Type extends `${infer X}[]` ? Array<EncodedType<X, Table>> : Type extends Array<string | [string, string]> ? EnumEncodedValueType<Type[number], Table> : Type extends ReadonlyArray<string | readonly [string, string]> ? EnumEncodedValueType<Type[number], Table> : Type extends object ? {
+export type EncodedType<Type, Table extends object = {}> = TypeDescription extends Type ? JsonType : Type extends "string" | "email" | "html" | "xml" | "url" | "hex" | "uuid" | "base64" | "cpf" | "cnpj" ? string : Type extends "json" ? JsonType : Type extends "bool" ? boolean : Type extends "void" ? null : Type extends "int" | "uint" | "float" | "money" ? number : Type extends "bigint" | "bytes" | "date" | "datetime" | "decimal" ? string : Type extends `${infer X}?` ? EncodedType<X, Table> | null : Type extends `${infer X}[]` ? Array<EncodedType<X, Table>> : Type extends Array<string | [string, string]> ? EnumEncodedValueType<Type[number], Table> : Type extends ReadonlyArray<string | readonly [string, string]> ? EnumEncodedValueType<Type[number], Table> : Type extends object ? {
     -readonly [Key in keyof Type]: EncodedType<Type[Key], Table>;
 } : object extends Table ? never : Type extends keyof Table ? EncodedType<Table[Type], Table> : never;
-declare type EnumEncodedValueType<ValueType extends string | [string, string] | readonly [string, string], Table extends object> = ValueType extends string ? ValueType : ValueType extends [infer Tag, infer Struct] ? [Tag, EncodedType<Struct, Table>] : ValueType extends readonly [infer Tag, infer Struct] ? [Tag, EncodedType<Struct, Table>] : never;
+type EnumEncodedValueType<ValueType extends string | [string, string] | readonly [string, string], Table extends object> = ValueType extends string ? ValueType : ValueType extends [infer Tag, infer Struct] ? [Tag, EncodedType<Struct, Table>] : ValueType extends readonly [infer Tag, infer Struct] ? [Tag, EncodedType<Struct, Table>] : never;
 export declare function encode<Table extends DeepReadonly<TypeTable>, Type extends DeepReadonly<TypeDescription>>(typeTable: Table, path: string, type: Type, value: unknown): EncodedType<Type, Table>;
 export declare function decode<Table extends DeepReadonly<TypeTable>, Type extends DeepReadonly<TypeDescription>>(typeTable: Table, path: string, type: Type, value: unknown): DecodedType<Type, Table>;
 export {};

package/dist/src/encode-decode.js

@@ -37,6 +37,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decode = exports.encode = void 0;
 const CNPJ = __importStar(require("@fnando/cnpj"));
 const CPF = __importStar(require("@fnando/cpf"));
+const decimal_js_1 = require("decimal.js");
 const simpleStringTypes = ["string", "email", "html", "xml"];
 const simpleTypes = ["json", "bool", "url", "int", "uint", "float", "money", "hex", "uuid", "base64", "void", ...simpleStringTypes];
 class ParseError extends Error {
@@ -48,7 +49,7 @@ class ParseError extends Error {
         catch (err) {
             str = String(value);
         }
-        super(`Invalid type at '${path}', expected ${type}, got ${str}`);
+        super(`Invalid type at '${path}', expected ${String(type)}, got ${str}`);
     }
 }
 function simpleEncodeDecode(path, type, value) {
@@ -220,7 +221,11 @@ function encode(typeTable, path, type, value) {
         if (!(value instanceof Date && !isNaN(value.getTime())) && !(typeof value === "string" && /^[0-9]{4}-[01][0-9]-[0123][0-9]$/u.test(value))) {
             throw new ParseError(path, type, value);
         }
-        return (typeof value === "string" ? new Date(value).toISOString().split("T")[0] : value.toISOString().split("T")[0]);
+        const dateValue = value instanceof Date ? value : new Date(value);
+        return `${dateValue.getFullYear().toString().padStart(4, "0")}-${(dateValue.getMonth() + 1).toString().padStart(2, "0")}-${dateValue
+            .getDate()
+            .toString()
+            .padStart(2, "0")}`;
     }
     else if (type === "datetime") {
         if (!(value instanceof Date && !isNaN(value.getTime())) &&
@@ -230,13 +235,19 @@ function encode(typeTable, path, type, value) {
         }
         return (typeof value === "string" ? new Date(value) : value).toISOString().replace("Z", "");
     }
+    else if (type === "decimal") {
+        if (typeof value !== "number" && (typeof value !== "string" || !/^-?[0-9]+(?:\.[0-9]+)?$/u.test(value)) && !decimal_js_1.Decimal.isDecimal(value)) {
+            throw new ParseError(path, type, value);
+        }
+        return new decimal_js_1.Decimal(value).toString();
+    }
     else {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         const resolved = typeTable[type];
         if (resolved) {
             return encode(typeTable, path, resolved, value);
         }
-        throw new Error(`Unknown type '${type}' at '${path}'`);
+        throw new Error(`Unknown type '${String(type)}' at '${path}'`);
     }
 }
 exports.encode = encode;
@@ -301,11 +312,11 @@ function decode(typeTable, path, type, value) {
     }
     else if (type === "bytes") {
         if (typeof value !== "string") {
-            throw new ParseError(path, `${type} (base 64)`, value);
+            throw new ParseError(path, `${String(type)} (base 64)`, value);
         }
         const buffer = Buffer.from(value, "base64");
         if (buffer.toString("base64") !== value) {
-            throw new ParseError(path, `${type} (base 64)`, value);
+            throw new ParseError(path, `${String(type)} (base 64)`, value);
         }
         return buffer;
     }
@@ -346,6 +357,12 @@ function decode(typeTable, path, type, value) {
         }
         return new Date(`${value.endsWith("Z") ? value : value.concat("Z")}`);
     }
+    else if (type === "decimal") {
+        if (typeof value !== "number" && (typeof value !== "string" || !/^-?[0-9]+(?:\.[0-9]+)?$/u.test(value))) {
+            throw new ParseError(path, type, value);
+        }
+        return new decimal_js_1.Decimal(value);
+    }
     else {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         const resolved = typeTable[type];
@@ -353,7 +370,7 @@ function decode(typeTable, path, type, value) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return decode(typeTable, path, resolved, value);
         }
-        throw new Error(`Unknown type '${type}' at '${path}'`);
+        throw new Error(`Unknown type '${String(type)}' at '${path}'`);
     }
 }
 exports.decode = decode;

package/dist/src/http-client.d.ts

@@ -3,9 +3,7 @@ import type { PartialDeep } from "type-fest";
 import type { Context } from "./context";
 import type { SdkgenError, SdkgenErrorWithData } from "./error";
 import type { DeepReadonly } from "./utils";
-interface ErrClasses {
-    [className: string]: (new (message: string, data: any) => SdkgenErrorWithData<any>) | (new (message: string) => SdkgenError) | undefined;
-}
+type ErrClasses = Record<string, (new (message: string, data: any) => SdkgenErrorWithData<any>) | (new (message: string) => SdkgenError) | undefined>;
 export declare class SdkgenHttpClient {
     private astJson;
     private errClasses;

package/dist/src/http-client.js

@@ -76,27 +76,29 @@ class SdkgenHttpClient {
             });
             req.write(requestBody);
             req.end();
-        }).catch(error => {
+        }).catch((error) => {
+            var _a;
             if ((0, utils_1.has)(error, "type") && (0, utils_1.has)(error, "message") && typeof error.type === "string" && typeof error.message === "string") {
-                const errClass = this.errClasses[error.type];
-                if (errClass) {
-                    const errorJson = this.astJson.errors.find(err => (Array.isArray(err) ? err[0] === error.type : err === error.type));
-                    if (errorJson) {
-                        if (Array.isArray(errorJson) && (0, utils_1.has)(error, "data")) {
-                            throw new errClass(error.message, (0, encode_decode_1.decode)(this.astJson.typeTable, `${errClass.name}.data`, errorJson[1], error.data));
-                        }
-                        else {
-                            throw new errClass(error.message, undefined);
-                        }
-                    }
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const errClass = (_a = this.errClasses[error.type]) !== null && _a !== void 0 ? _a : this.errClasses.Fatal;
+                const errType = errClass.name;
+                const errorJson = this.astJson.errors.find(err => (Array.isArray(err) ? err[0] === errType : err === errType));
+                let newError;
+                if (errorJson && Array.isArray(errorJson) && (0, utils_1.has)(error, "data")) {
+                    newError = new errClass(error.message, (0, encode_decode_1.decode)(this.astJson.typeTable, `${errClass.name}.data`, errorJson[1], error.data));
+                }
+                else {
+                    newError = new errClass(error.message, undefined);
+                }
+                if (!newError.type) {
+                    newError.type = errType;
                 }
-                throw new this.errClasses.Fatal(`${error.type}: ${error.message}`);
+                throw newError;
             }
             else {
                 throw error;
             }
         });
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return (0, encode_decode_1.decode)(this.astJson.typeTable, `${functionName}.ret`, func.ret, encodedRet);
     }
 }

package/dist/src/http-server.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingMessage, Server, ServerResponse } from "http";
 import type { BaseApiConfig } from "./api-config";
 export declare class SdkgenHttpServer<ExtraContextT = unknown> {

package/dist/src/http-server.js

@@ -67,11 +67,21 @@ class SdkgenHttpServer {
                 res.end();
                 return;
             }
-            const body = [];
-            req.on("data", chunk => body.push(chunk));
-            req.on("end", () => {
-                this.handleRequestWithBody(req, res, Buffer.concat(body), hrStart).catch((e) => this.writeReply(res, null, { error: e }, hrStart));
-            });
+            const handleBody = (body) => {
+                this.handleRequestWithBody(req, res, body, hrStart).catch((e) => this.writeReply(res, null, { error: e }, hrStart));
+            };
+            // Google Cloud Functions add a rawBody property to the request object
+            if ((0, utils_1.has)(req, "rawBody") && req.rawBody instanceof Buffer) {
+                handleBody(req.rawBody);
+            }
+            else {
+                const body = [];
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                req.on("data", chunk => body.push(chunk));
+                req.on("end", () => {
+                    handleBody(Buffer.concat(body));
+                });
+            }
         };
         this.extraContext = ((_a = maybeExtraContext[0]) !== null && _a !== void 0 ? _a : {});
         this.httpServer = (0, http_1.createServer)(this.handleRequest.bind(this));
@@ -150,28 +160,29 @@ class SdkgenHttpServer {
         return new Promise(resolve => {
             this.httpServer.listen(port, () => {
                 const addr = this.httpServer.address();
-                let addrString;
-                if (addr === null) {
-                    addrString = undefined;
+                let urlHost;
+                if (addr.address === "::") {
+                    urlHost = `localhost:${addr.port}`;
                 }
-                else if (typeof addr === "string") {
-                    addrString = addr;
+                else if (addr.family === "ipv6") {
+                    urlHost = `[${addr.address}]:${addr.port}`;
                 }
                 else {
-                    addrString = `${addr.address}:${addr.port}`;
+                    urlHost = `${addr.address}:${addr.port}`;
                 }
-                if (!addrString) {
-                    console.log(`Listening.`);
-                    resolve();
-                    return;
+                if (addr.address === "::" || addr.address === "0.0.0.0") {
+                    console.log(`\nListening on port ${addr.port}`);
+                }
+                else {
+                    console.log(`\nListening on port ${addr.port} (${addr.address})`);
                 }
-                console.log(`Listening on ${addrString}`);
                 if (this.introspection) {
-                    console.log(`Access the sdkgen Playground at http://${addrString}/playground`);
+                    console.log(`Playground: http://${urlHost}/playground`);
                 }
                 if (this.hasSwagger) {
-                    console.log(`Access the REST API Swagger at http://${addrString}/swagger`);
+                    console.log(`Swagger UI: http://${urlHost}/swagger`);
                 }
+                console.log("");
                 resolve();
             });
         });
@@ -370,6 +381,7 @@ class SdkgenHttpServer {
                                         type instanceof parser_1.DatePrimitiveType ||
                                         type instanceof parser_1.DateTimePrimitiveType ||
                                         type instanceof parser_1.MoneyPrimitiveType ||
+                                        type instanceof parser_1.DecimalPrimitiveType ||
                                         type instanceof parser_1.BigIntPrimitiveType ||
                                         type instanceof parser_1.CpfPrimitiveType ||
                                         type instanceof parser_1.CnpjPrimitiveType ||
@@ -463,7 +475,9 @@ class SdkgenHttpServer {
                                 if (reply.error) {
                                     const error = this.makeResponseError(reply.error);
                                     if (!(ctx === null || ctx === void 0 ? void 0 : ctx.response.statusCode)) {
-                                        res.statusCode = error.type === "Fatal" ? 500 : 400;
+                                        const errorNode = this.apiConfig.ast.errors.find(node => node.name === error.type);
+                                        const statusAnnotation = errorNode === null || errorNode === void 0 ? void 0 : errorNode.annotations.find(x => x instanceof parser_1.StatusCodeAnnotation);
+                                        res.statusCode = statusAnnotation ? statusAnnotation.statusCode : error.type === "Fatal" ? 500 : 400;
                                     }
                                     res.setHeader("content-type", "application/json");
                                     res.write(JSON.stringify(error));
@@ -495,6 +509,7 @@ class SdkgenHttpServer {
                                         type instanceof parser_1.DatePrimitiveType ||
                                         type instanceof parser_1.DateTimePrimitiveType ||
                                         type instanceof parser_1.MoneyPrimitiveType ||
+                                        type instanceof parser_1.DecimalPrimitiveType ||
                                         type instanceof parser_1.BigIntPrimitiveType ||
                                         type instanceof parser_1.CpfPrimitiveType ||
                                         type instanceof parser_1.CnpjPrimitiveType ||
@@ -924,16 +939,3 @@ class SdkgenHttpServer {
     }
 }
 exports.SdkgenHttpServer = SdkgenHttpServer;
-// type SdkgenHttpServerConstructor<ExtraContextT = unknown> = {} extends ExtraContextT
-//   ? ExtraContextT extends {}
-//     ? new (apiConfig: BaseApiConfig<ExtraContextT>) => SdkgenHttpServer
-//     : new (apiConfig: BaseApiConfig<ExtraContextT>, extraContext: ExtraContextT) => SdkgenHttpServer
-//   : new (apiConfig: BaseApiConfig<ExtraContextT>, extraContext: ExtraContextT) => SdkgenHttpServer;
-// function wrap(constructor: typeof SdkgenHttpServerBase) {
-//   return constructor as unknown as SdkgenHttpServerConstructor;
-// }
-// // eslint-disable-next-line @typescript-eslint/naming-convention
-// export const SdkgenHttpServer = wrap(class SdkgenHttpServer<ExtraContextT = unknown> extends SdkgenHttpServerBase<ExtraContextT> {});
-// export type SdkgenHttpServer<ExtraContextT = unknown> = {
-//   [Prop in keyof SdkgenHttpServerBase<ExtraContextT>]: SdkgenHttpServerBase<ExtraContextT>[Prop];
-// };

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
 export { BaseApiConfig } from "./api-config";
 export { Context, ContextReply, ContextRequest } from "./context";
-export { decode, encode } from "./encode-decode";
+export { decode, encode, DecodedType, EncodedType } from "./encode-decode";
 export { Fatal, SdkgenError, SdkgenErrorWithData } from "./error";
 export { SdkgenHttpClient } from "./http-client";
 export { SdkgenHttpServer } from "./http-server";