uranio 0.1.30 → 0.1.32

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.
Files changed (12) hide show
  1. package/.uranio/package.json +1 -1
  2. package/.uranio/src/atom/mongodb.ts +28 -15
  3. package/.uranio/src/types/atom.ts +8 -6
  4. package/.uranio/src/types/index.ts +1 -1
  5. package/dist/cli/generate/index.js +17 -3
  6. package/dist/cli/generate/index.js.map +1 -1
  7. package/dist/main.d.ts +5 -0
  8. package/dist/main.js +6 -0
  9. package/dist/main.js.map +1 -1
  10. package/package.json +3 -3
  11. package/src/cli/generate/index.ts +23 -10
  12. package/src/main.ts +7 -0
package/.uranio/package.json CHANGED
@@ -28,6 +28,6 @@
28
28
  "typescript": "^5.2.2"
29
29
  },
30
30
  "dependencies": {
31
- "uranio": "0.1.30"
31
+ "uranio": "0.1.32"
32
32
  }
33
33
  }
package/.uranio/src/atom/mongodb.ts CHANGED
@@ -25,7 +25,7 @@ export class MongoDBAtomClient<S extends atom_types.mongodb_atom> {
25
25
  if (!item) {
26
26
  return null;
27
27
  }
28
- item = _string_id(item) as S;
28
+ // item = _string_id(item) as S;
29
29
  return item;
30
30
  }
31
31
 
@@ -40,23 +40,25 @@ export class MongoDBAtomClient<S extends atom_types.mongodb_atom> {
40
40
  return items;
41
41
  }
42
42
 
43
- public async put_atom(
44
- shape: atom_types.Shape<S>
45
- ): Promise<mongodb.InsertOneResult> {
46
- shape = _remove_id(shape as Partial<S>);
43
+ public async put_atom(atom: Partial<S>): Promise<mongodb.InsertOneResult> {
44
+ // shape = _remove_id(shape as Partial<S>);
45
+ atom = _replace_string_id_to_object_id(atom);
47
46
  const respone_insert = await this.collection.insertOne(
48
- shape as mongodb.OptionalUnlessRequiredId<S>
47
+ atom as mongodb.OptionalUnlessRequiredId<S>
49
48
  );
50
49
  return respone_insert;
51
50
  }
52
51
 
53
52
  public async put_atoms(
54
- atoms: atom_types.Shape<S>[]
53
+ atoms: Partial<S>[]
55
54
  ): Promise<mongodb.InsertManyResult> {
56
55
  const atoms_no_ids: mongodb.OptionalUnlessRequiredId<S>[] = [];
57
56
  for (const atom of atoms) {
58
- const atom_no_id = _remove_id(
59
- atom as Partial<S>
57
+ // const atom_no_id = _remove_id(
58
+ // atom as Partial<S>
59
+ // ) as mongodb.OptionalUnlessRequiredId<S>;
60
+ const atom_no_id = _replace_string_id_to_object_id(
61
+ atom
60
62
  ) as mongodb.OptionalUnlessRequiredId<S>;
61
63
  atoms_no_ids.push(atom_no_id);
62
64
  }
@@ -69,7 +71,8 @@ export class MongoDBAtomClient<S extends atom_types.mongodb_atom> {
69
71
  atom: Partial<S>
70
72
  ): Promise<mongodb.UpdateResult> {
71
73
  where = _instance_object_id(where);
72
- atom = _remove_id(atom) as Partial<S>;
74
+ // atom = _remove_id(atom) as Partial<S>;
75
+ atom = _replace_string_id_to_object_id(atom) as Partial<S>;
73
76
  const response_update = await this.collection.updateOne(
74
77
  where as mongodb.Filter<S>,
75
78
  {$set: atom}
@@ -82,7 +85,8 @@ export class MongoDBAtomClient<S extends atom_types.mongodb_atom> {
82
85
  atom: Partial<S>
83
86
  ): Promise<mongodb.UpdateResult> {
84
87
  where = _instance_object_id(where);
85
- atom = _remove_id(atom) as Partial<S>;
88
+ // atom = _remove_id(atom) as Partial<S>;
89
+ atom = _replace_string_id_to_object_id(atom) as Partial<S>;
86
90
  const response_update = await this.collection.updateMany(
87
91
  where as mongodb.Filter<S>,
88
92
  {$set: atom}
@@ -125,11 +129,20 @@ function _string_id<T extends unknown>(item: T): StringId<T> {
125
129
  return item as StringId<T>;
126
130
  }
127
131
 
128
- function _remove_id<A extends atom_types.mongodb_atom>(
132
+ // function _remove_id<A extends atom_types.mongodb_atom>(
133
+ // atom: Partial<A>
134
+ // ): atom_types.Shape<A> {
135
+ // delete (atom as any)._id;
136
+ // return atom as atom_types.Shape<A>;
137
+ // }
138
+
139
+ function _replace_string_id_to_object_id<A extends atom_types.mongodb_atom>(
129
140
  atom: Partial<A>
130
- ): atom_types.Shape<A> {
131
- delete (atom as any)._id;
132
- return atom as atom_types.Shape<A>;
141
+ ): Partial<A> {
142
+ if (atom._id && typeof atom._id === 'string') {
143
+ atom._id = new mongodb.ObjectId(atom._id) as any;
144
+ }
145
+ return atom;
133
146
  }
134
147
 
135
148
  function _instance_object_id<A extends atom_types.mongodb_atom>(
package/.uranio/src/types/atom.ts CHANGED
@@ -8,9 +8,11 @@
8
8
 
9
9
  export interface atom {}
10
10
 
11
- export type unique<T> = T & {__uranio: 'unique'};
11
+ // export type unique<T> = T & {__uranio: 'unique'};
12
12
 
13
- export type primary<T> = T & {__uranio: 'primary'};
13
+ // export type primary<T> = T & {__uranio: 'primary'};
14
+
15
+ export type primary<T> = T;
14
16
 
15
17
  export interface mysql_atom extends atom {}
16
18
 
@@ -18,11 +20,11 @@ export interface mongodb_atom extends atom {
18
20
  _id: primary<string>;
19
21
  }
20
22
 
21
- type PrimaryAttribute<A extends atom> = {
22
- [K in keyof A]: A[K] extends {__uranio: 'primary'} ? K : never;
23
- }[keyof A];
23
+ // type PrimaryAttribute<A extends atom> = {
24
+ // [K in keyof A]: A[K] extends {__uranio: 'primary'} ? K : never;
25
+ // }[keyof A];
24
26
 
25
- export type Shape<A extends atom> = Omit<A, PrimaryAttribute<A>>;
27
+ // export type Shape<A extends atom> = Omit<A, PrimaryAttribute<A>>;
26
28
 
27
29
  // export type Shape<A extends atom> = Omit<A, '_id'>;
28
30
 
package/.uranio/src/types/index.ts CHANGED
@@ -6,6 +6,6 @@
6
6
  *
7
7
  */
8
8
 
9
- import {mysql_atom as atom} from './atom';
9
+ import {atom} from './atom';
10
10
  import {primary} from './atom';
11
11
  export {atom, primary};
package/dist/cli/generate/index.js CHANGED
@@ -93,8 +93,8 @@ function _resolve_param_database(args) {
93
93
  }
94
94
  function _assert_database(db) {
95
95
  if (!Object.values(t.DATABASE).includes(db)) {
96
- throw new exception.UranioCLIException(`Invalid database flag value. Possible value are`
97
- + ` [${Object.values(t.DATABASE)}]. Evaluating '${db}'`);
96
+ throw new exception.UranioCLIException(`Invalid database flag value. Possible value are` +
97
+ ` [${Object.values(t.DATABASE)}]. Evaluating '${db}'`);
98
98
  }
99
99
  }
100
100
  async function _copy_dot_uranio(params) {
@@ -278,7 +278,7 @@ function _generate_mysql_uranio_client_module_text(interfaces) {
278
278
  text += `\n`;
279
279
  text += `import {MySQLClient, MySQLClientParams} from './client/mysql';\n`;
280
280
  text += `import {MySQLAtomClient} from './atom/mysql';\n`;
281
- text += `import {mysql_atom} './types/atom';\n`;
281
+ text += `import {mysql_atom} from './types/atom';\n`;
282
282
  text += `\n`;
283
283
  text += _generate_mysql_interface_definitions(interfaces);
284
284
  text += _generate_mysql_client(interfaces);
@@ -334,6 +334,20 @@ function _generate_mysql_interface_definitions(interfaces) {
334
334
  continue;
335
335
  }
336
336
  for (const [prop_name, prop] of Object.entries(inter.properties)) {
337
+ // if (prop.primitive === 'object' && prop.properties?.['___uranio']) {
338
+ // if (prop.properties['___uranio'].original === "__uranio: 'primary';") {
339
+ // const original = prop.original;
340
+ // const match = original.match(/<([^>]+)>/);
341
+ // if (match && match[1]) {
342
+ // text += ` ${prop_name}: ${match[1]};\n`;
343
+ // continue;
344
+ // }
345
+ // throw new exception.UranioCLIException(
346
+ // `Cannot resolve uranio.primary for attribute ${prop_name}`
347
+ // );
348
+ // }
349
+ // continue;
350
+ // }
337
351
  text += ` ${prop_name}: ${prop.primitive};\n`;
338
352
  }
339
353
  text += `}\n`;
package/dist/cli/generate/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/generate/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/generate/index.ts"],"names":[],"mappings":"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"}
package/dist/main.d.ts CHANGED
@@ -5,3 +5,8 @@
5
5
  * @packageDocumentation
6
6
  */
7
7
  export * from '.uranio';
8
+ /**
9
+ * Type used to define an Atom, if they are defined in .uranio libs istead of
10
+ * directly in uranio, plutonio cannot infer them correctly. Therefor they are
11
+ * re-defined here
12
+ */
package/dist/main.js CHANGED
@@ -21,4 +21,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
21
21
  };
22
22
  Object.defineProperty(exports, "__esModule", { value: true });
23
23
  __exportStar(require(".uranio"), exports);
24
+ /**
25
+ * Type used to define an Atom, if they are defined in .uranio libs istead of
26
+ * directly in uranio, plutonio cannot infer them correctly. Therefor they are
27
+ * re-defined here
28
+ */
29
+ // export type primary<T> = T & {__uranio: 'primary'};
24
30
  //# sourceMappingURL=main.js.map
package/dist/main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB;AAExB;;;;GAIG;AACH,sDAAsD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "uranio",
3
- "version": "0.1.30",
3
+ "version": "0.1.32",
4
4
  "description": "Uranio is a type-safe ODM for MongoDB",
5
5
  "main": "dist/index.js",
6
6
  "repository": {
@@ -25,7 +25,7 @@
25
25
  "dev": "yarn tsc -w",
26
26
  "dev:base": "node ./dist/index.js",
27
27
  "dev:bin": "node ./dist/bin.js generate --root ~/repos/uranio/builder",
28
- "dev:bin:verbose": "node ./dist/bin.js generate -v --root ~/repos/uranio/builder",
28
+ "dev:bin:verbose": "node ./dist/bin.js generate -v -d mysql --root ~/repos/uranio/builder",
29
29
  "dev:bin:version": "node ./dist/bin.js --root ~/repos/uranio/builder",
30
30
  "dev:run": "yarn tsc-watch --onSuccess \"yarn dev:bin\"",
31
31
  "dev:run:verbose": "yarn tsc-watch --onSuccess \"yarn dev:bin:verbose\"",
@@ -50,7 +50,7 @@
50
50
  "lint-staged": "^13.2.1",
51
51
  "prettier": "2.8.7",
52
52
  "tsc-watch": "^6.0.0",
53
- "typescript": "^5.2.2"
53
+ "typescript": "^5.3.3"
54
54
  },
55
55
  "dependencies": {
56
56
  "app-root-path": "^3.1.0",
package/src/cli/generate/index.ts CHANGED
@@ -76,8 +76,8 @@ function _resolve_param_database(args: t.Arguments): t.Database {
76
76
  function _assert_database(db: unknown): asserts db is t.Database {
77
77
  if (!Object.values(t.DATABASE).includes(db as any)) {
78
78
  throw new exception.UranioCLIException(
79
- `Invalid database flag value. Possible value are`
80
- + ` [${Object.values(t.DATABASE)}]. Evaluating '${db}'`
79
+ `Invalid database flag value. Possible value are` +
80
+ ` [${Object.values(t.DATABASE)}]. Evaluating '${db}'`
81
81
  );
82
82
  }
83
83
  }
@@ -95,7 +95,7 @@ async function _copy_dot_uranio(params: GenerateParams) {
95
95
 
96
96
  async function _update_dot_uranio(params: GenerateParams) {
97
97
  log.spinner.text(`Updating dot uranio files...`);
98
- const dot_uranio_src_path = `${params.root}/node_modules/.uranio/src`;
98
+ const dot_uranio_src_path = `${params.root}/node_modules/.uranio/src`;
99
99
  const uranio_extended_interfaces = _get_uranio_extended_interfaces(params);
100
100
 
101
101
  log.trace(`Generating client...`);
@@ -104,7 +104,7 @@ async function _update_dot_uranio(params: GenerateParams) {
104
104
  ? _generate_mysql_uranio_client_module_text(uranio_extended_interfaces)
105
105
  : _generate_mongodb_uranio_client_module_text(uranio_extended_interfaces);
106
106
 
107
- const uranio_client_path = `${dot_uranio_src_path}/client.ts`
107
+ const uranio_client_path = `${dot_uranio_src_path}/client.ts`;
108
108
  fs.writeFileSync(uranio_client_path, client_text);
109
109
  log.debug(`Generated client`);
110
110
 
@@ -181,7 +181,7 @@ function _get_uranio_extended_interfaces(params: GenerateParams) {
181
181
  return uranio_extended_interfaces;
182
182
  }
183
183
 
184
- function _generate_mongodb_uranio_types_module_text(){
184
+ function _generate_mongodb_uranio_types_module_text() {
185
185
  let text = '';
186
186
  text += `/**\n`;
187
187
  text += ` *\n`;
@@ -198,10 +198,9 @@ function _generate_mongodb_uranio_types_module_text(){
198
198
  text += `export {atom, primary};\n`;
199
199
  text += `\n`;
200
200
  return text;
201
-
202
201
  }
203
202
 
204
- function _generate_mysql_uranio_types_module_text(){
203
+ function _generate_mysql_uranio_types_module_text() {
205
204
  let text = '';
206
205
  text += `/**\n`;
207
206
  text += ` *\n`;
@@ -218,7 +217,7 @@ function _generate_mysql_uranio_types_module_text(){
218
217
  return text;
219
218
  }
220
219
 
221
- function _generate_mongodb_uranio_index_module_text(){
220
+ function _generate_mongodb_uranio_index_module_text() {
222
221
  let text = '';
223
222
  text += `/**\n`;
224
223
  text += ` *\n`;
@@ -236,7 +235,7 @@ function _generate_mongodb_uranio_index_module_text(){
236
235
  return text;
237
236
  }
238
237
 
239
- function _generate_mysql_uranio_index_module_text(){
238
+ function _generate_mysql_uranio_index_module_text() {
240
239
  let text = '';
241
240
  text += `/**\n`;
242
241
  text += ` *\n`;
@@ -290,7 +289,7 @@ function _generate_mysql_uranio_client_module_text(
290
289
  text += `\n`;
291
290
  text += `import {MySQLClient, MySQLClientParams} from './client/mysql';\n`;
292
291
  text += `import {MySQLAtomClient} from './atom/mysql';\n`;
293
- text += `import {mysql_atom} './types/atom';\n`;
292
+ text += `import {mysql_atom} from './types/atom';\n`;
294
293
  text += `\n`;
295
294
  text += _generate_mysql_interface_definitions(interfaces);
296
295
  text += _generate_mysql_client(interfaces);
@@ -354,6 +353,20 @@ function _generate_mysql_interface_definitions(
354
353
  continue;
355
354
  }
356
355
  for (const [prop_name, prop] of Object.entries(inter.properties)) {
356
+ // if (prop.primitive === 'object' && prop.properties?.['___uranio']) {
357
+ // if (prop.properties['___uranio'].original === "__uranio: 'primary';") {
358
+ // const original = prop.original;
359
+ // const match = original.match(/<([^>]+)>/);
360
+ // if (match && match[1]) {
361
+ // text += ` ${prop_name}: ${match[1]};\n`;
362
+ // continue;
363
+ // }
364
+ // throw new exception.UranioCLIException(
365
+ // `Cannot resolve uranio.primary for attribute ${prop_name}`
366
+ // );
367
+ // }
368
+ // continue;
369
+ // }
357
370
  text += ` ${prop_name}: ${prop.primitive};\n`;
358
371
  }
359
372
  text += `}\n`;
package/src/main.ts CHANGED
@@ -6,3 +6,10 @@
6
6
  */
7
7
 
8
8
  export * from '.uranio';
9
+
10
+ /**
11
+ * Type used to define an Atom, if they are defined in .uranio libs istead of
12
+ * directly in uranio, plutonio cannot infer them correctly. Therefor they are
13
+ * re-defined here
14
+ */
15
+ // export type primary<T> = T & {__uranio: 'primary'};