@openfn/project 0.14.2 → 0.14.4

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as l from '@openfn/lexicon';
 import l__default, { SandboxMeta, WorkspaceConfig, UUID } from '@openfn/lexicon';
-import { Logger } from '@openfn/logger';
 import { Provisioner } from '@openfn/lexicon/lightning';
+import { Logger } from '@openfn/logger';
 
 type DiffType = 'added' | 'changed' | 'removed';
 type WorkflowDiff = {
@@ -78,6 +78,7 @@ type fromAppStateConfig = Partial<l.WorkspaceConfig> & {
     format?: 'yaml' | 'json';
     alias?: string;
 };
+declare const mapWorkflow: (workflow: Provisioner.Workflow, credentials?: Credential[]) => l.Workflow;
 
 type FromPathConfig = l.WorkspaceConfig & {
     format: 'json' | 'yaml';
@@ -182,7 +183,7 @@ declare class Project {
     collections: any;
     credentials: Credential[];
     sandbox?: SandboxMeta;
-    static from(type: 'project', data: any, options: never): Promise<Project>;
+    static from(type: 'project', data: any, config?: Partial<l__default.WorkspaceConfig>): Promise<Project>;
     static from(type: 'state', data: Provisioner.Project, meta?: Partial<l__default.ProjectMeta>, config?: fromAppStateConfig): Promise<Project>;
     static from(type: 'fs', options: FromFsConfig): Promise<Project>;
     static from(type: 'path', data: string, options?: {
@@ -248,4 +249,4 @@ type GenerateProjectOptions = GenerateWorkflowOptions & {
 declare function generateWorkflow(def: string, options?: Partial<GenerateWorkflowOptions>): Workflow;
 declare function generateProject(name: string, workflowDefs: string[], options?: Partial<GenerateProjectOptions>): Project;
 
-export { DiffType, WorkflowDiff, Workspace, Project as default, diff, generateProject, generateHash as generateVersionHash, generateWorkflow, jsonToYaml, match as versionsEqual, yamlToJson };
+export { type DiffType, type WorkflowDiff, Workspace, Project as default, diff, generateProject, generateHash as generateVersionHash, generateWorkflow, jsonToYaml, mapWorkflow, match as versionsEqual, yamlToJson };

package/dist/index.js

@@ -13,12 +13,12 @@ function slugify(text) {
 }
 
 // src/util/version.ts
-import crypto from "node:crypto";
+import crypto from "crypto";
 import { get } from "lodash-es";
 
 // src/serialize/to-app-state.ts
 import { pick, omitBy, isNil, sortBy } from "lodash-es";
-import { randomUUID } from "node:crypto";
+import { randomUUID } from "crypto";
 
 // src/util/rename-keys.ts
 function renameKeys(props = {}, keyMap) {
@@ -55,7 +55,7 @@ var parse = (credentialName) => {
 // src/serialize/to-app-state.ts
 var defaultJobProps = {
   // TODO why does the provisioner throw if these keys are not set?
-  // Ok, 90% of jobs will have a credenial, but it's still optional right?
+  // Ok, 90% of jobs will have a credential, but it's still optional right?
   keychain_credential_id: null,
   project_credential_id: null
 };
@@ -428,10 +428,8 @@ var Workflow = class {
       const step = s;
       const next = typeof step.next === "string" ? { [step.next]: true } : step.next || {};
       for (const toNode of Object.keys(next)) {
-        if (!Array.isArray(edges[step.id]))
-          edges[step.id] = [toNode];
-        else
-          edges[step.id].push(toNode);
+        if (!Array.isArray(edges[step.id])) edges[step.id] = [toNode];
+        else edges[step.id].push(toNode);
       }
     }
     return edges;
@@ -448,8 +446,7 @@ var Workflow = class {
       all_parents.push(parent);
     }
     const root = all_parents.find((parent) => !all_children.includes(parent));
-    if (!root)
-      return;
+    if (!root) return;
     return this.index.steps[root];
   }
   getUUID(id) {
@@ -490,8 +487,8 @@ import nodepath from "path";
 import { omit } from "lodash-es";
 
 // src/util/config.ts
-import { readFileSync } from "node:fs";
-import path from "node:path";
+import { readFileSync } from "fs";
+import path from "path";
 import { pickBy, isNil as isNil2 } from "lodash-es";
 var buildConfig = (config = {}) => ({
   credentials: "credentials.yaml",
@@ -891,8 +888,8 @@ var mapWorkflow2 = (workflow, credentials = []) => {
 };
 
 // src/parse/from-path.ts
-import { readFile } from "node:fs/promises";
-import path2 from "node:path";
+import { readFile } from "fs/promises";
+import path2 from "path";
 
 // src/parse/from-project.ts
 var from_project_default = (data, config) => {
@@ -927,8 +924,8 @@ var from_path_default = async (filePath, config = {}) => {
 };
 
 // src/parse/from-fs.ts
-import fs from "node:fs/promises";
-import path3 from "node:path";
+import fs from "fs/promises";
+import path3 from "path";
 import { glob } from "glob";
 import { omit as omit2 } from "lodash-es";
 var parseProject = async (options) => {
@@ -1164,8 +1161,7 @@ function getUnmappedCandidates(unmappedTarget, idMap) {
   return unmappedTarget.filter((step) => !mappedIds.has(step.id));
 }
 function findBestMatch(sourceStep, candidates, sourceEdges, targetEdges, getMappedId, isLastIteration) {
-  if (candidates.length === 0)
-    return null;
+  if (candidates.length === 0) return null;
   let bestCandidates = candidates;
   let topResult = null;
   let didStructuralFilter = false;
@@ -1275,8 +1271,7 @@ function findByParent(parentIds, edges, steps) {
   const matches = [];
   for (const parentId of parentIds) {
     const children = edges[parentId];
-    if (!children || children.length === 0)
-      continue;
+    if (!children || children.length === 0) continue;
     const matchingSteps = steps.filter((step) => children.includes(step.id));
     matches.push(...matchingSteps);
   }
@@ -1341,10 +1336,8 @@ function getDuplicates(arr) {
   const duplicates = /* @__PURE__ */ new Set();
   for (let i = 0; i < arr.length; i++) {
     const item = arr[i];
-    if (hmap[item])
-      duplicates.add(item);
-    else
-      hmap[item] = true;
+    if (hmap[item]) duplicates.add(item);
+    else hmap[item] = true;
   }
   return Array.from(duplicates);
 }
@@ -1450,7 +1443,11 @@ Pass --force to force the merge anyway`
     }
   }
   const assigns = options.mode === SANDBOX_MERGE ? {
-    workflows: finalWorkflows
+    workflows: finalWorkflows,
+    credentials: replaceCredentials(
+      source.credentials,
+      target.credentials
+    )
   } : {
     workflows: finalWorkflows,
     openfn: {
@@ -1699,18 +1696,16 @@ var Project_default = Project;
 
 // src/Workspace.ts
 import createLogger from "@openfn/logger";
-import path4 from "node:path";
-import fs3 from "node:fs";
+import path4 from "path";
+import fs3 from "fs";
 
 // src/util/path-exists.ts
 import fs2 from "fs";
 function pathExists(fpath, type) {
   try {
     const stat = fs2.statSync(fpath);
-    if (type === "file" && stat.isFile())
-      return true;
-    else if (type === "directory" && stat.isDirectory())
-      return true;
+    if (type === "file" && stat.isFile()) return true;
+    else if (type === "directory" && stat.isDirectory()) return true;
     return false;
   } catch (e) {
     return false;
@@ -1850,9 +1845,9 @@ var Workspace = class {
 };
 
 // src/gen/generator.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
-import path5 from "node:path";
-import { readFileSync as readFileSync2 } from "node:fs";
+import { randomUUID as randomUUID2 } from "crypto";
+import path5 from "path";
+import { readFileSync as readFileSync2 } from "fs";
 import { grammar } from "ohm-js";
 import { isNil as isNil5, set } from "lodash-es";
 var parser;
@@ -2061,15 +2056,16 @@ function generateProject(name, workflowDefs, options = {}) {
 }
 
 // src/index.ts
-var src_default = Project;
+var index_default = Project;
 export {
   Workspace,
-  src_default as default,
+  index_default as default,
   diff,
   generateProject,
   generateHash as generateVersionHash,
   generateWorkflow,
   jsonToYaml,
+  mapWorkflow2 as mapWorkflow,
   match as versionsEqual,
   yamlToJson
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/project",
-  "version": "0.14.2",
+  "version": "0.14.4",
   "description": "Read, serialize, replicate and sync OpenFn projects",
   "type": "module",
   "exports": {
@@ -17,25 +17,25 @@
   "author": "Open Function Group <admin@openfn.org>",
   "license": "ISC",
   "devDependencies": {
-    "@types/lodash": "^4.17.20",
+    "@types/lodash": "^4.17.24",
     "@types/mock-fs": "~4.13.4",
     "ava": "5.3.1",
     "mock-fs": "^5.5.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.1.3",
     "tslib": "^2.8.1",
-    "tsup": "^7.2.0",
-    "typescript": "^5.9.2"
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "@types/lodash-es": "^4.17.12",
-    "glob": "^11.0.2",
-    "human-id": "^4.1.1",
-    "lodash": "^4.17.21",
-    "lodash-es": "^4.17.21",
-    "ohm-js": "^17.2.1",
-    "yaml": "^2.2.2",
-    "@openfn/logger": "1.1.1",
-    "@openfn/lexicon": "^1.4.1"
+    "glob": "^13.0.6",
+    "human-id": "^4.1.3",
+    "lodash": "^4.17.23",
+    "lodash-es": "^4.17.23",
+    "ohm-js": "^17.5.0",
+    "yaml": "^2.8.2",
+    "@openfn/lexicon": "^1.4.2",
+    "@openfn/logger": "1.1.2"
   },
   "files": [
     "dist",