screw-up 1.17.0 → 1.19.0

package/README.md

@@ -49,6 +49,10 @@ To insert banner header each bundled source files (`dist/index.js` and etc.):
 You may have noticed the line `git.commit.hash:`. That's right, if your project is managed by Git (it is, right?), you can also insert commit IDs, branch information, and tag information.
 Most importantly, if a version is applied to a Git tag, you can automatically reflect that version tag in the `version` field of `package.json`. In other words, you can manage version numbers using only Git tags!
 
+This calculates the version number by measuring the commit height to the current HEAD based on the last applied version tag.
+
+![git-versioning](./images/git-versioning.png)
+
 Instead of using `npm pack`, you can use the CLI tool `screw-up` to generate packages, which will automatically apply the collected metadata to the NPM package's `package.json`:
 
 ```bash

package/dist/analyzer.d.ts

@@ -1,11 +1,11 @@
 /*!
  * 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 { Logger } from './internal.js';

package/dist/cli-internal.d.ts

@@ -1,14 +1,21 @@
 /*!
  * 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 { Logger } from './internal';
+export interface WorkspaceFilesMergeResult {
+    readonly workspaceRoot: string;
+    readonly parentFiles?: string[];
+    readonly childFiles?: string[];
+    readonly mergedFiles?: string[];
+}
+export declare const resolveWorkspaceFilesMerge: (targetDir: string, logger: Logger) => Promise<WorkspaceFilesMergeResult | undefined>;
 /**
  * Packed result
  */
@@ -28,7 +35,7 @@ export interface PackedResult {
  * @param alwaysOverrideVersionFromGit - Always override version from Git (default: true)
  * @returns Package metadata (package.json) or undefined if failed
  */
-export declare const packAssets: (targetDir: string, outputDir: string, checkWorkingDirectoryStatus: boolean, alwaysOverrideVersionFromGit: boolean, inheritableFields: Set<string>, readmeReplacementPath: string | undefined, replacePeerDepsWildcards: boolean, peerDepsVersionPrefix: string, logger: Logger) => Promise<PackedResult | undefined>;
+export declare const packAssets: (targetDir: string, outputDir: string, checkWorkingDirectoryStatus: boolean, alwaysOverrideVersionFromGit: boolean, inheritableFields: Set<string>, readmeReplacementPath: string | undefined, replacePeerDepsWildcards: boolean, peerDepsVersionPrefix: string, logger: Logger, mergeFiles?: boolean) => Promise<PackedResult | undefined>;
 /**
  * Get computed package.json object
  * @param targetDir - Target directory to resolve package metadata

package/dist/cli-internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-internal.d.ts","sourceRoot":"","sources":["../src/cli-internal.ts"],"names":[],"mappings":";;;;;;;;;AAiBA,OAAO,EAKL,MAAM,EACP,MAAM,YAAY,CAAC;AAyEpB;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GACrB,WAAW,MAAM,EACjB,WAAW,MAAM,EACjB,6BAA6B,OAAO,EACpC,8BAA8B,OAAO,EACrC,mBAAmB,GAAG,CAAC,MAAM,CAAC,EAC9B,uBAAuB,MAAM,GAAG,SAAS,EACzC,0BAA0B,OAAO,EACjC,uBAAuB,MAAM,EAC7B,QAAQ,MAAM,KACb,OAAO,CAAC,YAAY,GAAG,SAAS,CAmIlC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,WAAW,MAAM,EACjB,kBAAkB,MAAM,OAAO,CAAC,GAAG,CAAC,EACpC,8BAA8B,OAAO,EACrC,mBAAmB,GAAG,CAAC,MAAM,CAAC,EAC9B,QAAQ,MAAM,EACd,iBAAgB,OAAe,KAC9B,OAAO,CAAC,GAAG,CAgBb,CAAC;AAIF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;CACpD;AAED;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EAAE,EACd,cAAc,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KACrC,UAiDF,CAAC"}
+{"version":3,"file":"cli-internal.d.ts","sourceRoot":"","sources":["../src/cli-internal.ts"],"names":[],"mappings":";;;;;;;;;AAmBA,OAAO,EAKL,MAAM,EACP,MAAM,YAAY,CAAC;AAgHpB,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,eAAO,MAAM,0BAA0B,GACrC,WAAW,MAAM,EACjB,QAAQ,MAAM,KACb,OAAO,CAAC,yBAAyB,GAAG,SAAS,CA6B/C,CAAC;AAoEF;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GACrB,WAAW,MAAM,EACjB,WAAW,MAAM,EACjB,6BAA6B,OAAO,EACpC,8BAA8B,OAAO,EACrC,mBAAmB,GAAG,CAAC,MAAM,CAAC,EAC9B,uBAAuB,MAAM,GAAG,SAAS,EACzC,0BAA0B,OAAO,EACjC,uBAAuB,MAAM,EAC7B,QAAQ,MAAM,EACd,aAAY,OAAc,KACzB,OAAO,CAAC,YAAY,GAAG,SAAS,CA+JlC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,4BAA4B,GACvC,WAAW,MAAM,EACjB,kBAAkB,MAAM,OAAO,CAAC,GAAG,CAAC,EACpC,8BAA8B,OAAO,EACrC,mBAAmB,GAAG,CAAC,MAAM,CAAC,EAC9B,QAAQ,MAAM,EACd,iBAAgB,OAAe,KAC9B,OAAO,CAAC,GAAG,CAgBb,CAAC;AAIF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;CACpD;AAED;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,MAAM,EAAE,EACd,cAAc,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KACrC,UAiDF,CAAC"}

package/dist/cli.d.ts

@@ -1,11 +1,11 @@
 /*!
  * 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 { Logger } from './internal';

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;AAiBA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAypBpC,eAAO,MAAM,OAAO,GAClB,MAAM,MAAM,EAAE,EACd,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,CA8BhB,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;AAkBA,OAAO,EAAE,MAAM,EAA0B,MAAM,YAAY,CAAC;AAyzB5D,eAAO,MAAM,OAAO,GAClB,MAAM,MAAM,EAAE,EACd,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,CAgChB,CAAC"}

package/dist/fast-tags.d.ts

@@ -1,11 +1,11 @@
 /*!
  * 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 { Logger } from './internal.js';

package/dist/generated/packageMetadata.d.ts

@@ -1,18 +1,18 @@
 /*!
  * 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
  */
 
 export declare const name = "screw-up";
-export declare const version = "1.17.0";
+export declare const version = "1.19.0";
 export declare const description = "Simply package metadata inserter on Vite plugin";
 export declare const author = "Kouji Matsui (@kekyo@mi.kekyo.net)";
 export declare const license = "MIT";
 export declare const repository_url = "https://github.com/kekyo/screw-up.git";
-export declare const git_commit_hash = "05a9f2e0dec5249126f020eee1d57f6ff8767096";
+export declare const git_commit_hash = "b86321865390ff8dc11c118f46a8e0ba8b67aa9c";
 //# sourceMappingURL=packageMetadata.d.ts.map

package/dist/git-operations.d.ts

@@ -1,11 +1,11 @@
 /*!
  * 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 { TagInfo, Version } from './analyzer';

package/dist/index.cjs

@@ -1,25 +1,25 @@
 "use strict";
 /*!
  * 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
  */
 const fs = require("fs/promises");
 const fs$1 = require("fs");
 const path = require("path");
-const packageMetadata = require("./packageMetadata-DdvLnmBC.cjs");
+const packageMetadata = require("./packageMetadata-DXwK6bb8.cjs");
 /*!
  * 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 = () => {
 };
@@ -27,13 +27,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);
     }
@@ -42,10 +51,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);
       }
@@ -227,40 +237,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;
 };
@@ -302,7 +278,6 @@ const screwUp = (options = {}) => {
     assetFilters = ["\\.d\\.ts$"],
     outputMetadataFile = false,
     outputMetadataFilePath = "src/generated/packageMetadata.ts",
-    outputMetadataFileTypePath,
     outputMetadataKeys = [
       "name",
       "version",
@@ -317,7 +292,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 = `${packageMetadata.name}-vite`;
   let logger = packageMetadata.createConsoleLogger(loggerPrefix);
@@ -325,50 +299,6 @@ const screwUp = (options = {}) => {
   let metadata;
   let projectRoot;
   let fetchGitMetadata = () => Promise.resolve({});
-  const writeFileIfChanged = async (filePath, content, description) => {
-    try {
-      let shouldWrite = !fs$1.existsSync(filePath);
-      if (!shouldWrite) {
-        try {
-          const existingContent = await fs.readFile(filePath, "utf-8");
-          shouldWrite = existingContent !== content;
-        } catch (e) {
-          shouldWrite = true;
-        }
-      }
-      if (shouldWrite) {
-        await fs.mkdir(path.dirname(filePath), { recursive: true });
-        await fs.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 = path.dirname(metadataSourcePath);
-    const gitignorePath = path.join(metadataDirectory, ".gitignore");
-    if (fs$1.existsSync(gitignorePath)) {
-      return false;
-    }
-    try {
-      await fs.mkdir(metadataDirectory, { recursive: true });
-      const metadataFileName = path.basename(metadataSourcePath);
-      const gitignoreContent = `# Auto-generated by screw-up plugin
-${metadataFileName}
-`;
-      await fs.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 packageMetadata.resolvePackageMetadata(
       projectRoot,
@@ -379,25 +309,22 @@ ${metadataFileName}
     metadata = result.metadata;
     banner = generateBanner(metadata, outputKeys);
     if (outputMetadataFile) {
-      const { content: metadataSourceContent, exportedIdentifiers } = generateMetadataFileContent(metadata, outputMetadataKeys);
+      const metadataSourceContent = packageMetadata.generateMetadataFileContent(
+        metadata,
+        outputMetadataKeys
+      );
       const metadataSourcePath = path.join(projectRoot, outputMetadataFilePath);
-      const metadataWritten = await writeFileIfChanged(
+      const metadataWritten = await packageMetadata.writeFileIfChanged(
         metadataSourcePath,
         metadataSourceContent,
-        "metadata source file"
-      );
-      const metadataTypeContent = generateMetadataTypeFileContent(exportedIdentifiers);
-      const metadataTypePath = path.join(
-        projectRoot,
-        resolvedOutputMetadataTypeFilePath
-      );
-      const metadataTypeWritten = await writeFileIfChanged(
-        metadataTypePath,
-        metadataTypeContent,
-        "metadata type definition file"
+        "metadata source file",
+        logger
       );
       if (fs$1.existsSync(metadataSourcePath)) {
-        const gitignoreWritten = await ensureMetadataGitignore(metadataSourcePath);
+        const gitignoreWritten = await packageMetadata.ensureMetadataGitignore(
+          metadataSourcePath,
+          logger
+        );
         if (gitignoreWritten) {
           logger.info(
             `generateMetadataSourceFile: .gitignore is generated: ${path.join(
@@ -407,27 +334,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 = path.join(
-        projectRoot,
-        resolvedOutputMetadataTypeFilePath
-      );
-      return await writeFileIfChanged(
-        metadataTypePath,
-        metadataTypeContent,
-        "metadata type definition file"
-      );
+      return metadataWritten;
     }
     return false;
   };
@@ -439,14 +346,12 @@ ${metadataFileName}
         keys.forEach((key) => {
           dummyMetadata[key] = "[Require first build]";
         });
-        const { content: dummyContent } = generateMetadataFileContent(
-          dummyMetadata,
-          keys
-        );
-        return await writeFileIfChanged(
+        const dummyContent = packageMetadata.generateMetadataFileContent(dummyMetadata, keys);
+        return await packageMetadata.writeFileIfChanged(
           metadataSourcePath,
           dummyContent,
-          "dummy metadata source file"
+          "dummy metadata source file",
+          logger
         );
       }
     }
@@ -461,11 +366,6 @@ ${metadataFileName}
     applyToEnvironment: async (penv) => {
       logger.info(`${packageMetadata.version}-${packageMetadata.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}`