@danielx/civet 0.7.12 → 0.7.14

package/dist/rollup.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/dist/unplugin-shared.mjs

@@ -67,6 +67,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -107,12 +108,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -133,6 +135,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (path.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -183,6 +210,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/dist/unplugin.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/dist/vite.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/dist/webpack.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -64,13 +64,14 @@
     "docs:build": "yarn build && vitepress build civet.dev",
     "docs:preview": "yarn build && vitepress preview civet.dev",
     "prepublishOnly": "yarn build && yarn test",
-    "test": "bash ./build/test.sh"
+    "test": "bash ./build/test.sh",
+    "test:self": "yarn build && mocha --config .mocharc-self.json"
   },
   "author": "Daniel X. Moore",
   "license": "MIT",
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
-    "@typescript/vfs": "^1.5.0",
+    "@typescript/vfs": "^1.5.3",
     "unplugin": "^1.6.0"
   },
   "devDependencies": {
@@ -89,7 +90,7 @@
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "tsup": "^7.2.0",
-    "typescript": "^5.4.5",
+    "typescript": "^5.5.2",
     "vite": "^4.4.12",
     "vitepress": "^1.0.0-alpha.35",
     "vscode-languageserver": "^8.1.0",
@@ -97,7 +98,13 @@
     "vue": "^3.2.45"
   },
   "peerDependencies": {
-    "typescript": "^4.5 || ^5.0"
+    "typescript": "^4.5 || ^5.0",
+    "yaml": "^2.4.5"
+  },
+  "peerDependenciesMeta": {
+    "yaml": {
+      "optional": true
+    }
   },
   "c8": {
     "all": true,
@@ -122,19 +129,5 @@
       "source/bun-civet.civet"
     ]
   },
-  "mocha": {
-    "extension": [
-      "civet",
-      "coffee"
-    ],
-    "loader": [
-      "@danielx/hera/esm",
-      "./node_modules/@danielx/civet/dist/esm.mjs"
-    ],
-    "reporter": "dot",
-    "recursive": true,
-    "spec": [
-      "test"
-    ]
-  }
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }