@etsoo/shared 1.1.64 → 1.1.65

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -122,9 +122,9 @@ export declare namespace DataTypes {
122
122
  * Add and edit data type
123
123
  * ChangedFields for editing case
124
124
  */
125
- type AddAndEditType<T extends object, D extends keyof T = T extends {
126
- id: IdType;
127
- } ? 'id' : any> = (Omit<T, D> & {
125
+ type AddAndEditType<T extends {
126
+ [key in D]: IdType;
127
+ }, D extends string = 'id'> = (Omit<T, D> & {
128
128
  [key in D]: undefined | never;
129
129
  }) | (Partial<T> & Readonly<Pick<T, D>> & {
130
130
  changedFields?: string[];
@@ -133,11 +133,11 @@ export declare namespace DataTypes {
133
133
  * Add or edit conditional type
134
134
  * ChangedFields for editing case
135
135
  */
136
- type AddOrEditType<T extends object, // Entity modal
136
+ type AddOrEditType<T extends {
137
+ [key in D]: IdType;
138
+ }, // Entity modal
137
139
  E extends boolean, // Editing or not
138
- D extends keyof T = T extends {
139
- id: IdType;
140
- } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
140
+ D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
141
141
  changedFields?: string[];
142
142
  };
143
143
  /**
@@ -70,12 +70,16 @@ export declare namespace DomUtils {
70
70
  const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
71
71
  name: string;
72
72
  label: string;
73
- resources: T;
73
+ resources: T; /**
74
+ * Current detected culture
75
+ */
74
76
  compatibleName?: string[] | undefined;
75
77
  }>[], culture: string) => Readonly<{
76
78
  name: string;
77
79
  label: string;
78
- resources: T;
80
+ resources: T; /**
81
+ * Current detected culture
82
+ */
79
83
  compatibleName?: string[] | undefined;
80
84
  }> | undefined;
81
85
  /**
@@ -122,9 +122,9 @@ export declare namespace DataTypes {
122
122
  * Add and edit data type
123
123
  * ChangedFields for editing case
124
124
  */
125
- type AddAndEditType<T extends object, D extends keyof T = T extends {
126
- id: IdType;
127
- } ? 'id' : any> = (Omit<T, D> & {
125
+ type AddAndEditType<T extends {
126
+ [key in D]: IdType;
127
+ }, D extends string = 'id'> = (Omit<T, D> & {
128
128
  [key in D]: undefined | never;
129
129
  }) | (Partial<T> & Readonly<Pick<T, D>> & {
130
130
  changedFields?: string[];
@@ -133,11 +133,11 @@ export declare namespace DataTypes {
133
133
  * Add or edit conditional type
134
134
  * ChangedFields for editing case
135
135
  */
136
- type AddOrEditType<T extends object, // Entity modal
136
+ type AddOrEditType<T extends {
137
+ [key in D]: IdType;
138
+ }, // Entity modal
137
139
  E extends boolean, // Editing or not
138
- D extends keyof T = T extends {
139
- id: IdType;
140
- } ? 'id' : any> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
140
+ D extends string = 'id'> = E extends false ? Optional<T, D> : Partial<T> & Readonly<Pick<T, D>> & {
141
141
  changedFields?: string[];
142
142
  };
143
143
  /**
@@ -70,12 +70,16 @@ export declare namespace DomUtils {
70
70
  const getCulture: <T extends DataTypes.StringRecord>(items: Readonly<{
71
71
  name: string;
72
72
  label: string;
73
- resources: T;
73
+ resources: T; /**
74
+ * Current detected culture
75
+ */
74
76
  compatibleName?: string[] | undefined;
75
77
  }>[], culture: string) => Readonly<{
76
78
  name: string;
77
79
  label: string;
78
- resources: T;
80
+ resources: T; /**
81
+ * Current detected culture
82
+ */
79
83
  compatibleName?: string[] | undefined;
80
84
  }> | undefined;
81
85
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/shared",
3
- "version": "1.1.64",
3
+ "version": "1.1.65",
4
4
  "description": "TypeScript shared utilities and functions",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/DataTypes.ts CHANGED
@@ -158,8 +158,8 @@ export namespace DataTypes {
158
158
  * ChangedFields for editing case
159
159
  */
160
160
  export type AddAndEditType<
161
- T extends object,
162
- D extends keyof T = T extends { id: IdType } ? 'id' : any
161
+ T extends { [key in D]: IdType },
162
+ D extends string = 'id'
163
163
  > =
164
164
  | (Omit<T, D> & { [key in D]: undefined | never })
165
165
  | (Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] });
@@ -169,9 +169,9 @@ export namespace DataTypes {
169
169
  * ChangedFields for editing case
170
170
  */
171
171
  export type AddOrEditType<
172
- T extends object, // Entity modal
172
+ T extends { [key in D]: IdType }, // Entity modal
173
173
  E extends boolean, // Editing or not
174
- D extends keyof T = T extends { id: IdType } ? 'id' : any // Default is 'id' field
174
+ D extends string = 'id' // Default is 'id' field
175
175
  > = E extends false
176
176
  ? Optional<T, D>
177
177
  : Partial<T> & Readonly<Pick<T, D>> & { changedFields?: string[] };