From 47b0b18d70697509c095bbfecb9e52445a387530 Mon Sep 17 00:00:00 2001 From: Taylor Downs Date: Mon, 19 Feb 2018 18:14:02 -0300 Subject: [PATCH] allow humanProper from language-common --- lib/Adaptor.js | 8 ++++- lib/FakeAdaptor.js | 74 ++++++---------------------------------------- package.json | 4 +-- src/Adaptor.js | 2 +- src/FakeAdaptor.js | 2 +- 5 files changed, 20 insertions(+), 70 deletions(-) diff --git a/lib/Adaptor.js b/lib/Adaptor.js index c7e02ca..17a5d5f 100644 --- a/lib/Adaptor.js +++ b/lib/Adaptor.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.alterState = exports.arrayToString = exports.toArray = exports.beta = exports.index = exports.lastReferenceValue = exports.referencePath = exports.dataValue = exports.dataPath = exports.merge = exports.combine = exports.map = exports.sourceValue = exports.source = exports.field = exports.fields = exports.join = exports.each = exports.relationship = exports.lookup = exports.reference = exports.update = exports.upsertIf = exports.upsert = exports.createIf = exports.create = exports.describe = undefined; +exports.humanProper = exports.alterState = exports.arrayToString = exports.toArray = exports.beta = exports.index = exports.lastReferenceValue = exports.referencePath = exports.dataValue = exports.dataPath = exports.merge = exports.combine = exports.map = exports.sourceValue = exports.source = exports.field = exports.fields = exports.join = exports.each = exports.relationship = exports.lookup = exports.reference = exports.update = exports.upsertIf = exports.upsert = exports.createIf = exports.create = exports.describe = undefined; var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /** @module Adaptor */ @@ -146,6 +146,12 @@ Object.defineProperty(exports, 'alterState', { return _languageCommon.alterState; } }); +Object.defineProperty(exports, 'humanProper', { + enumerable: true, + get: function get() { + return _languageCommon.humanProper; + } +}); var _jsforce = require('jsforce'); diff --git a/lib/FakeAdaptor.js b/lib/FakeAdaptor.js index 2968449..c1ffbcd 100644 --- a/lib/FakeAdaptor.js +++ b/lib/FakeAdaptor.js @@ -1,10 +1,9 @@ -/** @module FakeAdaptor */ 'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); -exports.alterState = exports.arrayToString = exports.toArray = exports.beta = exports.index = exports.lastReferenceValue = exports.referencePath = exports.dataValue = exports.dataPath = exports.merge = exports.combine = exports.map = exports.sourceValue = exports.source = exports.field = exports.fields = exports.join = exports.each = exports.relationship = exports.lookup = exports.upsert = exports.update = exports.steps = exports.reference = exports.execute = exports.create = undefined; +exports.humanProper = exports.alterState = exports.arrayToString = exports.toArray = exports.beta = exports.index = exports.lastReferenceValue = exports.referencePath = exports.dataValue = exports.dataPath = exports.merge = exports.combine = exports.map = exports.sourceValue = exports.source = exports.field = exports.fields = exports.join = exports.each = exports.relationship = exports.lookup = exports.upsert = exports.update = exports.steps = exports.reference = exports.execute = exports.create = undefined; var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; @@ -133,22 +132,19 @@ Object.defineProperty(exports, 'alterState', { return _languageCommon.alterState; } }); +Object.defineProperty(exports, 'humanProper', { + enumerable: true, + get: function get() { + return _languageCommon.humanProper; + } +}); var _lodashFp = require('lodash-fp'); function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } +/** @module FakeAdaptor */ -/** - * Flattens an array of operations. - * @example - * steps( - * createIf(params), - * update(params) - * ) - * @function - * @returns {Array} - */ function steps() { for (var _len = arguments.length, operations = Array(_len), _key = 0; _key < _len; _key++) { operations[_key] = arguments[_key]; @@ -157,40 +153,13 @@ function steps() { return (0, _lodashFp.flatten)(operations); } -/** - * Expands references. - * @example - * expandReferences( - * state, - * { - * attr1: "foo", - * attr2: "bar" - * } - * ) - * @function - * @param {Object} attrs - Field attributes for the new object. - * @param {State} state - Runtime state. - * @returns {State} - */ +// TODO: use the one from language-common function expandReferences(attrs, state) { - // TODO: use the one from language-common return (0, _lodashFp.mapValues)(function (value) { return typeof value == 'function' ? value(state) : value; })(attrs); } -/** - * Create a new object. - * @example - * create('obj_name', { - * attr1: "foo", - * attr2: "bar" - * }) - * @function - * @param {String} sObject - API name of the sObject. - * @param {Object} fields - Field attributes for the new object. - * @returns {Operation} - */ function create(sObject, fields) { return function (state) { @@ -208,18 +177,6 @@ function create(sObject, fields) { }; } -/** - * Update an object. - * @example - * update('obj_name', { - * attr1: "foo", - * attr2: "bar" - * }) - * @function - * @param {String} sObject - API name of the sObject. - * @param {Object} fields - Field attributes for the new object. - * @returns {Operation} - */ function update(sObject, fields) { return function (state) { @@ -237,19 +194,6 @@ function update(sObject, fields) { }; } -/** - * Upsert an object. - * @example - * upsert('obj_name', 'ext_id', { - * attr1: "foo", - * attr2: "bar" - * }) - * @function - * @param {String} sObject - API name of the sObject. - * @param {String} externalId - ID. - * @param {Object} fields - Field attributes for the new object. - * @returns {Operation} - */ function upsert(sObject, externalId, fields) { return function (state) { diff --git a/package.json b/package.json index b97c0b6..4578d2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "language-salesforce", - "version": "0.5.1", + "version": "0.6.0", "description": "Salesforce Language Pack for OpenFn", "main": "lib/index.js", "scripts": { @@ -20,7 +20,7 @@ "dependencies": { "JSONPath": "^0.10.0", "jsforce": "1.5.1", - "language-common": "github:openfn/language-common#v0.0.5", + "language-common": "github:openfn/language-common#v0.3.0", "lodash-fp": "^0.10.2", "mustache": "^2.2.0", "yargs": "^3.30.0" diff --git a/src/Adaptor.js b/src/Adaptor.js index 4867c51..84d42de 100644 --- a/src/Adaptor.js +++ b/src/Adaptor.js @@ -354,5 +354,5 @@ export { lookup, relationship } from './sourceHelpers'; export { each, join, fields, field, source, sourceValue, map, combine, merge, dataPath, dataValue, referencePath, lastReferenceValue, - index, beta, toArray, arrayToString, alterState + index, beta, toArray, arrayToString, alterState, humanProper } from 'language-common'; diff --git a/src/FakeAdaptor.js b/src/FakeAdaptor.js index 25d64c6..0984b91 100644 --- a/src/FakeAdaptor.js +++ b/src/FakeAdaptor.js @@ -127,5 +127,5 @@ export { lookup, relationship } from './sourceHelpers'; export { each, join, fields, field, source, sourceValue, map, combine, merge, dataPath, dataValue, referencePath, lastReferenceValue, - index, beta, toArray, arrayToString, alterState + index, beta, toArray, arrayToString, alterState, humanProper } from 'language-common';