jaamd 0.1.12 → 0.1.14

package/README.md

@@ -62,7 +62,7 @@ To fix it, import the stylesheet **statically** in your layout's frontmatter alo
 ```astro
 ---
 //  In any layout that uses MarkdownContent
-import "jaamd/default.css";  // variable fallbacks
+import "jaamd/default.css"; 
 import "jaamd/styles.css";
 ---
 ```
@@ -74,7 +74,7 @@ The duplicate import from `injectScript` is automatically deduplicated by the br
 ```ts
 jaamd({
   selector:   ".jaamd-content", // CSS selector for the JS enhancements (see below)
-  theme:      "light",          // "light" → github-light | "dark" → github-dark Shiki theme
+  theme:      "",               // Shiki theme (default "github-light")
   noDefault:  false,            // set true to skip injecting jaamd/default variable fallbacks
   plugins: {
     codeTabs:  true,            // :::code-tabs directive blocks

package/index.ts

@@ -13,10 +13,9 @@ export interface JaamdOptions {
 
   /**
    * Shiki syntax-highlighting theme family.
-   * Selects between `github-light` and `github-dark`.
-   * @default "light"
+   * @default "github-light"
    */
-  theme?: "light" | "dark";
+  theme?: string;
 
   /**
    * Skip injecting the default CSS variable fallbacks (`jaamd/default`).
@@ -48,7 +47,12 @@ export interface JaamdOptions {
  * Supports `astro add jaamd`.
  */
 export default function jaamd(options: JaamdOptions = {}): AstroIntegration {
-  const { selector = ".jaamd-content", theme = "light", noDefault = false, plugins = {} } = options;
+  const {
+    selector  = ".jaamd-content",
+    theme     = "github-light",
+    noDefault = false,
+    plugins   = {},
+  } = options;
   const { codeTabs = true, alerts = true, directive = true } = plugins;
 
   return {
@@ -67,14 +71,10 @@ export default function jaamd(options: JaamdOptions = {}): AstroIntegration {
         const existingRemarkPlugins: any[] = existingMarkdown.remarkPlugins ?? [];
         const existingShikiConfig: any = existingMarkdown.shikiConfig ?? {};
 
-        // Build shikiConfig: jaamd values are true defaults
-        // only apply when the key is absent (undefined).
-        // If the user (or a prior integration) already set a key,
-        // that value is preserved as-is.
-        const shikiTheme = theme === "dark" ? "github-dark" : "github-light";
+        // `wrap` and other keys are only filled in when absent.
         const mergedShikiConfig: any = { ...existingShikiConfig };
-        if (mergedShikiConfig.theme === undefined) mergedShikiConfig.theme = shikiTheme;
-        if (mergedShikiConfig.wrap  === undefined) mergedShikiConfig.wrap  = true;
+        mergedShikiConfig.theme = theme;
+        if (mergedShikiConfig.wrap === undefined) mergedShikiConfig.wrap = true;
 
         updateConfig({
           vite: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaamd",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Just Another Astro Markdown",
   "type": "module",
   "license": "MIT",

package/src/styles/variables.css

@@ -4,19 +4,29 @@
  *
  * This file serves a dual purpose:
  *
- *  1. FALLBACK THEME — it is automatically imported by the
- *     integration (before markdown.css) so all --jaamd-* vars
- *     have sensible values even if you never set any yourself.
- *     You can opt out with `noDefault: true` in jaamd({…}).
+ *  1. FALLBACK THEME:
+ *     it is automatically imported by the integration so all
+ *     --jaamd-* vars have sensible values even if you never
+ *     set any yourself. You can opt out with `noDefault: true`
+ *     in jaamd({…}).
  *
- *  2. DOCUMENTATION — every --jaamd-* property is listed here
- *     with a comment describing its role. Copy any variable
- *     you want to override into your own :root block.
+ *     All defaults live inside @layer jaamd.defaults, so any
+ *     :root rule you write outside a layer always wins — no
+ *     matter the load order.
+ *
+ *  2. DOCUMENTATION:
+ *     every --jaamd-* property is listed here with a comment
+ *     describing its role. Copy any variable you want to override
+ *     into your own :root block (no layer needed).
  *
  * Importable as:  import "jaamd/default";
  *                 @import "jaamd/default.css";
  * ============================================================ */
 
+/* Establish the layer so its priority is always below unlayered CSS. */
+@layer jaamd.defaults;
+
+@layer jaamd.defaults {
 :root {
   /* ── Typography ─────────────────────────────────────────── */
 
@@ -196,3 +206,4 @@
   --jaamd-alert-caution-color: #cf222e;
   --jaamd-alert-caution-bg:    #ffebe9;
 }
+}