screw-up 1.17.0 → 1.19.0

package/dist/index.js

@@ -1,24 +1,24 @@
 /*!
  * name: screw-up
- * version: 1.17.0
+ * version: 1.19.0
  * description: Simply package metadata inserter on Vite plugin
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/screw-up.git
- * git.commit.hash: 05a9f2e0dec5249126f020eee1d57f6ff8767096
+ * git.commit.hash: b86321865390ff8dc11c118f46a8e0ba8b67aa9c
  */
-import { readdir, readFile, writeFile, mkdir } from "fs/promises";
+import { readdir, readFile, writeFile } from "fs/promises";
 import { existsSync } from "fs";
-import { join, dirname, basename } from "path";
-import { c as createConsoleLogger, n as name, g as getFetchGitMetadata, v as version, a as git_commit_hash, r as resolvePackageMetadata } from "./packageMetadata-DgMEVI8P.js";
+import { join, dirname } from "path";
+import { c as createConsoleLogger, n as name, g as getFetchGitMetadata, v as version, a as git_commit_hash, r as resolvePackageMetadata, b as generateMetadataFileContent, w as writeFileIfChanged, e as ensureMetadataGitignore } from "./packageMetadata-DlkAQe0j.js";
 /*!
  * name: async-primitives
- * version: 1.2.0
+ * version: 1.5.0
  * description: A collection of primitive functions for asynchronous operations
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/async-primitives.git
- * git.commit.hash: 3b7bffeaa8ae47aea6e8b0ef0f70e265a6d9ab08
+ * git.commit.hash: cd35465b7e9b9945049186e7eaeecc0bfba65766
  */
 const __NOOP_HANDLER = () => {
 };
@@ -26,13 +26,22 @@ const __NOOP_RELEASABLE = {
   release: __NOOP_HANDLER,
   [Symbol.dispose]: __NOOP_HANDLER
 };
+const toAbortError = (reason) => {
+  if (reason instanceof Error) {
+    return reason;
+  }
+  if (typeof reason === "string") {
+    return new Error(reason);
+  }
+  return new Error("Operation aborted");
+};
 const onAbort = (signal, callback) => {
   if (!signal) {
     return __NOOP_RELEASABLE;
   }
   if (signal.aborted) {
     try {
-      callback();
+      callback(toAbortError(signal.reason));
     } catch (error) {
       console.warn("AbortHook callback error: ", error);
     }
@@ -41,10 +50,11 @@ const onAbort = (signal, callback) => {
   let abortHandler;
   abortHandler = () => {
     if (abortHandler) {
+      const reason = signal.reason;
       signal.removeEventListener("abort", abortHandler);
       abortHandler = void 0;
       try {
-        callback();
+        callback(toAbortError(reason));
       } catch (error) {
         console.warn("AbortHook callback error: ", error);
       }
@@ -226,40 +236,6 @@ const mergeBanners = (currentBanner, existingBanner) => {
   const currentWithNewline = ensureTrailingNewline(currentBanner, newlineSeq);
   return `${currentWithNewline}${existingBanner}`;
 };
-const sanitizeKey = (key) => {
-  return key.replace(/[^a-zA-Z0-9_]/g, "_").replace(/^(\d)/, "_$1");
-};
-const generateMetadataFileContent = (metadata, outputKeys) => {
-  const lines = [];
-  const exportedIdentifiers = [];
-  lines.push("// @ts-nocheck");
-  lines.push("// This file is auto-generated by screw-up plugin");
-  lines.push("// Do not edit manually");
-  lines.push("");
-  for (const key of outputKeys) {
-    const value = metadata[key];
-    if (value) {
-      const sanitizedKey = sanitizeKey(key);
-      const escapedValue = JSON.stringify(value);
-      lines.push(`export const ${sanitizedKey} = ${escapedValue};`);
-      exportedIdentifiers.push(sanitizedKey);
-    }
-  }
-  lines.push("");
-  return { content: lines.join("\n"), exportedIdentifiers };
-};
-const generateMetadataTypeFileContent = (outputKeys) => {
-  const lines = [];
-  lines.push("// This file is auto-generated by screw-up plugin");
-  lines.push("// Do not edit manually");
-  lines.push("");
-  for (const key of outputKeys) {
-    const sanitizedKey = sanitizeKey(key);
-    lines.push(`export declare const ${sanitizedKey}: string;`);
-  }
-  lines.push("");
-  return lines.join("\n");
-};
 const countInsertedLines = (bannerWithTrailingNewline) => {
   return bannerWithTrailingNewline.split("\n").length - 1;
 };
@@ -301,7 +277,6 @@ const screwUp = (options = {}) => {
     assetFilters = ["\\.d\\.ts$"],
     outputMetadataFile = false,
     outputMetadataFilePath = "src/generated/packageMetadata.ts",
-    outputMetadataFileTypePath,
     outputMetadataKeys = [
       "name",
       "version",
@@ -316,7 +291,6 @@ const screwUp = (options = {}) => {
     insertMetadataBanner = true
   } = options;
   const assetFiltersRegex = assetFilters.map((filter) => new RegExp(filter));
-  const resolvedOutputMetadataTypeFilePath = outputMetadataFileTypePath || outputMetadataFilePath.replace(/\.ts$/, ".d.ts");
   const generateMetadataSourceLocker = createMutex();
   const loggerPrefix = `${name}-vite`;
   let logger = createConsoleLogger(loggerPrefix);
@@ -324,50 +298,6 @@ const screwUp = (options = {}) => {
   let metadata;
   let projectRoot;
   let fetchGitMetadata = () => Promise.resolve({});
-  const writeFileIfChanged = async (filePath, content, description) => {
-    try {
-      let shouldWrite = !existsSync(filePath);
-      if (!shouldWrite) {
-        try {
-          const existingContent = await readFile(filePath, "utf-8");
-          shouldWrite = existingContent !== content;
-        } catch (e) {
-          shouldWrite = true;
-        }
-      }
-      if (shouldWrite) {
-        await mkdir(dirname(filePath), { recursive: true });
-        await writeFile(filePath, content);
-        return true;
-      } else {
-        return false;
-      }
-    } catch (error) {
-      logger.warn(`Failed to write ${description}: ${filePath}: ${error}`);
-      return false;
-    }
-  };
-  const ensureMetadataGitignore = async (metadataSourcePath) => {
-    const metadataDirectory = dirname(metadataSourcePath);
-    const gitignorePath = join(metadataDirectory, ".gitignore");
-    if (existsSync(gitignorePath)) {
-      return false;
-    }
-    try {
-      await mkdir(metadataDirectory, { recursive: true });
-      const metadataFileName = basename(metadataSourcePath);
-      const gitignoreContent = `# Auto-generated by screw-up plugin
-${metadataFileName}
-`;
-      await writeFile(gitignorePath, gitignoreContent);
-      return true;
-    } catch (error) {
-      logger.warn(
-        `Failed to write .gitignore for metadata source: ${gitignorePath}: ${error}`
-      );
-      return false;
-    }
-  };
   const generateMetadataSourceFiles = async () => {
     const result = await resolvePackageMetadata(
       projectRoot,
@@ -378,25 +308,22 @@ ${metadataFileName}
     metadata = result.metadata;
     banner = generateBanner(metadata, outputKeys);
     if (outputMetadataFile) {
-      const { content: metadataSourceContent, exportedIdentifiers } = generateMetadataFileContent(metadata, outputMetadataKeys);
+      const metadataSourceContent = generateMetadataFileContent(
+        metadata,
+        outputMetadataKeys
+      );
       const metadataSourcePath = join(projectRoot, outputMetadataFilePath);
       const metadataWritten = await writeFileIfChanged(
         metadataSourcePath,
         metadataSourceContent,
-        "metadata source file"
-      );
-      const metadataTypeContent = generateMetadataTypeFileContent(exportedIdentifiers);
-      const metadataTypePath = join(
-        projectRoot,
-        resolvedOutputMetadataTypeFilePath
-      );
-      const metadataTypeWritten = await writeFileIfChanged(
-        metadataTypePath,
-        metadataTypeContent,
-        "metadata type definition file"
+        "metadata source file",
+        logger
       );
       if (existsSync(metadataSourcePath)) {
-        const gitignoreWritten = await ensureMetadataGitignore(metadataSourcePath);
+        const gitignoreWritten = await ensureMetadataGitignore(
+          metadataSourcePath,
+          logger
+        );
         if (gitignoreWritten) {
           logger.info(
             `generateMetadataSourceFile: .gitignore is generated: ${join(
@@ -406,27 +333,7 @@ ${metadataFileName}
           );
         }
       }
-      if (metadataTypeWritten) {
-        logger.info(
-          `generateMetadataSourceFile: Metadata type definition file is generated: ${resolvedOutputMetadataTypeFilePath}`
-        );
-      }
-      return metadataWritten || metadataTypeWritten;
-    }
-    return false;
-  };
-  const generateMetadataTypeDefinitionFileFromKeys = async (keys) => {
-    if (outputMetadataFile) {
-      const metadataTypeContent = generateMetadataTypeFileContent(keys);
-      const metadataTypePath = join(
-        projectRoot,
-        resolvedOutputMetadataTypeFilePath
-      );
-      return await writeFileIfChanged(
-        metadataTypePath,
-        metadataTypeContent,
-        "metadata type definition file"
-      );
+      return metadataWritten;
     }
     return false;
   };
@@ -438,14 +345,12 @@ ${metadataFileName}
         keys.forEach((key) => {
           dummyMetadata[key] = "[Require first build]";
         });
-        const { content: dummyContent } = generateMetadataFileContent(
-          dummyMetadata,
-          keys
-        );
+        const dummyContent = generateMetadataFileContent(dummyMetadata, keys);
         return await writeFileIfChanged(
           metadataSourcePath,
           dummyContent,
-          "dummy metadata source file"
+          "dummy metadata source file",
+          logger
         );
       }
     }
@@ -460,11 +365,6 @@ ${metadataFileName}
     applyToEnvironment: async (penv) => {
       logger.info(`${version}-${git_commit_hash}: Started.`);
       projectRoot = penv.config.root;
-      if (projectRoot && await generateMetadataTypeDefinitionFileFromKeys(outputMetadataKeys)) {
-        logger.info(
-          `applyToEnvironment: Metadata type definition file is generated: ${resolvedOutputMetadataTypeFilePath}`
-        );
-      }
       if (projectRoot && await generateMetadataFileFromKeys(outputMetadataKeys)) {
         logger.info(
           `applyToEnvironment: Dummy metadata source file is generated: ${outputMetadataFilePath}`