@naturalcycles/nodejs-lib 15.41.0 → 15.43.0

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

@@ -4,8 +4,11 @@ export declare const j: {
     string(): JsonSchemaStringBuilder<string, string, false>;
     number(): JsonSchemaNumberBuilder<number, number, false>;
     boolean(): JsonSchemaBooleanBuilder<boolean, boolean, false>;
-    object: typeof object;
-    objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectInferringBuilder<P, false>;
+    object: typeof object & {
+        dbEntity: typeof objectDbEntity;
+        infer: typeof objectInfer;
+        any(): JsonSchemaObjectBuilder<AnyObject, AnyObject, false>;
+    };
     array<IN, OUT, Opt>(itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>): JsonSchemaArrayBuilder<IN, OUT, Opt>;
     set<IN, OUT, Opt>(itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>): JsonSchemaSet2Builder<IN, OUT, Opt>;
     buffer(): JsonSchemaBufferBuilder;
@@ -236,6 +239,9 @@ declare function object(props: AnyObject): never;
 declare function object<IN extends AnyObject>(props: {
     [key in keyof IN]: JsonSchemaAnyBuilder<any, IN[key], any>;
 }): JsonSchemaObjectBuilder<IN, IN, false>;
+declare function objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectInferringBuilder<P, false>;
+declare function objectDbEntity(props?: AnyObject): never;
+declare function objectDbEntity<IN extends AnyObject>(props?: AnyObject): JsonSchemaObjectBuilder<IN, IN, false>;
 type Expand<T> = T extends infer O ? {
     [K in keyof O]: O[K];
 } : never;

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -16,10 +16,13 @@ export const j = {
     boolean() {
         return new JsonSchemaBooleanBuilder();
     },
-    object,
-    objectInfer(props) {
-        return new JsonSchemaObjectInferringBuilder(props);
-    },
+    object: Object.assign(object, {
+        dbEntity: objectDbEntity,
+        infer: objectInfer,
+        any() {
+            return j.object({}).allowAdditionalProperties();
+        },
+    }),
     array(itemSchema) {
         return new JsonSchemaArrayBuilder(itemSchema);
     },
@@ -524,3 +527,14 @@ export class JsonSchemaEnumBuilder extends JsonSchemaAnyBuilder {
 function object(props) {
     return new JsonSchemaObjectBuilder(props);
 }
+function objectInfer(props) {
+    return new JsonSchemaObjectInferringBuilder(props);
+}
+function objectDbEntity(props) {
+    return j.object({
+        id: j.string(),
+        created: j.number().unixTimestamp2000(),
+        updated: j.number().unixTimestamp2000(),
+        ...props,
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.41.0",
+  "version": "15.43.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -37,13 +37,13 @@ export const j = {
     return new JsonSchemaBooleanBuilder()
   },
 
-  object,
-
-  objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
-    props: P,
-  ): JsonSchemaObjectInferringBuilder<P, false> {
-    return new JsonSchemaObjectInferringBuilder<P, false>(props)
-  },
+  object: Object.assign(object, {
+    dbEntity: objectDbEntity,
+    infer: objectInfer,
+    any() {
+      return j.object<AnyObject>({}).allowAdditionalProperties()
+    },
+  }),
 
   array<IN, OUT, Opt>(
     itemSchema: JsonSchemaAnyBuilder<IN, OUT, Opt>,
@@ -833,6 +833,28 @@ function object<IN extends AnyObject>(props: {
   return new JsonSchemaObjectBuilder<IN, IN, false>(props)
 }
 
+function objectInfer<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
+  props: P,
+): JsonSchemaObjectInferringBuilder<P, false> {
+  return new JsonSchemaObjectInferringBuilder<P, false>(props)
+}
+
+function objectDbEntity(props?: AnyObject): never
+function objectDbEntity<IN extends AnyObject>(
+  props?: AnyObject,
+): JsonSchemaObjectBuilder<IN, IN, false>
+
+function objectDbEntity<IN extends AnyObject>(
+  props?: AnyObject,
+): JsonSchemaObjectBuilder<IN, IN, false> {
+  return j.object({
+    id: j.string(),
+    created: j.number().unixTimestamp2000(),
+    updated: j.number().unixTimestamp2000(),
+    ...props,
+  })
+}
+
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never
 
 type ExactMatch<A, B> =