2017-04-29 01:30:23 +00:00
|
|
|
// originally based off of https://github.com/gulpjs/vinyl
|
2016-05-11 06:38:11 +00:00
|
|
|
import invariant from 'invariant';
|
2017-04-29 01:30:23 +00:00
|
|
|
import { Observable } from 'rx';
|
2018-09-03 10:23:18 +00:00
|
|
|
import castToObservable from '../../server/utils/cast-to-observable';
|
2017-04-29 01:30:23 +00:00
|
|
|
|
|
|
|
|
|
|
|
// createFileStream(
|
2018-01-17 11:08:55 +00:00
|
|
|
// files: [...PolyVinyl]
|
2017-04-29 01:30:23 +00:00
|
|
|
// ) => Observable[...Observable[...PolyVinyl]]
|
2018-01-08 00:00:34 +00:00
|
|
|
export function createFileStream(files = []) {
|
2017-04-29 01:30:23 +00:00
|
|
|
return Observable.of(
|
2018-01-08 00:00:34 +00:00
|
|
|
Observable.from(files)
|
2017-04-29 01:30:23 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Observable::pipe(
|
|
|
|
// project(
|
|
|
|
// file: PolyVinyl
|
|
|
|
// ) => PolyVinyl|Observable[PolyVinyl]|Promise[PolyVinyl]
|
|
|
|
// ) => Observable[...Observable[...PolyVinyl]]
|
|
|
|
export function pipe(project) {
|
|
|
|
const source = this;
|
|
|
|
return source.map(
|
|
|
|
files => files.flatMap(file => castToObservable(project(file)))
|
|
|
|
);
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
// interface PolyVinyl {
|
2017-04-29 01:30:23 +00:00
|
|
|
// source: String,
|
2016-05-11 06:38:11 +00:00
|
|
|
// contents: String,
|
2016-05-20 19:42:26 +00:00
|
|
|
// name: String,
|
|
|
|
// ext: String,
|
2016-05-11 06:38:11 +00:00
|
|
|
// path: String,
|
2016-05-20 19:42:26 +00:00
|
|
|
// key: String,
|
|
|
|
// head: String,
|
|
|
|
// tail: String,
|
2016-05-11 06:38:11 +00:00
|
|
|
// history: [...String],
|
2017-04-29 01:30:23 +00:00
|
|
|
// error: Null|Object|Error
|
2016-05-11 06:38:11 +00:00
|
|
|
// }
|
2017-04-29 01:30:23 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
// createPoly({
|
2016-05-20 19:42:26 +00:00
|
|
|
// name: String,
|
|
|
|
// ext: String,
|
2016-05-11 06:38:11 +00:00
|
|
|
// contents: String,
|
|
|
|
// history?: [...String],
|
|
|
|
// }) => PolyVinyl, throws
|
2016-05-20 19:42:26 +00:00
|
|
|
export function createPoly({
|
|
|
|
name,
|
|
|
|
ext,
|
|
|
|
contents,
|
|
|
|
history,
|
|
|
|
...rest
|
|
|
|
} = {}) {
|
|
|
|
invariant(
|
|
|
|
typeof name === 'string',
|
|
|
|
'name must be a string but got %s',
|
|
|
|
name
|
|
|
|
);
|
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
invariant(
|
2016-05-20 19:42:26 +00:00
|
|
|
typeof ext === 'string',
|
|
|
|
'ext must be a string, but was %s',
|
|
|
|
ext
|
2016-05-11 06:38:11 +00:00
|
|
|
);
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
invariant(
|
|
|
|
typeof contents === 'string',
|
|
|
|
'contents must be a string but got %s',
|
|
|
|
contents
|
|
|
|
);
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
return {
|
2016-05-14 23:46:20 +00:00
|
|
|
...rest,
|
2016-05-20 19:42:26 +00:00
|
|
|
history: Array.isArray(history) ? history : [ name + ext ],
|
|
|
|
name,
|
|
|
|
ext,
|
|
|
|
path: name + '.' + ext,
|
|
|
|
key: name + ext,
|
|
|
|
contents,
|
2018-01-08 00:00:34 +00:00
|
|
|
error: null
|
2016-05-11 06:38:11 +00:00
|
|
|
};
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
// isPoly(poly: Any) => Boolean
|
|
|
|
export function isPoly(poly) {
|
|
|
|
return poly &&
|
|
|
|
typeof poly.contents === 'string' &&
|
2016-05-20 19:42:26 +00:00
|
|
|
typeof poly.name === 'string' &&
|
|
|
|
typeof poly.ext === 'string' &&
|
2016-05-11 06:38:11 +00:00
|
|
|
Array.isArray(poly.history);
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
// checkPoly(poly: Any) => Void, throws
|
|
|
|
export function checkPoly(poly) {
|
|
|
|
invariant(
|
|
|
|
isPoly(poly),
|
|
|
|
'function should receive a PolyVinyl, but got %s',
|
|
|
|
poly
|
|
|
|
);
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2016-05-11 06:38:11 +00:00
|
|
|
// isEmpty(poly: PolyVinyl) => Boolean, throws
|
|
|
|
export function isEmpty(poly) {
|
|
|
|
checkPoly(poly);
|
|
|
|
return !!poly.contents;
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2017-04-29 01:30:23 +00:00
|
|
|
// setContent(contents: String, poly: PolyVinyl) => PolyVinyl
|
|
|
|
// setContent will loose source if set
|
|
|
|
export function setContent(contents, poly) {
|
2016-05-11 06:38:11 +00:00
|
|
|
checkPoly(poly);
|
|
|
|
return {
|
|
|
|
...poly,
|
2017-04-29 01:30:23 +00:00
|
|
|
contents,
|
|
|
|
source: null
|
2016-05-11 06:38:11 +00:00
|
|
|
};
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2018-01-03 23:38:52 +00:00
|
|
|
// setExt(ext: String, poly: PolyVinyl) => PolyVinyl
|
2016-05-20 19:42:26 +00:00
|
|
|
export function setExt(ext, poly) {
|
2016-05-11 06:38:11 +00:00
|
|
|
checkPoly(poly);
|
2016-05-20 19:42:26 +00:00
|
|
|
const newPoly = {
|
|
|
|
...poly,
|
|
|
|
ext,
|
|
|
|
path: poly.name + '.' + ext,
|
|
|
|
key: poly.name + ext
|
|
|
|
};
|
|
|
|
newPoly.history = [ ...poly.history, newPoly.path ];
|
|
|
|
return newPoly;
|
2016-05-11 06:38:11 +00:00
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2018-01-03 23:38:52 +00:00
|
|
|
// setName(name: String, poly: PolyVinyl) => PolyVinyl
|
2016-05-20 19:42:26 +00:00
|
|
|
export function setName(name, poly) {
|
|
|
|
checkPoly(poly);
|
2016-05-11 06:38:11 +00:00
|
|
|
const newPoly = {
|
|
|
|
...poly,
|
2016-05-20 19:42:26 +00:00
|
|
|
name,
|
|
|
|
path: name + '.' + poly.ext,
|
|
|
|
key: name + poly.ext
|
2016-05-11 06:38:11 +00:00
|
|
|
};
|
|
|
|
newPoly.history = [ ...poly.history, newPoly.path ];
|
|
|
|
return newPoly;
|
|
|
|
}
|
2016-05-09 20:42:39 +00:00
|
|
|
|
2018-01-03 23:38:52 +00:00
|
|
|
// setError(error: Object, poly: PolyVinyl) => PolyVinyl
|
2016-05-11 06:38:11 +00:00
|
|
|
export function setError(error, poly) {
|
|
|
|
invariant(
|
|
|
|
typeof error === 'object',
|
|
|
|
'error must be an object or null, but got %',
|
|
|
|
error
|
|
|
|
);
|
|
|
|
checkPoly(poly);
|
|
|
|
return {
|
|
|
|
...poly,
|
|
|
|
error
|
|
|
|
};
|
2016-05-09 20:42:39 +00:00
|
|
|
}
|
2017-04-29 01:30:23 +00:00
|
|
|
|
|
|
|
// clearHeadTail(poly: PolyVinyl) => PolyVinyl
|
|
|
|
export function clearHeadTail(poly) {
|
|
|
|
checkPoly(poly);
|
|
|
|
return {
|
|
|
|
...poly,
|
|
|
|
head: '',
|
|
|
|
tail: ''
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-01-03 23:38:52 +00:00
|
|
|
// appendToTail (tail: String, poly: PolyVinyl) => PolyVinyl
|
2018-02-19 20:41:01 +00:00
|
|
|
export function appendToTail(tail, poly) {
|
|
|
|
checkPoly(poly);
|
|
|
|
return {
|
|
|
|
...poly,
|
|
|
|
tail: poly.tail.concat(tail)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-01-03 23:38:52 +00:00
|
|
|
// compileHeadTail(padding: String, poly: PolyVinyl) => PolyVinyl
|
2017-04-29 01:30:23 +00:00
|
|
|
export function compileHeadTail(padding = '', poly) {
|
2017-12-13 23:24:36 +00:00
|
|
|
return clearHeadTail(transformContents(
|
|
|
|
() => [ poly.head, poly.contents, poly.tail ].join(padding),
|
2017-04-29 01:30:23 +00:00
|
|
|
poly
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
// transformContents(
|
|
|
|
// wrap: (contents: String) => String,
|
|
|
|
// poly: PolyVinyl
|
|
|
|
// ) => PolyVinyl
|
|
|
|
// transformContents will keep a copy of the original
|
|
|
|
// code in the `source` property. If the original polyvinyl
|
|
|
|
// already contains a source, this version will continue as
|
|
|
|
// the source property
|
|
|
|
export function transformContents(wrap, poly) {
|
|
|
|
const newPoly = setContent(
|
|
|
|
wrap(poly.contents),
|
|
|
|
poly
|
|
|
|
);
|
|
|
|
// if no source exist, set the original contents as source
|
2017-12-13 23:24:36 +00:00
|
|
|
newPoly.source = poly.source || poly.contents;
|
2017-04-29 01:30:23 +00:00
|
|
|
return newPoly;
|
|
|
|
}
|
|
|
|
|
|
|
|
// transformHeadTailAndContents(
|
|
|
|
// wrap: (source: String) => String,
|
|
|
|
// poly: PolyVinyl
|
|
|
|
// ) => PolyVinyl
|
|
|
|
export function transformHeadTailAndContents(wrap, poly) {
|
|
|
|
return {
|
Feat: react redux migration (#16200)
* feat: crudely enables test to run solution code against React challenge (and passes!)
* feat: Updates comment
* feat: Adds React 2 and 3, validates challenges in app
* feat: Adds React 4, validates tests
* feat: Adds Peter's migrated challenge seed files for all challenges
* feat: Adds redux, react-redux imports, adds tests for React 7,
* feat: Adds tests for React 08
* fix(challenges): wrap reserved words in <code> and add tests
* feat: complete first two tests for React 9
* feat: modifies tests in React 09
* feat: Adds working tests for React 37, including async setState tests
* feat: Escape hatch to avoid async tests in automated test suite
* feat: Updates React 15 with working tests
* feat: build passes, yay
* feat: Provisions original code string in challenges and adds tests for React Redux 01
* fix(tests): add self-closing tags challenge, other small fixes
* fix(challenge): add react_10, some other stuff
* fix(challenges): update react 22, add react 23
* fix(challenges): react 5 and react 8
* feat: removes dependencies that will break in browser, will replace later
* feat: fix build
* feat: add redux 1
* fix(challenge): add react 24 tests
* feat: partial implemented Redux 2
* feat: migrate redux 3
* feat: Adds React-Redux 04 with working tests under npm test
* feat: Updates automated test runner, just provide all the dependencies. Adds Redux-Thunk.
* feat: Adds working tests for React Redux 07
* feat: redux challenge 4
* feat: migrate redux 5
* feat: redux 6
* feat: migrate Redux test 7
* fix(challenge): add react 25 tests
* feat: Adds tests for React 48, npm test does not pass...
* feat: Migrate Redux test 8
* fix(challenges): skip 26, add react 27 tests
* fix(challenges): add react 28 tests, replace function w/ => throughout, fix linter warnings
* feat: fixes (patches) hard to understand problem with automated test suite
* feat: updates async tests patch
* feat: adds converted tests for React 47
* feat: adds converted tests for React 46
* feat: Partially adds tests for React 43
* docs: adds TO-DO tests for React 43
* feat: migrates tests for React 42
* feat: migrates tests for React 41
* feat: migrates tests for React 39
* feat: Migrates tests for React 38, automated test script fails again!
* feat: migrates tests for React 32
* feat: QAs more React Redux challenge in FCC UI
* feat: Updates tests for React 7
* feat: Migrates React-Redux 3 tests and hardcodes deep-freeze dependency
* feat: migrates React Redux 05 tests
* feat: migrates React Redux 06 tests
* feat: Migrates React Redux 10
* feat: Migrates tests for React 16
* feat: Migrates React 17 tests
* feat: Migrates React 18 tests
* feat: Migrates React 19 tests
* feat: Migrates React 19 tests
* feat: fixing usage of code, replace with editor.getOriginalCode
* feat: Migrates React 21 tests
* feat: Finishes migration of React 09
* fix(challenges): add react 45 tests 💀
* feat: Adds React 11 tests
* feat: Migrates React 50 tests
* feat: Re-enables original code in FCC editor, QAs challenges blocked by original code
* feat: hacks head tail code in editor test environment
* feat: updates React 20 head code
* feat: QAs React Redux 07 in UI
* fix(challenges): add React 29 tests
* fix(challenges): add React 30 tests
* feat: updates async tests
* feat: Migrates React 12, gets ReactDOM challenges working and QAs them
* feat: Migrates React 13 tests
* feat: Migrates tests for React 14 and updates challenge description formatting
* feat: Refactors 2nd test for Redux 02
* feat: Migrates React 33
* feat: Removes React 26 and 43
* feat: Adds React 34 from Kevin
* fix(challenges): add React 31 & 35 tests (thanks Kevin)
* feat: Migrate Redux challenge 10 - pass both UI QA and terminal test
* fix(challenge): add react 40 tests
* feat: Migrates React Redux 02 tests
* feat: Migrates React Redux 08 and fixes async syntax in React challenge
* fix(challenge): add react 49 tests with caveat
* feat: fixes React 49 tests and adds first tests for React Redux 09
* feat: Migrate Redux 11 - pass both terminal test and UI test
* feat: Migrate Redux 12 - passing both UI test and terminal test
* feat: Migrate Redux 13 - passing both terminal and UI tests
* feat: Adding in code tags for previous redux challenges - terminal and UI tests pass
* feat: Migrates React Redux 09 and React 44 (thanks Kevin)
* feat: fix code tag issues - passed UI and terminal tests
* feat: Migrates Redux 14 tests
* feat: Migrates Redux 14
* feat: Migrates Redux 15
* feat: Migrates Redux 17
* feat: Final migration and QA of Redux, except for Redux 9
* feat: migrates React 36 and QAs
* feat: Rewrites Redux 09 and migrates
* feat: refactors pull request and cleans up code
* style(challenges): QA React challenges
* style(challenges): QA react challenges
* fix(challenges): fix react 41 and 45 tests
* style(challenges): QA redux challenges
* style(challenges): QA react and redux challenges
* fix(seed/react): Move head/tail to files
* fix(seed/redux): Move head/tail to file level
* chore(packages): Move jsdom to dev deps
* fix(seed/react/redux): Async funcs
make async func defined
* fix(seed): %s/editor.getUserCode/getUserInput/gc
* fix(Challenges/build): Make sure head/tail is bundled and transformed
* feat(Challenges.react): Add tail to render component
* chore(seed): Disable modern challenge testing for now
We will put these on beta while we update the auto testing framework
2017-12-18 21:04:03 +00:00
|
|
|
...transformContents(
|
|
|
|
wrap,
|
2017-04-29 01:30:23 +00:00
|
|
|
poly
|
|
|
|
),
|
|
|
|
head: wrap(poly.head),
|
|
|
|
tail: wrap(poly.tail)
|
|
|
|
};
|
|
|
|
}
|
2017-12-13 23:24:36 +00:00
|
|
|
|
|
|
|
export function testContents(predicate, poly) {
|
|
|
|
return !!predicate(poly.contents);
|
|
|
|
}
|
Feat: react redux migration (#16200)
* feat: crudely enables test to run solution code against React challenge (and passes!)
* feat: Updates comment
* feat: Adds React 2 and 3, validates challenges in app
* feat: Adds React 4, validates tests
* feat: Adds Peter's migrated challenge seed files for all challenges
* feat: Adds redux, react-redux imports, adds tests for React 7,
* feat: Adds tests for React 08
* fix(challenges): wrap reserved words in <code> and add tests
* feat: complete first two tests for React 9
* feat: modifies tests in React 09
* feat: Adds working tests for React 37, including async setState tests
* feat: Escape hatch to avoid async tests in automated test suite
* feat: Updates React 15 with working tests
* feat: build passes, yay
* feat: Provisions original code string in challenges and adds tests for React Redux 01
* fix(tests): add self-closing tags challenge, other small fixes
* fix(challenge): add react_10, some other stuff
* fix(challenges): update react 22, add react 23
* fix(challenges): react 5 and react 8
* feat: removes dependencies that will break in browser, will replace later
* feat: fix build
* feat: add redux 1
* fix(challenge): add react 24 tests
* feat: partial implemented Redux 2
* feat: migrate redux 3
* feat: Adds React-Redux 04 with working tests under npm test
* feat: Updates automated test runner, just provide all the dependencies. Adds Redux-Thunk.
* feat: Adds working tests for React Redux 07
* feat: redux challenge 4
* feat: migrate redux 5
* feat: redux 6
* feat: migrate Redux test 7
* fix(challenge): add react 25 tests
* feat: Adds tests for React 48, npm test does not pass...
* feat: Migrate Redux test 8
* fix(challenges): skip 26, add react 27 tests
* fix(challenges): add react 28 tests, replace function w/ => throughout, fix linter warnings
* feat: fixes (patches) hard to understand problem with automated test suite
* feat: updates async tests patch
* feat: adds converted tests for React 47
* feat: adds converted tests for React 46
* feat: Partially adds tests for React 43
* docs: adds TO-DO tests for React 43
* feat: migrates tests for React 42
* feat: migrates tests for React 41
* feat: migrates tests for React 39
* feat: Migrates tests for React 38, automated test script fails again!
* feat: migrates tests for React 32
* feat: QAs more React Redux challenge in FCC UI
* feat: Updates tests for React 7
* feat: Migrates React-Redux 3 tests and hardcodes deep-freeze dependency
* feat: migrates React Redux 05 tests
* feat: migrates React Redux 06 tests
* feat: Migrates React Redux 10
* feat: Migrates tests for React 16
* feat: Migrates React 17 tests
* feat: Migrates React 18 tests
* feat: Migrates React 19 tests
* feat: Migrates React 19 tests
* feat: fixing usage of code, replace with editor.getOriginalCode
* feat: Migrates React 21 tests
* feat: Finishes migration of React 09
* fix(challenges): add react 45 tests 💀
* feat: Adds React 11 tests
* feat: Migrates React 50 tests
* feat: Re-enables original code in FCC editor, QAs challenges blocked by original code
* feat: hacks head tail code in editor test environment
* feat: updates React 20 head code
* feat: QAs React Redux 07 in UI
* fix(challenges): add React 29 tests
* fix(challenges): add React 30 tests
* feat: updates async tests
* feat: Migrates React 12, gets ReactDOM challenges working and QAs them
* feat: Migrates React 13 tests
* feat: Migrates tests for React 14 and updates challenge description formatting
* feat: Refactors 2nd test for Redux 02
* feat: Migrates React 33
* feat: Removes React 26 and 43
* feat: Adds React 34 from Kevin
* fix(challenges): add React 31 & 35 tests (thanks Kevin)
* feat: Migrate Redux challenge 10 - pass both UI QA and terminal test
* fix(challenge): add react 40 tests
* feat: Migrates React Redux 02 tests
* feat: Migrates React Redux 08 and fixes async syntax in React challenge
* fix(challenge): add react 49 tests with caveat
* feat: fixes React 49 tests and adds first tests for React Redux 09
* feat: Migrate Redux 11 - pass both terminal test and UI test
* feat: Migrate Redux 12 - passing both UI test and terminal test
* feat: Migrate Redux 13 - passing both terminal and UI tests
* feat: Adding in code tags for previous redux challenges - terminal and UI tests pass
* feat: Migrates React Redux 09 and React 44 (thanks Kevin)
* feat: fix code tag issues - passed UI and terminal tests
* feat: Migrates Redux 14 tests
* feat: Migrates Redux 14
* feat: Migrates Redux 15
* feat: Migrates Redux 17
* feat: Final migration and QA of Redux, except for Redux 9
* feat: migrates React 36 and QAs
* feat: Rewrites Redux 09 and migrates
* feat: refactors pull request and cleans up code
* style(challenges): QA React challenges
* style(challenges): QA react challenges
* fix(challenges): fix react 41 and 45 tests
* style(challenges): QA redux challenges
* style(challenges): QA react and redux challenges
* fix(seed/react): Move head/tail to files
* fix(seed/redux): Move head/tail to file level
* chore(packages): Move jsdom to dev deps
* fix(seed/react/redux): Async funcs
make async func defined
* fix(seed): %s/editor.getUserCode/getUserInput/gc
* fix(Challenges/build): Make sure head/tail is bundled and transformed
* feat(Challenges.react): Add tail to render component
* chore(seed): Disable modern challenge testing for now
We will put these on beta while we update the auto testing framework
2017-12-18 21:04:03 +00:00
|
|
|
|
|
|
|
export function updateFileFromSpec(spec, poly) {
|
|
|
|
return setContent(poly.contents, createPoly(spec));
|
|
|
|
}
|