@naturalcycles/js-lib 14.204.0 → 14.205.0

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { BaseDBEntity, JsonSchemaAllOf, JsonSchemaArray, JsonSchemaOneOf, JsonSchemaTuple, SavedDBEntity, AnyObject } from '../index';
+import type { BaseDBEntity, JsonSchemaAllOf, JsonSchemaArray, JsonSchemaOneOf, JsonSchemaTuple, AnyObject } from '../index';
 import type { JsonSchema, JsonSchemaAny, JsonSchemaBoolean, JsonSchemaConst, JsonSchemaEnum, JsonSchemaNull, JsonSchemaNumber, JsonSchemaObject, JsonSchemaRef, JsonSchemaString } from './jsonSchema.model';
 export interface JsonSchemaBuilder<T = unknown> {
     build: () => JsonSchema<T>;
@@ -117,7 +117,6 @@ export declare class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSc
     maxProps(maxProperties: number): this;
     additionalProps(additionalProperties: boolean): this;
     baseDBEntity(): JsonSchemaObjectBuilder<T & BaseDBEntity>;
-    savedDBEntity(): JsonSchemaObjectBuilder<T & SavedDBEntity>;
     extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2>;
 }
 export declare class JsonSchemaArrayBuilder<ITEM> extends JsonSchemaAnyBuilder<ITEM[], JsonSchemaArray<ITEM>> {

package/dist/json-schema/jsonSchemaBuilder.js

@@ -317,10 +317,7 @@ class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
             created: { type: 'number', format: 'unixTimestamp2000' },
             updated: { type: 'number', format: 'unixTimestamp2000' },
         });
-        return this;
-    }
-    savedDBEntity() {
-        return this.baseDBEntity().addRequired(['id', 'created', 'updated']);
+        return this.addRequired(['id', 'created', 'updated']);
     }
     extend(s2) {
         const builder = new JsonSchemaObjectBuilder();

package/dist/json-schema/jsonSchemas.d.ts

@@ -1,3 +1,2 @@
-import type { BaseDBEntity, SavedDBEntity } from '../types';
+import type { BaseDBEntity } from '../types';
 export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<BaseDBEntity>;
-export declare const savedDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<SavedDBEntity>;

package/dist/json-schema/jsonSchemas.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savedDBEntityJsonSchema = exports.baseDBEntityJsonSchema = void 0;
+exports.baseDBEntityJsonSchema = void 0;
 const jsonSchemaBuilder_1 = require("./jsonSchemaBuilder");
 exports.baseDBEntityJsonSchema = jsonSchemaBuilder_1.jsonSchema.object({
-    id: jsonSchemaBuilder_1.jsonSchema.string().optional(),
-    created: jsonSchemaBuilder_1.jsonSchema.unixTimestamp2000().optional(),
-    updated: jsonSchemaBuilder_1.jsonSchema.unixTimestamp2000().optional(),
-});
-exports.savedDBEntityJsonSchema = jsonSchemaBuilder_1.jsonSchema.object({
     id: jsonSchemaBuilder_1.jsonSchema.string(),
     created: jsonSchemaBuilder_1.jsonSchema.unixTimestamp2000(),
     updated: jsonSchemaBuilder_1.jsonSchema.unixTimestamp2000(),
 });
+// export const savedDBEntityJsonSchema = jsonSchema.object<SavedDBEntity>({
+//   id: jsonSchema.string(),
+//   created: jsonSchema.unixTimestamp2000(),
+//   updated: jsonSchema.unixTimestamp2000(),
+// })

package/dist/types.d.ts

@@ -35,7 +35,7 @@ export interface AnyObjectWithId extends AnyObject, ObjectWithId {
 /**
  * Base interface for any Entity that was saved to DB.
  */
-export type SavedDBEntity = {
+export type BaseDBEntity = {
     id: string;
     /**
      * unixTimestamp of when the entity was first created (in the DB).
@@ -46,25 +46,8 @@ export type SavedDBEntity = {
      */
     updated: UnixTimestampNumber;
 };
-/**
- * Base interface for any Entity that can be saved to DB.
- * This interface fits when entity was NOT YET saved to DB,
- * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
- * When it's known to be saved - `SavedDBEntity` interface can be used instead.
- */
-export type BaseDBEntity = {
-    id?: string;
-    /**
-     * unixTimestamp of when the entity was first created (in the DB).
-     */
-    created?: UnixTimestampNumber;
-    /**
-     * unixTimestamp of when the entity was last updated (in the DB).
-     */
-    updated?: UnixTimestampNumber;
-};
-export type Saved<T> = T & SavedDBEntity;
-export type Unsaved<T> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity : T;
+export type Saved<T> = T & BaseDBEntity;
+export type Unsaved<T> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & Partial<BaseDBEntity> : T;
 export type UnsavedId<T> = Omit<T, 'id'> & {
     id?: string;
 };

package/dist/zod/zod.shared.schemas.d.ts

@@ -25,19 +25,6 @@ export declare const zIdBase64Url: z.ZodString;
  */
 export declare const zSlug: z.ZodString;
 export declare const zBaseDBEntity: z.ZodObject<{
-    id: z.ZodOptional<z.ZodString>;
-    created: z.ZodOptional<z.ZodNumber>;
-    updated: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    id?: string | undefined;
-    created?: number | undefined;
-    updated?: number | undefined;
-}, {
-    id?: string | undefined;
-    created?: number | undefined;
-    updated?: number | undefined;
-}>;
-export declare const zSavedDBEntity: z.ZodObject<{
     id: z.ZodString;
     created: z.ZodNumber;
     updated: z.ZodNumber;

package/dist/zod/zod.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zSavedDBEntity = exports.zBaseDBEntity = exports.zSlug = exports.zIdBase64Url = exports.zIdBase64 = exports.zIdBase62 = exports.zId = exports.zJwt = exports.JWT_REGEX = exports.zBase64Url = exports.zBase64 = exports.zBase62 = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.zEmail = exports.zIsoDateString = exports.zSemVer = exports.zUnixTimestampMillis2000 = exports.zUnixTimestampMillis = exports.zUnixTimestamp2000 = exports.zUnixTimestamp = exports.TS_2000 = exports.TS_2500 = void 0;
+exports.zBaseDBEntity = exports.zSlug = exports.zIdBase64Url = exports.zIdBase64 = exports.zIdBase62 = exports.zId = exports.zJwt = exports.JWT_REGEX = exports.zBase64Url = exports.zBase64 = exports.zBase62 = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.zEmail = exports.zIsoDateString = exports.zSemVer = exports.zUnixTimestampMillis2000 = exports.zUnixTimestampMillis = exports.zUnixTimestamp2000 = exports.zUnixTimestamp = exports.TS_2000 = exports.TS_2500 = void 0;
 const zod_1 = require("zod");
 exports.TS_2500 = 16725225600; // 2500-01-01
 exports.TS_2000 = 946684800; // 2000-01-01
@@ -86,9 +86,9 @@ exports.zSlug = zod_1.z
     .describe('Slug');
 exports.zBaseDBEntity = zod_1.z
     .object({
-    id: zod_1.z.string().optional(),
-    created: exports.zUnixTimestamp2000.optional(),
-    updated: exports.zUnixTimestamp2000.optional(),
+    id: zod_1.z.string(),
+    created: exports.zUnixTimestamp2000,
+    updated: exports.zUnixTimestamp2000,
 })
     .describe('BaseDBEntity');
-exports.zSavedDBEntity = exports.zBaseDBEntity.required().describe('SavedDBEntity');
+// export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')

package/dist-esm/json-schema/jsonSchemaBuilder.js

@@ -312,10 +312,7 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
             created: { type: 'number', format: 'unixTimestamp2000' },
             updated: { type: 'number', format: 'unixTimestamp2000' },
         });
-        return this;
-    }
-    savedDBEntity() {
-        return this.baseDBEntity().addRequired(['id', 'created', 'updated']);
+        return this.addRequired(['id', 'created', 'updated']);
     }
     extend(s2) {
         const builder = new JsonSchemaObjectBuilder();

package/dist-esm/json-schema/jsonSchemas.js

@@ -1,11 +1,11 @@
 import { jsonSchema } from './jsonSchemaBuilder';
 export const baseDBEntityJsonSchema = jsonSchema.object({
-    id: jsonSchema.string().optional(),
-    created: jsonSchema.unixTimestamp2000().optional(),
-    updated: jsonSchema.unixTimestamp2000().optional(),
-});
-export const savedDBEntityJsonSchema = jsonSchema.object({
     id: jsonSchema.string(),
     created: jsonSchema.unixTimestamp2000(),
     updated: jsonSchema.unixTimestamp2000(),
 });
+// export const savedDBEntityJsonSchema = jsonSchema.object<SavedDBEntity>({
+//   id: jsonSchema.string(),
+//   created: jsonSchema.unixTimestamp2000(),
+//   updated: jsonSchema.unixTimestamp2000(),
+// })

package/dist-esm/zod/zod.shared.schemas.js

@@ -83,9 +83,9 @@ export const zSlug = z
     .describe('Slug');
 export const zBaseDBEntity = z
     .object({
-    id: z.string().optional(),
-    created: zUnixTimestamp2000.optional(),
-    updated: zUnixTimestamp2000.optional(),
+    id: z.string(),
+    created: zUnixTimestamp2000,
+    updated: zUnixTimestamp2000,
 })
     .describe('BaseDBEntity');
-export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity');
+// export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.204.0",
+  "version": "14.205.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/json-schema/jsonSchemaBuilder.ts

@@ -5,7 +5,6 @@ import type {
   JsonSchemaArray,
   JsonSchemaOneOf,
   JsonSchemaTuple,
-  SavedDBEntity,
   AnyObject,
 } from '../index'
 import { mergeJsonSchemaObjects, _deepCopy, _sortObject } from '../index'
@@ -375,11 +374,7 @@ export class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyB
       updated: { type: 'number', format: 'unixTimestamp2000' },
     })
 
-    return this
-  }
-
-  savedDBEntity(): JsonSchemaObjectBuilder<T & SavedDBEntity> {
-    return this.baseDBEntity().addRequired(['id', 'created', 'updated']) as any
+    return this.addRequired(['id', 'created', 'updated']) as any
   }
 
   extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2> {

package/src/json-schema/jsonSchemas.ts

@@ -1,14 +1,14 @@
-import type { BaseDBEntity, SavedDBEntity } from '../types'
+import type { BaseDBEntity } from '../types'
 import { jsonSchema } from './jsonSchemaBuilder'
 
 export const baseDBEntityJsonSchema = jsonSchema.object<BaseDBEntity>({
-  id: jsonSchema.string().optional(),
-  created: jsonSchema.unixTimestamp2000().optional(),
-  updated: jsonSchema.unixTimestamp2000().optional(),
-})
-
-export const savedDBEntityJsonSchema = jsonSchema.object<SavedDBEntity>({
   id: jsonSchema.string(),
   created: jsonSchema.unixTimestamp2000(),
   updated: jsonSchema.unixTimestamp2000(),
 })
+
+// export const savedDBEntityJsonSchema = jsonSchema.object<SavedDBEntity>({
+//   id: jsonSchema.string(),
+//   created: jsonSchema.unixTimestamp2000(),
+//   updated: jsonSchema.unixTimestamp2000(),
+// })

package/src/types.ts

@@ -47,7 +47,7 @@ export interface AnyObjectWithId extends AnyObject, ObjectWithId {}
  * Base interface for any Entity that was saved to DB.
  */
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type SavedDBEntity = {
+export type BaseDBEntity = {
   id: string
 
   /**
@@ -61,31 +61,10 @@ export type SavedDBEntity = {
   updated: UnixTimestampNumber
 }
 
-/**
- * Base interface for any Entity that can be saved to DB.
- * This interface fits when entity was NOT YET saved to DB,
- * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
- * When it's known to be saved - `SavedDBEntity` interface can be used instead.
- */
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type BaseDBEntity = {
-  id?: string
-
-  /**
-   * unixTimestamp of when the entity was first created (in the DB).
-   */
-  created?: UnixTimestampNumber
-
-  /**
-   * unixTimestamp of when the entity was last updated (in the DB).
-   */
-  updated?: UnixTimestampNumber
-}
-
-export type Saved<T> = T & SavedDBEntity
+export type Saved<T> = T & BaseDBEntity
 
 export type Unsaved<T> = T extends AnyObject
-  ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity
+  ? Omit<T, 'id' | 'created' | 'updated'> & Partial<BaseDBEntity>
   : T
 
 export type UnsavedId<T> = Omit<T, 'id'> & {

package/src/zod/zod.shared.schemas.ts

@@ -93,10 +93,10 @@ export const zSlug = z
 
 export const zBaseDBEntity = z
   .object({
-    id: z.string().optional(),
-    created: zUnixTimestamp2000.optional(),
-    updated: zUnixTimestamp2000.optional(),
+    id: z.string(),
+    created: zUnixTimestamp2000,
+    updated: zUnixTimestamp2000,
   })
   .describe('BaseDBEntity')
 
-export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')
+// export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')