@zenstackhq/server 1.0.0-alpha.71 → 1.0.0-alpha.74

package/express/index.d.ts

@@ -0,0 +1 @@
+export { default as ZenStackMiddleware } from './middleware';

package/express/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZenStackMiddleware = void 0;
+var middleware_1 = require("./middleware");
+Object.defineProperty(exports, "ZenStackMiddleware", { enumerable: true, get: function () { return __importDefault(middleware_1).default; } });
+//# sourceMappingURL=index.js.map

package/express/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA6D;AAApD,iIAAA,OAAO,OAAsB"}

package/express/middleware.d.ts

@@ -0,0 +1,25 @@
+import { ModelZodSchema } from '@zenstackhq/runtime/zod';
+import type { Handler, Request, Response } from 'express';
+import { LoggerConfig } from '../openapi';
+/**
+ * Express middleware options
+ */
+export interface MiddlewareOptions {
+    /**
+     * Callback for getting a PrismaClient for the given request
+     */
+    getPrisma: (req: Request, res: Response) => unknown | Promise<unknown>;
+    /**
+     * Logger settings
+     */
+    logger?: LoggerConfig;
+    /**
+     * Zod schemas for validating request input. Pass `true` to load from standard location (need to enable `@core/zod` plugin in schema.zmodel).
+     */
+    zodSchemas?: ModelZodSchema | boolean;
+}
+/**
+ * Creates an Express middleware for handling CRUD requests.
+ */
+declare const factory: (options: MiddlewareOptions) => Handler;
+export default factory;

package/express/middleware.js

@@ -0,0 +1,43 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const zod_1 = require("@zenstackhq/runtime/zod");
+const openapi_1 = require("../openapi");
+/**
+ * Creates an Express middleware for handling CRUD requests.
+ */
+const factory = (options) => {
+    let schemas;
+    if (typeof options.zodSchemas === 'object') {
+        schemas = options.zodSchemas;
+    }
+    else if (options.zodSchemas === true) {
+        schemas = (0, zod_1.getModelZodSchemas)();
+    }
+    return (request, response) => __awaiter(void 0, void 0, void 0, function* () {
+        const prisma = (yield options.getPrisma(request, response));
+        if (!prisma) {
+            throw new Error('unable to get prisma from request context');
+        }
+        const r = yield (0, openapi_1.handleRequest)({
+            method: request.method,
+            path: request.path,
+            query: request.query,
+            requestBody: request.body,
+            prisma,
+            logger: options.logger,
+            zodSchemas: schemas,
+        });
+        response.status(r.status).json(r.body);
+    });
+};
+exports.default = factory;
+//# sourceMappingURL=middleware.js.map

package/express/middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/express/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,iDAA6E;AAE7E,wCAAyD;AAsBzD;;GAEG;AACH,MAAM,OAAO,GAAG,CAAC,OAA0B,EAAW,EAAE;IACpD,IAAI,OAAmC,CAAC;IACxC,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE;QACxC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;KAChC;SAAM,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;QACpC,OAAO,GAAG,IAAA,wBAAkB,GAAE,CAAC;KAClC;IAED,OAAO,CAAO,OAAO,EAAE,QAAQ,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAqB,CAAC;QAChF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAChE;QAED,MAAM,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAA0C;YACzD,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM;YACN,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/fastify/plugin.d.ts

@@ -1,9 +1,26 @@
+import { ModelZodSchema } from '@zenstackhq/runtime/zod';
 import { FastifyPluginCallback, FastifyReply, FastifyRequest } from 'fastify';
 import { LoggerConfig } from '../openapi';
+/**
+ * Fastify plugin options
+ */
 export interface PluginOptions {
+    /**
+     * Url prefix, e.g.: /api
+     */
     prefix: string;
+    /**
+     * Callback for getting a PrismaClient for the given request
+     */
     getPrisma: (request: FastifyRequest, reply: FastifyReply) => unknown | Promise<unknown>;
+    /**
+     * Logger settings
+     */
     logger?: LoggerConfig;
+    /**
+     * Zod schemas for validating request input. Pass `true` to load from standard location (need to enable `@core/zod` plugin in schema.zmodel).
+     */
+    zodSchemas?: ModelZodSchema | boolean;
 }
 declare const _default: FastifyPluginCallback<PluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;

package/fastify/plugin.js

@@ -12,8 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const zod_1 = require("@zenstackhq/runtime/zod");
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const openapi_1 = require("../openapi");
+/**
+ * Fastify plugin for handling CRUD requests.
+ */
 const pluginHandler = (fastify, options, done) => {
     var _a, _b, _c, _d;
     const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : '';
@@ -23,6 +27,13 @@ const pluginHandler = (fastify, options, done) => {
     else {
         (_d = (_c = options.logger) === null || _c === void 0 ? void 0 : _c.info) === null || _d === void 0 ? void 0 : _d.call(_c, `ZenStackPlugin installing routes at prefix: ${prefix}`);
     }
+    let schemas;
+    if (typeof options.zodSchemas === 'object') {
+        schemas = options.zodSchemas;
+    }
+    else if (options.zodSchemas === true) {
+        schemas = (0, zod_1.getModelZodSchemas)();
+    }
     fastify.all(`${prefix}/*`, (request, reply) => __awaiter(void 0, void 0, void 0, function* () {
         const prisma = (yield options.getPrisma(request, reply));
         if (!prisma) {
@@ -36,6 +47,7 @@ const pluginHandler = (fastify, options, done) => {
             requestBody: request.body,
             prisma,
             logger: options.logger,
+            zodSchemas: schemas,
         });
         reply.status(response.status).send(response.body);
     }));

package/fastify/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/fastify/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,oEAAgC;AAChC,wCAAyD;AAQzD,MAAM,aAAa,GAAyC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;IACnF,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC;IAEpC,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAI,MAAK,SAAS,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;KACxE;SAAM;QACH,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAI,mDAAG,+CAA+C,MAAM,EAAE,CAAC,CAAC;KACnF;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,EAAE,CAAO,OAAO,EAAE,KAAK,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAqB,CAAC;QAC7E,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAChE;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAG,OAAO,CAAC,MAAc,CAAC,GAAG,CAAC;YAClC,KAAK;YACL,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM;YACN,MAAM,EAAE,OAAO,CAAC,MAAM;SACzB,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC;AACX,CAAC,CAAC;AAEF,kBAAe,IAAA,wBAAE,EAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/fastify/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,iDAA6E;AAE7E,oEAAgC;AAChC,wCAAyD;AA2BzD;;GAEG;AACH,MAAM,aAAa,GAAyC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;IACnF,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC;IAEpC,IAAI,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAI,MAAK,SAAS,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;KACxE;SAAM;QACH,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAI,mDAAG,+CAA+C,MAAM,EAAE,CAAC,CAAC;KACnF;IAED,IAAI,OAAmC,CAAC;IACxC,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE;QACxC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;KAChC;SAAM,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;QACpC,OAAO,GAAG,IAAA,wBAAkB,GAAE,CAAC;KAClC;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,EAAE,CAAO,OAAO,EAAE,KAAK,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAqB,CAAC;QAC7E,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAChE;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAG,OAAO,CAAC,MAAc,CAAC,GAAG,CAAC;YAClC,KAAK;YACL,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM;YACN,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC;AACX,CAAC,CAAC;AAEF,kBAAe,IAAA,wBAAE,EAAC,aAAa,CAAC,CAAC"}

package/openapi/index.d.ts

@@ -1,4 +1,5 @@
 import { DbClientContract } from '@zenstackhq/runtime';
+import type { ModelZodSchema } from '@zenstackhq/runtime/zod';
 type LoggerMethod = (message: string, code?: string) => void;
 /**
  * Logger config.
@@ -19,17 +20,27 @@ export type RequestHandlerOptions = {
      */
     logger?: LoggerConfig | null;
 };
+/**
+ * OpenApi request context.
+ */
 export type RequestContext = {
     method: string;
     path: string;
-    query: Record<string, string | string[]>;
-    requestBody: unknown;
+    query?: Record<string, string | string[]>;
+    requestBody?: unknown;
     prisma: DbClientContract;
     logger?: LoggerConfig;
+    zodSchemas?: ModelZodSchema;
 };
+/**
+ * OpenApi response.
+ */
 export type Response = {
     status: number;
     body: unknown;
 };
-export declare function handleRequest({ method, path, query, requestBody, prisma, logger, }: RequestContext): Promise<Response>;
+/**
+ * Handles OpenApi requests
+ */
+export declare function handleRequest({ method, path, query, requestBody, prisma, logger, zodSchemas, }: RequestContext): Promise<Response>;
 export {};

package/openapi/index.js

@@ -14,22 +14,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRequest = void 0;
 const runtime_1 = require("@zenstackhq/runtime");
+const change_case_1 = require("change-case");
 const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
-function logError(logger, message, code) {
-    if (logger === undefined) {
-        console.error(`@zenstackhq/openapi: error ${code ? '[' + code + ']' : ''}, ${message}`);
+const zod_validation_error_1 = require("zod-validation-error");
+const utils_1 = require("./utils");
+function getZodSchema(zodSchemas, model, operation) {
+    if (zodSchemas[model]) {
+        return zodSchemas[model][operation];
     }
-    else if (logger === null || logger === void 0 ? void 0 : logger.error) {
-        logger.error(message, code);
+    else if (zodSchemas[(0, change_case_1.capitalCase)(model)]) {
+        return zodSchemas[(0, change_case_1.capitalCase)(model)][operation];
+    }
+    else {
+        return undefined;
     }
 }
-function handleRequest({ method, path, query, requestBody, prisma, logger, }) {
+function zodValidate(zodSchemas, model, operation, args) {
+    const zodSchema = zodSchemas && getZodSchema(zodSchemas, model, operation);
+    if (zodSchema) {
+        const parseResult = zodSchema.safeParse(args);
+        if (parseResult.success) {
+            return { data: parseResult.data, error: undefined };
+        }
+        else {
+            return { data: undefined, error: (0, zod_validation_error_1.fromZodError)(parseResult.error).message };
+        }
+    }
+    else {
+        return { data: args, error: undefined };
+    }
+}
+/**
+ * Handles OpenApi requests
+ */
+function handleRequest({ method, path, query, requestBody, prisma, logger, zodSchemas, }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const parts = path.split('/');
         if (parts.length < 2) {
             return { status: 400, body: { error: 'invalid request path' } };
         }
+        method = method.toUpperCase();
         const op = parts.pop();
         const model = parts.pop();
         (0, tiny_invariant_1.default)(op);
@@ -44,6 +69,9 @@ function handleRequest({ method, path, query, requestBody, prisma, logger, }) {
                 if (method !== 'POST') {
                     return { status: 400, body: { message: 'invalid request method, only POST is supported' } };
                 }
+                if (!requestBody) {
+                    return { status: 400, body: { message: 'missing request body' } };
+                }
                 args = requestBody;
                 // TODO: upsert's status code should be conditional
                 resCode = 201;
@@ -57,13 +85,16 @@ function handleRequest({ method, path, query, requestBody, prisma, logger, }) {
                 if (method !== 'GET') {
                     return { status: 400, body: { message: 'invalid request method, only GET is supported' } };
                 }
-                args = query.q ? unmarshal(query.q) : {};
+                args = (query === null || query === void 0 ? void 0 : query.q) ? unmarshal(query.q) : {};
                 break;
             case 'update':
             case 'updateMany':
                 if (method !== 'PUT' && method !== 'PATCH') {
                     return { status: 400, body: { message: 'invalid request method, only PUT AND PATCH are supported' } };
                 }
+                if (!requestBody) {
+                    return { status: 400, body: { message: 'missing request body' } };
+                }
                 args = requestBody;
                 break;
             case 'delete':
@@ -71,16 +102,26 @@ function handleRequest({ method, path, query, requestBody, prisma, logger, }) {
                 if (method !== 'DELETE') {
                     return { status: 400, body: { message: 'invalid request method, only DELETE is supported' } };
                 }
-                args = query.q ? unmarshal(query.q) : {};
+                args = (query === null || query === void 0 ? void 0 : query.q) ? unmarshal(query.q) : {};
                 break;
             default:
                 return { status: 400, body: { message: 'invalid operation: ' + op } };
         }
+        if (zodSchemas) {
+            const { data, error } = zodValidate(zodSchemas, model, dbOp, args);
+            if (error) {
+                return { status: 400, body: { message: error } };
+            }
+            else {
+                args = data;
+            }
+        }
         try {
             if (!prisma[model]) {
                 return { status: 400, body: { message: `unknown model name: ${model}` } };
             }
             const result = yield prisma[model][dbOp](args);
+            (0, utils_1.stripAuxFields)(result);
             return { status: resCode, body: result };
         }
         catch (err) {
@@ -137,4 +178,12 @@ exports.handleRequest = handleRequest;
 function unmarshal(value) {
     return JSON.parse(value);
 }
+function logError(logger, message, code) {
+    if (logger === undefined) {
+        console.error(`@zenstackhq/openapi: error ${code ? '[' + code + ']' : ''}, ${message}`);
+    }
+    else if (logger === null || logger === void 0 ? void 0 : logger.error) {
+        logger.error(message, code);
+    }
+}
 //# sourceMappingURL=index.js.map

package/openapi/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/openapi/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAM6B;AAC7B,oEAAuC;AAyBvC,SAAS,QAAQ,CAAC,MAAuC,EAAE,OAAe,EAAE,IAAa;IACrF,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;KAC3F;SAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAE;QACtB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;KAC/B;AACL,CAAC;AAgBD,SAAsB,aAAa,CAAC,EAChC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,MAAM,EACN,MAAM,GACO;;;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,EAAE,CAAC;SACnE;QAED,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAE1B,IAAA,wBAAS,EAAC,EAAE,CAAC,CAAC;QACd,IAAA,wBAAS,EAAC,KAAK,CAAC,CAAC;QAEjB,MAAM,IAAI,GAAG,EAAwB,CAAC;QACtC,IAAI,IAAa,CAAC;QAClB,IAAI,OAAO,GAAG,GAAG,CAAC;QAElB,QAAQ,IAAI,EAAE;YACV,KAAK,QAAQ,CAAC;YACd,KAAK,YAAY,CAAC;YAClB,KAAK,QAAQ;gBACT,IAAI,MAAM,KAAK,MAAM,EAAE;oBACnB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,gDAAgD,EAAE,EAAE,CAAC;iBAC/F;gBACD,IAAI,GAAG,WAAW,CAAC;gBACnB,mDAAmD;gBACnD,OAAO,GAAG,GAAG,CAAC;gBACd,MAAM;YAEV,KAAK,WAAW,CAAC;YACjB,KAAK,YAAY,CAAC;YAClB,KAAK,UAAU,CAAC;YAChB,KAAK,WAAW,CAAC;YACjB,KAAK,SAAS,CAAC;YACf,KAAK,OAAO;gBACR,IAAI,MAAM,KAAK,KAAK,EAAE;oBAClB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,+CAA+C,EAAE,EAAE,CAAC;iBAC9F;gBACD,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,MAAM;YAEV,KAAK,QAAQ,CAAC;YACd,KAAK,YAAY;gBACb,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,OAAO,EAAE;oBACxC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,0DAA0D,EAAE,EAAE,CAAC;iBACzG;gBACD,IAAI,GAAG,WAAW,CAAC;gBACnB,MAAM;YAEV,KAAK,QAAQ,CAAC;YACd,KAAK,YAAY;gBACb,IAAI,MAAM,KAAK,QAAQ,EAAE;oBACrB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,kDAAkD,EAAE,EAAE,CAAC;iBACjG;gBACD,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,MAAM;YAEV;gBACI,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,qBAAqB,GAAG,EAAE,EAAE,EAAE,CAAC;SAC7E;QAED,IAAI;YACA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAChB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,uBAAuB,KAAK,EAAE,EAAE,EAAE,CAAC;aAC7E;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC5C;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,IAAA,yCAA+B,EAAC,GAAG,CAAC,EAAE;gBACtC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;gBACxC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;oBACtB,qBAAqB;oBACrB,OAAO;wBACH,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE;4BACF,MAAM,EAAE,IAAI;4BACZ,gBAAgB,EAAE,IAAI;4BACtB,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,MAAM,EAAE,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM;yBAC3B;qBACJ,CAAC;iBACL;qBAAM;oBACH,OAAO;wBACH,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE;4BACF,MAAM,EAAE,IAAI;4BACZ,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,MAAM,EAAE,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM;yBAC3B;qBACJ,CAAC;iBACL;aACJ;iBAAM,IAAI,IAAA,2CAAiC,EAAC,GAAG,CAAC,IAAI,IAAA,uCAA6B,EAAC,GAAG,CAAC,EAAE;gBACrF,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9B,OAAO;oBACH,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE;wBACF,MAAM,EAAE,IAAI;wBACZ,OAAO,EAAE,GAAG,CAAC,OAAO;qBACvB;iBACJ,CAAC;aACL;iBAAM;gBACH,QAAQ,CAAC,MAAM,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;gBACzC,OAAO;oBACH,MAAM,EAAE,GAAG;oBACX,IAAI,EAAE;wBACF,OAAO,EAAG,GAAa,CAAC,OAAO;qBAClC;iBACJ,CAAC;aACL;SACJ;;CACJ;AAtHD,sCAsHC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/openapi/index.ts"],"names":[],"mappings":"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"}

package/openapi/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Recursively strip auxiliary fields from the given data.
+ */
+export declare function stripAuxFields(data: unknown): void;

package/openapi/utils.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripAuxFields = void 0;
+const sdk_1 = require("@zenstackhq/sdk");
+/**
+ * Recursively strip auxiliary fields from the given data.
+ */
+function stripAuxFields(data) {
+    if (Array.isArray(data)) {
+        return data.forEach(stripAuxFields);
+    }
+    else if (data && typeof data === 'object') {
+        for (const [key, value] of Object.entries(data)) {
+            if (sdk_1.AUXILIARY_FIELDS.includes(key)) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                delete data[key];
+            }
+            else {
+                stripAuxFields(value);
+            }
+        }
+    }
+}
+exports.stripAuxFields = stripAuxFields;
+//# sourceMappingURL=utils.js.map

package/openapi/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/openapi/utils.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AAEnD;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAa;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;KACvC;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7C,IAAI,sBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChC,8DAA8D;gBAC9D,OAAQ,IAAY,CAAC,GAAG,CAAC,CAAC;aAC7B;iBAAM;gBACH,cAAc,CAAC,KAAK,CAAC,CAAC;aACzB;SACJ;KACJ;AACL,CAAC;AAbD,wCAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/server",
-  "version": "1.0.0-alpha.71",
+  "version": "1.0.0-alpha.74",
   "displayName": "ZenStack Server-side Adapters",
   "description": "ZenStack server-side adapters",
   "homepage": "https://zenstack.dev",
@@ -14,26 +14,29 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "change-case": "^4.1.2",
     "tiny-invariant": "^1.3.1",
-    "tmp": "^0.2.1",
-    "@zenstackhq/openapi": "1.0.0-alpha.71",
-    "@zenstackhq/runtime": "1.0.0-alpha.71",
-    "@zenstackhq/testtools": "1.0.0-alpha.71"
+    "zod-validation-error": "^0.2.1",
+    "@zenstackhq/runtime": "1.0.0-alpha.74",
+    "@zenstackhq/openapi": "1.0.0-alpha.74",
+    "@zenstackhq/sdk": "1.0.0-alpha.74"
   },
   "devDependencies": {
+    "@types/body-parser": "^1.19.2",
+    "@types/express": "^4.17.17",
     "@types/jest": "^29.4.0",
-    "@types/react": "^18.0.26",
     "@types/supertest": "^2.0.12",
+    "body-parser": "^1.20.2",
     "copyfiles": "^2.4.1",
+    "express": "^4.18.2",
     "fastify": "^4.14.1",
     "fastify-plugin": "^4.5.0",
     "jest": "^29.4.3",
-    "react": "^17.0.2 || ^18",
     "rimraf": "^3.0.2",
-    "superjson": "^1.11.0",
     "supertest": "^6.3.3",
     "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.4",
+    "@zenstackhq/testtools": "1.0.0-alpha.74"
   },
   "scripts": {
     "clean": "rimraf dist",