@deckspec/dsl 0.1.4 → 0.1.6

package/dist/parser.d.ts

@@ -26,10 +26,11 @@ export interface ResolvedSlideFile {
  * Resolution priority (ADR-022):
  * 1. Deck-local pattern: {basePath}/patterns/{name}/index.tsx
  * 2. Deck-local pattern: {basePath}/patterns/{name}/index.js
- * 3. Theme pattern:      {patternsDir}/{name}/index.js
- * 4. Theme pattern:      {patternsDir}/{name}.js
+ * 3. Theme pattern:      {patternsDir}/{name}/index.js (compiled)
+ * 4. Theme pattern:      {patternsDir}/{name}.js (compiled, flat)
+ * 5. Theme pattern:      {patternsSrcDir}/{name}/index.tsx (source, on-the-fly compile)
  *
  * Files with extensions (.html etc) are resolved relative to basePath as passthrough.
  */
-export declare function resolveSlideFile(file: string, basePath: string, patternsDir: string): Promise<ResolvedSlideFile>;
+export declare function resolveSlideFile(file: string, basePath: string, patternsDir: string, patternsSrcDir?: string): Promise<ResolvedSlideFile>;
 //# sourceMappingURL=parser.d.ts.map

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAQzD;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUrE;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,0FAA0F;IAC1F,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,iBAAiB,CAAC,CA6C5B"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAQzD;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUrE;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,0FAA0F;IAC1F,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA0D5B"}

package/dist/parser.js

@@ -38,12 +38,13 @@ export async function loadDeckFile(filePath) {
  * Resolution priority (ADR-022):
  * 1. Deck-local pattern: {basePath}/patterns/{name}/index.tsx
  * 2. Deck-local pattern: {basePath}/patterns/{name}/index.js
- * 3. Theme pattern:      {patternsDir}/{name}/index.js
- * 4. Theme pattern:      {patternsDir}/{name}.js
+ * 3. Theme pattern:      {patternsDir}/{name}/index.js (compiled)
+ * 4. Theme pattern:      {patternsDir}/{name}.js (compiled, flat)
+ * 5. Theme pattern:      {patternsSrcDir}/{name}/index.tsx (source, on-the-fly compile)
  *
  * Files with extensions (.html etc) are resolved relative to basePath as passthrough.
  */
-export async function resolveSlideFile(file, basePath, patternsDir) {
+export async function resolveSlideFile(file, basePath, patternsDir, patternsSrcDir) {
     const ext = extname(file);
     if (ext) {
         // File with extension → relative to deck directory
@@ -83,8 +84,20 @@ export async function resolveSlideFile(file, basePath, patternsDir) {
             return { type: "pattern", path: flatPath };
         }
         catch {
-            throw new Error(`Pattern "${file}" not found. Looked in:\n  ${localTsxPath}\n  ${localJsPath}\n  ${dirIndexPath}\n  ${flatPath}`);
+            // continue
         }
     }
+    // 5. Theme source: patternsSrcDir/{name}/index.tsx (on-the-fly compile)
+    if (patternsSrcDir) {
+        const themeTsxPath = resolve(patternsSrcDir, file, "index.tsx");
+        try {
+            await access(themeTsxPath);
+            return { type: "pattern", path: themeTsxPath, tsx: true };
+        }
+        catch {
+            // continue
+        }
+    }
+    throw new Error(`Pattern "${file}" not found. Looked in:\n  ${localTsxPath}\n  ${localJsPath}\n  ${resolve(patternsDir, file, "index.js")}\n  ${resolve(patternsDir, `${file}.js`)}${patternsSrcDir ? `\n  ${resolve(patternsSrcDir, file, "index.tsx")}` : ""}`);
 }
 //# sourceMappingURL=parser.js.map

package/dist/parser.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckspec/dsl",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "files": [
     "dist",
     "src"
@@ -11,7 +11,7 @@
   "dependencies": {
     "js-yaml": "^4.1.0",
     "zod": "^3.23.0",
-    "@deckspec/schema": "0.1.4"
+    "@deckspec/schema": "0.1.6"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",

package/src/parser.ts

@@ -51,8 +51,9 @@ export interface ResolvedSlideFile {
  * Resolution priority (ADR-022):
  * 1. Deck-local pattern: {basePath}/patterns/{name}/index.tsx
  * 2. Deck-local pattern: {basePath}/patterns/{name}/index.js
- * 3. Theme pattern:      {patternsDir}/{name}/index.js
- * 4. Theme pattern:      {patternsDir}/{name}.js
+ * 3. Theme pattern:      {patternsDir}/{name}/index.js (compiled)
+ * 4. Theme pattern:      {patternsDir}/{name}.js (compiled, flat)
+ * 5. Theme pattern:      {patternsSrcDir}/{name}/index.tsx (source, on-the-fly compile)
  *
  * Files with extensions (.html etc) are resolved relative to basePath as passthrough.
  */
@@ -60,6 +61,7 @@ export async function resolveSlideFile(
   file: string,
   basePath: string,
   patternsDir: string,
+  patternsSrcDir?: string,
 ): Promise<ResolvedSlideFile> {
   const ext = extname(file);
 
@@ -100,9 +102,22 @@ export async function resolveSlideFile(
       await access(flatPath);
       return { type: "pattern", path: flatPath };
     } catch {
-      throw new Error(
-        `Pattern "${file}" not found. Looked in:\n  ${localTsxPath}\n  ${localJsPath}\n  ${dirIndexPath}\n  ${flatPath}`,
-      );
+      // continue
     }
   }
+
+  // 5. Theme source: patternsSrcDir/{name}/index.tsx (on-the-fly compile)
+  if (patternsSrcDir) {
+    const themeTsxPath = resolve(patternsSrcDir, file, "index.tsx");
+    try {
+      await access(themeTsxPath);
+      return { type: "pattern", path: themeTsxPath, tsx: true };
+    } catch {
+      // continue
+    }
+  }
+
+  throw new Error(
+    `Pattern "${file}" not found. Looked in:\n  ${localTsxPath}\n  ${localJsPath}\n  ${resolve(patternsDir, file, "index.js")}\n  ${resolve(patternsDir, `${file}.js`)}${patternsSrcDir ? `\n  ${resolve(patternsSrcDir, file, "index.tsx")}` : ""}`,
+  );
 }