@nu-art/ts-common 0.202.30 → 0.202.32

package/db/types.d.ts

@@ -10,7 +10,11 @@ export type DBIndex<T extends DB_Object> = {
 };
 export type Default_UniqueKey = '_id';
 export type VersionType = string;
-export type VersionsDeclaration<T extends DB_Object, Versions extends VersionType[] = ['1.0.0'], Types extends [T, ...DB_Object[]] = [T, ...DB_Object[]]> = {
+export type VersionsDeclaration<Versions extends VersionType[] = ['1.0.0'], Types extends {
+    [V in Versions[number]]: DB_Object;
+} = {
+    [V in Versions[number]]: DB_Object;
+}> = {
     versions: Versions;
     types: Types;
 };
@@ -21,7 +25,7 @@ export type InnerDependencies<T extends DB_Object, K extends SubsetKeys<keyof T,
 type Exact<T, Shape> = T & {
     [K in Exclude<keyof Shape, keyof T>]?: never;
 };
-export type Proto_DB_Object<T extends DB_Object, GeneratedKeys extends keyof T | never, Versions extends VersionsDeclaration<T, any, any>, UniqueKeys extends keyof T = Default_UniqueKey, Dependencies extends Exact<{
+export type Proto_DB_Object<T extends DB_Object, GeneratedKeys extends keyof T | never, Versions extends VersionsDeclaration<VersionType[]>, UniqueKeys extends keyof T = Default_UniqueKey, Dependencies extends Exact<{
     [K in SubsetKeys<keyof T, T, string | string[]>]?: DBProto<any>;
 }, Dependencies> = never> = {
     type: T;
@@ -30,7 +34,7 @@ export type Proto_DB_Object<T extends DB_Object, GeneratedKeys extends keyof T |
     uniqueKeys: UniqueKeys;
     dependencies: Dependencies;
 };
-export type DBProto<P extends Proto_DB_Object<any, any, any, any, any>, ModifiableSubType = Omit<P['type'], P['generatedKeys'] | keyof DB_Object>, GeneratedSubType = SubsetObjectByKeys<P['type'], P['generatedKeys']>> = {
+export type DBProto<P extends Proto_DB_Object<any, any, VersionsDeclaration<VersionType[]>, any, any>, ModifiableSubType = Omit<P['type'], P['generatedKeys'] | keyof DB_Object>, GeneratedSubType = SubsetObjectByKeys<P['type'], P['generatedKeys']>> = {
     uiType: ModifiableSubType & Partial<GeneratedSubType> & Partial<DB_Object>;
     preDbType: ModifiableSubType & Partial<GeneratedSubType>;
     dbType: P['type'];
@@ -38,7 +42,7 @@ export type DBProto<P extends Proto_DB_Object<any, any, any, any, any>, Modifiab
     modifiablePropsValidator: ValidatorTypeResolver<ModifiableSubType>;
     uniqueKeys: P['uniqueKeys'][];
     generatedProps: P['generatedKeys'][];
-    versions: P['versions']['versions'];
+    versions: P['versions'];
     indices: DBIndex<P['type']>[];
     uniqueParam: UniqueId | {
         [K in P['uniqueKeys']]: P['type'][K];
@@ -55,7 +59,7 @@ export type DBDef_V3<P extends DBProto<any, any, any>> = {
     generatedPropsValidator: P['generatedPropsValidator'];
     modifiablePropsValidator: P['modifiablePropsValidator'];
     uniqueKeys?: P['uniqueKeys'];
-    versions?: P['versions'];
+    versions?: P['versions']['versions'];
     indices?: P['indices'];
     lockKeys?: P['lockKeys'];
     metadata?: P['metadata'];
@@ -97,36 +101,4 @@ export type MetadataNested<T extends any> = T extends (infer I)[] ? MetadataProp
 export type Metadata<T extends any> = T extends (infer I)[] ? MetadataProperty<T> & {
     metadata: Metadata<I>;
 } : T extends object ? MetadataObject<T> : MetadataProperty<T>;
-export declare const DB_Object_Metadata: {
-    _id: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-    _v: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-    _originDocId: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-    __hardDelete: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-    __created: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-    __updated: {
-        optional: boolean;
-        valueType: string;
-        description: string;
-    };
-};
 export {};

package/db/types.js

@@ -1,38 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DB_Object_Metadata = void 0;
-exports.DB_Object_Metadata = {
-    _id: { optional: false, valueType: 'string', description: 'unique key' },
-    _v: { optional: false, valueType: 'string', description: 'version' },
-    _originDocId: { optional: true, valueType: 'string', description: 'previous doc id' },
-    __hardDelete: { optional: true, valueType: 'boolean', description: 'is hard delete' },
-    __created: { optional: false, valueType: 'number', description: 'timestamp of creation' },
-    __updated: { optional: false, valueType: 'number', description: 'timestamp of last time modified' }
-};
-//@ts-ignore
-const pah = {
-    a: { optional: false, description: 'aaa', valueType: 'string' },
-    b: { optional: true, description: 'aaa', valueType: 'number' },
-    c: {
-        optional: true,
-        description: 'harti barti',
-        valueType: 'array',
-        metadata: { optional: false, description: 'aaa', valueType: 'string' }
-    },
-    d: {
-        optional: true,
-        description: 'harti barti',
-        valueType: 'object',
-        metadata: {
-            k: { optional: false, description: 'aaa', valueType: 'string' },
-            l: { optional: false, description: 'aaa', valueType: 'number' }
-        }
-    },
-    e: {
-        optional: true,
-        description: 'harti barti',
-        valueType: 'object',
-        metadata: { ashpa: { optional: false, description: 'aaa', valueType: 'string' } }
-    }
-};
-// console.log(pah);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/ts-common",
-  "version": "0.202.30",
+  "version": "0.202.32",
   "description": "js and ts infra",
   "keywords": [
     "TacB0sS",

package/utils/db-object-tools.d.ts

@@ -1,8 +1,6 @@
 import { DB_Object, OmitDBObject, SubsetObjectByKeys, TS_Object } from './types';
-import { DBProto } from '../db/types';
 export declare const KeysOfDB_Object: (keyof DB_Object)[];
 export declare function dbObjectToId(i: DB_Object): string;
-export declare function dbObjectToId_V3<Proto extends DBProto<any>>(i: Proto['dbType']): any;
 export declare function removeDBObjectKeys<T extends DB_Object>(instance: T): OmitDBObject<T>;
 export declare function deleteKeysObject<T extends DB_Object, Ks extends keyof T>(instance: T, keysToRemove: Ks[]): Omit<T, Ks>;
 export declare function keepDBObjectKeys<T extends DB_Object>(instance: T): DB_Object;

package/utils/db-object-tools.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.keepPartialObject = exports.keepDBObjectKeys = exports.deleteKeysObject = exports.removeDBObjectKeys = exports.dbObjectToId_V3 = exports.dbObjectToId = exports.KeysOfDB_Object = void 0;
+exports.keepPartialObject = exports.keepDBObjectKeys = exports.deleteKeysObject = exports.removeDBObjectKeys = exports.dbObjectToId = exports.KeysOfDB_Object = void 0;
 const object_tools_1 = require("./object-tools");
 const tools_1 = require("./tools");
 exports.KeysOfDB_Object = ['_id', '_v', '__created', '__updated'];
@@ -8,10 +8,6 @@ function dbObjectToId(i) {
     return i._id;
 }
 exports.dbObjectToId = dbObjectToId;
-function dbObjectToId_V3(i) {
-    return i._id;
-}
-exports.dbObjectToId_V3 = dbObjectToId_V3;
 function removeDBObjectKeys(instance) {
     const _instance = (0, object_tools_1.deepClone)(instance);
     exports.KeysOfDB_Object.forEach(key => delete _instance[key]);