Wire up compiler generators + fix parser for SpeckDL edge cases
Some checks failed
Deploy Landing Page to Storj / deploy (push) Failing after 3s
Some checks failed
Deploy Landing Page to Storj / deploy (push) Failing after 3s
- Connected PROV-O, CycloneDX, and SPDX generators to CLI entry point - Fixed parseAuthor regex to handle angle-bracket email format - Fixed parseDerives to handle hyphenated names and quoted rationale - Fixed parseSatisfies to handle hyphenated requirement IDs - Fixed parseSource to handle ref keyword with quoted value - Added graceful fallbacks (warn instead of throw) for parse errors - All 5 example .speck files compile and validate successfully
This commit is contained in:
Scott Scoble
parent
11875df2f0
commit
8facd5c6c7
8 changed files with 98 additions and 36 deletions
2
compiler/dist/__tests__/compiler.test.js
vendored
2
compiler/dist/__tests__/compiler.test.js
vendored
|
|
@ -15,7 +15,7 @@ describe('Compiler E2E', () => {
|
|||
}
|
||||
});
|
||||
it('should parse RetryHandler.speck', () => {
|
||||
const specPath = path.join(process.cwd(), 'examples', 'RetryHandler.speck');
|
||||
const specPath = path.join(process.cwd(), '..', 'examples', 'RetryHandler.speck');
|
||||
ast = parseSpeckFile(specPath);
|
||||
expect(ast).toBeDefined();
|
||||
expect(ast.specks).toBeDefined();
|
||||
|
|
|
|||
2
compiler/dist/__tests__/compiler.test.js.map
vendored
2
compiler/dist/__tests__/compiler.test.js.map
vendored
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"compiler.test.js","sourceRoot":"","sources":["../../src/__tests__/compiler.test.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"compiler.test.js","sourceRoot":"","sources":["../../src/__tests__/compiler.test.ts"],"names":[],"mappings":"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"}
|
||||
29
compiler/dist/index.js
vendored
29
compiler/dist/index.js
vendored
|
|
@ -2,6 +2,10 @@
|
|||
import yargs from 'yargs';
|
||||
import { hideBin } from 'yargs/helpers';
|
||||
import { parseSpeckFile } from './parser.js';
|
||||
import { generateProvenanceGraph } from './generators/provenance.js';
|
||||
import { generateCycloneDX } from './generators/cyclonedx.js';
|
||||
import { generateSPDX } from './generators/spdx.js';
|
||||
import fs from 'fs';
|
||||
async function main() {
|
||||
const argv = await yargs(hideBin(process.argv))
|
||||
.command('$0 <file>', 'Compile a SpeckDL specification', (yargsCmd) => {
|
||||
|
|
@ -35,11 +39,26 @@ async function main() {
|
|||
console.log(`Compiling ${file}...`);
|
||||
// Parse the Speck file
|
||||
const ast = parseSpeckFile(file);
|
||||
console.log('AST parsed successfully');
|
||||
console.log('Compilation complete');
|
||||
// TODO: Generate outputs based on bomFormat
|
||||
console.log(`Output directory: ${options.outputDir}`);
|
||||
console.log(`BOM format: ${options.bomFormat}`);
|
||||
const speckCount = ast.specks.length;
|
||||
const memberCount = ast.specks.reduce((sum, s) => sum + s.members.length, 0);
|
||||
console.log(`AST parsed successfully: ${speckCount} speck(s), ${memberCount} member(s)`);
|
||||
// Ensure output directory exists
|
||||
if (!fs.existsSync(options.outputDir)) {
|
||||
fs.mkdirSync(options.outputDir, { recursive: true });
|
||||
}
|
||||
// Always generate provenance (it's the core output)
|
||||
console.log('\nGenerating provenance graph (PROV-O JSON-LD)...');
|
||||
generateProvenanceGraph(ast, options.outputDir);
|
||||
// Generate BOM based on format selection
|
||||
if (options.bomFormat === 'cdx' || options.bomFormat === 'both') {
|
||||
console.log('\nGenerating CycloneDX BOM...');
|
||||
generateCycloneDX(ast, options.outputDir);
|
||||
}
|
||||
if (options.bomFormat === 'spdx' || options.bomFormat === 'both') {
|
||||
console.log('\nGenerating SPDX BOM...');
|
||||
generateSPDX(ast, options.outputDir);
|
||||
}
|
||||
console.log(`\nCompilation complete. Output: ${options.outputDir}/`);
|
||||
}
|
||||
main().catch((err) => {
|
||||
console.error('Compilation failed:', err);
|
||||
|
|
|
|||
2
compiler/dist/index.js.map
vendored
2
compiler/dist/index.js.map
vendored
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAO7C,KAAK,UAAU,IAAI;IACjB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5C,OAAO,CAAC,WAAW,EAAE,iCAAiC,EAAE,CAAC,QAAQ,EAAE,EAAE;QACpE,OAAO,QAAQ;aACZ,UAAU,CAAC,MAAM,EAAE;YAClB,QAAQ,EAAE,yBAAyB;YACnC,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YACpB,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yCAAyC;YACnD,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,OAAO;SACjB,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YACpB,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,mBAAmB;YAC7B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;YAChC,OAAO,EAAE,MAAe;SACzB,CAAC,CAAC;IACP,CAAC,CAAC;SACD,IAAI,EAAE;SACN,IAAI,CAAC;IAER,MAAM,IAAI,GAAG,IAAI,CAAC,IAAc,CAAC;IACjC,MAAM,OAAO,GAAG;QACd,SAAS,EAAE,IAAI,CAAC,SAAmB;QACnC,SAAS,EAAE,IAAI,CAAC,SAAoC;KACrD,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,KAAK,CAAC,CAAC;IAEpC,uBAAuB;IACvB,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAEpC,4CAA4C;IAC5C,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
||||
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
||||
32
compiler/dist/parser.js
vendored
32
compiler/dist/parser.js
vendored
|
|
@ -224,11 +224,12 @@ function parseProvenanceBlock(lines, line) {
|
|||
}
|
||||
function parseDerives(line) {
|
||||
// derives from Name via "rationale"
|
||||
const match = line.match(/^derives\s+from\s+(\w+)(?:\s+via\s+(['"])(.+?)\2)?/);
|
||||
const match = line.match(/^derives\s+from\s+(\w+(?:-\w+)*)(?:\s+via\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse derives: ${line}`);
|
||||
console.warn(`Failed to parse derives statement: ${line}`);
|
||||
return { type: 'derives', from: 'unknown' };
|
||||
}
|
||||
const [, from, via] = match;
|
||||
const [, from, , via] = match;
|
||||
return {
|
||||
type: 'derives',
|
||||
from,
|
||||
|
|
@ -237,11 +238,14 @@ function parseDerives(line) {
|
|||
}
|
||||
function parseSatisfies(line) {
|
||||
// satisfies Name [clause "X.Y.Z"]
|
||||
const match = line.match(/^satisfies\s+(\w+)(?:\s+clause\s+(['"])(.+?)\2)?/);
|
||||
// e.g., satisfies RESILIENCE-REQ-01 clause "3.1.2"
|
||||
// e.g., satisfies RESILIENCE-REQ-02
|
||||
const match = line.match(/^satisfies\s+([\w-]+(?:-[\w]+)*)(?:\s+clause\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse satisfies: ${line}`);
|
||||
console.warn(`Failed to parse satisfies statement: ${line}`);
|
||||
return { type: 'satisfies', requirement: 'unknown' };
|
||||
}
|
||||
const [, requirement, clause] = match;
|
||||
const [, requirement, , clause] = match;
|
||||
return {
|
||||
type: 'satisfies',
|
||||
requirement,
|
||||
|
|
@ -250,11 +254,14 @@ function parseSatisfies(line) {
|
|||
}
|
||||
function parseAuthor(line) {
|
||||
// author: "Name" <"email">
|
||||
// e.g., author: "Scott Scoble" <"scott@scoble.me">
|
||||
const match = line.match(/^author:\s+(['"])(.+?)\1(?:\s+<(['"])(.+?)\3>)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse author: ${line}`);
|
||||
// Try without angle brackets or with different format
|
||||
console.warn(`Failed to parse author statement: ${line}`);
|
||||
return { type: 'author', name: 'unknown' };
|
||||
}
|
||||
const [, name, email] = match;
|
||||
const [, , name, , email] = match;
|
||||
return {
|
||||
type: 'author',
|
||||
name,
|
||||
|
|
@ -263,17 +270,20 @@ function parseAuthor(line) {
|
|||
}
|
||||
function parseSource(line) {
|
||||
// source: kind ref "identifier"
|
||||
// e.g., source: architecture_review ref "AR-2024-0215"
|
||||
const match = line.match(/^source:\s+(\w+)(?:\s+ref\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse source: ${line}`);
|
||||
console.warn(`Failed to parse source statement: ${line}`);
|
||||
return { type: 'source', kind: 'document' };
|
||||
}
|
||||
const [, kind, ref] = match;
|
||||
const [, kind, , ref] = match;
|
||||
const validKinds = [
|
||||
'conversation', 'meeting', 'document', 'regulation',
|
||||
'architecture_review', 'threat_model', 'compliance_audit'
|
||||
];
|
||||
if (!validKinds.includes(kind)) {
|
||||
throw new Error(`Invalid source kind: ${kind}`);
|
||||
console.warn(`Invalid source kind: ${kind}, defaulting to document`);
|
||||
return { type: 'source', kind: 'document', ref: ref || undefined };
|
||||
}
|
||||
return {
|
||||
type: 'source',
|
||||
|
|
|
|||
2
compiler/dist/parser.js.map
vendored
2
compiler/dist/parser.js.map
vendored
File diff suppressed because one or more lines are too long
|
|
@ -3,6 +3,10 @@
|
|||
import yargs from 'yargs';
|
||||
import { hideBin } from 'yargs/helpers';
|
||||
import { parseSpeckFile } from './parser.js';
|
||||
import { generateProvenanceGraph } from './generators/provenance.js';
|
||||
import { generateCycloneDX } from './generators/cyclonedx.js';
|
||||
import { generateSPDX } from './generators/spdx.js';
|
||||
import fs from 'fs';
|
||||
|
||||
interface CompileOptions {
|
||||
outputDir: string;
|
||||
|
|
@ -45,13 +49,32 @@ async function main() {
|
|||
|
||||
// Parse the Speck file
|
||||
const ast = parseSpeckFile(file);
|
||||
|
||||
const speckCount = ast.specks.length;
|
||||
const memberCount = ast.specks.reduce((sum, s) => sum + s.members.length, 0);
|
||||
console.log(`AST parsed successfully: ${speckCount} speck(s), ${memberCount} member(s)`);
|
||||
|
||||
console.log('AST parsed successfully');
|
||||
console.log('Compilation complete');
|
||||
// Ensure output directory exists
|
||||
if (!fs.existsSync(options.outputDir)) {
|
||||
fs.mkdirSync(options.outputDir, { recursive: true });
|
||||
}
|
||||
|
||||
// TODO: Generate outputs based on bomFormat
|
||||
console.log(`Output directory: ${options.outputDir}`);
|
||||
console.log(`BOM format: ${options.bomFormat}`);
|
||||
// Always generate provenance (it's the core output)
|
||||
console.log('\nGenerating provenance graph (PROV-O JSON-LD)...');
|
||||
generateProvenanceGraph(ast, options.outputDir);
|
||||
|
||||
// Generate BOM based on format selection
|
||||
if (options.bomFormat === 'cdx' || options.bomFormat === 'both') {
|
||||
console.log('\nGenerating CycloneDX BOM...');
|
||||
generateCycloneDX(ast, options.outputDir);
|
||||
}
|
||||
|
||||
if (options.bomFormat === 'spdx' || options.bomFormat === 'both') {
|
||||
console.log('\nGenerating SPDX BOM...');
|
||||
generateSPDX(ast, options.outputDir);
|
||||
}
|
||||
|
||||
console.log(`\nCompilation complete. Output: ${options.outputDir}/`);
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
|
|
|
|||
|
|
@ -403,12 +403,13 @@ function parseProvenanceBlock(lines: string[], line: string): ProvenanceNode {
|
|||
|
||||
function parseDerives(line: string): DerivesNode {
|
||||
// derives from Name via "rationale"
|
||||
const match = line.match(/^derives\s+from\s+(\w+)(?:\s+via\s+(['"])(.+?)\2)?/);
|
||||
const match = line.match(/^derives\s+from\s+(\w+(?:-\w+)*)(?:\s+via\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse derives: ${line}`);
|
||||
console.warn(`Failed to parse derives statement: ${line}`);
|
||||
return { type: 'derives', from: 'unknown' };
|
||||
}
|
||||
|
||||
const [, from, via] = match;
|
||||
const [, from, , via] = match;
|
||||
|
||||
return {
|
||||
type: 'derives',
|
||||
|
|
@ -419,12 +420,15 @@ function parseDerives(line: string): DerivesNode {
|
|||
|
||||
function parseSatisfies(line: string): SatisfiesNode {
|
||||
// satisfies Name [clause "X.Y.Z"]
|
||||
const match = line.match(/^satisfies\s+(\w+)(?:\s+clause\s+(['"])(.+?)\2)?/);
|
||||
// e.g., satisfies RESILIENCE-REQ-01 clause "3.1.2"
|
||||
// e.g., satisfies RESILIENCE-REQ-02
|
||||
const match = line.match(/^satisfies\s+([\w-]+(?:-[\w]+)*)(?:\s+clause\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse satisfies: ${line}`);
|
||||
console.warn(`Failed to parse satisfies statement: ${line}`);
|
||||
return { type: 'satisfies', requirement: 'unknown' };
|
||||
}
|
||||
|
||||
const [, requirement, clause] = match;
|
||||
const [, requirement, , clause] = match;
|
||||
|
||||
return {
|
||||
type: 'satisfies',
|
||||
|
|
@ -435,12 +439,15 @@ function parseSatisfies(line: string): SatisfiesNode {
|
|||
|
||||
function parseAuthor(line: string): AuthorNode {
|
||||
// author: "Name" <"email">
|
||||
// e.g., author: "Scott Scoble" <"scott@scoble.me">
|
||||
const match = line.match(/^author:\s+(['"])(.+?)\1(?:\s+<(['"])(.+?)\3>)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse author: ${line}`);
|
||||
// Try without angle brackets or with different format
|
||||
console.warn(`Failed to parse author statement: ${line}`);
|
||||
return { type: 'author', name: 'unknown' };
|
||||
}
|
||||
|
||||
const [, name, email] = match;
|
||||
const [, , name, , email] = match;
|
||||
|
||||
return {
|
||||
type: 'author',
|
||||
|
|
@ -451,19 +458,22 @@ function parseAuthor(line: string): AuthorNode {
|
|||
|
||||
function parseSource(line: string): SourceNode {
|
||||
// source: kind ref "identifier"
|
||||
// e.g., source: architecture_review ref "AR-2024-0215"
|
||||
const match = line.match(/^source:\s+(\w+)(?:\s+ref\s+(['"])(.+?)\2)?/);
|
||||
if (!match) {
|
||||
throw new Error(`Failed to parse source: ${line}`);
|
||||
console.warn(`Failed to parse source statement: ${line}`);
|
||||
return { type: 'source', kind: 'document' };
|
||||
}
|
||||
|
||||
const [, kind, ref] = match;
|
||||
const [, kind, , ref] = match;
|
||||
const validKinds = [
|
||||
'conversation', 'meeting', 'document', 'regulation',
|
||||
'architecture_review', 'threat_model', 'compliance_audit'
|
||||
];
|
||||
|
||||
if (!validKinds.includes(kind)) {
|
||||
throw new Error(`Invalid source kind: ${kind}`);
|
||||
console.warn(`Invalid source kind: ${kind}, defaulting to document`);
|
||||
return { type: 'source', kind: 'document', ref: ref || undefined };
|
||||
}
|
||||
|
||||
return {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue