@openfn/project 0.14.2 → 0.14.3

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 { DiffType, WorkflowDiff, Workspace, Project as default, diff, generateProject, generateHash as generateVersionHash, generateWorkflow, jsonToYaml, mapWorkflow, match as versionsEqual, yamlToJson };

package/dist/index.js

@@ -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
 };
@@ -1450,7 +1450,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: {
@@ -2070,6 +2074,7 @@ export {
   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.3",
   "description": "Read, serialize, replicate and sync OpenFn projects",
   "type": "module",
   "exports": {
@@ -34,8 +34,8 @@
     "lodash-es": "^4.17.21",
     "ohm-js": "^17.2.1",
     "yaml": "^2.2.2",
-    "@openfn/logger": "1.1.1",
-    "@openfn/lexicon": "^1.4.1"
+    "@openfn/lexicon": "^1.4.1",
+    "@openfn/logger": "1.1.1"
   },
   "files": [
     "dist",