@smartlyio/oats-runtime 4.4.0 → 4.4.1-alpha.18

package/dist/server.js

@@ -4,6 +4,7 @@ exports.createHandlerFactory = exports.assertMethod = exports.supportedMethods =
 const assert_1 = require("./assert");
 const safe_navigation_1 = require("@smartlyio/safe-navigation");
 const make_1 = require("./make");
+const serialize_1 = require("./serialize");
 class RequestValidationError extends Error {
     constructor(tag, errors) {
         super('invalid request ' + tag + ' ' + errors.map(make_1.validationErrorPrinter).join('\n'));
@@ -46,30 +47,55 @@ function voidify(value) {
     }
     return null;
 }
-function cleanHeaders(maker, headers) {
-    const normalized = voidify(lowercaseObject(headers));
+function cleanHeaders(mode, maker, headers) {
+    // note: we now expect that on client side headers are type conforming so do not need to lowercase those
+    // this is slightly breaking change is somebody has subverted the type checker
+    const normalized = voidify(mode === 'server' ? lowercaseObject(headers) : headers);
     const acceptsNull = maker(null);
     if (acceptsNull.isSuccess()) {
         return acceptsNull.success();
     }
     return maker(normalized, {
-        unknownField: 'drop'
+        unknownField: 'drop',
+        convertFromNetwork: mode === 'server'
     }).success(throwRequestValidationError.bind(null, 'headers'));
 }
-function safe(headers, params, query, body, response, endpoint, { validationOptions = {} } = {}) {
+function serializeWhenClient(mode, value) {
+    if (mode === 'client') {
+        return (0, serialize_1.serialize)(value);
+    }
+    return value;
+}
+function getOutBody(mode, value) {
+    if (!value) {
+        return value;
+    }
+    return { contentType: value.contentType, value: serializeWhenClient(mode, value.value) };
+}
+function safe(headers, params, query, body, response, endpoint, { validationOptions = {}, mode } = { mode: 'client' }) {
     return async (ctx) => {
+        // note: data coming to client adapter needs to be serialized and data coming from the adapter needs conversion from network
+        // note: data coming to server adapter needs to be deserialized and data coming from the adapter needs serialization
+        // this is all very clear.
+        const internalMakeOptions = { convertFromNetwork: mode === 'server' };
         const result = await endpoint({
             path: ctx.path,
             method: ctx.method,
             servers: ctx.servers,
             op: ctx.op,
-            headers: cleanHeaders(headers, ctx.headers),
-            params: params(voidify(ctx.params), validationOptions.params).success(throwRequestValidationError.bind(null, 'params')),
-            query: query(ctx.query || {}, validationOptions.query).success(throwRequestValidationError.bind(null, 'query')),
-            body: body(voidify(ctx.body)).success(throwRequestValidationError.bind(null, 'body')),
+            headers: serializeWhenClient(mode, cleanHeaders(mode, headers, ctx.headers)),
+            // note: path params come to the adapter in network format always as those are gleaned from the path definition
+            params: params(voidify(ctx.params), Object.assign(Object.assign(Object.assign({}, validationOptions.params), internalMakeOptions), { convertFromNetwork: true })).success(throwRequestValidationError.bind(null, 'params')),
+            query: serializeWhenClient(mode, query(ctx.query || {}, Object.assign(Object.assign({}, validationOptions.query), internalMakeOptions)).success(throwRequestValidationError.bind(null, 'query'))),
+            body: getOutBody(mode, body(voidify(ctx.body), internalMakeOptions).success(throwRequestValidationError.bind(null, 'body'))),
             requestContext: ctx.requestContext
         });
-        return response(result).success(throwResponseValidationError.bind(null, `body ${ctx.path}`, result.value.value));
+        const responseValue = response(result, { convertFromNetwork: mode === 'client' }).success(throwResponseValidationError.bind(null, `body ${ctx.path}`, result.value.value));
+        if (mode === 'client' || !responseValue) {
+            return responseValue;
+        }
+        // the response must be serialized for transferring from server to client
+        return Object.assign(Object.assign({}, responseValue), { headers: (0, serialize_1.serialize)(responseValue.headers), value: Object.assign(Object.assign({}, responseValue.value), { value: (0, serialize_1.serialize)(responseValue.value.value) }) });
     };
 }
 exports.safe = safe;
@@ -110,7 +136,7 @@ function createHandlerFactory(handlers, opts) {
                     const methodHandler = endpoint[method];
                     const endpointWrapper = (0, safe_navigation_1.default)(tree)[path][method].$;
                     (0, assert_1.assert)(endpointWrapper, 'unknown endpoint ' + method.toUpperCase() + ' ' + path);
-                    adapter(path, endpointWrapper.op, assertMethod(method), endpointWrapper.safeHandler(methodHandler, opts), endpointWrapper.servers);
+                    adapter(path, endpointWrapper.op, assertMethod(method), endpointWrapper.safeHandler(methodHandler, Object.assign(Object.assign({}, opts), { mode: 'server' })), endpointWrapper.servers);
                 });
             });
         };

package/dist/server.js.map

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

package/dist/type-tag.d.ts

@@ -0,0 +1,7 @@
+import { Type } from './reflection-type';
+export declare function withType<A>(to: A, type: Type[]): A;
+export declare function getTypeSet(value: Record<string, any>): Set<Type> | undefined;
+/**  Get reflection type from a  made value for serialization.
+ * Note that only directly made object values or ValueClasses can be used
+ * */
+export declare function getType(value: Record<string, any>): Type[] | undefined;

package/dist/type-tag.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getType = exports.getTypeSet = exports.withType = void 0;
+const value_class_1 = require("./value-class");
+function withType(to, type) {
+    if (type.length === 0) {
+        return to;
+    }
+    // todo: is it possible to confuse typing by re-use of valueclassed values
+    //  eg. with value 'v: SomeValueClass' passing it to multiple makers
+    // -> no? the re-use happens only if the valueclass instance matches so it
+    // will not mutate the tagged reflection types
+    const previous = getTypeSet(to);
+    if (previous) {
+        type.forEach(type => previous.add(type));
+        return to;
+    }
+    const newType = new Set(type);
+    // tag each constructed object with a hidden type property
+    Object.defineProperty(to, reflection, {
+        enumerable: false,
+        value: newType
+    });
+    return to;
+}
+exports.withType = withType;
+function getTypeSet(value) {
+    if (!value || typeof value !== 'object') {
+        return;
+    }
+    // NOTE: prefer using the added reflection type instead of the contstructor type
+    // the added reflection type will have types from eg allOf
+    // @ts-ignore
+    const t = value[reflection];
+    if (t && t.size > 0) {
+        return t;
+    }
+    if (value instanceof value_class_1.ValueClass) {
+        // a bit of leap here to trust that all ValueClasses have generated `reflection`
+        // @ts-ignore
+        const classType = new Set([value.constructor.reflection().definition]);
+        // tag each constructed object with a hidden type property
+        // this ensures that ValueClasses have a mutable reflection type property
+        Object.defineProperty(value, reflection, {
+            enumerable: false,
+            value: classType
+        });
+        return classType;
+    }
+    return;
+}
+exports.getTypeSet = getTypeSet;
+/**  Get reflection type from a  made value for serialization.
+ * Note that only directly made object values or ValueClasses can be used
+ * */
+function getType(value) {
+    const t = getTypeSet(value);
+    if (t) {
+        return [...t];
+    }
+}
+exports.getType = getType;
+const reflection = Symbol('reflection');
+//# sourceMappingURL=type-tag.js.map

package/dist/type-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-tag.js","sourceRoot":"","sources":["../src/type-tag.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAE3C,SAAgB,QAAQ,CAAI,EAAK,EAAE,IAAY;IAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IACD,0EAA0E;IAC1E,oEAAoE;IACpE,0EAA0E;IAC1E,8CAA8C;IAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;KACX;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,0DAA0D;IAC1D,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,UAAU,EAAE;QACpC,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,OAAO;KACf,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC;AApBD,4BAoBC;AAED,SAAgB,UAAU,CAAC,KAA0B;IACnD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACvC,OAAO;KACR;IAED,gFAAgF;IAChF,0DAA0D;IAC1D,aAAa;IACb,MAAM,CAAC,GAAc,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;QACnB,OAAO,CAAC,CAAC;KACV;IACD,IAAI,KAAK,YAAY,wBAAU,EAAE;QAC/B,gFAAgF;QAChF,aAAa;QACb,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACvE,0DAA0D;QAC1D,yEAAyE;QACzE,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE;YACvC,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;KAClB;IACD,OAAO;AACT,CAAC;AAzBD,gCAyBC;AAED;;KAEK;AACL,SAAgB,OAAO,CAAC,KAA0B;IAChD,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;KACf;AACH,CAAC;AALD,0BAKC;AAED,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC"}

package/jest.config.js

@@ -0,0 +1,38 @@
+module.exports = {
+  moduleFileExtensions: ['js', 'ts', 'tsx'],
+  moduleNameMapper: {
+      "@smartlyio/oats$": "<rootDir>/packages/oats/index.ts",
+      "@smartlyio/oats-runtime$": "<rootDir>/packages/oats-runtime/src/runtime.ts",
+      "@smartlyio/oats-axios-adapter$": "<rootDir>/packages/oats-axios-adapter/index.ts",
+      "@smartlyio/oats-koa-adapter$": "<rootDir>/packages/oats-koa-adapter/index.ts",
+      "@smartlyio/oats-fast-check$": "<rootDir>/packages/oats-fast-check/src/index.ts"
+  },
+
+  testRegex: '.*\\.spec.(tsx?)$',
+
+  collectCoverageFrom: [
+    'packages/*/src/**/*.{ts,tsxx}',
+    '!packages/*/src/**/*.story.*'
+  ],
+
+  coverageThreshold: {
+    global: {
+      branches: 20,
+      statements: 20,
+    },
+  },
+
+  modulePathIgnorePatterns: ['<rootDir>/packages/*/dist'],
+
+  transform: {
+    '^.+\\.(ts|js)x?$': 'ts-jest',
+  },
+
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+      diagnostics: true,
+    },
+  },
+  setupFilesAfterEnv: [],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartlyio/oats-runtime",
-  "version": "4.4.0",
+  "version": "4.4.1-alpha.18+2b1a8cf",
   "license": "MIT",
   "description": "Runtime for Oats a Openapi3 based generator for typescript aware servers and clients",
   "private": false,
@@ -51,5 +51,5 @@
     "tsconfig-paths": "3.14.1",
     "typescript": "4.6.3"
   },
-  "gitHead": "743a31718a2487b0cf7157ac1b6bc8872af256c1"
+  "gitHead": "2b1a8cf408f64c88102224b5e608961a4b65cbe1"
 }

package/src/client.ts

@@ -184,7 +184,8 @@ function makeMethod(adapter: ClientAdapter, handler: server.Handler, pathParams:
     handler.body,
     handler.response,
     ctx =>
-      adapter({ ...ctx, path: fillInPathParams(params, handler.path), servers: handler.servers })
+      adapter({ ...ctx, path: fillInPathParams(params, handler.path), servers: handler.servers }),
+    { mode: 'client' }
   );
   return (ctx: ClientArg<any, any, any>) =>
     call({

package/src/make.ts

@@ -1,10 +1,11 @@
 import { assert, fail } from './assert';
 import safe from '@smartlyio/safe-navigation';
 import * as _ from 'lodash';
+import { isEqual, uniq } from 'lodash';
 import { ValueClass } from './value-class';
 import { NamedTypeDefinition, ObjectType, Type } from './reflection-type';
 import { discriminateUnion } from './union-discriminator';
-import { isEqual, uniq } from 'lodash';
+import { getType, getTypeSet, withType } from './type-tag';
 
 export class MakeError extends Error {
   constructor(readonly errors: ValidationError[]) {
@@ -122,6 +123,9 @@ export interface MakeOptions {
    * (if query parameter is not repeated, it will not be an array on server side).
    */
   allowConvertForArrayType?: boolean;
+
+  /** If true convert property names from network to ts format while parsing objects */
+  convertFromNetwork?: boolean;
 }
 
 export type Maker<Shape, V> = (value: Shape, opts?: MakeOptions) => Make<V>;
@@ -363,16 +367,18 @@ export function makeOneOf(...options: any[]) {
   };
 }
 
-export function makeAllOf(...all: any[]) {
+export function makeAllOf(...all: Maker<any, any>[]) {
   return (value: any, opts?: MakeOptions) => {
+    const types = [];
     for (const make of all) {
       const result: Make<any> = make(value, opts);
       if (result.isError()) {
         return result.errorPath('(allOf)');
       }
       value = result.success();
+      types.push(...(getTypeSet(value) ?? []));
     }
-    return Make.ok(value);
+    return Make.ok(withType(value, types));
   };
 }
 
@@ -380,9 +386,45 @@ function isMagic(field: string) {
   return ['__proto__', 'constructor'].indexOf(field) >= 0;
 }
 
+function getInputPropName(args: {
+  value: any;
+  index: string;
+  fromNetwork: Record<string, string>;
+  opts?: MakeOptions;
+}) {
+  if (!args.opts?.convertFromNetwork) {
+    return args.index;
+  }
+  // we need to look at the types already used for making the value to detect cases
+  // where the property has already been mapped and we should use the ts side
+  // property name
+  const types = getType(args.value) ?? [];
+  const networkProp = args.fromNetwork?.[args.index] ?? args.index;
+  for (const type of types) {
+    if (type.type !== 'object') {
+      // only objects can have network mappings
+      continue;
+    }
+    const mapped = type.properties[args.index];
+    if (mapped) {
+      // if the object was made already then network mapping has been done for listed properties
+      // and we should use the ts side property
+      assert(
+        networkProp == mapped.networkName,
+        `Network names for properties with the same name need to be equal when a object has multiple types. Mismatch in ${networkProp} and ${mapped.networkName}.`
+      );
+      return args.index;
+    }
+  }
+  return networkProp;
+}
+
 export function makeObject<
   P extends { [key: string]: Maker<any, any> | { optional: Maker<any, any> } }
->(props: P, additionalProp?: any, comparisorOrder?: string[]) {
+>(props: P, additionalProp?: any, comparisorOrder?: string[], type?: ObjectType) {
+  const fromNetwork = fromNetworkMap(type);
+  const listedInputPropNames = new Set(Object.keys(props).map(prop => fromNetwork[prop] ?? prop));
+
   return (value: any, opts?: MakeOptions) => {
     if (typeof value !== 'object' || value == null || Array.isArray(value)) {
       return getErrorWithValueMsg('expected an object', value);
@@ -393,26 +435,32 @@ export function makeObject<
       if (isMagic(index)) {
         return error(`Using ${index} as field of an object is not allowed`);
       }
+      const inputPropName = getInputPropName({ opts, index, fromNetwork, value });
       let maker: any = props[index];
       if (!maker) {
         return error(`Prop maker not found for key ${index}. This is likely a bug in oats`);
       }
       if (maker.optional) {
-        if (!(index in value) || value[index] === undefined) {
+        if (!(inputPropName in value) || value[inputPropName] === undefined) {
           continue;
         }
         maker = maker.optional;
       }
-      const propResult: Make<any> = maker(value[index], opts);
+      const propResult: Make<any> = maker(value[inputPropName], opts);
       if (propResult.isError()) {
         return propResult.errorPath(index);
       }
       result[index] = propResult.success();
     }
     for (const index of Object.keys(value)) {
+      // do not consider props that got mapped
+      if (opts?.convertFromNetwork && listedInputPropNames.has(index)) {
+        continue;
+      }
       if (isMagic(index)) {
         return error(`Using ${index} as objects additional field is not allowed.`);
       }
+      // do not allow overriding mapped props
       if (props[index]) {
         continue;
       }
@@ -422,13 +470,21 @@ export function makeObject<
         }
         return error('unexpected property').errorPath(index);
       }
+      // If the input value A has been made already with network prop name mapping
+      // this runs the property value through the current additionalProps maker to validate it
+      // nb. the property key *has* already been mapped when making A and we just use it here
+      // this works unless we start mapping additionalProp property names.
       const propResult: Make<any> = additionalProp(value[index], opts);
       if (propResult.isError()) {
         return propResult.errorPath(index);
       }
       result[index] = propResult.success();
     }
-    return Make.ok(result);
+    const oldType = getType(value);
+    if (oldType) {
+      withType(result, oldType);
+    }
+    return Make.ok(withType(result, type ? [type] : []));
   };
 }
 
@@ -542,12 +598,26 @@ function priority(v: ObjectType['properties'][string]) {
   return Priority.NonScalar;
 }
 
+function fromNetworkMap(type?: ObjectType) {
+  if (!type) {
+    return {};
+  }
+  const fromNetwork = Object.keys(type.properties).reduce<Record<string, string>>((memo, key) => {
+    const mapped = type.properties[key].networkName;
+    if (mapped) {
+      memo[key] = mapped;
+    }
+    return memo;
+  }, {});
+  return fromNetwork;
+}
 function fromObjectReflection(type: ObjectType): Maker<any, any> {
   const comparisonOrder = Object.keys(type.properties).sort((aKey, bKey) => {
     const a = type.properties[aKey]!;
     const b = type.properties[bKey]!;
     return priority(a) - priority(b);
   });
+
   return makeObject(
     Object.entries(type.properties).reduce(
       (memo, [key, prop]) => ({
@@ -561,7 +631,8 @@ function fromObjectReflection(type: ObjectType): Maker<any, any> {
         ? makeAny()
         : fromReflection(type.additionalProperties)
       : undefined,
-    comparisonOrder
+    comparisonOrder,
+    type
   );
 }
 

package/src/reflection-type.ts

@@ -96,6 +96,7 @@ export interface NamedType {
 export interface PropType {
   required: boolean;
   value: Type;
+  networkName?: string;
 }
 
 export interface Props {

package/src/runtime.ts

@@ -4,12 +4,16 @@ import * as make from './make';
 import { fromReflection } from './make';
 import * as valueClass from './value-class';
 import * as reflection from './reflection-type';
+import * as typeTag from './type-tag';
+import { ValueClass } from './value-class';
 
 export { redirect } from './redirect';
 
 export { make, fromReflection, server, client, valueClass, reflection };
 
 export const noContentContentType = 'oatsNoContent' as const;
+export { serialize } from './serialize';
+export { getType, withType } from './type-tag';
 
 type Scalar = number | string | boolean;
 
@@ -18,6 +22,23 @@ const tagKey = Symbol();
 
 type ScalarWithoutBrand<V> = V extends ShapedClass<infer S> ? ScalarWithoutBrand<S> : V;
 
+// helper to set necessary metadata  for valueclass instances
+export function instanceAssign(
+  to: ValueClass,
+  value: Record<string, unknown>,
+  opts: make.MakeOptions | { unSafeSet: boolean } | undefined,
+  builder: make.Maker<any, any>
+) {
+  Object.assign(to, opts && 'unSafeSet' in opts ? value : builder(value, opts).success());
+  // when we create an instance of a ValueClass we need to propagate the type information from 'value' to the newly
+  // constructed instance
+  const existingType = typeTag.getType(value);
+  if (existingType) {
+    return typeTag.withType(to, existingType);
+  }
+  return to;
+}
+
 export type ShapeOf<A> = A extends Scalar
   ? ScalarWithoutBrand<A>
   : A extends ShapedClass<infer S>

package/src/serialize.ts

@@ -0,0 +1,36 @@
+import { getType } from './type-tag';
+
+export function serialize(value: any): any {
+  if (!value || typeof value !== 'object') {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map(v => serialize(v));
+  }
+  const types = getType(value);
+  if (!types) {
+    return value;
+  }
+  // get mapping from all types ts property names to network names
+  const jointMap = types
+    .flatMap(type => (type.type === 'object' ? [type] : []))
+    .reduce<Map<string, string>>((memo, type) => {
+      for (const key in type.properties) {
+        const mapped = type.properties[key].networkName;
+        if (mapped != null) {
+          memo.set(key, mapped);
+        }
+      }
+      return memo;
+    }, new Map());
+  // in case there are no network mapping done we can return immediately to avoid wasting a loop
+  if (jointMap.size === 0) {
+    return value;
+  }
+  // map value using jointMap
+  return Object.entries(value).reduce<Record<string, any>>((memo, [key, prop]) => {
+    const to = jointMap.get(key) ?? key;
+    memo[to] = serialize(prop);
+    return memo;
+  }, {});
+}