@covector/files - npm Package Compare versions

Comparing version 0.7.1 to 0.7.2

CHANGELOG.md

 # Changelog
 
+## \[0.7.2]
+
+- [`9e111fc`](https://www.github.com/jbolda/covector/commit/9e111fcf2431690b8719ca493e6580a42e72c457) ([#304](https://www.github.com/jbolda/covector/pull/304) by [@jbolda](https://www.github.com/jbolda/covector/../../jbolda)) Add currentVersion property to more easily refer to the version before a bump.
+
+### Dependencies
+
+- Upgraded to `@covector/toml@0.1.0`
+
 ## \[0.7.1]
@@ -4,0 +12,0 @@

dist/index.d.ts

@@ -50,3 +50,5 @@ /// <reference types="node" />
     changeFolder?: string;
-}): Operation<ConfigFile & File>;
+}): Operation<ConfigFile & {
+    file: File;
+}>;
 export declare const changeFiles: ({ cwd, changeFolder, }: {
@@ -53,0 +55,0 @@ cwd: string;

dist/index.js

@@ -24,3 +24,3 @@ "use strict";
 const path_1 = __importDefault(require("path"));
-const toml_1 = __importDefault(require("@tauri-apps/toml"));
+const toml_1 = require("@covector/toml");
 const js_yaml_1 = __importDefault(require("js-yaml"));
@@ -62,3 +62,3 @@ const semver_1 = __importDefault(require("semver"));
         case ".toml":
-            const parsedTOML = toml_1.default.parse(file.content);
+            const parsedTOML = toml_1.TomlDocument.parse(file.content);
             let version;
@@ -79,2 +79,3 @@ if (((_a = parsedTOML === null || parsedTOML === void 0 ? void 0 : parsedTOML.package) === null || _a === void 0 ? void 0 : _a.version) &&
                 version: version,
+                currentVersion: version,
                 versionMajor: semver_1.default.major(version),
@@ -91,2 +92,3 @@ versionMinor: semver_1.default.minor(version),
                 version: parsedJSON.version,
+                currentVersion: parsedJSON.version,
                 versionMajor: semver_1.default.major(parsedJSON.version),
@@ -112,2 +114,3 @@ versionMinor: semver_1.default.minor(parsedJSON.version),
                 version: verifiedYAML.version,
+                currentVersion: verifiedYAML.version,
                 versionMajor: semver_1.default.major(verifiedYAML.version),
@@ -127,2 +130,3 @@ versionMinor: semver_1.default.minor(verifiedYAML.version),
                 version: stringVersion,
+                currentVersion: stringVersion,
                 versionMajor: semver_1.default.major(stringVersion),
@@ -156,3 +160,7 @@ versionMinor: semver_1.default.minor(stringVersion),
                 }
-                else if (typeof version === "object" && version.version) {
+                else if (version &&
+                    typeof version === "object" &&
+                    "version" in version &&
+                    version.version &&
+                    typeof version.version === "string") {
                     deps[dep].push({
@@ -171,3 +179,3 @@ type: depType,
         case ".toml":
-            return toml_1.default.stringify(newContents);
+            return toml_1.TomlDocument.stringify(newContents);
         case ".json":
@@ -230,3 +238,3 @@ return `${JSON.stringify(newContents, null, "  ")}\n`;
     if (!packageFile.file)
-        throw new Error(`no vfile present for ${packageFile.name}`);
+        throw new Error(`no file present for ${packageFile.name}`);
     const fileNext = Object.assign({}, packageFile.file);
@@ -328,3 +336,2 @@ fileNext.content = stringifyPkg({
             property === "build-dependencies") {
-            const currentPkg = pkg.pkg;
             const currentProperty = currentPkg[property];
@@ -338,3 +345,2 @@ if (currentProperty === undefined)
             if (typeof currentDepVersion === "string") {
-                //@ts-expect-error TS struggles to type narrow, but we are confident it should be defined
                 pkg.pkg[property][dep] = version;
@@ -344,3 +350,2 @@ }
                 if ("version" in currentDepVersion) {
-                    //@ts-expect-error TS struggles to type narrow, but we are confident it should be defined
                     pkg.pkg[property][dep].version = version;
@@ -347,0 +352,0 @@ }

package.json

 {
   "name": "@covector/files",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "license": "Apache-2.0",
@@ -19,8 +19,7 @@ "homepage": "https://github.com/jbolda/covector#readme",
   "dependencies": {
-    "@iarna/toml": "^2.2.5",
-    "@tauri-apps/toml": "^2.2.4",
+    "@covector/toml": "0.1.0",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
     "semver": "^7.5.4",
-    "zod": "^3.21.4",
+    "zod": "^3.22.4",
     "zod-validation-error": "^1.3.1"
@@ -27,0 +26,0 @@ },

src/index.ts

@@ -1,2 +0,2 @@
-import { default as fsDefault, PathLike, statSync } from "fs";
+import { default as fsDefault, PathLike } from "fs";
 // this is compatible with node@12+
@@ -10,3 +10,3 @@ const fs = fsDefault.promises;
 import path from "path";
-import TOML from "@tauri-apps/toml";
+import { TomlDocument } from "@covector/toml";
 import yaml from "js-yaml";
@@ -57,3 +57,3 @@ import semver from "semver";
     case ".toml":
-      const parsedTOML = TOML.parse(file.content) as unknown as Pkg;
+      const parsedTOML = TomlDocument.parse(file.content);
       let version;
@@ -78,2 +78,3 @@ if (
         version: version,
+        currentVersion: version,
         versionMajor: semver.major(version),
@@ -90,2 +91,3 @@ versionMinor: semver.minor(version),
         version: parsedJSON.version,
+        currentVersion: parsedJSON.version,
         versionMajor: semver.major(parsedJSON.version),
@@ -113,2 +115,3 @@ versionMinor: semver.minor(parsedJSON.version),
         version: verifiedYAML.version,
+        currentVersion: verifiedYAML.version,
         versionMajor: semver.major(verifiedYAML.version),
@@ -128,2 +131,3 @@ versionMinor: semver.minor(verifiedYAML.version),
         version: stringVersion,
+        currentVersion: stringVersion,
         versionMajor: semver.major(stringVersion),
@@ -138,3 +142,3 @@ versionMinor: semver.minor(stringVersion),
 
-const keyDeps = (parsed: Pkg): DepsKeyed => {
+const keyDeps = (parsed: Pkg | TomlDocument): DepsKeyed => {
   const deps: DepsKeyed = {};
@@ -158,3 +162,9 @@ const depTypes: DepTypes[] = [
           });
-        } else if (typeof version === "object" && version.version) {
+        } else if (
+          version &&
+          typeof version === "object" &&
+          "version" in version &&
+          version.version &&
+          typeof version.version === "string"
+        ) {
           deps[dep].push({
@@ -180,3 +190,3 @@ type: depType,
     case ".toml":
-      return TOML.stringify(newContents);
+      return TomlDocument.stringify(newContents);
     case ".json":
@@ -202,3 +212,3 @@ return `${JSON.stringify(newContents, null, "  ")}\n`;
   const readPkgs = pkgArray.map(([name, pkg]) =>
-    readPkgFile({ cwd, pkgConfig: pkg, nickname: name }),
+    readPkgFile({ cwd, pkgConfig: pkg, nickname: name })
   );
@@ -214,3 +224,3 @@ const pkgFilesArray: PackageFile[] = yield all(readPkgs);
     },
-    {},
+    {}
   );
@@ -281,3 +291,3 @@ }
   if (!packageFile.file)
-    throw new Error(`no vfile present for ${packageFile.name}`);
+    throw new Error(`no file present for ${packageFile.name}`);
   const fileNext = { ...packageFile.file };
@@ -355,3 +365,3 @@ fileNext.content = stringifyPkg({
                       `This cannot be published. ` +
-                      `Please pin it to a MAJOR.MINOR.PATCH reference.`,
+                      `Please pin it to a MAJOR.MINOR.PATCH reference.`
                   );
@@ -401,3 +411,2 @@ }
     ) {
-      const currentPkg = pkg.pkg;
       const currentProperty = currentPkg[property];
@@ -410,4 +419,4 @@ if (currentProperty === undefined)
             null,
-            2,
-          )}`,
+            2
+          )}`
         );
@@ -418,7 +427,5 @@ if (!dep) return pkg;
       if (typeof currentDepVersion === "string") {
-        //@ts-expect-error TS struggles to type narrow, but we are confident it should be defined
         pkg.pkg[property][dep] = version;
       } else if (typeof currentDepVersion === "object") {
         if ("version" in currentDepVersion) {
-          //@ts-expect-error TS struggles to type narrow, but we are confident it should be defined
           pkg.pkg[property][dep].version = version;
@@ -466,3 +473,3 @@ }
       console.error(
-        "It appears that a dependency within this repo does not have a version specified.",
+        "It appears that a dependency within this repo does not have a version specified."
       );
@@ -480,6 +487,6 @@ }
   changeFolder?: string;
-}): Operation<ConfigFile & File> {
+}): Operation<ConfigFile & { file: File }> {
   const inputFile: File = yield loadFile(
     path.join(changeFolder, "config.json"),
-    cwd,
+    cwd
   );
@@ -514,3 +521,3 @@ try {
       cwd,
-    },
+    }
   );
@@ -542,3 +549,3 @@ };
       return changeFilePath;
-    }),
+    })
   );
@@ -545,0 +552,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

463521

increased by0.12%

Dependency count

6

decreased by-14.29%

Lines of code

11038

increased by0.13%

Dependency changes

• + Added@covector/toml@0.1.0

• + Added@covector/toml@0.1.0(transitive)

• - Removed@iarna/toml@^2.2.5

• - Removed@tauri-apps/toml@^2.2.4

• - Removed@iarna/toml@2.2.5(transitive)

• - Removed@tauri-apps/toml@2.2.4(transitive)

• Updatedzod@^3.22.4