Revert "fix:(js/core/schema): Allow disabling runtime schema compilation (#3988)"

This reverts commit dbf142f.

Author: pavelgj

js/core/package.json

@@ -29,21 +29,22 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "~1.25.0",
     "@opentelemetry/core": "~1.25.0",
-    "@opentelemetry/exporter-jaeger": "^1.25.0",
     "@opentelemetry/sdk-metrics": "~1.25.0",
     "@opentelemetry/sdk-node": "^0.52.0",
     "@opentelemetry/sdk-trace-base": "~1.25.0",
+    "@opentelemetry/exporter-jaeger": "^1.25.0",
     "@types/json-schema": "^7.0.15",
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "async-mutex": "^0.5.0",
+    "body-parser": "^1.20.3",
     "cors": "^2.8.5",
-    "dotprompt": "^1.1.1",
     "express": "^4.21.0",
     "get-port": "^5.1.0",
     "json-schema": "^0.4.0",
     "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.22.4"
+    "zod-to-json-schema": "^3.22.4",
+    "dotprompt": "^1.1.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
@@ -56,7 +57,6 @@
     "typescript": "^4.9.0"
   },
   "optionalDependencies": {
-    "@cfworker/json-schema": "^4.1.1",
     "@genkit-ai/firebase": "^1.16.1"
   },
   "types": "lib/index.d.ts",

js/core/src/index.ts

@@ -77,12 +77,7 @@ export {
 } from './flow.js';
 export * from './plugin.js';
 export * from './reflection.js';
-export {
-  defineJsonSchema,
-  defineSchema,
-  disableSchemaCodeGeneration,
-  type JSONSchema,
-} from './schema.js';
+export { defineJsonSchema, defineSchema, type JSONSchema } from './schema.js';
 export * from './telemetryTypes.js';
 export * from './utils.js';
 

js/core/src/schema.ts

@@ -14,36 +14,15 @@
  * limitations under the License.
  */
 
-import { Validator } from '@cfworker/json-schema';
 import Ajv, { type ErrorObject, type JSONSchemaType } from 'ajv';
 import addFormats from 'ajv-formats';
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 import { GenkitError } from './error.js';
-import { logger } from './logging.js';
 import type { Registry } from './registry.js';
 const ajv = new Ajv();
 addFormats(ajv);
 
-const SCHEMA_VALIDATION_MODE = 'schemaValidationMode' as const;
-
-/**
- * Disable schema code generation in runtime. Use this if your runtime
- * environment restricts the use of `eval` or `new Function`, for e.g., in
- * CloudFlare workers.
- */
-export function disableSchemaCodeGeneration() {
-  logger.warn(
-    "It looks like you're trying to disable schema code generation. Please ensure that the '@cfworker/json-schema' package is installed: `npm i --save @cfworker/json-schema`"
-  );
-  global[SCHEMA_VALIDATION_MODE] = 'interpret';
-}
-
-/** Visible for testing */
-export function resetSchemaCodeGeneration() {
-  global[SCHEMA_VALIDATION_MODE] = undefined;
-}
-
 export { z }; // provide a consistent zod to use throughout genkit
 
 /**
@@ -53,7 +32,6 @@ export type JSONSchema = JSONSchemaType<any> | any;
 
 const jsonSchemas = new WeakMap<z.ZodTypeAny, JSONSchema>();
 const validators = new WeakMap<JSONSchema, ReturnType<typeof ajv.compile>>();
-const cfWorkerValidators = new WeakMap<JSONSchema, Validator>();
 
 /**
  * Wrapper object for various ways schema can be provided.
@@ -119,19 +97,6 @@ function toErrorDetail(error: ErrorObject): ValidationErrorDetail {
   };
 }
 
-function cfWorkerErrorToValidationErrorDetail(error: {
-  instanceLocation: string;
-  error: string;
-}): ValidationErrorDetail {
-  const path = error.instanceLocation.startsWith('#/')
-    ? error.instanceLocation.substring(2)
-    : '';
-  return {
-    path: path.replace(/\//g, '.') || '(root)',
-    message: error.error,
-  };
-}
-
 /**
  * Validation response.
  */
@@ -150,24 +115,6 @@ export function validateSchema(
   if (!toValidate) {
     return { valid: true, schema: toValidate };
   }
-  const validationMode = (global[SCHEMA_VALIDATION_MODE] ?? 'compile') as
-    | 'compile'
-    | 'interpret';
-
-  if (validationMode === 'interpret') {
-    let validator = cfWorkerValidators.get(toValidate);
-    if (!validator) {
-      validator = new Validator(toValidate);
-      cfWorkerValidators.set(toValidate, validator);
-    }
-    const result = validator.validate(data);
-    return {
-      valid: result.valid,
-      errors: result.errors?.map(cfWorkerErrorToValidationErrorDetail),
-      schema: toValidate,
-    };
-  }
-
   const validator = validators.get(toValidate) || ajv.compile(toValidate);
   const valid = validator(data) as boolean;
   const errors = validator.errors?.map((e) => e);

js/core/tests/schema_test.ts

@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-import Ajv from 'ajv';
 import * as assert from 'assert';
-import { describe, it, mock } from 'node:test';
+import { describe, it } from 'node:test';
 
 import {
   ValidationError,
-  disableSchemaCodeGeneration,
   parseSchema,
-  resetSchemaCodeGeneration,
   toJsonSchema,
   validateSchema,
   z,
@@ -165,27 +162,3 @@ describe('toJsonSchema', () => {
     );
   });
 });
-
-describe('disableSchemaCodeGeneration()', () => {
-  it('should validate using cfworker validator', () => {
-    const compileMock = mock.method(Ajv.prototype, 'compile');
-
-    disableSchemaCodeGeneration();
-    const result = validateSchema(
-      { foo: 123 },
-      {
-        jsonSchema: {
-          type: 'object',
-          properties: { foo: { type: 'boolean' } },
-        },
-      }
-    );
-
-    assert.strictEqual(result.valid, false);
-    const errorAtFoo = result.errors?.find((e) => e.path === 'foo');
-    assert.ok(errorAtFoo, 'Should have error at foo');
-    assert.strictEqual(compileMock.mock.callCount(), 0);
-    compileMock.mock.restore();
-    resetSchemaCodeGeneration();
-  });
-});

js/genkit/src/common.ts

@@ -129,7 +129,6 @@ export {
   UserFacingError,
   defineJsonSchema,
   defineSchema,
-  disableSchemaCodeGeneration,
   getClientHeader,
   getCurrentEnv,
   getStreamingCallback,