@deterministic-code/datasources 0.1.6 → 0.1.11

package/dist/BatchCommandIBulkWriteStrategy.d.ts

@@ -27,6 +27,7 @@ export declare class BatchCommandIBulkWriteStrategy<T extends object> implements
     private statements;
     private get ids();
     private reverse;
+    private writable;
     private fields;
     private cell;
     private idsWhere;

package/dist/BatchCommandIBulkWriteStrategy.js

@@ -9,6 +9,7 @@ const empty = () => ({ result: null, rowsAffected: 0 });
 const budget = 8000;
 const maxRows = 250;
 const assigned = (value) => value !== null && value !== "" && value !== 0 && value !== 0n;
+const listed = (list, col, fallback) => list === undefined ? fallback : list.includes(col);
 const columnsOf = (rows) => {
     const seen = new Set();
     const columns = [];
@@ -83,12 +84,12 @@ export class BatchCommandIBulkWriteStrategy {
     };
     mappedInsert = (item) => {
         const record = this.reverse(item);
-        const statement = this.statements().insert(this.fields(record, (col) => !this.ids.includes(col) || assigned(record[col] ?? null)));
+        const statement = this.statements().insert(this.fields(record, (col) => listed(this.options.createProperties, col, !this.ids.includes(col) || assigned(record[col] ?? null))));
         return { table: statement.table, fields: statement.fields };
     };
     mappedUpdate = (item) => {
         const record = this.reverse(item);
-        const fields = this.fields(record, (col) => !this.ids.includes(col));
+        const fields = this.fields(record, (col) => listed(this.options.updateProperties, col, !this.ids.includes(col)));
         if (fields.length === 0)
             throw new DatasourceError("Update requires at least one non-Id field");
         const statement = this.statements().update(fields, this.idsWhere(record), (name, value) => this.cell(name, value, true));
@@ -101,7 +102,7 @@ export class BatchCommandIBulkWriteStrategy {
     };
     updateCommand = (item, byWhere) => {
         const record = this.reverse(item);
-        const fields = this.fields(record, (col) => !this.ids.includes(col));
+        const fields = this.fields(record, (col) => listed(this.options.updateProperties, col, !this.ids.includes(col)));
         if (fields.length === 0)
             throw new DatasourceError("Update requires at least one non-Id field");
         const statement = this.statements().update(fields, byWhere ?? this.idsWhere(record), (name, value) => this.cell(name, value, byWhere === undefined));
@@ -127,8 +128,15 @@ export class BatchCommandIBulkWriteStrategy {
         const row = objects.reverseConvert(item);
         return this.options.rowConverter ? this.options.rowConverter.reverseConvert(row) : row;
     };
+    writable = (key) => {
+        const columns = this.statements().readColumns;
+        const map = this.options.propertyMappings;
+        return (columns.length === 0 ||
+            columns.includes(key) ||
+            (map !== undefined && columns.some((name) => map.map(name) === key)));
+    };
     fields = (record, include) => Object.entries(record)
-        .filter(([key, value]) => include(key) && value !== null && value !== undefined)
+        .filter(([key, value]) => include(key) && this.writable(key) && value !== null && value !== undefined)
         .sort(([left], [right]) => left.localeCompare(right))
         .map(([name, value]) => ({ name, value: this.cell(name, value, true) }));
     cell = (property, value, fieldsApplied) => fieldsApplied

package/dist/CRUDRepository.d.ts

@@ -12,6 +12,8 @@ import type { IReadonlyEnrichmentStrategy } from "./IReadonlyEnrichmentStrategy.
 import type { IReadonlyRepository } from "./IReadonlyRepository.js";
 export declare class CRUDRepository<T = Cells> extends ReadonlyRepository<T> implements ICRUDRepository<T> {
     readonly ids: readonly string[];
+    private readonly createProperties?;
+    private readonly updateProperties?;
     private readonly crudStatements;
     private readonly tree;
     private readonly write;

package/dist/CRUDRepository.js

@@ -11,8 +11,14 @@ import { UnitOfWorkTransaction } from "./UnitOfWorkTransaction.js";
 import { RepositoryTree } from "./RepositoryTree.js";
 import { RepositoryTreeNode } from "./RepositoryTreeNode.js";
 const assigned = (value) => value !== null && value !== "" && value !== 0 && value !== 0n;
-const fieldsOf = (record, include, cell, enrichmentInto) => Object.entries(record)
-    .filter(([key, value]) => include(key) && !enrichmentInto(key) && value !== null && value !== undefined)
+const listed = (list, col, fallback) => list === undefined ? fallback : list.includes(col);
+const writable = (key, columns, column) => columns.length === 0 || columns.includes(key) || columns.some((name) => column(name) === key);
+const fieldsOf = (record, include, cell, enrichmentInto, columns, column) => Object.entries(record)
+    .filter(([key, value]) => include(key) &&
+    writable(key, columns, column) &&
+    !enrichmentInto(key) &&
+    value !== null &&
+    value !== undefined)
     .sort(([left], [right]) => left.localeCompare(right))
     .map(([name, value]) => ({ name, value: cell(name, value, true) }));
 const isCells = (id) => typeof id === "object" && id !== null;
@@ -29,6 +35,8 @@ const identified = (row, column) => {
 const scalarOf = (value) => value === undefined || value === null || typeof value === "object" ? undefined : value;
 export class CRUDRepository extends ReadonlyRepository {
     ids;
+    createProperties;
+    updateProperties;
     crudStatements;
     tree;
     write;
@@ -40,6 +48,8 @@ export class CRUDRepository extends ReadonlyRepository {
         const opened = repositoryParts(typeOrConnection, options);
         super(opened.built);
         this.ids = opened.built.ids;
+        this.createProperties = options.createProperties;
+        this.updateProperties = options.updateProperties;
         this.crudStatements = opened.statements;
         this.tree = new RepositoryTree(new RepositoryTreeNode(this, ""));
         this.write = options.write ?? new DefaultWriteEnrichmentStrategy();
@@ -101,7 +111,7 @@ export class CRUDRepository extends ReadonlyRepository {
     readSingleById = async (id) => this.readSingle(this.byId(id));
     insert = async (item) => {
         const record = this.reverseConvert(item);
-        const fields = fieldsOf(record, (col) => !this.ids.includes(col) || assigned(record[col] ?? null), this.cell, this.enrichmentInto);
+        const fields = fieldsOf(record, (col) => listed(this.createProperties, col, !this.ids.includes(col) || assigned(record[col] ?? null)), this.cell, this.enrichmentInto, this.crudStatements.readColumns, this.column);
         const statement = this.crudStatements.insert(fields);
         const response = await execute(this.command(), statement, statement.fields);
         if (this.ids.length === 1 && !fields.some((field) => field.name === this.ids[0]))
@@ -136,7 +146,7 @@ export class CRUDRepository extends ReadonlyRepository {
     idValue = (item) => scalarOf(item[this.ids[0]]);
     save = async (item, byWhere) => {
         const record = this.reverseConvert(item);
-        const fields = fieldsOf(record, (col) => !this.ids.includes(col), this.cell, this.enrichmentInto);
+        const fields = fieldsOf(record, (col) => listed(this.updateProperties, col, !this.ids.includes(col)), this.cell, this.enrichmentInto, this.crudStatements.readColumns, this.column);
         if (fields.length === 0)
             throw new DatasourceError("Update requires at least one non-Id field");
         const statement = this.crudStatements.update(fields, byWhere ?? this.idWhere(record), (name, value) => this.cell(name, value, byWhere === undefined));
@@ -149,7 +159,7 @@ export class CRUDRepository extends ReadonlyRepository {
         const parameters = listed.length
             ? listed
             : DefaultStatementTextRenderer.instance.render(statement).includes("$")
-                ? fieldsOf(record, () => true, this.cell, this.enrichmentInto)
+                ? fieldsOf(record, () => true, this.cell, this.enrichmentInto, this.crudStatements.readColumns, this.column)
                 : [];
         return execute(this.command(), statement, parameters);
     };

package/dist/CRUDRepositoryOptions.d.ts

@@ -3,5 +3,7 @@ import type { Cells } from "./converters/Cell.js";
 import type { IWriteEnrichmentStrategy } from "./IWriteEnrichmentStrategy.js";
 export type CRUDRepositoryOptions<T = Cells> = ReadonlyRepositoryMappingOptions<T> & {
     ids?: string[];
+    createProperties?: string[];
+    updateProperties?: string[];
     write?: IWriteEnrichmentStrategy<T>;
 };

package/dist/DriverLoader.js

@@ -1,16 +1,34 @@
 import { readFileSync } from "node:fs";
 import { createRequire, registerHooks } from "node:module";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { ProviderNotInstalledError } from "./ProviderNotInstalledError.js";
 const require = createRequire(import.meta.url);
-const appRequire = () => createRequire(join(process.cwd(), "package.json"));
+const requirers = () => [
+    createRequire(join(process.cwd(), "package.json")),
+    ...(process.argv[1] ? [createRequire(process.argv[1])] : []),
+    require,
+];
+const missingModule = (error) => error instanceof Error &&
+    "code" in error &&
+    (error.code === "MODULE_NOT_FOUND" ||
+        error.code === "ERR_MODULE_NOT_FOUND" ||
+        error.code === "ERR_PACKAGE_PATH_NOT_EXPORTED");
 const virtual = new Map();
 const virtualBySource = new Map();
 let typeScriptHook = false;
 let compiling = false;
+let compilingRoot = "";
 let nextVirtual = 0;
+/* v8 ignore start */
+const underRoot = (url) => {
+    if (!url.startsWith("file:"))
+        return false;
+    const path = fileURLToPath(url);
+    return path === compilingRoot || path.startsWith(`${compilingRoot}/`);
+};
+/* v8 ignore stop */
 const installTypeScriptHook = () => {
     if (typeScriptHook)
         return;
@@ -21,7 +39,7 @@ const installTypeScriptHook = () => {
             const parentURL = context.parentURL ? virtual.get(context.parentURL) ?? context.parentURL : undefined;
             const resolved = nextResolve(specifier, parentURL ? { ...context, parentURL } : context);
             /* v8 ignore next */
-            if (!compiling || !resolved.url.endsWith(".ts"))
+            if (!compiling || !resolved.url.endsWith(".ts") || !underRoot(resolved.url))
                 return resolved;
             const existing = virtualBySource.get(resolved.url);
             /* v8 ignore next */
@@ -33,7 +51,7 @@ const installTypeScriptHook = () => {
             return { url, shortCircuit: true };
         },
         load: (url, context, nextLoad) => {
-            const original = virtual.get(url) ?? (compiling && url.endsWith(".ts") ? url : undefined);
+            const original = virtual.get(url) ?? (compiling && url.endsWith(".ts") && underRoot(url) ? url : undefined);
             /* v8 ignore next */
             if (!original)
                 return nextLoad(url, context);
@@ -58,14 +76,27 @@ const instantiate = (catalog) => {
     }
     finally {
         compiling = false;
+        compilingRoot = "";
     }
 };
 const instantiateLoaded = (catalog) => {
-    const loaded = appRequire()(catalog.location);
-    const Type = loaded[catalog.module];
-    if (typeof Type !== "function")
-        throw new ProviderNotInstalledError(catalog.name);
-    return new Type();
+    let last;
+    for (const req of requirers()) {
+        try {
+            compilingRoot = dirname(req.resolve(catalog.location));
+            const loaded = req(catalog.location);
+            const Type = loaded[catalog.module];
+            if (typeof Type !== "function")
+                throw new ProviderNotInstalledError(catalog.name);
+            return new Type();
+        }
+        catch (error) {
+            last = error;
+            if (error instanceof ProviderNotInstalledError || !missingModule(error))
+                throw error;
+        }
+    }
+    throw last instanceof ProviderNotInstalledError ? last : new ProviderNotInstalledError(catalog.name);
 };
 export class DriverLoader {
     static load = (catalog) => {

package/package.json

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