@goatlab/fluent 0.6.24 → 0.7.1

package/dist/TypeOrmConnector/test/relations/roles/roles.repositoryTypeOrm.d.ts

@@ -1,8 +1,8 @@
 import { RoleEntity } from './roles.entity';
-import { RoleEntityIn } from './role.dto';
+import { RoleEntityInputSchema } from './role.schema';
 import { TypeOrmConnector } from '../../../TypeOrmConnector';
 import { UserRepository } from '../user/user.repositoryTypeOrm';
-export declare class RoleRepository extends TypeOrmConnector<RoleEntity, RoleEntityIn> {
-    constructor(relations?: any);
+export declare class RoleRepository extends TypeOrmConnector<RoleEntity, RoleEntityInputSchema> {
+    constructor();
     users: () => UserRepository;
 }

package/dist/TypeOrmConnector/test/relations/roles/roles.repositoryTypeOrm.js

@@ -2,14 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleRepository = void 0;
 const roles_entity_1 = require("./roles.entity");
+const role_schema_1 = require("./role.schema");
 const roles_users_repositoryTypeOrm_1 = require("./roles_users.repositoryTypeOrm");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
 const user_repositoryTypeOrm_1 = require("../user/user.repositoryTypeOrm");
-const memoryDataSource_1 = require("../../memoryDataSource");
+const memoryDataSource_1 = require("../../sqlite/memoryDataSource");
 class RoleRepository extends TypeOrmConnector_1.TypeOrmConnector {
-    constructor(relations) {
-        super(roles_entity_1.RoleEntity, memoryDataSource_1.MemoryDataSource, relations);
-        this.users = () => this.belongsToMany(user_repositoryTypeOrm_1.UserRepository, roles_users_repositoryTypeOrm_1.RoleUsersRepository, 'users');
+    constructor() {
+        super({
+            entity: roles_entity_1.RoleEntity,
+            dataSource: memoryDataSource_1.MemoryDataSource,
+            inputSchema: role_schema_1.RoleEntitySchema
+        });
+        this.users = () => this.belongsToMany({
+            repository: user_repositoryTypeOrm_1.UserRepository,
+            pivot: roles_users_repositoryTypeOrm_1.RoleUsersRepository
+        });
     }
 }
 exports.RoleRepository = RoleRepository;

package/dist/TypeOrmConnector/test/relations/roles/roles_user.entity.d.ts

@@ -1,5 +1,5 @@
 export declare class RolesUser {
     id: string;
-    userId?: string;
-    roleId?: string;
+    userId: string;
+    roleId: string;
 }

package/dist/TypeOrmConnector/test/relations/roles/roles_user.entity.js

@@ -6,18 +6,18 @@ const decorators_1 = require("../../../../decorators");
 let RolesUser = class RolesUser {
 };
 tslib_1.__decorate([
-    decorators_1.Decorators.id(),
+    decorators_1.f.id(),
     tslib_1.__metadata("design:type", String)
 ], RolesUser.prototype, "id", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: false }),
+    decorators_1.f.property({ required: false }),
     tslib_1.__metadata("design:type", String)
 ], RolesUser.prototype, "userId", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: false }),
+    decorators_1.f.property({ required: false }),
     tslib_1.__metadata("design:type", String)
 ], RolesUser.prototype, "roleId", void 0);
 RolesUser = tslib_1.__decorate([
-    decorators_1.Decorators.entity('roles_users')
+    decorators_1.f.entity('roles_users')
 ], RolesUser);
 exports.RolesUser = RolesUser;

package/dist/TypeOrmConnector/test/relations/roles/roles_user.schema.d.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+export declare const RolesUserSchema: z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
+    userId: z.ZodString;
+    roleId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id?: string | undefined;
+    roleId: string;
+    userId: string;
+}, {
+    id?: string | undefined;
+    roleId: string;
+    userId: string;
+}>;
+export declare type RolesUserInputSchema = z.infer<typeof RolesUserSchema>;

package/dist/TypeOrmConnector/test/relations/roles/roles_user.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RolesUserSchema = void 0;
+const zod_1 = require("zod");
+exports.RolesUserSchema = zod_1.z.object({
+    id: zod_1.z.string().optional(),
+    userId: zod_1.z.string(),
+    roleId: zod_1.z.string()
+});

package/dist/TypeOrmConnector/test/relations/roles/roles_users.repositoryTypeOrm.d.ts

@@ -1,6 +1,6 @@
-import { RoleUserEntityIn } from './roles_user.dto';
 import { RolesUser } from './roles_user.entity';
+import { RolesUserInputSchema } from './roles_user.schema';
 import { TypeOrmConnector } from '../../../TypeOrmConnector';
-export declare class RoleUsersRepository extends TypeOrmConnector<RolesUser, RoleUserEntityIn> {
-    constructor(relations?: any);
+export declare class RoleUsersRepository extends TypeOrmConnector<RolesUser, RolesUserInputSchema> {
+    constructor();
 }

package/dist/TypeOrmConnector/test/relations/roles/roles_users.repositoryTypeOrm.js

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleUsersRepository = void 0;
 const roles_user_entity_1 = require("./roles_user.entity");
+const roles_user_schema_1 = require("./roles_user.schema");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
-const memoryDataSource_1 = require("../../memoryDataSource");
+const memoryDataSource_1 = require("../../sqlite/memoryDataSource");
 class RoleUsersRepository extends TypeOrmConnector_1.TypeOrmConnector {
-    constructor(relations) {
-        super(roles_user_entity_1.RolesUser, memoryDataSource_1.MemoryDataSource, relations);
+    constructor() {
+        super({
+            entity: roles_user_entity_1.RolesUser,
+            dataSource: memoryDataSource_1.MemoryDataSource,
+            inputSchema: roles_user_schema_1.RolesUserSchema
+        });
     }
 }
 exports.RoleUsersRepository = RoleUsersRepository;

package/dist/TypeOrmConnector/test/relations/user/user.entity.js

@@ -8,41 +8,41 @@ const roles_entity_1 = require("../roles/roles.entity");
 class Family {
 }
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: false }),
+    decorators_1.f.property({ required: false }),
     tslib_1.__metadata("design:type", String)
 ], Family.prototype, "family", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: false }),
+    decorators_1.f.property({ required: false }),
     tslib_1.__metadata("design:type", Number)
 ], Family.prototype, "members", void 0);
 exports.Family = Family;
 let UsersEntity = class UsersEntity {
 };
 tslib_1.__decorate([
-    decorators_1.Decorators.id(),
+    decorators_1.f.id(),
     tslib_1.__metadata("design:type", String)
 ], UsersEntity.prototype, "id", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: true }),
+    decorators_1.f.property({ required: true }),
     tslib_1.__metadata("design:type", String)
 ], UsersEntity.prototype, "name", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.property({ required: false }),
+    decorators_1.f.property({ required: false }),
     tslib_1.__metadata("design:type", Number)
 ], UsersEntity.prototype, "age", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.embed(Family),
+    decorators_1.f.embed(Family),
     tslib_1.__metadata("design:type", Family)
 ], UsersEntity.prototype, "breed", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.hasMany({
+    decorators_1.f.hasMany({
         entity: () => car_entity_1.CarsEntity,
-        inverse: cars => cars.userId
+        inverse: cars => cars.user
     }),
     tslib_1.__metadata("design:type", Array)
 ], UsersEntity.prototype, "cars", void 0);
 tslib_1.__decorate([
-    decorators_1.Decorators.belongsToMany({
+    decorators_1.f.belongsToMany({
         entity: () => roles_entity_1.RoleEntity,
         joinTableName: 'roles_users',
         foreignKey: 'userId',
@@ -51,6 +51,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Array)
 ], UsersEntity.prototype, "roles", void 0);
 UsersEntity = tslib_1.__decorate([
-    decorators_1.Decorators.entity('users')
+    decorators_1.f.entity('users')
 ], UsersEntity);
 exports.UsersEntity = UsersEntity;

package/dist/TypeOrmConnector/test/relations/user/user.repositoryTypeOrm.d.ts

@@ -2,9 +2,9 @@ import { CarsRepository } from '../car/car.repositoryTypeOrm';
 import { RoleRepository } from '../roles/roles.repositoryTypeOrm';
 import { TypeOrmConnector } from '../../../TypeOrmConnector';
 import { UsersEntity } from './user.entity';
-import { UsersEntityIn } from './user.dto';
-export declare class UserRepository extends TypeOrmConnector<UsersEntity, UsersEntityIn> {
-    constructor(relations?: any);
+import { UsersEntityInputSchema } from './user.schema';
+export declare class UserRepository extends TypeOrmConnector<UsersEntity, UsersEntityInputSchema> {
+    constructor();
     cars: () => CarsRepository;
     roles: () => RoleRepository;
 }

package/dist/TypeOrmConnector/test/relations/user/user.repositoryTypeOrm.js

@@ -6,12 +6,24 @@ const roles_repositoryTypeOrm_1 = require("../roles/roles.repositoryTypeOrm");
 const roles_users_repositoryTypeOrm_1 = require("../roles/roles_users.repositoryTypeOrm");
 const TypeOrmConnector_1 = require("../../../TypeOrmConnector");
 const user_entity_1 = require("./user.entity");
-const memoryDataSource_1 = require("../../memoryDataSource");
+const user_schema_1 = require("./user.schema");
+const memoryDataSource_1 = require("../../sqlite/memoryDataSource");
 class UserRepository extends TypeOrmConnector_1.TypeOrmConnector {
-    constructor(relations) {
-        super(user_entity_1.UsersEntity, memoryDataSource_1.MemoryDataSource, relations);
-        this.cars = () => this.hasMany(car_repositoryTypeOrm_1.CarsRepository, 'cars');
-        this.roles = () => this.belongsToMany(roles_repositoryTypeOrm_1.RoleRepository, roles_users_repositoryTypeOrm_1.RoleUsersRepository, 'roles');
+    constructor() {
+        super({
+            entity: user_entity_1.UsersEntity,
+            dataSource: memoryDataSource_1.MemoryDataSource,
+            inputSchema: user_schema_1.UsersEntitySchema
+        });
+        this.cars = () => {
+            return this.hasMany({
+                repository: car_repositoryTypeOrm_1.CarsRepository
+            });
+        };
+        this.roles = () => this.belongsToMany({
+            repository: roles_repositoryTypeOrm_1.RoleRepository,
+            pivot: roles_users_repositoryTypeOrm_1.RoleUsersRepository
+        });
     }
 }
 exports.UserRepository = UserRepository;

package/dist/TypeOrmConnector/test/relations/user/user.schema.d.ts

@@ -0,0 +1,150 @@
+import { z } from 'zod';
+export declare const BreedSchema: z.ZodObject<{
+    family: z.ZodOptional<z.ZodString>;
+    members: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    family?: string | undefined;
+    members?: number | undefined;
+}, {
+    family?: string | undefined;
+    members?: number | undefined;
+}>;
+export declare const UsersEntitySchema: z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
+    name: z.ZodString;
+    age: z.ZodOptional<z.ZodNumber>;
+    breed: z.ZodOptional<z.ZodObject<{
+        family: z.ZodOptional<z.ZodString>;
+        members: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        family?: string | undefined;
+        members?: number | undefined;
+    }, {
+        family?: string | undefined;
+        members?: number | undefined;
+    }>>;
+    cars: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodOptional<z.ZodString>;
+        name: z.ZodString;
+        userId: z.ZodOptional<z.ZodString>;
+        user: z.ZodOptional<z.ZodObject<{
+            id: z.ZodOptional<z.ZodString>;
+            name: z.ZodString;
+            age: z.ZodOptional<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }, {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        id?: string | undefined;
+        userId?: string | undefined;
+        user?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        } | undefined;
+        name: string;
+    }, {
+        id?: string | undefined;
+        userId?: string | undefined;
+        user?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        } | undefined;
+        name: string;
+    }>, "many">>;
+    roles: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodOptional<z.ZodString>;
+        name: z.ZodString;
+        users: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodOptional<z.ZodString>;
+            name: z.ZodString;
+            age: z.ZodOptional<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }, {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        id?: string | undefined;
+        users?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }[] | undefined;
+        name: string;
+    }, {
+        id?: string | undefined;
+        users?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }[] | undefined;
+        name: string;
+    }>, "many">>;
+}, "strip", z.ZodTypeAny, {
+    id?: string | undefined;
+    roles?: {
+        id?: string | undefined;
+        users?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }[] | undefined;
+        name: string;
+    }[] | undefined;
+    age?: number | undefined;
+    breed?: {
+        family?: string | undefined;
+        members?: number | undefined;
+    } | undefined;
+    cars?: {
+        id?: string | undefined;
+        userId?: string | undefined;
+        user?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        } | undefined;
+        name: string;
+    }[] | undefined;
+    name: string;
+}, {
+    id?: string | undefined;
+    roles?: {
+        id?: string | undefined;
+        users?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        }[] | undefined;
+        name: string;
+    }[] | undefined;
+    age?: number | undefined;
+    breed?: {
+        family?: string | undefined;
+        members?: number | undefined;
+    } | undefined;
+    cars?: {
+        id?: string | undefined;
+        userId?: string | undefined;
+        user?: {
+            id?: string | undefined;
+            age?: number | undefined;
+            name: string;
+        } | undefined;
+        name: string;
+    }[] | undefined;
+    name: string;
+}>;
+export declare type UsersEntityInputSchema = z.infer<typeof UsersEntitySchema>;

package/dist/TypeOrmConnector/test/relations/user/user.schema.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UsersEntitySchema = exports.BreedSchema = void 0;
+const zod_1 = require("zod");
+const car_schema_1 = require("../car/car.schema");
+const role_schema_1 = require("../roles/role.schema");
+exports.BreedSchema = zod_1.z.object({
+    family: zod_1.z.string().optional(),
+    members: zod_1.z.number().optional()
+});
+exports.UsersEntitySchema = zod_1.z.object({
+    id: zod_1.z.string().optional(),
+    name: zod_1.z.string(),
+    age: zod_1.z.number().optional(),
+    breed: exports.BreedSchema.optional(),
+    cars: car_schema_1.CarsEntitySchema.array().optional(),
+    roles: role_schema_1.RoleEntitySchema.array().optional()
+});

package/dist/TypeOrmConnector/test/{memoryDataSource.js → sqlite/memoryDataSource.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryDataSource = void 0;
 const typeorm_1 = require("typeorm");
-const dbEntities_1 = require("./dbEntities");
+const dbEntities_1 = require("../dbEntities");
 exports.MemoryDataSource = new typeorm_1.DataSource({
     type: 'sqlite',
     database: ':memory:',

package/dist/core/Loopback/build-schema.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelToJsonSchema = exports.getNavigationalPropertyForRelation = exports.metaToJsonProperty = exports.isArrayType = exports.stringTypeToWrapper = exports.getJsonSchemaRef = exports.getJsonSchema = exports.buildModelCacheKey = exports.JSON_SCHEMA_KEY = void 0;
-const tslib_1 = require("tslib");
 const metadata_1 = require("@loopback/metadata");
-const debug_1 = tslib_1.__importDefault(require("debug"));
 const util_1 = require("util");
 const type_resolver_1 = require("./type-resolver");
 const metadata_2 = require("./metadata");
 exports.JSON_SCHEMA_KEY = metadata_1.MetadataAccessor.create('loopback:json-schema');
-const debug = (0, debug_1.default)('loopback:repository-json-schema:build-schema');
+const debug = console.log;
 function buildModelCacheKey(options = {}) {
     if (Object.keys(options).length === 0) {
         return 'modelOnly';

package/dist/core/Loopback/json-to-schema.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonOrBooleanToJSON = exports.jsonToSchemaObject = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const mapValues_1 = tslib_1.__importDefault(require("./mapValues"));
 const openapi3_ts_1 = require("openapi3-ts");
 function jsonToSchemaObject(json, visited = new Map()) {
     const converted = 'x-loopback-converted';
@@ -30,23 +30,23 @@ function jsonToSchemaObject(json, visited = new Map()) {
                 break;
             }
             case 'allOf': {
-                result.allOf = lodash_1.default.map(json.allOf, item => jsonToSchemaObject(item, visited));
+                result.allOf = json.allOf?.map(item => jsonToSchemaObject(item, visited));
                 break;
             }
             case 'anyOf': {
-                result.anyOf = lodash_1.default.map(json.anyOf, item => jsonToSchemaObject(item, visited));
+                result.anyOf = json.anyOf?.map(item => jsonToSchemaObject(item, visited));
                 break;
             }
             case 'oneOf': {
-                result.oneOf = lodash_1.default.map(json.oneOf, item => jsonToSchemaObject(item, visited));
+                result.oneOf = json.oneOf?.map(item => jsonToSchemaObject(item, visited));
                 break;
             }
             case 'definitions': {
-                result.definitions = lodash_1.default.mapValues(json.definitions, def => jsonToSchemaObject(jsonOrBooleanToJSON(def), visited));
+                result.definitions = (0, mapValues_1.default)(json.definitions, def => jsonToSchemaObject(jsonOrBooleanToJSON(def), visited));
                 break;
             }
             case 'properties': {
-                result.properties = lodash_1.default.mapValues(json.properties, item => jsonToSchemaObject(jsonOrBooleanToJSON(item), visited));
+                result.properties = (0, mapValues_1.default)(json.properties, item => jsonToSchemaObject(jsonOrBooleanToJSON(item), visited));
                 break;
             }
             case 'additionalProperties': {

package/dist/core/Loopback/mapValues.d.ts

@@ -0,0 +1,2 @@
+export = mapValues;
+declare function mapValues(object: any, iteratee?: Function | undefined): any;