@antelopejs/interface-database-decorators 0.1.11 → 0.2.0

package/dist/modifiers/hash.js

@@ -4,31 +4,169 @@ exports.Hashed = exports.HashModifier = void 0;
 const randomstring_1 = require("randomstring");
 const node_crypto_1 = require("node:crypto");
 const decorators_1 = require("@antelopejs/interface-core/decorators");
-const common_1 = require("./common");
+const common_1 = require("../common");
+const common_2 = require("./common");
+const records_1 = require("./internal/records");
+const kinds_1 = require("./internal/kinds");
+const SCRYPT_COST = { ln: 15, r: 8, p: 3 };
+const SALT_BYTES = 16;
+const KEY_BYTES = 32;
+const DECOY_SALT = Buffer.alloc(SALT_BYTES);
+const LEGACY_DIGEST = "sha256";
+/** Most scrypt memory (128 * N * r bytes) a stored hash may ask for. */
+const STORED_MAX_MEMORY = 128 * 1024 * 1024;
+const STORED_MAX_P = 16;
+const CURRENT_PREFIX = `$scrypt$ln=${SCRYPT_COST.ln},r=${SCRYPT_COST.r},p=${SCRYPT_COST.p}$`;
+/** Salt and key take 22 to 86 characters, so 16 to 64 bytes. */
+const STORED_SCRYPT = /^\$scrypt\$ln=([1-9]\d?),r=([1-9]\d?),p=([1-9]\d?)\$([A-Za-z0-9+/]{22,86})\$([A-Za-z0-9+/]{22,86})$/;
+function unpaddedBase64(bytes) {
+    return bytes.toString("base64").replace(/=+$/, "");
+}
+function scryptArgs(password, salt, keylen, { ln, r, p }) {
+    return [
+        password,
+        salt,
+        keylen,
+        { N: 2 ** ln, r, p, maxmem: 2 * STORED_MAX_MEMORY },
+    ];
+}
+function scryptAsync(...[password, salt, keylen, options]) {
+    return new Promise((resolve, reject) => {
+        (0, node_crypto_1.scrypt)(password, salt, keylen, options, (error, key) => {
+            if (error)
+                reject(error);
+            else
+                resolve(key);
+        });
+    });
+}
+function parseScrypt(stored) {
+    const match = STORED_SCRYPT.exec(stored);
+    if (!match)
+        return undefined;
+    const cost = {
+        ln: Number(match[1]),
+        r: Number(match[2]),
+        p: Number(match[3]),
+    };
+    if (128 * cost.r * 2 ** cost.ln > STORED_MAX_MEMORY ||
+        cost.p > STORED_MAX_P ||
+        cost.ln >= 16 * cost.r) {
+        return undefined;
+    }
+    return {
+        cost,
+        salt: Buffer.from(match[4], "base64"),
+        key: Buffer.from(match[5], "base64"),
+    };
+}
+function digestOf(algorithm, salt, candidate) {
+    return (0, node_crypto_1.createHash)(algorithm).update(salt).update(candidate).digest("base64");
+}
+function digestMatches(stored, salt, algorithm, candidate) {
+    if (!salt || candidate === undefined)
+        return false;
+    const expected = Buffer.from(stored);
+    const actual = Buffer.from(digestOf(algorithm, salt, candidate));
+    return expected.length === actual.length && (0, node_crypto_1.timingSafeEqual)(expected, actual);
+}
+/**
+ * Plans the test of a candidate from what the row holds. A field that uses
+ * scrypt spends one scrypt run in every case, so the time of a refusal does not
+ * tell a missing or an older hash from a current one.
+ */
+function planCheck(row, algorithm, candidate) {
+    const hash = parseScrypt(row.stored);
+    if (hash && candidate !== undefined) {
+        return {
+            run: scryptArgs(candidate, hash.salt, hash.key.length, hash.cost),
+            verdict: (derived) => derived !== undefined && (0, node_crypto_1.timingSafeEqual)(derived, hash.key),
+        };
+    }
+    const matches = digestMatches(row.stored, row.salt, algorithm ?? LEGACY_DIGEST, candidate);
+    return {
+        run: algorithm
+            ? undefined
+            : scryptArgs(candidate ?? "", DECOY_SALT, KEY_BYTES, SCRYPT_COST),
+        verdict: () => matches,
+    };
+}
+/** A row stores a string or nothing. Anything else cannot match a candidate. */
+function storedText(stored) {
+    return String(stored ?? "");
+}
+function withHashedField(row, field, use) {
+    const metaTable = (0, common_1.getMetadata)(row.constructor, common_2.ModifiersStaticMetadata);
+    const entry = (0, records_1.fieldsByKey)(metaTable)[field]?.find(({ modifier }) => modifier instanceof HashModifier);
+    if (!entry || !(entry.modifier instanceof HashModifier)) {
+        throw new Error(`Field ${String(field)} is not hashed`);
+    }
+    const internal = (0, records_1.getInternal)(row);
+    const stored = (0, records_1.dataByKey)(internal)[field];
+    return (0, records_1.withRef)(internal, entry.id, entry.modifier, entry.metaRef, (modifier) => use(modifier, (0, kinds_1.isString)(stored) ? stored : ""));
+}
 /**
  * Hash modifier. enables the use of {@link Hashed} on table fields.
  *
- * Hashed fields only contain a hash of the inserted value.
+ * Hashed fields only contain a hash of the inserted value, by default a scrypt
+ * hash in the self-describing form `$scrypt$ln=15,r=8,p=3$<salt>$<key>`.
  * Because of this, you lose the ability to query the information directly.
  * You can test equality using {@link testHash}
  */
-class HashModifier extends common_1.OneWayModifier {
+class HashModifier extends common_2.OneWayModifier {
     autolock = true;
-    lock(_locked_value, value) {
+    /**
+     * Hashes a new value. Assigning the stored hash back keeps it as it is.
+     * Blocks the event loop for one scrypt run: a setter and the conversions
+     * behind `insert` and `update` are synchronous.
+     */
+    // oxlint-disable-next-line anti-slop/no-unknown-parameters -- overrides OneWayModifier.lock; a modified field's value has its table class's type, which the shared modifier chain cannot name
+    lock(locked_value, value) {
         if (value === undefined) {
             return value;
         }
-        if (!this.meta.salt) {
-            this.meta.salt = (0, randomstring_1.generate)();
+        if (value === locked_value) {
+            return locked_value;
+        }
+        const candidate = JSON.stringify(value);
+        const { algorithm } = this.options;
+        if (algorithm) {
+            if (!this.meta.salt) {
+                this.meta.salt = (0, randomstring_1.generate)();
+            }
+            return digestOf(algorithm, this.meta.salt, candidate);
         }
-        return (0, node_crypto_1.createHash)(this.options.algorithm || "sha256")
-            .update(this.meta.salt)
-            .update(JSON.stringify(value))
-            .digest("base64");
+        const salt = (0, node_crypto_1.randomBytes)(SALT_BYTES);
+        const key = (0, node_crypto_1.scryptSync)(...scryptArgs(candidate, salt, KEY_BYTES, SCRYPT_COST));
+        return `${CURRENT_PREFIX}${unpaddedBase64(salt)}$${unpaddedBase64(key)}`;
     }
-    [common_1.MixinSymbol] = class {
+    test(locked_value, value) {
+        const check = this.plan(storedText(locked_value), value);
+        return check.verdict(check.run && (0, node_crypto_1.scryptSync)(...check.run));
+    }
+    /** {@link test} on the thread pool, without blocking the event loop. */
+    async testAsync(locked_value, value) {
+        const check = this.plan(locked_value, value);
+        return check.verdict(check.run && (await scryptAsync(...check.run)));
+    }
+    /**
+     * @returns Whether a stored hash differs from what this field writes today. A
+     * field with an explicit `algorithm` never reports one: hashing again would
+     * give the same digest, or weaken a scrypt hash.
+     */
+    isOutdated(locked_value) {
+        return (!this.options.algorithm &&
+            locked_value !== "" &&
+            !locked_value.startsWith(CURRENT_PREFIX));
+    }
+    /** Reads the salt now: `this.meta` is bound to a row only synchronously. */
+    plan(locked_value, value) {
+        return planCheck({ stored: locked_value, salt: this.meta.salt }, this.options.algorithm, value === undefined ? undefined : JSON.stringify(value));
+    }
+    [common_2.MixinSymbol] = class {
         /**
-         * Test a value against the stored hash.
+         * Test a value against the stored hash. Blocks the event loop for one
+         * scrypt run: on a server, prefer {@link testHashAsync}.
          *
          * @param field - Name of the field to test against.
          * @param value - Value to hash and test.
@@ -36,7 +174,30 @@ class HashModifier extends common_1.OneWayModifier {
          * @returns Whether the new value is identical to the original or not.
          */
         testHash(field, value) {
-            return (0, common_1.testValue)(this, field, value);
+            return (0, common_2.testValue)(this, field, value);
+        }
+        /**
+         * Test a value against the stored hash on the thread pool.
+         *
+         * @param field - Name of the field to test against.
+         * @param value - Value to hash and test.
+         *
+         * @returns Whether the new value is identical to the original or not.
+         */
+        async testHashAsync(field, value) {
+            return withHashedField(this, field, (modifier, stored) => modifier.testAsync(stored, value));
+        }
+        /**
+         * Tell whether a stored hash needs writing again: it uses an older format
+         * or cost. After a successful test, assign the tested value to the field
+         * and save the row.
+         *
+         * @param field - Name of the field to inspect.
+         *
+         * @returns Whether the stored hash is outdated. False when nothing is stored.
+         */
+        isHashOutdated(field) {
+            return withHashedField(this, field, (modifier, stored) => modifier.isOutdated(stored));
         }
     };
 }
@@ -49,6 +210,6 @@ exports.HashModifier = HashModifier;
  * @param options Hash options.
  */
 exports.Hashed = (0, decorators_1.MakePropertyDecorator)((target, propertyKey, options) => {
-    (0, common_1.attachModifier)(target.constructor, HashModifier, propertyKey, options || {});
+    (0, common_2.attachModifier)(target.constructor, HashModifier, propertyKey, options || {});
 });
 //# sourceMappingURL=hash.js.map

package/dist/modifiers/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/modifiers/hash.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,6CAAyC;AACzC,sEAA8E;AAE9E,qCAKkB;AAOlB;;;;;;GAMG;AACH,MAAa,YAAa,SAAQ,uBAKjC;IACiB,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAI,CAAC,aAAiC,EAAE,KAAc;QACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAA,uBAAQ,GAAE,CAAC;QAC9B,CAAC;QACD,OAAO,IAAA,wBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAC;aAClD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;aACtB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aAC7B,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAED,CAAC,oBAAW,CAAC,GAAG;QACd;;;;;;;WAOG;QACH,QAAQ,CAEN,KAAQ,EACR,KAAc;YAEd,OAAO,IAAA,kBAAS,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;CACH;AAtCD,oCAsCC;AAED;;;;;;GAMG;AACU,QAAA,MAAM,GAAG,IAAA,kCAAqB,EACzC,CAAC,MAAM,EAAE,WAAW,EAAE,OAAiB,EAAE,EAAE;IACzC,IAAA,uBAAc,EACZ,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,WAAW,EACX,OAAO,IAAI,EAAE,CACd,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../src/modifiers/hash.ts"],"names":[],"mappings":"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"}

package/dist/modifiers/internal/kinds.d.ts

@@ -1,5 +1,6 @@
 /** @internal @packageDocumentation */
-import type { Modifier, OneWayModifier, TwoWayModifier } from "../common";
+import type { Constructible } from "../../common";
+import type { Modifier, ModifierEvent, OneWayModifier, TwoWayModifier } from "../common";
 export declare function isWriteOnly(m: Modifier): m is OneWayModifier<unknown, any[]>;
 export declare function isLocking(m: Modifier): m is OneWayModifier<unknown, any[]>;
 export declare function isTwoWay(m: Modifier): m is TwoWayModifier<unknown, any[]>;
@@ -10,3 +11,16 @@ export declare const ignoredEventNames: {
     unlock: boolean;
 };
 export declare function isCallable(value: unknown): value is CallableFunction;
+/**
+ * Whether a modifier prototype member is a method the engine can run for an
+ * event: any function takes the instance, the field and the event arguments.
+ */
+export declare function isEventHandler(value: unknown): value is ModifierEvent;
+export declare function isString(value: unknown): value is string;
+/** Whether a value is an object or a function: what a prototype chain holds. */
+export declare function isObjectLike(value: unknown): value is object;
+/** The object the instances of a class inherit from. */
+export declare function prototypeOf(target: Constructible): object;
+/** Whether `candidate` is the class `base` or a class extending it. */
+export declare function isSameOrSubclass<Base extends Constructible>(candidate: Constructible, base: Base): candidate is Base;
+export declare function isRecord(value: unknown): value is Record<string, unknown>;

package/dist/modifiers/internal/kinds.js

@@ -6,6 +6,12 @@ exports.isLocking = isLocking;
 exports.isTwoWay = isTwoWay;
 exports.isOnlyEvents = isOnlyEvents;
 exports.isCallable = isCallable;
+exports.isEventHandler = isEventHandler;
+exports.isString = isString;
+exports.isObjectLike = isObjectLike;
+exports.prototypeOf = prototypeOf;
+exports.isSameOrSubclass = isSameOrSubclass;
+exports.isRecord = isRecord;
 function isWriteOnly(m) {
     return "lock" in m && !("unlock" in m);
 }
@@ -26,4 +32,33 @@ exports.ignoredEventNames = {
 function isCallable(value) {
     return typeof value === "function";
 }
+/**
+ * Whether a modifier prototype member is a method the engine can run for an
+ * event: any function takes the instance, the field and the event arguments.
+ */
+function isEventHandler(value) {
+    return typeof value === "function";
+}
+function isString(value) {
+    return typeof value === "string";
+}
+/** Whether a value is an object or a function: what a prototype chain holds. */
+function isObjectLike(value) {
+    return ((typeof value === "object" || typeof value === "function") && value !== null);
+}
+/** The object the instances of a class inherit from. */
+function prototypeOf(target) {
+    const prototype = target.prototype;
+    if (!isObjectLike(prototype)) {
+        throw new TypeError("A class prototype must be an object.");
+    }
+    return prototype;
+}
+/** Whether `candidate` is the class `base` or a class extending it. */
+function isSameOrSubclass(candidate, base) {
+    return candidate === base || base.isPrototypeOf(candidate);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
 //# sourceMappingURL=kinds.js.map

package/dist/modifiers/internal/kinds.js.map

@@ -1 +1 @@
-{"version":3,"file":"kinds.js","sourceRoot":"","sources":["../../../src/modifiers/internal/kinds.ts"],"names":[],"mappings":";;;AAGA,kCAEC;AAED,8BAEC;AAED,4BAEC;AAED,oCAEC;AAQD,gCAEC;AAxBD,SAAgB,WAAW,CAAC,CAAW;IACrC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,SAAS,CAAC,CAAW;IACnC,OAAO,MAAM,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,QAAQ,CAAC,CAAW;IAClC,OAAO,QAAQ,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,SAAgB,YAAY,CAAC,QAAkB;IAC7C,OAAO,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAEY,QAAA,iBAAiB,GAAG;IAC/B,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,SAAgB,UAAU,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC"}
+{"version":3,"file":"kinds.js","sourceRoot":"","sources":["../../../src/modifiers/internal/kinds.ts"],"names":[],"mappings":";;;AASA,kCAEC;AAED,8BAEC;AAED,4BAEC;AAED,oCAEC;AAQD,gCAEC;AAMD,wCAEC;AAED,4BAEC;AAGD,oCAIC;AAGD,kCAMC;AAGD,4CAKC;AAED,4BAEC;AAhED,SAAgB,WAAW,CAAC,CAAW;IACrC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,SAAS,CAAC,CAAW;IACnC,OAAO,MAAM,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,QAAQ,CAAC,CAAW;IAClC,OAAO,QAAQ,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,SAAgB,YAAY,CAAC,QAAkB;IAC7C,OAAO,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAEY,QAAA,iBAAiB,GAAG;IAC/B,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,SAAgB,UAAU,CAAC,KAAc;IACvC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,KAAc;IAC3C,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC;AAED,gFAAgF;AAChF,SAAgB,YAAY,CAAC,KAAc;IACzC,OAAO,CACL,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,CAAC,IAAI,KAAK,KAAK,IAAI,CAC7E,CAAC;AACJ,CAAC;AAED,wDAAwD;AACxD,SAAgB,WAAW,CAAC,MAAqB;IAC/C,MAAM,SAAS,GAAY,MAAM,CAAC,SAAS,CAAC;IAC5C,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,uEAAuE;AACvE,SAAgB,gBAAgB,CAC9B,SAAwB,EACxB,IAAU;IAEV,OAAO,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}

package/dist/modifiers/internal/records.d.ts

@@ -1,20 +1,51 @@
 /** @internal @packageDocumentation */
-import type { DatumStaticMetadata } from "../../common";
-import type { Modifier, ModifiersDynamicMetadata, ModifiersStaticMetadata } from "../common";
+import type { Constructible, DatumStaticMetadata } from "../../common";
+import type { Modifier, ModifierEvent, ModifiersDynamicMetadata, ModifiersStaticMetadata } from "../common";
 type ModifiedFieldList = ModifiersStaticMetadata["fields"][string];
 type ModifiedField = ModifiedFieldList[number];
-type InternalRecord = Parameters<ModifiersDynamicMetadata["get"]>[1];
+/** What a modifier keeps for a field of a stored row, beside the locked value. */
+export type ModifierState = {
+    [key: PropertyKey]: unknown;
+};
+/**
+ * Where a row holds its modified fields: the locked values by field name, and
+ * each modifier's state by modifier name. What the values hold is known to the
+ * modifiers that wrote them, not to the row.
+ */
+export interface InternalRecord {
+    meta: Record<string, ModifierState>;
+    data: {
+        [field: PropertyKey]: unknown;
+    };
+}
+export interface InternalHolder {
+    constructor: any;
+    _internal?: InternalRecord;
+}
+/** The modifier state of a table instance, created on first use. */
+export declare function getInternal(object: InternalHolder): InternalRecord;
+/** Whether a row's modifier state holds no locked value and no modifier state. */
+export declare function isEmptyInternal({ meta, data }: InternalRecord): boolean;
+/**
+ * Throws when a modifier cannot be attached to the field named `field`: the
+ * two names the table's own structures live under.
+ */
+export declare function assertModifiableField(tableName: string, modifierId: string, field: PropertyKey): void;
 export declare function fieldsByKey(meta: ModifiersStaticMetadata): {
     [field: PropertyKey]: ModifiedFieldList;
 };
-export declare function eventsByKey(meta: ModifiersStaticMetadata): Map<string, Array<[field: PropertyKey, modified: ModifiedFieldList[number]]>>;
+export declare function eventsByKey(meta: ModifiersStaticMetadata): Map<string, Array<[
+    field: PropertyKey,
+    modified: ModifiedFieldList[number],
+    handler: ModifierEvent
+]>>;
 export declare function unlockArgsOf(meta: ModifiersDynamicMetadata, field: PropertyKey): ModifiersDynamicMetadata["fields"][string];
 export declare function fieldTypesByKey(meta: DatumStaticMetadata): {
     [field: PropertyKey]: DatumStaticMetadata["fields"][string];
 };
 export declare function floatingOf<V>(meta: {
     floating: Record<string, V>;
-}, field: PropertyKey): V;
+}, field: PropertyKey): V | undefined;
 export declare function floatingByKey<V>(meta: {
     floating: Record<string, V>;
 }): {
@@ -25,5 +56,9 @@ export declare function dataByKey<V>(internal: {
 }): {
     [field: PropertyKey]: V;
 };
+/** A field entry for a new `Modifier`, whose `meta` reads and writes the record its `metaRef` points at. */
+export declare function newModifiedField(Modifier: Constructible<Modifier>): ModifiedField;
 export declare function withRef<T extends Modifier, U>(internal: InternalRecord, id: ModifiedField["id"], modifier: T, metaRef: ModifiedField["metaRef"], callback: (modifier: T) => U): U;
+/** Fills `copy` with the modified fields and events of `parent`, every list copied. */
+export declare function copyModifierLists(copy: ModifiersStaticMetadata, parent: ModifiersStaticMetadata): ModifiersStaticMetadata;
 export {};

package/dist/modifiers/internal/records.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInternal = getInternal;
+exports.isEmptyInternal = isEmptyInternal;
+exports.assertModifiableField = assertModifiableField;
 exports.fieldsByKey = fieldsByKey;
 exports.eventsByKey = eventsByKey;
 exports.unlockArgsOf = unlockArgsOf;
@@ -7,7 +10,37 @@ exports.fieldTypesByKey = fieldTypesByKey;
 exports.floatingOf = floatingOf;
 exports.floatingByKey = floatingByKey;
 exports.dataByKey = dataByKey;
+exports.newModifiedField = newModifiedField;
 exports.withRef = withRef;
+exports.copyModifierLists = copyModifierLists;
+/** The modifier state of a table instance, created on first use. */
+function getInternal(object) {
+    if (!object._internal) {
+        object._internal = {
+            meta: {},
+            data: {},
+        };
+    }
+    return object._internal;
+}
+/** Whether a row's modifier state holds no locked value and no modifier state. */
+function isEmptyInternal({ meta, data }) {
+    return Object.keys(meta).length === 0 && Object.keys(data).length === 0;
+}
+/**
+ * Throws when a modifier cannot be attached to the field named `field`: the
+ * two names the table's own structures live under.
+ */
+function assertModifiableField(tableName, modifierId, field) {
+    const reason = field === "constructor"
+        ? "the field would replace the class constructor that locates the metadata of every instance"
+        : field === "__proto__"
+            ? "the field would replace the prototype of the record of modified fields and never be recorded"
+            : undefined;
+    if (reason) {
+        throw new Error(`Cannot add Modifier ${modifierId} on ${tableName}.${String(field)}: ${reason}.`);
+    }
+}
 function fieldsByKey(meta) {
     return meta.fields;
 }
@@ -16,6 +49,9 @@ function eventsByKey(meta) {
 }
 function unlockArgsOf(meta, field) {
     const byKey = meta.fields;
+    if (!Object.hasOwn(byKey, field)) {
+        throw new TypeError(`${String(field)} holds no modifier arguments`);
+    }
     return byKey[field];
 }
 function fieldTypesByKey(meta) {
@@ -23,7 +59,7 @@ function fieldTypesByKey(meta) {
 }
 function floatingOf(meta, field) {
     const byKey = meta.floating;
-    return byKey[field];
+    return Object.hasOwn(byKey, field) ? byKey[field] : undefined;
 }
 function floatingByKey(meta) {
     return meta.floating;
@@ -31,6 +67,29 @@ function floatingByKey(meta) {
 function dataByKey(internal) {
     return internal.data;
 }
+/** A field entry for a new `Modifier`, whose `meta` reads and writes the record its `metaRef` points at. */
+function newModifiedField(Modifier) {
+    const entry = {
+        id: Modifier.name,
+        modifier: new Modifier(),
+        metaRef: { _ref: {} },
+    };
+    Object.assign(entry.modifier, {
+        meta: new Proxy(entry.metaRef, {
+            get: (self, p) => {
+                if (!self._ref)
+                    return undefined;
+                return self._ref[p];
+            },
+            set: (self, p, v) => {
+                if (!self._ref)
+                    self._ref = {};
+                return Reflect.set(self._ref, p, v, self._ref);
+            },
+        }),
+    });
+    return entry;
+}
 function withRef(internal, id, modifier, metaRef, callback) {
     metaRef._ref = internal.meta[id];
     const ret = callback(modifier);
@@ -39,4 +98,14 @@ function withRef(internal, id, modifier, metaRef, callback) {
     }
     return ret;
 }
+/** The entries of a record or map with every list copied, not shared. */
+function listsCopied(entries) {
+    return Array.from(entries, ([key, list]) => [key, [...list]]);
+}
+/** Fills `copy` with the modified fields and events of `parent`, every list copied. */
+function copyModifierLists(copy, parent) {
+    copy.fields = Object.fromEntries(listsCopied(Object.entries(parent.fields)));
+    copy.events = new Map(listsCopied(parent.events));
+    return copy;
+}
 //# sourceMappingURL=records.js.map

package/dist/modifiers/internal/records.js.map

@@ -1 +1 @@
-{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../src/modifiers/internal/records.ts"],"names":[],"mappings":";;AAYA,kCAIC;AAED,kCAOC;AAED,oCAQC;AAED,0CAIC;AAED,gCAMC;AAED,sCAIC;AAED,8BAIC;AAED,0BAaC;AAhED,SAAgB,WAAW,CAAC,IAA6B;IAGvD,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,SAAgB,WAAW,CACzB,IAA6B;IAK7B,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,SAAgB,YAAY,CAC1B,IAA8B,EAC9B,KAAkB;IAElB,MAAM,KAAK,GAEP,IAAI,CAAC,MAAM,CAAC;IAChB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAgB,eAAe,CAAC,IAAyB;IAGvD,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,SAAgB,UAAU,CACxB,IAAqC,EACrC,KAAkB;IAElB,MAAM,KAAK,GAAgC,IAAI,CAAC,QAAQ,CAAC;IACzD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAgB,aAAa,CAAI,IAAqC;IAGpE,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC;AAED,SAAgB,SAAS,CAAI,QAAqC;IAGhE,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB,CAAC;AAED,SAAgB,OAAO,CACrB,QAAwB,EACxB,EAAuB,EACvB,QAAW,EACX,OAAiC,EACjC,QAA4B;IAE5B,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IACnC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../src/modifiers/internal/records.ts"],"names":[],"mappings":"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"}

package/dist/modifiers/localization.js

@@ -4,11 +4,9 @@ exports.Localized = exports.LocalizationModifier = void 0;
 const decorators_1 = require("@antelopejs/interface-core/decorators");
 const common_1 = require("../common");
 const common_2 = require("./common");
+const kinds_1 = require("./internal/kinds");
 /** A text left empty in one language counts as no text in that language. */
 const EMPTY_TEXT = "";
-function isObject(value) {
-    return typeof value === "object" && value !== null;
-}
 function withoutEmptyTexts(values) {
     return Object.fromEntries(Object.entries(values).filter(([, value]) => value !== EMPTY_TEXT));
 }
@@ -40,14 +38,19 @@ class LocalizationModifier extends common_2.ContainerModifier {
      * Stores an empty text as no text, so that the fallback locale answers for
      * it in queries too (`unlockrequest`).
      */
-    lock(locked_value, value, key) {
+    lock(
+    // oxlint-disable-next-line anti-slop/no-unsafe-dictionary-type -- the container modifier leaves the values by locale untyped
+    locked_value, 
+    // oxlint-disable-next-line anti-slop/no-unknown-parameters -- overrides ContainerModifier.lock; a modified field's value has its table class's type, which the shared modifier chain cannot name
+    value, key) {
         if (key === "*") {
-            return isObject(value)
+            return (0, kinds_1.isRecord)(value)
                 ? withoutEmptyTexts(value)
-                : value;
+                : super.lock(locked_value, value, key);
         }
         return withoutEmptyTexts(super.lock(locked_value, value, key));
     }
+    // oxlint-disable-next-line anti-slop/no-unsafe-dictionary-type -- the container modifier leaves the values by locale untyped
     unlock(locked_value, key) {
         const unlocked = super.unlock(locked_value, key);
         if (unlocked !== undefined && unlocked !== EMPTY_TEXT) {
@@ -57,7 +60,9 @@ class LocalizationModifier extends common_2.ContainerModifier {
             return super.unlock(locked_value, this.options.fallbackLocale);
         }
     }
-    unlockrequest(data, _meta, key) {
+    unlockrequest(
+    // oxlint-disable-next-line anti-slop/no-unsafe-dictionary-type -- the container modifier leaves the values by locale untyped
+    data, _meta, key) {
         if (this.options.fallbackLocale) {
             return data.key(key).default(data.key(this.options.fallbackLocale));
         }

package/dist/modifiers/localization.js.map

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

package/dist/relation.d.ts

@@ -23,6 +23,11 @@ export interface RelationOptions {
  */
 export declare class RelationStaticMetadata {
     static key: symbol;
+    /**
+     * The metadata of a subclass of a table: a copy of its parent's, so that
+     * relations declared on the subclass never reach the parent or its siblings.
+     */
+    static inherit(parent: RelationStaticMetadata): RelationStaticMetadata;
     readonly relations: Record<string, RelationOptions>;
 }
 /**

package/dist/relation.js

@@ -8,6 +8,17 @@ const common_1 = require("./common");
  */
 class RelationStaticMetadata {
     static key = Symbol.for("@antelopejs/interface-database-decorators/RelationStaticMetadata@1");
+    /**
+     * The metadata of a subclass of a table: a copy of its parent's, so that
+     * relations declared on the subclass never reach the parent or its siblings.
+     */
+    static inherit(parent) {
+        const copy = new RelationStaticMetadata();
+        for (const [field, options] of Object.entries(parent.relations)) {
+            copy.relations[field] = options;
+        }
+        return copy;
+    }
     relations = {};
 }
 exports.RelationStaticMetadata = RelationStaticMetadata;

package/dist/relation.js.map

@@ -1 +1 @@
-{"version":3,"file":"relation.js","sourceRoot":"","sources":["../src/relation.ts"],"names":[],"mappings":";;;AAAA,sEAA8E;AAG9E,qCAAuC;AAsBvC;;GAEG;AACH,MAAa,sBAAsB;IAC1B,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAC5B,oEAAoE,CACrE,CAAC;IAEc,SAAS,GAAoC,EAAE,CAAC;;AALlE,wDAMC;AAED;;;;;;;;;;;;;GAaG;AACU,QAAA,QAAQ,GAAG,IAAA,kCAAqB,EAC3C,CAAC,MAAM,EAAE,WAAW,EAAE,OAAwB,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACzE,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC;AACpD,CAAC,CACF,CAAC"}
+{"version":3,"file":"relation.js","sourceRoot":"","sources":["../src/relation.ts"],"names":[],"mappings":";;;AAAA,sEAA8E;AAG9E,qCAAuC;AAsBvC;;GAEG;AACH,MAAa,sBAAsB;IAC1B,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAC5B,oEAAoE,CACrE,CAAC;IAEF;;;OAGG;IACI,MAAM,CAAC,OAAO,CACnB,MAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC1C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEe,SAAS,GAAoC,EAAE,CAAC;;AAnBlE,wDAoBC;AAED;;;;;;;;;;;;;GAaG;AACU,QAAA,QAAQ,GAAG,IAAA,kCAAqB,EAC3C,CAAC,MAAM,EAAE,WAAW,EAAE,OAAwB,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACzE,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC;AACpD,CAAC,CACF,CAAC"}

package/dist/schema.js

@@ -5,18 +5,17 @@ exports.getTablesForSchema = getTablesForSchema;
 const decorators_1 = require("@antelopejs/interface-core/decorators");
 const interface_database_1 = require("@antelopejs/interface-database");
 const common_1 = require("./common");
-const schemaTableRegistry = {};
+const schemaTableRegistry = new Map();
 exports.RegisterTable = (0, decorators_1.MakeClassDecorator)((target, tableName, schemaName) => {
     const metadata = (0, common_1.getMetadata)(target, common_1.DatumStaticMetadata);
     metadata.tableName = tableName;
     metadata.schemaName = schemaName;
     metadata.schema = interface_database_1.Schema.get(schemaName);
-    if (!(schemaName in schemaTableRegistry)) {
-        schemaTableRegistry[schemaName] = {};
-    }
-    schemaTableRegistry[schemaName][tableName] = target;
+    const tables = schemaTableRegistry.get(schemaName) ?? {};
+    tables[tableName] = target;
+    schemaTableRegistry.set(schemaName, tables);
 });
 function getTablesForSchema(schemaName) {
-    return schemaTableRegistry[schemaName];
+    return schemaTableRegistry.get(schemaName);
 }
 //# sourceMappingURL=schema.js.map

package/dist/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;AA6BA,gDAIC;AAjCD,sEAI+C;AAC/C,uEAAwD;AAGxD,qCAA4D;AAE5D,MAAM,mBAAmB,GAAiD,EAAE,CAAC;AAEhE,QAAA,aAAa,GAGU,IAAA,+BAAkB,EACpD,CAAC,MAAM,EAAE,SAAiB,EAAE,UAAkB,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,MAAM,EAAE,4BAAmB,CAAC,CAAC;IAC1D,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,QAAQ,CAAC,MAAM,GAAG,2BAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAmB,CAAC,EAAE,CAAC;QACzC,mBAAmB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;IACvC,CAAC;IACD,mBAAmB,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;AACtD,CAAC,CACF,CAAC;AAEF,SAAgB,kBAAkB,CAChC,UAAkB;IAElB,OAAO,mBAAmB,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":";;;AA4BA,gDAIC;AAhCD,sEAI+C;AAC/C,uEAAwD;AAGxD,qCAA4D;AAE5D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAwC,CAAC;AAE/D,QAAA,aAAa,GAGU,IAAA,+BAAkB,EACpD,CAAC,MAAM,EAAE,SAAiB,EAAE,UAAkB,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,MAAM,EAAE,4BAAmB,CAAC,CAAC;IAC1D,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,QAAQ,CAAC,MAAM,GAAG,2BAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEzC,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACzD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAC3B,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC,CACF,CAAC;AAEF,SAAgB,kBAAkB,CAChC,UAAkB;IAElB,OAAO,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC7C,CAAC"}