@smartlyio/oats-runtime 3.5.0 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartlyio/oats-runtime",
-  "version": "3.5.0",
+  "version": "4.0.2",
   "license": "MIT",
   "description": "Runtime for Oats a Openapi3 based generator for typescript aware servers and clients",
   "private": false,
@@ -35,17 +35,17 @@
     "client"
   ],
   "devDependencies": {
-    "@types/jest": "27.0.2",
-    "@types/lodash": "4.14.177",
-    "@types/node": "16.11.7",
-    "fast-check": "2.19.0",
-    "jest": "27.3.1",
+    "@types/jest": "27.0.3",
+    "@types/lodash": "4.14.178",
+    "@types/node": "16.11.14",
+    "fast-check": "2.20.0",
+    "jest": "27.4.5",
     "jsverify": "0.8.4",
-    "prettier": "2.4.1",
-    "ts-jest": "27.0.7",
+    "prettier": "2.5.1",
+    "ts-jest": "27.1.2",
     "ts-node": "10.4.0",
-    "tsconfig-paths": "3.11.0",
-    "typescript": "4.4.4"
+    "tsconfig-paths": "3.12.0",
+    "typescript": "4.5.4"
   },
-  "gitHead": "a5e812f13092a2e10a0aee6e70bdc548c19e6ac8"
+  "gitHead": "140ea78c4bb8bd34c7959941d4f9d771c289c30c"
 }

package/src/make.ts

@@ -484,7 +484,7 @@ export function makeNullable(maker: any) {
 
 function isScalar(type: Type): boolean {
   if (type.type === 'named') {
-    return isScalar(type.reference.definition);
+    return isScalar(type.reference().definition);
   }
   return ['array', 'object', 'union', 'intersection', 'unknown'].indexOf(type.type) < 0;
 }
@@ -494,7 +494,7 @@ function enumOptions(type: Type): number | null {
     return 1;
   }
   if (type.type === 'named') {
-    return enumOptions(type.reference.definition);
+    return enumOptions(type.reference().definition);
   }
   if (
     type.type === 'string' ||
@@ -581,7 +581,7 @@ function fromUnionReflection(types: Type[]): Maker<any, any> {
     discriminatedMakers.set(key, makeOneOf(...[...untaggedMaker, fromReflection(t)]));
   }
   return (value: any, opts?: MakeOptions) => {
-    if (value && typeof value === 'object' && !Array.isArray(value) && value[discriminator.key]) {
+    if (value && typeof value === 'object' && !Array.isArray(value) && discriminator.key in value) {
       const discriminatedType = discriminatedMakers.get(value[discriminator.key]);
       if (discriminatedType) {
         return discriminatedType(value, opts);
@@ -622,7 +622,7 @@ export function fromReflection(type: Type): Maker<any, any> {
     case 'intersection':
       return makeAllOf(...type.options.map(req => fromReflection(req)));
     case 'named':
-      return type.reference.maker;
+      return type.reference().maker;
     case 'unknown':
       return makeAny();
     case 'binary':
@@ -683,7 +683,7 @@ export function extractDiscriminatorKeys(
   typeObjectRef: Type
 ): string[] {
   const typeObject =
-    typeObjectRef.type === 'named' ? typeObjectRef.reference.definition : typeObjectRef;
+    typeObjectRef.type === 'named' ? typeObjectRef.reference().definition : typeObjectRef;
 
   if (typeObject.type === 'union') {
     const keys = typeObject.options.map(type => extractDiscriminatorKeys(discriminatorField, type));
@@ -700,7 +700,7 @@ export function extractDiscriminatorKeys(
   }
   const fieldSchemaRef = typeObject.properties[discriminatorField].value;
   const fieldSchema =
-    fieldSchemaRef.type === 'named' ? fieldSchemaRef.reference.definition : fieldSchemaRef;
+    fieldSchemaRef.type === 'named' ? fieldSchemaRef.reference().definition : fieldSchemaRef;
 
   if (fieldSchema.type === 'union') {
     return extractDiscriminatorKeys(discriminatorField, fieldSchemaRef);

package/src/reflection-type.ts

@@ -18,6 +18,8 @@ export type Type =
   | ObjectType
   | NamedType;
 
+export type NamedTypeDefinitionDeferred<A, Shape = any> = () => NamedTypeDefinition<A, Shape>;
+
 export interface NamedTypeDefinition<A, Shape = any> {
   readonly name: string;
   readonly definition: Type;
@@ -88,7 +90,7 @@ export interface ArrayType {
 
 export interface NamedType {
   readonly type: 'named';
-  readonly reference: NamedTypeDefinition<unknown>;
+  readonly reference: NamedTypeDefinitionDeferred<unknown>;
 }
 
 export interface PropType {
@@ -348,8 +350,8 @@ function calculateReachInType(
   ambiguousPath: boolean
 ) {
   if (type.type === 'named') {
-    canReach(reaches, from, type.reference, path);
-    calculateReverseReach(processed, reaches, type.reference, to, ambiguousPath);
+    canReach(reaches, from, type.reference(), path);
+    calculateReverseReach(processed, reaches, type.reference(), to, ambiguousPath);
   } else if (type.type === 'array') {
     calculateReachInType(
       processed,

package/src/runtime.ts

@@ -24,6 +24,8 @@ export type ShapeOf<A> = A extends Scalar
   ? unknown
   : A extends Array<infer Item>
   ? Array<ShapeOf<Item>>
+  : A extends ReadonlyArray<infer Item>
+  ? ReadonlyArray<ShapeOf<Item>>
   : { [K in keyof A]: ShapeOf<A[K]> };
 
 class ShapedClass<Shape> {

package/src/union-discriminator.ts

@@ -49,14 +49,14 @@ export function getTags(type: Type): Map<string, unknown[]> {
 
 function rootType(type: Type): Type {
   if (type.type === 'named') {
-    return rootType(type.reference.definition);
+    return rootType(type.reference().definition);
   }
   return type;
 }
 
 function typeTag(v: Type): unknown[] {
   if (v.type === 'named') {
-    return typeTag(v.reference.definition);
+    return typeTag(v.reference().definition);
   }
   if (v.type === 'string' || v.type === 'boolean' || v.type === 'number' || v.type === 'integer') {
     if (v.enum) {

package/src/value-class.ts

@@ -1,4 +1,4 @@
-import { NamedTypeDefinition } from './reflection-type';
+import { NamedTypeDefinitionDeferred } from './reflection-type';
 import { ShapeOf } from './runtime';
 
 function asPlainObject(value: any): any {
@@ -15,7 +15,7 @@ function asPlainObject(value: any): any {
 }
 
 export class ValueClass {
-  public static reflection: NamedTypeDefinition<ValueClass>;
+  public static reflection: NamedTypeDefinitionDeferred<ValueClass>;
 }
 
 type WritableArray<T> = Array<Writable<T>>;

package/dist/client.d.ts

@@ -1,43 +0,0 @@
-import * as server from './server';
-declare type HasOnlyOptionalTypes<O> = Partial<O> extends O ? true : O extends void ? true : false;
-declare type MakeOptional<O, K extends string> = true extends HasOnlyOptionalTypes<O> ? {
-    [P in K]?: O;
-} : {
-    [P in K]: O;
-};
-export declare type ClientArg<H extends server.Headers | void, Q extends server.Query | void, B extends server.RequestBody<any> | void> = MakeOptional<H, 'headers'> & MakeOptional<Q, 'query'> & MakeOptional<B, 'body'>;
-export declare type ClientEndpoint<H extends server.Headers | void, Q extends server.Query | void, B extends server.RequestBody<any> | void, R extends server.Response<number, any, any, Record<string, any>>> = object extends ClientArg<H, Q, B> ? (ctx?: ClientArg<H, Q, B>) => Promise<R> : (ctx: ClientArg<H, Q, B>) => Promise<R>;
-declare type PathParam = (param: string | number) => ClientSpec | ClientEndpoint<any, any, any, any>;
-export interface ClientSpec {
-    readonly [part: string]: ClientSpec | PathParam | ClientEndpoint<any, any, any, any>;
-}
-export declare type ClientAdapter = server.SafeEndpoint;
-export declare type ClientFactory<Spec> = (adapter: ClientAdapter) => Spec;
-interface RequestBody<T, ContentType> {
-    contentType: ContentType;
-    value: T;
-}
-export declare function body<T, ContentType extends string>(contentType: ContentType, value: T): RequestBody<T, ContentType>;
-export declare const noContentContentType: "oatsNoContent";
-export declare function noContent(): RequestBody<null, typeof noContentContentType>;
-export declare function json<T>(data: T): RequestBody<T, 'application/json'>;
-export declare function formData<T>(data: T): RequestBody<T, 'multipart/form-data'>;
-export declare function formUrlEncoded<T>(data: T): RequestBody<T, 'application/x-www-form-urlencoded'>;
-export default function literal<T extends string>(literal: T): T;
-export declare function emptyTree<T>(): OpTree<T>;
-export declare function identifier(part: string): string;
-export declare function addPath<T>(opTree: OpTree<T>, path: string, method: server.Methods, value: T): OpTree<T>;
-export interface OpTree<T> {
-    methods: {
-        [method: string]: T;
-    };
-    parts: {
-        [part: string]: OpTree<T>;
-    };
-    param?: {
-        name: string;
-        tree: OpTree<T>;
-    };
-}
-export declare function createClientFactory<Spec>(handlers: server.Handler[]): ClientFactory<Spec>;
-export {};

package/dist/client.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientFactory = exports.addPath = exports.identifier = exports.emptyTree = exports.formUrlEncoded = exports.formData = exports.json = exports.noContent = exports.noContentContentType = exports.body = void 0;
-const server = require("./server");
-const assert = require("assert");
-const safe_navigation_1 = require("@smartlyio/safe-navigation");
-function body(contentType, value) {
-    return {
-        contentType,
-        value
-    };
-}
-exports.body = body;
-exports.noContentContentType = 'oatsNoContent';
-function noContent() {
-    return body(exports.noContentContentType, null);
-}
-exports.noContent = noContent;
-function json(data) {
-    return body('application/json', data);
-}
-exports.json = json;
-function formData(data) {
-    return body('multipart/form-data', data);
-}
-exports.formData = formData;
-function formUrlEncoded(data) {
-    return body('application/x-www-form-urlencoded', data);
-}
-exports.formUrlEncoded = formUrlEncoded;
-function literal(literal) {
-    return literal;
-}
-exports.default = literal;
-function emptyTree() {
-    return {
-        methods: {},
-        parts: {}
-    };
-}
-exports.emptyTree = emptyTree;
-function identifier(part) {
-    return part;
-}
-exports.identifier = identifier;
-function addPath(opTree, path, method, value) {
-    const parts = path.split('/').filter(n => n);
-    function addPath_(parts, opTree) {
-        opTree = opTree || emptyTree();
-        const part = parts[0];
-        if (part === undefined) {
-            assert((0, safe_navigation_1.default)(opTree).methods[method].$ === undefined, 'duplicate method definition for ' + path);
-            return Object.assign(Object.assign({}, opTree), { methods: Object.assign(Object.assign({}, opTree.methods), { [method]: value }) });
-        }
-        const param = part.match('(.*){([^}]+)}');
-        if (param) {
-            assert(!/{.*}/.test(param[1]), 'only single path parameter is supported per url segment. Got multiple in ' + path);
-            if (param[1] === '') {
-                return Object.assign(Object.assign({}, opTree), { param: {
-                        name: identifier(param[2]),
-                        tree: addPath_(parts.slice(1), (0, safe_navigation_1.default)(opTree).param.tree.$)
-                    } });
-            }
-            else {
-                const id = identifier(param[1]);
-                return Object.assign(Object.assign({}, opTree), { parts: Object.assign(Object.assign({}, opTree.parts), { [id]: addPath_(['{' + param[2] + '}', ...parts.slice(1)], opTree.parts[id]) }) });
-            }
-        }
-        const id = identifier(part);
-        return Object.assign(Object.assign({}, opTree), { parts: Object.assign(Object.assign({}, opTree.parts), { [id]: addPath_(parts.slice(1), opTree.parts[id]) }) });
-    }
-    return addPath_(parts, opTree);
-}
-exports.addPath = addPath;
-function makeParam(adapter, param, pathParams) {
-    return (value) => fromTree(adapter, param.tree, [...pathParams, value]);
-}
-function paramObject(pathParams, path) {
-    const matches = path.match(/{([^}]+)}/g) || [];
-    assert(matches.length === pathParams.length, 'mismatch in path param sizes for ' + path);
-    if (matches.length === 0) {
-        return undefined;
-    }
-    const params = {};
-    for (let i = 0; i < matches.length; i++) {
-        params[matches[i].replace(/{|}/g, '')] = pathParams[i];
-    }
-    return params;
-}
-function fillInPathParams(params, path) {
-    return path.replace(/{([^}]+)}/g, (m, param) => {
-        assert(params[param] != null, 'missing path param ' + param);
-        return params[param];
-    });
-}
-function makeMethod(adapter, handler, pathParams) {
-    const params = paramObject(pathParams, handler.path);
-    const call = server.safe(handler.headers, handler.params, handler.query, handler.body, handler.response, ctx => adapter(Object.assign(Object.assign({}, ctx), { path: fillInPathParams(params, handler.path), servers: handler.servers })));
-    return (ctx) => call({
-        path: handler.path,
-        servers: handler.servers,
-        method: handler.method,
-        params,
-        headers: (0, safe_navigation_1.default)(ctx).headers.$,
-        query: (0, safe_navigation_1.default)(ctx).query.$,
-        body: (0, safe_navigation_1.default)(ctx).body.$,
-        requestContext: {}
-    });
-}
-function fromTree(adapter, tree, pathParams) {
-    const node = tree.param ? makeParam(adapter, tree.param, pathParams) : {};
-    Object.keys(tree.methods).forEach(key => {
-        assert(!node[key], 'duplicate path part ' + key);
-        node[key] = makeMethod(adapter, tree.methods[key], pathParams);
-    });
-    Object.keys(tree.parts).forEach(key => {
-        assert(!node[key], 'duplicate path part ' + key);
-        node[key] = fromTree(adapter, tree.parts[key], pathParams);
-    });
-    return node;
-}
-function createClientFactory(handlers) {
-    return (adapter) => {
-        const tree = handlers.reduce((memo, handler) => {
-            return addPath(memo, handler.path, handler.method, handler);
-        }, emptyTree());
-        return fromTree(adapter, tree, []);
-    };
-}
-exports.createClientFactory = createClientFactory;
-//# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

package/dist/make.d.ts

@@ -1,123 +0,0 @@
-/// <reference types="node" />
-import { NamedTypeDefinition, Type } from './reflection-type';
-export declare class MakeError extends Error {
-    readonly errors: ValidationError[];
-    constructor(errors: ValidationError[]);
-}
-export interface ErrorGroup {
-    groupMessage: string;
-    errors: ValidationError[];
-}
-export interface ValidationError {
-    path: Path;
-    error: string | ErrorGroup;
-}
-declare type Path = ReadonlyArray<string>;
-export declare function validationErrorPrinter(error: ValidationError, indentation?: number): string;
-export declare class Make<V> {
-    static ok<V>(value: V): Make<V>;
-    static error<V>(errors: ValidationError[]): Make<V>;
-    readonly errors: ValidationError[];
-    private readonly value;
-    private constructor();
-    isError(): boolean;
-    isSuccess(): boolean;
-    success(handler?: (e: this) => V): V;
-    group(groupMessage: string): Make<null>;
-    errorPath(path: string): Make<null>;
-    map<R>(fn: (value: V) => R): Make<R>;
-}
-export interface MakeOptions {
-    unknownField?: 'drop' | 'fail';
-    /**
-     * If enabled, "number" ans "integer" schemas will accept strings and try to parse them.
-     */
-    parseNumericStrings?: boolean;
-    /**
-     * If enabled, "boolean" schemas will accept strings and try to parse them.
-     */
-    parseBooleanStrings?: boolean;
-    /**
-     * If enabled, "array" schema will convert any non-array value to an array with a single element.
-     * Useful for supporting arrays in query parameters
-     * (if query parameter is not repeated, it will not be an array on server side).
-     */
-    allowConvertForArrayType?: boolean;
-}
-export declare type Maker<Shape, V> = (value: Shape, opts?: MakeOptions) => Make<V>;
-export declare function registerFormat(format: string, maker: Maker<any, undefined>): void;
-export declare function makeString(format?: string, pattern?: string, minLength?: number, maxLength?: number): Maker<any, string>;
-export declare function makeNumber(min?: number, max?: number): Maker<unknown, number>;
-export declare function makeInteger(min?: number, max?: number): Maker<unknown, number>;
-declare function checkAny(value: any): Make<any>;
-export declare function makeAny(): typeof checkAny;
-declare function checkVoid(value: any): Make<any>;
-export declare function makeVoid(): typeof checkVoid;
-export declare function makeEnum<T>(...args: T[]): (value: T) => Make<T>;
-export declare function makeOptional(maker: any): {
-    optional: any;
-};
-export declare function makeBoolean(): Maker<unknown, boolean>;
-export declare function makeArray(maker: any, minSize?: number, maxSize?: number): Maker<unknown, unknown[]>;
-export declare function makeOneOf(...options: any[]): (value: any, opts?: MakeOptions | undefined) => any;
-export declare function makeAllOf(...all: any[]): (value: any, opts?: MakeOptions | undefined) => Make<any>;
-export declare function makeObject<P extends {
-    [key: string]: Maker<any, any> | {
-        optional: Maker<any, any>;
-    };
-}>(props: P, additionalProp?: any, comparisorOrder?: string[]): (value: any, opts?: MakeOptions | undefined) => Make<any>;
-export declare type Binary = File | Buffer | FormBinary;
-export declare class FormBinary {
-    readonly binary: Binary;
-    readonly options?: string | {
-        [key: string]: string;
-    } | undefined;
-    constructor(binary: Binary, options?: string | {
-        [key: string]: string;
-    } | undefined);
-}
-export declare class File {
-    readonly path: string;
-    readonly size: number;
-    readonly name?: string | undefined;
-    private brand;
-    constructor(path: string, size: number, name?: string | undefined);
-}
-declare function checkBinary(value: any): Make<any>;
-export declare function makeBinary(): typeof checkBinary;
-export declare function makeNullable(maker: any): (value: any, opts?: MakeOptions | undefined) => any;
-export declare function fromReflection(type: Type): Maker<any, any>;
-export declare function createMaker<Shape, Type>(fun: () => any): (value: Shape, opts?: MakeOptions | undefined) => Make<Type>;
-export declare function createMakerWith<Shape, Type>(constructor: new (v: Shape, opts?: MakeOptions) => Type): Maker<Shape, Type>;
-/**
- * Merge multiple mappings into one set of mappings
- *
- * Throw error if there are duplicate koys
- * @deprecated
- */
-export declare function mergeMappings(...mappings: readonly {
-    [key: string]: Maker<any, any>;
-}[]): {
-    [key: string]: Maker<any, any>;
-};
-export declare function extractDiscriminatorKeys(discriminatorField: string, typeObjectRef: Type): string[];
-/** @deprecated */
-export declare function extractDiscriminatorValueMap(discriminatorField: string, typeObject: NamedTypeDefinition<any>): {
-    [key: string]: Maker<any, any>;
-};
-/**
- * Make oneOf with the discriminator support
- *
- * Will use given mapping to find correct maker. If optional importedTypes are provided, will extract
- * extra mapping keys from them.
- *
- * @deprecated
- *
- * @param discriminatorField Field to use as discriminator
- * @param mapping Mappings that we should use to determine target makers
- * @param importedTypes Optional types where we should extract enum values for makers
- */
-export declare function makeOneOfWithDiscriminator(discriminatorField: string, mapping: {
-    [key: string]: Maker<any, any>;
-}, importedTypes?: readonly any[]): (value: any, opts?: MakeOptions | undefined) => Make<any>;
-export {};