Fix creating multiple projects in a single process #2573
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rosen-vladimirov
requested review from
Plamen5kov,
Mitko-Kerezov and
TsvetanMilanov
lib/services/project-data-service.ts
Outdated
| const props = propertyName.split("."); | ||
| const propertyToDelete = props.splice(props.length - 1, 1)[0]; | ||
|
|
||
| _.each(props, (prop, index: number) => { |
There was a problem hiding this comment.
Do we need the index here?
lib/services/project-data-service.ts
Outdated
| this.projectData = projectFileContent ? JSON.parse(projectFileContent) : Object.create(null); | ||
| return { | ||
| projectData, | ||
| indent, |
There was a problem hiding this comment.
I think we don't need to detect the indent. We will detect it here https://github.com/telerik/mobile-cli-lib/blob/master/file-system.ts#L199
| let currentData: any = skipNativeScriptKey ? data : (data[CLIENT_NAME_KEY_IN_PROJECT_FILE] = {}); | ||
|
|
||
| _.each(props, (prop, index: number) => { | ||
|
|
There was a problem hiding this comment.
Can you remove this blank line?
| let currentData: any = data[CLIENT_NAME_KEY_IN_PROJECT_FILE] = {}; | ||
|
|
||
| _.each(props, (prop) => { | ||
|
|
There was a problem hiding this comment.
Can you remove this blank line?
|
|
||
| }); | ||
|
|
||
| it("does not override already existing property of project data", () => { |
There was a problem hiding this comment.
Maybe the description should be removes only the selected property?
rosen-vladimirov
force-pushed
the
vladimirov/fix-create-multiple-projs
branch
from
f23a425 to
03db4c3
Compare
Mitko-Kerezov
approved these changes
Feb 28, 2017
lib/services/project-data-service.ts
Outdated
| this.loadProjectFile(); | ||
| return this.projectData ? this.projectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE][propertyName] : null; | ||
| public setNSValue(projectDir: string, key: string, value: any): void { | ||
| return this.setValue(projectDir, this.getNativeScriptPropertyName(key), value); |
There was a problem hiding this comment.
Gratuitous return statement here
rosen-vladimirov
force-pushed
the
vladimirov/fix-create-multiple-projs
branch
from
03db4c3 to
18ef6ce
Compare
In case the CLI is `required` as a library (used in a long living process, not as a command-line interface), trying to create a project multiple times leads ot error. The problem is in the `projectDataService` which caches the path to first created project file (package.json) and uses it for all consecutive operations. In other cases, when CLI had to use the projectDataService, it always had to call `projectDataService.initialize` method. Instead of relying on a magically called initialize method, modify the service methods to work with any project dir and execute the required operation for it. This will fix the creation of multiple projects as all operations will work with currently passed project directory. Also remove the code that creates a `package.json` file during `loadProjectFile` in projectDataService - it's required only when a project is created, so move it there. Rename the methods getValue, setValue and removeProperty to getNSValue, setNSValue, removeNSProperty as they are intended to modify the nativescript key in package.json. We can later expose getValue, setValue and removeProperty (they are currently private). Remove the indentation detection as `$fs.writeJson` file already does this.
rosen-vladimirov
force-pushed
the
vladimirov/fix-create-multiple-projs
branch
from
18ef6ce to
7f403b4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In case the CLI is
requiredas a library (used in a long living process, not as a command-line interface), trying to create a project multiple times leads to errors.The problem is in the
projectDataServicewhich caches the path to first created project file (package.json) and uses it for all consecutive operations.In other cases, when CLI had to use the projectDataService, it always had to call
projectDataService.initializemethod.Instead of relying on a magically called initialize method, modify the service methods to work with any project dir and execute the required operation for it.
This will fix the creation of multiple projects as all operations will work with currently passed project directory.
Also remove the code that creates a
package.jsonfile duringloadProjectFilein projectDataService - it's required only when a project is created, so move it there.Rename the methods getValue, setValue and removeProperty to getNSValue, setNSValue, removeNSProperty as they are intended to modify the nativescript key in package.json.
We can later expose getValue, setValue and removeProperty (they are currently private).