@samet-it/be-couchbase-common 1.1.4 → 1.1.5

package/dist/connection/cb-direct.connection.d.ts

@@ -1,13 +1,14 @@
 import { CbConnection } from "./cb.connection";
+import { UrnDef } from "@samet-it/be-base-common";
 import type { DefDims, Entity, UrnDocLike, Pair, Portion, View } from "@samet-it/be-base-common";
 import { type CbRepoDirectOpt, type CbRepoLike } from "../repo";
 import type { CbDirectConnectionLike, CbDirectConnOpt } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * Couchbase connection direct class
  * */
 export declare class CbDirectConnection extends CbConnection implements CbDirectConnectionLike {
     constructor(opt?: CbDirectConnOpt);
     /** @inheritDoc */
-    newRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS, R>): CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
+    newRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS, R>): CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
 }

package/dist/connection/index.types.d.ts

@@ -1,8 +1,8 @@
 import type { Cluster, QueryMetaData, QueryOptions, QueryResult, Scope } from "couchbase";
-import type { IgnoreFieldsByType, KeyValue, ReplaceType } from "@leyyo/common";
+import type { IgnoreFieldsByType, KeyValue, ReplaceType, StrKey } from "@leyyo/common";
 import type { CbRepoDirectOpt, CbRepoLike } from "../repo";
 import type { DbConnectionLike, DbConnOpt, DbConnProps, DbExecOpt, DbRepoLink } from "@samet-it/be-db-common";
-import type { DefDims, Entity, UrnDocLike, Pair, Portion, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, UrnDocLike, Pair, Portion, View, UrnDef } from "@samet-it/be-base-common";
 /**
  * Couchbase connection interface
  * */
@@ -81,7 +81,7 @@ export interface CbDirectConnectionLike extends CbConnectionLike {
      * @param {CbRepoDirectOpt} opt - options
      * @return {CbRepoLike} - created repository
      * */
-    newRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS, R>): CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
+    newRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS, R>): CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
 }
 export type CbIgnoreDate<T> = CbReplaceType<T, Date, string>;
 export type CbIgnoreDateKeys<T> = CbIgnoreFields<T, Date>;

package/dist/repo/cb-direct.repo.d.ts

@@ -1,11 +1,11 @@
 import { CbRepo } from "./cb.repo";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { CbConnectionLike } from "../connection";
 import type { CbRepoDirectOpt } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * Couchbase repository direct class
  * */
-export declare class CbDirectRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends CbRepo<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
-    constructor(conn: CbConnectionLike, opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS>);
+export declare class CbDirectRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends CbRepo<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+    constructor(conn: CbConnectionLike, opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS>);
 }

package/dist/repo/cb.repo.d.ts

@@ -3,16 +3,16 @@ import type { KeyValue } from "@leyyo/common";
 import type { StrKey } from "@leyyo/common";
 import type { CbExistsOpt, CbGetOpt, CbInsertOpt, CbReplaceOpt, CbRepoProps, CbRepoLike, CbRepoOpt } from "./index.types";
 import { DbRepo } from "@samet-it/be-db-common";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { QueryRegular } from "@leyyo/query";
 /**
  * Couchbase repository abstract class
  * */
-export declare abstract class CbRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends DbRepo<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> implements CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+export declare abstract class CbRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends DbRepo<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> implements CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
     private static _specs;
     /** @inheritDoc */
-    protected _props: CbRepoProps<ID, ENTITY>;
-    protected constructor(conn: CbConnectionLike, opt?: CbRepoOpt<ID, ENTITY>);
+    protected _props: CbRepoProps<ENTITY, ID>;
+    protected constructor(conn: CbConnectionLike, opt?: CbRepoOpt<ENTITY, ID>);
     /**
      * Check property name
      *
@@ -65,7 +65,7 @@ export declare abstract class CbRepo<ID extends KeyValue, ENTITY extends Entity<
      * */
     protected $createIndices(): Promise<void>;
     /** @inheritDoc */
-    get props(): Readonly<CbRepoProps<ID, ENTITY>>;
+    get props(): Readonly<CbRepoProps<ENTITY, ID>>;
     /** @inheritDoc */
     $getByPrimary(key: string, p1?: CbGetOpt | string, ignoreCheck?: boolean): Promise<ENTITY | undefined>;
     /** @inheritDoc */

package/dist/repo/index.types.d.ts

@@ -1,10 +1,10 @@
 import type { Bucket, BucketSettings, Cluster, Collection, CollectionSpec, RemoveOptions, Scope, ScopeSpec } from "couchbase";
 import type { CbConnectionLike, CbExecOpt } from "../connection";
 import type { DbRepoLike, DbRepoOpt, DbRepoToDim, DbRepoToUrnTuple } from "@samet-it/be-db-common";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { ExistsOptions, GetOptions, InsertOptions, ReplaceOptions } from "couchbase";
 import type { DbRepoProps } from "@samet-it/be-db-common";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * General result for mutable queries to return key
  * */
@@ -18,9 +18,9 @@ export interface CbResultX {
  * Couchbase repository (collection) interface
  * @abstract
  * */
-export interface CbRepoLike<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends DbRepoLike<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+export interface CbRepoLike<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends DbRepoLike<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
     /** @inheritDoc */
-    get props(): Readonly<CbRepoProps<ID, ENTITY>>;
+    get props(): Readonly<CbRepoProps<ENTITY, ID>>;
     /** @inheritDoc */
     insert(doc: ENTITY, opt?: CbInsertOpt | string, ignoreCheck?: boolean): Promise<string>;
     /** @inheritDoc */
@@ -45,7 +45,7 @@ export interface CbRepoLike<ID extends KeyValue, ENTITY extends Entity<ID>, URN
 /**
  * Couchbase repository (collection) option
  * */
-export interface CbRepoOpt<ID extends KeyValue, ENTITY extends Entity<ID>> extends DbRepoOpt<ID, ENTITY> {
+export interface CbRepoOpt<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue> extends DbRepoOpt<ID, ENTITY> {
     /**
      * Bucket name
      *
@@ -74,7 +74,7 @@ export interface CbRepoOpt<ID extends KeyValue, ENTITY extends Entity<ID>> exten
 /**
  * Couchbase repository (collection) props
  * */
-export interface CbRepoProps<ID extends KeyValue, ENTITY extends Entity<ID>> extends CbRepoOpt<ID, ENTITY>, DbRepoProps<CbConnectionLike, ID, ENTITY> {
+export interface CbRepoProps<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue> extends CbRepoOpt<ENTITY, ID>, DbRepoProps<CbConnectionLike, ID, ENTITY> {
     /**
      * Cluster
      *
@@ -118,7 +118,7 @@ export interface CbRepoPropsPart<S> {
 /**
  * Couchbase direct repository (collection) option
  * */
-export interface CbRepoDirectOpt<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, DIMS extends DefDims = DefDims, R = unknown> extends CbRepoOpt<ID, ENTITY> {
+export interface CbRepoDirectOpt<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, DIMS extends DefDims = DefDims, R = unknown> extends CbRepoOpt<ENTITY, ID> {
     /**
      * Name of logger class
      * */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-couchbase-common",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Couchbase common component",
   "keywords": [
     "Couchbase"