@covector/assemble - npm Package Compare versions

Comparing version 0.9.0 to 0.10.0

CHANGELOG.md

 # Changelog
 
+## \[0.10.0]
+
+### Dependencies
+
+- [`7b6201c`](https://www.github.com/jbolda/covector/commit/7b6201c2e7e0d9120610a2a882c0b4523f4ab6dc)([#264](https://www.github.com/jbolda/covector/pull/264)) Bump Typescript to v4.9, and deeply update types in the lower level functions to start.
+
+### New Features
+
+- [`0b33560`](https://www.github.com/jbolda/covector/commit/0b335606a4998f94ad88006ccc6cf0e7cb2538b1)([#244](https://www.github.com/jbolda/covector/pull/244)) Add changelog tags (section or category) to group different change files.
+
 ## \[0.9.0]
@@ -4,0 +14,0 @@

dist/index.d.ts

@@ -34,6 +34,6 @@ import { Operation } from "effection";
     filterPackages: string[];
-}) => Generator<any, {
+}) => Operation<{
     commands: PkgVersion[];
     pipeTemplate: any;
-}, any>;
+}>;
 export declare const mergeIntoConfig: ({ config, assembledChanges, command, cwd, dryRun, filterPackages, changelogs, tag, }: {
@@ -55,6 +55,6 @@ config: ConfigFile;
     tag?: string | undefined;
-}) => Generator<any, {
+}) => Operation<{
     commands: PkgPublish[];
     pipeTemplate: any;
-}, any>;
+}>;
 //# sourceMappingURL=index.d.ts.map

dist/index.js

@@ -26,3 +26,3 @@ "use strict";
     const [parsedChanges, ...remaining] = processed.children;
-    //@ts-ignore
+    //@ts-expect-error
     const parsedYaml = js_yaml_1.default.load(parsedChanges.value);
@@ -33,6 +33,12 @@ changeset.releases =
         throw new Error(`${file.path} didn't have any packages bumped. Please add a package bump.`);
+    for (const [k, v] of Object.entries(changeset.releases)) {
+        const [bump, tag] = v.split(":");
+        changeset.releases[k] =
+            bump;
+        changeset.tag = tag;
+    }
     changeset.summary = processor
         .stringify({
         type: "root",
-        //@ts-ignore
+        //@ts-expect-error
         children: remaining,
@@ -198,5 +204,5 @@ })
             const oldBump = ((_b = oldMergedRelease[pkg]) === null || _b === void 0 ? void 0 : _b.type) || "noop";
-            //@ts-ignore bumpMap could be undefined?
+            //@ts-expect-error bumpMap could be undefined?
             if (bumpMap.get(nextBump) < bumpMap.get(oldBump)) {
-                //@ts-ignore TODO template string doesn't play nice with the type
+                //@ts-expect-error TODO template string doesn't play nice with the type
                 diffed[pkg].type = `pre${nextBump}`;
@@ -213,3 +219,3 @@ }
             diffed[pkg] = Object.assign({}, allMergedRelease[pkg]);
-            //@ts-ignore TODO template string doesn't play nice with the type
+            //@ts-expect-error TODO template string doesn't play nice with the type
             diffed[pkg].type = `pre${allMergedRelease[pkg].type}`;
@@ -321,3 +327,3 @@ return diffed;
                 [`getPublishedVersion${subPublishCommand}`]: (0, lodash_1.template)(
-                //@ts-ignore no index type string
+                //@ts-expect-error no index type string
                 pkgCommands[pkg][`getPublishedVersion${subPublishCommand}`])(pipeToTemplate),
@@ -354,5 +360,5 @@ })), (!pkgCommands[pkg].assets
     var _a, _b, _c, _d, _e, _f;
-    //@ts-ignore
+    //@ts-expect-error
     const managerCommand = (_c = (_b = (_a = config.pkgManagers) === null || _a === void 0 ? void 0 : _a[pkgManager]) === null || _b === void 0 ? void 0 : _b[command]) !== null && _c !== void 0 ? _c : null;
-    //@ts-ignore
+    //@ts-expect-error
     const mergedCommand = (_f = (_e = (_d = config.packages) === null || _d === void 0 ? void 0 : _d[pkg]) === null || _e === void 0 ? void 0 : _e[command]) !== null && _f !== void 0 ? _f : managerCommand;
@@ -359,0 +365,0 @@ return mergedCommand;

package.json

 {
   "name": "@covector/assemble",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "license": "Apache-2.0",
@@ -19,4 +19,4 @@ "homepage": "https://github.com/jbolda/covector#readme",
   "dependencies": {
-    "@covector/command": "0.6.0",
-    "@covector/files": "0.6.0",
+    "@covector/command": "0.6.1",
+    "@covector/files": "0.6.1",
     "effection": "^2.0.6",
@@ -33,6 +33,6 @@ "js-yaml": "^4.1.0",
     "@types/js-yaml": "^4.0.0",
-    "@types/lodash": "^4.14.181",
+    "@types/lodash": "^4.14.191",
     "fixturez": "^1.1.0",
-    "tslib": "^2.4.0",
-    "typescript": "^4.6.3"
+    "tslib": "^2.5.0",
+    "typescript": "^4.9.5"
   },
@@ -39,0 +39,0 @@ "volta": {

src/index.ts

@@ -44,3 +44,3 @@ import { Operation } from "effection";
     processed.children;
-  //@ts-ignore
+  //@ts-expect-error
   const parsedYaml = yaml.load(parsedChanges.value as string);
@@ -53,6 +53,16 @@ changeset.releases =
     );
+
+  for (const [k, v] of Object.entries(
+    changeset.releases as { [k: string]: CommonBumps }
+  )) {
+    const [bump, tag] = (v as string).split(":");
+    (changeset.releases as { [k: string]: CommonBumps })[k] =
+      bump as CommonBumps;
+    changeset.tag = tag;
+  }
+
   changeset.summary = processor
     .stringify({
       type: "root",
-      //@ts-ignore
+      //@ts-expect-error
       children: remaining,
@@ -291,5 +301,5 @@ })
       const oldBump = oldMergedRelease[pkg]?.type || "noop";
-      //@ts-ignore bumpMap could be undefined?
+      //@ts-expect-error bumpMap could be undefined?
       if (bumpMap.get(nextBump) < bumpMap.get(oldBump)) {
-        //@ts-ignore TODO template string doesn't play nice with the type
+        //@ts-expect-error TODO template string doesn't play nice with the type
         diffed[pkg].type = `pre${nextBump}`;
@@ -305,3 +315,3 @@ } else {
         diffed[pkg] = { ...allMergedRelease[pkg] };
-        //@ts-ignore TODO template string doesn't play nice with the type
+        //@ts-expect-error TODO template string doesn't play nice with the type
         diffed[pkg].type = `pre${allMergedRelease[pkg].type}`;
@@ -329,3 +339,3 @@ return diffed;
   filterPackages: string[];
-}): Generator<any, { commands: PkgVersion[]; pipeTemplate: any }, any> {
+}): Operation<{ commands: PkgVersion[]; pipeTemplate: any }> {
   // build in assembledChanges to only issue commands with ones with changes
@@ -443,3 +453,3 @@ // and pipe in data to template function
   tag?: string;
-}): Generator<any, { commands: PkgPublish[]; pipeTemplate: any }, any> {
+}): Operation<{ commands: PkgPublish[]; pipeTemplate: any }> {
   // build in assembledChanges to only issue commands with ones with changes
@@ -554,3 +564,3 @@ // and pipe in data to template function
       ...extraPublishParams,
-      //@ts-ignore no index type string
+      //@ts-expect-error no index type string
       ...(!pkgCommands[pkg][`getPublishedVersion${subPublishCommand}`]
@@ -560,3 +570,3 @@ ? {}
             [`getPublishedVersion${subPublishCommand}`]: template(
-              //@ts-ignore no index type string
+              //@ts-expect-error no index type string
               pkgCommands[pkg][`getPublishedVersion${subPublishCommand}`]
@@ -637,5 +647,5 @@ )(pipeToTemplate),
 }) => {
-  //@ts-ignore
+  //@ts-expect-error
   const managerCommand = config.pkgManagers?.[pkgManager]?.[command] ?? null;
-  //@ts-ignore
+  //@ts-expect-error
   const mergedCommand = config.packages?.[pkg]?.[command] ?? managerCommand;
@@ -642,0 +652,0 @@

test/assemble.test.ts

@@ -296,3 +296,3 @@ import { it } from "@effection/jest";
         ],
-        //@ts-ignore
+        //@ts-expect-error
         config: configSpecial,
@@ -314,3 +314,3 @@ });
           ],
-          //@ts-ignore
+          //@ts-expect-error
           config,
@@ -331,3 +331,3 @@ });
           files: [testTextSpecialTwo],
-          //@ts-ignore
+          //@ts-expect-error
           config: configSpecial,
@@ -346,3 +346,3 @@ });
         files: [testTextSpecialOne],
-        //@ts-ignore
+        //@ts-expect-error
         config: configSpecial,
@@ -349,0 +349,0 @@ });

test/git.test.ts

@@ -12,3 +12,4 @@ import { it } from "@effection/jest";
       content: "---\nboop: patch\n---\n",
-      path: `./.changes/upgrade-to-effection-v2.md`,
+      // the `--` forces a path and won't throw an error on missing files
+      path: `-- ./.changes/upgrade-to-effection-v2.md`,
       filename: "upgrade-to-effection-v2.md",
@@ -34,4 +35,10 @@ extname: "md",
       },
+      {
+        commitSubject: "publish new versions (#231)",
+        date: "2023-01-17",
+        hashLong: "b5375deed67cb47f75e29b5628c5c15ff4b99b78",
+        hashShort: "b5375de",
+      },
     ]);
   });
 });

test/merge-config.test.ts

@@ -123,5 +123,4 @@ import { it } from "@effection/jest";
     it("merges version", function* () {
-      //@ts-ignore
       const mergedVersionConfig = yield mergeChangesToConfig({
-        //@ts-ignore
+        //@ts-expect-error
         config,
@@ -136,14 +135,13 @@ assembledChanges,
       let modifiedConfig = { ...config };
-      //@ts-ignore
+      //@ts-expect-error
       delete modifiedConfig.pkgManagers.javascript.version;
-      //@ts-ignore
+      //@ts-expect-error
       delete modifiedConfig.packages["assemble2"].version;
-      //@ts-ignore
+      //@ts-expect-error
       delete modifiedConfig.packages["@namespaced/assemble1"].version;
-      //@ts-ignore
+      //@ts-expect-error
       delete modifiedConfig.packages["@namespaced/assemble2"].version;
 
-      //@ts-ignore
       const mergedVersionConfig = yield mergeChangesToConfig({
-        //@ts-ignore
+        //@ts-expect-error
         config: modifiedConfig,
@@ -213,5 +211,4 @@ assembledChanges,
 
-      //@ts-ignore
       const mergedVersionConfig = yield mergeChangesToConfig({
-        //@ts-ignore
+        //@ts-expect-error
         config: nestedConfig,
@@ -229,5 +226,5 @@ assembledChanges: nestedAssembledChanges,
         cwd: configFolder,
-        //@ts-ignore
+        //@ts-expect-error
         config,
-        //@ts-ignore
+        //@ts-expect-error
         assembledChanges: [],
@@ -242,5 +239,4 @@ command: "publish",
     it("merges version", function* () {
-      //@ts-ignore
       const mergedVersionConfig = yield mergeChangesToConfig({
-        //@ts-ignore
+        //@ts-expect-error
         config,
@@ -257,6 +253,5 @@ assembledChanges,
 
-      //@ts-ignore
       const mergedPublishConfig = yield mergeIntoConfig({
         cwd: configFolder,
-        //@ts-ignore
+        //@ts-expect-error
         config,
@@ -263,0 +258,0 @@ assembledChanges,

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

123565

increased by2.53%

Lines of code

1711

increased by0.94%

Dependency changes

• + Added@covector/command@0.6.1(transitive)

• + Added@covector/files@0.6.1(transitive)

• - Removed@covector/command@0.6.0(transitive)

• - Removed@covector/files@0.6.0(transitive)

• Updated@covector/command@0.6.1

• Updated@covector/files@0.6.1