edacation 0.5.1 → 0.6.1

package/dist/project/nextpnr.d.ts

@@ -2,8 +2,6 @@ import type { NextpnrOptions, ProjectConfiguration, WorkerOptions, WorkerStep }
 import type { Project } from './project.js';
 export type NextpnrStep = WorkerStep;
 export type NextpnrWorkerOptions = WorkerOptions<NextpnrStep, NextpnrOptions>;
-export declare const getNextpnrDefaultOptions: (configuration: ProjectConfiguration) => NextpnrOptions;
-export declare const getNextpnrOptions: (configuration: ProjectConfiguration, targetId: string) => NextpnrOptions;
-export declare const generateNextpnrWorkerOptions: (configuration: ProjectConfiguration, targetId: string) => NextpnrWorkerOptions;
 export declare const parseNextpnrArguments: (args: string[]) => string[];
+export declare const getNextpnrOptions: (configuration: ProjectConfiguration, targetId: string) => NextpnrOptions;
 export declare const getNextpnrWorkerOptions: (project: Project, targetId: string) => NextpnrWorkerOptions;

package/dist/project/nextpnr.js

@@ -1,48 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextpnrWorkerOptions = exports.parseNextpnrArguments = exports.generateNextpnrWorkerOptions = exports.getNextpnrOptions = exports.getNextpnrDefaultOptions = void 0;
+exports.getNextpnrWorkerOptions = exports.getNextpnrOptions = exports.parseNextpnrArguments = void 0;
 const string_args_parser_1 = require("string-args-parser");
 const devices_js_1 = require("./devices.js");
 const target_js_1 = require("./target.js");
 const DEFAULT_OPTIONS = {
     placedSvg: false,
     routedSvg: false,
-    routedJson: true
+    routedJson: true,
+    pinConfigFile: undefined
 };
-const getNextpnrDefaultOptions = (configuration) => (0, target_js_1.getDefaultOptions)(configuration, 'nextpnr', DEFAULT_OPTIONS);
-exports.getNextpnrDefaultOptions = getNextpnrDefaultOptions;
+const parseNextpnrArguments = (args) => args.flatMap((arg) => (0, string_args_parser_1.parseArgs)(arg));
+exports.parseNextpnrArguments = parseNextpnrArguments;
 const getNextpnrOptions = (configuration, targetId) => (0, target_js_1.getOptions)(configuration, targetId, 'nextpnr', DEFAULT_OPTIONS);
 exports.getNextpnrOptions = getNextpnrOptions;
-const generateNextpnrWorkerOptions = (configuration, targetId) => {
+const getNextpnrWorkerOptions = (project, targetId) => {
+    const configuration = project.getConfiguration();
     const target = (0, target_js_1.getTarget)(configuration, targetId);
     const options = (0, exports.getNextpnrOptions)(configuration, targetId);
     const vendor = devices_js_1.VENDORS[target.vendor];
     const family = vendor.families[target.family];
     const device = family.devices[target.device];
-    const inputFiles = [(0, target_js_1.getTargetFile)(target, `${family.architecture}.json`)];
-    const outputFiles = [];
+    // Input files
+    const generatedInputFiles = [`${family.architecture}.json`].map(f => (0, target_js_1.getTargetFile)(target, f));
+    const inputFiles = (0, target_js_1.getCombined)(configuration, targetId, 'nextpnr', 'inputFiles', generatedInputFiles).filter((f) => !!f);
+    // Tool
     const tool = `nextpnr-${family.architecture}`;
-    const args = [];
+    // Output files / args
+    const generatedOutputFiles = [];
+    const generatedArgs = [];
     switch (family.architecture) {
         case 'ecp5': {
-            args.push(`--${device.device}`);
-            args.push('--package', target.package.toUpperCase());
+            generatedArgs.push(`--${device.device}`);
+            generatedArgs.push('--package', target.package.toUpperCase());
+            if (options.pinConfigFile) {
+                generatedArgs.push('--lpf', options.pinConfigFile);
+            }
+            // Write bitstream file
+            const file = (0, target_js_1.getTargetFile)(target, `${family.architecture}.config`);
+            generatedOutputFiles.push(file);
+            generatedArgs.push('--textcfg', file);
             break;
         }
         case 'generic': {
             break;
         }
         case 'gowin': {
-            args.push('--device', `${device.device.replace('-', '-UV')}${target.package}C5/I4`);
+            generatedArgs.push('--device', `${device.device.replace('-', '-UV')}${target.package}C5/I4`);
             break;
         }
         case 'ice40': {
-            args.push(`--${device.device}`);
-            args.push('--package', target.package);
-            // Write ASC file by default
+            generatedArgs.push(`--${device.device}`);
+            generatedArgs.push('--package', target.package);
+            if (options.pinConfigFile) {
+                generatedArgs.push('--pcf', options.pinConfigFile);
+            }
+            // Write ASC file
             const file = (0, target_js_1.getTargetFile)(target, `${family.architecture}.asc`);
-            outputFiles.push(file);
-            args.push('--asc', `${family.architecture}.asc`);
+            generatedOutputFiles.push(file);
+            generatedArgs.push('--asc', file);
             break;
         }
         case 'nexus': {
@@ -58,29 +74,31 @@ const generateNextpnrWorkerOptions = (configuration, targetId) => {
             if (!devPackage) {
                 throw new Error(`Package "${target.package}" is currenty not supported.`);
             }
-            args.push('--device', `${device.device}-7${devPackage}C`);
+            generatedArgs.push('--device', `${device.device}-7${devPackage}C`);
             break;
         }
         default: {
             throw new Error(`Architecture "${family.architecture}" is currently not supported.`);
         }
     }
-    args.push('--json', inputFiles[0]);
+    generatedArgs.push('--json', inputFiles[0]);
     if (options.placedSvg) {
         const file = (0, target_js_1.getTargetFile)(target, 'placed.svg');
-        outputFiles.push(file);
-        args.push('--placed-svg', file);
+        generatedOutputFiles.push(file);
+        generatedArgs.push('--placed-svg', file);
     }
     if (options.routedSvg) {
         const file = (0, target_js_1.getTargetFile)(target, 'routed.svg');
-        outputFiles.push(file);
-        args.push('--routed-svg', file);
+        generatedOutputFiles.push(file);
+        generatedArgs.push('--routed-svg', file);
     }
     if (options.routedJson) {
         const file = (0, target_js_1.getTargetFile)(target, 'routed.nextpnr.json');
-        outputFiles.push(file);
-        args.push('--write', file);
+        generatedOutputFiles.push(file);
+        generatedArgs.push('--write', file);
     }
+    const outputFiles = (0, target_js_1.getCombined)(configuration, targetId, 'nextpnr', 'outputFiles', generatedOutputFiles).filter((f) => !!f);
+    const args = (0, target_js_1.getCombined)(configuration, targetId, 'nextpnr', 'arguments', generatedArgs, exports.parseNextpnrArguments);
     return {
         inputFiles,
         outputFiles,
@@ -88,33 +106,12 @@ const generateNextpnrWorkerOptions = (configuration, targetId) => {
         options,
         steps: [
             {
+                id: 'pnr',
                 tool,
                 arguments: args
             }
         ]
     };
 };
-exports.generateNextpnrWorkerOptions = generateNextpnrWorkerOptions;
-const parseNextpnrArguments = (args) => args.flatMap((arg) => (0, string_args_parser_1.parseArgs)(arg));
-exports.parseNextpnrArguments = parseNextpnrArguments;
-const getNextpnrWorkerOptions = (project, targetId) => {
-    const generated = (0, exports.generateNextpnrWorkerOptions)(project.getConfiguration(), targetId);
-    const inputFiles = (0, target_js_1.getCombined)(project.getConfiguration(), targetId, 'nextpnr', 'inputFiles', generated.inputFiles).filter((f) => !!f);
-    const outputFiles = (0, target_js_1.getCombined)(project.getConfiguration(), targetId, 'nextpnr', 'outputFiles', generated.outputFiles).filter((f) => !!f);
-    const target = generated.target;
-    const options = generated.options;
-    const steps = generated.steps.map((step) => {
-        const tool = step.tool;
-        const args = (0, target_js_1.getCombined)(project.getConfiguration(), targetId, 'nextpnr', 'arguments', step.arguments, exports.parseNextpnrArguments);
-        return { tool, arguments: args };
-    });
-    return {
-        inputFiles,
-        outputFiles,
-        target,
-        options,
-        steps
-    };
-};
 exports.getNextpnrWorkerOptions = getNextpnrWorkerOptions;
 //# sourceMappingURL=nextpnr.js.map

package/dist/project/nextpnr.js.map

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

package/dist/project/project.d.ts

@@ -9,7 +9,7 @@ export type ProjectEvent = 'meta' | 'inputFiles' | 'outputFiles' | 'configuratio
 type EventCallback = (project: Project, events: ProjectEvent[]) => void;
 export interface ProjectInputFileState {
     path: string;
-    type: 'design' | 'testbench';
+    type: 'design' | 'testbench' | 'pinconfig';
 }
 export declare class ProjectInputFile {
     private _project;
@@ -52,6 +52,9 @@ export declare class ProjectTarget {
     set id(newId: string);
     get name(): string;
     set name(newName: string);
+    get isActive(): boolean;
+    setActive(): void;
+    getFile(...parts: string[]): string;
     get vendorId(): string;
     get availableVendors(): Record<string, Vendor>;
     get vendor(): Vendor | undefined;
@@ -70,7 +73,7 @@ export declare class ProjectTarget {
     setPackage(packageId: string): void;
     get config(): TargetConfiguration;
     setConfig<P extends PathArray<TargetConfiguration>>(path: P, value: PathArrayValue<TargetConfiguration, P>): void;
-    getEffectiveOptions<W extends WorkerId>(workerId: WorkerId): TargetOptionTypes[W];
+    getEffectiveOptions<W extends WorkerId>(workerId: W): TargetOptionTypes[W];
     getEffectiveTextConfig(workerId: WorkerId, configId: string, generated: string[], parse?: (values: string[]) => string[]): string[];
     update(updates: Partial<TargetConfiguration>): void;
     serialize(): TargetConfiguration;
@@ -110,11 +113,16 @@ export declare class Project {
     removeOutputFiles(filePaths: string[]): void;
     expireOutputFiles(): void;
     setTopLevelModule(targetId: string, module: string): void;
-    setTestbenchPath(targetId: string, testbenchPath?: string): void;
+    setActiveTestbenchPath(targetId: string, testbenchPath?: string): void;
+    getActiveTestbenchPath(targetId: string): string | undefined;
+    setActivePinConfigPath(targetId: string, pinConfigPath?: string): void;
+    getActivePinConfigPath(targetId: string): string | undefined;
     setInputFileType(filePath: string, type: ProjectInputFile['type']): void;
     getTargets(): ProjectTarget[];
     hasTarget(id: string): boolean;
     getTarget(id: string): ProjectTarget | null;
+    getActiveTarget(): ProjectTarget | null;
+    setActiveTarget(id: string | null): void;
     addTarget(id?: string, config?: Omit<TargetConfiguration, 'id'>): ProjectTarget;
     removeTarget(id: string): void;
     updateTarget(id: string, updates: Partial<TargetConfiguration>): void;
@@ -138,7 +146,17 @@ export declare class Project {
                     values: string[];
                     useDefault: boolean;
                 } | undefined;
-                commands?: {
+                synthPrepareCommands?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                synthCommands?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                rtlCommands?: {
                     useGenerated: boolean;
                     values: string[];
                     useDefault: boolean;
@@ -168,6 +186,7 @@ export declare class Project {
                     placedSvg?: boolean | undefined;
                     routedSvg?: boolean | undefined;
                     routedJson?: boolean | undefined;
+                    pinConfigFile?: string | undefined;
                 } | undefined;
             } | undefined;
             iverilog?: {
@@ -190,6 +209,31 @@ export declare class Project {
                     testbenchFile?: string | undefined;
                 } | undefined;
             } | undefined;
+            flasher?: {
+                inputFiles?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                outputFiles?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                packerArguments?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                flasherArguments?: {
+                    useGenerated: boolean;
+                    values: string[];
+                    useDefault: boolean;
+                } | undefined;
+                options?: {
+                    board?: string | undefined;
+                } | undefined;
+            } | undefined;
         }[];
         defaults?: {
             yosys?: {
@@ -201,7 +245,15 @@ export declare class Project {
                     useGenerated: boolean;
                     values: string[];
                 } | undefined;
-                commands?: {
+                synthPrepareCommands?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                synthCommands?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                rtlCommands?: {
                     useGenerated: boolean;
                     values: string[];
                 } | undefined;
@@ -227,6 +279,7 @@ export declare class Project {
                     placedSvg?: boolean | undefined;
                     routedSvg?: boolean | undefined;
                     routedJson?: boolean | undefined;
+                    pinConfigFile?: string | undefined;
                 } | undefined;
             } | undefined;
             iverilog?: {
@@ -246,7 +299,29 @@ export declare class Project {
                     testbenchFile?: string | undefined;
                 } | undefined;
             } | undefined;
+            flasher?: {
+                inputFiles?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                outputFiles?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                packerArguments?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                flasherArguments?: {
+                    useGenerated: boolean;
+                    values: string[];
+                } | undefined;
+                options?: {
+                    board?: string | undefined;
+                } | undefined;
+            } | undefined;
         } | undefined;
+        activeTargetId?: string | undefined;
     };
     updateConfiguration(configuration: Partial<ProjectConfiguration>): void;
     protected importFromProject(other: Project, doTriggerEvent?: boolean): void;
@@ -255,7 +330,12 @@ export declare class Project {
     triggerConfigurationChanged(): void;
     protected emitEvents(...events: ProjectEvent[]): void;
     protected batchEvents<T>(func: () => T, ...events: ProjectEvent[]): T;
+    protected ignoreEvents<T>(func: () => T): T;
     protected static emitsEvents(...events: ProjectEvent[]): <T>(_target: object, _propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
+    protected makeCorrections(): boolean;
+    private correctTestbenchPath;
+    private correctPinconfigPaths;
+    correctActiveTarget(): boolean;
     static serialize(project: Project): ProjectState;
     static deserialize(data: ProjectState, ..._args: unknown[]): Project;
     static loadFromData(rawData: Uint8Array): Project;

package/dist/project/project.js

@@ -8,15 +8,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Project = exports.ProjectTarget = exports.ProjectOutputFile = exports.ProjectInputFile = void 0;
+const path_1 = __importDefault(require("path"));
 const util_js_1 = require("../util.js");
 const configuration_js_1 = require("./configuration.js");
 const devices_js_1 = require("./devices.js");
+const flasher_js_1 = require("./flasher.js");
 const iverilog_js_1 = require("./iverilog.js");
 const nextpnr_js_1 = require("./nextpnr.js");
 const target_js_1 = require("./target.js");
 const yosys_js_1 = require("./yosys.js");
+const guessInputFileType = (filePath) => {
+    // *_tb.<hdl_ext> -> testbench
+    // *.<pin_cfg_ext> -> pinconfig
+    // default: design
+    const baseName = filePath.split('/').pop() ?? filePath;
+    const lowerBase = baseName.toLowerCase();
+    const ext = lowerBase.split('.').pop() ?? '';
+    const hdlExts = util_js_1.FILE_EXTENSIONS_HDL.map(e => e.toLowerCase());
+    const pincfgExts = util_js_1.FILE_EXTENSIONS_PINCFG.map(e => e.toLowerCase());
+    if (hdlExts.some(e => lowerBase.endsWith(`_tb.${e}`)))
+        return 'testbench';
+    if (pincfgExts.includes(ext))
+        return 'pinconfig';
+    return 'design';
+};
+// Fallback clone to handle Proxy objects (structuredClone throws DataCloneError on Proxy)
+const safeStructuredClone = (value) => {
+    return JSON.parse(JSON.stringify(value));
+};
 class ProjectInputFile {
     constructor(_project, _path, _type) {
         this._project = _project;
@@ -134,6 +158,18 @@ class ProjectTarget {
         this._data.name = newName;
         this._project.triggerConfigurationChanged();
     }
+    get isActive() {
+        const activeTarget = this._project.getActiveTarget();
+        return activeTarget?.id === this.id;
+    }
+    setActive() {
+        if (this.isActive)
+            return;
+        this._project.setActiveTarget(this.id);
+    }
+    getFile(...parts) {
+        return (0, target_js_1.getTargetFile)(this.config, path_1.default.join(...parts));
+    }
     get vendorId() {
         return this._data.vendor;
     }
@@ -251,6 +287,8 @@ class ProjectTarget {
             return (0, nextpnr_js_1.getNextpnrOptions)(this._project.getConfiguration(), this.id);
         else if (workerId === 'iverilog')
             return (0, iverilog_js_1.getIVerilogOptions)(this._project.getConfiguration(), this.id);
+        else if (workerId === 'flasher')
+            return (0, flasher_js_1.getFlasherOptions)(this._project.getConfiguration(), this.id);
         throw new Error(`Worker ID "${String(workerId)}" is not supported.`);
     }
     getEffectiveTextConfig(workerId, configId, generated, parse = target_js_1.defaultParse) {
@@ -263,7 +301,7 @@ class ProjectTarget {
             }
             this._data.id = updates.id;
         }
-        Object.assign(this._data, structuredClone(updates));
+        Object.assign(this._data, safeStructuredClone(updates));
         this._project.triggerConfigurationChanged();
     }
     serialize() {
@@ -308,7 +346,8 @@ class Project {
     addInputFiles(files) {
         for (const file of files) {
             if (!this.hasInputFile(file.path)) {
-                const inputFile = new ProjectInputFile(this, file.path, file.type ?? 'design');
+                const fileType = file.type ?? guessInputFileType(file.path);
+                const inputFile = new ProjectInputFile(this, file.path, fileType);
                 this.inputFiles.push(inputFile);
             }
         }
@@ -376,7 +415,7 @@ class Project {
             cfg.yosys.options = {};
         cfg.yosys.options.topLevelModule = module;
     }
-    setTestbenchPath(targetId, testbenchPath) {
+    setActiveTestbenchPath(targetId, testbenchPath) {
         const testbenchFiles = this.getInputFiles()
             .filter((file) => file.type === 'testbench')
             .map((file) => file.path);
@@ -385,12 +424,30 @@ class Project {
         const target = this.getTarget(targetId);
         if (!target)
             throw new Error(`Target "${targetId}" does not exist!`);
-        const cfg = target.config;
-        if (!cfg.iverilog)
-            cfg.iverilog = {};
-        if (!cfg.iverilog.options)
-            cfg.iverilog.options = {};
-        cfg.iverilog.options.testbenchFile = testbenchPath;
+        target.setConfig(['iverilog', 'options', 'testbenchFile'], testbenchPath);
+    }
+    getActiveTestbenchPath(targetId) {
+        const target = this.getTarget(targetId);
+        if (!target)
+            throw new Error(`Target "${targetId}" does not exist!`);
+        return target.getEffectiveOptions('iverilog').testbenchFile;
+    }
+    setActivePinConfigPath(targetId, pinConfigPath) {
+        const pinConfigFiles = this.getInputFiles()
+            .filter((file) => file.type === 'pinconfig')
+            .map((file) => file.path);
+        if (pinConfigPath && !pinConfigFiles.includes(pinConfigPath))
+            throw new Error(`Pin config file ${pinConfigPath} is not marked as such!`);
+        const target = this.getTarget(targetId);
+        if (!target)
+            throw new Error(`Target "${targetId}" does not exist!`);
+        target.setConfig(['nextpnr', 'options', 'pinConfigFile'], pinConfigPath);
+    }
+    getActivePinConfigPath(targetId) {
+        const target = this.getTarget(targetId);
+        if (!target)
+            throw new Error(`Target "${targetId}" does not exist!`);
+        return target.getEffectiveOptions('nextpnr').pinConfigFile;
     }
     setInputFileType(filePath, type) {
         const file = this.getInputFile(filePath);
@@ -410,6 +467,17 @@ class Project {
         const t = this.configuration.targets.find(t => t.id === id);
         return t ? new ProjectTarget(this, t) : null;
     }
+    getActiveTarget() {
+        if (!this.configuration.activeTargetId)
+            return null;
+        return this.getTarget(this.configuration.activeTargetId);
+    }
+    setActiveTarget(id) {
+        if (id !== null && !this.hasTarget(id)) {
+            throw new Error(`Target with ID "${id}" does not exist!`);
+        }
+        this.configuration.activeTargetId = id ?? undefined;
+    }
     addTarget(id, config) {
         if (!id) {
             // Generate a unique ID
@@ -422,7 +490,7 @@ class Project {
             throw new Error(`Target with ID "${id}" already exists!`);
         }
         const newTargetObj = {
-            ...structuredClone(config || configuration_js_1.DEFAULT_TARGET),
+            ...safeStructuredClone(config || configuration_js_1.DEFAULT_TARGET),
             id
         };
         this.configuration.targets.push(newTargetObj);
@@ -464,7 +532,7 @@ class Project {
         this.name = other.getName();
         this.inputFiles = other.getInputFiles().map((file) => file.copy(this));
         this.outputFiles = other.getOutputFiles().map((file) => file.copy(this));
-        this.configuration = structuredClone(other.getConfiguration());
+        this.configuration = safeStructuredClone(other.getConfiguration());
         if (doTriggerEvent)
             this.emitEvents('inputFiles', 'outputFiles', 'configuration', 'meta');
     }
@@ -487,6 +555,11 @@ class Project {
         // Do not emit events when batching
         if (this.batchCounter > 0)
             return;
+        // Make any corrections needed,
+        // and add 'configuration' event if any corrections were made
+        const didCorrect = this.makeCorrections();
+        if (didCorrect)
+            this.batchedEvents.add('configuration');
         // Emit new + batched events
         if (this.eventCallback)
             this.eventCallback(this, Array.from(this.batchedEvents));
@@ -499,6 +572,14 @@ class Project {
         this.emitEvents(...events);
         return res;
     }
+    ignoreEvents(func) {
+        // raise batch counter to ignore events,
+        // but don't actually emit them later
+        this.batchCounter += 1;
+        const res = func();
+        this.batchCounter -= 1;
+        return res;
+    }
     static emitsEvents(...events) {
         return function decorator(_target, _propertyKey, descriptor) {
             const originalMethod = descriptor.value;
@@ -511,6 +592,73 @@ class Project {
             return descriptor;
         };
     }
+    makeCorrections() {
+        return this.ignoreEvents(() => {
+            let didChange = false;
+            didChange = this.correctTestbenchPath() || didChange;
+            didChange = this.correctPinconfigPaths() || didChange;
+            didChange = this.correctActiveTarget() || didChange;
+            return didChange;
+        });
+    }
+    correctTestbenchPath() {
+        const testbenches = this.getInputFiles()
+            .filter((file) => file.type == 'testbench')
+            .map((file) => file.path);
+        let didChange = false;
+        for (const target of this.getTargets()) {
+            const tbPath = target.getEffectiveOptions('iverilog').testbenchFile;
+            if (tbPath && testbenches.includes(tbPath)) {
+                // testbench is configured and correct
+                continue;
+            }
+            else if (!tbPath && testbenches.length === 0) {
+                // no path configured but also no testbenches present, so ok
+                continue;
+            }
+            const newTb = testbenches.length === 0 ? undefined : testbenches[0];
+            this.setActiveTestbenchPath(target.id, newTb);
+            didChange = true;
+        }
+        return didChange;
+    }
+    correctPinconfigPaths() {
+        const pinconfigs = this.getInputFiles()
+            .filter((file) => file.type == 'pinconfig')
+            .map((file) => file.path);
+        let didChange = false;
+        for (const target of this.getTargets()) {
+            const pcPath = target.getEffectiveOptions('nextpnr').pinConfigFile;
+            if (pcPath && pinconfigs.includes(pcPath)) {
+                // pinconfig is configured and correct
+                continue;
+            }
+            else if (!pcPath && pinconfigs.length === 0) {
+                // no path configured but also no testbenches present, so ok
+                continue;
+            }
+            const newPc = pinconfigs.length === 0 ? undefined : pinconfigs[0];
+            this.setActivePinConfigPath(target.id, newPc);
+            didChange = true;
+        }
+        return didChange;
+    }
+    correctActiveTarget() {
+        const activeTarget = this.getActiveTarget();
+        if (activeTarget)
+            return false; // active target exists, so ok
+        const activeTargetId = this.configuration.activeTargetId;
+        if (activeTargetId && this.hasTarget(activeTargetId))
+            return false; // active target ID is valid, so ok
+        // No active target or invalid active target ID, so set to first target (if any)
+        if (this.configuration.targets.length > 0) {
+            this.configuration.activeTargetId = this.configuration.targets[0].id;
+        }
+        else {
+            this.configuration.activeTargetId = undefined;
+        }
+        return true;
+    }
     static serialize(project) {
         return {
             name: project.name,
@@ -584,13 +732,25 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", void 0)
-], Project.prototype, "setTestbenchPath", null);
+], Project.prototype, "setActiveTestbenchPath", null);
+__decorate([
+    Project.emitsEvents('configuration'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String]),
+    __metadata("design:returntype", void 0)
+], Project.prototype, "setActivePinConfigPath", null);
 __decorate([
     Project.emitsEvents('inputFiles'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),
     __metadata("design:returntype", void 0)
 ], Project.prototype, "setInputFileType", null);
+__decorate([
+    Project.emitsEvents('configuration'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], Project.prototype, "setActiveTarget", null);
 __decorate([
     Project.emitsEvents('configuration'),
     __metadata("design:type", Function),