Merge branch 'main' into renovate/npm-minimatch-vulnerability

rocketstack-matt · web-flow · commit 24acf5807b14 · 2026-03-02T12:01:28.000Z
diff --git a/.github/workflows/automated-release-calm-server.yml b/.github/workflows/automated-release-calm-server.yml
diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml
@@ -183,7 +183,17 @@ jobs:
               NEXT_VERSION=$(grep "The next release version is" analysis.txt | sed 's/.*The next release version is \([^[:space:]]\+\).*/\1/')
               
               # Get current version from latest git tag instead of package.json
-              CURRENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/cli-v//')
+              CURRENT_VERSION=$(git describe --tags --abbrev=0 --match 'cli-v*' 2>/dev/null | sed 's/cli-v//')
+              
+              if [ -z "$CURRENT_VERSION" ]; then
+                echo "⚠️ No cli-v* git tag found; falling back to package.json version."
+                CURRENT_VERSION=$(node -p "require('./package.json').version" 2>/dev/null || echo "")
+              fi
+              
+              if [ -z "$CURRENT_VERSION" ]; then
+                echo "⚠️ package.json version unavailable; defaulting current version to 0.0.0."
+                CURRENT_VERSION="0.0.0"
+              fi
               
               echo "📋 Extracted versions:"
               echo "  Current: $CURRENT_VERSION"
@@ -422,7 +432,7 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'automated-release')
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2
+        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2
         with:
           egress-policy: audit
 
@@ -437,6 +447,7 @@ jobs:
         uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           node-version: 22
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
         run: npm ci
@@ -481,6 +492,8 @@ jobs:
             --target main
 
       - name: Publish to NPM
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_SEMANTIC_RELEASE }}
         run: |
           cd cli
           npm publish --provenance
diff --git a/.github/workflows/semgrep-ci.yml b/.github/workflows/semgrep-ci.yml
@@ -21,7 +21,7 @@ jobs:
         env:
             SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
         container:
-            image: semgrep/semgrep@sha256:d3d1be3a3770514d16a6a57b9761575d7536d70f45a5220274f4ec7d55c442b9
+            image: semgrep/semgrep@sha256:e04d2cb132288d90035db8791d64f610cb255b21e727b94db046243b30c01ae9
         if: (github.actor != 'dependabot[bot]')
         steps:
             - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
diff --git a/calm-plugins/vscode/src/core/services/navigation-service.spec.ts b/calm-plugins/vscode/src/core/services/navigation-service.spec.ts
@@ -3,7 +3,7 @@ import { NavigationService } from './navigation-service'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { buildDocumentLoader } from '@finos/calm-shared/dist/document-loader/document-loader'
+import { buildDocumentLoader } from '@finos/calm-shared'
 
 // Mock vscode
 vi.mock('vscode', () => ({
@@ -39,7 +39,7 @@ vi.mock('fs', () => ({
 }))
 
 // Mock document loader
-vi.mock('@finos/calm-shared/dist/document-loader/document-loader', () => ({
+vi.mock('@finos/calm-shared', () => ({
     buildDocumentLoader: vi.fn(),
 }))
 
@@ -65,7 +65,7 @@ describe('NavigationService', () => {
         }
 
         vi.mocked(buildDocumentLoader).mockReturnValue(mockDocLoader)
-        
+
         // Reset vscode mocks
         // @ts-ignore
         vscode.workspace.workspaceFolders = undefined
@@ -96,8 +96,8 @@ describe('NavigationService', () => {
             // @ts-ignore
             vscode.workspace.workspaceFolders = undefined
 
-            const result = await navigationService.navigate('node1', { 
-                'detailed-architecture': 'detail.json' 
+            const result = await navigationService.navigate('node1', {
+                'detailed-architecture': 'detail.json'
             })
 
             expect(result).toBe(false)
@@ -114,7 +114,7 @@ describe('NavigationService', () => {
             const targetPath = '/workspace/detail.json'
             mockDocLoader.resolvePath.mockReturnValue(targetPath)
             vi.mocked(fs.existsSync).mockReturnValue(true)
-            
+
             // Setup open document
             const mockDoc = { uri: { fsPath: targetPath } }
             vi.mocked(vscode.workspace.openTextDocument).mockResolvedValue(mockDoc as any)
@@ -147,8 +147,8 @@ describe('NavigationService', () => {
             mockDocLoader.resolvePath.mockReturnValue(targetPath)
             vi.mocked(fs.existsSync).mockReturnValue(false)
 
-            const result = await navigationService.navigate('node1', { 
-                'detailed-architecture': 'detail.json' 
+            const result = await navigationService.navigate('node1', {
+                'detailed-architecture': 'detail.json'
             })
 
             expect(vscode.window.showWarningMessage).toHaveBeenCalledWith(expect.stringContaining('File not found'))
@@ -163,9 +163,9 @@ describe('NavigationService', () => {
 
             const httpUrl = 'http://example.com/arch.json'
             mockDocLoader.resolvePath.mockReturnValue(undefined) // or whatever resolvePath returns for unresolvable
-            
-            const result = await navigationService.navigate('node1', { 
-                'detailed-architecture': httpUrl 
+
+            const result = await navigationService.navigate('node1', {
+                'detailed-architecture': httpUrl
             })
 
             expect(vscode.window.showWarningMessage).toHaveBeenCalledWith(
@@ -200,7 +200,7 @@ describe('NavigationService', () => {
             expect(buildDocumentLoader).toHaveBeenCalledWith(expect.objectContaining({
                 urlToLocalMap: expect.any(Map)
             }))
-            
+
             // Verify map content passed to loader
             const callArgs = vi.mocked(buildDocumentLoader).mock.calls[0][0]
             expect(callArgs.urlToLocalMap?.get('http://example.com')).toContain('local/path')
diff --git a/calm-plugins/vscode/src/core/services/navigation-service.ts b/calm-plugins/vscode/src/core/services/navigation-service.ts
@@ -5,7 +5,7 @@ import {
     buildDocumentLoader,
     DocumentLoader,
     DocumentLoaderOptions
-} from '@finos/calm-shared/dist/document-loader/document-loader'
+} from '@finos/calm-shared'
 import { Config } from '../ports/config'
 import type { Logger } from '../ports/logger'
 
diff --git a/calm-plugins/vscode/src/features/validation/validation-service.spec.ts b/calm-plugins/vscode/src/features/validation/validation-service.spec.ts
@@ -76,18 +76,14 @@ vi.mock('@finos/calm-shared', async () => {
         loadTimeline: vi.fn(),
         SchemaDirectory: vi.fn().mockImplementation(() => ({
             loadSchemas: vi.fn()
+        })),
+        buildDocumentLoader: vi.fn(() => ({
+            loadMissingDocument: vi.fn(),
+            initialise: vi.fn()
         }))
     }
 })
 
-// Mock document loader
-vi.mock('@finos/calm-shared/dist/document-loader/document-loader', () => ({
-    buildDocumentLoader: vi.fn(() => ({
-        loadMissingDocument: vi.fn(),
-        initialise: vi.fn()
-    }))
-}))
-
 // Mock CalmSchemaRegistry
 vi.mock('../../core/services/calm-schema-registry', () => ({
     CalmSchemaRegistry: vi.fn().mockImplementation(() => ({
diff --git a/calm-plugins/vscode/src/features/validation/validation-service.ts b/calm-plugins/vscode/src/features/validation/validation-service.ts
@@ -7,9 +7,10 @@ import {
     loadArchitectureAndPattern,
     loadTimeline,
     enrichWithDocumentPositions,
-    parseDocumentWithPositions
+    parseDocumentWithPositions,
+    buildDocumentLoader,
+    DocumentLoader
 } from '@finos/calm-shared'
-import { buildDocumentLoader, DocumentLoader } from '@finos/calm-shared/dist/document-loader/document-loader'
 import type { Logger } from '../../core/ports/logger'
 import type { Config } from '../../core/ports/config'
 import { CalmSchemaRegistry } from '../../core/services/calm-schema-registry'
diff --git a/calm-server/CHANGELOG.md b/calm-server/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to the CALM Server will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.2.0] - 2026-03-01
+
+### Changed
+- Manual release triggered
+
diff --git a/calm-server/package.json b/calm-server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/calm-server",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "CALM Server - A server implementation for the Common Architecture Language Model",
     "homepage": "https://calm.finos.org",
     "repository": {
@@ -48,4 +48,4 @@
         "typescript": "^5.8.2",
         "vitest": "^3.1.1"
     }
-}
+}
diff --git a/cli/src/cli.spec.ts b/cli/src/cli.spec.ts
@@ -1,9 +1,9 @@
 import {
-    CALM_META_SCHEMA_DIRECTORY,
     Docifier,
     DocifyMode,
     TemplateProcessingMode,
-    TemplateProcessor
+    TemplateProcessor,
+    DocumentLoader
 } from '@finos/calm-shared';
 import { Command } from 'commander';
 import { MockInstance } from 'vitest';
@@ -14,12 +14,12 @@ let validateModule: typeof import('./command-helpers/validate');
 let serverModule: typeof import('./server/cli-server');
 let templateModule: typeof import('./command-helpers/template');
 let optionsModule: typeof import('./command-helpers/generate-options');
-let fileSystemDocLoaderModule: typeof import('@finos/calm-shared/dist/document-loader/file-system-document-loader');
 let setupCLI: typeof import('./cli').setupCLI;
 let cliConfigModule: typeof import('./cli-config');
 
 describe('CLI Commands', () => {
     let program: Command;
+    let mockDocLoader: DocumentLoader;
 
     beforeEach(async () => {
         vi.resetModules();
@@ -30,7 +30,6 @@ describe('CLI Commands', () => {
         serverModule = await import('./server/cli-server');
         templateModule = await import('./command-helpers/template');
         optionsModule = await import('./command-helpers/generate-options');
-        fileSystemDocLoaderModule = await import('@finos/calm-shared/dist/document-loader/file-system-document-loader');
 
         vi.spyOn(calmShared, 'runGenerate').mockResolvedValue(undefined);
         vi.spyOn(calmShared.TemplateProcessor.prototype, 'processTemplate').mockResolvedValue(undefined);
@@ -44,8 +43,12 @@ describe('CLI Commands', () => {
 
         vi.spyOn(optionsModule, 'promptUserForOptions').mockResolvedValue([]);
 
-        vi.spyOn(fileSystemDocLoaderModule, 'FileSystemDocumentLoader').mockImplementation(vi.fn());
-        vi.spyOn(fileSystemDocLoaderModule.FileSystemDocumentLoader.prototype, 'loadMissingDocument').mockResolvedValue({});
+        mockDocLoader = {
+            initialise: vi.fn().mockResolvedValue(undefined),
+            loadMissingDocument: vi.fn().mockResolvedValue({}),
+            resolvePath: vi.fn().mockReturnValue(undefined)
+        };
+        vi.spyOn(calmShared, 'buildDocumentLoader').mockReturnValue(mockDocLoader);
 
         const cliModule = await import('./cli');
         setupCLI = cliModule.setupCLI;
@@ -64,10 +67,14 @@ describe('CLI Commands', () => {
                 '--schema-directory', 'schemas',
             ]);
 
-            expect(fileSystemDocLoaderModule.FileSystemDocumentLoader.prototype.loadMissingDocument).toHaveBeenCalledWith('pattern.json', 'pattern');
+            expect(mockDocLoader.loadMissingDocument).toHaveBeenCalledWith('pattern.json', 'pattern');
             expect(optionsModule.promptUserForOptions).toHaveBeenCalled();
 
-            expect(fileSystemDocLoaderModule.FileSystemDocumentLoader).toHaveBeenCalledWith([CALM_META_SCHEMA_DIRECTORY, 'schemas'], true, process.cwd());
+            expect(calmShared.buildDocumentLoader).toHaveBeenCalledWith(expect.objectContaining({
+                schemaDirectoryPath: 'schemas',
+                debug: true,
+                basePath: process.cwd()
+            }));
 
             expect(calmShared.runGenerate).toHaveBeenCalledWith(
                 {}, 'output.json', true, expect.any(calmShared.SchemaDirectory), []
diff --git a/cli/src/cli.ts b/cli/src/cli.ts
@@ -1,9 +1,7 @@
-import { CALM_META_SCHEMA_DIRECTORY, DocifyMode, initLogger, runGenerate, SchemaDirectory, TemplateProcessingMode } from '@finos/calm-shared';
+import { CALM_META_SCHEMA_DIRECTORY, DocifyMode, initLogger, runGenerate, SchemaDirectory, TemplateProcessingMode, CalmChoice, buildDocumentLoader, DocumentLoader, DocumentLoaderOptions } from '@finos/calm-shared';
 import { Option, Command } from 'commander';
 import { version } from '../package.json';
 import { promptUserForOptions } from './command-helpers/generate-options';
-import { CalmChoice } from '@finos/calm-shared/dist/commands/generate/components/options';
-import { buildDocumentLoader, DocumentLoader, DocumentLoaderOptions } from '@finos/calm-shared/dist/document-loader/document-loader';
 import { loadCliConfig } from './cli-config';
 import path from 'path';
 import { select } from '@inquirer/prompts';
diff --git a/cli/src/command-helpers/generate-options.spec.ts b/cli/src/command-helpers/generate-options.spec.ts
@@ -1,4 +1,4 @@
-import { CalmChoice } from '@finos/calm-shared/dist/commands/generate/components/options';
+import { CalmChoice } from '@finos/calm-shared';
 import { promptUserForOptions } from './generate-options';
 
 const mocks = vi.hoisted(() => {
@@ -9,9 +9,13 @@ const mocks = vi.hoisted(() => {
     };
 });
 
-vi.mock('@finos/calm-shared/dist/commands/generate/components/options', () => ({
-    extractOptions: mocks.extractOptions
-}));
+vi.mock('@finos/calm-shared', async () => {
+    const actual = await vi.importActual<typeof import('@finos/calm-shared')>('@finos/calm-shared');
+    return {
+        ...actual,
+        extractOptions: mocks.extractOptions
+    };
+});
 
 vi.mock('@inquirer/prompts', () => ({ 
     select: mocks.select,
diff --git a/cli/src/command-helpers/generate-options.ts b/cli/src/command-helpers/generate-options.ts
@@ -1,5 +1,4 @@
-import { CalmChoice, CalmOption, extractOptions } from '@finos/calm-shared/dist/commands/generate/components/options';
-import { initLogger } from '@finos/calm-shared';
+import { CalmChoice, CalmOption, extractOptions, initLogger } from '@finos/calm-shared';
 import { select, checkbox } from '@inquirer/prompts';
 
 type InquirerQuestion = {
diff --git a/cli/src/command-helpers/validate.spec.ts b/cli/src/command-helpers/validate.spec.ts
@@ -38,7 +38,8 @@ vi.mock('@finos/calm-shared', async () => ({
     getFormattedOutput: mocks.getFormattedOutput,
     exitBasedOffOfValidationOutcome: mocks.exitBasedOffOfValidationOutcome,
     initLogger: mocks.initLogger,
-    loadSchemas: mocks.loadSchemas
+    loadSchemas: mocks.loadSchemas,
+    buildDocumentLoader: mocks.buildDocumentLoader
 }));
 
 vi.mock('mkdirp', () => ({
@@ -59,11 +60,6 @@ vi.mock('../cli', async () => ({
     })),
 }));
 
-vi.mock('@finos/calm-shared/dist/document-loader/document-loader', async () => ({
-    ...(await vi.importActual('@finos/calm-shared/dist/document-loader/document-loader')),
-    buildDocumentLoader: mocks.buildDocumentLoader
-}));
-
 describe('runValidate', () => {
     const fakeOutcome = { valid: true };
 
diff --git a/cli/src/command-helpers/validate.ts b/cli/src/command-helpers/validate.ts
@@ -1,13 +1,9 @@
-import { getFormattedOutput, validate, exitBasedOffOfValidationOutcome, ValidationFormattingOptions, loadArchitectureAndPattern, loadTimeline, enrichWithDocumentPositions, ParsedDocumentContext } from '@finos/calm-shared';
-import { initLogger } from '@finos/calm-shared';
+import { getFormattedOutput, validate, exitBasedOffOfValidationOutcome, ValidationFormattingOptions, loadArchitectureAndPattern, loadTimeline, enrichWithDocumentPositions, ParsedDocumentContext, initLogger, ValidateOutputFormat, buildDocumentLoader, DocumentLoader, Logger } from '@finos/calm-shared';
 import path from 'path';
 import { mkdirp } from 'mkdirp';
 import { readFileSync, writeFileSync } from 'fs';
 import { Command } from 'commander';
-import { ValidateOutputFormat } from '@finos/calm-shared/dist/commands/validate/validate';
 import { buildSchemaDirectory, parseDocumentLoaderConfig } from '../cli';
-import { buildDocumentLoader, DocumentLoader } from '@finos/calm-shared/dist/document-loader/document-loader';
-import { Logger } from '@finos/calm-shared/dist/logger';
 import { parseWithPointers } from '@stoplight/json';
 
 export interface ValidateOptions {
diff --git a/shared/src/index.ts b/shared/src/index.ts
@@ -5,11 +5,13 @@ export {
     ValidationFormattingOptions,
     ValidationDocumentContext,
 } from './commands/validate/validate.js';
-export { OutputFormat } from './commands/validate/validate.js';
+export { OutputFormat, ValidateOutputFormat } from './commands/validate/validate.js';
 export { runGenerate } from './commands/generate/generate.js';
 export {
     extractOptions,
     selectChoices,
+    CalmChoice,
+    CalmOption,
 } from './commands/generate/components/options.js';
 export { ValidationOutput } from './commands/validate/validation.output.js';
 export { CALM_META_SCHEMA_DIRECTORY } from './consts.js';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@finos/calm-server",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"description": "CALM Server - A server implementation for the Common Architecture Language Model",`
`5`	`5`	`"homepage": "https://calm.finos.org",`
`6`	`6`	`"repository": {`
`@@ -48,4 +48,4 @@`
`48`	`48`	`"typescript": "^5.8.2",`
`49`	`49`	`"vitest": "^3.1.1"`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+}`