Merge branch 'release/next' into typesync

OpenFn · Jul 27, 2023 · df96348 · df96348
2 parents 616225c + 2a0aaa9
commit df96348
Show file tree

Hide file tree

Showing 27 changed files with 728 additions and 757 deletions.
diff --git a/.changeset/cyan-rockets-add.md b/.changeset/cyan-rockets-add.md
@@ -0,0 +1,5 @@
+---
+'@openfn/compiler': patch
+---
+
+Bump recast version
diff --git a/.changeset/late-experts-pull.md b/.changeset/late-experts-pull.md
@@ -0,0 +1,5 @@
+---
+'@openfn/runtime': patch
+---
+
+Bump semver
diff --git a/.changeset/shiny-fans-beam.md b/.changeset/shiny-fans-beam.md
@@ -0,0 +1,6 @@
+---
+'@openfn/deploy': patch
+'@openfn/logger': patch
+---
+
+Bump inquirer
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - run:
           name: Install pnpm
-          command: sudo corepack enable && corepack prepare [email protected].0 --activate
+          command: sudo corepack enable && corepack prepare [email protected].9 --activate
       - checkout
       - restore_cache:
           # See the configuration reference documentation for more details on using restore_cache and save_cache steps

diff --git a/examples/dts-inspector/CHANGELOG.md b/examples/dts-inspector/CHANGELOG.md
@@ -1,5 +1,19 @@
 # dts-inspector
 
+## 1.0.15
+
+### Patch Changes
+
+- Updated dependencies [faf1852]
+  - @openfn/describe-package@0.0.18
+
+## 1.0.14
+
+### Patch Changes
+
+- Updated dependencies [4c875b3]
+  - @openfn/describe-package@0.0.17
+
 ## 1.0.13
 
 ### Patch Changes

diff --git a/examples/dts-inspector/package.json b/examples/dts-inspector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dts-inspector",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "",
   "main": "index.js",
   "type": "module",

diff --git a/integration-tests/cli/package.json b/integration-tests/cli/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@types/node": "^18.7.18",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "date-fns": "^2.29.3",
     "rimraf": "^3.0.2",
     "ts-node": "10.8.1",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @openfn/cli
 
+## 0.2.2
+
+### Patch Changes
+
+- faf1852: Downgrade tsup
+- Updated dependencies [faf1852]
+  - @openfn/compiler@0.0.34
+  - @openfn/deploy@0.2.2
+  - @openfn/describe-package@0.0.18
+  - @openfn/logger@0.0.15
+  - @openfn/runtime@0.0.28
+
+## 0.2.1
+
+### Patch Changes
+
+- 4c875b3: Bump yargs version
+- Updated dependencies [749afe8]
+- Updated dependencies [614c86b]
+- Updated dependencies [4c875b3]
+- Updated dependencies [4c875b3]
+  - @openfn/logger@0.0.14
+  - @openfn/runtime@0.0.27
+  - @openfn/compiler@0.0.33
+  - @openfn/deploy@0.2.1
+  - @openfn/describe-package@0.0.17
+
 ## 0.2.0
 
 ### Minor Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -39,11 +39,11 @@
     "@types/rimraf": "^3.0.2",
     "@types/treeify": "^1.0.0",
     "@types/yargs": "^17.0.24",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "mock-fs": "^5.1.4",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "tsup": "^7.1.0",
+    "tsup": "^6.2.3",
     "typescript": "^4.7.4"
   },
   "dependencies": {

diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @openfn/compiler
 
+## 0.0.34
+
+### Patch Changes
+
+- faf1852: Downgrade tsup
+- Updated dependencies [faf1852]
+  - @openfn/describe-package@0.0.18
+  - @openfn/logger@0.0.15
+
+## 0.0.33
+
+### Patch Changes
+
+- 4c875b3: Remove yargs from prod dependencies
+- Updated dependencies [749afe8]
+- Updated dependencies [4c875b3]
+  - @openfn/logger@0.0.14
+  - @openfn/describe-package@0.0.17
+
 ## 0.0.32
 
 ### Patch Changes

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/compiler",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Compiler and language tooling for openfn jobs.",
   "author": "Open Function Group <[email protected]>",
   "license": "ISC",
@@ -32,19 +32,19 @@
   "devDependencies": {
     "@types/node": "^17.0.45",
     "@types/yargs": "^17.0.24",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "tsup": "^7.1.0",
-    "typescript": "^4.7.4"
+    "tsup": "^6.2.3",
+    "typescript": "^4.7.4",
+    "yargs": "^17.7.2"
   },
   "dependencies": {
     "@openfn/describe-package": "workspace:*",
     "@openfn/logger": "workspace:*",
     "acorn": "^8.8.0",
     "ast-types": "^0.14.2",
-    "recast": "^0.21.2",
-    "yargs": "^17.7.2"
+    "recast": "^0.21.5"
   },
   "files": [
     "dist",

diff --git a/packages/deploy/CHANGELOG.md b/packages/deploy/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @openfn/deploy
 
+## 0.2.2
+
+### Patch Changes
+
+- faf1852: Downgrade tsup
+- Updated dependencies [faf1852]
+  - @openfn/logger@0.0.15
+
+## 0.2.1
+
+### Patch Changes
+
+- 4c875b3: minor version bumps
+- Updated dependencies [749afe8]
+- Updated dependencies [4c875b3]
+  - @openfn/logger@0.0.14
+
 ## 0.2.0
 
 ### Minor Changes

diff --git a/packages/deploy/package.json b/packages/deploy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/deploy",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Deploy projects to Lightning instances",
   "type": "module",
   "exports": {
@@ -30,12 +30,12 @@
     "@types/jsonpath": "^0.2.0",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "^18.7.14",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "jsonpath": "^1.1.1",
     "mock-fs": "^5.1.4",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "tsup": "^7.1.0",
+    "tsup": "^6.2.3",
     "typescript": "^4.6.4"
   },
   "files": [

diff --git a/packages/describe-package/CHANGELOG.md b/packages/describe-package/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @openfn/describe-package
 
+## 0.0.18
+
+### Patch Changes
+
+- faf1852: Downgrade tsup
+
+## 0.0.17
+
+### Patch Changes
+
+- 4c875b3: minor version bumps
+
 ## 0.0.16
 
 ### Patch Changes

diff --git a/packages/describe-package/package.json b/packages/describe-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/describe-package",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Utilities to inspect an npm package.",
   "author": "Open Function Group <[email protected]>",
   "license": "ISC",
@@ -40,14 +40,14 @@
     "@types/node": "^17.0.45",
     "@types/node-localstorage": "^1.3.0",
     "@types/rimraf": "^3.0.2",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "esbuild": "^0.18.14",
     "rimraf": "^3.0.2",
     "threads": "1.7.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "tsm": "^2.2.1",
-    "tsup": "^7.1.0"
+    "tsup": "^6.2.3"
   },
   "files": [
     "dist",
@@ -63,7 +63,6 @@
   "dependencies": {
     "@typescript/vfs": "^1.3.5",
     "cross-fetch": "^3.1.5",
-    "node-localstorage": "^2.2.1",
     "typescript": "^4.7.4",
     "url-join": "^5.0.0"
   }

diff --git a/packages/describe-package/test/typescript/project.test.ts b/packages/describe-package/test/typescript/project.test.ts
@@ -1,6 +1,6 @@
 import test from 'ava';
-import { LocalStorage } from 'node-localstorage';
-global.localStorage = new LocalStorage('./tmp');
+// import { LocalStorage } from 'node-localstorage';
+// global.localStorage = new LocalStorage('./tmp');
 import { readFile } from 'node:fs/promises';
 import { Project, getDefaultMap } from '../../src/typescript/project';
 import { createDefaultMapFromNodeModules } from '@typescript/vfs';

diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @openfn/logger
 
+## 0.0.15
+
+### Patch Changes
+
+- faf1852: Downgrade tsup
+
+## 0.0.14
+
+### Patch Changes
+
+- 749afe8: Pretty print output
+- 4c875b3: minor version bumps
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/logger",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Cross-package logging utility",
   "module": "dist/index.js",
   "author": "Open Function Group <[email protected]>",
@@ -34,10 +34,10 @@
   },
   "devDependencies": {
     "@types/node": "^18.7.18",
-    "ava": "5.1.0",
+    "ava": "5.3.1",
     "ts-node": "10.8.1",
     "tslib": "^2.4.0",
-    "tsup": "^7.1.0",
+    "tsup": "^6.2.3",
     "typescript": "^4.8.3"
   },
   "files": [

diff --git a/packages/logger/src/sanitize.ts b/packages/logger/src/sanitize.ts
@@ -12,7 +12,7 @@ type SanitizeOptions = {
 const sanitize = (item: any, options: SanitizeOptions = {}) => {
   // Stringify output to ensure we show deep nesting
   const maybeStringify = (o: any) =>
-    options.stringify === false ? o : stringify(o);
+    options.stringify === false ? o : stringify(o, null, 2);
 
   if (item instanceof Error) {
     return item;

diff --git a/packages/logger/test/logger.test.ts b/packages/logger/test/logger.test.ts
@@ -73,7 +73,12 @@ test('should log objects as strings', (t) => {
   logger.success(obj);
 
   const { message } = logger._parse(logger._last);
-  t.is(message, '{"a":22}');
+  t.is(
+    message,
+    `{
+  "a": 22
+}`
+  );
 
   const messageObj = JSON.parse(message as string);
   t.deepEqual(messageObj.a, 22);
@@ -346,7 +351,14 @@ test('log a circular object', async (t) => {
   logger.success(a);
 
   const { message } = logger._parse(logger._last);
-  t.is(message, '{"z":{"a":"[Circular]"}}');
+  t.is(
+    message,
+    `{
+  "z": {
+    "a": "[Circular]"
+  }
+}`
+  );
 });
 
 test('log a circular object as JSON', async (t) => {
@@ -375,7 +387,12 @@ test('ignore functions on logged objects', async (t) => {
   logger.success(obj);
 
   const { message } = logger._parse(logger._last);
-  t.is(message, '{"a":1}');
+  t.is(
+    message,
+    `{
+  "a": 1
+}`
+  );
 });
 
 test('log an error object', (t) => {