larvituser 0.24.7 → 0.25.0

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.
@@ -7,8 +7,8 @@ export type UserBaseOptions = {
7
7
  username: string;
8
8
  inactive?: boolean;
9
9
  passwordIsFalse: boolean;
10
- created?: string;
11
- updated?: string;
10
+ created?: Date;
11
+ updated?: Date;
12
12
  fields?: Record<string, string[]>;
13
13
  };
14
14
  export declare class UserBase {
@@ -18,8 +18,8 @@ export declare class UserBase {
18
18
  username: string;
19
19
  inactive?: boolean;
20
20
  passwordIsFalse: boolean;
21
- created?: string;
22
- updated?: string;
21
+ created?: Date;
22
+ updated?: Date;
23
23
  fields: Record<string, string[]>;
24
24
  constructor(options: UserBaseOptions);
25
25
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"userBase.d.ts","sourceRoot":"","sources":["../src/userBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlC,MAAM,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAClC,CAAC;AAEF,qBAAa,QAAQ;IACpB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,GAAG,CAAc;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAE5B,OAAO,EAAE,eAAe;IAYpC;;;;;;OAMG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzE;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvE,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC;IAezB;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/C,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/C,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAYnD"}
1
+ {"version":3,"file":"userBase.d.ts","sourceRoot":"","sources":["../src/userBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlC,MAAM,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAClC,CAAC;AAEF,qBAAa,QAAQ;IACpB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,GAAG,CAAc;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAE5B,OAAO,EAAE,eAAe;IAYpC;;;;;;OAMG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzE;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvE,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC;IAezB;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/C,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/C,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAYnD"}
package/dist/users.d.ts CHANGED
@@ -1,17 +1,17 @@
1
1
  import { LogInstance } from 'larvitutils';
2
+ export type matchDate = {
3
+ field: string;
4
+ value: string;
5
+ operation?: 'gt' | 'lt' | 'eq';
6
+ };
2
7
  export type UsersOptions = {
3
8
  db: any;
4
9
  limit?: string;
5
10
  log?: LogInstance;
6
11
  showInactive?: boolean;
7
12
  showInactiveOnly?: boolean;
8
- matchDateFields?: [
9
- {
10
- field: string;
11
- value: string | Array<string>;
12
- operation?: 'gt' | 'lt' | 'eq';
13
- }
14
- ];
13
+ matchDateFields?: matchDate[];
14
+ matchDates?: matchDate[];
15
15
  matchAllFields?: Record<string, string | Array<string>>;
16
16
  matchAllFieldsQ?: Record<string, string | Array<string>>;
17
17
  matchExistingFields?: string[];
@@ -25,8 +25,8 @@ export type UsersOptions = {
25
25
  q?: string;
26
26
  returnFields?: string[];
27
27
  uuids?: string | string[];
28
- createdAfter?: string;
29
- updatedAfter?: string;
28
+ createdAfter?: Date;
29
+ updatedAfter?: Date;
30
30
  };
31
31
  export type UserFields = {
32
32
  [key: string]: string[];
@@ -1 +1 @@
1
- {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,WAAW,EAAS,MAAM,aAAa,CAAC;AAMtD,MAAM,MAAM,YAAY,GAAG;IAC1B,EAAE,EAAE,GAAG,CAAC;IACR,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE;QAAC;YAClB,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9B,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;SAC/B;KAAC,CAAC;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;KAC3B,CAAC;IACF,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,qBAAa,KAAK;IACjB,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,OAAO,CAA4B;gBAE/B,OAAO,EAAE,YAAY;IAQjC;;;;;OAKG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQlD,GAAG,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;CAuTxE"}
1
+ {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,WAAW,EAAS,MAAM,aAAa,CAAC;AAMtD,MAAM,MAAM,SAAS,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,EAAE,EAAE,GAAG,CAAC;IACR,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC;IAC9B,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;KAC3B,CAAC;IACF,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,YAAY,CAAC,EAAE,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,qBAAa,KAAK;IACjB,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,OAAO,CAA4B;gBAE/B,OAAO,EAAE,YAAY;IAQjC;;;;;OAKG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQlD,GAAG,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;CAkUxE"}
package/dist/users.js CHANGED
@@ -30,6 +30,7 @@ class Users {
30
30
  const { log, options, lUtils } = this;
31
31
  const { db } = options;
32
32
  const logPrefix = `${topLogPrefix} get() -`;
33
+ const dbCon = await db.getConnection();
33
34
  const dbFields = [];
34
35
  let sqlWhere = '';
35
36
  // Check if we should show inactive users or not
@@ -43,22 +44,32 @@ class Users {
43
44
  }
44
45
  // Check createdAfter
45
46
  if (options.createdAfter) {
46
- if (isNaN(Date.parse(options.createdAfter))) {
47
- sqlWhere += ' AND created IS NULL\n';
48
- }
49
- else {
50
- sqlWhere += ' AND created >= ?\n';
51
- dbFields.push(options.createdAfter);
52
- }
47
+ sqlWhere += ' AND created >= ?\n';
48
+ dbFields.push(options.createdAfter);
53
49
  }
54
50
  // Check updatedAfter
55
51
  if (options.updatedAfter) {
56
- if (isNaN(Date.parse(options.updatedAfter))) {
57
- sqlWhere += ' AND created IS NULL\n';
58
- }
59
- else {
60
- sqlWhere += ' AND updated >= ?\n';
61
- dbFields.push(options.updatedAfter);
52
+ sqlWhere += ' AND updated >= ?\n';
53
+ dbFields.push(options.updatedAfter);
54
+ }
55
+ // Check headerDates
56
+ if (options.matchDates && options.matchDates.length) {
57
+ for (const matchExistingDate of options.matchDates) {
58
+ const operation = matchExistingDate.operation || 'eq';
59
+ const value = matchExistingDate.value;
60
+ const field = matchExistingDate.field;
61
+ if (!value)
62
+ continue;
63
+ if (!field)
64
+ continue;
65
+ sqlWhere += ' AND ' + dbCon.escapeId(field);
66
+ if (operation === 'eq')
67
+ sqlWhere += ' = CAST(? AS DATETIME)\n';
68
+ else if (operation === 'gt')
69
+ sqlWhere += ' > CAST(? AS DATETIME)\n';
70
+ else if (operation === 'lt')
71
+ sqlWhere += ' < CAST(? AS DATETIME)\n';
72
+ dbFields.push(value);
62
73
  }
63
74
  }
64
75
  // Build where-statement
@@ -186,15 +197,14 @@ class Users {
186
197
  sqlWhere = sqlWhere.substring(0, sqlWhere.length - 1) + ')\n';
187
198
  }
188
199
  }
189
- const dbCon = await db.getConnection();
190
200
  const mainDbFields = dbFields.slice(0);
191
201
  const returnFields = options.returnFields ? (0, helpers_1.arrayify)(options.returnFields) : undefined;
192
202
  let sql = 'SELECT user_users.uuid as uuid, user_users.username as username, user_users.created as created, user_users.updated as updated';
193
203
  // SORT ORDERING
194
204
  if (options.order !== undefined && typeof options.order === 'object') {
195
- const allowedSortables = ['uuid', 'username', ...returnFields ?? []];
205
+ const allowedSortables = ['uuid', 'username', 'created', 'updated', ...returnFields ?? []];
196
206
  if (options.order.by !== undefined && allowedSortables.includes(options.order.by)) {
197
- if (options.order.by !== 'uuid' && options.order.by !== 'username') {
207
+ if (!['uuid', 'username', 'created', 'updated'].includes(options.order.by)) {
198
208
  sql += ', group_concat(user_users_data.data) as ' + dbCon.escapeId(options.order.by) + ' FROM user_users ';
199
209
  sql += 'LEFT JOIN user_users_data on (user_users_data.fieldUuid = (SELECT uuid FROM user_data_fields WHERE name = ?) AND user_users_data.userUuid = user_users.uuid) ';
200
210
  sql += 'WHERE 1 ';
package/dist/users.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"users.js","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.js","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "larvituser",
3
- "version": "0.24.7",
3
+ "version": "0.25.0",
4
4
  "author": {
5
5
  "name": "Mikael 'Lilleman' Göransson",
6
6
  "email": "lilleman@larvit.se",
@@ -10,7 +10,7 @@
10
10
  "dependencies": {
11
11
  "bcryptjs": "2.4.3",
12
12
  "larvitdbmigration": "7.0.148",
13
- "larvitutils": "5.1.129",
13
+ "larvitutils": "5.1.130",
14
14
  "luxon": "^3.1.1",
15
15
  "uuid": "11.0.5"
16
16
  },
@@ -20,7 +20,7 @@
20
20
  "@types/bcryptjs": "2.4.6",
21
21
  "@types/luxon": "^3.1.0",
22
22
  "@types/mocha": "10.0.10",
23
- "@types/node": "22.10.10",
23
+ "@types/node": "22.13.0",
24
24
  "@types/uuid": "10.0.0",
25
25
  "@typescript-eslint/eslint-plugin": "7.18.0",
26
26
  "@typescript-eslint/parser": "7.18.0",