@conduitplatform/module-tools 0.16.0-alpha.8 → 0.16.0-rc.0

package/dist/classes/GrpcServer.js

@@ -1,188 +1,110 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcServer = void 0;
-var helpers_1 = require("../helpers");
-var lodash_1 = require("lodash");
-var grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
-var GrpcServer = /** @class */ (function () {
-    function GrpcServer(port) {
+const helpers_1 = require("../helpers");
+const lodash_1 = require("lodash");
+const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
+class GrpcServer {
+    constructor(port) {
         this.started = false;
         this.startedOnce = false;
         this._serviceNames = [];
         this._postponeRequests = 0;
         this._services = [];
-        this._url = "0.0.0.0:".concat(port !== null && port !== void 0 ? port : '5000');
+        this._url = `0.0.0.0:${port !== null && port !== void 0 ? port : '5000'}`;
     }
-    Object.defineProperty(GrpcServer.prototype, "url", {
-        get: function () {
-            return this._url;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    GrpcServer.prototype.createNewServer = function (useForce) {
-        if (useForce === void 0) { useForce = false; }
-        return __awaiter(this, void 0, void 0, function () {
-            var serverResult;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if ((0, lodash_1.isNil)(this._useForce)) {
-                            this._useForce = useForce;
-                        }
-                        return [4 /*yield*/, (0, helpers_1.createServer)(this._url)];
-                    case 1:
-                        serverResult = _a.sent();
-                        this.grpcServer = serverResult.server;
-                        this._url = this._url.split(':')[0] + ':' + serverResult.port.toString();
-                        return [2 /*return*/, serverResult.port];
-                }
-            });
-        });
-    };
-    GrpcServer.prototype.addService = function (protoPath, protoDescription, functions) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        functions = (0, helpers_1.wrapGrpcFunctions)(functions, this.postponeRestart.bind(this));
-                        if (!(this._serviceNames.indexOf(protoDescription) !== -1)) return [3 /*break*/, 1];
-                        grpc_sdk_1.default.Logger.log('Service already exists, performing replace');
-                        this._services[this._serviceNames.indexOf(protoDescription)] = {
-                            protoPath: protoPath,
-                            protoDescription: protoDescription,
-                            functions: functions,
-                        };
-                        this.scheduleRefresh();
-                        return [2 /*return*/, this];
-                    case 1:
-                        this._services.push({ protoPath: protoPath, protoDescription: protoDescription, functions: functions });
-                        this._serviceNames.push(protoDescription);
-                        if (!this.started) return [3 /*break*/, 2];
-                        grpc_sdk_1.default.Logger.log('Server already started, scheduling refresh..');
-                        this.scheduleRefresh();
-                        return [2 /*return*/, this];
-                    case 2:
-                        if (!!this.grpcServer) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.wait(1000)];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
-                    case 4:
-                        (0, helpers_1.addServiceToServer)(this.grpcServer, protoPath, protoDescription, functions);
-                        return [2 /*return*/, this];
+    async waitForReady() {
+        while (!(0, lodash_1.isNil)(this.scheduledRestart)) {
+            await this.wait(200);
+        }
+    }
+    get url() {
+        return this._url;
+    }
+    async createNewServer(useForce = false) {
+        if ((0, lodash_1.isNil)(this._useForce)) {
+            this._useForce = useForce;
+        }
+        const serverResult = await (0, helpers_1.createServer)(this._url);
+        this.grpcServer = serverResult.server;
+        this._url = this._url.split(':')[0] + ':' + serverResult.port.toString();
+        return serverResult.port;
+    }
+    async addService(protoPath, protoDescription, functions) {
+        functions = (0, helpers_1.wrapGrpcFunctions)(functions, this.postponeRestart.bind(this));
+        if (this._serviceNames.indexOf(protoDescription) !== -1) {
+            grpc_sdk_1.default.Logger.log('Service already exists, performing replace');
+            this._services[this._serviceNames.indexOf(protoDescription)] = {
+                protoPath,
+                protoDescription,
+                functions,
+            };
+            this.scheduleRefresh();
+            return this;
+        }
+        else {
+            this._services.push({ protoPath, protoDescription, functions });
+            this._serviceNames.push(protoDescription);
+            if (this.started) {
+                grpc_sdk_1.default.Logger.log('Server already started, scheduling refresh..');
+                this.scheduleRefresh();
+                return this;
+            }
+            else {
+                if (!this.grpcServer) {
+                    await this.wait(1000);
                 }
-            });
-        });
-    };
-    GrpcServer.prototype.wait = function (time) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var timeout = setTimeout(function () {
-                            clearTimeout(timeout);
-                            resolve();
-                        }, time);
-                    })];
-            });
+                (0, helpers_1.addServiceToServer)(this.grpcServer, protoPath, protoDescription, functions);
+                return this;
+            }
+        }
+    }
+    async wait(time) {
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                clearTimeout(timeout);
+                resolve();
+            }, time);
         });
-    };
-    GrpcServer.prototype.refresh = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.started) return [3 /*break*/, 3];
-                        this.started = false;
-                        if (!this._useForce) return [3 /*break*/, 1];
-                        this.grpcServer.forceShutdown();
-                        return [3 /*break*/, 3];
-                    case 1: 
-                    //gracefully shutdown so that there are no service disruption
-                    return [4 /*yield*/, new Promise(function (resolve) { return _this.grpcServer.tryShutdown(function () { return resolve(); }); })];
-                    case 2:
-                        //gracefully shutdown so that there are no service disruption
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [4 /*yield*/, this.createNewServer()];
-                    case 4:
-                        _a.sent();
-                        this._services.forEach(function (service) {
-                            (0, helpers_1.addServiceToServer)(_this.grpcServer, service.protoPath, service.protoDescription, service.functions);
-                        });
-                        if (!this.started && this.startedOnce) {
-                            this.grpcServer.start();
-                            this.started = true;
-                        }
-                        return [2 /*return*/];
-                }
-            });
+    }
+    async refresh() {
+        if (this.started) {
+            this.started = false;
+            if (this._useForce) {
+                this.grpcServer.forceShutdown();
+            }
+            else {
+                //gracefully shutdown so that there are no service disruption
+                await new Promise(resolve => this.grpcServer.tryShutdown(() => resolve()));
+            }
+        }
+        await this.createNewServer();
+        this._services.forEach(service => {
+            (0, helpers_1.addServiceToServer)(this.grpcServer, service.protoPath, service.protoDescription, service.functions);
         });
-    };
-    GrpcServer.prototype.scheduleRefresh = function () {
-        var _this = this;
+        if (!this.started && this.startedOnce) {
+            this.grpcServer.start();
+            this.started = true;
+        }
+    }
+    scheduleRefresh() {
         if (this.scheduledRestart) {
             clearTimeout(this.scheduledRestart);
         }
-        var self = this;
-        this.scheduledRestart = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        grpc_sdk_1.default.Logger.log('Begin refresh');
-                        return [4 /*yield*/, self.refresh()];
-                    case 1:
-                        _a.sent();
-                        grpc_sdk_1.default.Logger.log('Refresh complete');
-                        clearTimeout(self.scheduledRestart);
-                        self.scheduledRestart = undefined;
-                        self._postponeRequests = 0;
-                        return [2 /*return*/];
-                }
-            });
-        }); }, 2000);
-    };
-    GrpcServer.prototype.start = function () {
+        const self = this;
+        this.scheduledRestart = setTimeout(async () => {
+            grpc_sdk_1.default.Logger.log('Begin refresh');
+            await self.refresh();
+            grpc_sdk_1.default.Logger.log('Refresh complete');
+            clearTimeout(self.scheduledRestart);
+            self.scheduledRestart = undefined;
+            self._postponeRequests = 0;
+        }, 2000);
+    }
+    start() {
         var _a;
         if (this.started) {
             grpc_sdk_1.default.Logger.error('gRPC server is already running!');
@@ -194,14 +116,13 @@ var GrpcServer = /** @class */ (function () {
         this.started = true;
         this.startedOnce = true;
         (_a = this.grpcServer) === null || _a === void 0 ? void 0 : _a.start();
-    };
-    GrpcServer.prototype.postponeRestart = function () {
+    }
+    postponeRestart() {
         if (!this.scheduledRestart || this._postponeRequests > 5)
             return;
         this._postponeRequests++;
         this.scheduleRefresh();
-    };
-    return GrpcServer;
-}());
+    }
+}
 exports.GrpcServer = GrpcServer;
 //# sourceMappingURL=GrpcServer.js.map

package/dist/classes/GrpcServer.js.map

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

package/dist/helpers/GrpcHelper.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServiceToServer = exports.createServer = void 0;
-var grpc_js_1 = require("@grpc/grpc-js");
-var protoLoader = require('@grpc/proto-loader');
+const grpc_js_1 = require("@grpc/grpc-js");
+const protoLoader = require('@grpc/proto-loader');
 function createServer(port) {
-    var grpcServer = new grpc_js_1.Server({
+    const grpcServer = new grpc_js_1.Server({
         'grpc.max_receive_message_length': 1024 * 1024 * 100,
         'grpc.max_send_message_length': 1024 * 1024 * 100,
     });
-    return new Promise(function (resolve, reject) {
-        grpcServer.bindAsync(port, grpc_js_1.ServerCredentials.createInsecure(), function (err, port) {
+    return new Promise((resolve, reject) => {
+        grpcServer.bindAsync(port, grpc_js_1.ServerCredentials.createInsecure(), (err, port) => {
             if (err) {
                 reject(err);
             }
             else {
                 resolve({
                     server: grpcServer,
-                    port: port,
+                    port,
                 });
             }
         });
@@ -24,17 +24,17 @@ function createServer(port) {
 }
 exports.createServer = createServer;
 function addServiceToServer(server, protoPath, descriptorObject, functions) {
-    var packageDefinition = protoLoader.loadSync(protoPath, {
+    const packageDefinition = protoLoader.loadSync(protoPath, {
         keepCase: true,
         longs: String,
         enums: String,
         defaults: true,
         oneofs: true,
     });
-    var protoDescriptor = (0, grpc_js_1.loadPackageDefinition)(packageDefinition);
-    var objs = descriptorObject.split('.');
-    var descObj = protoDescriptor;
-    objs.forEach(function (r) {
+    const protoDescriptor = (0, grpc_js_1.loadPackageDefinition)(packageDefinition);
+    const objs = descriptorObject.split('.');
+    let descObj = protoDescriptor;
+    objs.forEach((r) => {
         descObj = descObj[r];
     });
     server.addService(descObj.service, functions);

package/dist/helpers/GrpcHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"GrpcHelper.js","sourceRoot":"","sources":["../../src/helpers/GrpcHelper.ts"],"names":[],"mappings":";;;AAAA,yCAKuB;AAEvB,IAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAM,UAAU,GAAW,IAAI,gBAAM,CAAC;QACpC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;QACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;KAClD,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,2BAAiB,CAAC,cAAc,EAAE,EAAE,UAAC,GAAG,EAAE,IAAI;YACvE,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC;oBACN,MAAM,EAAE,UAAU;oBAClB,IAAI,MAAA;iBACL,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,oCAiBC;AAED,SAAgB,kBAAkB,CAChC,MAAc,EACd,SAAiB,EACjB,gBAAwB,EACxB,SAAuC;IAEvC,IAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE;QACxD,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,IAAM,eAAe,GAAG,IAAA,+BAAqB,EAAC,iBAAiB,CAAC,CAAC;IACjE,IAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO,GAAQ,eAAe,CAAC;IACnC,IAAI,CAAC,OAAO,CAAC,UAAC,CAAS;QACrB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAQ,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,SAAyC,CAAC,CAAC;AAChF,CAAC;AArBD,gDAqBC"}
+{"version":3,"file":"GrpcHelper.js","sourceRoot":"","sources":["../../src/helpers/GrpcHelper.ts"],"names":[],"mappings":";;;AAAA,2CAKuB;AAEvB,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,SAAgB,YAAY,CAAC,IAAY;IACvC,MAAM,UAAU,GAAW,IAAI,gBAAM,CAAC;QACpC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;QACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;KAClD,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,2BAAiB,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC3E,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC;oBACN,MAAM,EAAE,UAAU;oBAClB,IAAI;iBACL,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,oCAiBC;AAED,SAAgB,kBAAkB,CAChC,MAAc,EACd,SAAiB,EACjB,gBAAwB,EACxB,SAAuC;IAEvC,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE;QACxD,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAA,+BAAqB,EAAC,iBAAiB,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO,GAAQ,eAAe,CAAC;IACnC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QACzB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAQ,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,SAAyC,CAAC,CAAC;AAChF,CAAC;AArBD,gDAqBC"}

package/dist/helpers/GrpcToParsedRouterRequest.d.ts

@@ -0,0 +1,2 @@
+import { Context, Cookies, Params, ParsedRouterRequest } from '@conduitplatform/grpc-sdk';
+export declare function createParsedRouterRequest(params: Params, urlParams?: Params, queryParams?: Params, bodyParams?: Params, path?: string, headers?: Headers, context?: Context, cookies?: Cookies): ParsedRouterRequest;

package/dist/helpers/GrpcToParsedRouterRequest.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createParsedRouterRequest = void 0;
+function createParsedRouterRequest(params, urlParams, queryParams, bodyParams, path, headers, context, cookies) {
+    return {
+        request: {
+            params,
+            urlParams: urlParams !== null && urlParams !== void 0 ? urlParams : {},
+            queryParams: queryParams !== null && queryParams !== void 0 ? queryParams : {},
+            bodyParams: bodyParams !== null && bodyParams !== void 0 ? bodyParams : {},
+            path: path !== null && path !== void 0 ? path : '',
+            headers: headers,
+            context: context !== null && context !== void 0 ? context : {},
+            cookies: cookies !== null && cookies !== void 0 ? cookies : {},
+        },
+    };
+}
+exports.createParsedRouterRequest = createParsedRouterRequest;
+//# sourceMappingURL=GrpcToParsedRouterRequest.js.map

package/dist/helpers/GrpcToParsedRouterRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GrpcToParsedRouterRequest.js","sourceRoot":"","sources":["../../src/helpers/GrpcToParsedRouterRequest.ts"],"names":[],"mappings":";;;AAEA,SAAgB,yBAAyB,CACvC,MAAc,EACd,SAAkB,EAClB,WAAoB,EACpB,UAAmB,EACnB,IAAa,EACb,OAAiB,EACjB,OAAiB,EACjB,OAAiB;IAEjB,OAA4B;QAC1B,OAAO,EAAE;YACP,MAAM;YACN,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE;YAC1B,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE;YAC9B,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;YAC5B,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE;YAChB,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE;YACtB,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE;SACvB;KACF,CAAC;AACJ,CAAC;AAtBD,8DAsBC"}

package/dist/helpers/TypeHelpers.d.ts

@@ -1,44 +1,70 @@
-import { ConduitModelField, TYPE } from '@conduitplatform/grpc-sdk';
+import { TYPE } from '@conduitplatform/grpc-sdk';
 declare class ConduitStringConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.String;
+    static get Required(): {
+        type: TYPE.String;
+        required: true;
+    };
 }
 export declare const ConduitString: typeof ConduitStringConstructor;
 declare class ConduitNumberConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.Number;
+    static get Required(): {
+        type: TYPE.Number;
+        required: true;
+    };
 }
 export declare const ConduitNumber: typeof ConduitNumberConstructor;
 declare class ConduitBooleanConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.Boolean;
+    static get Required(): {
+        type: TYPE.Boolean;
+        required: true;
+    };
 }
 export declare const ConduitBoolean: typeof ConduitBooleanConstructor;
 declare class ConduitDateConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.Date;
+    static get Required(): {
+        type: TYPE.Date;
+        required: true;
+    };
 }
 export declare const ConduitDate: typeof ConduitDateConstructor;
 declare class ConduitObjectIdConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.ObjectId;
+    static get Required(): {
+        type: TYPE.ObjectId;
+        required: true;
+    };
 }
 export declare const ConduitObjectId: typeof ConduitObjectIdConstructor;
 declare class ConduitJSONConstructor {
     private constructor();
-    static get Optional(): TYPE;
-    static get Required(): ConduitModelField;
+    static get Optional(): TYPE.JSON;
+    static get Required(): {
+        type: TYPE.JSON;
+        required: true;
+    };
 }
 export declare const ConduitJson: typeof ConduitJSONConstructor;
 declare class ConduitRelationConstructor {
     private constructor();
-    static Optional(model: string): ConduitModelField;
-    static Required(model: string): ConduitModelField;
+    static Optional(model: string): {
+        type: TYPE.Relation;
+        model: string;
+        required: false;
+    };
+    static Required(model: string): {
+        type: TYPE.Relation;
+        model: string;
+        required: true;
+    };
 }
 export declare const ConduitRelation: typeof ConduitRelationConstructor;
 export {};