uranio 0.1.26 → 0.1.28

package/.uranio/package.json

@@ -28,6 +28,6 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "uranio": "0.1.26"
+    "uranio": "0.1.28"
   }
 }

package/.uranio/src/atom/mongodb.ts

@@ -6,11 +6,10 @@
 
 import mongodb, {ObjectId} from 'mongodb';
 
-import * as t from '../types/index';
-
-// export class MongoDBAtomClient<S extends atom> implements AtomClient<S> {
-export class MongoDBAtomClient<S extends t.mongodb_atom> {
+import * as atom_types from '../types/atom';
+import * as where_types from '../types/where';
 
+export class MongoDBAtomClient<S extends atom_types.mongodb_atom> {
   public collection: mongodb.Collection<S>;
 
   constructor(
@@ -20,7 +19,7 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     this.collection = this.db.collection<S>(name);
   }
 
-  public async get_atom(where: t.Where<S>): Promise<S | null> {
+  public async get_atom(where: where_types.Where<S>): Promise<S | null> {
     where = _instance_object_id(where);
     let item = await this.collection.findOne<S>(where as mongodb.Filter<S>);
     if (!item) {
@@ -30,7 +29,7 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     return item;
   }
 
-  public async get_atoms(where: t.Where<S>): Promise<S[]> {
+  public async get_atoms(where: where_types.Where<S>): Promise<S[]> {
     where = _instance_object_id(where);
     let items = await this.collection
       .find<S>(where as mongodb.Filter<S>)
@@ -41,7 +40,9 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     return items;
   }
 
-  public async put_atom(shape: t.Shape<S>): Promise<mongodb.InsertOneResult> {
+  public async put_atom(
+    shape: atom_types.Shape<S>
+  ): Promise<mongodb.InsertOneResult> {
     shape = _remove_id(shape as Partial<S>);
     const respone_insert = await this.collection.insertOne(
       shape as mongodb.OptionalUnlessRequiredId<S>
@@ -49,7 +50,9 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     return respone_insert;
   }
 
-  public async put_atoms(atoms: t.Shape<S>[]): Promise<mongodb.InsertManyResult> {
+  public async put_atoms(
+    atoms: atom_types.Shape<S>[]
+  ): Promise<mongodb.InsertManyResult> {
     const atoms_no_ids: mongodb.OptionalUnlessRequiredId<S>[] = [];
     for (const atom of atoms) {
       const atom_no_id = _remove_id(
@@ -62,7 +65,7 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
   }
 
   public async update_atom(
-    where: t.Where<S>,
+    where: where_types.Where<S>,
     atom: Partial<S>
   ): Promise<mongodb.UpdateResult> {
     where = _instance_object_id(where);
@@ -75,7 +78,7 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
   }
 
   public async update_atoms(
-    where: t.Where<S>,
+    where: where_types.Where<S>,
     atom: Partial<S>
   ): Promise<mongodb.UpdateResult> {
     where = _instance_object_id(where);
@@ -87,7 +90,9 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     return response_update;
   }
 
-  public async delete_atom(where: t.Where<S>): Promise<mongodb.DeleteResult> {
+  public async delete_atom(
+    where: where_types.Where<S>
+  ): Promise<mongodb.DeleteResult> {
     where = _instance_object_id(where);
     const response_delete = await this.collection.deleteOne(
       where as mongodb.Filter<S>
@@ -95,7 +100,9 @@ export class MongoDBAtomClient<S extends t.mongodb_atom> {
     return response_delete;
   }
 
-  public async delete_atoms(where: t.Where<S>): Promise<mongodb.DeleteResult> {
+  public async delete_atoms(
+    where: where_types.Where<S>
+  ): Promise<mongodb.DeleteResult> {
     where = _instance_object_id(where);
     const response_delete = await this.collection.deleteMany(
       where as mongodb.Filter<S>
@@ -118,12 +125,16 @@ function _string_id<T extends unknown>(item: T): StringId<T> {
   return item as StringId<T>;
 }
 
-function _remove_id<A extends t.mongodb_atom>(atom: Partial<A>): t.Shape<A> {
+function _remove_id<A extends atom_types.mongodb_atom>(
+  atom: Partial<A>
+): atom_types.Shape<A> {
   delete (atom as any)._id;
-  return atom as t.Shape<A>;
+  return atom as atom_types.Shape<A>;
 }
 
-function _instance_object_id<A extends t.mongodb_atom>(where: t.Where<A>): t.Where<A> {
+function _instance_object_id<A extends atom_types.mongodb_atom>(
+  where: where_types.Where<A>
+): where_types.Where<A> {
   for (let [key, value] of Object.entries(where)) {
     if (key === '_id' && typeof value === 'string') {
       where['_id'] = new ObjectId(value) as any;

package/.uranio/src/atom/mysql.ts

@@ -4,25 +4,22 @@
  *
  */
 
-// import mysql from 'mysql2/promise';
-
-// import {log} from './log/index';
 
 import {MySQLClient} from '../client/mysql';
-
 import * as sql from '../sql/index';
-import * as t from '../types/index';
 
-// export class MySQLAtomClient<S extends t.atom> implements t.AtomClient<S> {
+import * as atom_types from '../types/atom';
+import * as where_types from '../types/where';
+import * as sql_types from '../types/sql';
 
-export class MySQLAtomClient<S extends t.mysql_atom> {
+export class MySQLAtomClient<S extends atom_types.mysql_atom> {
 
   constructor(
     public client: MySQLClient,
     public name: string
   ) {}
 
-  public async get_atom(where: t.Where<S>): Promise<S | null> {
+  public async get_atom(where: where_types.Where<S>): Promise<S | null> {
     const {query, map} = sql.param.compose_select({
       table: this.name,
       where,
@@ -40,8 +37,8 @@ export class MySQLAtomClient<S extends t.mysql_atom> {
     order,
     limit,
   }: {
-    where?: t.Where<S>;
-    order?: t.OrderBy;
+    where?: where_types.Where<S>;
+    order?: sql_types.OrderBy;
     limit?: string;
   }): Promise<S[]> {
     const {query, map} = sql.param.compose_select({
@@ -90,7 +87,7 @@ export class MySQLAtomClient<S extends t.mysql_atom> {
 
   public async update_atoms(
     atom: Partial<S>,
-    where?: t.Where<S>,
+    where?: where_types.Where<S>,
   ): Promise<any> {
     const {query, map} = sql.param.compose_update({
       table: this.name,
@@ -101,7 +98,7 @@ export class MySQLAtomClient<S extends t.mysql_atom> {
     return response;
   }
 
-  public async delete_atoms(where: t.Where<S>): Promise<any> {
+  public async delete_atoms(where: where_types.Where<S>): Promise<any> {
     const {query, map} = sql.param.compose_delete({
       table: this.name,
       where,

package/.uranio/src/sql/full_query.ts

@@ -1,14 +1,16 @@
 /**
  *
- * JS Object to SQL expanded query converter module
+ * JS Object to sql_types expanded query converter module
  *
  * @packageDocumentation
  *
  */
 
-import * as t from '../types/index';
+import * as atom_types from '../types/atom';
+import * as where_types from '../types/where';
+import * as sql_types from '../types/sql';
 
-export function compose_select<S extends t.atom>({
+export function compose_select<S extends atom_types.atom>({
   projection = ['*'],
   table,
   where,
@@ -17,8 +19,8 @@ export function compose_select<S extends t.atom>({
 }: {
   projection?: string[];
   table: string;
-  where?: t.Where<S>;
-  order?: t.OrderBy;
+  where?: where_types.Where<S>;
+  order?: sql_types.OrderBy;
   limit?: string;
 }) {
   let query_string = 'SELECT';
@@ -32,14 +34,14 @@ export function compose_select<S extends t.atom>({
   return query_string;
 }
 
-export function compose_update<S extends t.atom>({
+export function compose_update<S extends atom_types.atom>({
   table,
   update,
   where,
 }: {
   table: string;
   update: Partial<S>;
-  where?: t.Where<S>;
+  where?: where_types.Where<S>;
 }) {
   let query_string = 'UPDATE';
   query_string += ` \`${table}\``;
@@ -49,12 +51,12 @@ export function compose_update<S extends t.atom>({
   return query_string;
 }
 
-export function compose_delete<S extends t.atom>({
+export function compose_delete<S extends atom_types.atom>({
   table,
   where,
 }: {
   table: string;
-  where?: t.Where<S>;
+  where?: where_types.Where<S>;
 }) {
   let query_string = 'DELETE';
   query_string += ` FROM \`${table}\``;
@@ -62,7 +64,7 @@ export function compose_delete<S extends t.atom>({
   return query_string;
 }
 
-export function compose_insert<S extends t.atom>({
+export function compose_insert<S extends atom_types.atom>({
   table,
   columns,
   records,
@@ -78,7 +80,7 @@ export function compose_insert<S extends t.atom>({
   return query_string;
 }
 
-function _resolve_where<S extends t.atom>(where?: t.Where<S>): string {
+function _resolve_where<S extends atom_types.atom>(where?: where_types.Where<S>): string {
   if (
     !where ||
     typeof where !== 'object' ||
@@ -87,14 +89,14 @@ function _resolve_where<S extends t.atom>(where?: t.Where<S>): string {
     return '';
   }
   const where_parts: string[] = [];
-  // console.log(`t.Where param: ${JSON.stringify(where)}`);
+  // console.log(`where_types.Where param: ${JSON.stringify(where)}`);
   for (const [key, value] of Object.entries(where)) {
     // console.log(`Key: ${key}, Value: ${JSON.stringify(value)}`);
-    if (t.root_operators.includes(key as t.RootOperator)) {
+    if (sql_types.root_operators.includes(key as sql_types.RootOperator)) {
       // console.log(`Key is in root operators`);
       if (!Array.isArray(value)) {
         throw new Error(
-          `Invalid t.Where. Root operator '${key}' must have an Array as value`
+          `Invalid Where. Root operator '${key}' must have an Array as value`
         );
       }
       const queries = value.map((el) => _resolve_where(el));
@@ -119,7 +121,7 @@ function _resolve_where<S extends t.atom>(where?: t.Where<S>): string {
           throw new Error(`Invalid root operator`);
         }
       }
-      // console.log(`t.Where parts: ${where_parts}`);
+      // console.log(`where_types.Where parts: ${where_parts}`);
       const final_where = where_parts.join(` AND `);
       return final_where;
     }
@@ -140,7 +142,7 @@ function _resolve_where<S extends t.atom>(where?: t.Where<S>): string {
         throw new Error(`Cannot compare to empty object value`);
       }
       let query_string = '';
-      query_string += '' + _resolve_filter(key, value as t.Operator);
+      query_string += '' + _resolve_filter(key, value as sql_types.Operator);
       where_parts.push(query_string);
       continue;
     }
@@ -152,11 +154,11 @@ function _resolve_where<S extends t.atom>(where?: t.Where<S>): string {
   return final_where;
 }
 
-function _resolve_columns<S extends t.atom>(columns: (keyof S)[]): string {
+function _resolve_columns<S extends atom_types.atom>(columns: (keyof S)[]): string {
   return ' (' + columns.map((el) => '`' + String(el) + '`').join(', ') + ')';
 }
 
-function _resolve_records<S extends t.atom>(
+function _resolve_records<S extends atom_types.atom>(
   columns: (keyof S)[],
   records: Partial<S>[]
 ): string {
@@ -173,7 +175,7 @@ function _resolve_records<S extends t.atom>(
   return ` VALUES ${full_records}`;
 }
 
-function _resolve_update<S extends t.atom>(update: Partial<S>): string {
+function _resolve_update<S extends atom_types.atom>(update: Partial<S>): string {
   const update_parts: string[] = [];
   for (const [key, value] of Object.entries(update)) {
     update_parts.push(`${key} = ${_format_value(value)}`);
@@ -181,7 +183,7 @@ function _resolve_update<S extends t.atom>(update: Partial<S>): string {
   return ' ' + update_parts.join(', ');
 }
 
-function _resolve_order(order?: t.OrderBy): string {
+function _resolve_order(order?: sql_types.OrderBy): string {
   if (
     !order ||
     typeof order !== 'object' ||
@@ -213,7 +215,7 @@ function _resolve_limit(limit?: string): string {
   return ` LIMIT ${limit}`;
 }
 
-function _resolve_filter(column: string, operator: t.Operator) {
+function _resolve_filter(column: string, operator: sql_types.Operator) {
   let filter_strings: string[] = [];
   for (let [key, value] of Object.entries(operator)) {
     switch (key) {
@@ -324,5 +326,5 @@ function _format_value(value: unknown): string {
 //   if (sql_type.includes(type as SQLType)) {
 //     return;
 //   }
-//   throw new Error(`Invalid SQL type`);
+//   throw new Error(`Invalid sql_types type`);
 // }

package/.uranio/src/sql/param_query.ts

@@ -8,11 +8,13 @@
 
 // import crypto from 'crypto';
 
-import * as t from '../types/index';
-
 import * as full from './full_query';
 
-export function compose_select<S extends t.atom>({
+import * as atom_types from '../types/atom';
+import * as where_types from '../types/where';
+import * as sql_types from '../types/sql';
+
+export function compose_select<S extends atom_types.atom>({
   projection = ['*'],
   table,
   where,
@@ -21,8 +23,8 @@ export function compose_select<S extends t.atom>({
 }: {
   projection?: string[];
   table: string;
-  where?: t.Where<S>;
-  order?: t.OrderBy;
+  where?: where_types.Where<S>;
+  order?: sql_types.OrderBy;
   limit?: string;
 }) {
   // console.log(projection, table, JSON.stringify(where), order, limit);
@@ -39,14 +41,14 @@ export function compose_select<S extends t.atom>({
   return {query: param_query, map};
 }
 
-export function compose_update<S extends t.atom>({
+export function compose_update<S extends atom_types.atom>({
   table,
   update,
   where,
 }: {
   table: string;
   update: Partial<S>;
-  where?: t.Where<S>;
+  where?: where_types.Where<S>;
 }) {
   const full_query = full.compose_update({
     table,
@@ -63,12 +65,12 @@ export function compose_update<S extends t.atom>({
   return {query: param_query, map};
 }
 
-export function compose_delete<S extends t.atom>({
+export function compose_delete<S extends atom_types.atom>({
   table,
   where,
 }: {
   table: string;
-  where?: t.Where<S>;
+  where?: where_types.Where<S>;
 }) {
   const full_query = full.compose_delete({
     table,
@@ -80,7 +82,7 @@ export function compose_delete<S extends t.atom>({
   return {query: param_query, map};
 }
 
-export function compose_insert<S extends t.atom>({
+export function compose_insert<S extends atom_types.atom>({
   table,
   columns,
   records,
@@ -115,7 +117,7 @@ function _generate_unique_consecutive_id():string{
 //   return 'x' + digested.substring(0, 3) + _generate_random_string(4);
 // }
 
-function _generate_value_map_from_update<S extends t.atom>(
+function _generate_value_map_from_update<S extends atom_types.atom>(
   update: Partial<S>
 ): Map<string, any> {
   const value_map = new Map<string, any>();
@@ -126,8 +128,8 @@ function _generate_value_map_from_update<S extends t.atom>(
   return value_map;
 }
 
-function _generate_value_map_from_query<S extends t.atom>(
-  where?: t.Where<S>
+function _generate_value_map_from_query<S extends atom_types.atom>(
+  where?: where_types.Where<S>
 ): Map<string, any> {
   const value_map = new Map<string, any>();
   if (!where) {
@@ -135,7 +137,7 @@ function _generate_value_map_from_query<S extends t.atom>(
   }
   for (const [key, value] of Object.entries(where)) {
     // key is a root operator: $and, $or, ...
-    if (t.root_operators.includes(key as t.RootOperator)) {
+    if (sql_types.root_operators.includes(key as sql_types.RootOperator)) {
       // console.log(`Key is in Root Operator: [${key}]`);
       if (!Array.isArray(value)) {
         throw new Error(
@@ -164,7 +166,7 @@ function _generate_value_map_from_query<S extends t.atom>(
       }
       const filter_map = _generate_map_from_filter(
         // key,
-        value as Record<t.FilterOperator, string>
+        value as Record<sql_types.FilterOperator, string>
       );
       for (const [_k, v] of filter_map) {
         const id = _generate_unique_consecutive_id();
@@ -181,7 +183,7 @@ function _generate_value_map_from_query<S extends t.atom>(
 
 function _generate_map_from_filter(
   // key: string,
-  filter: Record<t.FilterOperator, string>
+  filter: Record<sql_types.FilterOperator, string>
 ): Map<string, any> {
   const filter_map = new Map<string, any>();
   for (const [_operator, v] of Object.entries(filter)) {

package/.uranio/src/types/atom.ts

@@ -6,6 +6,26 @@
  *
  */
 
+export interface atom {}
+
+export type unique<T> = T & {__uranio: 'unique'};
+
+export type primary<T> = T & {__uranio: 'primary'};
+
+export interface mysql_atom extends atom {}
+
+export interface mongodb_atom extends atom {
+  _id: primary<string>;
+}
+
+type PrimaryAttribute<A extends atom> = {
+  [K in keyof A]: A[K] extends {__uranio: 'primary'} ? K : never;
+}[keyof A];
+
+export type Shape<A extends atom> = Omit<A, PrimaryAttribute<A>>;
+
+// export type Shape<A extends atom> = Omit<A, '_id'>;
+
 // import {atom, Where, Shape, OrderBy} from './index';
 
 // export interface AtomClient<S extends atom> {

package/.uranio/src/types/index.ts

@@ -6,28 +6,6 @@
  *
  */
 
-export * from './where';
-
-// export * from './atom';
-
-export * from './sql';
-
-export interface atom {}
-
-export interface mysql_atom extends atom {}
-
-export interface mongodb_atom extends atom {
-  _id: primary<string>;
-}
-
-export type unique<T> = T & {__uranio: 'unique'};
-
-// export type Shape<A extends atom> = Omit<A, '_id'>;
-
-export type primary<T> = T & {__uranio: 'primary'};
-
-type PrimaryAttribute<A extends atom> = {
-  [K in keyof A]: A[K] extends {__uranio: 'primary'} ? K : never;
-}[keyof A];
-
-export type Shape<A extends atom> = Omit<A, PrimaryAttribute<A>>;
+import {mysql_atom as atom} from './atom';
+import {primary} from './atom';
+export {atom, primary};

package/dist/cli/generate/index.js

@@ -311,6 +311,7 @@ function _generate_mongodb_client_initialization(interfaces) {
     let text = '';
     for (const [name, _inter] of Object.entries(interfaces)) {
         let lc = _first_letter_lowercase(name);
+        // Different from MySQL since it pass `this.db` instead of `this`
         text += `    this.${lc} = new MongoDBAtomClient<${name}>(this.db, '${lc}');\n`;
     }
     return text;
@@ -327,7 +328,8 @@ function _generate_mysql_client_initialization(interfaces) {
     let text = '';
     for (const [name, _inter] of Object.entries(interfaces)) {
         let lc = _first_letter_lowercase(name);
-        text += `    this.${lc} = new MySQLAtomClient<${name}>(this.db, '${lc}');\n`;
+        // Different from Mongo since it pass `this` instead of `this.db`
+        text += `    this.${lc} = new MySQLAtomClient<${name}>(this, '${lc}');\n`;
     }
     return text;
 }

package/dist/cli/generate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/generate/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/generate/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uranio",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Uranio is a type-safe ODM for MongoDB",
   "main": "dist/index.js",
   "repository": {

package/src/cli/generate/index.ts

@@ -95,6 +95,7 @@ async function _copy_dot_uranio(params: GenerateParams) {
 
 async function _update_dot_uranio(params: GenerateParams) {
   log.spinner.text(`Updating dot uranio files...`);
+  const dot_uranio_src_path = `${params.root}/node_modules/.uranio/src`; 
   const uranio_extended_interfaces = _get_uranio_extended_interfaces(params);
 
   log.trace(`Generating client...`);
@@ -103,7 +104,7 @@ async function _update_dot_uranio(params: GenerateParams) {
       ? _generate_mysql_uranio_client_module_text(uranio_extended_interfaces)
       : _generate_mongodb_uranio_client_module_text(uranio_extended_interfaces);
 
-  const uranio_client_path = `${params.root}/node_modules/.uranio/src/client.ts`;
+  const uranio_client_path = `${dot_uranio_src_path}/client.ts`
   fs.writeFileSync(uranio_client_path, client_text);
   log.debug(`Generated client`);
 
@@ -113,10 +114,20 @@ async function _update_dot_uranio(params: GenerateParams) {
       ? _generate_mysql_uranio_index_module_text()
       : _generate_mongodb_uranio_index_module_text();
 
-  const uranio_index_path = `${params.root}/node_modules/.uranio/src/index.ts`;
+  const uranio_index_path = `${dot_uranio_src_path}/index.ts`;
   fs.writeFileSync(uranio_index_path, index_text);
   log.debug(`Generated index`);
 
+  log.trace(`Generating types...`);
+  const types_text =
+    params.database === t.DATABASE.MYSQL
+      ? _generate_mysql_uranio_types_module_text()
+      : _generate_mongodb_uranio_types_module_text();
+
+  const uranio_types_path = `${dot_uranio_src_path}/types/index.ts`;
+  fs.writeFileSync(uranio_types_path, types_text);
+  log.debug(`Generated types`);
+
   log.debug(`Updated dot uranio files`);
 }
 
@@ -170,6 +181,43 @@ function _get_uranio_extended_interfaces(params: GenerateParams) {
   return uranio_extended_interfaces;
 }
 
+function _generate_mongodb_uranio_types_module_text(){
+  let text = '';
+  text += `/**\n`;
+  text += ` *\n`;
+  text += ` * [Auto-generated module by "uranio generate" command]\n`;
+  text += ` *\n`;
+  text += ` * Types index module\n`;
+  text += ` *\n`;
+  text += ` */\n`;
+  text += `\n`;
+  text += `export * from './types/index';\n`;
+  text += `\n`;
+  text += `import {mongodb as atom} from './atom';\n`;
+  text += `import {primary} from './atom';\n`;
+  text += `export {atom, primary};\n`;
+  text += `\n`;
+  return text;
+  
+}
+
+function _generate_mysql_uranio_types_module_text(){
+  let text = '';
+  text += `/**\n`;
+  text += ` *\n`;
+  text += ` * [Auto-generated module by "uranio generate" command]\n`;
+  text += ` *\n`;
+  text += ` * Types index module\n`;
+  text += ` *\n`;
+  text += ` */\n`;
+  text += `\n`;
+  text += `import {mysql_atom as atom} from './atom';\n`;
+  text += `import {primary} from './atom';\n`;
+  text += `export {atom, primary};\n`;
+  text += `\n`;
+  return text;
+}
+
 function _generate_mongodb_uranio_index_module_text(){
   let text = '';
   text += `/**\n`;
@@ -329,6 +377,7 @@ function _generate_mongodb_client_initialization(
   let text = '';
   for (const [name, _inter] of Object.entries(interfaces)) {
     let lc = _first_letter_lowercase(name);
+    // Different from MySQL since it pass `this.db` instead of `this`
     text += `    this.${lc} = new MongoDBAtomClient<${name}>(this.db, '${lc}');\n`;
   }
   return text;
@@ -349,7 +398,8 @@ function _generate_mysql_client_initialization(
   let text = '';
   for (const [name, _inter] of Object.entries(interfaces)) {
     let lc = _first_letter_lowercase(name);
-    text += `    this.${lc} = new MySQLAtomClient<${name}>(this.db, '${lc}');\n`;
+    // Different from Mongo since it pass `this` instead of `this.db`
+    text += `    this.${lc} = new MySQLAtomClient<${name}>(this, '${lc}');\n`;
   }
   return text;
 }