@deterministic-code/datasources 0.1.16 → 0.1.18

package/dist/Datasource.d.ts

@@ -17,6 +17,8 @@ export declare class Datasource implements IDatasource {
     readonly repositories: RepositoryFactory;
     constructor(provider: string, driver: IDriver, options?: DatasourceOptions | undefined);
     private defaultConnection;
+    close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
     createConnection: () => Promise<IConnection>;
     createCommand: (connection?: IConnection) => Promise<ICommand>;
     private applyCrud;

package/dist/Datasource.js

@@ -29,6 +29,12 @@ export class Datasource {
         });
     }
     defaultConnection = () => (this.connection ??= this.driver.connection(this.options));
+    close = async () => {
+        const connection = this.connection;
+        this.connection = undefined;
+        await connection?.close();
+    };
+    [Symbol.asyncDispose] = () => this.close();
     createConnection = () => Promise.resolve(this.defaultConnection());
     createCommand = async (connection) => {
         if (!connection) {

package/dist/IDatasource.d.ts

@@ -9,6 +9,8 @@ import type { RepositoryFactory } from "./RepositoryFactory.js";
 export interface IDatasource {
     readonly provider: string;
     readonly repositories: RepositoryFactory;
+    close(): Promise<void>;
+    [Symbol.asyncDispose](): Promise<void>;
     createConnection(): Promise<IConnection>;
     createCommand(connection?: IConnection): Promise<ICommand>;
     createRepository<T>(type: Constructable<T>, connection?: IConnection, options?: CRUDRepositoryOptions<T>): ICRUDRepository<T>;

package/dist/converters/DefaultValueConverter.js

@@ -1,6 +1,5 @@
 export const EMPTY_UUID = "00000000-0000-0000-0000-000000000000";
-const NUMERIC_LITERAL_TYPES = new Set([
-    "number",
+const NUMERIC_TYPES = [
     "integer",
     "unsignedinteger",
     "smallinteger",
@@ -9,8 +8,8 @@ const NUMERIC_LITERAL_TYPES = new Set([
     "unsignedbiginteger",
     "float",
     "decimal",
-    "reference",
-]);
+];
+const NUMERIC_LITERAL_TYPES = new Set([...NUMERIC_TYPES, "reference"]);
 const CALL_FORM = /^([A-Za-z]+)\('(.*)'\)$/;
 const quotedReverse = /^'(.*)'$/;
 const identity = (arg) => arg;
@@ -27,22 +26,10 @@ const token = (specToken, native, reverse) => ({
     native,
     reverse,
 });
-const NUMERIC_TYPES = [
-    "number",
-    "integer",
-    "unsignedinteger",
-    "smallinteger",
-    "unsignedsmallinteger",
-    "biginteger",
-    "unsignedbiginteger",
-    "float",
-    "decimal",
-];
 export class DefaultValueConverter {
     static spec = {
         string: { String: { spec: /^.*$/, specText: identity } },
         character: { String: { spec: /^.+$/, specText: identity } },
-        number: { Numeric: intLit },
         integer: { Numeric: intLit },
         unsignedinteger: { Numeric: uintLit },
         smallinteger: { Numeric: intLit },

package/dist/converters/DeterministicTypeConverter.js

@@ -23,11 +23,8 @@ export class DeterministicTypeConverter {
         this.#rules = rules;
         this.#reverse = new Map();
         for (const [specType, native] of Object.entries(dictionary)) {
-            const existing = this.#reverse.get(native);
-            if (existing === undefined)
-                this.#reverse.set(native, [specType]);
-            else
-                existing.push(specType);
+            if (!this.#reverse.has(native))
+                this.#reverse.set(native, specType);
         }
     }
     convert(from) {
@@ -63,12 +60,9 @@ export class DeterministicTypeConverter {
         return this.convert(field.type);
     }
     reverseConvert = (native) => {
-        const specTypes = this.#reverse.get(native);
-        if (specTypes === undefined)
+        const spec = this.#reverse.get(native);
+        if (spec === undefined)
             throw new Error(`Unknown native field type: ${native}`);
-        if (specTypes.length > 1) {
-            throw new Error(`Native field type ${native} maps to multiple spec types: ${specTypes.join(", ")}`);
-        }
-        return specTypes[0];
+        return spec;
     };
 }

package/dist/converters/RowTypeConverter.js

@@ -8,7 +8,7 @@ export class RowTypeConverter extends TypeConverter {
     static from(converters, columns) {
         const fields = {};
         for (const [name, type] of Object.entries(columns)) {
-            const converter = converters[type];
+            const converter = converters[type] ?? (type.endsWith("integer") ? converters.integer : undefined);
             if (converter)
                 fields[name] = converter;
         }

package/dist/mocks/mock-datasource.d.ts

@@ -15,6 +15,8 @@ export declare class MockDatasource implements IDatasource {
     repository?: ICRUDRepository;
     readonly repositories: RepositoryFactory;
     constructor(provider?: string);
+    close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
     createConnection(): Promise<IConnection>;
     createCommand(connection?: IConnection): Promise<ICommand>;
     createRepository<T>(type: Constructable<T>, connection?: IConnection): ICRUDRepository<T>;

package/dist/mocks/mock-datasource.js

@@ -16,6 +16,8 @@ export class MockDatasource {
         this.provider = provider;
         this.connection = new MockConnection();
     }
+    close = () => this.connection.close();
+    [Symbol.asyncDispose] = () => this.close();
     createConnection() {
         this.createConnectionCalls += 1;
         return Promise.resolve(this.connection);

package/dist/stubs/StubDatasource.d.ts

@@ -11,6 +11,8 @@ export declare class StubDatasource implements IDatasource {
     readonly repositories: RepositoryFactory;
     constructor(provider: string);
     private defaultConnection;
+    close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
     createConnection: () => Promise<IConnection>;
     createCommand: (connection?: IConnection) => Promise<ICommand>;
     createRepository<T>(type: Constructable<T>, connection?: IConnection): ICRUDRepository<T>;

package/dist/stubs/StubDatasource.js

@@ -11,6 +11,12 @@ export class StubDatasource {
         this.provider = provider;
     }
     defaultConnection = () => (this.connection ??= new StubConnection(this.provider));
+    close = async () => {
+        const connection = this.connection;
+        this.connection = undefined;
+        await connection?.close();
+    };
+    [Symbol.asyncDispose] = () => this.close();
     createConnection = () => Promise.resolve(this.defaultConnection());
     createCommand = async (connection) => {
         if (!connection) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",