@fhir-dsl/terminology 0.32.0 → 0.34.0

package/dist/index.cjs

@@ -50,15 +50,80 @@ function flattenConcepts(concepts) {
   }
   return result;
 }
+function buildNodes(concepts) {
+  const nodes = [];
+  const childrenOf = /* @__PURE__ */ new Map();
+  function visit(concept, implicitParent) {
+    if (!concept.code) {
+      for (const child of concept.concept ?? []) visit(child, implicitParent);
+      return;
+    }
+    const parents = /* @__PURE__ */ new Set();
+    if (implicitParent) parents.add(implicitParent);
+    for (const p of concept.property ?? []) {
+      if (p.code === "parent" && typeof p.valueCode === "string") parents.add(p.valueCode);
+    }
+    const properties = {};
+    for (const p of concept.property ?? []) {
+      if (!p.code || p.code === "parent") continue;
+      const v = p.valueCode ?? p.valueString ?? p.valueInteger ?? p.valueBoolean;
+      if (v !== void 0) properties[p.code] = v;
+    }
+    const designations = concept.designation?.filter((d) => typeof d.value === "string").map((d) => ({ language: d.language, use: d.use?.code, value: d.value })) ?? [];
+    for (const parent of parents) {
+      const list = childrenOf.get(parent) ?? [];
+      list.push(concept.code);
+      childrenOf.set(parent, list);
+    }
+    const node = { code: concept.code };
+    if (concept.display !== void 0) node.display = concept.display;
+    if (parents.size > 0) node.parents = [...parents];
+    if (Object.keys(properties).length > 0) node.properties = properties;
+    if (designations.length > 0) node.designations = designations;
+    nodes.push(node);
+    for (const child of concept.concept ?? []) visit(child, concept.code);
+  }
+  for (const top of concepts) visit(top, void 0);
+  return nodes.map((n) => {
+    const kids = childrenOf.get(n.code);
+    return kids?.length ? { ...n, children: kids } : n;
+  });
+}
+function makeIsA(nodes) {
+  const byCode = /* @__PURE__ */ new Map();
+  for (const n of nodes) byCode.set(n.code, n);
+  return (ancestor, descendant) => {
+    if (ancestor === descendant) return true;
+    const stack = [...byCode.get(descendant)?.parents ?? []];
+    const seen = /* @__PURE__ */ new Set();
+    while (stack.length) {
+      const cur = stack.pop();
+      if (cur === void 0 || seen.has(cur)) continue;
+      seen.add(cur);
+      if (cur === ancestor) return true;
+      const node = byCode.get(cur);
+      if (node?.parents?.length) stack.push(...node.parents);
+    }
+    return false;
+  };
+}
 function parseCodeSystem(resource) {
   if (!isCodeSystem(resource)) return void 0;
   const content = normalizeContent(resource.content);
-  return {
+  const hasConcepts = content === "complete" && resource.concept?.length;
+  const concepts = hasConcepts ? flattenConcepts(resource.concept) : [];
+  const nodes = hasConcepts ? buildNodes(resource.concept) : [];
+  const model = {
     url: resource.url ?? "",
     name: resource.name ?? "",
     content,
-    concepts: content === "complete" && resource.concept?.length ? flattenConcepts(resource.concept) : []
+    concepts
   };
+  if (nodes.length > 0) {
+    model.nodes = nodes;
+    model.isA = makeIsA(nodes);
+  }
+  return model;
 }
 function normalizeContent(value) {
   switch (value) {
@@ -151,7 +216,8 @@ function resolveCompose(resource, codeSystemLookup) {
     } else if (include.filter?.length) {
       const cs = include.system ? codeSystemLookup.get(include.system) : void 0;
       if (cs && cs.content === "complete" && cs.concepts.length > 0) {
-        const filtered = applyFilters(cs.concepts, include.filter);
+        const { codes: filtered, complete } = applyFilters(cs, include.filter);
+        if (!complete) isComplete = false;
         includedCodes.push(...filtered.map((c) => ({ ...c, system: include.system })));
       } else {
         isComplete = false;
@@ -202,14 +268,49 @@ function resolveCompose(resource, codeSystemLookup) {
     isComplete
   };
 }
-function applyFilters(concepts, filters) {
-  let result = concepts;
+function applyFilters(cs, filters) {
+  let result = cs.concepts;
+  let complete = true;
   for (const filter of filters) {
-    if (filter.op === "=" && filter.property === "concept" && filter.value) {
-      result = result.filter((c) => c.code === filter.value);
+    const op = filter.op;
+    const value = filter.value;
+    const prop = filter.property;
+    if (!op || !value || !prop) {
+      complete = false;
+      continue;
+    }
+    if (op === "=" && prop === "concept") {
+      result = result.filter((c) => c.code === value);
+      continue;
     }
+    if ((op === "is-a" || op === "isa") && prop === "concept") {
+      if (!cs.isA) {
+        complete = false;
+        continue;
+      }
+      result = result.filter((c) => cs.isA(value, c.code));
+      continue;
+    }
+    if (op === "descendent-of" && prop === "concept") {
+      if (!cs.isA) {
+        complete = false;
+        continue;
+      }
+      result = result.filter((c) => c.code !== value && cs.isA(value, c.code));
+      continue;
+    }
+    if (op === "regex") {
+      try {
+        const re = new RegExp(value);
+        result = result.filter((c) => re.test(prop === "display" ? c.display ?? "" : c.code));
+      } catch {
+        complete = false;
+      }
+      continue;
+    }
+    complete = false;
   }
-  return result;
+  return { codes: result, complete };
 }
 
 // src/resolver.ts

package/dist/index.d.cts

@@ -11,11 +11,43 @@ interface ResolvedValueSet {
     /** true if all includes were resolved offline; false if some were skipped */
     isComplete: boolean;
 }
+/**
+ * Phase 3.2 — extended concept model.
+ *
+ * `parents` carries the codes inherited via `concept.property[code=parent]`
+ * (or implicit nesting under another concept). `children` is the inverse,
+ * derived after a full pass. Both are optional; older callers that only
+ * need `code`/`display` keep working.
+ */
+interface ConceptNode {
+    code: string;
+    display?: string | undefined;
+    /** Hierarchy parents (direct). Empty for root concepts. */
+    parents?: readonly string[] | undefined;
+    /** Direct children (computed after the full code system loads). */
+    children?: readonly string[] | undefined;
+    /** Concept-level properties (`property[code]` → value). */
+    properties?: Readonly<Record<string, string | number | boolean>> | undefined;
+    /** Localized / alternate display strings. */
+    designations?: ReadonlyArray<{
+        language?: string | undefined;
+        use?: string | undefined;
+        value: string;
+    }> | undefined;
+}
 interface CodeSystemModel {
     url: string;
     name: string;
     content: "complete" | "not-present" | "example" | "fragment" | "supplement";
     concepts: ResolvedCode[];
+    /** Phase 3.2: hierarchy + properties for each concept. Aligned with `concepts` by `.code`. */
+    nodes?: readonly ConceptNode[] | undefined;
+    /**
+     * Phase 3.2: returns true when `descendant` is `ancestor` or has it
+     * transitively in its `parents` chain. Implemented by the parser when
+     * a hierarchy is present.
+     */
+    isA?: ((ancestor: string, descendant: string) => boolean) | undefined;
 }
 
 declare function parseCodeSystem(resource: unknown): CodeSystemModel | undefined;

package/dist/index.d.ts

@@ -11,11 +11,43 @@ interface ResolvedValueSet {
     /** true if all includes were resolved offline; false if some were skipped */
     isComplete: boolean;
 }
+/**
+ * Phase 3.2 — extended concept model.
+ *
+ * `parents` carries the codes inherited via `concept.property[code=parent]`
+ * (or implicit nesting under another concept). `children` is the inverse,
+ * derived after a full pass. Both are optional; older callers that only
+ * need `code`/`display` keep working.
+ */
+interface ConceptNode {
+    code: string;
+    display?: string | undefined;
+    /** Hierarchy parents (direct). Empty for root concepts. */
+    parents?: readonly string[] | undefined;
+    /** Direct children (computed after the full code system loads). */
+    children?: readonly string[] | undefined;
+    /** Concept-level properties (`property[code]` → value). */
+    properties?: Readonly<Record<string, string | number | boolean>> | undefined;
+    /** Localized / alternate display strings. */
+    designations?: ReadonlyArray<{
+        language?: string | undefined;
+        use?: string | undefined;
+        value: string;
+    }> | undefined;
+}
 interface CodeSystemModel {
     url: string;
     name: string;
     content: "complete" | "not-present" | "example" | "fragment" | "supplement";
     concepts: ResolvedCode[];
+    /** Phase 3.2: hierarchy + properties for each concept. Aligned with `concepts` by `.code`. */
+    nodes?: readonly ConceptNode[] | undefined;
+    /**
+     * Phase 3.2: returns true when `descendant` is `ancestor` or has it
+     * transitively in its `parents` chain. Implemented by the parser when
+     * a hierarchy is present.
+     */
+    isA?: ((ancestor: string, descendant: string) => boolean) | undefined;
 }
 
 declare function parseCodeSystem(resource: unknown): CodeSystemModel | undefined;

package/dist/index.js

@@ -19,15 +19,80 @@ function flattenConcepts(concepts) {
   }
   return result;
 }
+function buildNodes(concepts) {
+  const nodes = [];
+  const childrenOf = /* @__PURE__ */ new Map();
+  function visit(concept, implicitParent) {
+    if (!concept.code) {
+      for (const child of concept.concept ?? []) visit(child, implicitParent);
+      return;
+    }
+    const parents = /* @__PURE__ */ new Set();
+    if (implicitParent) parents.add(implicitParent);
+    for (const p of concept.property ?? []) {
+      if (p.code === "parent" && typeof p.valueCode === "string") parents.add(p.valueCode);
+    }
+    const properties = {};
+    for (const p of concept.property ?? []) {
+      if (!p.code || p.code === "parent") continue;
+      const v = p.valueCode ?? p.valueString ?? p.valueInteger ?? p.valueBoolean;
+      if (v !== void 0) properties[p.code] = v;
+    }
+    const designations = concept.designation?.filter((d) => typeof d.value === "string").map((d) => ({ language: d.language, use: d.use?.code, value: d.value })) ?? [];
+    for (const parent of parents) {
+      const list = childrenOf.get(parent) ?? [];
+      list.push(concept.code);
+      childrenOf.set(parent, list);
+    }
+    const node = { code: concept.code };
+    if (concept.display !== void 0) node.display = concept.display;
+    if (parents.size > 0) node.parents = [...parents];
+    if (Object.keys(properties).length > 0) node.properties = properties;
+    if (designations.length > 0) node.designations = designations;
+    nodes.push(node);
+    for (const child of concept.concept ?? []) visit(child, concept.code);
+  }
+  for (const top of concepts) visit(top, void 0);
+  return nodes.map((n) => {
+    const kids = childrenOf.get(n.code);
+    return kids?.length ? { ...n, children: kids } : n;
+  });
+}
+function makeIsA(nodes) {
+  const byCode = /* @__PURE__ */ new Map();
+  for (const n of nodes) byCode.set(n.code, n);
+  return (ancestor, descendant) => {
+    if (ancestor === descendant) return true;
+    const stack = [...byCode.get(descendant)?.parents ?? []];
+    const seen = /* @__PURE__ */ new Set();
+    while (stack.length) {
+      const cur = stack.pop();
+      if (cur === void 0 || seen.has(cur)) continue;
+      seen.add(cur);
+      if (cur === ancestor) return true;
+      const node = byCode.get(cur);
+      if (node?.parents?.length) stack.push(...node.parents);
+    }
+    return false;
+  };
+}
 function parseCodeSystem(resource) {
   if (!isCodeSystem(resource)) return void 0;
   const content = normalizeContent(resource.content);
-  return {
+  const hasConcepts = content === "complete" && resource.concept?.length;
+  const concepts = hasConcepts ? flattenConcepts(resource.concept) : [];
+  const nodes = hasConcepts ? buildNodes(resource.concept) : [];
+  const model = {
     url: resource.url ?? "",
     name: resource.name ?? "",
     content,
-    concepts: content === "complete" && resource.concept?.length ? flattenConcepts(resource.concept) : []
+    concepts
   };
+  if (nodes.length > 0) {
+    model.nodes = nodes;
+    model.isA = makeIsA(nodes);
+  }
+  return model;
 }
 function normalizeContent(value) {
   switch (value) {
@@ -120,7 +185,8 @@ function resolveCompose(resource, codeSystemLookup) {
     } else if (include.filter?.length) {
       const cs = include.system ? codeSystemLookup.get(include.system) : void 0;
       if (cs && cs.content === "complete" && cs.concepts.length > 0) {
-        const filtered = applyFilters(cs.concepts, include.filter);
+        const { codes: filtered, complete } = applyFilters(cs, include.filter);
+        if (!complete) isComplete = false;
         includedCodes.push(...filtered.map((c) => ({ ...c, system: include.system })));
       } else {
         isComplete = false;
@@ -171,14 +237,49 @@ function resolveCompose(resource, codeSystemLookup) {
     isComplete
   };
 }
-function applyFilters(concepts, filters) {
-  let result = concepts;
+function applyFilters(cs, filters) {
+  let result = cs.concepts;
+  let complete = true;
   for (const filter of filters) {
-    if (filter.op === "=" && filter.property === "concept" && filter.value) {
-      result = result.filter((c) => c.code === filter.value);
+    const op = filter.op;
+    const value = filter.value;
+    const prop = filter.property;
+    if (!op || !value || !prop) {
+      complete = false;
+      continue;
+    }
+    if (op === "=" && prop === "concept") {
+      result = result.filter((c) => c.code === value);
+      continue;
     }
+    if ((op === "is-a" || op === "isa") && prop === "concept") {
+      if (!cs.isA) {
+        complete = false;
+        continue;
+      }
+      result = result.filter((c) => cs.isA(value, c.code));
+      continue;
+    }
+    if (op === "descendent-of" && prop === "concept") {
+      if (!cs.isA) {
+        complete = false;
+        continue;
+      }
+      result = result.filter((c) => c.code !== value && cs.isA(value, c.code));
+      continue;
+    }
+    if (op === "regex") {
+      try {
+        const re = new RegExp(value);
+        result = result.filter((c) => re.test(prop === "display" ? c.display ?? "" : c.code));
+      } catch {
+        complete = false;
+      }
+      continue;
+    }
+    complete = false;
   }
-  return result;
+  return { codes: result, complete };
 }
 
 // src/resolver.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fhir-dsl/terminology",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "Compile-time FHIR terminology resolver for ValueSets and CodeSystems",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -22,7 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "@fhir-dsl/utils": "0.32.0"
+    "@fhir-dsl/utils": "0.34.0"
   },
   "author": "Abdelhadi Sabani",
   "license": "MIT",