@memoarchitect/tools 0.6.6 → 0.7.2

package/packages/tools/lib/model/kind-registry.d.ts

@@ -1,4 +1,25 @@
-import type { KindDefinition, SysMLConstruct } from './config.js';
+import type { SysMLConstruct } from './config.js';
+/**
+ * A kind as the registry reports it.
+ *
+ * This shape used to live in `config.ts`, where a YAML `kinds:` block could
+ * declare one. Kinds come from the ontology's own `part def` / `item def`
+ * declarations now, so the shape belongs to the registry that derives it.
+ */
+export interface KindDefinition {
+    /** Human-readable label */
+    label: string;
+    /** Architecture layer this kind belongs to */
+    layer?: string;
+    /** SysML v2 construct this kind maps to */
+    sysmlConstruct: SysMLConstruct;
+    /** Icon identifier for the palette/diagram */
+    icon?: string;
+    /** Template file for new instances */
+    template?: string;
+    /** Default attributes for new instances */
+    defaultAttributes?: Record<string, string>;
+}
 import type { ParsedDocument } from './parser-utils.js';
 import type { KindDefinitionDTO } from './relationship-legality.js';
 /** Entry in the KindRegistry, matching KindDefinition shape */
@@ -25,6 +46,29 @@ export interface KindRegistryEntry {
     isAbstract?: boolean;
     /** Namespace segments mirrored by the ontology source folders. */
     namespace?: string[];
+    /**
+     * Fully qualified name, e.g. `memo::ontology::assurance::safety_risk::Hazard`.
+     *
+     * This is the registry's real identity. `name` is a short index into it,
+     * which resolves only while it is unambiguous — see `getCollisions`.
+     */
+    qualifiedName?: string;
+    /** Source file this definition was declared in. */
+    sourceFile?: string;
+}
+/**
+ * Two definitions sharing a short name.
+ *
+ * Previously the second silently replaced the first in a `Map` keyed by short
+ * name, so which one survived depended on file iteration order and the loss was
+ * invisible. Collisions are now recorded and surfaced as load diagnostics.
+ */
+export interface KindNameCollision {
+    shortName: string;
+    /** Qualified names competing for the short name, in discovery order. */
+    qualifiedNames: string[];
+    /** Files declaring them, aligned with `qualifiedNames`. */
+    sourceFiles: string[];
 }
 /**
  * Registry that discovers kinds from SysML AST Definition nodes.
@@ -32,6 +76,27 @@ export interface KindRegistryEntry {
  */
 export declare class KindRegistry {
     private readonly kinds;
+    /**
+     * Attribute values bound by a `view def`, keyed by definition name, with the
+     * definition's own supertype chain already merged in.
+     *
+     * A view usage inherits these — `view mainScreenLayout : MemoScreenLayoutView`
+     * gets that definition's `viewKind` without restating it, and SysIDE in fact
+     * REJECTS restating it ("Cannot override a binding feature value"). So the
+     * definition is the only place the value can live, and consumers resolve a
+     * usage's presentation by falling back here.
+     *
+     * View definitions are not registered as kinds: they classify views, not
+     * model elements, and adding them to the kind extent would put them in the
+     * Explorer and in kind counts where they do not belong.
+     */
+    private readonly viewDefaults;
+    private readonly viewSuperTypes;
+    /** short name → the qualified name it currently resolves to. */
+    private readonly byQualifiedName;
+    /** qualified name → declaring file, for collision diagnostics. */
+    private readonly sourceFiles;
+    private readonly collisions;
     /** Number of registered kinds */
     get size(): number;
     /**
@@ -39,6 +104,11 @@ export declare class KindRegistry {
      * Returns undefined if the kind is not registered.
      */
     getKind(name: string): KindRegistryEntry | undefined;
+    /**
+     * Attribute values a view usage inherits from its `view def`, resolved up
+     * the definition's specialization chain (nearest declaration wins).
+     */
+    getViewDefaults(viewDefName: string | undefined): Record<string, string> | undefined;
     /**
      * Convert a registry entry to a KindDefinition (for backward compat with builder).
      */
@@ -81,6 +151,24 @@ export declare class KindRegistry {
     }[];
     /** Register a kind manually (for testing or config fallback) */
     register(entry: KindRegistryEntry): void;
+    /**
+     * Track qualified identity alongside the short-name map.
+     *
+     * Short-name lookup is kept as-is so every existing caller keeps working;
+     * what changes is that a shadowed definition is no longer lost silently.
+     * A re-registration of the SAME qualified name is not a collision — that
+     * happens legitimately when a registry is copied in `withProjectExtensions`.
+     */
+    private recordIdentity;
+    /**
+     * Short names claimed by more than one qualified definition.
+     *
+     * Callers surface these as load diagnostics: a reference to an ambiguous
+     * short name cannot be resolved by load order and needs qualifying.
+     */
+    getCollisions(): KindNameCollision[];
+    /** Qualified name a short name currently resolves to. */
+    getQualifiedName(shortName: string): string | undefined;
     /**
      * Compute the derivedBy reverse-lookup for all kinds.
      * Must be called after populateFromDocuments() is complete.
@@ -94,4 +182,29 @@ export declare class KindRegistry {
     /** Walk a package declaration and register all Definition nodes */
     private walkPackage;
 }
+/**
+ * The ontology facts a formatter or importer needs, derived from the registries.
+ *
+ * Consumers used to take a `MEMOConfig` and read `config.kinds` and
+ * `config.relationshipTypes` off it, which meant a settings file could declare
+ * a kind the ontology never defined. They take this instead: it can only be
+ * built from what the resolved SysML declares.
+ */
+export interface OntologyView {
+    kinds: Record<string, KindDefinition>;
+    relationshipTypes: Array<{
+        name: string;
+        label: string;
+        layer: string;
+        color: string;
+    }>;
+}
+/** An empty view — what a caller has before any ontology is resolved. */
+export declare const EMPTY_ONTOLOGY_VIEW: OntologyView;
+/** Build a view from populated registries. */
+export declare function ontologyViewFrom(kindRegistry?: {
+    toKindsRecord(): Record<string, KindDefinition>;
+}, relationshipRegistry?: {
+    toRelationshipTypesArray(): OntologyView['relationshipTypes'];
+}): OntologyView;
 //# sourceMappingURL=kind-registry.d.ts.map

package/packages/tools/lib/model/kind-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kind-registry.d.ts","sourceRoot":"","sources":["../../src/model/kind-registry.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAC9B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,cAAc,EAAE,cAAc,CAAC;IAC/B,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,yFAAyF;IACzF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAiBD;;;GAGG;AACH,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwC;IAE9D,iCAAiC;IACjC,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIpD;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAU1D;;;OAGG;IACH,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC;IAY/C,oCAAoC;IACpC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,yBAAyB;IACzB,SAAS,IAAI,MAAM,EAAE;IAIrB,sBAAsB;IACtB,OAAO,IAAI,iBAAiB,EAAE;IAI9B;;;;;;;;;;;;OAYG;IACH,qBAAqB,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,YAAY;IAyDhE;;;;OAIG;IACH,gBAAgB,IAAI,iBAAiB,EAAE;IAYvC,wEAAwE;IACxE,mBAAmB,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iBAAiB,EAAE,CAAA;KAAE,EAAE;IAczE,gEAAgE;IAChE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAIxC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAiBxB;;;OAGG;IACH,qBAAqB,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI;IAexD,mEAAmE;IACnE,OAAO,CAAC,WAAW;CA4CtB"}
+{"version":3,"file":"kind-registry.d.ts","sourceRoot":"","sources":["../../src/model/kind-registry.ts"],"names":[],"mappings":"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"}

package/packages/tools/lib/model/kind-registry.js

@@ -14,6 +14,36 @@
 import { isPartDefinition, isRequirementDefinition, isVerificationDefinition, isStateDefinition, isUseCaseDeclaration, isActionDefinition, isItemDefinition, isPortDefinition, isInterfaceDefinition, isAttributeDefinition, isEnumDefinition, isPackageDeclaration, } from '../language/generated/ast.js';
 import { resolveLayerFromPath, resolveNamespaceFromPath, resolveStandardFromPath } from './layer-resolver.js';
 /** AST $type → SysMLConstruct mapping */
+/**
+ * Literal attribute values declared in a definition body. Only literals are
+ * read: an inherited presentation hint is always a literal, and anything else
+ * belongs to the usage.
+ */
+function extractBoundAttributes(body) {
+    const out = {};
+    for (const member of body ?? []) {
+        if (member?.$type !== 'AttributeMember' || !member.value || !member.name)
+            continue;
+        const v = member.value;
+        switch (v.$type) {
+            case 'StringValue':
+                out[member.name] = String(v.value).replace(/^"|"$/g, '');
+                break;
+            case 'IntValue':
+            case 'RealValue':
+                out[member.name] = String(v.value);
+                break;
+            case 'BooleanValue':
+                out[member.name] = String(v.value);
+                break;
+            case 'EnumValue':
+                out[member.name] = String(v.enumRef ?? '');
+                break;
+            default: break;
+        }
+    }
+    return out;
+}
 const AST_TYPE_TO_CONSTRUCT = {
     PartDefinition: 'part def',
     RequirementDefinition: 'requirement def',
@@ -33,6 +63,27 @@ const AST_TYPE_TO_CONSTRUCT = {
  */
 export class KindRegistry {
     kinds = new Map();
+    /**
+     * Attribute values bound by a `view def`, keyed by definition name, with the
+     * definition's own supertype chain already merged in.
+     *
+     * A view usage inherits these — `view mainScreenLayout : MemoScreenLayoutView`
+     * gets that definition's `viewKind` without restating it, and SysIDE in fact
+     * REJECTS restating it ("Cannot override a binding feature value"). So the
+     * definition is the only place the value can live, and consumers resolve a
+     * usage's presentation by falling back here.
+     *
+     * View definitions are not registered as kinds: they classify views, not
+     * model elements, and adding them to the kind extent would put them in the
+     * Explorer and in kind counts where they do not belong.
+     */
+    viewDefaults = new Map();
+    viewSuperTypes = new Map();
+    /** short name → the qualified name it currently resolves to. */
+    byQualifiedName = new Map();
+    /** qualified name → declaring file, for collision diagnostics. */
+    sourceFiles = new Map();
+    collisions = new Map();
     /** Number of registered kinds */
     get size() {
         return this.kinds.size;
@@ -44,6 +95,26 @@ export class KindRegistry {
     getKind(name) {
         return this.kinds.get(name);
     }
+    /**
+     * Attribute values a view usage inherits from its `view def`, resolved up
+     * the definition's specialization chain (nearest declaration wins).
+     */
+    getViewDefaults(viewDefName) {
+        if (!viewDefName)
+            return undefined;
+        const merged = {};
+        const seen = new Set();
+        let name = viewDefName;
+        while (name && !seen.has(name)) {
+            seen.add(name);
+            for (const [k, v] of Object.entries(this.viewDefaults.get(name) ?? {})) {
+                if (!(k in merged))
+                    merged[k] = v; // nearest declaration wins
+            }
+            name = this.viewSuperTypes.get(name);
+        }
+        return Object.keys(merged).length > 0 ? merged : undefined;
+    }
     /**
      * Convert a registry entry to a KindDefinition (for backward compat with builder).
      */
@@ -106,6 +177,12 @@ export class KindRegistry {
                 derivedBy: entry.derivedBy ? [...entry.derivedBy] : undefined,
             });
         }
+        for (const [name, defaults] of this.viewDefaults) {
+            result.viewDefaults.set(name, { ...defaults });
+        }
+        for (const [name, superType] of this.viewSuperTypes) {
+            result.viewSuperTypes.set(name, superType);
+        }
         const discovered = new KindRegistry();
         discovered.populateFromDocuments(documents);
         let pending = discovered.entries().filter(entry => !result.has(entry.name));
@@ -185,8 +262,50 @@ export class KindRegistry {
     }
     /** Register a kind manually (for testing or config fallback) */
     register(entry) {
+        this.recordIdentity(entry);
         this.kinds.set(entry.name, entry);
     }
+    /**
+     * Track qualified identity alongside the short-name map.
+     *
+     * Short-name lookup is kept as-is so every existing caller keeps working;
+     * what changes is that a shadowed definition is no longer lost silently.
+     * A re-registration of the SAME qualified name is not a collision — that
+     * happens legitimately when a registry is copied in `withProjectExtensions`.
+     */
+    recordIdentity(entry) {
+        const qualified = entry.qualifiedName ?? entry.name;
+        const existing = this.byQualifiedName.get(entry.name);
+        if (existing && existing !== qualified) {
+            const collision = this.collisions.get(entry.name) ?? {
+                shortName: entry.name,
+                qualifiedNames: [existing],
+                sourceFiles: [this.sourceFiles.get(existing) ?? '(unknown)'],
+            };
+            if (!collision.qualifiedNames.includes(qualified)) {
+                collision.qualifiedNames.push(qualified);
+                collision.sourceFiles.push(entry.sourceFile ?? '(unknown)');
+            }
+            this.collisions.set(entry.name, collision);
+        }
+        this.byQualifiedName.set(entry.name, qualified);
+        if (entry.sourceFile)
+            this.sourceFiles.set(qualified, entry.sourceFile);
+    }
+    /**
+     * Short names claimed by more than one qualified definition.
+     *
+     * Callers surface these as load diagnostics: a reference to an ambiguous
+     * short name cannot be resolved by load order and needs qualifying.
+     */
+    getCollisions() {
+        return [...this.collisions.values()]
+            .sort((a, b) => a.shortName.localeCompare(b.shortName));
+    }
+    /** Qualified name a short name currently resolves to. */
+    getQualifiedName(shortName) {
+        return this.byQualifiedName.get(shortName);
+    }
     /**
      * Compute the derivedBy reverse-lookup for all kinds.
      * Must be called after populateFromDocuments() is complete.
@@ -220,16 +339,30 @@ export class KindRegistry {
             const namespace = resolveNamespaceFromPath(doc.filePath);
             for (const member of model.members) {
                 if (isPackageDeclaration(member)) {
-                    this.walkPackage(member, layer, standard, namespace);
+                    this.walkPackage(member, layer, standard, namespace, [], doc.filePath);
                 }
             }
         }
     }
     /** Walk a package declaration and register all Definition nodes */
-    walkPackage(pkg, layer, standard, namespace) {
+    walkPackage(pkg, layer, standard, namespace, packagePath = [], sourceFile) {
+        // A declaration's qualified name is the enclosing package chain, which
+        // is why nested package declarations are required: a file declaring
+        // `package a::b` gives no chain to walk.
+        const here = pkg.name ? [...packagePath, pkg.name] : packagePath;
         for (const member of pkg.members) {
             if (isPackageDeclaration(member)) {
-                this.walkPackage(member, layer, standard, namespace);
+                this.walkPackage(member, layer, standard, namespace, here, sourceFile);
+                continue;
+            }
+            if (member.$type === 'ViewDefinition') {
+                const viewName = member.name;
+                if (viewName) {
+                    this.viewDefaults.set(viewName, extractBoundAttributes(member.body));
+                    const sup = member.specialization?.superType;
+                    if (sup)
+                        this.viewSuperTypes.set(viewName, sup);
+                }
                 continue;
             }
             // Check each definition type
@@ -253,7 +386,7 @@ export class KindRegistry {
                 const superType = 'specialization' in member
                     ? member.specialization?.superType
                     : undefined;
-                this.kinds.set(name, {
+                this.register({
                     name,
                     label: name,
                     layer,
@@ -262,9 +395,20 @@ export class KindRegistry {
                     standard,
                     isAbstract: ('isAbstract' in member && member.isAbstract) || undefined,
                     namespace,
+                    qualifiedName: [...here, name].join('::'),
+                    sourceFile,
                 });
             }
         }
     }
 }
+/** An empty view — what a caller has before any ontology is resolved. */
+export const EMPTY_ONTOLOGY_VIEW = { kinds: {}, relationshipTypes: [] };
+/** Build a view from populated registries. */
+export function ontologyViewFrom(kindRegistry, relationshipRegistry) {
+    return {
+        kinds: kindRegistry?.toKindsRecord() ?? {},
+        relationshipTypes: relationshipRegistry?.toRelationshipTypesArray() ?? [],
+    };
+}
 //# sourceMappingURL=kind-registry.js.map

package/packages/tools/lib/model/kind-registry.js.map

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

package/packages/tools/lib/model/layer-resolver.js

@@ -118,7 +118,7 @@ export function resolveStandardFromPath(filePath) {
         afterSysml = normalized.substring(6);
     }
     else {
-        // Vendored ontology convention: src/compliance/<standard>/<file>.sysml
+        // Vendored ontology convention: src/<layer>/<module>/<file>.sysml
         const m = normalized.match(/\/src\/compliance\/([^/]+)\/[^/]+\.sysml$/);
         return m ? m[1] : undefined;
     }

package/packages/tools/lib/model/layer-resolver.js.map

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

package/packages/tools/lib/model/methodology-loader.d.ts

@@ -1,56 +1,51 @@
+import { type NativeMethodology, type NativeProjectResolution } from './native-project.js';
+import { type EffectiveMethodology } from './methodology-resolver.js';
 /** Primitive value pulled out of a SysML attribute literal. */
 export type MethodologyAttrValue = string | number | boolean;
-/** A `part <name> : <Type> { ... }` instance from a methodology file. */
+/** A `part <name> : <Type> { ... }` usage from resolved source. */
 export interface MethodologyPart {
-    /** SysML local name, e.g. "swArchView". */
     partName: string;
-    /** Type of the part, e.g. "Viewpoint", "WorkflowStep". */
     partType: string;
-    /** Attributes captured from the body (`attribute k = v;` lines). */
     attributes: Record<string, MethodologyAttrValue>;
-    /** Multi-valued attributes (repeated keys). Each key maps to all values in order. */
     multiAttributes: Record<string, MethodologyAttrValue[]>;
-    /** Source file path relative to the project root, for traceability. */
     sourceFile: string;
-    /** Fully-qualified SysML namespace, e.g. "memo::methodology::profiles". */
     namespace?: string;
 }
-/** A `part def Foo :> Bar { ... }` declaration discovered in methodology files. */
+/** A `part def Foo :> Bar { ... }` declaration in resolved methodology source. */
 export interface MethodologyPartDef {
     name: string;
     superType?: string;
     sourceFile: string;
     namespace?: string;
 }
-/** One self-contained methodology folder (e.g. `ontology/methodology/memo`). */
+/** One methodology-supplying source unit. */
 export interface MethodologyFolderInfo {
-    /** Folder name = methodology id (e.g. "memo"). */
+    /** Package name supplying the methodology content. */
     name: string;
-    /** Absolute path to the methodology folder. */
+    /** Absolute path of the root that supplied it. */
     rootDir: string;
-    /** Files scanned (relative to project root). */
     sourceFiles: string[];
-    /** Distinct SysML packages declared across the folder's files. */
     namespaces: string[];
-    /** All `part def`s discovered locally. */
     partDefs: MethodologyPartDef[];
-    /** All part instances, grouped by partType. */
     parts: Record<string, MethodologyPart[]>;
 }
-/** Top-level descriptor exposed to the web app. */
+/** Top-level descriptor exposed to clients. */
 export interface MethodologyDescriptor {
-    /** Methodology folders discovered (project may pin one in future Phase C). */
     folders: MethodologyFolderInfo[];
-    /** Errors / warnings during methodology scan (non-fatal). */
     errors: string[];
+    /** The resolved chain, merged selection, and policy chain. */
+    effective?: EffectiveMethodology;
+    /** Methodologies visible in the closure, by usage name. */
+    available?: NativeMethodology[];
 }
-export { extractScopeInfo, type MethodologyScopeInfo } from './dimension-filter.js';
 /**
- * Discover all methodology folders reachable from a project config and parse them.
+ * Build the methodology descriptor for a project.
  *
- * For each ontology package on the extends chain, look for a `methodology/`
- * subdirectory under its sysml root. Each direct subdirectory of `methodology/`
- * is treated as one methodology (Phase A convention).
+ * A source unit appears here when it supplies methodology content the project
+ * resolved — that is, when a package in the import closure declares a
+ * methodology part. Discovery is not "a directory called `methodology/`":
+ * that convention meant a package could ship methodology content the project
+ * never imported and have it load anyway.
  */
-export declare function loadMethodologyDescriptor(configPath: string, projectRoot?: string): Promise<MethodologyDescriptor>;
+export declare function loadMethodologyDescriptor(projectRoot: string, resolution?: NativeProjectResolution): Promise<MethodologyDescriptor>;
 //# sourceMappingURL=methodology-loader.d.ts.map

package/packages/tools/lib/model/methodology-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"methodology-loader.d.ts","sourceRoot":"","sources":["../../src/model/methodology-loader.ts"],"names":[],"mappings":"AAyBA,+DAA+D;AAC/D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,yEAAyE;AACzE,MAAM,WAAW,eAAe;IAC5B,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,oEAAoE;IACpE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACjD,qFAAqF;IACrF,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACxD,uEAAuE;IACvE,UAAU,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,mFAAmF;AACnF,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,gFAAgF;AAChF,MAAM,WAAW,qBAAqB;IAClC,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,kEAAkE;IAClE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,0CAA0C;IAC1C,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;CAC5C;AAED,mDAAmD;AACnD,MAAM,WAAW,qBAAqB;IAClC,8EAA8E;IAC9E,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,6DAA6D;IAC7D,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAyGD,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEpF;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC3C,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,qBAAqB,CAAC,CAoEhC"}
+{"version":3,"file":"methodology-loader.d.ts","sourceRoot":"","sources":["../../src/model/methodology-loader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,KAAK,oBAAoB,EAC5B,MAAM,2BAA2B,CAAC;AAEnC,+DAA+D;AAC/D,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,mEAAmE;AACnE,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACjD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,kFAAkF;AAClF,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,6CAA6C;AAC7C,MAAM,WAAW,qBAAqB;IAClC,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;CAC5C;AAED,+CAA+C;AAC/C,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,oBAAoB,CAAC;IACjC,2DAA2D;IAC3D,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACnC;AA4GD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC3C,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,uBAAuB,GACrC,OAAO,CAAC,qBAAqB,CAAC,CAiEhC"}