fhirsmith 0.7.1 → 0.7.3

package/publisher/publisher.js

@@ -198,6 +198,24 @@ class PublisherModule {
         });
       });
     }
+    const websiteColumns = await new Promise((resolve, reject) => {
+      this.db.all("PRAGMA table_info(websites)", (err, rows) => {
+        if (err) reject(err);
+        else resolve(rows || []);
+      });
+    });
+    const websiteColumnNames = websiteColumns.map(c => c.name);
+    if (!websiteColumnNames.includes('git_root')) {
+      await new Promise((resolve, reject) => {
+        this.db.run('ALTER TABLE websites ADD COLUMN git_root TEXT', (err) => {
+          if (err) reject(err);
+          else {
+            this.logger.info('Migration: added git_root column to websites table');
+            resolve();
+          }
+        });
+      });
+    }
   }
 
   async createDefaultAdmin() {
@@ -268,6 +286,8 @@ class PublisherModule {
     // Admin routes
     this.router.get('/admin/websites', this.requireAdmin.bind(this), this.renderWebsites.bind(this));
     this.router.post('/admin/websites', this.requireAdmin.bind(this), this.createWebsite.bind(this));
+    this.router.get('/admin/websites/:id/edit', this.requireAdmin.bind(this), this.renderEditWebsite.bind(this));
+    this.router.post('/admin/websites/:id/edit', this.requireAdmin.bind(this), this.updateWebsite.bind(this));
     this.router.get('/admin/users', this.requireAdmin.bind(this), this.renderUsers.bind(this));
     this.router.post('/admin/users', this.requireAdmin.bind(this), this.createUser.bind(this));
     this.router.post('/admin/permissions', this.requireAdmin.bind(this), this.updatePermissions.bind(this));
@@ -682,7 +702,7 @@ class PublisherModule {
     const historyDir = path.join(taskDir, 'fhir-ig-history-template');
     const templatesDir = path.join(taskDir, 'fhir-web-templates');
 
-    await this.runCommand('git', ['clone', 'https://github.com/FHIR/ig-registry.git', registryDir],
+    await this.runCommand('git', ['clone', 'git@github.com:FHIR/ig-registry.git', registryDir],
       {}, task.id, 'Cloning ig-registry');
 
     await this.runCommand('git', ['clone', 'https://github.com/HL7/fhir-ig-history-template.git', historyDir],
@@ -698,7 +718,7 @@ class PublisherModule {
     }
 
     // Step 3: Pull latest web folder before publishing into it
-    await this.runCommand('git', ['pull'], { cwd: website.local_folder }, task.id, 'Pulling latest web folder');
+    await this.runCommand('git', ['pull'], { cwd: website.git_root }, task.id, 'Pulling latest web folder');
 
     // Step 4: Run the IG publisher in go-publish mode
     await this.runPublisherGoPublish(task.id, publisherJar, draftDir, website.local_folder,
@@ -716,9 +736,9 @@ class PublisherModule {
     await this.logTaskMessage(task.id, 'info', 'Committing changes to web folder...');
     const gitUrl = 'https://github.com/' + task.github_org + '/' + task.github_repo + '.git';
     const commitMsg = 'publish ' + task.npm_package_id + '#' + task.version + ' from ' + gitUrl + ' ' + task.git_branch;
-    await this.runCommand('git', ['add', '.'], { cwd: website.local_folder }, task.id, 'Staging web folder changes');
-    await this.runCommand('git', ['commit', '-m', commitMsg], { cwd: website.local_folder }, task.id, 'Committing web folder changes');
-    await this.runCommand('git', ['push'], { cwd: website.local_folder }, task.id, 'Pushing web folder changes');
+    await this.runCommand('git', ['add', '.'], { cwd: website.git_root }, task.id, 'Staging web folder changes');
+    await this.runCommand('git', ['commit', '-m', commitMsg], { cwd: website.git_root }, task.id, 'Committing web folder changes');
+    await this.runCommand('git', ['push'], { cwd: website.git_root }, task.id, 'Pushing web folder changes');
 
     // Step 7: Commit and push the ig-registry
     await this.logTaskMessage(task.id, 'info', 'Committing changes to ig-registry...');
@@ -1583,6 +1603,71 @@ class PublisherModule {
     }
   }
 
+  async renderEditWebsite(req, res) {
+    const start = Date.now();
+    try {
+      const htmlServer = require('../library/html-server');
+      const website = await this.getWebsite(req.params.id);
+      if (!website) return res.status(404).send('Website not found');
+
+      let content = '<h3>Edit Website</h3>';
+      content += '<form method="post" action="/publisher/admin/websites/' + website.id + '/edit" class="row g-3">';
+      content += '<div class="col-md-4"><label class="form-label">Website Name</label>';
+      content += '<input type="text" class="form-control" name="name" value="' + escape(website.name) + '" required></div>';
+      content += '<div class="col-md-4"><label class="form-label">Local Folder</label>';
+      content += '<input type="text" class="form-control" name="local_folder" value="' + escape(website.local_folder) + '" required></div>';
+      content += '<div class="col-md-4"><label class="form-label">Git Root (repo root for git operations)</label>';
+      content += '<input type="text" class="form-control" name="git_root" value="' + escape(website.git_root || '') + '"></div>';
+      content += '<div class="col-md-4"><label class="form-label">History Templates</label>';
+      content += '<input type="text" class="form-control" name="history_templates" value="' + escape(website.history_templates) + '" required></div>';
+      content += '<div class="col-md-4"><label class="form-label">Web Templates</label>';
+      content += '<input type="text" class="form-control" name="web_templates" value="' + escape(website.web_templates) + '" required></div>';
+      content += '<div class="col-md-4"><label class="form-label">Update Script</label>';
+      content += '<input type="text" class="form-control" name="server_update_script" value="' + escape(website.server_update_script) + '" required></div>';
+      content += '<div class="col-md-4"><label class="form-label">Active</label>';
+      content += '<select class="form-control" name="is_active"><option value="1"' + (website.is_active ? ' selected' : '') + '>Yes</option><option value="0"' + (!website.is_active ? ' selected' : '') + '>No</option></select></div>';
+      content += '<div class="col-12"><button type="submit" class="btn btn-primary">Save Changes</button> ';
+      content += '<a href="/publisher/admin/websites" class="btn btn-secondary">Cancel</a></div>';
+      content += '</form>';
+
+      const html = htmlServer.renderPage('publisher', 'Edit Website - FHIR Publisher', content, {
+        templateVars: { loginTitle: 'Logout', loginPath: 'logout', loginAction: 'POST' }
+      });
+      res.setHeader('Content-Type', 'text/html');
+      res.send(html);
+    } catch (error) {
+      this.logger.error('Error rendering edit website:', error);
+      res.status(500).send('Internal server error');
+    } finally {
+      this.stats.countRequest('websites-edit', Date.now() - start);
+    }
+  }
+
+  async updateWebsite(req, res) {
+    const start = Date.now();
+    try {
+      const { name, local_folder,  git_root, history_templates, web_templates, server_update_script, is_active } = req.body;
+      const websiteId = req.params.id;
+
+      await new Promise((resolve, reject) => {
+        this.db.run(
+          'UPDATE websites SET name=?, local_folder=?,  git_root = ?, history_templates=?, web_templates=?, server_update_script=?, is_active=? WHERE id=?',
+          [name, local_folder,  git_root, history_templates, web_templates, server_update_script, is_active === '1' ? 1 : 0, websiteId],
+          (err) => err ? reject(err) : resolve()
+        );
+      });
+
+      this.logUserAction(req.session.userId, 'update_website', websiteId, req.ip);
+      this.logger.info('Website updated: ' + websiteId + ' by user ' + req.session.userId);
+      res.redirect('/publisher/admin/websites');
+    } catch (error) {
+      this.logger.error('Error updating website:', error);
+      res.status(500).send('Failed to update website');
+    } finally {
+      this.stats.countRequest('websites-update', Date.now() - start);
+    }
+  }
+
   async renderWebsites(req, res) {
     const start = Date.now();
     try {
@@ -1607,6 +1692,10 @@ class PublisherModule {
         content += '<input type="text" class="form-control" id="local_folder" name="local_folder" required>';
         content += '</div>';
         content += '<div class="col-md-4">';
+        content += '<label class="form-label">Git Root (repo root for git operations)</label>';
+        content += '<input type="text" class="form-control" name="git_root" required>';
+        content += '</div>';
+        content += '<div class="col-md-4">';
         content += '<label for="history_templates" class="form-label">History Templates</label>';
         content += '<input type="text" class="form-control" id="history_templates" name="history_templates" required>';
         content += '</div>';
@@ -1634,18 +1723,20 @@ class PublisherModule {
         } else {
           content += '<div class="table-responsive">';
           content += '<table class="table table-striped">';
-          content += '<thead><tr><th>Name</th><th>Local Folder</th><th>Update Script</th><th>Active</th><th>Created</th></tr></thead>';
+          content += '<thead><tr><th>Name</th><th>Local Folder</th><th>Git Root</th><th>Update Script</th><th>Active</th><th>Created</th><th>Actions</th></tr></thead>';
           content += '<tbody>';
 
           websites.forEach(website => {
             content += '<tr>';
             content += '<td>' + website.name + '</td>';
-            content += '<td><code>' + website.local_folder + '</code></td>';
-            content += '<td><code>' + website.history_templates + '</code></td>';
-            content += '<td><code>' + website.web_templates + '</code></td>';
-            content += '<td><code>' + website.server_update_script + '</code></td>';
+            content += '<td><code>' + escape(website.local_folder) + '</code></td>';
+            content += '<td><code>' + escape(website.git_root || '') + '</code></td>';
+            content += '<td><code>' + escape(website.history_templates) + '</code></td>';
+            content += '<td><code>' + escape(website.web_templates) + '</code></td>';
+            content += '<td><code>' + escape(website.server_update_script) + '</code></td>';
             content += '<td>' + (website.is_active ? '✓' : '✗') + '</td>';
             content += '<td>' + new Date(website.created_at).toLocaleString() + '</td>';
+            content += '<td><a href="/publisher/admin/websites/' + website.id + '/edit" class="btn btn-sm btn-outline-primary">Edit</a></td>';
             content += '</tr>';
           });
 
@@ -1677,12 +1768,12 @@ class PublisherModule {
     const start = Date.now();
     try {
       try {
-        const {name, local_folder, history_templates, web_templates, server_update_script} = req.body;
+        const {name, local_folder,  git_root, history_templates, web_templates, server_update_script} = req.body;
 
         await new Promise((resolve, reject) => {
           this.db.run(
-            'INSERT INTO websites (name, local_folder, history_templates, web_templates, server_update_script) VALUES (?, ?, ?, ?, ?)',
-            [name, local_folder, history_templates, web_templates, server_update_script],
+            'INSERT INTO websites (name, local_folder,  git_root, history_templates, web_templates, server_update_script) VALUES (?, ?, ?, ?, ?, ?)',
+            [name, local_folder, git_root, history_templates, web_templates, server_update_script],
             function (err) {
               if (err) reject(err);
               else resolve();

package/server.js

@@ -59,6 +59,8 @@ const TXModule = require('./tx/tx.js');
 const htmlServer = require('./library/html-server');
 const ServerStats = require("./stats");
 const {Liquid} = require("liquidjs");
+const FolderModule = require("./folder/folder");
+const ExtensionTrackerModule = require("./extension-tracker/extension-tracker");
 
 htmlServer.useLog(serverLog);
 
@@ -195,6 +197,17 @@ async function initializeModules() {
     }
   }
 
+
+  if (config.modules?.['ext-tracker']?.enabled) {
+    try {
+      serverLog.info('Initializing module: ext-tracker...');
+      modules.extTracker = new ExtensionTrackerModule(stats);
+      await modules.extTracker.initialize(config.modules['ext-tracker'], app);
+    } catch (error) {
+      serverLog.error('Failed to initialize extension tracker module:', error);
+      throw error;
+    }
+  }
   // Initialize TX module
   // Note: TX module registers its own endpoints directly on the app
   // because it supports multiple endpoints at different paths
@@ -208,6 +221,18 @@ async function initializeModules() {
       throw error;
     }
   }
+
+  if (config.modules?.folder?.enabled) {
+    try {
+      serverLog.info('Initializing module: folder...');
+      modules.folder = new FolderModule(stats);
+      await modules.folder.initialize(config.modules.folder, app);
+      // mount the router
+    } catch (error) {
+      serverLog.error('Failed to initialize folder module:', error);
+      throw error;
+    }
+  }
 }
 
 async function loadTemplates() {
@@ -312,6 +337,32 @@ async function buildRootPageContent() {
     content += '</li>';
   }
 
+  if (config.modules?.['ext-tracker']?.enabled) {
+    mc++;
+    content += '<li class="list-group-item">';
+    content += '<a href="/ext-tracker" class="text-decoration-none">Extension Tracker</a>: ';
+    content += 'View of Extension Usage';
+    content += '</li>';
+  }
+
+  if (config.modules.folder && config.modules.folder.enabled) {
+    content += '<li class="list-group-item">';
+    content += '<strong>Cache Folder</strong>: ';
+    content += 'Cache Folder for Kindling';
+    const folders = config.modules.folder.folders || [];
+    content += '<ul class="mt-2 mb-0">';
+    for (const fc of folders) {
+      if (fc.enabled === false) continue;
+      mc++;
+      content += '<li>';
+      content += `<a href="${fc.url}" class="text-decoration-none">${fc.name}</a>: `;
+      content += 'File folder with write control';
+      content += '</li>';
+    }
+    content += '</ul>';
+  }
+
+
   if (config.modules.tx && config.modules.tx.enabled) {
     content += '<li class="list-group-item">';
     content += '<strong>TX Terminology Server</strong>: ';
@@ -350,12 +401,14 @@ async function buildRootPageContent() {
   const heapUsedMB = (memUsage.heapUsed / 1024 / 1024).toFixed(2);
   const heapTotalMB = (memUsage.heapTotal / 1024 / 1024).toFixed(2);
   const rssMB = (memUsage.rss / 1024 / 1024).toFixed(2);
+  const freeMemMB = (os.freemem() / 1024 / 1024).toFixed(0);
+  const totalMemMB = (os.totalmem() / 1024 / 1024).toFixed(0);
 
   content += '<table class="grid">';
   content += '<tr>';
-  content += `<td><strong>Module Count:</strong> ${mc}</td>`;
   content += `<td><strong>Uptime:</strong> ${escape(uptimeStr)}</td>`;
   content += `<td><strong>Request Count:</strong> ${stats.requestCount}</td>`;
+  content += `<td><strong>Free Memory:</strong> ${freeMemMB} MB of ${totalMemMB} MB</td>`;
   content += '</tr>';
   content += '<tr>';
   content += `<td><strong>Heap Used:</strong> ${heapUsedMB} MB</td>`;
@@ -433,7 +486,7 @@ app.get('/', async (req, res) => {
         about
       };
 
-      const html = htmlServer.renderPage('root', escape(config.hostName) || 'FHIRsmith Server', content, stats);
+      const html = htmlServer.renderPage('root', config.hostName ? escape(config.hostName) : 'FHIRsmith Server', content, stats);
       res.setHeader('Content-Type', 'text/html');
       res.send(html);
       return;
@@ -442,8 +495,9 @@ app.get('/', async (req, res) => {
       htmlServer.sendErrorResponse(res, 'root', error);
       return;
     }
+  } else {
+    return serveFhirsmithHome(req, res);
   }
-  return serveFhirsmithHome(req, res);
 });
 
 app.get('/fhirsmith', (req, res) => serveFhirsmithHome(req, res));
@@ -622,7 +676,7 @@ async function serveFhirsmithHome(req, res) {
         processingTime: Date.now() - startTime
       };
 
-      const html = htmlServer.renderPage('root', escape(config.hostName) || 'FHIRsmith Server', content, stats);
+      const html = htmlServer.renderPage('root', config.hostName ? escape(config.hostName) : 'FHIRsmith Server', content, stats);
       res.setHeader('Content-Type', 'text/html');
       res.send(html);
       return;

package/tx/cs/cs-snomed.js

@@ -410,9 +410,9 @@ class SnomedServices {
 
             if (matchFound) {
               // Calculate priority based on match quality
-              if (term === searchText.toLowerCase()) {
+              if (term === searchText.filter.toLowerCase()) {
                 priority = 100; // Exact match
-              } else if (term.startsWith(searchText.toLowerCase())) {
+              } else if (term.startsWith(searchText.filter.toLowerCase())) {
                 priority = 50; // Prefix match
               } else {
                 priority = 10; // Contains match
@@ -615,10 +615,14 @@ class SnomedProvider extends BaseCSServices {
   getLanguageCode(langIndex) {
     const languageMap = {
       1: 'en',
-      2: 'en-GB',
-      3: 'es',
-      4: 'fr',
-      5: 'de'
+      2: 'fr',
+      3: 'nl',
+      4: 'es',
+      5: 'sv',
+      6: 'da',
+      7: 'de',
+      8: 'it',
+      9: 'cs'
     };
     return languageMap[langIndex] || 'en';
   }
@@ -969,7 +973,9 @@ class SnomedProvider extends BaseCSServices {
 
   // Search filter
   async searchFilter(filterContext, filter, sort) {
-    return this.sct.searchFilter(filter, false, sort);
+    let f = this.sct.searchFilter(filter, false, sort);
+    filterContext.filters.push(f);
+    return f;
   }
 
   // Subsumption testing

package/tx/library/extensions.js

@@ -110,14 +110,18 @@ const Extensions = {
     if (!exp.extension) {
       exp.extension = [];
     }
-    exp.extension.push({ url : url, valueBoolean : b });
+    let ext = { url : url, valueBoolean : b };
+    exp.extension.push(ext);
+    return ext;
   },
 
   addString(exp, url, s) {
     if (!exp.extension) {
       exp.extension = [];
     }
-    exp.extension.push({ url : url, valueString : s });
+    let ext = { url : url, valueString : s };
+    exp.extension.push(ext);
+    return ext;
   }
 }
 

package/tx/library/renderer.js

@@ -439,7 +439,7 @@ class Renderer {
           }
         }
       } else {
-        li.tx(this.translate('VALUE_SET_CODES_FROM'));
+        li.tx(this.translate('VALUE_SET_CODES_FROM')+" ");
         await this.renderLink(li,inc.system+(inc.version ? "|"+inc.version : ""));
         li.tx(" "+ this.translate('VALUE_SET_WHERE')+" ");
         li.startCommaList("and");

package/tx/ocl/cache/cache-paths.cjs

@@ -15,11 +15,10 @@ function sanitizeFilename(text) {
 }
 
 function getCacheFilePath(baseDir, canonicalUrl, version = null, paramsKey = null) {
-  const filename = sanitizeFilename(canonicalUrl)
-    + (version ? `_${sanitizeFilename(version)}` : '')
-    + (paramsKey && paramsKey !== 'default' ? `_p_${sanitizeFilename(paramsKey)}` : '')
-    + '.json';
-
+  const crypto = require('crypto');
+  const base = `${canonicalUrl}|${version || ''}|${paramsKey || 'default'}`;
+  const hash = crypto.createHash('sha256').update(base).digest('hex');
+  const filename = `${hash}.json`;
   return path.join(baseDir, filename);
 }
 

package/tx/ocl/cm-ocl.cjs

@@ -46,7 +46,10 @@ class OCLConceptMapProvider extends AbstractConceptMapProvider {
   async fetchConceptMap(url, version) {
     this._validateFetchParams(url, version);
 
-    const direct = this.conceptMapMap.get(`${url}|${version}`) || this.conceptMapMap.get(url);
+    const crypto = require('crypto');
+    const base = `${url}|${version || ''}`;
+    const hash = crypto.createHash('sha256').update(base).digest('hex');
+    const direct = this.conceptMapMap.get(hash);
     if (direct) {
       return direct;
     }

package/tx/ocl/cs-ocl.cjs

@@ -21,13 +21,12 @@ function normalizeCanonicalSystem(system) {
     return system;
   }
 
-  const trimmed = system.trim();
+  let trimmed = system.trim();
   if (!trimmed) {
     return trimmed;
   }
 
-  // Treat canonical URLs with and without trailing slash as equivalent.
-  return trimmed.replace(/\/+$/, '');
+  return trimmed;
 }
 
 class OCLCodeSystemProvider extends AbstractCodeSystemProvider {
@@ -517,16 +516,14 @@ class OCLCodeSystemProvider extends AbstractCodeSystemProvider {
   }
 
   #normalizePath(pathValue) {
+    // Não normaliza nem remove barras, retorna exatamente o valor fornecido pelo autor
     if (!pathValue) {
       return null;
     }
     if (typeof pathValue !== 'string') {
       return null;
     }
-    if (pathValue.startsWith('http://') || pathValue.startsWith('https://')) {
-      return pathValue;
-    }
-    return `${this.baseUrl}${pathValue.startsWith('/') ? '' : '/'}${pathValue}`;
+    return pathValue;
   }
 
   async #fetchAllPages(path) {
@@ -537,7 +534,7 @@ class OCLCodeSystemProvider extends AbstractCodeSystemProvider {
         logger: console,
         loggerPrefix: '[OCL]'
       });
-      // Verificação extra: payload deve ser objeto ou array
+      // Extra check: payload must be object or array
       if (!result || (typeof result !== 'object' && !Array.isArray(result))) {
         throw new Error('[OCL] Invalid response format: expected object or array');
       }
@@ -1733,8 +1730,11 @@ class OCLSourceCodeSystemFactory extends CodeSystemFactoryProvider {
   }
 
   #resourceKey() {
+    const crypto = require('crypto');
     const normalizedSystem = OCLSourceCodeSystemFactory.#normalizeSystem(this.system());
-    return `${normalizedSystem}|${this.version() || ''}`;
+    const base = `${normalizedSystem}|${this.version() || ''}`;
+    const hash = crypto.createHash('sha256').update(base).digest('hex');
+    return hash;
   }
 
   currentChecksum() {

package/tx/ocl/jobs/background-queue.cjs

@@ -22,15 +22,17 @@ class OCLBackgroundJobQueue {
     const resolveAndEnqueue = async () => {
       const resolvedSize = await this.#resolveJobSize(options);
       const normalizedSize = this.#normalizeJobSize(resolvedSize);
-      this.#insertPendingJobOrdered({
+      const job = {
         jobKey,
         jobType: jobType || 'background-job',
         jobId: options?.jobId || jobKey,
         jobSize: normalizedSize,
         getProgress: typeof options?.getProgress === 'function' ? options.getProgress : null,
         runJob,
-        enqueueOrder: this.enqueueSequence++
-      });
+        enqueueOrder: this.enqueueSequence++,
+        userRequested: !!options.userRequested
+      };
+      this.#insertPendingJobOrdered(job);
       this.ensureHeartbeatRunning();
       console.log(`[OCL] ${jobType || 'Background job'} enqueued: ${jobKey} (size=${normalizedSize}, queue=${this.pendingJobs.length}, active=${this.activeCount})`);
       this.processNext();
@@ -72,17 +74,21 @@ class OCLBackgroundJobQueue {
   }
 
   static #insertPendingJobOrdered(job) {
+    // Prioridade máxima para userRequested
+    if (job.userRequested) {
+      this.pendingJobs.unshift(job);
+      console.log(`[OCL] User-requested job prioritized: ${job.jobKey}`);
+      return;
+    }
     let index = this.pendingJobs.findIndex(existing => {
       if (existing.jobSize === job.jobSize) {
         return existing.enqueueOrder > job.enqueueOrder;
       }
       return existing.jobSize > job.jobSize;
     });
-
     if (index < 0) {
       index = this.pendingJobs.length;
     }
-
     this.pendingJobs.splice(index, 0, job);
   }
 

package/tx/ocl/shared/patches.cjs

@@ -178,6 +178,43 @@ function patchValueSetExpandWholeSystemForOcl() {
 
   const originalIncludeCodes = proto.includeCodes;
   proto.includeCodes = async function patchedIncludeCodes(cset, path, vsSrc, compose, filter, expansion, excludeInactive, notClosed) {
+    // ...existing code...
+    // PATCH: Para OCL ValueSet, só expandir códigos explicitamente listados em compose.include.code
+    if (Array.isArray(compose?.include)) {
+      const explicitCodes = [];
+      for (const include of compose.include) {
+        // Normaliza o system para URL canônico
+        const canonicalSystem = typeof include.system === 'string' ? include.system.trim() : include.system;
+        if (Array.isArray(include.code)) {
+          for (const code of include.code) {
+            explicitCodes.push({ system: canonicalSystem, code });
+          }
+        }
+        // Também verifica se há conceitos explícitos em include.concept
+        if (Array.isArray(include.concept)) {
+          for (const concept of include.concept) {
+            if (concept && concept.code) {
+              explicitCodes.push({ system: canonicalSystem, code: concept.code });
+            }
+          }
+        }
+      }
+      if (explicitCodes.length > 0) {
+        // Filtra expansão para só retornar os códigos explicitamente referenciados
+        const filtered = [];
+        for (const { system, code } of explicitCodes) {
+          // Busca conceito no CodeSystem
+          const resources = await originalIncludeCodes.call(this, { system, code }, path, vsSrc, compose, filter, expansion, excludeInactive, notClosed);
+          if (Array.isArray(resources)) {
+            filtered.push(...resources);
+          } else if (resources) {
+            filtered.push(resources);
+          }
+        }
+        return filtered;
+      }
+    }
+    // Fallback para comportamento original
     try {
       return await originalIncludeCodes.call(this, cset, path, vsSrc, compose, filter, expansion, excludeInactive, notClosed);
     } catch (error) {