@venizia/ardor 0.4.6 → 0.4.7-0

package/dist/codemod/transform.d.ts

@@ -0,0 +1,51 @@
+import type * as TS from 'typescript';
+export type TTypeScript = typeof TS;
+/** Something the codemod found and did not change, with the place to look. */
+export interface IFinding {
+    line: number;
+    name: string;
+    reason: string;
+    /** `note`: something changed on purpose that the owner should know; it does not count as left. */
+    kind?: 'note';
+}
+export interface INamespaceResult {
+    text: string;
+    /** Identifiers rewritten to `Owner.member`. */
+    renamed: number;
+    findings: IFinding[];
+}
+/**
+ * Rewrites the deprecated bare names of `@venizia/ardor` to their class members, in source text:
+ * `isDefined(x)` becomes `ValueUtility.isDefined(x)` and the import follows. With `hooks`, a hook
+ * imported from `@venizia/ardor` itself becomes `Ardor.useX` (never one imported from the react or
+ * admin package, which cannot import `Ardor`).
+ *
+ * It reads syntax only (no type information), so it is conservative: a name the file also declares
+ * itself, an owner name already taken, an `export { name }` and a type-only import are listed in
+ * `findings` and left alone.
+ */
+export declare class NamespaceTransform {
+    static run(opts: {
+        ts: TTypeScript;
+        fileName: string;
+        text: string;
+        hooks: boolean;
+    }): INamespaceResult;
+    /** Every named import from an ARDOR package that has a class-member replacement. */
+    private static collectRenames;
+    private static collectBindings;
+    /** The renames that are safe: nothing in the file competes for the old name or for the class name. */
+    private static accept;
+    /** Walks the file once and records each use of an accepted import. */
+    private static collectReferences;
+    private static classify;
+    /** `App.DEFAULT_LOCALE` and the two removed `HeaderConstants`: listed, there is nothing to write instead. */
+    private static findRemovedMembers;
+    /** The import lines, with the old names out and the class names in (once per class). */
+    private static importEdits;
+    /** `{ a, b }` on one line when the import was on one line, one name per line when it was not. */
+    private static formatNames;
+    private static removeImport;
+    private static apply;
+}
+//# sourceMappingURL=transform.d.ts.map

package/dist/codemod/transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/codemod/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,MAAM,WAAW,GAAG,OAAO,EAAE,CAAC;AAEpC,8EAA8E;AAC9E,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,kGAAkG;IAClG,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,EAAE,CAAC;CACtB;AAyBD;;;;;;;;;GASG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACf,EAAE,EAAE,WAAW,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,OAAO,CAAC;KAChB,GAAG,gBAAgB;IA8CpB,oFAAoF;IACpF,OAAO,CAAC,MAAM,CAAC,cAAc;IA6E7B,OAAO,CAAC,MAAM,CAAC,eAAe;IAiE9B,sGAAsG;IACtG,OAAO,CAAC,MAAM,CAAC,MAAM;IAwDrB,sEAAsE;IACtE,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAyBhC,OAAO,CAAC,MAAM,CAAC,QAAQ;IA4EvB,6GAA6G;IAC7G,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAsDjC,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,WAAW;IAyD1B,iGAAiG;IACjG,OAAO,CAAC,MAAM,CAAC,WAAW;IA2B1B,OAAO,CAAC,MAAM,CAAC,YAAY;IA+B3B,OAAO,CAAC,MAAM,CAAC,KAAK;CAUrB"}

package/dist/codemod/transform.js

@@ -0,0 +1,384 @@
+import { FunctionRenames, HookRenames, NamespaceModules, RemovedNames, TypeRenames, } from './renames.js';
+/**
+ * Rewrites the deprecated bare names of `@venizia/ardor` to their class members, in source text:
+ * `isDefined(x)` becomes `ValueUtility.isDefined(x)` and the import follows. With `hooks`, a hook
+ * imported from `@venizia/ardor` itself becomes `Ardor.useX` (never one imported from the react or
+ * admin package, which cannot import `Ardor`).
+ *
+ * It reads syntax only (no type information), so it is conservative: a name the file also declares
+ * itself, an owner name already taken, an `export { name }` and a type-only import are listed in
+ * `findings` and left alone.
+ */
+export class NamespaceTransform {
+    static run(opts) {
+        const { ts, fileName, text, hooks } = opts;
+        if (!text.includes('@venizia/ardor')) {
+            return { text, renamed: 0, findings: [] };
+        }
+        const sourceFile = ts.createSourceFile(fileName, text, ts.ScriptTarget.Latest, true, fileName.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
+        const findings = [];
+        const renames = NamespaceTransform.collectRenames({ ts, sourceFile, hooks, findings });
+        NamespaceTransform.findRemovedMembers({ ts, sourceFile, findings });
+        if (renames.length === 0) {
+            return { text, renamed: 0, findings };
+        }
+        const bindings = NamespaceTransform.collectBindings({ ts, sourceFile });
+        const accepted = NamespaceTransform.accept({ renames, bindings, sourceFile, findings });
+        const byLocal = new Map(accepted.map((rename) => [rename.local, rename]));
+        NamespaceTransform.collectReferences({ ts, sourceFile, byLocal, findings });
+        const used = accepted.filter((rename) => rename.references.length > 0);
+        const edits = used.flatMap((rename) => rename.references.map((reference) => ({
+            start: reference.start,
+            end: reference.end,
+            text: reference.text,
+        })));
+        edits.push(...NamespaceTransform.importEdits({ ts, sourceFile, used, bindings }));
+        return {
+            text: NamespaceTransform.apply({ text, edits }),
+            renamed: used.reduce((sum, rename) => sum + rename.references.length, 0),
+            findings,
+        };
+    }
+    /** Every named import from an ARDOR package that has a class-member replacement. */
+    static collectRenames(opts) {
+        const { ts, sourceFile, hooks, findings } = opts;
+        const renames = [];
+        for (const statement of sourceFile.statements) {
+            if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier)) {
+                continue;
+            }
+            const module = statement.moduleSpecifier.text;
+            const clause = statement.importClause;
+            if (!NamespaceModules.isValid(module) || !clause) {
+                continue;
+            }
+            if (!clause.namedBindings || !ts.isNamedImports(clause.namedBindings)) {
+                continue;
+            }
+            for (const specifier of clause.namedBindings.elements) {
+                const imported = (specifier.propertyName ?? specifier.name).text;
+                const removed = RemovedNames.findExport({ name: imported });
+                if (removed) {
+                    findings.push({
+                        line: sourceFile.getLineAndCharacterOfPosition(specifier.getStart(sourceFile)).line + 1,
+                        name: specifier.name.text,
+                        reason: `removed: ${removed}`,
+                    });
+                    continue;
+                }
+                const typeText = TypeRenames.find({ name: imported });
+                if (typeText) {
+                    renames.push({
+                        specifier,
+                        declaration: statement,
+                        local: specifier.name.text,
+                        typeText,
+                        references: [],
+                    });
+                    continue;
+                }
+                // A function or a hook is a value: an import that is type-only cannot carry it.
+                if (clause.isTypeOnly || specifier.isTypeOnly) {
+                    continue;
+                }
+                let target = FunctionRenames.find({ name: imported });
+                if (!target && hooks && module === NamespaceModules.UMBRELLA) {
+                    target = HookRenames.find({ name: imported });
+                }
+                if (target) {
+                    renames.push({
+                        specifier,
+                        declaration: statement,
+                        local: specifier.name.text,
+                        target,
+                        references: [],
+                    });
+                }
+            }
+        }
+        return renames;
+    }
+    static collectBindings(opts) {
+        const { ts, sourceFile } = opts;
+        const declared = new Set();
+        const imported = new Map();
+        const declareName = (name) => {
+            if (ts.isIdentifier(name)) {
+                declared.add(name.text);
+                return;
+            }
+            for (const element of name.elements) {
+                if (ts.isBindingElement(element)) {
+                    declareName(element.name);
+                }
+            }
+        };
+        const visit = (node) => {
+            if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) {
+                const clause = node.importClause;
+                const module = node.moduleSpecifier.text;
+                const typeOnly = clause?.isTypeOnly ?? false;
+                if (clause?.name) {
+                    imported.set(clause.name.text, { module, typeOnly });
+                }
+                const bindings = clause?.namedBindings;
+                if (bindings && ts.isNamespaceImport(bindings)) {
+                    imported.set(bindings.name.text, { module, typeOnly });
+                }
+                else if (bindings) {
+                    for (const element of bindings.elements) {
+                        imported.set(element.name.text, { module, typeOnly: typeOnly || element.isTypeOnly });
+                    }
+                }
+                return;
+            }
+            if ((ts.isVariableDeclaration(node) || ts.isParameter(node) || ts.isBindingElement(node)) &&
+                node.name) {
+                declareName(node.name);
+            }
+            else if ((ts.isFunctionDeclaration(node) ||
+                ts.isClassDeclaration(node) ||
+                ts.isFunctionExpression(node) ||
+                ts.isClassExpression(node)) &&
+                node.name) {
+                declared.add(node.name.text);
+            }
+            ts.forEachChild(node, visit);
+        };
+        visit(sourceFile);
+        return { declared, imported };
+    }
+    /** The renames that are safe: nothing in the file competes for the old name or for the class name. */
+    static accept(opts) {
+        const { renames, bindings, sourceFile, findings } = opts;
+        return renames.filter((rename) => {
+            const line = sourceFile.getLineAndCharacterOfPosition(rename.specifier.getStart(sourceFile)).line + 1;
+            const owner = rename.target?.owner;
+            if (bindings.declared.has(rename.local)) {
+                findings.push({
+                    line,
+                    name: rename.local,
+                    reason: `the file also declares "${rename.local}" itself, so a use of the import cannot be told apart without types`,
+                });
+                return false;
+            }
+            if (!owner || !rename.target) {
+                return true;
+            }
+            const existing = bindings.imported.get(owner);
+            if (bindings.declared.has(owner) ||
+                (existing && !NamespaceModules.isValid(existing.module))) {
+                findings.push({
+                    line,
+                    name: rename.local,
+                    reason: `"${owner}" is already taken in this file; import it under another name and use ${owner}.${rename.target.member}`,
+                });
+                return false;
+            }
+            if (existing?.typeOnly) {
+                findings.push({
+                    line,
+                    name: rename.local,
+                    reason: `"${owner}" is imported as a type only; import it as a value to use ${owner}.${rename.target.member}`,
+                });
+                return false;
+            }
+            return true;
+        });
+    }
+    /** Walks the file once and records each use of an accepted import. */
+    static collectReferences(opts) {
+        const { ts, sourceFile, byLocal, findings } = opts;
+        const visit = (node) => {
+            if (ts.isImportDeclaration(node)) {
+                return;
+            }
+            const rename = ts.isIdentifier(node) ? byLocal.get(node.text) : undefined;
+            if (rename && ts.isIdentifier(node)) {
+                NamespaceTransform.classify({ ts, sourceFile, node, rename, findings });
+            }
+            ts.forEachChild(node, visit);
+        };
+        visit(sourceFile);
+    }
+    static classify(opts) {
+        const { ts, sourceFile, node, rename, findings } = opts;
+        const { parent } = node;
+        const replacement = rename.target
+            ? `${rename.target.owner}.${rename.target.member}`
+            : (rename.typeText ?? rename.local);
+        const start = node.getStart(sourceFile);
+        const end = node.getEnd();
+        // A name, not a use: a property, a member, a key, a label.
+        const isName = (ts.isPropertyAccessExpression(parent) && parent.name === node) ||
+            (ts.isQualifiedName(parent) && parent.right === node) ||
+            (ts.isBindingElement(parent) && parent.propertyName === node) ||
+            ((ts.isPropertyAssignment(parent) ||
+                ts.isPropertyDeclaration(parent) ||
+                ts.isPropertySignature(parent) ||
+                ts.isMethodDeclaration(parent) ||
+                ts.isMethodSignature(parent) ||
+                ts.isGetAccessorDeclaration(parent) ||
+                ts.isSetAccessorDeclaration(parent) ||
+                ts.isEnumMember(parent) ||
+                ts.isJsxAttribute(parent)) &&
+                parent.name === node);
+        if (isName) {
+            return;
+        }
+        if (ts.isExportSpecifier(parent)) {
+            // `export { x as isDefined }` names a new export; `export { isDefined }` re-exports the import.
+            if (parent.propertyName && parent.name === node) {
+                return;
+            }
+            findings.push({
+                line: sourceFile.getLineAndCharacterOfPosition(start).line + 1,
+                name: rename.local,
+                reason: `re-exported by name; export ${replacement} under a name of your own`,
+            });
+            return;
+        }
+        if (rename.typeText !== undefined) {
+            // A type is a name in a type position only: `NullableType[]` needs parentheses once replaced.
+            if (ts.isTypeReferenceNode(parent) && parent.typeName === node) {
+                const grand = parent.parent;
+                const wrap = rename.typeText.includes('|') &&
+                    (ts.isArrayTypeNode(grand) ||
+                        ts.isIntersectionTypeNode(grand) ||
+                        ts.isTypeOperatorNode(grand) ||
+                        ts.isIndexedAccessTypeNode(grand));
+                rename.references.push({ start, end, text: wrap ? `(${replacement})` : replacement });
+            }
+            return;
+        }
+        if (ts.isShorthandPropertyAssignment(parent) && parent.name === node) {
+            rename.references.push({ start, end, text: `${rename.local}: ${replacement}` });
+            return;
+        }
+        rename.references.push({ start, end, text: replacement });
+    }
+    /** `App.DEFAULT_LOCALE` and the two removed `HeaderConstants`: listed, there is nothing to write instead. */
+    static findRemovedMembers(opts) {
+        const { ts, sourceFile, findings } = opts;
+        const owners = new Map();
+        for (const statement of sourceFile.statements) {
+            if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier)) {
+                continue;
+            }
+            const named = statement.importClause?.namedBindings;
+            if (!NamespaceModules.isValid(statement.moduleSpecifier.text) ||
+                !named ||
+                !ts.isNamedImports(named)) {
+                continue;
+            }
+            for (const specifier of named.elements) {
+                owners.set(specifier.name.text, (specifier.propertyName ?? specifier.name).text);
+            }
+        }
+        if (owners.size === 0) {
+            return;
+        }
+        const visit = (node) => {
+            if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.expression)) {
+                const owner = owners.get(node.expression.text);
+                const reason = owner
+                    ? RemovedNames.findMember({ owner, member: node.name.text })
+                    : undefined;
+                if (reason) {
+                    findings.push({
+                        line: sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)).line + 1,
+                        name: `${node.expression.text}.${node.name.text}`,
+                        reason: `removed: ${reason}`,
+                    });
+                }
+            }
+            ts.forEachChild(node, visit);
+        };
+        visit(sourceFile);
+    }
+    /** The import lines, with the old names out and the class names in (once per class). */
+    static importEdits(opts) {
+        const { ts, sourceFile, used, bindings } = opts;
+        const edits = [];
+        const added = new Set();
+        const declarations = new Set(used.map((rename) => rename.declaration));
+        for (const declaration of declarations) {
+            const clause = declaration.importClause;
+            const named = clause?.namedBindings;
+            if (!clause || !named || !ts.isNamedImports(named)) {
+                continue;
+            }
+            const renamed = new Set(used
+                .filter((rename) => rename.declaration === declaration)
+                .map((rename) => rename.specifier));
+            const kept = named.elements
+                .filter((element) => !renamed.has(element))
+                .map((element) => element.getText(sourceFile));
+            const owners = [
+                ...new Set(used
+                    .filter((rename) => rename.declaration === declaration)
+                    .map((rename) => rename.target?.owner)
+                    .filter((owner) => owner !== undefined)),
+            ].filter((owner) => !bindings.imported.has(owner) && !added.has(owner));
+            for (const owner of owners) {
+                added.add(owner);
+            }
+            const names = [...kept, ...owners];
+            if (names.length === 0) {
+                edits.push(NamespaceTransform.removeImport({ sourceFile, declaration, clause, named, ts }));
+                continue;
+            }
+            edits.push({
+                start: named.getStart(sourceFile),
+                end: named.getEnd(),
+                text: NamespaceTransform.formatNames({ sourceFile, declaration, named, names }),
+            });
+        }
+        return edits;
+    }
+    /** `{ a, b }` on one line when the import was on one line, one name per line when it was not. */
+    static formatNames(opts) {
+        const { sourceFile, declaration, named, names } = opts;
+        const original = named.getText(sourceFile);
+        if (!original.includes('\n')) {
+            return `{ ${names.join(', ')} }`;
+        }
+        const lineStart = (position) => {
+            const before = sourceFile.text.slice(0, position);
+            return before.slice(before.lastIndexOf('\n') + 1);
+        };
+        const closing = /^\s*/.exec(lineStart(declaration.getStart(sourceFile)))?.[0] ?? '';
+        const first = named.elements[0];
+        const indent = first
+            ? (/^\s*/.exec(lineStart(first.getStart(sourceFile)))?.[0] ?? '  ')
+            : `${closing}  `;
+        return `{\n${names.map((name) => `${indent}${name},`).join('\n')}\n${closing}}`;
+    }
+    static removeImport(opts) {
+        const { sourceFile, declaration, clause, named } = opts;
+        // `import Default, { a } from 'x'`: drop the braces and the comma, keep the default.
+        if (clause.name) {
+            return { start: clause.name.getEnd(), end: named.getEnd(), text: '' };
+        }
+        const start = declaration.getStart(sourceFile);
+        let end = declaration.getEnd();
+        if (sourceFile.text[end] === '\n') {
+            end += 1;
+        }
+        // The blank line that separated this import from the code goes with it, not a second one.
+        const alone = start === 0 || sourceFile.text.slice(start - 2, start) === '\n\n';
+        if (alone && sourceFile.text[end] === '\n') {
+            end += 1;
+        }
+        return { start, end, text: '' };
+    }
+    static apply(opts) {
+        const ordered = [...opts.edits].sort((a, b) => b.start - a.start);
+        let result = opts.text;
+        for (const edit of ordered) {
+            result = result.slice(0, edit.start) + edit.text + result.slice(edit.end);
+        }
+        return result;
+    }
+}
+//# sourceMappingURL=transform.js.map

package/dist/codemod/transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../src/codemod/transform.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,WAAW,EAEX,gBAAgB,EAChB,YAAY,EACZ,WAAW,GACZ,MAAM,WAAW,CAAC;AA2CnB;;;;;;;;;GASG;AACH,MAAM,OAAO,kBAAkB;IAC7B,MAAM,CAAC,GAAG,CAAC,IAKV;QACC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC5C,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,QAAQ,EACR,IAAI,EACJ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,EACJ,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CACjE,CAAC;QACF,MAAM,QAAQ,GAAe,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvF,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEpE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;QACxC,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxF,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAE1E,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE5E,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvE,MAAM,KAAK,GAAgB,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACjD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACpC,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,GAAG,EAAE,SAAS,CAAC,GAAG;YAClB,IAAI,EAAE,SAAS,CAAC,IAAI;SACrB,CAAC,CAAC,CACJ,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAElF,OAAO;YACL,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YACxE,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,oFAAoF;IAC5E,MAAM,CAAC,cAAc,CAAC,IAK7B;QACC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACjD,MAAM,OAAO,GAAc,EAAE,CAAC;QAE9B,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;gBACzF,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC;YAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC;YAEtC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjD,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBACtE,SAAS;YACX,CAAC;YAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACtD,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;gBACjE,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAE5D,IAAI,OAAO,EAAE,CAAC;oBACZ,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,UAAU,CAAC,6BAA6B,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;wBACvF,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;wBACzB,MAAM,EAAE,YAAY,OAAO,EAAE;qBAC9B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAEtD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC,IAAI,CAAC;wBACX,SAAS;wBACT,WAAW,EAAE,SAAS;wBACtB,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;wBAC1B,QAAQ;wBACR,UAAU,EAAE,EAAE;qBACf,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,gFAAgF;gBAChF,IAAI,MAAM,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBAED,IAAI,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAEtD,IAAI,CAAC,MAAM,IAAI,KAAK,IAAI,MAAM,KAAK,gBAAgB,CAAC,QAAQ,EAAE,CAAC;oBAC7D,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAChD,CAAC;gBAED,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,SAAS;wBACT,WAAW,EAAE,SAAS;wBACtB,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;wBAC1B,MAAM;wBACN,UAAU,EAAE,EAAE;qBACf,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,IAAoD;QACjF,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAiD,CAAC;QAE1E,MAAM,WAAW,GAAG,CAAC,IAAoB,EAAQ,EAAE;YACjD,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAExB,OAAO;YACT,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACpC,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;gBACjC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;gBACzC,MAAM,QAAQ,GAAG,MAAM,EAAE,UAAU,IAAI,KAAK,CAAC;gBAE7C,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC;oBACjB,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACvD,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,EAAE,aAAa,CAAC;gBAEvC,IAAI,QAAQ,IAAI,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC/C,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,QAAQ,EAAE,CAAC;oBACpB,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBACxC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;oBACxF,CAAC;gBACH,CAAC;gBAED,OAAO;YACT,CAAC;YAED,IACE,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBACrF,IAAI,CAAC,IAAI,EACT,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;iBAAM,IACL,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;gBAC7B,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBAC3B,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBAC7B,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBAC7B,IAAI,CAAC,IAAI,EACT,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,sGAAsG;IAC9F,MAAM,CAAC,MAAM,CAAC,IAKrB;QACC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEzD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,MAAM,IAAI,GACR,UAAU,CAAC,6BAA6B,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;YAC3F,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;YAEnC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxC,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI;oBACJ,IAAI,EAAE,MAAM,CAAC,KAAK;oBAClB,MAAM,EAAE,2BAA2B,MAAM,CAAC,KAAK,qEAAqE;iBACrH,CAAC,CAAC;gBAEH,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAE9C,IACE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC5B,CAAC,QAAQ,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EACxD,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI;oBACJ,IAAI,EAAE,MAAM,CAAC,KAAK;oBAClB,MAAM,EAAE,IAAI,KAAK,yEAAyE,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;iBAC1H,CAAC,CAAC;gBAEH,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,QAAQ,EAAE,QAAQ,EAAE,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI;oBACJ,IAAI,EAAE,MAAM,CAAC,KAAK;oBAClB,MAAM,EAAE,IAAI,KAAK,6DAA6D,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;iBAC9G,CAAC,CAAC;gBAEH,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sEAAsE;IAC9D,MAAM,CAAC,iBAAiB,CAAC,IAKhC;QACC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEnD,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACpC,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE1E,IAAI,MAAM,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC1E,CAAC;YAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,KAAK,CAAC,UAAU,CAAC,CAAC;IACpB,CAAC;IAEO,MAAM,CAAC,QAAQ,CAAC,IAMvB;QACC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM;YAC/B,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;YAClD,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAE1B,2DAA2D;QAC3D,MAAM,MAAM,GACV,CAAC,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;YAC/D,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC;YACrD,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,CAAC;YAC7D,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC;gBAC/B,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC;gBAChC,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBAC9B,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBAC9B,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC5B,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;gBACnC,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;gBACnC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;gBACvB,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAE1B,IAAI,MAAM,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,IAAI,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,gGAAgG;YAChG,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBAChD,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC;gBAC9D,IAAI,EAAE,MAAM,CAAC,KAAK;gBAClB,MAAM,EAAE,+BAA+B,WAAW,2BAA2B;aAC9E,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,8FAA8F;YAC9F,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC5B,MAAM,IAAI,GACR,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAC7B,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;wBACxB,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC;wBAChC,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC;wBAC5B,EAAE,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;gBAEvC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACxF,CAAC;YAED,OAAO;QACT,CAAC;QAED,IAAI,EAAE,CAAC,6BAA6B,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACrE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,KAAK,WAAW,EAAE,EAAE,CAAC,CAAC;YAEhF,OAAO;QACT,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,6GAA6G;IACrG,MAAM,CAAC,kBAAkB,CAAC,IAIjC;QACC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEzC,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;gBACzF,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;YAEpD,IACE,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC;gBACzD,CAAC,KAAK;gBACN,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EACzB,CAAC;gBACD,SAAS;YACX,CAAC;YAED,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;YACpC,IAAI,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC/C,MAAM,MAAM,GAAG,KAAK;oBAClB,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC5D,CAAC,CAAC,SAAS,CAAC;gBAEd,IAAI,MAAM,EAAE,CAAC;oBACX,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,UAAU,CAAC,6BAA6B,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;wBAClF,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;wBACjD,MAAM,EAAE,YAAY,MAAM,EAAE;qBAC7B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,KAAK,CAAC,UAAU,CAAC,CAAC;IACpB,CAAC;IAED,wFAAwF;IAChF,MAAM,CAAC,WAAW,CAAC,IAK1B;QACC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAChD,MAAM,KAAK,GAAgB,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QAEvE,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC;YACxC,MAAM,KAAK,GAAG,MAAM,EAAE,aAAa,CAAC;YAEpC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnD,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,IAAI;iBACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC;iBACtD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CACrC,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ;iBACxB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBAC1C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG;gBACb,GAAG,IAAI,GAAG,CACR,IAAI;qBACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CAAC;qBACtD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;qBACrC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAC3D;aACF,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAExE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;YAED,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;YAEnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC5F,SAAS;YACX,CAAC;YAED,KAAK,CAAC,IAAI,CAAC;gBACT,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACjC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE;gBACnB,IAAI,EAAE,kBAAkB,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAChF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iGAAiG;IACzF,MAAM,CAAC,WAAW,CAAC,IAK1B;QACC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAU,EAAE;YAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAElD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpF,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,KAAK;YAClB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YACnE,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC;QAEnB,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,GAAG,CAAC;IAClF,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,IAM3B;QACC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAExD,qFAAqF;QACrF,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACxE,CAAC;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;QAE/B,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAClC,GAAG,IAAI,CAAC,CAAC;QACX,CAAC;QAED,0FAA0F;QAC1F,MAAM,KAAK,GAAG,KAAK,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,KAAK,MAAM,CAAC;QAEhF,IAAI,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAC3C,GAAG,IAAI,CAAC,CAAC;QACX,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,IAA0C;QAC7D,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAClE,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * as Ardor from './ardor.js';
 export * from '@venizia/ardor-kernel';
 export * from '@venizia/ardor-react';
 export * from '@venizia/ardor-admin';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,6 +1,7 @@
 // ARDOR - one entry point over the framework packages.
 // An application imports from `@venizia/ardor`; a consumer that needs only one layer installs that
 // package directly.
+export * as Ardor from './ardor.js';
 export * from '@venizia/ardor-kernel';
 export * from '@venizia/ardor-react';
 export * from '@venizia/ardor-admin';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,mGAAmG;AACnG,oBAAoB;AACpB,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,mGAAmG;AACnG,oBAAoB;AACpB,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC"}

package/dist/presets/app/files/src/application.test.ts

@@ -39,12 +39,14 @@ describe('AdminConfiguration', () => {
   });
 
   test('binds the REST data provider options under their key', async () => {
-    expect(await restUrlOf()).toBe('/api');
+    const result = await restUrlOf();
+    expect(result).toBe('/api');
   });
 
   test('the API url is the one config.js wrote when the container started', async () => {
     Reflect.set(globalThis, RUNTIME_CONFIG_GLOBAL, { VITE_API_URL: 'https://api.example.com' });
 
-    expect(await restUrlOf()).toBe('https://api.example.com');
+    const result = await restUrlOf();
+    expect(result).toBe('https://api.example.com');
   });
 });

package/dist/presets/app/files/src/configurations/admin.configuration.ts

@@ -5,9 +5,9 @@ import {
   DefaultI18nProvider,
   DefaultRestDataProvider,
   englishMessages,
-  getRuntimeConfig,
   inject,
   provide,
+  RuntimeConfig,
 } from '@venizia/ardor';
 
 // The two providers an application without sign-in needs. start() binds each @provide method under its
@@ -24,7 +24,7 @@ export class AdminConfiguration {
     // No sign-in: no request carries an Authorization header. The API is `/api` (the image's nginx
     // forwards it to API_UPSTREAM) unless VITE_API_URL says otherwise: set in .env in dev, or written to
     // config.js when the container starts, so one built image serves every environment.
-    const url = getRuntimeConfig({
+    const url = RuntimeConfig.get({
       key: 'VITE_API_URL',
       buildTimeEnv: import.meta.env,
       defaultValue: '/api',

package/dist/presets/app/preset.json

@@ -13,12 +13,12 @@
   "dependencies": {
     "@reduxjs/toolkit": "^2.13.0",
     "@tanstack/react-query": "^5.104.5",
-    "@venizia/ardor": "0.4.6",
-    "@venizia/ignis-connectors": "0.4.6",
-    "@venizia/ignis-filter": "0.4.5",
-    "@venizia/ignis-helpers": "0.4.6",
-    "@venizia/ignis-inversion": "0.4.5",
-    "@venizia/ignis-kernel": "0.4.6",
+    "@venizia/ardor": "0.4.7-0",
+    "@venizia/ignis-connectors": "0.4.7-2",
+    "@venizia/ignis-filter": "0.4.6-1",
+    "@venizia/ignis-helpers": "0.4.7-2",
+    "@venizia/ignis-inversion": "0.4.6-1",
+    "@venizia/ignis-kernel": "0.4.7-2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "ra-core": "^5.15.5",
@@ -35,8 +35,8 @@
     "@types/bun": "^1.4.3",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "@venizia/dev-configs": "0.4.6",
-    "@venizia/ignis-boot": "0.4.6",
+    "@venizia/dev-configs": "0.4.7-2",
+    "@venizia/ignis-boot": "0.4.7-2",
     "@vitejs/plugin-react": "^6.1.2",
     "eslint": "^10.13.0",
     "oxlint": "1.89.0",
@@ -46,12 +46,12 @@
     "vite": "^8.3.5"
   },
   "peers": {
-    "@venizia/dev-configs": "^0.4.0",
-    "@venizia/ignis-connectors": "^0.4.1",
-    "@venizia/ignis-filter": "^0.4.1",
-    "@venizia/ignis-helpers": "^0.4.1",
-    "@venizia/ignis-inversion": "^0.4.4",
-    "@venizia/ignis-kernel": "^0.4.1"
+    "@venizia/dev-configs": "^0.4.0 || 0.4.7-2",
+    "@venizia/ignis-connectors": "^0.4.7-2",
+    "@venizia/ignis-filter": "^0.4.6-1",
+    "@venizia/ignis-helpers": "^0.4.7-2",
+    "@venizia/ignis-inversion": "^0.4.6-1",
+    "@venizia/ignis-kernel": "^0.4.7-2"
   },
   "scripts": {
     "server:dev": "vite --config .configs/builders/vite.config.mts",

package/dist/presets/lib/preset.json

@@ -5,14 +5,14 @@
   "devDependencies": {
     "@types/bun": "^1.4.3",
     "@types/react": "^19",
-    "@venizia/ardor": "^0.4.6",
-    "@venizia/dev-configs": "0.4.6",
-    "@venizia/ignis-boot": "0.4.6",
-    "@venizia/ignis-connectors": "0.4.6",
-    "@venizia/ignis-filter": "0.4.5",
-    "@venizia/ignis-helpers": "0.4.6",
-    "@venizia/ignis-inversion": "0.4.5",
-    "@venizia/ignis-kernel": "0.4.6",
+    "@venizia/ardor": "^0.4.7-0",
+    "@venizia/dev-configs": "0.4.7-2",
+    "@venizia/ignis-boot": "0.4.7-2",
+    "@venizia/ignis-connectors": "0.4.7-2",
+    "@venizia/ignis-filter": "0.4.6-1",
+    "@venizia/ignis-helpers": "0.4.7-2",
+    "@venizia/ignis-inversion": "0.4.6-1",
+    "@venizia/ignis-kernel": "0.4.7-2",
     "eslint": "^10.13.0",
     "oxlint": "1.89.0",
     "oxlint-tsgolint": "7.0.2004",
@@ -23,7 +23,7 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@venizia/ardor": "^0.4.6",
+    "@venizia/ardor": "^0.4.7-0",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
     "react-router-dom": "^7.18.4",

package/dist/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AAGtD,OAAO,EAAgB,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,kGAAkG;AAClG,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC;AAE/C,MAAM,WAAW,mCAAmC;IAClD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAEhC,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAmBD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,2BAA2B,GAAU,WAAW,SAAS,oBAAoB,EACxF,aAAa,WAAW,GAAG,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,EACrE,UAAS,mCAAwC,KAChD,OAAO,CAAC,WAAW,CA0DrB,CAAC"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AAGtD,OAAO,EAAgB,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,kGAAkG;AAClG,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC;AAE/C,MAAM,WAAW,mCAAmC;IAClD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAEhC,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAmBD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,2BAA2B,GAAU,WAAW,SAAS,oBAAoB,EACxF,aAAa,WAAW,GAAG,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,EACrE,UAAS,mCAAwC,KAChD,OAAO,CAAC,WAAW,CAiErB,CAAC"}