sedentary-pg 0.0.19 → 0.0.21

package/index.d.ts

@@ -1,9 +1,9 @@
-import { EntryBase, ForeignKeyOptions, Natural, SedentaryOptions, Sedentary, Type } from "sedentary";
+import { EntryBase, ForeignKeyOptions, Natural, Sedentary, SedentaryOptions, Type } from "sedentary";
+import { Attribute } from "sedentary/lib/db";
 import { PoolConfig } from "pg";
-export { AttributeDefinition, AttributeOptions, AttributesDefinition, EntryBase, ForeignKeyActions, ForeignKeyOptions } from "sedentary";
-export { IndexAttributes, IndexDefinition, IndexOptions, IndexesDefinition, ModelOptions, Natural, SedentaryOptions, Type, TypeDefinition } from "sedentary";
+export { EntryBase, SedentaryOptions, Type } from "sedentary";
 export declare class SedentaryPG extends Sedentary {
     constructor(connection: PoolConfig, options?: SedentaryOptions);
-    FKEY<N extends Natural, E extends EntryBase>(attribute: Type<N, E>, options?: ForeignKeyOptions): Type<N, E>;
+    FKEY<N extends Natural, E extends EntryBase>(attribute: Attribute<N, E>, options?: ForeignKeyOptions): Type<N, E>;
 }
 export declare const Package: typeof SedentaryPG;

package/index.js

@@ -5,8 +5,7 @@ const sedentary_1 = require("sedentary");
 const pgdb_1 = require("./lib/pgdb");
 var sedentary_2 = require("sedentary");
 Object.defineProperty(exports, "EntryBase", { enumerable: true, get: function () { return sedentary_2.EntryBase; } });
-var sedentary_3 = require("sedentary");
-Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return sedentary_3.Type; } });
+Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return sedentary_2.Type; } });
 class SedentaryPG extends sedentary_1.Sedentary {
     constructor(connection, options) {
         super("", options);

package/lib/pgdb.js

@@ -25,7 +25,10 @@ const actions = { cascade: "c", "no action": "a", restrict: "r", "set default":
 class PGDB extends db_1.DB {
     constructor(connection, log) {
         super(log);
+        this.client = {};
+        this.indexes = [];
         this.pool = new pg_1.Pool(connection);
+        this.version = 0;
     }
     async connect() {
         this.client = await this.pool.connect();
@@ -255,9 +258,9 @@ class PGDB extends db_1.DB {
                     await this.client.query(`SELECT currval('${table.tableName}_id_seq')`);
                 }
                 catch (e) {
-                    if (e.code === "55000")
+                    if (e instanceof pg_1.DatabaseError && e.code === "55000")
                         return;
-                    if (e.code === "42P01") {
+                    if (e instanceof pg_1.DatabaseError && e.code === "42P01") {
                         const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
                         this.syncLog(statement);
                         if (this.sync)
@@ -269,11 +272,11 @@ class PGDB extends db_1.DB {
                 }
             })();
         }
-        let create;
+        let create = false;
         const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
         if (resTable.rowCount) {
             table.oid = resTable.rows[0].oid;
-            let drop;
+            let drop = false;
             const resParent = await this.client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
             if (resParent.rowCount) {
                 if (!table.parent)

package/lib/pgdb.ts

@@ -1,6 +1,6 @@
-import { Pool, PoolClient, PoolConfig } from "pg";
+import { DatabaseError, Pool, PoolClient, PoolConfig } from "pg";
 import format from "pg-format";
-import { Attribute, DB, Index, Natural, ForeignKeyActions, Table } from "sedentary/lib/db";
+import { Attribute, DB, ForeignKeyActions, Index, Natural, Table } from "sedentary/lib/db";
 import { adsrc } from "./adsrc";
 
 const needDrop = [
@@ -28,7 +28,10 @@ export class PGDB extends DB {
   constructor(connection: PoolConfig, log: (message: string) => void) {
     super(log);
 
+    this.client = {} as PoolClient;
+    this.indexes = [];
     this.pool = new Pool(connection);
+    this.version = 0;
   }
 
   async connect(): Promise<void> {
@@ -50,7 +53,7 @@ export class PGDB extends DB {
       if(arr.length === 0) drop = true;
       else if(row.contype === "u") indexes.push(row.conindid);
       else {
-        const { options } = arr[0].attribute.foreignKey;
+        const { options } = arr[0].attribute.foreignKey as { attributeName: string; fieldName: string; options: { onDelete: ForeignKeyActions; onUpdate: ForeignKeyActions }; tableName: string };
 
         if(actions[options.onDelete] !== row.confdeltype || actions[options.onUpdate] !== row.confupdtype) drop = true;
       }
@@ -139,7 +142,7 @@ export class PGDB extends DB {
   }
 
   async syncDataBase(): Promise<void> {
-    let err: Error;
+    let err: unknown;
 
     try {
       await super.syncDataBase();
@@ -164,7 +167,12 @@ export class PGDB extends DB {
         let query: string;
 
         if(type === "f") {
-          const { fieldName, options, tableName } = attribute.foreignKey;
+          const { fieldName, options, tableName } = attribute.foreignKey as {
+            attributeName: string;
+            fieldName: string;
+            options: { onDelete: ForeignKeyActions; onUpdate: ForeignKeyActions };
+            tableName: string;
+          };
           const onDelete = options.onDelete !== "no action" ? ` ON DELETE ${options.onDelete.toUpperCase()}` : "";
           const onUpdate = options.onUpdate !== "no action" ? ` ON UPDATE ${options.onUpdate.toUpperCase()}` : "";
 
@@ -240,7 +248,7 @@ export class PGDB extends DB {
       } else {
         const { adsrc, attnotnull, atttypmod, typname } = res.rows[0];
 
-        if(types[typname] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
+        if(types[typname as keyof typeof types] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
           if(needDrop.filter(([type, name]) => attribute.type === type && typname === name).length) {
             await this.dropField(tableName, fieldName);
             await addField();
@@ -293,8 +301,8 @@ export class PGDB extends DB {
         try {
           await this.client.query(`SELECT currval('${table.tableName}_id_seq')`);
         } catch(e) {
-          if(e.code === "55000") return;
-          if(e.code === "42P01") {
+          if(e instanceof DatabaseError && e.code === "55000") return;
+          if(e instanceof DatabaseError && e.code === "42P01") {
             const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
 
             this.syncLog(statement);
@@ -309,13 +317,13 @@ export class PGDB extends DB {
       })();
     }
 
-    let create: boolean;
+    let create = false;
     const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
 
     if(resTable.rowCount) {
       table.oid = resTable.rows[0].oid;
 
-      let drop: boolean;
+      let drop = false;
       const resParent = await this.client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
 
       if(resParent.rowCount) {

package/package.json

@@ -2,19 +2,19 @@
   "author": "Daniele Ricci <daniele.icc@gmail.com> (https://github.com/iccicci)",
   "bugs": "https://github.com/iccicci/sedentary-pg/issues",
   "dependencies": {
-    "@types/pg": "8.6.2",
-    "@types/pg-format": "1.0.2",
     "pg": "8.7.1",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.19"
+    "sedentary": "0.0.21"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
     "@types/mocha": "9.0.0",
-    "@types/node": "17.0.0",
+    "@types/node": "17.0.5",
+    "@types/pg": "8.6.3",
+    "@types/pg-format": "1.0.2",
     "@types/yamljs": "0.2.31",
-    "@typescript-eslint/eslint-plugin": "5.7.0",
-    "@typescript-eslint/parser": "5.7.0",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
+    "@typescript-eslint/parser": "5.8.1",
     "eslint": "8.5.0",
     "mocha": "9.1.3",
     "nyc": "15.1.0",
@@ -64,9 +64,21 @@
   },
   "tsd": {
     "compilerOptions": {
-      "strict": false
+      "alwaysStrict": true,
+      "declaration": true,
+      "esModuleInterop": true,
+      "module": "commonjs",
+      "noImplicitAny": true,
+      "noImplicitReturns": true,
+      "noImplicitThis": true,
+      "strict": true,
+      "strictBindCallApply": true,
+      "strictFunctionTypes": true,
+      "strictNullChecks": true,
+      "strictPropertyInitialization": true,
+      "target": "es2017"
     }
   },
   "types": "index.d.ts",
-  "version": "0.0.19"
+  "version": "0.0.21"
 }