@naturalcycles/nodejs-lib 15.97.4 → 15.97.5

package/dist/validation/ajv/jSchema.d.ts

@@ -430,7 +430,7 @@ declare function objectDbEntity<OUT extends BaseDBEntity, EXTRA_KEYS extends Exc
 } : {
     updated: BuilderFor<OUT['updated']>;
 })): JObject<OUT, false>;
-declare function record<KS extends JSchema<any, any>, VS extends JSchema<any, any>, Opt extends boolean = SchemaOpt<VS>>(keySchema: KS, valueSchema: VS): JObject<Opt extends true ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>> : Record<SchemaOut<KS>, SchemaOut<VS>>, false>;
+declare function record<KS extends JSchema<any, any>, VS extends JSchema<any, any>, Opt extends boolean = SchemaOpt<VS>>(keySchema: KS, valueSchema: VS): SchemaOut<KS> extends string ? JObject<Opt extends true ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>> : Record<SchemaOut<KS>, SchemaOut<VS>>, false> : never;
 declare function withRegexKeys<S extends JSchema<any, any>>(keyRegex: RegExp | string, schema: S): JObject<StringMap<SchemaOut<S>>, false>;
 /**
  * Builds the object schema with the indicated `keys` and uses the `schema` for their validation.
@@ -647,7 +647,7 @@ export interface JsonBuilderRuleOpt {
      */
     name?: string;
 }
-type EnumKeyUnion<T> = T extends readonly (infer U)[] ? U : T extends StringEnum | NumberEnum ? T[keyof T] : never;
+type EnumKeyUnion<T> = T extends readonly (infer U)[] ? `${U & (string | number)}` : T extends StringEnum | NumberEnum ? `${T[keyof T] & (string | number)}` : never;
 type SchemaOut<S> = S extends JSchema<infer OUT, any> ? OUT : never;
 type SchemaOpt<S> = S extends JSchema<any, infer Opt> ? (Opt extends true ? true : false) : false;
 type TupleOut<T extends readonly JSchema<any, any>[]> = {

package/dist/validation/ajv/jSchema.js

@@ -964,6 +964,7 @@ function objectDbEntity(props) {
 }
 function record(keySchema, valueSchema) {
     const keyJsonSchema = keySchema.build();
+    _assert(keyJsonSchema.type !== 'number' && keyJsonSchema.type !== 'integer', 'record() key schema must validate strings, not numbers. JSON object keys are always strings.');
     // Check if value schema is optional before build() strips the optionalField flag
     const isValueOptional = valueSchema.getSchema().optionalField;
     const valueJsonSchema = valueSchema.build();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.97.4",
+  "version": "15.97.5",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -19,7 +19,7 @@
     "yargs": "^18"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20260201.1",
+    "@typescript/native-preview": "7.0.0-dev.20260301.1",
     "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {

package/src/validation/ajv/jSchema.ts

@@ -1380,13 +1380,20 @@ function record<
 >(
   keySchema: KS,
   valueSchema: VS,
-): JObject<
-  Opt extends true
-    ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>>
-    : Record<SchemaOut<KS>, SchemaOut<VS>>,
-  false
-> {
+): SchemaOut<KS> extends string
+  ? JObject<
+      Opt extends true
+        ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>>
+        : Record<SchemaOut<KS>, SchemaOut<VS>>,
+      false
+    >
+  : never {
   const keyJsonSchema = keySchema.build()
+
+  _assert(
+    keyJsonSchema.type !== 'number' && keyJsonSchema.type !== 'integer',
+    'record() key schema must validate strings, not numbers. JSON object keys are always strings.',
+  )
   // Check if value schema is optional before build() strips the optionalField flag
   const isValueOptional = (valueSchema as JSchema<any, any>).getSchema().optionalField
   const valueJsonSchema = valueSchema.build()
@@ -1396,18 +1403,13 @@ function record<
     ? { anyOf: [{ isUndefined: true }, valueJsonSchema] }
     : valueJsonSchema
 
-  return new JObject<
-    Opt extends true
-      ? Partial<Record<SchemaOut<KS>, SchemaOut<VS>>>
-      : Record<SchemaOut<KS>, SchemaOut<VS>>,
-    false
-  >([], {
+  return new JObject([], {
     hasIsOfTypeCheck: false,
     keySchema: keyJsonSchema,
     patternProperties: {
       ['^.*$']: finalValueSchema,
     },
-  })
+  }) as any
 }
 
 function withRegexKeys<S extends JSchema<any, any>>(
@@ -2151,12 +2153,12 @@ export interface JsonBuilderRuleOpt {
 }
 
 type EnumKeyUnion<T> =
-  // array of literals -> union of its elements
+  // array of literals -> union of its elements (stringified)
   T extends readonly (infer U)[]
-    ? U
-    : // enum object -> union of its values
+    ? `${U & (string | number)}`
+    : // enum object -> union of its values (stringified)
       T extends StringEnum | NumberEnum
-      ? T[keyof T]
+      ? `${T[keyof T] & (string | number)}`
       : never
 
 type SchemaOut<S> = S extends JSchema<infer OUT, any> ? OUT : never