prostgles-server 2.0.57 → 2.0.61

package/lib/TableConfig.ts

@@ -25,13 +25,13 @@ type LookupTableDefinition<LANG_IDS> = {
     }
 }
 
-type BaseColumn = {
+type BaseColumn<LANG_IDS> = {
     /**
      * Will add these values to .getColumns() result
      */
     info?: ColExtraInfo;
 
-
+    label?: string | Partial<{ [lang_id in keyof LANG_IDS]: string; }>;
 }
 
 type SQLDefColumn = {
@@ -79,11 +79,11 @@ type NamedJoinColumn = {
     joinDef: JoinDef[];
 }
 
-type ColumnConfig = NamedJoinColumn | (BaseColumn & (SQLDefColumn | ReferencedColumn))
+type ColumnConfig<LANG_IDS= { en: 1 }> = NamedJoinColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn))
 
-type TableDefinition = {
+type TableDefinition<LANG_IDS> = {
     columns: {
-        [column_name: string]: ColumnConfig
+        [column_name: string]: ColumnConfig<LANG_IDS>
     },
     constraints?: {
         [constraint_name: string]: string
@@ -93,8 +93,8 @@ type TableDefinition = {
 /**
  * Helper utility to create lookup tables for TEXT columns
  */
-export type TableConfig<LANG_IDS = { en: 1, ro: 1 }> = {
-    [table_name: string]: BaseTableDefinition & (TableDefinition | LookupTableDefinition<LANG_IDS>);
+export type TableConfig<LANG_IDS = { en: 1 }> = {
+    [table_name: string]: BaseTableDefinition & (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.57",
+  "version": "2.0.61",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-10092
+19221

package/tests/server/index.js

@@ -60,6 +60,39 @@ const dbConnection = {
         }
     };
     log("created prostgles");
+    const tableConfig = {
+        tr2: {
+            columns: {
+                t1: { label: { fr: "fr_t1" } },
+                t2: { label: { en: "en_t2" } },
+            }
+        },
+        lookup_col1: {
+            dropIfExists: true,
+            isLookupTable: {
+                values: {
+                    a: {},
+                    b: {}
+                },
+            }
+        },
+        uuid_text: {
+            columns: {
+                col1: {
+                    references: {
+                        tableName: "lookup_col1",
+                        nullable: true,
+                    }
+                },
+                col2: {
+                    references: {
+                        tableName: "lookup_col1",
+                        nullable: true,
+                    }
+                }
+            }
+        }
+    };
     let prgl = await (0, prostgles_server_1.default)({
         dbConnection,
         sqlFilePath: path_1.default.join(__dirname + '/init.sql'),
@@ -69,33 +102,7 @@ const dbConnection = {
         transactions: true,
         // DEBUG_MODE: true,
         // onNotice: console.log,
-        tableConfig: {
-            lookup_col1: {
-                dropIfExists: true,
-                isLookupTable: {
-                    values: {
-                        a: {},
-                        b: {}
-                    },
-                }
-            },
-            uuid_text: {
-                columns: {
-                    col1: {
-                        references: {
-                            tableName: "lookup_col1",
-                            nullable: true,
-                        }
-                    },
-                    col2: {
-                        references: {
-                            tableName: "lookup_col1",
-                            nullable: true,
-                        }
-                    }
-                }
-            }
-        },
+        tableConfig,
         fileTable: {
             // awsS3Config: {
             //   accessKeyId: process.env.S3_KEY,
@@ -268,7 +275,6 @@ const dbConnection = {
             // 	}
             // };
         },
-        i18n,
         // joins: "inferred",
         joins: [
             {

package/tests/server/index.ts

@@ -18,6 +18,7 @@ import server_only_queries from "../server_only_queries";
 import { DBObj, I18N_DBO_CONFIG } from "./DBoGenerated";
 // type DBObj = any;
 import { DB, DbHandler } from 'prostgles-server/dist/Prostgles';
+import { TableConfig } from '../../dist/TableConfig';
 
 const log = (msg: string, extra?: any, trace?: boolean) => {
 	const msgs = ["(server): " + msg, extra].filter(v => v);
@@ -75,6 +76,40 @@ const dbConnection = {
 	}
 
 	log("created prostgles")
+	const tableConfig: TableConfig<{ en: 1, fr: 1 }> = {
+
+		tr2: {
+			columns: {
+				t1: { label: { fr: "fr_t1" } },
+				t2: { label: { en: "en_t2" } },
+			}
+		},
+		lookup_col1: {
+			dropIfExists: true, 
+			isLookupTable: {
+				values: {
+					a: {},
+					b: {}
+				},
+			}
+		},
+		uuid_text: {
+			columns: {
+				col1: {
+					references: {
+						tableName: "lookup_col1",
+						nullable: true,
+					}
+				},
+				col2: {
+					references: {
+						tableName: "lookup_col1",
+						nullable: true,
+					}
+				}
+			}
+		}
+	}
 	let prgl = await prostgles({
 		dbConnection,
 		sqlFilePath: path.join(__dirname+'/init.sql'),
@@ -85,33 +120,7 @@ const dbConnection = {
 
 		// DEBUG_MODE: true,
 		// onNotice: console.log,
-		tableConfig: {
-			lookup_col1: {
-				dropIfExists: true, 
-				isLookupTable: {
-					values: {
-						a: {},
-						b: {}
-					},
-				}
-			},
-			uuid_text: {
-				columns: {
-					col1: {
-						references: {
-							tableName: "lookup_col1",
-							nullable: true,
-						}
-					},
-					col2: {
-						references: {
-							tableName: "lookup_col1",
-							nullable: true,
-						}
-					}
-				}
-			}
-		},
+		tableConfig,
 		fileTable: {
 			// awsS3Config: {
 			//   accessKeyId: process.env.S3_KEY,
@@ -289,7 +298,6 @@ const dbConnection = {
 			// 	}
 			// };
 		},
-		i18n,
 		// joins: "inferred",
 		joins: [
 			{ 

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.56",
+      "version": "2.0.60",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",