@danielx/civet 0.8.7 → 0.8.9

package/dist/types.d.ts

@@ -30,6 +30,7 @@ declare module "@danielx/civet" {
     rewriteCivetImports: string
     rewriteTsImports: boolean
     server: boolean
+    symbols: string[]
     tab: number
     verbose: boolean
     comptime: boolean

package/dist/unplugin/unplugin.js

@@ -105,6 +105,7 @@ var rawPlugin = (options = {}, meta) => {
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
+  let aliasResolver;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
@@ -121,7 +122,7 @@ var rawPlugin = (options = {}, meta) => {
     };
   };
   const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
-  return {
+  const plugin = {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
@@ -375,8 +376,14 @@ var rawPlugin = (options = {}, meta) => {
       }
     },
     resolveId(id, importer, options2) {
+      if (aliasResolver != null) {
+        id = aliasResolver(id);
+      }
       if (/\0/.test(id))
         return null;
+      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
+        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
+      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref1;
@@ -519,35 +526,28 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
           config.resolve.extensions.push(".civet");
         }
-        ;
-        return;
       },
       async transformIndexHtml(html) {
-        return html.replace(
-          /<!--[^]*?-->|<[^<>]*>/g,
-          (tag) => {
-            return tag.replace(
-              /<\s*script\b[^<>]*>/gi,
-              (script) => {
-                return script.replace(
-                  /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
-                  (attr, name, value) => {
-                    return name.toLowerCase() === "src" && value ? attr.replace(
-                      /(\.civet)(['"]?)$/,
-                      (_, extension, endQuote) => {
-                        return `${extension}${outExt}?transform${endQuote}`;
-                      }
-                    ) : attr;
+        return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
+          return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
+            return script.replace(
+              /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
+              (attr, name, value) => {
+                return name.toLowerCase() === "src" && value ? attr.replace(
+                  /(\.civet)(['"]?)$/,
+                  (_, extension, endQuote) => {
+                    return `${extension}${outExt}?transform${endQuote}`;
                   }
-                );
+                ) : attr;
               }
             );
-          }
-        );
+          });
+        });
       },
       handleHotUpdate({ file, server, modules }) {
-        if (!file.endsWith(".civet"))
+        if (!file.endsWith(".civet")) {
           return;
+        }
         const resolvedId = slash(import_path.default.resolve(file) + outExt);
         const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
@@ -556,8 +556,33 @@ var rawPlugin = (options = {}, meta) => {
         }
         return modules;
       }
+    },
+    webpack(compiler) {
+      if (implicitExtension) {
+        compiler.options.resolve.extensions.unshift(".civet");
+      }
+      return aliasResolver = (id) => {
+        let ref2;
+        for (const key in ref2 = compiler.options.resolve.alias) {
+          const value = ref2[key];
+          if (key.endsWith("$")) {
+            if (id === key.slice(0, -1)) {
+              return typeof value === "string" ? value : "\0";
+            }
+          } else {
+            if (id === key || id.startsWith(key + "/")) {
+              if (!(typeof value === "string")) {
+                return "\0";
+              }
+              return value + id.slice(key.length);
+            }
+          }
+        }
+        return id;
+      };
     }
   };
+  return plugin;
 };
 var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
 var unplugin_civet_default = unplugin;

package/dist/unplugin/unplugin.mjs

@@ -73,6 +73,7 @@ var rawPlugin = (options = {}, meta) => {
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
+  let aliasResolver;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
@@ -89,7 +90,7 @@ var rawPlugin = (options = {}, meta) => {
     };
   };
   const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
-  return {
+  const plugin = {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
@@ -343,8 +344,14 @@ var rawPlugin = (options = {}, meta) => {
       }
     },
     resolveId(id, importer, options2) {
+      if (aliasResolver != null) {
+        id = aliasResolver(id);
+      }
       if (/\0/.test(id))
         return null;
+      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
+        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
+      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref1;
@@ -487,35 +494,28 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
           config.resolve.extensions.push(".civet");
         }
-        ;
-        return;
       },
       async transformIndexHtml(html) {
-        return html.replace(
-          /<!--[^]*?-->|<[^<>]*>/g,
-          (tag) => {
-            return tag.replace(
-              /<\s*script\b[^<>]*>/gi,
-              (script) => {
-                return script.replace(
-                  /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
-                  (attr, name, value) => {
-                    return name.toLowerCase() === "src" && value ? attr.replace(
-                      /(\.civet)(['"]?)$/,
-                      (_, extension, endQuote) => {
-                        return `${extension}${outExt}?transform${endQuote}`;
-                      }
-                    ) : attr;
+        return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
+          return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
+            return script.replace(
+              /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
+              (attr, name, value) => {
+                return name.toLowerCase() === "src" && value ? attr.replace(
+                  /(\.civet)(['"]?)$/,
+                  (_, extension, endQuote) => {
+                    return `${extension}${outExt}?transform${endQuote}`;
                   }
-                );
+                ) : attr;
               }
             );
-          }
-        );
+          });
+        });
       },
       handleHotUpdate({ file, server, modules }) {
-        if (!file.endsWith(".civet"))
+        if (!file.endsWith(".civet")) {
           return;
+        }
         const resolvedId = slash(path.resolve(file) + outExt);
         const module = server.moduleGraph.getModuleById(resolvedId);
         if (module) {
@@ -524,8 +524,33 @@ var rawPlugin = (options = {}, meta) => {
         }
         return modules;
       }
+    },
+    webpack(compiler) {
+      if (implicitExtension) {
+        compiler.options.resolve.extensions.unshift(".civet");
+      }
+      return aliasResolver = (id) => {
+        let ref2;
+        for (const key in ref2 = compiler.options.resolve.alias) {
+          const value = ref2[key];
+          if (key.endsWith("$")) {
+            if (id === key.slice(0, -1)) {
+              return typeof value === "string" ? value : "\0";
+            }
+          } else {
+            if (id === key || id.startsWith(key + "/")) {
+              if (!(typeof value === "string")) {
+                return "\0";
+              }
+              return value + id.slice(key.length);
+            }
+          }
+        }
+        return id;
+      };
     }
   };
+  return plugin;
 };
 var unplugin = createUnplugin(rawPlugin);
 var unplugin_civet_default = unplugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",