New version 1.10.0

New version 1.10.0

Author: twibiral

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 
+## [Unreleased]
+### Added
+- Support for zig (Thanks to @slar)
+- Support for enabling WSL Mode for the shell language only (Thanks to @mihai-vlc)
+
+### Changed
+- Update README.md
+
+
 ## [1.9.1]
 ### Changed
 - Fix bug produced by duplicate labeled code blocks (Thanks to @qiaogaojian)

README.md

@@ -14,7 +14,7 @@ The result is shown only after the execution is finished. It is not possible to
 ![Video that shows how the plugin works.](https://github.com/twibiral/obsidian-execute-code/blob/master/images/execute_code_example.gif?raw=true)
 
 
-The following [languages are supported](#supported-programming-languages-): C, CPP, Dart, Golang, Groovy, Kotlin, Java, JavaScript, TypeScript, Lean, Lua, CSharp, Prolog, Rust, Python, R, Ruby, Wolfram Mathematica, Haskell, Scala, Racket, F#, Batch, Shell & Powershell, Octave, and Maxima.
+The following [languages are supported](#supported-programming-languages-): C, CPP, Dart, Golang, Groovy, Kotlin, Java, JavaScript, TypeScript, Lean, Lua, CSharp, Prolog, Rust, Python, R, Ruby, Wolfram Mathematica, Haskell, Scala, Racket, F#, Batch, Shell & Powershell, Octave, Maxima and Zig.
 
 
 Python, Rust, and Octave support embedded plots. All languages support ["magic" commands](#magic-commands-) that help you to access paths in obsidian or show images in your notes.
@@ -23,6 +23,8 @@ You can create code blocks that are executed before or after each code block of
 
 Take a look at the [changelog](CHANGELOG.md) to see what has changed in recent versions.
 
+[Here](#misc-) you can find some other tools and plugins that might are compatible with this plugin and might be useful for you.
+
 <div align='center'>
 
 [![Buy us a coffee](https://img.shields.io/badge/-buy_us_a%C2%A0coffee-gray?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/timwibiral)
@@ -627,9 +629,17 @@ undefined
 To manage the open runtimes for Notebook Mode, you can use the `Open Code Runtime Management` command in the command palette. From this sidebar window, you can stop kernels. **Note: force-stopping requires `taskkill` on Windows and `pkill` on Unix. 99% of systems should have these preinstalled: if yours doesn't, please [file an issue](https://github.com/twibiral/obsidian-execute-code/issues/new/choose)**
 
 
-## Style Settings 🎨
+## Misc 📦
+### Style Settings 🎨
+
+This plugin supports customising styles using the [Style Settings plugin](https://github.com/mgmeyers/obsidian-style-settings) 
+or the [Obsidian Code Styler plugin](https://github.com/mayurankv/Obsidian-Code-Styler).
+
+### Other Tools
+
+Take a look at the [Obsidian Tools python package](https://github.com/mfarragher/obsidiantools) to find some useful 
+tools for interacting with your vault.
 
-This plugin supports customising styles using the [Style Settings plugin](https://github.com/mgmeyers/obsidian-style-settings). It's possible to customise the color of code block outputs and errors.
 
 ## Installation 💾
 

esbuild.config.mjs

@@ -48,5 +48,5 @@ esbuild.build({
 	logLevel: "info",
 	sourcemap: prod ? false : 'inline',
 	treeShaking: true,
-	outfile: 'src/main.js',
+	outfile: 'main.js',
 }).catch(() => process.exit(1));

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "execute-code",
 	"name": "Execute Code",
-	"version": "1.9.1",
+	"version": "1.10.0",
 	"minAppVersion": "1.2.8",
 	"description": "Allows to execute code snippets within a note. Supported programming languages:  C, CPP, Dart, Golang, Groovy, Kotlin, Java, JavaScript, TypeScript, Lean, Lua, CSharp, Prolog, Rust, Python, R, Ruby, Wolfram Mathematica, Haskell, Scala, Racket, F#, Batch, Shell & Powershell.",
 	"author": "twibiral",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "execute-code",
-	"version": "1.9.1",
+	"version": "1.10.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "src/main.js",
 	"scripts": {

package.json

@@ -5,8 +5,6 @@ import Executor from "./Executor";
 import {Outputter} from "src/Outputter";
 import {LanguageId} from "src/main";
 import { ExecutorSettings } from "../settings/Settings.js";
-import { sep } from "path";
-import { join } from "path/posix";
 import windowsPathToWsl from "../transforms/windowsPathToWsl.js";
 
 export default class NonInteractiveCodeExecutor extends Executor {
@@ -38,13 +36,13 @@ export default class NonInteractiveCodeExecutor extends Executor {
 
 			fs.promises.writeFile(tempFileName, codeBlockContent).then(() => {
 				const args = cmdArgs ? cmdArgs.split(" ") : [];
-				
-				if (this.settings.wslMode) {
+
+				if (this.isWSLEnabled()) {
 					args.unshift("-e", cmd);
 					cmd = "wsl";
 					args.push(windowsPathToWsl(tempFileName));
 				} else {
-					args.push(tempFileName);	
+					args.push(tempFileName);
 				}
 
 				const child = child_process.spawn(cmd, args, {env: process.env, shell: this.usesShell});
@@ -63,6 +61,18 @@ export default class NonInteractiveCodeExecutor extends Executor {
 		});
 	}
 
+	private isWSLEnabled(): boolean {
+		if (this.settings.wslMode) {
+			return true;
+		}
+
+		if (this.language == 'shell' && this.settings.shellWSLMode) {
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Handles the output of a child process and redirects stdout and stderr to the given {@link Outputter} element.
 	 * Removes the temporary file after the code execution. Creates a new Notice after the code execution.

src/executors/NonInteractiveCodeExecutor.ts

@@ -26,7 +26,7 @@ import runAllCodeBlocks from './runAllCodeBlocks';
 export const languageAliases = ["javascript", "typescript", "bash", "csharp", "wolfram", "nb", "wl", "hs", "py", "scpt"] as const;
 export const canonicalLanguages = ["js", "ts", "cs", "lean", "lua", "python", "cpp", "prolog", "shell", "groovy", "r",
 	"go", "rust", "java", "powershell", "kotlin", "mathematica", "haskell", "scala", "racket", "fsharp", "c", "dart",
-	"ruby", "batch", "sql", "octave", "maxima", "applescript"] as const;
+	"ruby", "batch", "sql", "octave", "maxima", "applescript", "zig"] as const;
 export const supportedLanguages = [...languageAliases, ...canonicalLanguages] as const;
 export type LanguageId = typeof canonicalLanguages[number];
 
@@ -397,6 +397,12 @@ export default class ExecuteCodePlugin extends Plugin {
 				const transformedCode = await new CodeInjector(this.app, this.settings, language).injectCode(srcCode);
 				this.runCodeInShell(transformedCode, out, button, this.settings.applescriptPath, this.settings.applescriptArgs, this.settings.applescriptFileExtension, language, file);
 			})
+		} else if (language === "zig") {
+			button.addEventListener("click", async () => {
+				button.className = runButtonDisabledClass;
+				const transformedCode = await new CodeInjector(this.app, this.settings, language).injectCode(srcCode);
+				this.runCodeInShell(transformedCode, out, button, this.settings.zigPath, this.settings.zigArgs, "zig", language, file);
+			})
 		}
 
 	}

src/main.ts

@@ -9,6 +9,7 @@ export interface ExecutorSettings {
 	timeout: number;
 	allowInput: boolean;
 	wslMode: boolean;
+	shellWSLMode: boolean;
 	onlyCurrentBlock: boolean;
 	nodePath: string;
 	nodeArgs: string;
@@ -128,6 +129,9 @@ export interface ExecutorSettings {
 	applescriptArgs: string;
 	applescriptFileExtension: string;
 	applescriptInject: string;
+	zigPath: string;
+	zigArgs: string;
+	zigInject: string;
 
 	jsInteractive: boolean;
 	tsInteractive: boolean;
@@ -159,6 +163,7 @@ export interface ExecutorSettings {
 	octaveInteractive: boolean;
 	maximaInteractive: boolean;
 	applescriptInteractive: boolean;
+	zigInteractive: boolean;
 }
 
 
@@ -171,6 +176,7 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	timeout: 10000,
 	allowInput: true,
 	wslMode: false,
+	shellWSLMode: false,
 	onlyCurrentBlock: false,
 	nodePath: "node",
 	nodeArgs: "",
@@ -290,6 +296,9 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	applescriptArgs: "",
 	applescriptFileExtension: "scpt",
 	applescriptInject: "",
+	zigPath: "zig",
+	zigArgs: "run",
+	zigInject: "",
 	jsInteractive: true,
 	tsInteractive: false,
 	csInteractive: false,
@@ -320,4 +329,5 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	octaveInteractive: false,
 	maximaInteractive: false,
 	applescriptInteractive: false,
+	zigInteractive: false,
 }

src/settings/Settings.ts

@@ -31,6 +31,7 @@ import makeSQLSettings from "./per-lang/makeSQLSettings";
 import makeOctaviaSettings from "./per-lang/makeOctaveSettings";
 import makeMaximaSettings from "./per-lang/makeMaximaSettings";
 import makeApplescriptSettings from "./per-lang/makeApplescriptSettings";
+import makeZigSettings from "./per-lang/makeZigSettings";
 
 
 /**
@@ -218,6 +219,9 @@ export class SettingsTab extends PluginSettingTab {
 		// ========== Applescript ============
 		makeApplescriptSettings(this, this.makeContainerFor("applescript"));
 
+		// ========== Zig ============
+		makeZigSettings(this, this.makeContainerFor("zig"));
+
 		this.focusContainer(this.plugin.settings.lastOpenLanguageTab || canonicalLanguages[0]);
 	}