@opra/common 1.0.0-alpha.23 → 1.0.0-alpha.24

package/cjs/document/data-type/complex-type-base.js

@@ -132,7 +132,7 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             }
         }
         return valgen_1.vg.isObject(schema, {
-            ctor: this.ctor,
+            ctor: this.name === 'object' ? Object : this.ctor,
             additionalFields,
             name: this.name,
             coerce: true,
@@ -169,7 +169,7 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             const fn = this._generateFieldCodec(codec, field, {
                 ...context,
                 partial: context.partial === 'deep' ? context.partial : undefined,
-                projection: projection !== '*' ? projection : p?.projection,
+                projection,
                 currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
             });
             schema[fieldName] = context.partial || !field.required ? valgen_1.vg.optional(fn) : valgen_1.vg.required(fn);

package/cjs/document/data-type/primitive-types/object.type.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectType = void 0;
 const tslib_1 = require("tslib");
-const constants_js_1 = require("../../constants.js");
 const complex_type_js_1 = require("../complex-type.js");
 let ObjectType = class ObjectType {
     constructor(properties) {
@@ -19,5 +18,3 @@ exports.ObjectType = ObjectType = tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectType);
-const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, ObjectType);
-metadata.ctor = Object;

package/cjs/document/decorators/http-operation-entity.decorator.js

@@ -196,7 +196,7 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     })
         .QueryParam('limit', {
         description: 'Determines number of returning instances',
-        type: new index_js_4.IntegerType({ minValue: 1 }),
+        type: new index_js_4.IntegerType({ minValue: 1, maxValue: args.maxLimit }),
     })
         .QueryParam('skip', {
         description: 'Determines number of returning instances',

package/cjs/document/http/http-media-type.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpMediaType = void 0;
+const tslib_1 = require("tslib");
+const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const ts_gems_1 = require("ts-gems");
+const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
 const document_element_js_1 = require("../common/document-element.js");
 const data_type_js_1 = require("../data-type/data-type.js");
@@ -24,7 +27,6 @@ exports.HttpMediaType = function (owner, initArgs) {
     _this.maxFiles = initArgs.maxFiles;
     _this.maxFileSize = initArgs.maxFileSize;
     _this.maxTotalFileSize = initArgs.maxTotalFileSize;
-    _this.minFileSize = initArgs.minFileSize;
     if (initArgs?.type) {
         _this.type = initArgs?.type instanceof data_type_js_1.DataType ? initArgs.type : _this.owner.node.getDataType(initArgs.type);
     }
@@ -59,12 +61,25 @@ class HttpMediaTypeClass extends document_element_js_1.DocumentElement {
             maxFiles: this.maxFiles,
             maxFileSize: this.maxFileSize,
             maxTotalFileSize: this.maxTotalFileSize,
-            minFileSize: this.minFileSize,
         });
         if (this.multipartFields?.length) {
             out.multipartFields = this.multipartFields.map(x => x.toJSON());
         }
         return out;
     }
+    generateCodec(codec, options) {
+        let fn;
+        if (this.type) {
+            fn = this.type.generateCodec(codec, options);
+        }
+        else if (this.contentType) {
+            const arr = Array.isArray(this.contentType) ? this.contentType : [this.contentType];
+            if (arr.find(ct => type_is_1.default.is(ct, ['json']))) {
+                fn = this.node.findDataType('object').generateCodec(codec);
+            }
+        }
+        fn = fn || valgen_1.isAny;
+        return this.isArray ? valgen_1.vg.isArray(fn) : fn;
+    }
 }
 exports.HttpMediaType.prototype = HttpMediaTypeClass.prototype;

package/esm/document/data-type/complex-type-base.js

@@ -129,7 +129,7 @@ class ComplexTypeBaseClass extends DataType {
             }
         }
         return vg.isObject(schema, {
-            ctor: this.ctor,
+            ctor: this.name === 'object' ? Object : this.ctor,
             additionalFields,
             name: this.name,
             coerce: true,
@@ -166,7 +166,7 @@ class ComplexTypeBaseClass extends DataType {
             const fn = this._generateFieldCodec(codec, field, {
                 ...context,
                 partial: context.partial === 'deep' ? context.partial : undefined,
-                projection: projection !== '*' ? projection : p?.projection,
+                projection,
                 currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
             });
             schema[fieldName] = context.partial || !field.required ? vg.optional(fn) : vg.required(fn);

package/esm/document/data-type/primitive-types/object.type.js

@@ -1,5 +1,4 @@
 import { __decorate, __metadata } from "tslib";
-import { DATATYPE_METADATA } from '../../constants.js';
 import { ComplexType } from '../complex-type.js';
 let ObjectType = class ObjectType {
     constructor(properties) {
@@ -16,5 +15,3 @@ ObjectType = __decorate([
     __metadata("design:paramtypes", [Object])
 ], ObjectType);
 export { ObjectType };
-const metadata = Reflect.getMetadata(DATATYPE_METADATA, ObjectType);
-metadata.ctor = Object;

package/esm/document/decorators/http-operation-entity.decorator.js

@@ -194,7 +194,7 @@ HttpOperation.Entity.FindMany = function (arg0, arg1) {
     })
         .QueryParam('limit', {
         description: 'Determines number of returning instances',
-        type: new IntegerType({ minValue: 1 }),
+        type: new IntegerType({ minValue: 1, maxValue: args.maxLimit }),
     })
         .QueryParam('skip', {
         description: 'Determines number of returning instances',

package/esm/document/http/http-media-type.js

@@ -1,4 +1,6 @@
+import typeIs from '@browsery/type-is';
 import { asMutable } from 'ts-gems';
+import { isAny, vg } from 'valgen';
 import { omitUndefined } from '../../helpers/index.js';
 import { DocumentElement } from '../common/document-element.js';
 import { DataType } from '../data-type/data-type.js';
@@ -21,7 +23,6 @@ export const HttpMediaType = function (owner, initArgs) {
     _this.maxFiles = initArgs.maxFiles;
     _this.maxFileSize = initArgs.maxFileSize;
     _this.maxTotalFileSize = initArgs.maxTotalFileSize;
-    _this.minFileSize = initArgs.minFileSize;
     if (initArgs?.type) {
         _this.type = initArgs?.type instanceof DataType ? initArgs.type : _this.owner.node.getDataType(initArgs.type);
     }
@@ -56,12 +57,25 @@ class HttpMediaTypeClass extends DocumentElement {
             maxFiles: this.maxFiles,
             maxFileSize: this.maxFileSize,
             maxTotalFileSize: this.maxTotalFileSize,
-            minFileSize: this.minFileSize,
         });
         if (this.multipartFields?.length) {
             out.multipartFields = this.multipartFields.map(x => x.toJSON());
         }
         return out;
     }
+    generateCodec(codec, options) {
+        let fn;
+        if (this.type) {
+            fn = this.type.generateCodec(codec, options);
+        }
+        else if (this.contentType) {
+            const arr = Array.isArray(this.contentType) ? this.contentType : [this.contentType];
+            if (arr.find(ct => typeIs.is(ct, ['json']))) {
+                fn = this.node.findDataType('object').generateCodec(codec);
+            }
+        }
+        fn = fn || isAny;
+        return this.isArray ? vg.isArray(fn) : fn;
+    }
 }
 HttpMediaType.prototype = HttpMediaTypeClass.prototype;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.0.0-alpha.23",
+  "version": "1.0.0-alpha.24",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -40,6 +40,7 @@
     "@browsery/highland": "^2.13.5",
     "@browsery/http-parser": "^0.5.8",
     "@browsery/i18next": "^23.11.5",
+    "@browsery/type-is": "^1.6.18-r3",
     "fast-tokenizer": "^1.3.0",
     "lodash.omit": "^4.5.0",
     "putil-isplainobject": "^1.1.5",

package/types/document/data-type/complex-type-base.d.ts

@@ -74,7 +74,7 @@ declare abstract class ComplexTypeBaseClass extends DataType {
     }): IsObject.Schema;
     protected _generateFieldCodec(codec: 'encode' | 'decode', field: ApiField, context: StrictOmit<DataType.GenerateCodecOptions, 'projection'> & {
         currentPath: string;
-        projection?: FieldsProjection;
+        projection?: FieldsProjection | '*';
     }): Validator;
 }
 export {};

package/types/document/http/http-media-type.d.ts

@@ -1,4 +1,5 @@
 import { Combine, StrictOmit, Type } from 'ts-gems';
+import { Validator } from 'valgen';
 import { OpraSchema } from '../../schema/index.js';
 import { DocumentElement } from '../common/document-element.js';
 import { DataType } from '../data-type/data-type.js';
@@ -52,8 +53,8 @@ declare class HttpMediaTypeClass extends DocumentElement {
     maxFiles?: number;
     maxFileSize?: number;
     maxTotalFileSize?: number;
-    minFileSize?: number;
     findMultipartField(fieldName: string, fieldType?: OpraSchema.HttpMultipartFieldType): HttpMultipartField | undefined;
     toJSON(): OpraSchema.HttpMediaType;
+    generateCodec(codec: 'encode' | 'decode', options?: DataType.GenerateCodecOptions): Validator;
 }
 export {};

package/types/document/http/http-operation.d.ts

@@ -20,7 +20,7 @@ export declare namespace HttpOperation {
         requestBody?: HttpRequestBody.Metadata;
         immediateFetch?: boolean;
     }
-    interface Options extends Partial<Pick<Metadata, 'path' | 'description' | 'method' | 'immediateFetch'>> {
+    interface Options extends Partial<Pick<Metadata, 'path' | 'mergePath' | 'description' | 'method' | 'immediateFetch'>> {
         requestBody?: HttpRequestBody.Options;
     }
     interface InitArguments extends Combine<{