joist-orm 0.1.536 → 1.0.0

package/build/EntityPersister.js

@@ -1,197 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortJoinRows = exports.flushJoinTables = exports.getTodo = exports.sortEntities = exports.flushEntities = void 0;
-const index_1 = require("./index");
-const utils_1 = require("./utils");
-async function flushEntities(knex, todos) {
-    const updatedAt = new Date();
-    await assignNewIds(knex, todos);
-    for await (const todo of Object.values(todos)) {
-        if (todo) {
-            const meta = todo.metadata;
-            if (todo.inserts.length > 0) {
-                await batchInsert(knex, meta, todo.inserts);
-            }
-            if (todo.updates.length > 0) {
-                todo.updates.forEach((e) => (e.__orm.data["updatedAt"] = updatedAt));
-                await batchUpdate(knex, meta, todo.updates);
-            }
-            if (todo.deletes.length > 0) {
-                await batchDelete(knex, meta, todo.deletes);
-            }
-        }
-    }
-}
-exports.flushEntities = flushEntities;
-/**
- * Assigns all new entities an id directly from their corresponding sequence generator, instead of via INSERTs.
- *
- * This lets us avoid cyclic issues with some INSERTs having foreign keys to other rows that themselves
- * need to first be INSERTed.
- */
-async function assignNewIds(knex, todos) {
-    const seqStatements = [];
-    Object.values(todos).forEach((todo) => {
-        if (todo.inserts.length > 0) {
-            const meta = todo.inserts[0].__orm.metadata;
-            const sequenceName = `${meta.tableName}_id_seq`;
-            const sql = `select nextval('${sequenceName}') from generate_series(1, ${todo.inserts.length})`;
-            seqStatements.push(sql);
-        }
-    });
-    if (seqStatements.length > 0) {
-        // There will be 1 per table; 1 single insert should be fine but we might need to batch for super-large schemas?
-        const sql = seqStatements.join(" UNION ALL ");
-        const result = await knex.raw(sql);
-        let i = 0;
-        Object.values(todos).forEach((todo) => {
-            for (const insert of todo.inserts) {
-                insert.__orm.data["id"] = index_1.keyToString(todo.metadata, result.rows[i++]["nextval"]);
-            }
-        });
-    }
-}
-async function batchInsert(knex, meta, entities) {
-    const rows = entities.map((entity) => {
-        const row = {};
-        meta.columns.forEach((c) => c.serde.setOnRow(entity.__orm.data, row));
-        return row;
-    });
-    // We don't use the ids that come back from batchInsert b/c we pre-assign ids for both inserts and updates.
-    // We also use `.transacting` b/c even when `knex` is already a Transaction object,
-    // `batchInsert` w/o the `transacting` adds savepoints that we don't want/need.
-    await knex.batchInsert(meta.tableName, rows).transacting(knex);
-    for (let i = 0; i < entities.length; i++) {
-        entities[i].__orm.originalData = {};
-    }
-}
-// Uses a pg-specific syntax to issue a bulk update
-async function batchUpdate(knex, meta, entities) {
-    // Get the unique set of fields that are changed across all of the entities (of this type) we want to bulk update
-    const changedFields = new Set();
-    // Id doesn't change, but we need it for our WHERE clause
-    changedFields.add("id");
-    entities.forEach((entity) => {
-        Object.keys(entity.__orm.originalData).forEach((key) => changedFields.add(key));
-    });
-    // Sometimes with derived fields, an instance will be marked as an update, but if the derived field hasn't changed,
-    // it'll be a noop, so just short-circuit if it looks like that happened, i.e. we have no changed fields.
-    if (changedFields.size === 1) {
-        return;
-    }
-    // This currently assumes a 1-to-1 field-to-column mapping.
-    const columns = meta.columns.filter((c) => changedFields.has(c.fieldName));
-    const bindings = columns.map(() => []);
-    for (const entity of entities) {
-        columns.forEach((c, i) => {
-            var _a;
-            bindings[i].push((_a = c.serde.getFromEntity(entity.__orm.data)) !== null && _a !== void 0 ? _a : null);
-        });
-    }
-    await knex.raw(cleanSql(`
-      UPDATE ${meta.tableName}
-      SET ${columns
-        .filter((c) => c.columnName !== "id")
-        .map((c) => `"${c.columnName}" = data."${c.columnName}"`)
-        .join(", ")}
-      FROM (select ${columns.map((c) => `unnest(?::${c.dbType}[]) as "${c.columnName}"`).join(", ")}) as data
-      WHERE ${meta.tableName}.id = data.id
-   `), bindings);
-    entities.forEach((entity) => (entity.__orm.originalData = {}));
-}
-async function batchDelete(knex, meta, entities) {
-    await knex(meta.tableName)
-        .del()
-        .whereIn("id", entities.map((e) => index_1.keyToNumber(meta, e.id).toString()));
-    entities.forEach((entity) => (entity.__orm.deleted = "deleted"));
-}
-function cleanSql(sql) {
-    return sql.trim().replace(/\n/g, "").replace(/  +/g, " ");
-}
-/**
- * Scans `entities` for new/updated entities and arranges them per-type in entity order.
- *
- * This currently assumes the entity types in the schema can be topographically sorted
- * and have no cycles, i.e. `books` always depend on `authors` (due to the `books.author_id`
- * foreign key), but `authors` never (via a required foreign key) depend on `books`.
- */
-function sortEntities(entities) {
-    const todos = {};
-    for (const entity of entities) {
-        if (entity.isPendingFlush) {
-            const todo = getTodo(todos, entity);
-            if (entity.isPendingDelete) {
-                todo.deletes.push(entity);
-            }
-            else if (entity.isNewEntity) {
-                todo.inserts.push(entity);
-            }
-            else {
-                todo.updates.push(entity);
-            }
-        }
-    }
-    return todos;
-}
-exports.sortEntities = sortEntities;
-/** getOrSets a `Todo` for `entity` in `todos`. */
-function getTodo(todos, entity) {
-    const meta = index_1.getMetadata(entity);
-    let todo = todos[meta.type];
-    if (!todo) {
-        todo = { metadata: entity.__orm.metadata, inserts: [], updates: [], deletes: [], validates: [] };
-        todos[meta.type] = todo;
-    }
-    return todo;
-}
-exports.getTodo = getTodo;
-async function flushJoinTables(knex, joinRows) {
-    for await (const [joinTableName, { m2m, newRows, deletedRows }] of Object.entries(joinRows)) {
-        if (newRows.length > 0) {
-            const ids = await knex
-                .batchInsert(joinTableName, newRows.map((row) => {
-                // The rows in EntityManager.joinRows point to entities, change those to ints
-                const { id, created_at, m2m, ...fkColumns } = row;
-                Object.keys(fkColumns).forEach((key) => {
-                    const meta = key == m2m.columnName ? index_1.getMetadata(m2m.entity) : m2m.otherMeta;
-                    fkColumns[key] = index_1.keyToNumber(meta, index_1.maybeResolveReferenceToId(fkColumns[key]));
-                });
-                return fkColumns;
-            }))
-                .returning("id");
-            for (let i = 0; i < ids.length; i++) {
-                newRows[i].id = ids[i];
-            }
-        }
-        if (deletedRows.length > 0) {
-            // `remove`s that were done against unloaded ManyToManyCollections will not have row ids
-            const [haveIds, noIds] = utils_1.partition(deletedRows, (r) => r.id !== -1);
-            if (haveIds.length > 0) {
-                await knex(joinTableName)
-                    .del()
-                    .whereIn("id", haveIds.map((e) => e.id));
-            }
-            if (noIds.length > 0) {
-                const data = noIds.map((e) => [
-                    index_1.deTagIds(m2m.meta, [index_1.maybeResolveReferenceToId(e[m2m.columnName])])[0],
-                    index_1.deTagIds(m2m.otherMeta, [index_1.maybeResolveReferenceToId(e[m2m.otherColumnName])])[0],
-                ]);
-                await knex(joinTableName).del().whereIn([m2m.columnName, m2m.otherColumnName], data);
-            }
-        }
-    }
-}
-exports.flushJoinTables = flushJoinTables;
-function sortJoinRows(joinRows) {
-    const todos = {};
-    for (const [joinTableName, rows] of Object.entries(joinRows)) {
-        const newRows = rows.filter((r) => r.id === undefined && r.deleted !== true);
-        const deletedRows = rows.filter((r) => r.id !== undefined && r.deleted === true);
-        if (newRows.length > 0 || deletedRows.length > 0) {
-            todos[joinTableName] = { newRows, deletedRows, m2m: rows[0].m2m };
-        }
-    }
-    return todos;
-}
-exports.sortJoinRows = sortJoinRows;
-//# sourceMappingURL=EntityPersister.js.map

package/build/EntityPersister.js.map

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

package/build/QueryBuilder.js

@@ -1,195 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildQuery = void 0;
-const EntityManager_1 = require("./EntityManager");
-const serde_1 = require("./serde");
-const utils_1 = require("./utils");
-const operators = ["eq", "gt", "gte", "ne", "lt", "lte", "like", "ilike", "in"];
-const opToFn = {
-    eq: "=",
-    gt: ">",
-    gte: ">=",
-    ne: "!=",
-    lt: "<",
-    lte: "<=",
-    like: "LIKE",
-    ilike: "ILIKE",
-    in: "...",
-};
-/**
- * Builds the SQL/knex queries for `EntityManager.find` calls.
- *
- * Note this is generally for our own internal implementation details and not meant to
- * be a user-facing QueryBuilder, i.e. users should use Knex for that and just use SQL
- * directly (for any non-trivial queries that `EntityManager.find` does not support).
- */
-function buildQuery(knex, type, filter) {
-    const meta = EntityManager_1.getMetadata(type);
-    const { where, orderBy, limit, offset } = filter;
-    const aliases = {};
-    function getAlias(tableName) {
-        const abbrev = abbreviation(tableName);
-        const i = aliases[abbrev] || 0;
-        aliases[abbrev] = i + 1;
-        return `${abbrev}${i}`;
-    }
-    const alias = getAlias(meta.tableName);
-    let query = knex.select(`${alias}.*`).from(`${meta.tableName} AS ${alias}`);
-    // Define a function for recursively adding joins & filters
-    function addClauses(meta, alias, where, orderBy) {
-        // Combine the where and orderBy keys so that we can add them to aliases as that same time
-        const keys = [...(where ? Object.keys(where) : []), ...(orderBy ? Object.keys(orderBy) : [])];
-        keys.forEach((key) => {
-            const column = meta.columns.find((c) => c.fieldName === key) || utils_1.fail(`${key} not found`);
-            // We may/may not have a where clause or orderBy for this key, but we should have at least one of them.
-            const clause = where && where[key];
-            const hasClause = where && key in where;
-            const order = orderBy && orderBy[key];
-            const hasOrder = !!order;
-            if (column.serde instanceof serde_1.ForeignKeySerde) {
-                // Add `otherTable.column = ...` clause, unless `key` is not in `where`, i.e. there is only an orderBy for this fk
-                let [whereNeedsJoin, _query] = hasClause ? addForeignKeyClause(query, alias, column, clause) : [false, query];
-                query = _query;
-                if (whereNeedsJoin || hasOrder) {
-                    // Add a join for this column
-                    const otherMeta = column.serde.otherMeta();
-                    const otherAlias = getAlias(otherMeta.tableName);
-                    query = query.innerJoin(`${otherMeta.tableName} AS ${otherAlias}`, `${alias}.${column.columnName}`, `${otherAlias}.id`);
-                    // Then recurse to add its conditions to the query
-                    addClauses(otherMeta, otherAlias, whereNeedsJoin ? clause : undefined, hasOrder ? order : undefined);
-                }
-            }
-            else {
-                query = hasClause ? addPrimitiveClause(query, alias, column, clause) : query;
-                // This is not a foreign key column, so it'll have the primitive filters/order bys
-                if (order) {
-                    query = query.orderBy(`${alias}.${column.columnName}`, order);
-                }
-            }
-        });
-    }
-    addClauses(meta, alias, where, orderBy);
-    // Even if they already added orders, add id as the last one to get deterministic output
-    query = query.orderBy(`${alias}.id`);
-    query = query.limit(limit || EntityManager_1.entityLimit);
-    if (offset) {
-        query = query.offset(offset);
-    }
-    return query;
-}
-exports.buildQuery = buildQuery;
-function abbreviation(tableName) {
-    return tableName
-        .split("_")
-        .map((w) => w[0])
-        .join("");
-}
-function addForeignKeyClause(query, alias, column, clause) {
-    // I.e. this could be { authorFk: authorEntity | null | id | { ...recurse... } }
-    const clauseKeys = typeof clause === "object" && clause !== null ? Object.keys(clause) : [];
-    if (EntityManager_1.isEntity(clause) || typeof clause == "string" || Array.isArray(clause)) {
-        // I.e. { authorFk: authorEntity | id | id[] }
-        if (EntityManager_1.isEntity(clause) && clause.id === undefined) {
-            // The user is filtering on an unsaved entity, which will just never have any rows, so throw in -1
-            return [false, query.where(`${alias}.${column.columnName}`, -1)];
-        }
-        else if (Array.isArray(clause)) {
-            return [
-                false,
-                query.whereIn(`${alias}.${column.columnName}`, clause.map((id) => column.serde.mapToDb(id))),
-            ];
-        }
-        else {
-            return [false, query.where(`${alias}.${column.columnName}`, column.serde.mapToDb(clause))];
-        }
-    }
-    else if (clause === null || clause === undefined) {
-        // I.e. { authorFk: null | undefined }
-        return [false, query.whereNull(`${alias}.${column.columnName}`)];
-    }
-    else if (clauseKeys.length === 1 && clauseKeys[0] === "id") {
-        // I.e. { authorFk: { id: string } } || { authorFk: { id: string[] } }
-        // If only querying on the id, we can skip the join
-        const value = clause["id"];
-        if (Array.isArray(value)) {
-            return [
-                false,
-                query.whereIn(`${alias}.${column.columnName}`, value.map((id) => column.serde.mapToDb(id))),
-            ];
-        }
-        else {
-            return [false, query.where(`${alias}.${column.columnName}`, column.serde.mapToDb(value))];
-        }
-    }
-    else if (clauseKeys.length === 1 && clauseKeys[0] === "ne") {
-        // I.e. { authorFk: { ne: string | null | undefined } }
-        const value = clause["ne"];
-        if (value === null || value === undefined) {
-            return [false, query.whereNotNull(`${alias}.${column.columnName}`)];
-        }
-        else if (typeof value === "string") {
-            return [false, query.whereNot(`${alias}.${column.columnName}`, column.serde.mapToDb(value))];
-        }
-        else {
-            throw new Error("Not implemented");
-        }
-    }
-    else {
-        // I.e. { authorFk: { ...authorFilter... } }
-        return [clause !== undefined, query];
-    }
-}
-function addPrimitiveClause(query, alias, column, clause) {
-    if (clause && typeof clause === "object" && operators.find((op) => Object.keys(clause).includes(op))) {
-        // I.e. `{ primitiveField: { gt: value } }`
-        const op = Object.keys(clause)[0];
-        return addPrimitiveOperator(query, alias, column, op, clause[op]);
-    }
-    else if (clause && typeof clause === "object" && "op" in clause) {
-        // I.e. { primitiveField: { op: "gt", value: 1 } }`
-        return addPrimitiveOperator(query, alias, column, clause.op, clause.value);
-    }
-    else if (Array.isArray(clause)) {
-        // I.e. `{ primitiveField: value[] }`
-        return query.whereIn(`${alias}.${column.columnName}`, clause.map((v) => column.serde.mapToDb(v)));
-    }
-    else if (clause === null) {
-        // I.e. `{ primitiveField: null }`
-        return query.whereNull(`${alias}.${column.columnName}`);
-    }
-    else if (clause === undefined) {
-        // I.e. `{ primitiveField: undefined }`
-        // Currently we treat this like a partial filter, i.e. don't include it. Seems odd
-        // unless this is opt-in, i.e. maybe only do this for `findGql`?
-        return query;
-    }
-    else if (clause !== undefined) {
-        // I.e. `{ primitiveField: value }`
-        // TODO In theory could add a addToQuery method to Serde to generalize this to multi-columns fields.
-        return query.where(`${alias}.${column.columnName}`, column.serde.mapToDb(clause));
-    }
-    else {
-        return utils_1.fail(`Unhandled primitive clause ${clause}`);
-    }
-}
-function addPrimitiveOperator(query, alias, column, op, value) {
-    if (value === null || value === undefined) {
-        if (op === "ne") {
-            return query.whereNotNull(`${alias}.${column.columnName}`);
-        }
-        else if (op === "eq") {
-            return query.whereNull(`${alias}.${column.columnName}`);
-        }
-        else {
-            throw new Error("Only ne is supported when the value is undefined or null");
-        }
-    }
-    else if (op === "in") {
-        return query.whereIn(`${alias}.${column.columnName}`, value.map((v) => column.serde.mapToDb(v)));
-    }
-    else {
-        const fn = opToFn[op] || utils_1.fail(`Invalid operator ${op}`);
-        return query.where(`${alias}.${column.columnName}`, fn, column.serde.mapToDb(value));
-    }
-}
-//# sourceMappingURL=QueryBuilder.js.map

package/build/QueryBuilder.js.map

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

package/build/changes.d.ts

@@ -1,23 +0,0 @@
-import { Entity, IdOf, OptsOf } from "./EntityManager";
-/** Exposes a field's changed/original value in each entity's `this.changes` property. */
-export interface FieldStatus<T> {
-    hasChanged: boolean;
-    originalValue?: T;
-}
-declare type NullOrDefinedOr<T> = T | null | undefined;
-declare type ExcludeNever<T> = Pick<T, {
-    [P in keyof T]: T[P] extends never ? never : P;
-}[keyof T]>;
-/**
- * Creates the `this.changes.firstName` changes API for a given entity `T`.
- *
- * Specifically we use the fields from OptsOf but:
- *
- * - Exclude collections
- * - Convert entity types to id types to match what is stored in originalData
- */
-export declare type Changes<T extends Entity> = ExcludeNever<{
-    [P in keyof OptsOf<T>]-?: OptsOf<T>[P] extends NullOrDefinedOr<infer U> ? U extends Array<any> ? never : U extends Entity ? FieldStatus<IdOf<U>> : FieldStatus<U> : never;
-}>;
-export declare function newChangesProxy<T extends Entity>(entity: T): Changes<T>;
-export {};

package/build/changes.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.newChangesProxy = void 0;
-function newChangesProxy(entity) {
-    return new Proxy(entity, {
-        get(target, p) {
-            const originalValue = typeof p === "string" && entity.__orm.originalData[p];
-            const hasChanged = typeof p === "string" && p in entity.__orm.originalData && entity.id !== undefined;
-            return { hasChanged, originalValue };
-        },
-    });
-}
-exports.newChangesProxy = newChangesProxy;
-//# sourceMappingURL=changes.js.map

package/build/changes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"changes.js","sourceRoot":"","sources":["../src/changes.ts"],"names":[],"mappings":";;;AA+BA,SAAgB,eAAe,CAAmB,MAAS;IACzD,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,GAAG,CAAC,MAAM,EAAE,CAAc;YACxB,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS,CAAC;YACtG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;QACvC,CAAC;KACF,CAAQ,CAAC;AACZ,CAAC;AARD,0CAQC"}

package/build/collections/AbstractRelationImpl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AbstractRelationImpl.js","sourceRoot":"","sources":["../../src/collections/AbstractRelationImpl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAsB,oBAAoB;CAwBzC;AAxBD,oDAwBC"}

package/build/collections/CustomCollection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CustomCollection.js","sourceRoot":"","sources":["../../src/collections/CustomCollection.ts"],"names":[],"mappings":";;;AACA,oCAA8D;AAC9D,iEAA8D;AAa9D;;;;;;;;;;GAUG;AACH,MAAa,gBAAqD,SAAQ,2CAAyB;IAOjG,YAAmB,MAAS,EAAU,IAAgC;QACpE,KAAK,EAAE,CAAC;QADS,WAAM,GAAN,MAAM,CAAG;QAAU,SAAI,GAAJ,IAAI,CAA4B;QAF9D,cAAS,GAAG,KAAK,CAAC;IAI1B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAgC;QACzC,wBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE;gBAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/C,MAAM,IAAI,CAAC,WAAW,CAAC;gBACvB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;aACvB;iBAAM;gBACL,MAAM,IAAI,CAAC,WAAW,CAAC;aACxB;SACF;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,sBAAsB;QACpB,6FAA6F;QAC7F,4FAA4F;QAC5F,2FAA2F;QAC3F,gGAAgG;QAChG,yBAAyB;IAC3B,CAAC;IAED,GAAG,CAAC,MAAW;QACb,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACvC,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC1B;aAAM,IAAI,GAAG,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC;YACzB,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1F,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;SACxF;aAAM;YACL,YAAI,CAAC,mEAAmE,IAAI,EAAE,CAAC,CAAC;SACjF;IACH,CAAC;IAED,WAAW,CAAC,MAAW;QACrB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAW;QACpB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;SACtD;aAAM;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;SAC9B;IACH,CAAC;IAED,GAAG,CAAC,KAAQ;QACV,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,YAAI,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;SAC1C;QACD,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAQ;QACb,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC7B,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,YAAI,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;SAC1C;QACD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,2FAA2F;IAC3F,KAAK,CAAC,0BAA0B,KAAmB,CAAC;IACpD,cAAc,KAAU,CAAC;IACzB,KAAK,CAAC,eAAe,KAAmB,CAAC;IAEzC,2GAA2G;IAC3G,IAAI,SAAS;QACX,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ;QACN,OAAO,4BAA4B,IAAI,CAAC,MAAM,gBAAgB,IAAI,CAAC,SAAS,GAAG,CAAC;IAClF,CAAC;IAEO,KAAK,CAAC,IAAgC;QAC5C,wBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACrD,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEO,aAAa,CAAC,QAAsB,EAAE,IAAgC;QAC5E,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,MAAK,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5F,CAAC;CACF;AAtHD,4CAsHC;AAED,SAAS,iBAAiB,CAAC,SAAqC;IAC9D,IAAI,CAAC,CAAC,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QACzD,gGAAgG;QAChG,YAAI,CAAC,GAAG,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,SAAS,iBAAiB,CAAC,CAAC;KACnE;AACH,CAAC"}

package/build/collections/CustomReference.js.map

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