conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import { StructureParams, StructureMeshParams, StructureTextParams, StructureDirectVolumeParams, StructureLinesParams, StructureCylindersParams } from './params';
=======
import { StructureParams, StructureMeshParams, StructureTextParams, StructureDirectVolumeParams, StructureLinesParams, StructureTextureMeshParams } from './params';
>>>>>>>
import { StructureParams, StructureMeshParams, StructureTextParams, StructureDirectVolumeParams, StructureLinesParams, StructureCylindersParams, StructureTextureMeshParams } from './params';
<<<<<<<
=======
import { Lines } from '../../mol-geo/geometry/lines/lines';
import { TextureMesh } from '../../mol-geo/geometry/texture-mesh/texture-mesh';
>>>>>>>
import { TextureMesh } from '../../mol-geo/geometry/texture-mesh/texture-mesh'; |
<<<<<<<
import { paramDefaultValues } from 'mol-util/parameter';
=======
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
import { ParamDefinition as PD } from 'mol-util/param-definition';
<<<<<<<
=======
sizeTheme: PD.Select<SizeThemeName>('Size Theme', '', 'physical', SizeThemeOptions),
sizeValue: PD.Numeric('Size Value', '', 0.2, 0, 10, 0.1),
sizeFactor: PD.Numeric('Size Factor', '', 1, 0, 10, 0.1),
>>>>>>> |
<<<<<<<
import { SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
=======
import { SizeTheme, SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
import { SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
import { ParamDefinition as PD } from 'mol-util/param-definition';
<<<<<<<
radialSegments: NumberParam('Radial Segments', '', 16, 3, 56, 1),
=======
sizeTheme: PD.Select<SizeThemeName>('Size Theme', '', 'physical', SizeThemeOptions),
sizeValue: PD.Numeric('Size Value', '', 1, 0, 10, 0.1),
sizeFactor: PD.Numeric('Size Factor', '', 0.3, 0, 10, 0.1),
radialSegments: PD.Numeric('Radial Segments', '', 16, 3, 56, 1),
>>>>>>>
radialSegments: PD.Numeric('Radial Segments', '', 16, 3, 56, 1), |
<<<<<<<
import { paramDefaultValues, NumberParam } from 'mol-util/parameter';
=======
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
import { ParamDefinition as PD } from 'mol-util/param-definition';
<<<<<<<
radialSegments: NumberParam('Radial Segments', '', 16, 3, 56, 1),
=======
sizeTheme: PD.Select<SizeThemeName>('Size Theme', '', 'uniform', SizeThemeOptions),
sizeValue: PD.Numeric('Size Value', '', 1, 0, 10, 0.1),
radialSegments: PD.Numeric('Radial Segments', '', 16, 3, 56, 1),
>>>>>>>
radialSegments: PD.Numeric('Radial Segments', '', 16, 3, 56, 1), |
<<<<<<<
import "./hello.js"
import "./less/styles.less";
declare const FuseBox: any;
let results = FuseBox.import("./batch/*")
console.log(results, " ");
=======
import "./styles.css"
console.log(1);
>>>>>>>
import "./styles.css"
import "./less/styles.less";
console.log(1); |
<<<<<<<
public entryPackageName: string;
public entryPackageFile: string;
=======
private chokidarOptions: any;
>>>>>>>
public entryPackageName: string;
public entryPackageFile: string;
private chokidarOptions: any;
<<<<<<<
=======
if (opts) {
this.chokidarOptions = opts.chokidar;
}
>>>>>>>
if (opts) {
this.chokidarOptions = opts.chokidar;
} |
<<<<<<<
import { LESSPlugin } from './plugins/LESSPlugin';
=======
export { PostCSS } from "./plugins/PostCSSPlugin";
>>>>>>>
import { LESSPlugin } from './plugins/LESSPlugin';
export { PostCSS } from "./plugins/PostCSSPlugin";
<<<<<<<
export { LESSPlugin } from "./plugins/LESSPlugin";
=======
>>>>>>>
export { LESSPlugin } from "./plugins/LESSPlugin"; |
<<<<<<<
import { UserOutput } from "./UserOutput";
import { BundleProducer } from "./BundleProducer";
import { Bundle } from "./Bundle";
=======
const isWin = /^win/.test(process.platform);
>>>>>>>
import { UserOutput } from "./UserOutput";
import { BundleProducer } from "./BundleProducer";
import { Bundle } from "./Bundle";
const isWin = /^win/.test(process.platform); |
<<<<<<<
TMDBPagination,
=======
Entertainment,
TMDBRequestParams,
>>>>>>>
TMDBPagination,
Entertainment,
TMDBRequestParams,
<<<<<<<
private async request<TData>(
path: string,
params: {
query?: string;
language?: string;
region?: string;
year?: number;
with_genres?: string;
'vote_count.gte'?: number;
'vote_average.gte'?: number;
with_original_language?: string;
page?: number;
} = {}
) {
=======
private async request<TData>(path: string, params: TMDBRequestParams = {}) {
>>>>>>>
private async request<TData>(path: string, params: TMDBRequestParams = {}) {
<<<<<<<
const { year, originLanguage, score, genres, page } = args;
const TMDBResults = await this.request<TMDBPagination<TMDBMovie[]>>(
'/discover/movie',
{
page,
year: Number(year),
'vote_average.gte': score && score / 10,
with_original_language: originLanguage,
'vote_count.gte': 50,
with_genres: genres?.join(','),
}
);
=======
const {
primaryReleaseYear,
entertainment,
originLanguage,
score,
genres,
} = args;
const normalizedArgs = {
'vote_count.gte': 50,
with_genres: genres?.join(','),
with_original_language: originLanguage,
'vote_average.gte': score && score / 10,
...(Entertainment.Movie && {
primary_release_year: Number(primaryReleaseYear),
}),
...(Entertainment.TvShow && {
first_air_date_year: Number(primaryReleaseYear),
}),
};
>>>>>>>
const {
primaryReleaseYear,
entertainment,
originLanguage,
score,
genres,
page,
} = args;
const normalizedArgs = {
'vote_count.gte': 50,
with_genres: genres?.join(','),
with_original_language: originLanguage,
'vote_average.gte': score && score / 10,
...(Entertainment.Movie && {
primary_release_year: Number(primaryReleaseYear),
}),
...(Entertainment.TvShow && {
first_air_date_year: Number(primaryReleaseYear),
}),
page,
}; |
<<<<<<<
@Field({ nullable: true }) public page?: number;
=======
@Field((_type) => Entertainment) public entertainment: Entertainment =
Entertainment.Movie;
>>>>>>>
@Field({ nullable: true }) public page?: number;
@Field((_type) => Entertainment) public entertainment: Entertainment =
Entertainment.Movie; |
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconClearAllFiltersCommand || 'fa fa-filter text-danger',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('CLEAR_ALL_FILTERS') : this._locales && this._locales.TEXT_CLEAR_ALL_FILTERS,
disabled: false,
command: 'clear-filter',
positionOrder: 50
}
);
=======
const commandName = 'clear-filter';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconClearAllFiltersCommand || 'fa fa-filter text-danger',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('CLEAR_ALL_FILTERS') : Constants.TEXT_CLEAR_ALL_FILTERS,
disabled: false,
command: commandName,
positionOrder: 50
}
);
}
>>>>>>>
const commandName = 'clear-filter';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconClearAllFiltersCommand || 'fa fa-filter text-danger',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('CLEAR_ALL_FILTERS') : this._locales && this._locales.TEXT_CLEAR_ALL_FILTERS,
disabled: false,
command: commandName,
positionOrder: 50
}
);
}
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconToggleFilterCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_FILTER_ROW') : this._locales && this._locales.TEXT_TOGGLE_FILTER_ROW,
disabled: false,
command: 'toggle-filter',
positionOrder: 52
}
);
=======
const commandName = 'toggle-filter';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconToggleFilterCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_FILTER_ROW') : Constants.TEXT_TOGGLE_FILTER_ROW,
disabled: false,
command: commandName,
positionOrder: 52
}
);
}
>>>>>>>
const commandName = 'toggle-filter';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconToggleFilterCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_FILTER_ROW') : this._locales && this._locales.TEXT_TOGGLE_FILTER_ROW,
disabled: false,
command: commandName,
positionOrder: 52
}
);
}
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconRefreshDatasetCommand || 'fa fa-refresh',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('REFRESH_DATASET') : this._locales && this._locales.TEXT_REFRESH_DATASET,
disabled: false,
command: 'refresh-dataset',
positionOrder: 54
}
);
=======
const commandName = 'refresh-dataset';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconRefreshDatasetCommand || 'fa fa-refresh',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('REFRESH_DATASET') : Constants.TEXT_REFRESH_DATASET,
disabled: false,
command: commandName,
positionOrder: 54
}
);
}
>>>>>>>
const commandName = 'refresh-dataset';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconRefreshDatasetCommand || 'fa fa-refresh',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('REFRESH_DATASET') : this._locales && this._locales.TEXT_REFRESH_DATASET,
disabled: false,
command: commandName,
positionOrder: 54
}
);
}
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconTogglePreHeaderCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_PRE_HEADER_ROW') : this._locales && this._locales.TEXT_TOGGLE_PRE_HEADER_ROW,
disabled: false,
command: 'toggle-preheader',
positionOrder: 52
}
);
=======
const commandName = 'toggle-preheader';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconTogglePreHeaderCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_PRE_HEADER_ROW') : Constants.TEXT_TOGGLE_PRE_HEADER_ROW,
disabled: false,
command: commandName,
positionOrder: 52
}
);
}
>>>>>>>
const commandName = 'toggle-preheader';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconTogglePreHeaderCommand || 'fa fa-random',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('TOGGLE_PRE_HEADER_ROW') : this._locales && this._locales.TEXT_TOGGLE_PRE_HEADER_ROW,
disabled: false,
command: commandName,
positionOrder: 52
}
);
}
<<<<<<<
iconCssClass: this.sharedService.gridOptions.gridMenu.iconClearAllSortingCommand || 'fa fa-unsorted text-danger',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('CLEAR_ALL_SORTING') : this._locales && this._locales.TEXT_CLEAR_ALL_SORTING,
=======
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportCsvCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_CSV') : Constants.TEXT_EXPORT_IN_CSV_FORMAT,
>>>>>>>
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportCsvCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_CSV') : this._locales && this._locales.TEXT_EXPORT_IN_CSV_FORMAT,
<<<<<<<
// show grid menu: export to file
if (this.sharedService.gridOptions && this.sharedService.gridOptions.enableExport && this.sharedService.gridOptions.gridMenu && !this.sharedService.gridOptions.gridMenu.hideExportCsvCommand) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportCsvCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_CSV') : this._locales && this._locales.TEXT_EXPORT_IN_CSV_FORMAT,
disabled: false,
command: 'export-csv',
positionOrder: 53
}
);
}
=======
>>>>>>>
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportTextDelimitedCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_TAB_DELIMITED') : this._locales && this._locales.TEXT_EXPORT_IN_TEXT_FORMAT,
disabled: false,
command: 'export-text-delimited',
positionOrder: 54
}
);
=======
const commandName = 'export-text-delimited';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportTextDelimitedCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_TAB_DELIMITED') : Constants.TEXT_EXPORT_IN_TEXT_FORMAT,
disabled: false,
command: commandName,
positionOrder: 54
}
);
}
>>>>>>>
const commandName = 'export-text-delimited';
if (!originalCustomItems.find((item) => item.command === commandName)) {
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconExportTextDelimitedCommand || 'fa fa-download',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('EXPORT_TO_TAB_DELIMITED') : this._locales && this._locales.TEXT_EXPORT_IN_TEXT_FORMAT,
disabled: false,
command: commandName,
positionOrder: 54
}
);
} |
<<<<<<<
import DescriptorProto = google.protobuf.DescriptorProto;
import FieldDescriptorProto = google.protobuf.FieldDescriptorProto;
import FileDescriptorProto = google.protobuf.FileDescriptorProto;
import EnumDescriptorProto = google.protobuf.EnumDescriptorProto;
import ServiceDescriptorProto = google.protobuf.ServiceDescriptorProto;
import IFileDescriptorProto = google.protobuf.IFileDescriptorProto;
=======
>>>>>>>
<<<<<<<
if (options.outputSchema) {
const outputFileDesc: IFileDescriptorProto = {
...fileDesc,
sourceCodeInfo: null,
};
if (fileDesc.sourceCodeInfo) {
outputFileDesc.sourceCodeInfo = {
location: fileDesc.sourceCodeInfo.location.filter((loc) => loc['leadingComments'] || loc['trailingComments']),
} as any;
}
const descriptor = PropertySpec.create(
'fileDescriptor',
TypeNames.anyType('IFileDescriptorProto@protobufjs/ext/descriptor')
).addModifiers(Modifier.CONST);
file = file.addProperty(descriptor.initializerBlock(CodeBlock.of('%L', JSON.stringify(outputFileDesc))));
if (fileDesc.dependency) {
const dependencies = fileDesc.dependency.map((dep) => {
const module = dep.replace('.proto', '');
return TypeNames.importedType('fileDescriptor@' + module);
});
const resolvedDependencies = PropertySpec.create(
'resolvedDependencies',
TypeNames.arrayType('IFileDescriptorProto@protobufjs/ext/descriptor')
).addModifiers(Modifier.CONST);
file = file.addProperty(resolvedDependencies.initializerBlock(CodeBlock.of('[%L]', dependencies.join(', '))));
}
}
const initialOutput = file.toString();
// This `.includes(...)` is a pretty fuzzy way of detecting whether we use these utility
// methods (to prevent outputting them if its not necessary). In theory, we should be able
// to lean on the code generation library more to do this sort of "output only if used",
// similar to what it does for auto-imports.
if (
initialOutput.includes('longToNumber') ||
initialOutput.includes('numberToLong') ||
initialOutput.includes('longToString')
) {
file = addLongUtilityMethod(file, options);
}
if (initialOutput.includes('bytesFromBase64') || initialOutput.includes('base64FromBytes')) {
file = addBytesUtilityMethods(file);
}
if (initialOutput.includes('DeepPartial')) {
file = addDeepPartialType(file, options);
}
=======
return [moduleName, joinCode(chunks, { on: '\n\n' })];
}
>>>>>>>
return [moduleName, joinCode(chunks, { on: '\n\n' })];
} |
<<<<<<<
"Reveal in Finder": ["reveal_folder", undefined, ""],
"Force Reimport": ["force_reimport", undefined, ""],
=======
[showInFs]: ["reveal_folder", undefined, ""],
>>>>>>>
"Force Reimport": ["force_reimport", undefined, ""],
[showInFs]: ["reveal_folder", undefined, ""], |
<<<<<<<
public static infoWindowTemplete: Property;
=======
public static paddingProperty: Property;
>>>>>>>
public static paddingProperty: Property;
public static infoWindowTemplete: Property; |
<<<<<<<
export class MenuInfo {
name?: string;
siteId?: string;
isPublish?: boolean;
isLocked?: boolean;
}
=======
export class UpdatePermissionInput {
code?: string;
description?: string;
}
>>>>>>>
export class MenuInfo {
name?: string;
siteId?: string;
isPublish?: boolean;
isLocked?: boolean;
}
export class UpdatePermissionInput {
code?: string;
description?: string;
}
<<<<<<<
abstract createMenu(menuInfo: MenuInfo): boolean | Promise<boolean>;
abstract updateMenu(id: string, menuInfo: MenuInfo): boolean | Promise<boolean>;
abstract addDish(id: string, dishInput: DishInput): boolean | Promise<boolean>;
abstract updateDish(menuId: string, dishId?: string, dishInput: DishInput): boolean | Promise<boolean>;
=======
abstract createPermission(input: CreatePermissionInput): Permission | Promise<Permission>;
abstract updatePermission(_id: string, input: UpdatePermissionInput): boolean | Promise<boolean>;
abstract deletePermission(_id: string): boolean | Promise<boolean>;
abstract deletePermissions(): boolean | Promise<boolean>;
>>>>>>>
abstract createMenu(menuInfo: MenuInfo): boolean | Promise<boolean>;
abstract updateMenu(id: string, menuInfo: MenuInfo): boolean | Promise<boolean>;
abstract addDish(id: string, dishInput: DishInput): boolean | Promise<boolean>;
abstract updateDish(menuId: string, dishId: string, dishInput: DishInput): boolean | Promise<boolean>;
abstract createPermission(input: CreatePermissionInput): Permission | Promise<Permission>;
abstract updatePermission(_id: string, input: UpdatePermissionInput): boolean | Promise<boolean>;
abstract deletePermission(_id: string): boolean | Promise<boolean>;
abstract deletePermissions(): boolean | Promise<boolean>; |
<<<<<<<
pubSub.publish('menuPublished', { menuPublished: menu.isPublished })
return (await this.menuRepository.save(menu)) ? true : false
=======
pubSub.publish('menuSubscription', { menuSubscription: menu })
return await this.menuRepository.save(menu) ? true : false
>>>>>>>
pubSub.publish('menuSubscription', { menuSubscription: menu })
return (await this.menuRepository.save(menu)) ? true : false
<<<<<<<
pubSub.publish('menuLocked', { menuLocked: menu.isLocked })
return (await this.menuRepository.save(menu)) ? true : false
=======
pubSub.publish('menuSubscription', { menuSubscription: menu })
return await this.menuRepository.save(menu) ? true : false
>>>>>>>
pubSub.publish('menuSubscription', { menuSubscription: menu })
return (await this.menuRepository.save(menu)) ? true : false
<<<<<<<
return (await this.menuRepository.save(
new Menu({ name: menu.name, siteId: menu.siteId })
))
? true
: false
=======
// pubSub.publish('menuSubscription', { menuSubscription: null })
return await this.menuRepository.save(new Menu({ name: menu.name, siteId: menu.siteId })) ? true : false
>>>>>>>
// pubSub.publish('menuSubscription', { menuSubscription: null })
return (await this.menuRepository.save(
new Menu({ name: menu.name, siteId: menu.siteId })
))
? true
: false |
<<<<<<<
private calculateFolderSize(folder: IFolder): Promise<IFolder> {
return new Promise((resolve, reject) => {
fileService
.getFolderSize(folder.path)
.then((size: any) => {
folder.size = +size;
resolve(folder);
})
.catch(err => reject(err));
=======
private printFolderSize(folder: IFolder, position: Position) {
fileService.getFolderSize(folder.path).then((size: any) => {
this.printAt(size + ' mb', position);
folder.size = +size;
this.printStats();
>>>>>>>
private calculateFolderSize(folder: IFolder): Promise<IFolder> {
return new Promise((resolve, reject) => {
fileService
.getFolderSize(folder.path)
.then((size: any) => {
folder.size = +size;
resolve(folder);
})
.catch(err => reject(err));
<<<<<<<
this.printStats();
this.printFoldersSection();
=======
>>>>>>>
this.printStats();
this.printFoldersSection();
<<<<<<<
=======
this.printStats();
this.printAt(colors.green('[DELETED] ') + folder.path, {
x: 3,
y: this.cursorPosY,
});
>>>>>>> |
<<<<<<<
export const getTitle = createSelector(getReportsState, fromReports.getTitle);
export const getReportSearchTerm = createSelector(getReportsState, fromReports.getReportSearchTerm);
export const getFieldSearchTerm = createSelector(getReportsState, fromReports.getFieldSearchTerm);
export const getRelationsSearchTerm = createSelector(getReportsState, fromReports.getRelationsSearchTerm);
export const getLeftNavIsOpen = createSelector(getReportsState, fromReports.getLeftNavIsOpen);
export const getRightNavIsOpen = createSelector(getReportsState, fromReports.getRightNavIsOpen);
export const getSortTerm = createSelector(getReportsState, fromReports.getSortTerm);
export const getSortOrder = createSelector(getReportsState, fromReports.getSortOrder);
=======
export const getReportSearchTerm = createSelector(
getReportsState,
fromReports.getReportSearchTerm
);
export const getFieldSearchTerm = createSelector(
getReportsState,
fromReports.getFieldSearchTerm
);
export const getRelationsSearchTerm = createSelector(
getReportsState,
fromReports.getRelationsSearchTerm
);
export const getLeftNavIsOpen = createSelector(
getReportsState,
fromReports.getLeftNavIsOpen
);
export const getRightNavIsOpen = createSelector(
getReportsState,
fromReports.getRightNavIsOpen
);
>>>>>>>
export const getTitle = createSelector(getReportsState, fromReports.getTitle);
export const getReportSearchTerm = createSelector(
getReportsState,
fromReports.getReportSearchTerm
);
export const getFieldSearchTerm = createSelector(
getReportsState,
fromReports.getFieldSearchTerm
);
export const getRelationsSearchTerm = createSelector(
getReportsState,
fromReports.getRelationsSearchTerm
);
export const getLeftNavIsOpen = createSelector(
getReportsState,
fromReports.getLeftNavIsOpen
);
export const getRightNavIsOpen = createSelector(
getReportsState,
fromReports.getRightNavIsOpen
); |
<<<<<<<
title$ = this.store.select(getTitle);
sortReportsBy$ = Observable.combineLatest(
this.store.select(getSortTerm),
this.store.select(getReports),
this.store.select(getSortOrder),
sortReports
);
=======
>>>>>>>
title$ = this.store.select(getTitle); |
<<<<<<<
[Symbol.iterator](): Iterator<[K, V]>;
=======
// Sequence algorithms
/**
* Returns a new Iterable.Keyed with values passed through a
* `mapper` function.
*
* Iterable.Keyed({a: 1, b: 2}).map(x => 10 * x)
* // Iterable.Keyed {a: 10, b: 20}
*
*/
map<M>(
mapper: (value: V, key: K, iter: /*this*/Iterable.Keyed<K, V>) => M,
context?: any
): Iterable.Keyed<K, M>;
>>>>>>>
// Sequence algorithms
/**
* Returns a new Iterable.Keyed with values passed through a
* `mapper` function.
*
* Iterable.Keyed({a: 1, b: 2}).map(x => 10 * x)
* // Iterable.Keyed {a: 10, b: 20}
*
*/
map<M>(
mapper: (value: V, key: K, iter: /*this*/Iterable.Keyed<K, V>) => M,
context?: any
): Iterable.Keyed<K, M>;
[Symbol.iterator](): Iterator<[K, V]>;
<<<<<<<
[Symbol.iterator](): Iterator<T>;
=======
// Sequence algorithms
/**
* Returns a new Iterable.Indexed with values passed through a
* `mapper` function.
*
* Iterable.Indexed([1,2]).map(x => 10 * x)
* // Iterable.Indexed [1,2]
*
*/
map<M>(
mapper: (value: T, key: number, iter: /*this*/Iterable.Indexed<T>) => M,
context?: any
): Iterable.Indexed<T>;
>>>>>>>
// Sequence algorithms
/**
* Returns a new Iterable.Indexed with values passed through a
* `mapper` function.
*
* Iterable.Indexed([1,2]).map(x => 10 * x)
* // Iterable.Indexed [1,2]
*
*/
map<M>(
mapper: (value: T, key: number, iter: /*this*/Iterable.Indexed<T>) => M,
context?: any
): Iterable.Indexed<M>;
[Symbol.iterator](): Iterator<T>;
<<<<<<<
[Symbol.iterator](): Iterator<T>;
=======
// Sequence algorithms
/**
* Returns a new Iterable.Set with values passed through a
* `mapper` function.
*
* Iterable.Set([1,2]).map(x => 10 * x)
* // Iterable.Set [1,2]
*
*/
map<M>(
mapper: (value: T, key: T, iter: /*this*/Iterable.Set<T>) => M,
context?: any
): Iterable.Set<T>;
>>>>>>>
// Sequence algorithms
/**
* Returns a new Iterable.Set with values passed through a
* `mapper` function.
*
* Iterable.Set([1,2]).map(x => 10 * x)
* // Iterable.Set [1,2]
*
*/
map<M>(
mapper: (value: T, key: T, iter: /*this*/Iterable.Set<T>) => M,
context?: any
): Iterable.Set<M>;
[Symbol.iterator](): Iterator<T>; |
<<<<<<<
export declare const setdata: unique symbol;
export declare const datakey: unique symbol;
export declare const isLock: unique symbol;
=======
export declare const setdata: symbol;
export declare const isLock: symbol;
>>>>>>>
export declare const setdata: symbol;
export declare const datakey: symbol;
export declare const isLock: symbol; |
<<<<<<<
=======
public synchronizeScenes(): Promise<IScene[]> {
return this.getScenes()
.then(res => this.state.addScenes(res.scenes));
}
public ready(isReady: boolean = true): Promise<any> {
return this.execute('ready', { isReady }, false);
}
>>>>>>>
public synchronizeScenes(): Promise<IScene[]> {
return this.getScenes()
.then(res => this.state.addScenes(res.scenes));
} |
<<<<<<<
import { skip } from 'rxjs/operators';
import { getValue, isFunction, setValue } from '../internal/utils';
=======
import { skip, filter } from 'rxjs/operators';
import { getValue, setValue } from '../internal/utils';
>>>>>>>
import { skip, filter } from 'rxjs/operators';
import { getValue, setValue, isFunction } from '../internal/utils';
<<<<<<<
=======
if (hasInclude) {
includeStores = include.reduce((acc, path) => {
const storeName = path.split('.')[0];
acc[storeName] = path;
return acc;
}, {});
}
const storageState = deserialize(storage.getItem(key) || '{}');
>>>>>>>
if (hasInclude) {
includeStores = include.reduce((acc, path) => {
const storeName = path.split('.')[0];
acc[storeName] = path;
return acc;
}, {});
}
const storageState = deserialize(storage.getItem(key) || '{}'); |
<<<<<<<
const statusCode = mockResponse.status || 200;
const jsonCallbackName = this.getJsonCallbackName(request.url);
let headers, chunk;
=======
if (mockResponse !== undefined) {
const statusCode = mockResponse.status || 200;
const jsonCallbackName = this.getJsonCallbackName(request.url);
let headers: { [key: string]: string };
let chunk: Buffer | string;
>>>>>>>
const statusCode = mockResponse.status || 200;
const jsonCallbackName = this.getJsonCallbackName(request.url);
let headers: { [key: string]: string };
let chunk: Buffer | string; |
<<<<<<<
uid?: string = '';
type?: 'private'|'public' = 'public';
title?: string = '';
description?: string = '';
access?: AccessModel = new AccessModel();
repositories?: string[] = [];
createdOn?: Date;
updatedOn: Date;
constructor(uid: string = '') {
this.uid = uid;
}
=======
uid?: string = '';
type?: 'private' | 'public' = 'public';
title?: string = '';
description?: string = '';
access?: AccessModel = new AccessModel();
repositories?: string[] = [];
createdOn?: firestore.Timestamp;
updatedOn: firestore.Timestamp;
>>>>>>>
uid?: string = '';
type?: 'private' | 'public' = 'public';
title?: string = '';
description?: string = '';
access?: AccessModel = new AccessModel();
repositories?: string[] = [];
createdOn?: firestore.Timestamp;
updatedOn: firestore.Timestamp;
constructor(uid: string = '') {
this.uid = uid;
} |
<<<<<<<
issues?: number;
license?: {
name: string;
};
=======
license?: string;
>>>>>>>
license?: {
name: string;
}; |
<<<<<<<
TacoPackageLoader.lazyRequire<typeof Cordova>("cordova", "cordova@" + cordovaVersion, buildInfo.logLevel).done(function (pkg: typeof Cordova): void {
cordova = pkg;
cordova.on("results", Logger.log);
cordova.on("log", Logger.log);
cordova.on("warn", console.warn);
cordova.on("error", console.error);
cordova.on("verbose", Logger.log);
cordova.on("before_prepare", beforePrepare);
cordova.on("after_compile", afterCompile);
var builder: IOSBuilder = new IOSBuilder(currentBuild);
builder.build(function (resultBuildInfo: BuildInfo): void {
=======
TacoPackageLoader.lazyRequire<Cordova.ICordova>("cordova", "cordova@" + cordovaVersion, buildInfo.logLevel).done(function (pkg: Cordova.ICordova): void {
var iosBuilder = new IOSBuilder(buildInfo, pkg);
iosBuilder.build().done(function (resultBuildInfo: BuildInfo): void {
>>>>>>>
TacoPackageLoader.lazyRequire<Cordova.ICordova>("cordova", "cordova@" + cordovaVersion, buildInfo.logLevel).done(function (pkg: Cordova.ICordova): void {
var iosBuilder = new IOSBuilder(buildInfo, pkg);
iosBuilder.build().done(function (resultBuildInfo: BuildInfo): void {
<<<<<<<
class IOSBuilder {
private buildInfo: BuildInfo = null;
constructor(buildInfoArg: BuildInfo) {
this.buildInfo = buildInfoArg;
=======
class IOSBuilder extends Builder {
public static running: boolean = false;
private cfg: CordovaConfig;
constructor(currentBuild: BuildInfo, cordova: Cordova.ICordova) {
super(currentBuild, cordova);
this.cfg = CordovaConfig.getCordovaConfig(currentBuild.appDir);
}
protected beforePrepare(): Q.Promise<any> {
return Q({});
}
protected afterPrepare(): Q.Promise<any> {
return this.applyPreferencesToBuildConfig(this.cfg);
}
protected beforeCompile(): Q.Promise<any> {
return this.updateAppPlistBuildNumber();
}
protected afterCompile(): Q.Promise<any> {
return this.renameApp();
}
protected package(): Q.Promise<any> {
var deferred = Q.defer();
var self = this;
// need quotes around ipa paths for xcrun exec to work if spaces in path
var appDirName = this.cfg.id() + ".app";
var ipaFileName = this.currentBuild["appName"] + ".ipa";
var pathToCordovaApp = UtilHelper.quotesAroundIfNecessary(path.join("platforms", "ios", "build", "device", appDirName));
var fullPathToIpaFile = UtilHelper.quotesAroundIfNecessary(path.join(process.cwd(), "platforms", "ios", "build", "device", ipaFileName));
child_process.exec("xcrun -v -sdk iphoneos PackageApplication " + pathToCordovaApp + " -o " + fullPathToIpaFile, {},
function (error: Error, stdout: Buffer, stderr: Buffer): void {
console.info("xcrun.stdout: " + stdout);
console.info("xcrun.stderr: " + stderr);
if (error) {
deferred.reject(error);
} else {
var plistFileName = self.currentBuild["appName"] + ".plist";
var fullPathToPlistFile = path.join(process.cwd(), "platforms", "ios", "build", "device", plistFileName);
plist.createEnterprisePlist(self.cfg, fullPathToPlistFile);
deferred.resolve({});
}
});
return deferred.promise;
>>>>>>>
class IOSBuilder extends Builder {
public static running: boolean = false;
private cfg: CordovaConfig;
constructor(currentBuild: BuildInfo, cordova: Cordova.ICordova) {
super(currentBuild, cordova);
this.cfg = CordovaConfig.getCordovaConfig(currentBuild.appDir);
}
protected beforePrepare(): Q.Promise<any> {
return Q({});
}
protected afterPrepare(): Q.Promise<any> {
return this.applyPreferencesToBuildConfig(this.cfg);
}
protected beforeCompile(): Q.Promise<any> {
return this.updateAppPlistBuildNumber();
}
protected afterCompile(): Q.Promise<any> {
return this.renameApp();
}
protected package(): Q.Promise<any> {
var deferred = Q.defer();
var self = this;
// need quotes around ipa paths for xcrun exec to work if spaces in path
var appDirName = this.cfg.id() + ".app";
var ipaFileName = this.currentBuild["appName"] + ".ipa";
var pathToCordovaApp = UtilHelper.quotesAroundIfNecessary(path.join("platforms", "ios", "build", "device", appDirName));
var fullPathToIpaFile = UtilHelper.quotesAroundIfNecessary(path.join(process.cwd(), "platforms", "ios", "build", "device", ipaFileName));
child_process.exec("xcrun -v -sdk iphoneos PackageApplication " + pathToCordovaApp + " -o " + fullPathToIpaFile, {},
function (error: Error, stdout: Buffer, stderr: Buffer): void {
Logger.log("xcrun.stdout: " + stdout);
Logger.log("xcrun.stderr: " + stderr);
if (error) {
deferred.reject(error);
} else {
var plistFileName = self.currentBuild["appName"] + ".plist";
var fullPathToPlistFile = path.join(process.cwd(), "platforms", "ios", "build", "device", plistFileName);
plist.createEnterprisePlist(self.cfg, fullPathToPlistFile);
deferred.resolve({});
}
});
return deferred.promise;
<<<<<<<
return this.appendToBuildConfig("TARGETED_DEVICE_FAMILY = " + deviceToAdd);
=======
return self.appendToBuildConfig("TARGETED_DEVICE_FAMILY = " + deviceToAdd);
>>>>>>>
return self.appendToBuildConfig("TARGETED_DEVICE_FAMILY = " + deviceToAdd);
<<<<<<<
return this.appendToBuildConfig("IPHONEOS_DEPLOYMENT_TARGET = " + deploymentTarget);
=======
return self.appendToBuildConfig("IPHONEOS_DEPLOYMENT_TARGET = " + deploymentTarget);
>>>>>>>
return self.appendToBuildConfig("IPHONEOS_DEPLOYMENT_TARGET = " + deploymentTarget);
<<<<<<<
return this.appendToBuildConfig("");
=======
return self.appendToBuildConfig("");
>>>>>>>
return self.appendToBuildConfig("");
<<<<<<<
var isDeviceBuild = this.buildInfo.options === "--device";
var oldName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", this.buildInfo["appName"] + ".app");
var newName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", cfg.id() + ".app");
=======
var isDeviceBuild = this.currentBuild.options === "--device";
var oldName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", this.currentBuild["appName"] + ".app");
var newName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", this.cfg.id() + ".app");
>>>>>>>
var isDeviceBuild = this.currentBuild.options === "--device";
var oldName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", this.currentBuild["appName"] + ".app");
var newName = path.join("platforms", "ios", "build", isDeviceBuild ? "device" : "emulator", this.cfg.id() + ".app");
<<<<<<<
private package_ios(): Q.Promise<any> {
var deferred = Q.defer();
// need quotes around ipa paths for xcrun exec to work if spaces in path
var appDirName = cfg.id() + ".app";
var ipaFileName = this.buildInfo["appName"] + ".ipa";
var pathToCordovaApp = UtilHelper.quotesAroundIfNecessary(path.join("platforms", "ios", "build", "device", appDirName));
var fullPathToIpaFile = UtilHelper.quotesAroundIfNecessary(path.join(process.cwd(), "platforms", "ios", "build", "device", ipaFileName));
var self: IOSBuilder = this;
child_process.exec("xcrun -v -sdk iphoneos PackageApplication " + pathToCordovaApp + " -o " + fullPathToIpaFile, {},
function (error: Error, stdout: Buffer, stderr: Buffer): void {
Logger.log("xcrun.stdout: " + stdout);
Logger.log("xcrun.stderr: " + stderr);
if (error) {
deferred.reject(error);
} else {
var plistFileName = self.buildInfo["appName"] + ".plist";
var fullPathToPlistFile = path.join(process.cwd(), "platforms", "ios", "build", "device", plistFileName);
plist.createEnterprisePlist(cfg, fullPathToPlistFile);
deferred.resolve({});
}
});
return deferred.promise;
}
=======
>>>>>>> |
<<<<<<<
import LoggerHelper = tacoUtility.LoggerHelper;
=======
import level = logger.Level;
import tacoProjectHelper = projectHelper.TacoProjectHelper;
>>>>>>>
import LoggerHelper = tacoUtility.LoggerHelper;
import tacoProjectHelper = projectHelper.TacoProjectHelper; |
<<<<<<<
return gulpUtils.copyFiles(
[
"/**/package.json",
"/**/resources.json",
"/**/test/**",
"/**/commands.json",
"/**/TacoKitMetaData.json",
"/**/bin/**",
"/**/templates/**",
"/**/examples/**",
"/**/*.ps1",
"/**/dynamicDependencies.json",
"/**/platformDependencies.json"
],
buildConfig.src, buildConfig.buildPackages).then(function (): void {
/* replace %TACO_BUILD_PACKAGES% with the absolute path of buildConfig.buildPackages in the built output */
replace({
regex: /%TACO_BUILD_PACKAGES%/g,
replacement: JSON.stringify(path.resolve(buildConfig.buildPackages)).replace(/"/g, ""),
paths: [buildConfig.buildPackages],
includes: "*.json",
recursive: true,
silent: false
});
});
=======
var filesToCopy: string[] = [
"/**/package.json",
"/**/resources.json",
"/**/test/**",
"/**/commands.json",
"/**/TacoKitMetaData.json",
"/**/bin/**",
"/**/templates/**",
"/**/examples/**",
"/**/*.ps1",
];
return Q.all([
gulpUtils.copyFiles(filesToCopy, buildConfig.src, buildConfig.buildPackages),
gulpUtils.copyDynamicDependenciesJson("/**/dynamicDependencies.json", buildConfig.src, buildConfig.buildPackages)
]);
>>>>>>>
var filesToCopy: string[] = [
"/**/package.json",
"/**/resources.json",
"/**/test/**",
"/**/commands.json",
"/**/TacoKitMetaData.json",
"/**/bin/**",
"/**/templates/**",
"/**/examples/**",
"/**/*.ps1",
"/**/platformDependencies.json"
];
return Q.all([
gulpUtils.copyFiles(filesToCopy, buildConfig.src, buildConfig.buildPackages),
gulpUtils.copyDynamicDependenciesJson("/**/dynamicDependencies.json", buildConfig.src, buildConfig.buildPackages)
]); |
<<<<<<<
// templates.Kits = mockKitHelper;
done();
=======
templates.Kits = mockKitHelper;
// Delete existing run folder if necessary
rimraf(runFolder, function (err: Error): void {
if (err) {
done(err);
} else {
// Create the run folder for our tests
wrench.mkdirSyncRecursive(runFolder, 511); // 511 decimal is 0777 octal
// Prepare the test template (archive it)
wrench.mkdirSyncRecursive(testTemplateArchiveFolder, 511); // 511 decimal is 0777 octal
var archive: any = archiver("zip");
var outputStream: NodeJS.WritableStream = fs.createWriteStream(testTemplateArchive);
archive.on("error", function (err: Error): void {
done(err);
});
outputStream.on("close", function (): void {
done();
});
archive.pipe(outputStream);
archive.directory(testTemplateSrc, testTemplateId).finalize();
}
});
>>>>>>>
// templates.Kits = mockKitHelper;
// Delete existing run folder if necessary
rimraf(runFolder, function (err: Error): void {
if (err) {
done(err);
} else {
// Create the run folder for our tests
wrench.mkdirSyncRecursive(runFolder, 511); // 511 decimal is 0777 octal
// Prepare the test template (archive it)
wrench.mkdirSyncRecursive(testTemplateArchiveFolder, 511); // 511 decimal is 0777 octal
var archive: any = archiver("zip");
var outputStream: NodeJS.WritableStream = fs.createWriteStream(testTemplateArchive);
archive.on("error", function (err: Error): void {
done(err);
});
outputStream.on("close", function (): void {
done();
});
archive.pipe(outputStream);
archive.directory(testTemplateSrc, testTemplateId).finalize();
}
}); |
<<<<<<<
CommandInstallCordovaTooOld,
CommandNotBothDeviceEmulate,
CommandNotBothLocalRemote,
CommandRemotePlatformNotKnown,
=======
>>>>>>>
CommandInstallCordovaTooOld, |
<<<<<<<
private static cleanPlatformsIfNecessary(platforms: PlatformHelper.IPlatformWithLocation[], commandData: commands.ICommandData): Q.Promise<any> {
if (commandData.options["clean"]) {
return CleanHelper.cleanPlatforms(platforms, commandData);
}
return Q({});
}
private local(commandData: commands.ICommandData): Q.Promise<tacoUtility.ICommandTelemetryProperties> {
return PlatformHelper.determinePlatform(commandData).then((platforms: PlatformHelper.IPlatformWithLocation[]) => {
return Run.cleanPlatformsIfNecessary(platforms, commandData);
}).then(() => {
return CordovaWrapper.run(commandData);
}).then(() => Run.generateTelemetryProperties({}, commandData));
=======
private runLocal(localPlatforms?: string[]): Q.Promise<tacoUtility.ICommandTelemetryProperties> {
var self = this;
if (this.data.options["livereload"] || this.data.options["devicesync"]) {
// intentionally delay-requiring it since liveReload fetches whole bunch of stuff
var liveReload = require("./liveReload");
return liveReload.hookLiveReload(!!this.data.options["livereload"], !!this.data.options["devicesync"], localPlatforms)
.then(() => CordovaWrapper.run(self.data, localPlatforms));
}
return CordovaWrapper.run(this.data, localPlatforms);
}
private local(): Q.Promise<tacoUtility.ICommandTelemetryProperties> {
var commandData: commands.ICommandData = this.data;
return this.runLocal()
.then(() => Run.generateTelemetryProperties({}, commandData));
>>>>>>>
private runLocal(localPlatforms?: string[]): Q.Promise<tacoUtility.ICommandTelemetryProperties> {
var self = this;
if (this.data.options["livereload"] || this.data.options["devicesync"]) {
// intentionally delay-requiring it since liveReload fetches whole bunch of stuff
var liveReload = require("./liveReload");
return liveReload.hookLiveReload(!!this.data.options["livereload"], !!this.data.options["devicesync"], localPlatforms)
.then(() => CordovaWrapper.run(self.data, localPlatforms));
}
return CordovaWrapper.run(this.data, localPlatforms);
}
private local(): Q.Promise<tacoUtility.ICommandTelemetryProperties> {
var commandData: commands.ICommandData = this.data;
return this.runLocal()
.then(() => Run.generateTelemetryProperties({}, commandData));
}
private static cleanPlatformsIfNecessary(platforms: PlatformHelper.IPlatformWithLocation[], commandData: commands.ICommandData): Q.Promise<any> {
if (commandData.options["clean"]) {
return CleanHelper.cleanPlatforms(platforms, commandData);
}
return Q({});
<<<<<<<
return Run.cleanPlatformsIfNecessary(platforms, commandData).then(() => {
return PlatformHelper.operateOnPlatforms(platforms,
(localPlatforms: string[]): Q.Promise<any> => CordovaWrapper.run(commandData, localPlatforms),
(remotePlatform: string): Q.Promise<any> => Run.runRemotePlatform(remotePlatform, commandData, telemetryProperties)
=======
return PlatformHelper.operateOnPlatforms(platforms,
(localPlatforms: string[]): Q.Promise<any> => self.runLocal(localPlatforms),
(remotePlatform: string): Q.Promise<any> => Run.runRemotePlatform(remotePlatform, commandData, telemetryProperties)
>>>>>>>
return Run.cleanPlatformsIfNecessary(platforms, commandData).then(() => {
return PlatformHelper.operateOnPlatforms(platforms,
(localPlatforms: string[]): Q.Promise<any> => self.runLocal(commandData, localPlatforms),
(remotePlatform: string): Q.Promise<any> => Run.runRemotePlatform(remotePlatform, commandData, telemetryProperties) |
<<<<<<<
import stylecopUtil = require ("../tools/stylecop-util");
import gulpUtils = require("../tools/GulpUtils");
=======
import stylecopUtil = require ("../tools/stylecopUtil");
import tsUtil = require ("./taco-cli/compile/typeScriptServices");
import gulpUtils = require ("../tools/GulpUtils");
>>>>>>>
import stylecopUtil = require ("../tools/stylecopUtil");
import gulpUtils = require ("../tools/GulpUtils"); |
<<<<<<<
public static createKitProjectWithTemplate(kitId: string, templateId: string, cordovaCli: string, path: string, appId?: string, appName?: string, cordovaConfig?: string, options?: { [option: string]: any }): Q.Promise<string> {
=======
public static createKitProjectWithTemplate(kitId: string, templateId: string, path: string, appId?: string, appName?: string, cordovaConfig?: string, options?: { [option: string]: any }, optionsToExclude?: string[]): Q.Promise<string> {
if (!TemplateManager.Kits) {
TemplateManager.Kits = KitHelper.KitHelper;
}
>>>>>>>
public static createKitProjectWithTemplate(kitId: string, templateId: string, cordovaCli: string, path: string, appId?: string, appName?: string, cordovaConfig?: string, options?: { [option: string]: any }, optionsToExclude?: string[]): Q.Promise<string> {
<<<<<<<
return cordovaWrapper.create(cordovaCli, path, appId, appName, cordovaConfig, utils.cleanseOptions(options, createCommand.TacoOnlyOptions));
=======
return cordovaWrapper.create(path, appId, appName, cordovaConfig, utils.cleanseOptions(options, optionsToExclude));
>>>>>>>
return cordovaWrapper.create(cordovaCli, path, appId, appName, cordovaConfig, utils.cleanseOptions(options, optionsToExclude));
<<<<<<<
fs.createReadStream(templateInfo[templateId].url).pipe(zlib.createGunzip()).pipe(tar.Extract({ path: cachedTemplateKitPath }));
}
=======
var stream: tar.ExtractStream = fs.createReadStream(templateInfo.archiveUrl).pipe(zlib.createGunzip()).pipe(tar.Extract({ path: cachedTemplateKitPath }));
var deferred = Q.defer();
>>>>>>>
var stream: tar.ExtractStream = fs.createReadStream(templateInfo.url).pipe(zlib.createGunzip()).pipe(tar.Extract({ path: cachedTemplateKitPath }));
var deferred = Q.defer(); |
<<<<<<<
private static cordovaCommandName: string = os.platform() === "win32" ? "cordova.cmd" : "cordova";
private static CORDOVA_CHECK_REQS_MIN_VERSION: string = "5.1.1";
private static CORDOVA_NPM_PACKAGE_NAME: string = "cordova";
=======
private static CordovaCommandName: string = os.platform() === "win32" ? "cordova.cmd" : "cordova";
private static CordovaRequirementsMinVersion: string = "5.1.1";
>>>>>>>
private static cordovaCommandName: string = os.platform() === "win32" ? "cordova.cmd" : "cordova";
private static CORDOVA_CHECK_REQS_MIN_VERSION: string = "5.1.1";
<<<<<<<
return projectHelper.getProjectInfo().then(function (projectInfo: projectHelper.IProjectInfo): Q.Promise<any> {
if (projectInfo.cordovaCliVersion) {
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + projectInfo.cordovaCliVersion, tacoUtility.InstallLogLevel.taco)
.then(function (cordova: typeof Cordova): Q.Promise<any> {
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
return cordova.raw.build(cordovaHelper.toCordovaBuildArguments(commandData, platform));
});
});
} else {
return CordovaWrapper.cli(["build"].concat(cordovaHelper.toCordovaCliArguments(commandData, platform)));
}
});
=======
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.build(CordovaHelper.toCordovaBuildArguments(commandData, platform));
}, () => ["build"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform)));
>>>>>>>
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.build(CordovaHelper.toCordovaBuildArguments(commandData, platform));
}, () => ["build"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform)));
<<<<<<<
public static invokePlatformPluginCommand(command: string, cordovaCliVersion: string, platformCmdParameters: Cordova.ICordovaCommandParameters, data: commands.ICommandData = null, isSilent: boolean = false): Q.Promise<any> {
if (cordovaCliVersion) {
var cordova: typeof Cordova;
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + cordovaCliVersion)
.then(function (cdv: typeof Cordova): Q.Promise<any> {
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
cordova = cdv;
// Hook the event listeners. This will help us get the logs that cordova emits during platform/plugin operations
CordovaWrapper.changeCordovaEventSubscription(cordova, !isSilent /* Subscribe only if we are not in silent mode */);
if (command === "platform") {
return cordova.raw.platform(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else if (command === "plugin") {
return cordova.raw.plugin(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else {
return Q.reject(errorHelper.get(TacoErrorCodes.CordovaCmdNotFound));
}
});
}).then(function (): Q.Promise<any> {
// Unhook the event listeners after we are done
// (Cordova has an upper limit for the number of active event listeners - we do not want to exceed the max)
CordovaWrapper.changeCordovaEventSubscription(cordova, false /* Unscubscribe */);
return Q({});
});
} else {
=======
public static invokePlatformPluginCommand(command: string, platformCmdParameters: Cordova.ICordovaCommandParameters, data: commands.ICommandData = null, isSilent: boolean = false): Q.Promise<any> {
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
if (command === "platform") {
return cordova.raw.platform(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else if (command === "plugin") {
return cordova.raw.plugin(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else {
return Q.reject(errorHelper.get(TacoErrorCodes.CordovaCmdNotFound));
}
}, () => {
>>>>>>>
public static invokePlatformPluginCommand(command: string, platformCmdParameters: Cordova.ICordovaCommandParameters, data: commands.ICommandData = null, isSilent: boolean = false): Q.Promise<any> {
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
if (command === "platform") {
return cordova.raw.platform(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else if (command === "plugin") {
return cordova.raw.plugin(platformCmdParameters.subCommand, platformCmdParameters.targets, platformCmdParameters.downloadOptions);
} else {
return Q.reject(errorHelper.get(TacoErrorCodes.CordovaCmdNotFound));
}
}, () => {
<<<<<<<
return projectHelper.getProjectInfo().then(function (projectInfo: projectHelper.IProjectInfo): Q.Promise<any> {
if (projectInfo.cordovaCliVersion) {
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + projectInfo.cordovaCliVersion, tacoUtility.InstallLogLevel.taco)
.then(function (cordova: typeof Cordova): Q.Promise<any> {
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
return cordova.raw.emulate(cordovaHelper.toCordovaRunArguments(commandData, platform));
});
});
} else {
return CordovaWrapper.cli(["emulate"].concat(cordovaHelper.toCordovaCliArguments(commandData, platform)));
}
});
=======
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.emulate(CordovaHelper.toCordovaRunArguments(commandData, platform));
}, () => ["emulate"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform)));
>>>>>>>
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.emulate(CordovaHelper.toCordovaRunArguments(commandData, platform));
}, () => ["emulate"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform)));
<<<<<<<
// Execute the requirements command
if (projectInfo.cordovaCliVersion) {
// If we are in a taco project, use the raw api
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + projectInfo.cordovaCliVersion, tacoUtility.InstallLogLevel.silent)
.then(function (cordova: Cordova.ICordova510): Q.Promise<any> {
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
return cordova.raw.requirements(platforms);
});
});
}
// Fallback to the global Cordova via the command line
var args: string[] = ["requirements"];
if (platforms) {
args = args.concat(platforms);
}
return CordovaWrapper.cli(args, true);
=======
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova510) => {
return cordova.raw.requirements(platforms);
}, () => {
return ["requirements"].concat(platforms || []);
}, { logLevel: tacoUtility.InstallLogLevel.silent, captureOutput: true });
>>>>>>>
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova510) => {
return cordova.raw.requirements(platforms);
}, () => {
return ["requirements"].concat(platforms || []);
}, { logLevel: tacoUtility.InstallLogLevel.silent, captureOutput: true });
<<<<<<<
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + cordovaCliVersion, tacoUtility.InstallLogLevel.taco)
.then(function (cordova: typeof Cordova): Q.Promise<any> {
cordovaHelper.prepareCordovaConfig(cordovaParameters);
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
return cordova.raw.create(cordovaParameters.projectPath, cordovaParameters.appId, cordovaParameters.appName, cordovaParameters.cordovaConfig);
});
});
=======
CordovaHelper.prepareCordovaConfig(cordovaParameters);
return CordovaHelper.wrapCordovaInvocation<any>(cordovaCliVersion, (cordova: Cordova.ICordova) => {
return cordova.raw.create(cordovaParameters.projectPath, cordovaParameters.appId, cordovaParameters.appName, cordovaParameters.cordovaConfig);
}, tacoUtility.InstallLogLevel.taco);
>>>>>>>
CordovaHelper.prepareCordovaConfig(cordovaParameters);
return CordovaHelper.wrapCordovaInvocation<any>(cordovaCliVersion, (cordova: Cordova.ICordova) => {
return cordova.raw.create(cordovaParameters.projectPath, cordovaParameters.appId, cordovaParameters.appName, cordovaParameters.cordovaConfig);
}, tacoUtility.InstallLogLevel.taco);
<<<<<<<
return projectHelper.getProjectInfo().then(function (projectInfo: projectHelper.IProjectInfo): Q.Promise<any> {
if (projectInfo.cordovaCliVersion) {
return packageLoader.lazyRequire(CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME, CordovaWrapper.CORDOVA_NPM_PACKAGE_NAME + "@" + projectInfo.cordovaCliVersion, tacoUtility.InstallLogLevel.taco)
.then(function (cordova: typeof Cordova): Q.Promise<any> {
return CordovaWrapper.catchUncaughtCordovaErrors<any>(function (): Q.Promise<any> {
return cordova.raw.run(cordovaHelper.toCordovaRunArguments(commandData, platform));
});
});
} else {
return CordovaWrapper.cli(["run"].concat(cordovaHelper.toCordovaCliArguments(commandData, platform)));
}
});
}
private static changeCordovaEventSubscription(cordova: typeof Cordova, subscribe: boolean): void {
if (subscribe) {
cordova.on("results", console.info);
cordova.on("warn", console.warn);
cordova.on("error", console.error);
} else {
cordova.off("results", console.info);
cordova.off("warn", console.warn);
cordova.off("error", console.error);
}
=======
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.run(CordovaHelper.toCordovaRunArguments(commandData, platform));
}, () => ["run"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform)));
>>>>>>>
return CordovaWrapper.cordovaApiOrProcess((cordova: Cordova.ICordova) => {
return cordova.raw.run(CordovaHelper.toCordovaRunArguments(commandData, platform));
}, () => ["run"].concat(CordovaHelper.toCordovaCliArguments(commandData, platform))); |
<<<<<<<
gulp.src(path.join(buildConfig.src, "/**/commands.json")).pipe(gulp.dest(buildConfig.bin));
gulp.src(path.join(buildConfig.src, "/**/bin/**")).pipe(gulp.dest(buildConfig.bin));
=======
gulp.src(path.join(buildConfig.src, "/**/test/**")).pipe(gulp.dest(buildConfig.bin));
>>>>>>>
gulp.src(path.join(buildConfig.src, "/**/test/**")).pipe(gulp.dest(buildConfig.bin));
gulp.src(path.join(buildConfig.src, "/**/commands.json")).pipe(gulp.dest(buildConfig.bin));
gulp.src(path.join(buildConfig.src, "/**/bin/**")).pipe(gulp.dest(buildConfig.bin)); |
<<<<<<<
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "InvalidBuildRequest"), errors: err.toString() });
=======
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "invalidBuildRequest"), errors: err });
>>>>>>>
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "invalidBuildRequest"), errors: err.toString() }); |
<<<<<<<
cordovaCli?: string;
templateDisplayName?: string;
isKitProject?: boolean;
kitId?: string;
=======
>>>>>>>
templateDisplayName?: string;
cordovaCli?: string;
isKitProject?: boolean;
kitId?: string;
<<<<<<<
.then(function (): Q.Promise<any> {
return self.createTacoJsonFile()
.then(function (): Q.Promise<any> {
self.finalize();
return Q.resolve({});
=======
.then(function (templateDisplayName: string): Q.Promise<any> {
self.finalize(templateDisplayName);
return Q.resolve(null);
>>>>>>>
.then(function (templateDisplayName: string): Q.Promise<any> {
return self.createTacoJsonFile()
.then(function (): Q.Promise<any> {
self.finalize();
return Q.resolve(null); |
<<<<<<<
platforms: Settings.IPlatformWithLocation[], settings: Settings.ISettings): void {
var baseName: string = "platforms." + modifier + ".";
var remoteBaseName: string = baseName + "remote";
=======
platforms: PlatformHelper.IPlatformWithLocation[], settings: Settings.ISettings): void {
var baseName = "platforms." + modifier + ".";
var remoteBaseName = baseName + "remote";
>>>>>>>
platforms: PlatformHelper.IPlatformWithLocation[], settings: Settings.ISettings): void {
var baseName: string = "platforms." + modifier + ".";
var remoteBaseName: string = baseName + "remote";
<<<<<<<
var remotePlatforms: string[] = this.extractPlatformsList(platforms, Settings.BuildLocationType.Remote);
=======
var remotePlatforms = this.extractPlatformsList(platforms, PlatformHelper.BuildLocationType.Remote);
>>>>>>>
var remotePlatforms: string[] = this.extractPlatformsList(platforms, PlatformHelper.BuildLocationType.Remote);
<<<<<<<
return Settings.loadSettingsOrReturnEmpty().then((settings: Settings.ISettings) => {
var properties: tacoUtility.ICommandTelemetryProperties = tacoUtility.TelemetryHelper.addPropertiesFromOptions(telemetryProperties, knownOptions, commandData.options, this.buildAndRunNonPiiOptions);
return Settings.determinePlatformsFromOptions(commandData).then((platforms: Settings.IPlatformWithLocation[]) => {
var requestedPlatforms: string[] = Settings.parseRequestedPlatforms(commandData);
var requestedUsedPlatforms: Settings.IPlatformWithLocation[] = platforms.filter((platform: Settings.IPlatformWithLocation): boolean => requestedPlatforms.indexOf(platform.platform) !== -1);
=======
return Settings.loadSettingsOrReturnEmpty().then(settings => {
var properties = tacoUtility.TelemetryHelper.addPropertiesFromOptions(telemetryProperties, knownOptions, commandData.options, this.buildAndRunNonPiiOptions);
return PlatformHelper.determinePlatformsFromOptions(commandData).then((platforms: PlatformHelper.IPlatformWithLocation[]) => {
var requestedPlatforms = PlatformHelper.parseRequestedPlatforms(commandData);
var requestedUsedPlatforms = platforms.filter((platform: PlatformHelper.IPlatformWithLocation): boolean => requestedPlatforms.indexOf(platform.platform) !== -1);
>>>>>>>
return Settings.loadSettingsOrReturnEmpty().then((settings: Settings.ISettings) => {
var properties: ICommandTelemetryProperties = tacoUtility.TelemetryHelper.addPropertiesFromOptions(telemetryProperties,
knownOptions, commandData.options, this.buildAndRunNonPiiOptions);
return PlatformHelper.determinePlatformsFromOptions(commandData).then((platforms: PlatformHelper.IPlatformWithLocation[]) => {
var requestedPlatforms: string[] = PlatformHelper.parseRequestedPlatforms(commandData);
var requestedUsedPlatforms: PlatformHelper.IPlatformWithLocation[] = platforms
.filter((platform: PlatformHelper.IPlatformWithLocation): boolean => requestedPlatforms.indexOf(platform.platform) !== -1);
<<<<<<<
private static extractPlatformsList(platforms: Settings.IPlatformWithLocation[], buildLocationType: Settings.BuildLocationType): string[] {
return platforms
.filter((platform: Settings.IPlatformWithLocation) => platform.location === buildLocationType)
.map((platform: Settings.IPlatformWithLocation) => platform.platform);
=======
private static extractPlatformsList(platforms: PlatformHelper.IPlatformWithLocation[], buildLocationType: PlatformHelper.BuildLocationType): string[] {
var filteredPlatforms = platforms.filter(platform => platform.location === buildLocationType);
return filteredPlatforms.map(platform => platform.platform);
>>>>>>>
private static extractPlatformsList(platforms: PlatformHelper.IPlatformWithLocation[], buildLocationType: PlatformHelper.BuildLocationType): string[] {
return platforms
.filter((platform: PlatformHelper.IPlatformWithLocation) => platform.location === buildLocationType)
.map((platform: PlatformHelper.IPlatformWithLocation) => platform.platform); |
<<<<<<<
ESN
} as Networks;
=======
ESN,
ARTIS_SIGMA1,
ARTIS_TAU1
};
>>>>>>>
ESN,
ARTIS_SIGMA1,
ARTIS_TAU1
} as Networks; |
<<<<<<<
/// <reference path="../typings/tacoHelpArgs.d.ts"/>
=======
/// <reference path="../typings/node.d.ts" />
/// <reference path="../typings/nopt.d.ts" />
/// <reference path="../typings/Q.d.ts" />
/// <reference path="../typings/rimraf.d.ts"/>
>>>>>>>
/// <reference path="../typings/node.d.ts" />
/// <reference path="../typings/nopt.d.ts" />
/// <reference path="../typings/Q.d.ts" />
/// <reference path="../typings/rimraf.d.ts"/>
/// <reference path="../typings/tacoHelpArgs.d.ts"/> |
<<<<<<<
function sendPendingData(): Q.Promise<string>;
=======
function getSessionId(): string;
function setSessionId(sessionId: string): void;
>>>>>>>
function sendPendingData(): Q.Promise<string>;
function getSessionId(): string;
function setSessionId(sessionId: string): void; |
<<<<<<<
export { ROUTE_PATHS } from './routePaths';
export { WALLET_INFO } from './walletInfo';
=======
export { ROUTE_PATHS } from './routePaths';
export { NETWORKS_CONFIG } from './networks';
export { ETHSCAN_NETWORKS } from './ethScan';
export { Fiats, AssetsData, ContractsData } from './cacheData';
export {
GAS_LIMIT_LOWER_BOUND,
GAS_LIMIT_UPPER_BOUND,
GAS_PRICE_GWEI_LOWER_BOUND,
GAS_PRICE_GWEI_UPPER_BOUND,
GAS_PRICE_DEFAULT
} from './gasPrice';
export { accounts as testAccounts } from './accounts';
export { assets as testAssets } from './assets';
export { addressBook as testAddressBook } from './addressBook';
export { settings as testSettings } from './settings';
>>>>>>>
export { ROUTE_PATHS } from './routePaths';
export { WALLET_INFO } from './walletInfo';
export { NETWORKS_CONFIG } from './networks';
export { ETHSCAN_NETWORKS } from './ethScan';
export { Fiats, AssetsData, ContractsData } from './cacheData';
export {
GAS_LIMIT_LOWER_BOUND,
GAS_LIMIT_UPPER_BOUND,
GAS_PRICE_GWEI_LOWER_BOUND,
GAS_PRICE_GWEI_UPPER_BOUND,
GAS_PRICE_DEFAULT
} from './gasPrice';
export { accounts as testAccounts } from './accounts';
export { assets as testAssets } from './assets';
export { addressBook as testAddressBook } from './addressBook';
export { settings as testSettings } from './settings'; |
<<<<<<<
import TacoProjectHelper = projectHelper.TacoProjectHelper;
import telemetry = tacoUtility.Telemetry;
=======
>>>>>>>
import telemetry = tacoUtility.Telemetry;
<<<<<<<
TacoProjectHelper.cdToProjectRoot();
telemetry.init(require("../package.json").version);
=======
projectHelper.cdToProjectRoot();
>>>>>>>
projectHelper.cdToProjectRoot();
telemetry.init(require("../package.json").version); |
<<<<<<<
export * from './BuyAndExchange';
export * from './CreateWallet';
export * from './Dashboard';
export * from './DevTools';
export * from './DownloadApp';
export * from './Drawer';
export { AccountScreen, UnlockScreen } from './Drawer';
export * from './Home';
export * from './AddAccount';
export * from './Layout';
=======
export * from './BuyAndExchange';
export * from './CreateWallet';
export * from './Dashboard';
export * from './DevTools';
export * from './DownloadApp';
export * from './Drawer';
export { AccountScreen, UnlockScreen } from './Drawer';
export * from './Home';
export * from './ImportWallet';
export * from './Layout';
export * from './constants';
>>>>>>>
export * from './BuyAndExchange';
export * from './CreateWallet';
export * from './Dashboard';
export * from './DevTools';
export * from './DownloadApp';
export * from './Drawer';
export { AccountScreen, UnlockScreen } from './Drawer';
export * from './Home';
export * from './AddAccount';
export * from './Layout';
export * from './constants'; |
<<<<<<<
var self = this;
=======
var self: TemplateManager = this;
var templateSrcPath: string = null;
>>>>>>>
var self: TemplateManager = this;
<<<<<<<
return TemplateManager.copyTemplateItemsToProject(cordovaParameters);
=======
/*
Cordova's --copy-from behavior: "cordova create [project path] --copy-from [template path]" supports 2 scenarios: 1) The template is for the entire project; 2) The template is only
for the www assets.
Cordova looks for a "www" folder at the root of the specified path ("the template"). If it finds one, then it assumes we are in case 1), otherwise it assumes we are in case 2).
For case 1), Cordova looks for 4 specific items at the root of the template: "config.xml", "www\", "merges\" and "hooks\". When it finds one of those items, Cordova copies it to the
user's project, otherwise it uses the default for that particular item. It ignores everything else in the template.
For case 2), Cordova copies everything it finds in the template over to the "www\" folder of the user's project, and uses default items for everything else ("config.xml", "merges\",
etc).
What this means for TACO project creation: If we are in case 1), we need to copy the template items that Cordova ignored. For simplicity, we will simply recursively copy the entire
template folder to the user's project, while using the "clobber = false" option of the NCP package. That way, all the items get copied over, but those that were already copied by
Cordova are ignored. If we are in case 2), it means we don't have anything to do, because Cordova already copied all the template items to the "www\" folder of the user's project.
*/
// If we are in case 2) (see above comment), we need to skip the copy step
var skipCopy: boolean = !fs.readdirSync(templateSrcPath).some(function (itemPath: string): boolean {
return path.basename(itemPath) === "www";
});
if (skipCopy) {
return Q.resolve({});
}
// If we reach this point, we are in case 1) (see above comment), so we need to perform a recursive copy
var filterFunc: (itemPath: string) => boolean = function (itemPath: string): boolean {
// Return true if the item path is not in our list of git files to ignore
return TemplateManager.GIT_FILE_LIST.indexOf(path.basename(itemPath)) === -1;
};
var options: tacoUtility.ICopyOptions = { clobber: false, filter: filterFunc };
return utils.copyRecursive(templateSrcPath, cordovaParameters.projectPath, options);
>>>>>>>
return TemplateManager.copyTemplateItemsToProject(cordovaParameters);
<<<<<<<
var templateZip: admZip = new admZip(templateOverrideInfo.templateInfo.url);
=======
var templateZip: AdmZip = new AdmZip(templateOverrideInfo.templateInfo.url);
>>>>>>>
var templateZip: AdmZip = new AdmZip(templateOverrideInfo.templateInfo.url);
<<<<<<<
private acquireFromTacoKits(templateId: string, kitId: string, tempTemplateDir: string): Q.Promise<string> {
var self = this;
=======
private acquireFromGit(templateUrl: string): Q.Promise<string> {
loggerHelper.logSeparatorLine();
logger.log(resources.getString("CommandCreateGitTemplateHeader"));
return this.gitClone(templateUrl);
}
private gitClone(repo: string): Q.Promise<string> {
var deferred: Q.Deferred<any> = Q.defer<any>();
// Set up a temporary folder for the git clone
var tmpDir: string = os.tmpdir();
var cloneTo: string = "taco_template_" + crypto.pseudoRandomBytes(20).toString("hex");
while (fs.existsSync(path.join(tmpDir, cloneTo))) {
cloneTo = "taco_template_" + crypto.pseudoRandomBytes(20).toString("hex");
}
var destination: string = path.join(tmpDir, cloneTo);
var command: string = "git";
var args: string[] = [
"clone",
"--depth", // Use the "--depth 1" option to minimize bandwidth usage, as we are only interested in the final state of the repo
"1",
repo,
destination
];
var options: childProcess.IExecOptions = { cwd: tmpDir, stdio: "inherit" }; // Set cwd for the git child process to be in the temporary dir to ensure any created log or other files get created there
childProcess.spawn(command, args, options)
.on("error", function (err: any): void {
if (err.code === "ENOENT") {
// ENOENT error thrown if no git is found
deferred.reject(errorHelper.get(TacoErrorCodes.CommandCreateNoGit));
} else {
deferred.reject(err);
}
})
.on("exit", function (code: number): void {
if (code) {
deferred.reject(errorHelper.get(TacoErrorCodes.CommandCreateGitCloneError));
} else {
deferred.resolve(destination);
}
});
return deferred.promise;
}
private acquireFromTacoKits(templateId: string, kitId: string): Q.Promise<string> {
var self: TemplateManager = this;
>>>>>>>
private acquireFromTacoKits(templateId: string, kitId: string, tempTemplateDir: string): Q.Promise<string> {
var self: TemplateManager = this;
<<<<<<<
var templateInfo: TacoKits.ITemplateInfo = templateOverrideForKit.templateInfo;
var extractDestination: string = TemplateManager.createUnusedFolderPath(tempTemplateDir);
=======
var templateInfo: TacoKits.ITemplateInfo = templateOverrideForKit.templateInfo;
self.templateName = templateInfo.name;
return self.findTemplatePath(templateId, templateOverrideForKit.kitId, templateInfo);
});
}
>>>>>>>
var templateInfo: TacoKits.ITemplateInfo = templateOverrideForKit.templateInfo;
var extractDestination: string = TemplateManager.createUnusedFolderPath(tempTemplateDir);
<<<<<<<
// Extract the template archive to the temporary folder
var templateZip: admZip = new admZip(templateInfo.url);
=======
// Extract the template archive to the cache
var templateZip: AdmZip = new AdmZip(templateInfo.url);
>>>>>>>
// Extract the template archive to the temporary folder
var templateZip: AdmZip = new AdmZip(templateInfo.url); |
<<<<<<<
import telemetry = tacoUtility.Telemetry;
var kitHelper = tacoKits.KitHelper;
=======
import kitHelper = tacoKits.KitHelper;
import TacoProjectHelper = projectHelper.TacoProjectHelper;
>>>>>>>
import kitHelper = tacoKits.KitHelper;
import TacoProjectHelper = projectHelper.TacoProjectHelper;
import telemetry = tacoUtility.Telemetry;
<<<<<<<
telemetry.init();
=======
TacoProjectHelper.cdToProjectRoot();
>>>>>>>
TacoProjectHelper.cdToProjectRoot();
telemetry.init(); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
private simpleTypesAllowedProperties = [
"type",
"description"
];
private addSimpleType(def: any, type: string) {
for (let k in def) {
if (this.simpleTypesAllowedProperties.indexOf(k) == -1)
return false;
}
if (!def.type) {
def.type = type;
} else if (def.type.push) {
if (!(<Object[]>def.type).every((val) => { return typeof val == "string"; }))
return false;
if (def.type.indexOf('null') == -1)
def.type.push('null');
} else {
if (typeof def.type != "string")
return false;
if (def.type != 'null')
def.type = [ def.type, 'null' ];
}
return true;
}
private makeNullable(def: any) {
if (!this.addSimpleType(def, 'null')) {
let union = def.oneOf || def.anyOf;
if (union)
union.push({ type: 'null' });
else {
const subdef = {};
for (var k in def) {
subdef[k] = def[k];
delete def[k];
}
def.anyOf = [ subdef, { type: 'null' } ];
}
}
return def;
}
private getTypeDefinition(typ: ts.Type, tc: ts.TypeChecker, asRef = this.args.useRef, unionModifier: string = "oneOf", prop? : ts.Symbol, reffedType?: ts.Symbol): any {
=======
private getTypeDefinition(typ: ts.Type, tc: ts.TypeChecker, asRef = this.args.useRef, unionModifier: string = "anyOf", prop? : ts.Symbol, reffedType?: ts.Symbol): any {
>>>>>>>
private simpleTypesAllowedProperties = [
"type",
"description"
];
private addSimpleType(def: any, type: string) {
for (let k in def) {
if (this.simpleTypesAllowedProperties.indexOf(k) == -1)
return false;
}
if (!def.type) {
def.type = type;
} else if (def.type.push) {
if (!(<Object[]>def.type).every((val) => { return typeof val == "string"; }))
return false;
if (def.type.indexOf('null') == -1)
def.type.push('null');
} else {
if (typeof def.type != "string")
return false;
if (def.type != 'null')
def.type = [ def.type, 'null' ];
}
return true;
}
private makeNullable(def: any) {
if (!this.addSimpleType(def, 'null')) {
let union = def.oneOf || def.anyOf;
if (union)
union.push({ type: 'null' });
else {
const subdef = {};
for (var k in def) {
subdef[k] = def[k];
delete def[k];
}
def.anyOf = [ subdef, { type: 'null' } ];
}
}
return def;
}
private getTypeDefinition(typ: ts.Type, tc: ts.TypeChecker, asRef = this.args.useRef, unionModifier: string = "anyOf", prop? : ts.Symbol, reffedType?: ts.Symbol): any {
<<<<<<<
const otherAnnotations = {};
this.parseCommentsIntoDefinition(reffedType, definition, otherAnnotations); // handle comments in the type alias declaration
if (prop)
this.parseCommentsIntoDefinition(prop, returnedDefinition, otherAnnotations);
else
this.parseCommentsIntoDefinition(symbol, definition, otherAnnotations);
=======
this.parseCommentsIntoDefinition(reffedType, definition); // handle comments in the type alias declaration
this.parseCommentsIntoDefinition(prop || symbol, returnedDefinition);
const node = symbol ? symbol.getDeclarations()[0] : null;
>>>>>>>
const otherAnnotations = {};
this.parseCommentsIntoDefinition(reffedType, definition, otherAnnotations); // handle comments in the type alias declaration
if (prop)
this.parseCommentsIntoDefinition(prop, returnedDefinition, otherAnnotations);
else
this.parseCommentsIntoDefinition(symbol, definition, otherAnnotations);
// Create the actual definition only if is an inline definition, or
// if it will be a $ref and it is not yet created
<<<<<<<
export function getProgramFromFiles(files: string[], compilerOptions: ts.CompilerOptions = {}): ts.Program {
=======
export function getProgramFromFiles(files: string[]): ts.Program {
>>>>>>>
export function getProgramFromFiles(files: string[], compilerOptions: ts.CompilerOptions = {}): ts.Program {
<<<<<<<
for (const k in compilerOptions)
options[k] = compilerOptions[k];
return ts.createProgram(files, options);
=======
return ts.createProgram(files, options);
>>>>>>>
for (const k in compilerOptions)
options[k] = compilerOptions[k];
return ts.createProgram(files, options);
<<<<<<<
let definition : any;
if (fullTypeName == '*') { // All types in file(s)
definition = generator.getSchemaForAllSymbols();
}
else { // Use specific type as root object
definition = generator.getSchemaForSymbol(fullTypeName);
}
=======
let definition = generator.getSchemaForSymbol(fullTypeName);
>>>>>>>
let definition : any;
if (fullTypeName == '*') { // All types in file(s)
definition = generator.getSchemaForAllSymbols();
}
else { // Use specific type as root object
definition = generator.getSchemaForSymbol(fullTypeName);
} |
<<<<<<<
import { ReactionRolesPlugin } from "./ReactionRoles/ReactionRolesPlugin";
=======
import { AutomodPlugin } from "./Automod/AutomodPlugin";
>>>>>>>
import { ReactionRolesPlugin } from "./ReactionRoles/ReactionRolesPlugin";
import { AutomodPlugin } from "./Automod/AutomodPlugin"; |
<<<<<<<
PersistPlugin,
PingableRolesPlugin,
NameHistoryPlugin,
=======
>>>>>>>
PersistPlugin,
PingableRolesPlugin, |
<<<<<<<
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
const priorWarnAmount = await casesPlugin.getCaseTypeAmountForUserId(memberToWarn.id, CaseTypes.Warn);
if (priorWarnAmount >= config.warn_notify_threshold) {
const tooManyWarningsMsg = await msg.channel.createMessage(
config.warn_notify_message.replace("{priorWarnings}", `${priorWarnAmount}`),
);
const reply = await waitForReaction(this.bot, tooManyWarningsMsg, ["✅", "❌"]);
tooManyWarningsMsg.delete();
if (!reply || reply.name === "❌") {
msg.channel.createMessage(errorMessage("Warn cancelled by moderator"));
return;
}
}
const warnMessage = config.warn_message.replace("{guildName}", this.guild.name).replace("{reason}", reason);
const warnResult = await this.warnMember(
memberToWarn,
warnMessage,
{
=======
let contactMethods;
try {
contactMethods = this.readContactMethodsFromArgs(args);
} catch (e) {
this.sendErrorMessage(msg.channel, e.message);
return;
}
const warnResult = await this.warnMember(memberToWarn, reason, {
contactMethods,
caseArgs: {
>>>>>>>
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
const priorWarnAmount = await casesPlugin.getCaseTypeAmountForUserId(memberToWarn.id, CaseTypes.Warn);
if (priorWarnAmount >= config.warn_notify_threshold) {
const tooManyWarningsMsg = await msg.channel.createMessage(
config.warn_notify_message.replace("{priorWarnings}", `${priorWarnAmount}`),
);
const reply = await waitForReaction(this.bot, tooManyWarningsMsg, ["✅", "❌"]);
tooManyWarningsMsg.delete();
if (!reply || reply.name === "❌") {
msg.channel.createMessage(errorMessage("Warn cancelled by moderator"));
return;
}
}
let contactMethods;
try {
contactMethods = this.readContactMethodsFromArgs(args);
} catch (e) {
this.sendErrorMessage(msg.channel, e.message);
return;
}
const warnResult = await this.warnMember(memberToWarn, reason, {
contactMethods,
caseArgs: { |
<<<<<<<
import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin";
=======
import { CensorPlugin } from "./Censor/CensorPlugin";
import { RolesPlugin } from "./Roles/RolesPlugin";
import { SlowmodePlugin } from "./Slowmode/SlowmodePlugin";
import { StarboardPlugin } from "./Starboard/StarboardPlugin";
import { ChannelArchiverPlugin } from "./ChannelArchiver/ChannelArchiverPlugin";
>>>>>>>
import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin";
import { CensorPlugin } from "./Censor/CensorPlugin";
import { RolesPlugin } from "./Roles/RolesPlugin";
import { SlowmodePlugin } from "./Slowmode/SlowmodePlugin";
import { StarboardPlugin } from "./Starboard/StarboardPlugin";
import { ChannelArchiverPlugin } from "./ChannelArchiver/ChannelArchiverPlugin";
<<<<<<<
GuildInfoSaverPlugin,
=======
CensorPlugin,
ChannelArchiverPlugin,
>>>>>>>
GuildInfoSaverPlugin,
CensorPlugin,
ChannelArchiverPlugin, |
<<<<<<<
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
=======
import { LogType } from "src/data/LogType";
import { stripObjectToScalars, resolveUser } from "src/utils";
>>>>>>>
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
import { LogType } from "src/data/LogType";
import { stripObjectToScalars, resolveUser } from "src/utils"; |
<<<<<<<
assert.equal(container.connectionState, ConnectionState.Connected,
"Container should be in connected state!!");
assert.equal(container.id, documentId, "Doc id is not matching!!");
=======
assert.equal(container.id, "documentId", "Doc id is not matching!!");
>>>>>>>
assert.equal(container.id, documentId, "Doc id is not matching!!"); |
<<<<<<<
export { default as appRoutes } from './routes';
export * from './Ens';
=======
export { CreateWallet, Mnemonic, Keystore } from './CreateWallet';
export { Dashboard } from './Dashboard';
export { AddAccountFlow } from './AddAccount';
export { Settings, Import, Export } from './Settings';
export { DownloadApp } from './DownloadApp';
export { NoAccounts } from './NoAccounts';
export { ScreenLockNew, ScreenLockLocked, ScreenLockForgotPassword } from './ScreenLock';
export { SendAssets } from './SendAssets';
export { RequestAssets } from './RequestAssets';
export { BuyAndExchange, ShapeShiftAuthorization, ZeroEx } from './BuyAndExchange';
export { default as PageNotFound } from './PageNotFound';
>>>>>>>
export * from './Ens';
export { CreateWallet, Mnemonic, Keystore } from './CreateWallet';
export { Dashboard } from './Dashboard';
export { AddAccountFlow } from './AddAccount';
export { Settings, Import, Export } from './Settings';
export { DownloadApp } from './DownloadApp';
export { NoAccounts } from './NoAccounts';
export { ScreenLockNew, ScreenLockLocked, ScreenLockForgotPassword } from './ScreenLock';
export { SendAssets } from './SendAssets';
export { RequestAssets } from './RequestAssets';
export { BuyAndExchange, ShapeShiftAuthorization, ZeroEx } from './BuyAndExchange';
export { default as PageNotFound } from './PageNotFound'; |
<<<<<<<
import { IRequest, IResponse, IComponent } from "@microsoft/fluid-component-core-interfaces";
import { IDocumentServiceFactory, IUrlResolver } from "@microsoft/fluid-driver-definitions";
=======
import { IBaseHostConfig } from "@microsoft/fluid-base-host";
import { MultiUrlResolver, MultiDocumentServiceFactory } from "@microsoft/fluid-driver-utils";
import { IRequest, IResponse } from "@microsoft/fluid-component-core-interfaces";
>>>>>>>
import { IBaseHostConfig } from "@microsoft/fluid-base-host";
import { MultiUrlResolver, MultiDocumentServiceFactory } from "@microsoft/fluid-driver-utils";
import { IRequest, IResponse, IComponent } from "@microsoft/fluid-component-core-interfaces";
import { IDocumentServiceFactory, IUrlResolver } from "@microsoft/fluid-driver-definitions"; |
<<<<<<<
nconf.argv().env(<any> "__").file(path.join(__dirname, "../../config/config.json")).use("memory");
=======
import * as winston from "winston";
nconf.argv().env(<any> "__").file(path.join(__dirname, "../../config.json")).use("memory");
>>>>>>>
import * as winston from "winston";
nconf.argv().env(<any> "__").file(path.join(__dirname, "../../config/config.json")).use("memory"); |
<<<<<<<
=======
import { IDocumentDeltaConnection, IDocumentService, IFluidResolvedUrl } from "@microsoft/fluid-driver-definitions";
import { IClient, IDocumentMessage, MessageType, ScopeType } from "@microsoft/fluid-protocol-definitions";
>>>>>>>
<<<<<<<
import { CreationServerMessagesHandler } from "..";
=======
import { CreationDriverUrlResolver } from "../creationDriverUrlResolver";
>>>>>>>
import { CreationDriverUrlResolver } from "../creationDriverUrlResolver";
import { CreationServerMessagesHandler } from ".."; |
<<<<<<<
import { ChildLogger } from "@microsoft/fluid-core-utils";
import {
IDocumentService,
IDocumentServiceFactory,
IResolvedUrl,
} from "@microsoft/fluid-driver-definitions";
=======
import { IDocumentService, IDocumentServiceFactory, IResolvedUrl } from "@microsoft/fluid-protocol-definitions";
>>>>>>>
import {
IDocumentService,
IDocumentServiceFactory,
IResolvedUrl,
} from "@microsoft/fluid-driver-definitions"; |
<<<<<<<
=======
import { FatalError, ThrottlingError } from "@microsoft/fluid-driver-utils";
// eslint-disable-next-line import/no-internal-modules
import * as uuid from "uuid/v4";
>>>>>>>
// eslint-disable-next-line import/no-internal-modules
import * as uuid from "uuid/v4"; |
<<<<<<<
const odspResolvedUrl = resolvedUrl as IOdspResolvedUrl;
// A hint for driver if document was opened before by this factory
const docId = odspResolvedUrl.hashedDocumentId;
const isFirstTimeDocumentOpened = !this.documentsOpened.has(docId);
this.documentsOpened.add(docId);
return new OdspDocumentService(
=======
return OdspDocumentService.create(
>>>>>>>
const odspResolvedUrl = resolvedUrl as IOdspResolvedUrl;
// A hint for driver if document was opened before by this factory
const docId = odspResolvedUrl.hashedDocumentId;
const isFirstTimeDocumentOpened = !this.documentsOpened.has(docId);
this.documentsOpened.add(docId);
return OdspDocumentService.create(
<<<<<<<
docId,
odspResolvedUrl.siteUrl,
odspResolvedUrl.driveId,
odspResolvedUrl.itemId,
odspResolvedUrl.endpoints.snapshotStorageUrl,
=======
resolvedUrl,
>>>>>>>
resolvedUrl,
<<<<<<<
import("./getSocketIo").then((m) => m.getSocketIo()),
this.odspCache,
isFirstTimeDocumentOpened,
=======
import("./getSocketIo").then((m) => m.getSocketIo()),
this.odspCache,
this.fileInfoToCreateNewResponseCache,
>>>>>>>
import("./getSocketIo").then((m) => m.getSocketIo()),
this.odspCache,
isFirstTimeDocumentOpened,
this.fileInfoToCreateNewResponseCache, |
<<<<<<<
import * as kafka from "kafka-rest";
=======
import * as kafka from "kafka-node";
import { debug } from "./debug";
>>>>>>>
import * as kafka from "kafka-rest";
import { debug } from "./debug";
<<<<<<<
=======
* Ensures that the provided topics are ready
*/
export function ensureTopics(client: kafka.Client, topics: string[]): Promise<void> {
return new Promise<void>((resolve, reject) => {
// We make use of a refreshMetadata call to validate the given topics exist
client.refreshMetadata(
topics,
(error, data) => {
if (error) {
debug(error);
return reject();
}
return resolve();
});
});
}
/**
>>>>>>>
* Ensures that the provided topics are ready
*/
export function ensureTopics(client: kafka.Client, topics: string[]): Promise<void> {
return new Promise<void>((resolve, reject) => {
// We make use of a refreshMetadata call to validate the given topics exist
client.refreshMetadata(
topics,
(error, data) => {
if (error) {
debug(error);
return reject();
}
return resolve();
});
});
}
/**
<<<<<<<
/**
* Commit offsets using REST client directly.
*/
export function commitOffset(client: any, path: string, commitRequest: any): Promise<void> {
return new Promise<any>((resolve, reject) => {
client.post(path + '/offsets', commitRequest, null, (err, data) => {
if (err) {
reject(err);
} else {
resolve(JSON.stringify(data));
}
});
});
}
=======
/**
* Handles an error that requires a reconnect to Kafka
*/
private handleError(error: any) {
// Close the client if it exists
if (this.client) {
this.client.close((closeError) => {
if (closeError) {
debug(closeError);
}
});
this.client = undefined;
}
// TODO should we reject any pending messages?
this.connecting = this.connected = false;
debug("Kafka error - attempting reconnect", error);
this.connect();
}
}
>>>>>>>
/**
* Commit offsets using REST client directly.
*/
export function commitOffset(client: any, path: string, commitRequest: any): Promise<void> {
return new Promise<any>((resolve, reject) => {
client.post(path + '/offsets', commitRequest, null, (err, data) => {
if (err) {
reject(err);
} else {
resolve(JSON.stringify(data));
}
});
});
} |
<<<<<<<
connectionMode: this._deltaManager.connectionMode,
connectionState: this.connectionState,
=======
connectionMode: this._deltaManager!.connectionMode,
connectionState: ConnectionState[this.connectionState],
>>>>>>>
connectionMode: this._deltaManager.connectionMode,
connectionState: ConnectionState[this.connectionState], |
<<<<<<<
/* Issue #1566: Backward compat */
if (response.initialMessages === undefined) {
response.initialMessages = [];
}
if (response.initialClients === undefined) {
response.initialClients = [];
}
if (response.initialContents === undefined) {
response.initialContents = [];
}
if (response.initialSignals === undefined) {
response.initialSignals = [];
}
=======
// If we sent a nonce and the server supports nonces, check that the nonces match
if (connectMessage.nonce !== undefined &&
response.nonce !== undefined &&
response.nonce !== connectMessage.nonce) {
return;
}
>>>>>>>
// If we sent a nonce and the server supports nonces, check that the nonces match
if (connectMessage.nonce !== undefined &&
response.nonce !== undefined &&
response.nonce !== connectMessage.nonce) {
return;
}
/* Issue #1566: Backward compat */
if (response.initialMessages === undefined) {
response.initialMessages = [];
}
if (response.initialClients === undefined) {
response.initialClients = [];
}
if (response.initialContents === undefined) {
response.initialContents = [];
}
if (response.initialSignals === undefined) {
response.initialSignals = [];
} |
<<<<<<<
export { GithubService } from './Github';
=======
export { GithubService, OS } from './Github';
export { TokenInfoService } from './TokenInfo';
>>>>>>>
export { GithubService } from './Github';
export { TokenInfoService } from './TokenInfo'; |
<<<<<<<
name: 'RSK',
unit: 'RBTC',
=======
name: 'RSK Testnet',
unit: 'SBTC',
>>>>>>>
name: 'RSK Testnet',
unit: 'RBTC', |
<<<<<<<
// Return the deed owner's address, and the resolved address if it exists
const { deedOwnerAddress }: typeof ENS.deed.owner.outputType = yield call(makeEthCallAndDecode, {
=======
// Return the owner's address, and the resolved address if it exists
// NOTE: THE DEED OWNER IS NOT THE OWNER
// CHECK LEGACY.MYCRYPTO.COM FOR THE DIFFERENCE BETWEEN DEED OWNER AND OWNER
// THIS WILL CAUSE MASS CONFUSION IF WE USE THIS AS THE 'OWNER' FOR MIGRATING TO NEW REGISTRAR
// - TAYLOR
const { ownerAddress }: typeof ENS.deed.owner.outputType = yield call(makeEthCallAndDecode, {
>>>>>>>
// Return the owner's address, and the resolved address if it exists
// NOTE: THE DEED OWNER IS NOT THE OWNER
// CHECK LEGACY.MYCRYPTO.COM FOR THE DIFFERENCE BETWEEN DEED OWNER AND OWNER
// THIS WILL CAUSE MASS CONFUSION IF WE USE THIS AS THE 'OWNER' FOR MIGRATING TO NEW REGISTRAR
// - TAYLOR
const { deedOwnerAddress }: typeof ENS.deed.owner.outputType = yield call(makeEthCallAndDecode, { |
<<<<<<<
ConnectionState,
=======
IBlob,
>>>>>>>
ConnectionState,
IBlob, |
<<<<<<<
const gitManager = new git.GitManager(historian, gitSettings.repository);
const foo = routes.create(config, gitManager, mongoManager);
app.use("/deltas", foo.deltas);
app.use("/maps", foo.maps);
app.use("/canvas", foo.canvas);
app.use("/sharedText", foo.sharedText);
app.use("/cell", foo.cell);
app.use("/scribe", foo.scribe);
app.use("/intelligence", foo.intelligence);
app.use("/democreator", foo.demoCreator);
app.use("/login", foo.login);
app.use(foo.home);
=======
const routes = alfredRoutes.create(config, gitManager, mongoManager);
app.use("/deltas", routes.deltas);
app.use("/maps", routes.maps);
app.use("/canvas", routes.canvas);
app.use("/sharedText", routes.sharedText);
app.use("/cell", routes.cell);
app.use("/scribe", routes.scribe);
app.use("/intelligence", routes.intelligence);
app.use("/democreator", routes.demoCreator);
app.use("/login", routes.login);
app.use(routes.home);
>>>>>>>
const gitManager = new git.GitManager(historian, gitSettings.repository);
const routes = alfredRoutes.create(config, gitManager, mongoManager);
app.use("/deltas", routes.deltas);
app.use("/maps", routes.maps);
app.use("/canvas", routes.canvas);
app.use("/sharedText", routes.sharedText);
app.use("/cell", routes.cell);
app.use("/scribe", routes.scribe);
app.use("/intelligence", routes.intelligence);
app.use("/democreator", routes.demoCreator);
app.use("/login", routes.login);
app.use(routes.home); |
<<<<<<<
url: 'https://mainnet.infura.io/mycrypto'
=======
url: 'https://mainnet.infura.io/v3/c02fff6b5daa434d8422b8ece54c7286'
},
{
name: makeNodeName('ETH', 'blockscale'),
type: 'rpc',
service: 'Blockscale',
url: 'https://api.dev.blockscale.net/dev/parity'
>>>>>>>
url: 'https://mainnet.infura.io/v3/c02fff6b5daa434d8422b8ece54c7286' |
<<<<<<<
import { EventEmitter } from "events";
import { IComponentRuntime, ISharedObjectServices } from "@microsoft/fluid-runtime-definitions";
=======
import { ITree } from "@microsoft/fluid-protocol-definitions";
import {
IComponentRuntime,
IObjectStorageService,
ISharedObjectServices,
IChannelAttributes,
} from "@microsoft/fluid-runtime-definitions";
>>>>>>>
import { EventEmitter } from "events";
import {
IComponentRuntime,
ISharedObjectServices,
IChannelAttributes,
} from "@microsoft/fluid-runtime-definitions"; |
<<<<<<<
import { ISequencedDocumentMessage } from "@prague/container-definitions";
import { ISharedMap } from "@prague/map";
=======
>>>>>>>
import { ISequencedDocumentMessage } from "@prague/container-definitions"; |
<<<<<<<
export class ContainerContext extends EventEmitter implements IContainerContext {
=======
export class ContainerContext implements IContainerContext {
public readonly isExperimentalContainerContext = true;
>>>>>>>
export class ContainerContext implements IContainerContext { |
<<<<<<<
};
export const Geeii: Contributor = {
nickname: 'Geeii',
github: 'radean0909',
discord: 'Geei#8447',
mains: [{
name: "Geeii",
spec: SPECS.VENGEANCE_DEMON_HUNTER,
link: "https://worldofwarcraft.com/en-us/character/us/area52/geeii",
}]
}
=======
mains: [{
name: "Nakofel",
spec: SPECS.VENGEANCE_DEMON_HUNTER,
link: "https://worldofwarcraft.com/en-us/character/us/bleeding-hollow/nakofel",
}],
};
>>>>>>>
mains: [{
name: "Nakofel",
spec: SPECS.VENGEANCE_DEMON_HUNTER,
link: "https://worldofwarcraft.com/en-us/character/us/bleeding-hollow/nakofel",
}],
};
export const Geeii: Contributor = {
nickname: 'Geeii',
github: 'radean0909',
discord: 'Geei#8447',
mains: [{
name: "Geeii",
spec: SPECS.VENGEANCE_DEMON_HUNTER,
link: "https://worldofwarcraft.com/en-us/character/us/area52/geeii",
}],
} |
<<<<<<<
export const WEB_DEFAULT: DPath = {
label: 'Default (WEB)',
value: "m/44'/227'/0'/0"
};
=======
export const METADIUM_DEFAULT: DPath = {
label: 'Default (METADIUM)',
value: "m/44'/916'/0'/0"
};
>>>>>>>
export const WEB_DEFAULT: DPath = {
label: 'Default (WEB)',
value: "m/44'/227'/0'/0"
};
export const METADIUM_DEFAULT: DPath = {
label: 'Default (METADIUM)',
value: "m/44'/916'/0'/0"
};
<<<<<<<
THUNDERCORE_DEFAULT,
WEB_DEFAULT
=======
THUNDERCORE_DEFAULT,
METADIUM_DEFAULT
>>>>>>>
THUNDERCORE_DEFAULT,
WEB_DEFAULT,
METADIUM_DEFAULT |
<<<<<<<
import { fetchHelper, getWithRetryForTokenRefresh, throwOdspNetworkError } from "./odspUtils";
=======
import { fetchHelper, getWithRetryForTokenRefresh, IOdspResponse, throwOdspNetworkError } from "./odspUtils";
import { isOdcOrigin } from "./isOdc";
>>>>>>>
import { fetchHelper, getWithRetryForTokenRefresh, throwOdspNetworkError } from "./odspUtils";
import { isOdcOrigin } from "./isOdc";
<<<<<<<
const response = await fetchHelper(
`${siteOrigin}/_api/v2.1/drives/${driveId}/items/${itemId}/${path}?${queryParams}`,
=======
let prefix = "_api/";
if (isOdcOrigin(siteOrigin)) {
prefix = "";
}
response = await fetchHelper(
`${siteOrigin}/${prefix}v2.1/drives/${driveId}/items/${itemId}/${path}?${queryParams}`,
>>>>>>>
let prefix = "_api/";
if (isOdcOrigin(siteOrigin)) {
prefix = "";
}
const response = await fetchHelper(
`${siteOrigin}/${prefix}v2.1/drives/${driveId}/items/${itemId}/${path}?${queryParams}`,
<<<<<<<
=======
// TODO SPO-specific telemetry
joinSessionEvent.end({
sprequestguid: response.headers.get("sprequestguid"),
sprequestduration: response.headers.get("sprequestduration"),
});
return response;
>>>>>>> |
<<<<<<<
import { O } from 'ts-toolbelt';
import { PatchTypes } from '../../farming';
import { FarmingPatchTypes } from '../../farming/types';
import defaultContracts from '../../farming/defaultContracts';
import defaultTitheFarm from '../../farming/defaultTitheFarm';
=======
import { ItemBank } from '../../types';
>>>>>>>
import { O } from 'ts-toolbelt';
import { PatchTypes } from '../../farming';
import { FarmingPatchTypes } from '../../farming/types';
import defaultContracts from '../../farming/defaultContracts';
import defaultTitheFarm from '../../farming/defaultTitheFarm';
import { ItemBank } from '../../types';
<<<<<<<
export const Farming = T<number>(`skills.${SkillsEnum.Farming}`);
=======
export const Thieving = T<number>(`skills.${SkillsEnum.Thieving}`);
>>>>>>>
export const Farming = T<number>(`skills.${SkillsEnum.Farming}`);
export const Thieving = T<number>(`skills.${SkillsEnum.Thieving}`); |
<<<<<<<
// Scriptorium Lambda
this.scriptoriumLambda = new ScriptoriumLambda(
LocalOrderer.socketPublisher,
deltasCollection,
undefined,
LocalOrderer.scriptoriumContext);
=======
// Scriptorium + BBC Lambda
this.scriptoriumLambda = new ScriptoriumLambda(deltasCollection, LocalOrderer.scriptoriumContext);
this.bbcLambda = new BBCLambda(LocalOrderer.socketPublisher, LocalOrderer.bbcContext);
>>>>>>>
// Scriptorium + BBC Lambda
this.scriptoriumLambda = new ScriptoriumLambda(deltasCollection, undefined, LocalOrderer.scriptoriumContext);
this.bbcLambda = new BBCLambda(LocalOrderer.socketPublisher, LocalOrderer.bbcContext); |
<<<<<<<
FiremakingActivityTaskOptions,
WoodcuttingActivityTaskOptions,
OfferingActivityTaskOptions,
BuryingActivityTaskOptions,
FletchingActivityTaskOptions,
AlchingActivityTaskOptions,
FarmingActivityTaskOptions
=======
WoodcuttingActivityTaskOptions
>>>>>>>
WoodcuttingActivityTaskOptions
<<<<<<<
import Farming from '../../lib/skilling/skills/farming/farming';
=======
import getActivityOfUser from '../../lib/util/getActivityOfUser';
import { formatDuration } from '../../util';
>>>>>>>
import Farming from '../../lib/skilling/skills/farming/farming';
import getActivityOfUser from '../../lib/util/getActivityOfUser';
import { formatDuration } from '../../util'; |
<<<<<<<
${Emoji.Farming} Farming: ${msg.author.skillLevel(SkillsEnum.Farming)} (${msg.author.settings
.get(UserSettings.Skills.Farming)
.toLocaleString()} xp)
=======
${Emoji.XP} Total Level: ${msg.author.totalLevel().toLocaleString()} (${msg.author
.totalLevel(true)
.toLocaleString()} xp)
>>>>>>>
${Emoji.Farming} Farming: ${msg.author.skillLevel(SkillsEnum.Farming)} (${msg.author.settings
.get(UserSettings.Skills.Farming)
.toLocaleString()} xp)
${Emoji.XP} Total Level: ${msg.author.totalLevel().toLocaleString()} (${msg.author
.totalLevel(true)
.toLocaleString()} xp) |
<<<<<<<
import * as mergeTree from "../merge-tree";
=======
import * as ink from "../ink";
>>>>>>>
import * as ink from "../ink";
import * as mergeTree from "../merge-tree";
<<<<<<<
* Creates a new collaborative string
*/
public createString(): types.ICollaborativeObject {
return this.create(mergeTree.CollaboritiveStringExtension.Type) as types.ICollaborativeObject;
}
/**
=======
* Creates a new ink collaborative object
*/
public createInk(): ink.IInk {
return this.create(ink.InkExtension.Type) as ink.IInk;
}
/**
>>>>>>>
* Creates a new collaborative string
*/
public createString(): types.ICollaborativeObject {
return this.create(mergeTree.CollaboritiveStringExtension.Type) as types.ICollaborativeObject;
}
/**
* Creates a new ink collaborative object
*/
public createInk(): ink.IInk {
return this.create(ink.InkExtension.Type) as ink.IInk;
}
/**
<<<<<<<
defaultRegistry.register(new mergeTree.CollaboritiveStringExtension());
=======
defaultRegistry.register(new ink.InkExtension());
>>>>>>>
defaultRegistry.register(new mergeTree.CollaboritiveStringExtension());
defaultRegistry.register(new ink.InkExtension()); |
<<<<<<<
export interface FarmingActivityTaskOptions extends ActivityTaskOptions {
plantsName: string | null;
channelID: string;
quantity: number;
upgradeType: 'compost' | 'supercompost' | 'ultracompost' | null;
patchType: PatchTypes.PatchData;
getPatchType: string;
planting: boolean;
currentDate: number;
}
export interface QuestingActivityTaskOptions extends ActivityTaskOptions {
channelID: string;
}
=======
export interface QuestingActivityTaskOptions extends ActivityTaskOptions {}
>>>>>>>
export interface FarmingActivityTaskOptions extends ActivityTaskOptions {
plantsName: string | null;
channelID: string;
quantity: number;
upgradeType: 'compost' | 'supercompost' | 'ultracompost' | null;
patchType: PatchTypes.PatchData;
getPatchType: string;
planting: boolean;
currentDate: number;
}
export interface QuestingActivityTaskOptions extends ActivityTaskOptions {} |
<<<<<<<
IChaincode,
IChannel,
=======
>>>>>>>
IChannel, |
<<<<<<<
import { CollectionInsertManyOptions } from "mongodb";
import * as nconf from "nconf";
import * as path from "path";
=======
>>>>>>>
import * as nconf from "nconf";
import * as path from "path"; |
<<<<<<<
const defaultThrottleMaxDelayMs = 30 * 1000;
const defaultThrottleDelayWindowMs = 60 * 1000;
const defaultThrottleDelayFunction = (n: number) => 20 * (Math.pow(2, n) - 1);
/**
* Used to give increasing delay times for throttling a single functionality.
* Delay is based on previous attempts within specified time window, ignoring actual delay time.
* Default throttling function increases exponentially (0ms, 20ms, 60ms, 140ms, etc) up to max delay (default 30s)
*/
class Throttler {
private startTimes: number[] = [];
constructor(
private readonly delayWindowMs,
private readonly maxDelayMs,
private readonly delayFunction,
) { }
public get attempts() {
return this.startTimes.length;
}
public getDelay() {
const now = Date.now();
this.startTimes = this.startTimes.filter((t) => now - t < this.delayWindowMs);
const delayMs = Math.min(this.delayFunction(this.startTimes.length), this.maxDelayMs);
this.startTimes.push(now);
this.startTimes = this.startTimes.map((t) => t + delayMs); // account for delay time
if (delayMs === this.maxDelayMs) {
// we hit max delay so adding more won't affect anything
// shift off oldest time to stop this array from growing forever
this.startTimes.shift();
}
return delayMs;
}
}
=======
type ShouldSummarizeState = {
shouldSummarize: true;
} | {
shouldSummarize: false;
stopReason: string;
};
>>>>>>>
type ShouldSummarizeState = {
shouldSummarize: true;
} | {
shouldSummarize: false;
stopReason: string;
};
const defaultThrottleMaxDelayMs = 30 * 1000;
const defaultThrottleDelayWindowMs = 60 * 1000;
const defaultThrottleDelayFunction = (n: number) => 20 * (Math.pow(2, n) - 1);
/**
* Used to give increasing delay times for throttling a single functionality.
* Delay is based on previous attempts within specified time window, ignoring actual delay time.
* Default throttling function increases exponentially (0ms, 20ms, 60ms, 140ms, etc) up to max delay (default 30s)
*/
class Throttler {
private startTimes: number[] = [];
constructor(
private readonly delayWindowMs,
private readonly maxDelayMs,
private readonly delayFunction,
) { }
public get attempts() {
return this.startTimes.length;
}
public getDelay() {
const now = Date.now();
this.startTimes = this.startTimes.filter((t) => now - t < this.delayWindowMs);
const delayMs = Math.min(this.delayFunction(this.startTimes.length), this.maxDelayMs);
this.startTimes.push(now);
this.startTimes = this.startTimes.map((t) => t + delayMs); // account for delay time
if (delayMs === this.maxDelayMs) {
// we hit max delay so adding more won't affect anything
// shift off oldest time to stop this array from growing forever
this.startTimes.shift();
}
return delayMs;
}
}
<<<<<<<
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.runningSummarizer.stop(this.getStopReason());
=======
this.runningSummarizer.stop(shouldSummarizeState.stopReason);
>>>>>>>
this.runningSummarizer.stop(shouldSummarizeState.stopReason);
<<<<<<<
} else {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
summarizer.stop(this.getStopReason());
this.state = SummaryManagerState.Off;
=======
const shouldSummarizeState = this.getShouldSummarizeState();
if (shouldSummarizeState.shouldSummarize === false) {
summarizer.stop(shouldSummarizeState.stopReason);
this.state = SummaryManagerState.Off;
}
>>>>>>>
const shouldSummarizeState = this.getShouldSummarizeState();
if (shouldSummarizeState.shouldSummarize === false) {
summarizer.stop(shouldSummarizeState.stopReason);
this.state = SummaryManagerState.Off;
} |
<<<<<<<
| TitheFarmActivityTaskOptions
=======
| DeliverPresentsActivityTaskOptions
>>>>>>>
| TitheFarmActivityTaskOptions
| DeliverPresentsActivityTaskOptions |
<<<<<<<
case Activity.Farming:
return Tasks.FarmingActivity;
case Activity.TitheFarm:
return Tasks.TitheFarmActivity;
=======
case Activity.DeliverPresents:
return Tasks.DeliverPresents;
>>>>>>>
case Activity.Farming:
return Tasks.FarmingActivity;
case Activity.TitheFarm:
return Tasks.TitheFarmActivity;
case Activity.DeliverPresents:
return Tasks.DeliverPresents; |
<<<<<<<
public indentWidth: number;
public contentWidth: number;
public rows = <RowView[]> [];
=======
public indentPct = 0.1;
public contentPct: 0.8;
public rows = <RowView[]>[];
public columns = <ColumnView[]>[];
>>>>>>>
public indentPct = 0.1;
public contentPct: 0.8;
public rows = <RowView[]> [];
public columns = <ColumnView[]> [];
<<<<<<<
let pgMarker = <IParagraphMarker> marker;
if (!pgMarker.cache) {
let itemsContext = <IItemsContext> {
docContext: undefined,
items: [],
=======
let pgMarker = <IParagraphMarker>marker;
if (!pgMarker.itemCache) {
let itemsContext = <IItemsContext>{
itemInfo: { items: [], minWidth: 0 },
docContext: undefined,
>>>>>>>
let pgMarker = <IParagraphMarker> marker;
if (!pgMarker.itemCache) {
let itemsContext = <IItemsContext> {
docContext: undefined,
itemInfo: { items: [], minWidth: 0 },
<<<<<<<
function renderTable(
startPGMarker: IParagraphMarker, startPGPos: number,
currentLineTop: number, heightLimit: number, flowView: FlowView) {
// TODO
}
function renderOuterTable(
table: ITableMarker, viewportDiv: HTMLDivElement, startingPosition: number, flowView: FlowView) {
=======
function renderTable(table: ITableMarker, renderContext: IRenderContext) {
let flowView = renderContext.flowView;
>>>>>>>
function renderTable(table: ITableMarker, renderContext: IRenderContext) {
let flowView = renderContext.flowView;
<<<<<<<
renderOuterTable(<ITableMarker> outerTable, viewportDiv, startingPosition, flowView);
=======
let renderContext = <IRenderContext>{
flowView,
viewportDiv,
startingPosition,
startMarker: outerTable,
heightLimit: 0,
currentLineTop: 0,
};
return renderContent(renderContext);
>>>>>>>
let renderContext = <IRenderContext> {
currentLineTop: 0,
flowView,
heightLimit: 0,
startingPosition,
startMarker: outerTable,
viewportDiv,
};
return renderContent(renderContext);
<<<<<<<
function renderTree(
viewportDiv: HTMLDivElement,
startingPosition: number,
client: SharedString.Client,
flowView: FlowView,
heightLimit = 0) {
let docContext = buildDocumentContext(viewportDiv);
// TODO: for stable viewports cache the geometry and the divs
// TODO: cache all this pre-amble in style blocks; override with pg properties
let viewportBounds = Geometry.Rectangle.fromClientRect(viewportDiv.getBoundingClientRect());
=======
interface IRenderContext {
currentLineTop: number;
viewportDiv: HTMLDivElement;
startingPosition?: number;
startMarker: SharedString.Marker;
startMarkerPos?: number;
endMarker?: SharedString.Marker;
flowView: FlowView;
heightLimit: number;
}
interface IRenderOutput {
// TODO: make this an array for tables that extend past bottom of viewport
viewportStartPos: number;
viewportEndPos: number;
}
function renderContent(renderContext: IRenderContext): IRenderOutput {
let client = renderContext.flowView.client;
let docContext = buildDocumentContext(renderContext.viewportDiv);
// TODO: for stable viewports cache the geometry and the divs
// TODO: cache all this pre-amble in style blocks; override with pg properties
let viewportBounds = Geometry.Rectangle.fromClientRect(renderContext.viewportDiv.getBoundingClientRect());
>>>>>>>
interface IRenderContext {
currentLineTop: number;
viewportDiv: HTMLDivElement;
startingPosition?: number;
startMarker: SharedString.Marker;
startMarkerPos?: number;
endMarker?: SharedString.Marker;
flowView: FlowView;
heightLimit: number;
}
interface IRenderOutput {
// TODO: make this an array for tables that extend past bottom of viewport
viewportStartPos: number;
viewportEndPos: number;
}
function renderContent(renderContext: IRenderContext): IRenderOutput {
let client = renderContext.flowView.client;
let docContext = buildDocumentContext(renderContext.viewportDiv);
// TODO: for stable viewports cache the geometry and the divs
// TODO: cache all this pre-amble in style blocks; override with pg properties
let viewportBounds = Geometry.Rectangle.fromClientRect(renderContext.viewportDiv.getBoundingClientRect());
<<<<<<<
let itemsContext = <IItemsContext> {
items: [],
=======
let itemsContext = <IItemsContext>{
>>>>>>>
let itemsContext = <IItemsContext> {
<<<<<<<
let lineContext = <ILineContext> {
span, lineDiv, lineDivHeight, flowView, pgMarker, markerPos,
=======
let lineContext = <ILineContext>{
span, lineDiv, lineDivHeight, flowView: renderContext.flowView, pgMarker, markerPos,
>>>>>>>
let lineContext = <ILineContext> {
span, lineDiv, lineDivHeight, flowView: renderContext.flowView, pgMarker, markerPos,
<<<<<<<
// TODO: generalize to div (cell) and recognize when should break for end of
// div
=======
>>>>>>>
<<<<<<<
let tile = <IParagraphMarker> tileInfo.tile;
tile.cache = undefined;
=======
let tile = <IParagraphMarker>tileInfo.tile;
clearContentCaches(tile);
>>>>>>>
let tile = <IParagraphMarker> tileInfo.tile;
clearContentCaches(tile); |
<<<<<<<
import {Controller, Get, PathParams, PlatformTest} from "@tsed/common";
import {Returns} from "@tsed/schema";
=======
import {Controller, Description, Get, MergeParams, PathParams, PlatformTest} from "@tsed/common";
>>>>>>>
import {Controller, Get, MergeParams, PathParams, PlatformTest} from "@tsed/common";
import {Description, Returns} from "@tsed/schema";
import {Docs, Hidden} from "@tsed/swagger";
<<<<<<<
=======
import {Docs, Hidden, Returns, ReturnsArray} from "../src";
>>>>>>>
<<<<<<<
=======
"swagger": "2.0",
"tags": [
{
"name": "CalendarsController"
},
{
"name": "EventCtrl"
}
],
>>>>>>> |
<<<<<<<
export * from "./middlewares/GlobalAcceptMimesMiddleware";
=======
export * from "./components/ServerLoader";
>>>>>>>
<<<<<<<
export * from "./decorators/responseView";
=======
export * from "./decorators/serverSettings";
export * from "./decorators/expressApplication";
export * from "./decorators/ExpressRouter";
export * from "./decorators/routerSettings";
>>>>>>>
<<<<<<<
export * from "./services/PlatformExpressHandler";
=======
export * from "./services/PlatformExpressHandler";
export * from "./services/PlatformExpressResponse";
// UTILS
export * from "./utils";
>>>>>>>
export * from "./services/PlatformExpressHandler";
export * from "./services/PlatformExpressResponse"; |
<<<<<<<
return ParamFn(param => {
if (isParameterType(paramType)) {
param.parameter!.in(paramType);
}
=======
return ParamFn((param) => {
>>>>>>>
return ParamFn((param) => {
if (isParameterType(paramType)) {
param.parameter!.in(paramType);
} |
<<<<<<<
"get": {
"operationId": "queryParamsSwaggerControllerScenario1",
"parameters": [
=======
get: {
operationId: "QueryParamsSwaggerController.scenario1",
parameters: [
>>>>>>>
get: {
operationId: "queryParamsSwaggerControllerScenario1",
parameters: [
<<<<<<<
"get": {
"operationId": "queryParamsSwaggerControllerScenario2",
"parameters": [
=======
get: {
operationId: "QueryParamsSwaggerController.scenario2",
parameters: [
>>>>>>>
get: {
operationId: "queryParamsSwaggerControllerScenario2",
parameters: [
<<<<<<<
"get": {
"operationId": "queryParamsSwaggerControllerScenario3",
"parameters": [
=======
get: {
operationId: "QueryParamsSwaggerController.scenario3",
parameters: [
>>>>>>>
get: {
operationId: "queryParamsSwaggerControllerScenario3",
parameters: [
<<<<<<<
"get": {
"operationId": "queryParamsSwaggerControllerScenario4",
"parameters": [
=======
get: {
operationId: "QueryParamsSwaggerController.scenario4",
parameters: [
>>>>>>>
get: {
operationId: "queryParamsSwaggerControllerScenario4",
parameters: [ |
<<<<<<<
import {Ignore, Property} from "@tsed/schema";
import {expect} from "chai";
=======
import {expect} from "chai";
>>>>>>>
<<<<<<<
import {ConverterService} from "../../../src/mvc/services/ConverterService";
=======
>>>>>>> |
<<<<<<<
operationPaths.forEach(({path, method}) => {
if (!!method) {
=======
pathsMethods.forEach(({path, method}) => {
if (method) {
>>>>>>>
operationPaths.forEach(({path, method}) => {
if (method) { |
<<<<<<<
"get": {
"operationId": "calendarsControllerGetAll",
"parameters": [],
"produces": [
"application/json"
],
"responses": {
=======
get: {
operationId: "CalendarsController.getAll",
responses: {
>>>>>>>
get: {
operationId: "calendarsControllerGetAll",
parameters: [],
produces: ["application/json"],
responses: {
<<<<<<<
=======
"/rest/calendars/events": {
get: {
description: "Events",
operationId: "EventCtrl.get",
responses: {
"200": {
description: "Success"
}
},
tags: ["EventCtrl"]
}
},
>>>>>>>
<<<<<<<
"get": {
"operationId": "calendarsControllerGet",
"parameters": [
=======
get: {
operationId: "CalendarsController.get",
parameters: [
>>>>>>>
get: {
operationId: "calendarsControllerGet",
parameters: [
<<<<<<<
"produces": [
"application/json"
],
"responses": {
=======
responses: {
>>>>>>>
produces: ["application/json"],
responses: {
<<<<<<<
"produces": [
"application/json"
],
"securityDefinitions": {},
"swagger": "2.0",
"tags": [
{
"name": "EventCtrl"
},
{
"name": "CalendarsController"
}
]
=======
produces: ["application/json"],
securityDefinitions: {}
>>>>>>>
produces: ["application/json"],
securityDefinitions: {},
swagger: "2.0",
tags: [
{
name: "EventCtrl"
},
{
name: "CalendarsController"
}
] |
<<<<<<<
=======
class Test {
method(arg1: any, arg2: any) {}
}
class Parent {
id: string;
name: string;
categoryId: string;
}
class Children extends Parent {
id: string;
test: string;
categoryId: string;
}
class Children2 extends Parent {
id: string;
test: string;
categoryId: string;
}
>>>>>>>
<<<<<<<
expect(propertyMetadata.required)
.to.be.a("boolean")
.and.to.eq(true);
=======
it("should return the required value", () => {
expect(propertyMetadata.required).to.be.a("boolean").and.to.eq(true);
});
>>>>>>>
expect(propertyMetadata.required).to.be.a("boolean").and.to.eq(true);
<<<<<<<
class Test {
test: string;
}
=======
before(() => {});
>>>>>>>
class Test {
test: string;
}
<<<<<<<
=======
before(() => {});
>>>>>>> |
<<<<<<<
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(`${rmrf} lib`, 'tsc -b', 'oclif-dev manifest', 'oclif-dev readme', 'npm shrinkwrap')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json npm-shrinkwrap.json`
=======
if (['plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepack, 'oclif-dev manifest', 'oclif-dev readme')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json`
>>>>>>>
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepack, 'oclif-dev manifest', 'oclif-dev readme')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json`
<<<<<<<
if (this.tslint && this.type !== 'sfdx-plugin') {
=======
if (this.mocha) {
devDependencies.push(
'@types/chai@^4',
'@types/mocha@^5',
)
}
if (this.tslint) {
>>>>>>>
if (this.mocha) {
devDependencies.push(
'@types/chai@^4',
'@types/mocha@^5',
)
}
if (this.tslint) { |
<<<<<<<
const validLoaderOptions: ValidLoaderOptions[] = ['silent', 'logLevel', 'logInfoToStdOut', 'instance', 'compiler', 'contextAsConfigBasePath', 'configFile', 'transpileOnly', 'ignoreDiagnostics', 'errorFormatter', 'colors', 'compilerOptions', 'appendTsSuffixTo', 'appendTsxSuffixTo', 'entryFileCannotBeJs' /* DEPRECATED */, 'onlyCompileBundledFiles', 'happyPackMode', 'getCustomTransformers', 'reportFiles'];
=======
const validLoaderOptions: ValidLoaderOptions[] = ['silent', 'logLevel', 'logInfoToStdOut', 'instance', 'compiler', 'contextAsConfigBasePath', 'configFile', 'transpileOnly', 'ignoreDiagnostics', 'errorFormatter', 'colors', 'compilerOptions', 'appendTsSuffixTo', 'appendTsxSuffixTo', 'entryFileCannotBeJs' /* DEPRECATED */, 'onlyCompileBundledFiles', 'happyPackMode', 'getCustomTransformers', 'experimentalWatchApi'];
>>>>>>>
const validLoaderOptions: ValidLoaderOptions[] = ['silent', 'logLevel', 'logInfoToStdOut', 'instance', 'compiler', 'contextAsConfigBasePath', 'configFile', 'transpileOnly', 'ignoreDiagnostics', 'errorFormatter', 'colors', 'compilerOptions', 'appendTsSuffixTo', 'appendTsxSuffixTo', 'entryFileCannotBeJs' /* DEPRECATED */, 'onlyCompileBundledFiles', 'happyPackMode', 'getCustomTransformers', 'reportFiles', 'experimentalWatchApi'];
<<<<<<<
onlyCompileBundledFiles: false,
reportFiles: []
=======
onlyCompileBundledFiles: false,
// When the watch API usage stabilises look to remove this option and make watch usage the default behaviour when available
experimentalWatchApi: false
>>>>>>>
onlyCompileBundledFiles: false,
reportFiles: []
// When the watch API usage stabilises look to remove this option and make watch usage the default behaviour when available
experimentalWatchApi: false |
<<<<<<<
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepack, 'oclif-dev manifest', 'oclif-dev readme')
this.pjson.scripts.postpack = nps.series(this.pjson.scripts.postpack, 'rm -f .oclif.manifest.json')
=======
if (['plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepare, 'oclif-dev manifest', 'oclif-dev readme', 'npm shrinkwrap')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json npm-shrinkwrap.json`
>>>>>>>
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepare, 'oclif-dev manifest', 'oclif-dev readme', 'npm shrinkwrap')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json npm-shrinkwrap.json`
<<<<<<<
this.pjson.files.push('.oclif.manifest.json')
if (this.type === 'sfdx-plugin') {
this.pjson.files.push('/messages')
this.pjson.scripts.prepare = this.pjson.scripts.prepack
}
=======
this.pjson.files.push('/oclif.manifest.json')
this.pjson.files.push('/npm-shrinkwrap.json')
}
if (this.type === 'plugin' && hasYarn) {
// for plugins, add yarn.lock file to package so we can lock plugin dependencies
this.pjson.files.push('/yarn.lock')
>>>>>>>
this.pjson.files.push('/oclif.manifest.json')
this.pjson.files.push('/npm-shrinkwrap.json')
if (this.type === 'sfdx-plugin') {
this.pjson.files.push('/messages')
this.pjson.scripts.prepare = this.pjson.scripts.prepack
}
}
if (this.type === 'plugin' && hasYarn) {
// for plugins, add yarn.lock file to package so we can lock plugin dependencies
this.pjson.files.push('/yarn.lock')
<<<<<<<
if (this.type === 'sfdx-plugin') {
this.fs.copyTpl(this.templatePath('sfdxPlugin/test/tsconfig.json'), this.destinationPath('test/tsconfig.json'), this)
} else {
this.fs.copyTpl(this.templatePath('test/tsconfig.json'), this.destinationPath('test/tsconfig.json'), this)
}
=======
this.fs.copyTpl(this.templatePath('test/tsconfig.json'), this.destinationPath('test/tsconfig.json'), this)
this.fs.copyTpl(this.templatePath('nycrc'), this.destinationPath('.nycrc'), this)
>>>>>>>
if (this.type === 'sfdx-plugin') {
this.fs.copyTpl(this.templatePath('sfdxPlugin/test/tsconfig.json'), this.destinationPath('test/tsconfig.json'), this)
} else {
this.fs.copyTpl(this.templatePath('test/tsconfig.json'), this.destinationPath('test/tsconfig.json'), this)
}
this.fs.copyTpl(this.templatePath('nycrc'), this.destinationPath('.nycrc'), this) |
<<<<<<<
public async executeJavaScript<T>(scriptCode: string): Promise<T> {
=======
/**
* Always load the Fetch-polyfill on Android.
*
* Native 'Fetch API' on Android rejects all request for resources no HTTP or HTTPS.
* This breaks x-local requests (and file://).
*/
public ensureFetchSupport() {
this.writeTrace("WebViewExt<android>.ensureFetchSupport() - Override 'Fetch API' to support x-local.");
// The polyfill is not loaded if fetch already exists, start by null'ing it.
return this.executeJavaScript(
`
try {
window.fetch = null;
} catch (err) {
}
`,
).then(() => this.loadFetchPolyfill());
}
public executeJavaScript<T>(scriptCode: string): Promise<T> {
>>>>>>>
/**
* Always load the Fetch-polyfill on Android.
*
* Native 'Fetch API' on Android rejects all request for resources no HTTP or HTTPS.
* This breaks x-local requests (and file://).
*/
public ensureFetchSupport() {
this.writeTrace("WebViewExt<android>.ensureFetchSupport() - Override 'Fetch API' to support x-local.");
// The polyfill is not loaded if fetch already exists, start by null'ing it.
return this.executeJavaScript(
`
try {
window.fetch = null;
} catch (err) {
}
`,
).then(() => this.loadFetchPolyfill());
}
public async executeJavaScript<T>(scriptCode: string): Promise<T> {
<<<<<<<
/**
* Older Android WebView don't support promises.
* Inject the promise-polyfill if needed.
*/
protected async ensurePromiseSupport() {
if (androidSDK >= 21 || WebViewExt.isPromiseSupported) {
return;
}
if (typeof WebViewExt.isPromiseSupported === "undefined") {
this.writeTrace("WebViewExt<android>.ensurePromiseSupport() - need to check for promise support.");
WebViewExt.isPromiseSupported = (await this.executeJavaScript("typeof Promise")) !== "undefined";
if (WebViewExt.isPromiseSupported) {
this.writeTrace("WebViewExt<android>.ensurePromiseSupport() - promise is supported - polyfill not needed.");
return;
}
this.writeTrace("WebViewExt<android>.ensurePromiseSupport() - promise is not supported - polyfill needed.");
return await this.loadPromisePolyfill();
}
this.writeTrace("WebViewExt<android>.ensurePromiseSupport() - promise is not supported - polyfill needed.");
return await this.loadPromisePolyfill();
}
protected loadPromisePolyfill() {
return promisePolyfillJsCodePromise.then((scriptCode) => this.executeJavaScript(scriptCode)).then(() => void 0);
}
protected injectWebViewBridge() {
return super.injectWebViewBridge().then(() => this.ensurePromiseSupport());
}
public async getTitle() {
return this.nativeViewProtected.getTitle();
=======
public getTitle() {
return Promise.resolve(this.nativeViewProtected.getTitle());
>>>>>>>
public getTitle() {
return Promise.resolve(this.nativeViewProtected.getTitle()); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.