working

Author: xsro

masm-tasm/src/ASM/manager.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 
 import { API } from '../dosbox-api/vscode-dosbox-api';
-import { api } from '../dosbox-api/vscode-dosbox-api.impl';
+import { vscodeDosboxAPI} from '../dosbox-api/vscode-dosbox-api.impl';
 import * as Diag from '../diagnose/main';
 import * as conf from '../utils/configuration';
 import { logger } from '../utils/logger';
@@ -93,6 +93,8 @@ export function activateManager(context: vscode.ExtensionContext, actions: ExecA
             workspaceFolderUri,
         };
 
+        let api=new vscodeDosboxAPI(context);
+
         const execAction = actions.find(val => Array.isArray(val.name) ? val.name.includes(conf.extConf.emulator) : (val.name === conf.extConf.emulator));
         if (execAction) {
             const result = await execAction.run(context, ctx, api);

masm-tasm/src/dosbox-api/jsdos/main.ts

@@ -12,7 +12,7 @@ const webresources = [
   },
 ];
 
-export function activate(context: vscode.ExtensionContext) {
+export function activateJSdos(context: vscode.ExtensionContext) {
   const jsdos = new Jsdos(context);
 
   let disposable = vscode.commands.registerCommand(

masm-tasm/src/dosbox-api/vscode-dosbox-api.impl.ts

@@ -1,48 +1,29 @@
-import { CommandInterface, Emulators } from "emulators";
-import { Terminal, Uri, Webview } from "vscode";
+import { CommandInterface, Emulators,getEmulators } from "emulators";
+import { ExtensionContext, Terminal, Uri, Webview } from "vscode";
 import { API, Dosbox, Jsdos } from "./vscode-dosbox-api";
 import * as Jszip from 'jszip';
+import {activateJSdos} from "./jsdos/main"
+import { CreateBundleOptions } from "./jsdos-bundle/bundle";
 
-
-class JsdosApi implements Jsdos{
-    setBundle(bundle: Uri | Uint8Array, updateConf?: boolean): void {
-        throw new Error("Method not implemented.");
-    }
-    jszip=Jszip;
-    updateConf(section: string, key: string, value: string | number | boolean): boolean {
-        throw new Error("Method not implemented.");
-    }
-    updateAutoexec(context: string[]): void {
-        throw new Error("Method not implemented.");
-    }
-    runInHost(): Promise<CommandInterface> {
-        throw new Error("Method not implemented.");
-    }
-    runInWebview(): Promise<Webview> {
-        throw new Error("Method not implemented.");
-    }
-    
-}
-
-class vscodeDosboxAPI implements API {
+export class vscodeDosboxAPI implements API {
     emulators: Emulators;
-    jsdos: Jsdos=new JsdosApi();
+    jsdos: Jsdos;
     dosbox: Dosbox;
     dosboxX: Dosbox;
-    msdosPath: string;
-    commandPath: string;
+    msdosPath: string="";
+    commandPath: string="";
+    createBundle:({ sample, boxConf, mount, }: CreateBundleOptions) => Promise<Jszip>
 
-    constructor(emulators?: Emulators, msdosPath?: string, commandPath?: string) {
-        // store the provided emulators object or use an empty placeholder
-        this.emulators = emulators || ({} as Emulators);
+    constructor(context:ExtensionContext) {
+        const { jsdos, createBundle }=activateJSdos(context);
+        this.emulators = jsdos.emulators;
 
         // prefer real emulator instances when available, otherwise keep lightweight placeholders
-        this.jsdos = (this.emulators as any).jsdos || ({} as Jsdos);
+        this.jsdos = jsdos;
+        this.createBundle=createBundle;
         this.dosbox = (this.emulators as any).dosbox || ({} as Dosbox);
         this.dosboxX = (this.emulators as any).dosboxX || ({} as Dosbox);
 
-        this.msdosPath = msdosPath || "";
-        this.commandPath = commandPath || "";
     }
 
     /**
@@ -100,6 +81,4 @@ class vscodeDosboxAPI implements API {
         return impl as unknown as Terminal;
     }
 
-}
-
-export const api=new vscodeDosboxAPI()
+}