conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
import { RenderEditProps } from "../../core/blocks/BlockDefinition";
=======
import { RecommendedBlock, RequiredBlock } from "./dto";
import { getInvalidInnerBlocks } from "../../functions/validators";
import { InvalidBlockReason } from "./enums";
import { RenderEditProps, RenderSaveProps } from "../../core/blocks/BlockDefinition";
>>>>>>>
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
import { RenderEditProps, RenderSaveProps } from "../../core/blocks/BlockDefinition";
<<<<<<<
import validateMany from "../../functions/validators/validateMany";
=======
import BlockLeaf from "../../core/blocks/BlockLeaf";
>>>>>>>
import BlockLeaf from "../../core/blocks/BlockLeaf";
import validateMany from "../../functions/validators/validateMany"; |
<<<<<<<
import { getInnerBlocks, getInnerblocksByName, insertBlockToInnerBlock } from "../../functions/innerBlocksHelper";
import { removeBlock, getBlockType } from "../../functions/blocks";
=======
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import { InvalidBlockReason } from "./enums";
>>>>>>>
import { InvalidBlockReason } from "./enums";
import { getInnerblocksByName, insertBlockToInnerBlock } from "../../functions/innerBlocksHelper";
import { removeBlock, getBlockType } from "../../functions/blocks";
import { RenderEditProps, RenderSaveProps } from "../../core/blocks/BlockDefinition";
import { getBlockByClientId } from "../../functions/BlockHelper";
<<<<<<<
edit( props: RenderSaveProps | RenderEditProps ): JSX.Element {
const attributes: WordPressInnerBlocks.Props = {};
=======
edit(): JSX.Element {
const properties: WordPressInnerBlocks.Props = {};
>>>>>>>
edit( props: RenderSaveProps | RenderEditProps ): JSX.Element {
const properties: WordPressInnerBlocks.Props = {};
<<<<<<<
attributes.renderAppender = () => {
// The type definition of InnerBlocks are wrong so cast to fix them haha.
=======
properties.renderAppender = () => {
// The type definition of InnerBlocks are wrong so cast to fix them.
>>>>>>>
properties.renderAppender = () => {
// The type definition of InnerBlocks are wrong so cast to fix them haha.
<<<<<<<
const requiredBlocks: any[] = [];
if ( this.options.requiredBlocks ) {
// Get innerblocks for current block.
const innerBlocks = getInnerBlocks( props.clientId );
const requiredBlockNames = this.options.requiredBlocks.map( ( requiredBlock ) => {
return requiredBlock.name;
} );
const findPresentBlocks = getInnerblocksByName( requiredBlockNames, innerBlocks );
const presentBlockNames = findPresentBlocks.map( ( presentBlock ) => {
return presentBlock.name;
} );
requiredBlockNames.forEach( ( requiredBlockName: string ) => {
const blockType = getBlockType( requiredBlockName );
if ( typeof blockType === "undefined" ) {
return;
}
if ( presentBlockNames.includes( requiredBlockName ) ) {
requiredBlocks.push( createElement( "div", {
onClick: () => {
const blocksToRemove = getInnerblocksByName( [ requiredBlockName ], innerBlocks );
blocksToRemove.forEach( ( blockToRemove ) => {
removeBlock( blockToRemove.clientId );
} );
},
}, blockType.title + " -" ) );
return;
}
requiredBlocks.push(
createElement(
"div",
{
onClick: () => {
const block = createBlock( requiredBlockName );
insertBlockToInnerBlock( block, props.clientId );
},
},
blockType.title + " +",
),
);
} );
}
const requiredBlocksPanel = createElement(
PanelBody,
{
title: "Required blocks",
children: [
createElement( PanelRow, {}, ...requiredBlocks ),
],
},
);
return createElement(
Fragment,
{
children: [
createElement( WordPressInnerBlocks, attributes ),
createElement( InspectorControls,
{
children: [
requiredBlocksPanel,
],
},
),
],
},
);
=======
return createElement( WordPressInnerBlocks, properties );
>>>>>>>
const requiredBlocks: any[] = [];
const currentBlock = getBlockByClientId( props.clientId );
if ( this.options.requiredBlocks ) {
// Get innerblocks for current block.
const requiredBlockNames = this.options.requiredBlocks.map( ( requiredBlock ) => {
return requiredBlock.name;
} );
const findPresentBlocks = getInnerblocksByName( currentBlock, requiredBlockNames );
const presentBlockNames = findPresentBlocks.map( ( presentBlock ) => {
return presentBlock.name;
} );
requiredBlockNames.forEach( ( requiredBlockName: string ) => {
const blockType = getBlockType( requiredBlockName );
if ( typeof blockType === "undefined" ) {
return;
}
if ( presentBlockNames.includes( requiredBlockName ) ) {
requiredBlocks.push( createElement( "div", {
onClick: () => {
const blocksToRemove = getInnerblocksByName( currentBlock, [ requiredBlockName ] );
blocksToRemove.forEach( ( blockToRemove ) => {
removeBlock( blockToRemove.clientId );
} );
},
}, blockType.title + " -" ) );
return;
}
requiredBlocks.push(
createElement(
"div",
{
onClick: () => {
const block = createBlock( requiredBlockName );
insertBlockToInnerBlock( block, props.clientId );
},
},
blockType.title + " +",
),
);
} );
}
const requiredBlocksPanel = createElement(
PanelBody,
{
title: "Required blocks",
children: [
createElement( PanelRow, {}, ...requiredBlocks ),
],
},
);
return createElement(
Fragment,
{
children: [
createElement( WordPressInnerBlocks, properties ),
createElement( InspectorControls,
{
children: [
requiredBlocksPanel,
],
},
),
],
},
); |
<<<<<<<
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import { BlockValidationResult, RequiredBlock } from "../../core/validation";
import BlockInstruction from "../../core/blocks/BlockInstruction";
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
=======
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import BlockInstruction from "../../core/blocks/BlockInstruction";
import { RequiredBlock } from "./dto";
import { getInvalidInnerBlocks } from "../../functions/validators";
import { InvalidBlockReason } from "./enums";
import { RenderEditProps } from "../../core/blocks/BlockDefinition";
import { getBlockByClientId } from "../../functions/BlockHelper";
import RequiredBlocks from "../../blocks/RequiredBlocks";
>>>>>>>
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import { BlockValidationResult, RequiredBlock } from "../../core/validation";
import BlockInstruction from "../../core/blocks/BlockInstruction";
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
import { RenderEditProps } from "../../core/blocks/BlockDefinition";
import { getBlockByClientId } from "../../functions/BlockHelper";
import RequiredBlocks from "../../blocks/RequiredBlocks";
<<<<<<<
=======
* Renders the sidebar.
*
* @param props The props.
*
* @returns The sidebar element to render.
*/
sidebar( props: RenderEditProps ): ReactElement | string {
const currentBlock = getBlockByClientId( props.clientId );
if ( this.options.requiredBlocks ) {
return RequiredBlocks( currentBlock, this.options.requiredBlocks );
}
return "";
}
/**
>>>>>>>
* Renders the sidebar.
*
* @param props The props.
* @param i The number the rendered element is of it's parent.
*
* @returns The sidebar element to render.
*/
sidebar( props: RenderEditProps ): ReactElement | string {
const currentBlock = getBlockByClientId( props.clientId );
if ( this.options.requiredBlocks ) {
return RequiredBlocks( currentBlock, this.options.requiredBlocks );
}
return "";
}
/** |
<<<<<<<
export * from './icon';
export * from './tab';
export * from './tab-list';
=======
export * from './overlay-root';
export * from './overlay-trigger';
export * from './popover';
>>>>>>>
export * from './icon';
export * from './tab';
export * from './tab-list';
export * from './overlay-root';
export * from './overlay-trigger';
export * from './popover'; |
<<<<<<<
import { ContentScriptsBackground } from 'src/content-scripts/background'
import { InPageUIBackground } from 'src/in-page-ui/background'
=======
import { AnalyticsBackground } from 'src/analytics/background'
import { Analytics } from 'src/analytics/types'
>>>>>>>
import { ContentScriptsBackground } from 'src/content-scripts/background'
import { InPageUIBackground } from 'src/in-page-ui/background'
import { AnalyticsBackground } from 'src/analytics/background'
import { Analytics } from 'src/analytics/types'
<<<<<<<
const tags = new TagsBackground({
storageManager,
pageStorage: pages.storage,
searchIndex,
queryTabs: bindMethod(options.browserAPIs.tabs, 'query'),
windows: options.browserAPIs.windows,
})
=======
>>>>>>> |
<<<<<<<
readable: RemoteReaderInterface
=======
contentSharing: ContentSharingInterface
>>>>>>>
readable: RemoteReaderInterface
contentSharing: ContentSharingInterface
<<<<<<<
readable: runInBackground<RemoteReaderInterface>(),
=======
contentSharing: runInBackground<ContentSharingInterface>(),
>>>>>>>
readable: runInBackground<RemoteReaderInterface>(),
contentSharing: runInBackground<ContentSharingInterface>(),
<<<<<<<
export const copyPaster = remoteFunctions.copyPaster
export const readable = remoteFunctions.readable
=======
export const copyPaster = remoteFunctions.copyPaster
export const contentSharing = remoteFunctions.contentSharing
>>>>>>>
export const copyPaster = remoteFunctions.copyPaster
export const readable = remoteFunctions.readable
export const contentSharing = remoteFunctions.contentSharing |
<<<<<<<
import { RemoteReaderInterface } from 'src/reader/types'
=======
import { RemoteCopyPasterInterface } from 'src/overview/copy-paster/background/types'
import { FeaturesBetaInterface } from 'src/features/background/feature-beta'
>>>>>>>
import { RemoteReaderInterface } from 'src/reader/types'
import { RemoteCopyPasterInterface } from 'src/overview/copy-paster/background/types'
import { FeaturesBetaInterface } from 'src/features/background/feature-beta'
<<<<<<<
readable: RemoteReaderInterface
=======
copyPaster: RemoteCopyPasterInterface
>>>>>>>
copyPaster: RemoteCopyPasterInterface
readable: RemoteReaderInterface
<<<<<<<
readable: runInBackground<RemoteReaderInterface>(),
=======
copyPaster: runInBackground<RemoteCopyPasterInterface>(),
>>>>>>>
copyPaster: runInBackground<RemoteCopyPasterInterface>(),
readable: runInBackground<RemoteReaderInterface>(),
<<<<<<<
export const collections = remoteFunctions.collections
export const readable = remoteFunctions.readable
=======
export const collections = remoteFunctions.collections
export const copyPaster = remoteFunctions.copyPaster
>>>>>>>
export const collections = remoteFunctions.collections
export const copyPaster = remoteFunctions.copyPaster
export const readable = remoteFunctions.readable |
<<<<<<<
import { ReaderBackground } from 'src/reader/background'
=======
import { ServerStorage } from 'src/storage/types'
import ContentSharingBackground from 'src/content-sharing/background'
>>>>>>>
import { ReaderBackground } from 'src/reader/background'
import { ServerStorage } from 'src/storage/types'
import ContentSharingBackground from 'src/content-sharing/background'
<<<<<<<
readable: ReaderBackground
=======
contentSharing: ContentSharingBackground
>>>>>>>
readable: ReaderBackground
contentSharing: ContentSharingBackground
<<<<<<<
reader: backgroundModules.readable.storage,
=======
contentSharing: backgroundModules.contentSharing.storage,
>>>>>>>
reader: backgroundModules.readable.storage,
contentSharing: backgroundModules.contentSharing.storage, |
<<<<<<<
private isTabPageIndexed(params: { tabId: number; fullPageUrl: string }) {
=======
indexPage = async (props: PageCreationProps) => {
const foundTabId = await this.options.tabManagement.findTabIdByFullUrl(
props.fullUrl,
)
if (foundTabId) {
props.tabId = foundTabId
} else {
delete props.tabId
}
if (props.tabId) {
await this.indexPageFromTab(props)
} else {
await this.indexPageFromUrl(props)
}
}
isTabPageIndexed(params: { tabId: number; fullPageUrl: string }) {
>>>>>>>
isTabPageIndexed(params: { tabId: number; fullPageUrl: string }) { |
<<<<<<<
import { ReaderBackground } from 'src/reader/background'
=======
import CopyPasterBackground from 'src/overview/copy-paster/background'
>>>>>>>
import CopyPasterBackground from 'src/overview/copy-paster/background'
import { ReaderBackground } from 'src/reader/background'
<<<<<<<
readable: ReaderBackground
=======
copyPaster: CopyPasterBackground
>>>>>>>
copyPaster: CopyPasterBackground
readable: ReaderBackground
<<<<<<<
reader: backgroundModules.readable.storage,
=======
copyPaster: backgroundModules.copyPaster.storage,
>>>>>>>
copyPaster: backgroundModules.copyPaster.storage,
reader: backgroundModules.readable.storage, |
<<<<<<<
async function getComponents(compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx): Promise<d.JsonDocsComponent[]> {
const components = await Promise.all(buildCtx.moduleFiles.map(async moduleFile => {
const filePath = moduleFile.sourceFilePath;
const dirPath = normalizePath(sys.path.dirname(filePath));
const readmePath = normalizePath(sys.path.join(dirPath, 'readme.md'));
const usagesDir = normalizePath(sys.path.join(dirPath, 'usage'));
const readme = await getUserReadmeContent(compilerCtx, readmePath);
const usage = await generateUsages(compilerCtx, usagesDir);
return moduleFile.cmps
.filter(cmp => isDocsPublic(cmp.docs))
.map(cmp => ({
=======
async function getComponents(config: d.Config, compilerCtx: d.CompilerCtx, diagnostics: d.Diagnostic[]): Promise<d.JsonDocsComponent[]> {
const cmpDirectories: Set<string> = new Set();
const promises = Object.keys(compilerCtx.moduleFiles)
.sort()
.filter(filePath => {
const moduleFile = compilerCtx.moduleFiles[filePath];
if (!moduleFile.cmpMeta || moduleFile.isCollectionDependency) {
return false;
}
if (!isDocsPublic(moduleFile.cmpMeta.jsdoc)) {
return false;
}
const dirPath = normalizePath(config.sys.path.dirname(filePath));
if (cmpDirectories.has(dirPath)) {
const warn = buildWarn(diagnostics);
warn.relFilePath = dirPath;
warn.messageText = `multiple components found in: ${dirPath}`;
return false;
}
cmpDirectories.add(dirPath);
return true;
})
.map(async filePath => {
const moduleFile = compilerCtx.moduleFiles[filePath];
const dirPath = normalizePath(config.sys.path.dirname(filePath));
const readmePath = normalizePath(config.sys.path.join(dirPath, 'readme.md'));
const usagesDir = normalizePath(config.sys.path.join(dirPath, 'usage'));
const membersMeta = Object.keys(moduleFile.cmpMeta.membersMeta)
.sort()
.map(memberName => [memberName, moduleFile.cmpMeta.membersMeta[memberName]] as [string, d.MemberMeta])
.filter(([_, member]) => isDocsPublic(member.jsdoc));
const readme = await getUserReadmeContent(compilerCtx, readmePath);
const docsTags = generateDocsTags(moduleFile.cmpMeta.jsdoc);
return {
>>>>>>>
async function getComponents(compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx): Promise<d.JsonDocsComponent[]> {
const components = await Promise.all(buildCtx.moduleFiles.map(async moduleFile => {
const filePath = moduleFile.sourceFilePath;
const dirPath = normalizePath(sys.path.dirname(filePath));
const readmePath = normalizePath(sys.path.join(dirPath, 'readme.md'));
const usagesDir = normalizePath(sys.path.join(dirPath, 'usage'));
const readme = await getUserReadmeContent(compilerCtx, readmePath);
const usage = await generateUsages(compilerCtx, usagesDir);
return moduleFile.cmps
.filter(cmp => isDocsPublic(cmp.docs))
.map(cmp => ({
<<<<<<<
=======
function getSlots(tags: d.JsonDocsTags[]): d.JsonDocsSlot[] {
return tags
.filter(tag => tag.name === 'slot' && tag.text)
.map(({text}) => {
const [namePart, ...rest] = (' ' + text).split(' - ');
return {
name: namePart.trim(),
docs: rest.join(' - ').trim()
};
})
.sort((a, b) => {
if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
return 0;
});
}
function getAttrName(memberMeta: d.MemberMeta) {
if (memberMeta.attribName) {
const propType = memberMeta.propType;
if (propType !== PROP_TYPE.Unknown) {
return memberMeta.attribName;
}
}
return undefined;
}
>>>>>>>
function getSlots(tags: d.JsonDocsTags[]): d.JsonDocsSlot[] {
return tags
.filter(tag => tag.name === 'slot' && tag.text)
.map(({text}) => {
const [namePart, ...rest] = (' ' + text).split(' - ');
return {
name: namePart.trim(),
docs: rest.join(' - ').trim()
};
})
.sort((a, b) => {
if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
return 0;
});
} |
<<<<<<<
export interface ComponentCompilerMeta {
=======
export interface ComponentCompilerMeta extends ComponentCompilerFeatures {
assetsDirs?: CompilerAssetDir[];
>>>>>>>
export interface ComponentCompilerMeta {
assetsDirs?: CompilerAssetDir[]; |
<<<<<<<
import * as path from 'path';
import { AbstractTextComponent, App, FileSystemAdapter, PluginSettingTab, Setting } from "obsidian";
import CitationPlugin from "./main";
=======
import {
AbstractTextComponent,
App,
FileSystemAdapter,
PluginSettingTab,
Setting,
} from 'obsidian';
import CitationPlugin from './main';
>>>>>>>
import * as path from 'path';
import {
AbstractTextComponent,
App,
FileSystemAdapter,
PluginSettingTab,
Setting,
} from 'obsidian';
import CitationPlugin from './main';
<<<<<<<
new Setting(containerEl)
.setName("Citation export path")
.setDesc("Path to citation library exported by your reference manager. " +
"Can be an absolute path or a path relative to the current vault root folder. " +
"Citations will be automatically reloaded whenever this file updates.")
.addText(input => this.buildTextInput(
input.setPlaceholder("/path/to/export.json"),
"citationExportPath",
(value) => {
this.checkCitationExportPath(value)
.then((success) => success
&& this.plugin.loadLibrary().then(() => this.showCitationExportPathSuccess()));
}));
this.citationPathErrorEl = containerEl.createEl(
"p", {cls: "zoteroSettingCitationPathError d-none",
text: "The citation export file cannot be found. Please check the path above."});
this.citationPathSuccessEl = containerEl.createEl(
"p", {cls: "zoteroSettingCitationPathSuccess d-none",
text: "Loaded library with {{n}} references."});
new Setting(containerEl)
.setName("Literature note folder")
.addText(input => this.buildTextInput(input, "literatureNoteFolder"))
.setDesc("Save literature note files in this folder within your vault. If empty, notes will be stored in the root directory of the vault.");
containerEl.createEl("h3", {text: "Literature note settings"});
containerEl.createEl("p", {text: "The following variables can be used in the title and content templates:"});
let templateVariableUl = containerEl.createEl("ul", {attr: {id: "citationTemplateVariables"}});
Object.entries(this.plugin.TEMPLATE_VARIABLES).forEach(variableData => {
let [key, description] = variableData,
templateVariableItem = templateVariableUl.createEl("li"),
templateVariableItemKey = templateVariableItem.createEl("span", {cls: "text-monospace", text: "{{" + key + "}}"}),
templateVariableItemDescription = templateVariableItem.createEl("span", {text: description ? ` — ${description}` : ""});
console.log(variableData, key, description);
});
new Setting(containerEl)
.setName("Literature note title template")
.addText(input => this.buildTextInput(input, "literatureNoteTitleTemplate"));
new Setting(containerEl)
.setName("Literature note content template")
.addTextArea(input => this.buildTextInput(input, "literatureNoteContentTemplate"));
}
/**
* Returns true iff the path exists; displays error as a side-effect
*/
async checkCitationExportPath(filePath: string): Promise<boolean> {
try {
await FileSystemAdapter.readLocalFile(this.plugin.resolveLibraryPath(filePath));
this.citationPathErrorEl.addClass("d-none");
} catch (e) {
this.citationPathSuccessEl.addClass("d-none");
this.citationPathErrorEl.removeClass("d-none");
return false;
}
return true;
}
showCitationExportPathSuccess() {
if (!this.plugin.library)
return;
const numReferences = Object.keys(this.plugin.library).length;
this.citationPathSuccessEl.setText(`Loaded library with ${numReferences} references.`);
this.citationPathSuccessEl.removeClass("d-none");
}
=======
new Setting(containerEl).setName('Citation export path').addText((input) =>
this.buildTextInput(
input.setPlaceholder('/path/to/export.json'),
'citationExportPath',
(value) => {
this.checkCitationExportPath(value).then(
(success) => success && this.plugin.loadLibrary(),
);
},
),
);
this.citationPathErrorEl = containerEl.createEl('p', {
cls: 'zoteroSettingCitationPathError d-none',
text:
'The citation export file cannot be found. Please check the path above.',
});
this.citationPathSuccessEl = containerEl.createEl('p', {
cls: 'zoteroSettingCitationPathSuccess d-none',
text: 'Loaded library with {{n}} references.',
});
new Setting(containerEl)
.setName('Literature note folder')
.addText((input) => this.buildTextInput(input, 'literatureNoteFolder'))
.setDesc(
'Save literature note files in this folder within your vault. If empty, notes will be stored in the root directory of the vault.',
);
containerEl.createEl('h3', { text: 'Literature note settings' });
containerEl.createEl('p', {
text:
'The following variables can be used in the title and content templates:',
});
const templateVariableUl = containerEl.createEl('ul', {
attr: { id: 'citationTemplateVariables' },
});
Object.entries(this.plugin.TEMPLATE_VARIABLES).forEach((variableData) => {
const [key, description] = variableData,
templateVariableItem = templateVariableUl.createEl('li');
// templateVariableItemKey =
templateVariableItem.createEl('span', {
cls: 'text-monospace',
text: '{{' + key + '}}',
});
// templateVariableItemDescription =
templateVariableItem.createEl('span', {
text: description ? ` — ${description}` : '',
});
console.log(variableData, key, description);
});
new Setting(containerEl)
.setName('Literature note title template')
.addText((input) =>
this.buildTextInput(input, 'literatureNoteTitleTemplate'),
);
new Setting(containerEl)
.setName('Literature note content template')
.addTextArea((input) =>
this.buildTextInput(input, 'literatureNoteContentTemplate'),
);
}
/**
* Returns true iff the path exists; displays error as a side-effect
*/
async checkCitationExportPath(path: string): Promise<boolean> {
try {
await FileSystemAdapter.readLocalFile(path);
this.citationPathErrorEl.addClass('d-none');
} catch (e) {
this.citationPathSuccessEl.addClass('d-none');
this.citationPathErrorEl.removeClass('d-none');
return false;
}
return true;
}
showCitationExportPathSuccess(): void {
if (!this.plugin.library) return;
const numReferences = Object.keys(this.plugin.library).length;
this.citationPathSuccessEl.setText(
`Loaded library with ${numReferences} references.`,
);
this.citationPathSuccessEl.removeClass('d-none');
}
>>>>>>>
new Setting(containerEl)
.setName('Citation export path')
.setDesc(
'Path to citation library exported by your reference manager. ' +
'Can be an absolute path or a path relative to the current vault root folder. ' +
'Citations will be automatically reloaded whenever this file updates.',
)
.addText((input) =>
this.buildTextInput(
input.setPlaceholder('/path/to/export.json'),
'citationExportPath',
(value) => {
this.checkCitationExportPath(value).then(
(success) =>
success &&
this.plugin
.loadLibrary()
.then(() => this.showCitationExportPathSuccess()),
);
},
),
);
this.citationPathErrorEl = containerEl.createEl('p', {
cls: 'zoteroSettingCitationPathError d-none',
text:
'The citation export file cannot be found. Please check the path above.',
});
this.citationPathSuccessEl = containerEl.createEl('p', {
cls: 'zoteroSettingCitationPathSuccess d-none',
text: 'Loaded library with {{n}} references.',
});
new Setting(containerEl)
.setName('Literature note folder')
.addText((input) => this.buildTextInput(input, 'literatureNoteFolder'))
.setDesc(
'Save literature note files in this folder within your vault. If empty, notes will be stored in the root directory of the vault.',
);
containerEl.createEl('h3', { text: 'Literature note settings' });
containerEl.createEl('p', {
text:
'The following variables can be used in the title and content templates:',
});
let templateVariableUl = containerEl.createEl('ul', {
attr: { id: 'citationTemplateVariables' },
});
Object.entries(this.plugin.TEMPLATE_VARIABLES).forEach((variableData) => {
let [key, description] = variableData,
templateVariableItem = templateVariableUl.createEl('li'),
templateVariableItemKey = templateVariableItem.createEl('span', {
cls: 'text-monospace',
text: '{{' + key + '}}',
}),
templateVariableItemDescription = templateVariableItem.createEl(
'span',
{ text: description ? ` — ${description}` : '' },
);
console.log(variableData, key, description);
});
new Setting(containerEl)
.setName('Literature note title template')
.addText((input) =>
this.buildTextInput(input, 'literatureNoteTitleTemplate'),
);
new Setting(containerEl)
.setName('Literature note content template')
.addTextArea((input) =>
this.buildTextInput(input, 'literatureNoteContentTemplate'),
);
}
/**
* Returns true iff the path exists; displays error as a side-effect
*/
async checkCitationExportPath(filePath: string): Promise<boolean> {
try {
await FileSystemAdapter.readLocalFile(
this.plugin.resolveLibraryPath(filePath),
);
this.citationPathErrorEl.addClass('d-none');
} catch (e) {
this.citationPathSuccessEl.addClass('d-none');
this.citationPathErrorEl.removeClass('d-none');
return false;
}
return true;
}
showCitationExportPathSuccess() {
if (!this.plugin.library) return;
const numReferences = Object.keys(this.plugin.library).length;
this.citationPathSuccessEl.setText(
`Loaded library with ${numReferences} references.`,
);
this.citationPathSuccessEl.removeClass('d-none');
} |
<<<<<<<
import { Gender } from "../../../shared/enums/gender.enum";
import { HeartRateImpulseMode } from "../enums/heart-rate-impulse-mode.enum";
import { FitnessUserSettingsModel } from "../models/fitness-user-settings.model";
=======
import { AppError } from "../../../shared/models/app-error.model";
>>>>>>>
import { Gender } from "../../../shared/enums/gender.enum";
import { HeartRateImpulseMode } from "../enums/heart-rate-impulse-mode.enum";
import { FitnessUserSettingsModel } from "../models/fitness-user-settings.model";
import { AppError } from "../../../shared/models/app-error.model";
<<<<<<<
public static readonly DEFAULT_LTHR_HR_MAX_FACTOR: number = 0.86;
=======
public static readonly ERROR_NO_MINIMUM_REQUIRED_ACTIVITIES: string = "FT_1";
>>>>>>>
public static readonly ERROR_NO_MINIMUM_REQUIRED_ACTIVITIES: string = "FT_1";
public static readonly DEFAULT_LTHR_HR_MAX_FACTOR: number = 0.86; |
<<<<<<<
import { YearProgressComponent } from "../../year-progress/year-progress.component";
=======
import { DonateComponent } from "../../donate/donate.component";
import { ReleasesNotesComponent } from "../../releases-notes/releases-notes.component";
import { ReleasesNotesResolverService } from "../../releases-notes/releases-notes-resolver.service";
>>>>>>>
import { DonateComponent } from "../../donate/donate.component";
import { ReleasesNotesComponent } from "../../releases-notes/releases-notes.component";
import { ReleasesNotesResolverService } from "../../releases-notes/releases-notes-resolver.service";
import { YearProgressComponent } from "../../year-progress/year-progress.component";
<<<<<<<
{path: AppRoutesModel.fitnessTrend, component: FitnessTrendComponent},
{path: AppRoutesModel.commonSettings, component: CommonSettingsComponent},
{path: AppRoutesModel.athleteSettings, component: AthleteSettingsComponent},
{path: AppRoutesModel.zonesSettings, component: ZonesSettingsComponent},
{path: AppRoutesModel.zonesSettings + "/:zoneValue", component: ZonesSettingsComponent},
{path: AppRoutesModel.yearProgress, component: YearProgressComponent},
{path: "", redirectTo: AppRoutesModel.commonSettings, pathMatch: "full"},
=======
{
path: AppRoutesModel.fitnessTrend,
component: FitnessTrendComponent
},
{
path: AppRoutesModel.commonSettings,
component: CommonSettingsComponent
},
{
path: AppRoutesModel.athleteSettings,
component: AthleteSettingsComponent
},
{
path: AppRoutesModel.zonesSettings,
component: ZonesSettingsComponent
},
{
path: AppRoutesModel.zonesSettings + "/:zoneValue",
component: ZonesSettingsComponent
},
{
path: "", redirectTo: AppRoutesModel.commonSettings, pathMatch: "full"
},
{
path: AppRoutesModel.donate,
component: DonateComponent
},
{
path: AppRoutesModel.releasesNotes,
component: ReleasesNotesComponent,
resolve: {
releasesNotes: ReleasesNotesResolverService
}
},
>>>>>>>
{
path: AppRoutesModel.fitnessTrend,
component: FitnessTrendComponent
},
{
path: AppRoutesModel.yearProgress,
component: YearProgressComponent
},
{
path: AppRoutesModel.commonSettings,
component: CommonSettingsComponent
},
{
path: AppRoutesModel.athleteSettings,
component: AthleteSettingsComponent
},
{
path: AppRoutesModel.zonesSettings,
component: ZonesSettingsComponent
},
{
path: AppRoutesModel.zonesSettings + "/:zoneValue",
component: ZonesSettingsComponent
},
{
path: "", redirectTo: AppRoutesModel.commonSettings, pathMatch: "full"
},
{
path: AppRoutesModel.donate,
component: DonateComponent
},
{
path: AppRoutesModel.releasesNotes,
component: ReleasesNotesComponent,
resolve: {
releasesNotes: ReleasesNotesResolverService
}
}, |
<<<<<<<
new NumberColumn(Category.COMMON, "extendedStats.runningPerformanceIndex", null, "Run Performance Index", Print.number, 2),
=======
new NumberColumn(Category.COMMON, "calories", null, "Calories", Print.number).setDefault(true),
>>>>>>>
new NumberColumn(Category.COMMON, "extendedStats.runningPerformanceIndex", null, "Run Performance Index", Print.number, 2),
new NumberColumn(Category.COMMON, "calories", null, "Calories", Print.number).setDefault(true), |
<<<<<<<
public get userSettings(): IUserSettings {
=======
/**
* Check for goals element and enable GoalsModifier.
*
* This checks the document for a #progress-goals-v2 element. If
* found then the GoalsModifier is enabled and bound to the element.
* However, note that the modifier only works for the current athelete,
* and hence is only enabled on the dashboard and current user's profile
* pages.
*
* If the `displayExtendedGoals` user setting is falsey then this
* handler does nothing.
*/
protected handleGoalsModifier(): void {
if (!this._userSettings.displayExtendedGoals) {
return;
}
let goals = $('#progress-goals-v2');
if (goals.length > 0) {
let pageProfile = new RegExp(`^/athletes/${this.athleteId}$`);
let pageDashboard = new RegExp('^/dashboard');
if (window.location.pathname.match(pageProfile)
|| window.location.pathname.match(pageDashboard)) {
new GoalsModifier(goals).modify();
}
}
}
public get userSettings(): UserSettings {
>>>>>>>
/**
* Check for goals element and enable GoalsModifier.
*
* This checks the document for a #progress-goals-v2 element. If
* found then the GoalsModifier is enabled and bound to the element.
* However, note that the modifier only works for the current athelete,
* and hence is only enabled on the dashboard and current user's profile
* pages.
*
* If the `displayExtendedGoals` user setting is falsey then this
* handler does nothing.
*/
protected handleGoalsModifier(): void {
if (!this._userSettings.displayExtendedGoals) {
return;
}
let goals = $('#progress-goals-v2');
if (goals.length > 0) {
let pageProfile = new RegExp(`^/athletes/${this.athleteId}$`);
let pageDashboard = new RegExp('^/dashboard');
if (window.location.pathname.match(pageProfile)
|| window.location.pathname.match(pageDashboard)) {
new GoalsModifier(goals).modify();
}
}
}
public get userSettings(): IUserSettings { |
<<<<<<<
export interface DateTextFieldProps extends TextFieldProps {
minDate?: DateType;
minDateMessage?: string;
disablePast?: boolean;
disableFuture?: boolean;
maxDate?: DateType;
maxDateMessage?: string;
value: any;
=======
export interface DateTextFieldProps extends Omit<TextFieldProps, 'onChange' | 'value'> {
value: DateType;
>>>>>>>
export interface DateTextFieldProps extends Omit<TextFieldProps, 'onChange' | 'value'> {
value: DateType;
minDate?: DateType;
minDateMessage?: string;
disablePast?: boolean;
disableFuture?: boolean;
maxDate?: DateType;
maxDateMessage?: string; |
<<<<<<<
set(key: string, value: any): Promise<any> {
return this._db.setItem(key, value);
=======
set(key: string, value: any) {
return this._dbPromise.then(db => db.setItem(key, value));
>>>>>>>
set(key: string, value: any): Promise<any> {
return this._dbPromise.then(db => db.setItem(key, value));
<<<<<<<
remove(key: string): Promise<null> {
return this._db.removeItem(key);
=======
remove(key: string) {
return this._dbPromise.then(db => db.removeItem(key));
>>>>>>>
remove(key: string): Promise<any> {
return this._dbPromise.then(db => db.removeItem(key));
<<<<<<<
clear() : Promise<null> {
return this._db.clear();
=======
clear() {
return this._dbPromise.then(db => db.clear());
>>>>>>>
clear(): Promise<null> {
return this._dbPromise.then(db => db.clear());
<<<<<<<
length(): Promise<number> {
return this._db.length();
=======
length() {
return this._dbPromise.then(db => db.length());
>>>>>>>
length(): Promise<number> {
return this._dbPromise.then(db => db.length());
<<<<<<<
keys(): Promise<string[]> {
return this._db.keys();
=======
keys() {
return this._dbPromise.then(db => db.keys());
>>>>>>>
keys(): Promise<string[]> {
return this._dbPromise.then(db => db.keys()); |
<<<<<<<
import { from } from 'rxjs';
import { Address, TransportApi } from '@scalecube/api';
=======
import { Address, TransportApi, DiscoveryApi, MicroserviceApi } from '@scalecube/api';
import { createDiscovery } from '@scalecube/scalecube-discovery';
>>>>>>>
import { Address, TransportApi, DiscoveryApi, MicroserviceApi } from '@scalecube/api';
import { createDiscovery } from '@scalecube/scalecube-discovery';
<<<<<<<
// import { createDiscovery, Api as DiscoveryAPI } from '@scalecube/scalecube-discovery';
=======
import { check, getAddress, getFullAddress, saveToLogs, isNodejs } from '@scalecube/utils';
import { tap } from 'rxjs/operators';
>>>>>>>
import { check, getAddress, getFullAddress, saveToLogs, isNodejs } from '@scalecube/utils';
import { tap } from 'rxjs/operators';
<<<<<<<
export const Microservices: MicroservicesInterface = Object.freeze({
create: (options: MicroserviceOptions): Microservice => {
const microserviceOptions = {
services: [],
// discovery: createDiscovery,
transport: TransportBrowser,
...options,
=======
if (check.isString(microserviceOptions.address)) {
microserviceOptions = { ...microserviceOptions, address: getAddress(microserviceOptions.address as string) };
}
if (check.isString(microserviceOptions.seedAddress)) {
microserviceOptions = {
...microserviceOptions,
seedAddress: getAddress(microserviceOptions.seedAddress as string),
>>>>>>>
if (check.isString(microserviceOptions.address)) {
microserviceOptions = { ...microserviceOptions, address: getAddress(microserviceOptions.address as string) };
}
if (check.isString(microserviceOptions.seedAddress)) {
microserviceOptions = {
...microserviceOptions,
seedAddress: getAddress(microserviceOptions.seedAddress as string),
<<<<<<<
// if address is not available then microservice can't share services
const endPointsToPublishInCluster = address
? serviceRegistry.createEndPoints({
services,
address,
}) || []
: [];
const discoveryInstance: any = {
destroy: () => Promise.resolve(),
discoveredItems$: () => from([]),
};
// const discoveryInstance: DiscoveryAPI.Discovery = createDiscoveryInstance({
// address,
// itemsToPublish: endPointsToPublishInCluster,
// seedAddress,
// discovery,
// });
// server use only localCall therefor, router is irrelevant
const defaultLocalCall = getServiceCall({
router: defaultRouter,
microserviceContext,
transportClientProvider: transport.clientProvider,
});
// if address is not available then microservice can't start a server and get serviceCall requests
address &&
startServer({
address,
serviceCall: defaultLocalCall,
transportServerProvider: transport.serverProvider,
});
if (options && options.gateway) {
const gatewayServiceCall = getServiceCall({
router: options.gatewayRouter || defaultRouter,
microserviceContext,
transportClientProvider: transport.clientProvider,
});
options.gateway.start({ serviceCall: gatewayServiceCall });
}
=======
const transportClientProvider = transport && (transport as TransportApi.Transport).clientProvider;
>>>>>>>
if (options && options.gateway) {
const gatewayServiceCall = getServiceCall({
router: options.gatewayRouter || defaultRouter,
microserviceContext,
transportClientProvider: transport.clientProvider,
});
options.gateway.start({ serviceCall: gatewayServiceCall });
}
const transportClientProvider = transport && (transport as TransportApi.Transport).clientProvider;
<<<<<<<
};
// const createDiscoveryInstance = (opt: {
// address?: Address;
// seedAddress?: Address;
// itemsToPublish: Endpoint[];
// discovery: (...data: any[]) => DiscoveryAPI.Discovery;
// }): DiscoveryAPI.Discovery => {
// const { address, seedAddress, itemsToPublish, discovery } = opt;
// const discoveryInstance = discovery({
// address,
// itemsToPublish,
// seedAddress,
// });
// validateDiscoveryInstance(discoveryInstance);
// return discoveryInstance;
// };
=======
};
>>>>>>>
}; |
<<<<<<<
import webComponent from './web-component';
import route, { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
export { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
=======
import { Route, route, ROUTER_EVENT, ROUTER_404_EVENT } from './router';
>>>>>>>
import webComponent from './web-component';
import { Route, route, ROUTER_EVENT, ROUTER_404_EVENT } from './router';
<<<<<<<
webComponent(name: string, componentClass, options?): void;
=======
route?: Route;
>>>>>>>
route?: Route;
webComponent(name: string, componentClass, options?): void; |
<<<<<<<
webComponent(name: string, componentClass, options?): void;
=======
route?: Route;
>>>>>>>
route?: Route;
webComponent(name: string, componentClass, options?): void; |
<<<<<<<
import route from './router';
import webComponent from './web-component';
=======
import route, { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
export { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
>>>>>>>
import webComponent from './web-component';
import route, { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
export { ROUTER_EVENT, ROUTER_404_EVENT } from './router'; |
<<<<<<<
captureException(res, ctx, withScope, reportError)
=======
captureException(sentryInstance, res, ctx, withScope)
>>>>>>>
captureException(sentryInstance, res, ctx, withScope, reportError)
<<<<<<<
} catch (err) {
captureException(err, ctx, withScope, reportError)
=======
} catch (error) {
captureException(sentryInstance, error, ctx, withScope)
>>>>>>>
} catch (error) {
captureException(sentryInstance, error, ctx, withScope, reportError)
<<<<<<<
if (reportError && !reportError(err)) {
Sentry.withScope(scope => {
withScope(scope, err, ctx)
Sentry.captureException(err)
})
}
=======
sentryInstance.withScope(scope => {
withScope(scope, error, ctx)
sentryInstance.captureException(error)
})
>>>>>>>
if (reportError && !reportError(err)) {
sentryInstance.withScope(scope => {
withScope(scope, error, ctx)
sentryInstance.captureException(error)
})
} |
<<<<<<<
count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<number> {
=======
async count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<number> {
>>>>>>>
async count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<number> {
<<<<<<<
find<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<Entity[]> {
=======
async find<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<Entity[]> {
>>>>>>>
async find<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<Entity[]> {
<<<<<<<
findAndCount<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<[Entity[], number]> {
=======
async findAndCount<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<[Entity[], number]> {
>>>>>>>
async findAndCount<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<[Entity[], number]> {
<<<<<<<
findByIds<Entity>(entityClass: ObjectType<Entity>|string, ids: any[], optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<Entity[]> {
=======
async findByIds<Entity>(entityClass: ObjectType<Entity>|string, ids: any[], optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<Entity[]> {
>>>>>>>
async findByIds<Entity>(entityClass: ObjectType<Entity>|string, ids: any[], optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<Entity[]> {
<<<<<<<
findOne<Entity>(entityClass: ObjectType<Entity>|string, idOrOptionsOrConditions?: string|string[]|number|number[]|Date|Date[]|ObjectID|ObjectID[]|FindOneOptions<Entity>|DeepPartial<Entity>, maybeOptions?: FindOneOptions<Entity>): Promise<Entity|undefined> {
=======
async findOne<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindOneOptions<Entity>|Partial<Entity>): Promise<Entity|undefined> {
>>>>>>>
async findOne<Entity>(entityClass: ObjectType<Entity>|string, idOrOptionsOrConditions?: string|string[]|number|number[]|Date|Date[]|ObjectID|ObjectID[]|FindOneOptions<Entity>|DeepPartial<Entity>, maybeOptions?: FindOneOptions<Entity>): Promise<Entity|undefined> { |
<<<<<<<
import {UniqueMetadata} from "./UniqueMetadata";
=======
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdMapError";
>>>>>>>
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdMapError";
import {UniqueMetadata} from "./UniqueMetadata";
<<<<<<<
* Entity's relation id metadatas.
*/
relationIds: RelationIdMetadata[] = [];
/**
* Entity's relation id metadatas.
*/
relationCounts: RelationCountMetadata[] = [];
/**
* Entity's index metadatas.
*/
indices: IndexMetadata[] = [];
/**
* Entity's unique metadatas.
*/
uniques: UniqueMetadata[] = [];
/**
* Entity's foreign key metadatas.
*/
foreignKeys: ForeignKeyMetadata[] = [];
/**
* Entity's embedded metadatas.
*/
embeddeds: EmbeddedMetadata[] = [];
/**
* All embeddeds - embeddeds from this entity metadata and from all child embeddeds, etc.
*/
allEmbeddeds: EmbeddedMetadata[] = [];
/**
* Entity listener metadatas.
*/
listeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER LOAD" type.
*/
afterLoadListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER INSERT" type.
*/
beforeInsertListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER INSERT" type.
*/
afterInsertListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER UPDATE" type.
*/
beforeUpdateListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER UPDATE" type.
*/
afterUpdateListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER REMOVE" type.
*/
beforeRemoveListeners: EntityListenerMetadata[] = [];
/**
* Listener metadatas with "AFTER REMOVE" type.
*/
afterRemoveListeners: EntityListenerMetadata[] = [];
/**
* If this entity metadata's table using one of the inheritance patterns,
* then this will contain what pattern it uses.
*/
inheritanceType?: "single-table"|"class-table";
/**
* If this entity metadata is a child table of some table, it should have a discriminator value.
* Used to store a value in a discriminator column.
*/
discriminatorValue?: string;
/**
* Checks if entity's table has multiple primary columns.
*/
hasMultiplePrimaryKeys: boolean;
/**
* Indicates if this entity metadata has uuid generated columns.
*/
hasUUIDGeneratedColumns: boolean;
/**
=======
>>>>>>>
<<<<<<<
this.recomputeColumnDependencies( this.ownColumns);
=======
this.columns = this.embeddeds.reduce((columns, embedded) => columns.concat(embedded.columnsFromTree), this.ownColumns);
this.primaryColumns = this.columns.filter(column => column.isPrimary);
this.hasMultiplePrimaryKeys = this.primaryColumns.length > 1;
this.hasUUIDGeneratedColumns = this.columns.filter(column => column.isGenerated || column.generationStrategy === "uuid").length > 0;
this.propertiesMap = this.createPropertiesMap();
>>>>>>>
this.columns = this.embeddeds.reduce((columns, embedded) => columns.concat(embedded.columnsFromTree), this.ownColumns);
this.primaryColumns = this.columns.filter(column => column.isPrimary);
this.hasMultiplePrimaryKeys = this.primaryColumns.length > 1;
this.hasUUIDGeneratedColumns = this.columns.filter(column => column.isGenerated || column.generationStrategy === "uuid").length > 0;
this.propertiesMap = this.createPropertiesMap(); |
<<<<<<<
// not needed by tsc since we require typescript external module,
// but the editor/IDE doesn't give completions without it
/// <reference path="typings/typescript/typescript.d.ts" />
=======
/// <reference path="typings/typescript/typescript.d.ts" />
>>>>>>>
// not needed by tsc since we require typescript external module,
// but the editor/IDE doesn't give completions without it
/// <reference path="typings/typescript/typescript.d.ts" />
<<<<<<<
function visit(node: ts.Node) {
//console.log(`${(<any>ts).SyntaxKind[node.kind]}: ${node.getText()}`);
switch (node.kind) {
case ts.SyntaxKind.SourceFile:
case ts.SyntaxKind.EndOfFileToken:
ts.forEachChild(node, visit);
break;
case ts.SyntaxKind.VariableDeclaration:
var varDecl = <ts.VariableDeclaration>node;
visit(varDecl.type);
visit(varDecl.name);
if (varDecl.initializer) {
result += ' =';
visit(varDecl.initializer);
}
break;
case ts.SyntaxKind.FunctionDeclaration:
var funcDecl= <ts.FunctionDeclaration>node;
visit(funcDecl.type);
visit(funcDecl.name);
result += '(';
result += ') {';
result += '}';
break;
case ts.SyntaxKind.NumberKeyword:
result += ' num';
break;
case ts.SyntaxKind.VoidKeyword:
result += ' void';
break;
case ts.SyntaxKind.VariableStatement:
ts.forEachChild(node, visit);
result += ';\n';
break;
case ts.SyntaxKind.FirstAssignment:
case ts.SyntaxKind.FirstLiteralToken:
case ts.SyntaxKind.Identifier:
result += ` ${node.getText() }`;
break;
default:
throw new Error("Unsupported node type " + (<any>ts).SyntaxKind[node.kind]);
=======
case ts.SyntaxKind.VariableStatement:
ts.forEachChild(node, visit);
emit(';\n');
break;
case ts.SyntaxKind.FirstAssignment:
case ts.SyntaxKind.FirstLiteralToken:
case ts.SyntaxKind.Identifier:
emit(node.getText());
break;
case ts.SyntaxKind.TypeReference:
var typeRef = <ts.TypeReferenceNode>node;
visit(typeRef.typeName);
if (typeRef.typeArguments) {
visitEach(typeRef.typeArguments);
}
break;
case ts.SyntaxKind.ClassDeclaration:
var classDecl = <ts.ClassDeclaration>node;
emit('class');
visit(classDecl.name);
if (classDecl.typeParameters) {
visitEach(classDecl.typeParameters);
}
if (classDecl.heritageClauses) {
visitEach(classDecl.heritageClauses);
}
if (classDecl.members) {
emit('{\n');
visitEach(classDecl.members);
emit('}\n');
>>>>>>>
case ts.SyntaxKind.VariableStatement:
ts.forEachChild(node, visit);
emit(';\n');
break;
case ts.SyntaxKind.FirstAssignment:
case ts.SyntaxKind.FirstLiteralToken:
case ts.SyntaxKind.Identifier:
emit(node.getText());
break;
case ts.SyntaxKind.TypeReference:
var typeRef = <ts.TypeReferenceNode>node;
visit(typeRef.typeName);
if (typeRef.typeArguments) {
visitEach(typeRef.typeArguments);
default:
throw new Error("Unsupported node type " + (<any>ts).SyntaxKind[node.kind]);
}
break;
case ts.SyntaxKind.ClassDeclaration:
var classDecl = <ts.ClassDeclaration>node;
emit('class');
visit(classDecl.name);
if (classDecl.typeParameters) {
visitEach(classDecl.typeParameters);
}
if (classDecl.heritageClauses) {
visitEach(classDecl.heritageClauses);
}
if (classDecl.members) {
emit('{\n');
visitEach(classDecl.members);
emit('}\n'); |
<<<<<<<
class Translator {
result: string = '';
lastCommentIdx: number = -1;
=======
export function translateProgram(program: ts.Program): string {
var result: string = "";
program.getSourceFiles()
.filter((sourceFile: ts.SourceFile) => sourceFile.fileName.indexOf(".d.ts") < 0)
.forEach(emitDart);
return result;
>>>>>>>
class Translator {
result: string = '';
// Comments attach to all following AST nodes before the next 'physical' token. Track the earliest
// offset to avoid printing comments multiple times.
lastCommentIdx: number = -1;
<<<<<<<
reportError(n: ts.Node, message: string) {
=======
function visitClassLike(decl: ts.ClassDeclaration | ts.InterfaceDeclaration) {
visit(decl.name);
if (decl.typeParameters) {
emit('<');
visitList(decl.typeParameters);
emit('>');
}
if (decl.heritageClauses) {
visitEach(decl.heritageClauses);
}
emit('{');
if (decl.members) {
visitEach(decl.members);
}
emit('}');
}
function visitCall(c: ts.CallExpression) {
visit(c.expression);
emit('(');
visitList(c.arguments);
emit(')');
}
function reportError(n: ts.Node, message: string) {
>>>>>>>
visitClassLike(decl: ts.ClassDeclaration | ts.InterfaceDeclaration) {
this.visit(decl.name);
if (decl.typeParameters) {
this.emit('<');
this.visitList(decl.typeParameters);
this.emit('>');
}
if (decl.heritageClauses) {
this.visitEach(decl.heritageClauses);
}
this.emit('{');
if (decl.members) {
this.visitEach(decl.members);
}
this.emit('}');
}
visitCall(c: ts.CallExpression) {
this.visit(c.expression);
this.emit('(');
this.visitList(c.arguments);
this.emit(')');
}
reportError(n: ts.Node, message: string) {
<<<<<<<
this.visit(varDecl.type);
this.visit(varDecl.name);
=======
if (varDecl.type) {
visit(varDecl.type);
} else {
emit('var');
}
visit(varDecl.name);
>>>>>>>
if (varDecl.type) {
this.visit(varDecl.type);
} else {
this.emit('var');
}
this.visit(varDecl.name);
<<<<<<<
var sLit = <ts.StringLiteralExpression>node;
this.emit(JSON.stringify(sLit.text));
=======
var sLit = <ts.LiteralExpression>node;
emit(JSON.stringify(sLit.text));
>>>>>>>
var sLit = <ts.LiteralExpression>node;
this.emit(JSON.stringify(sLit.text));
<<<<<<<
this.visitEach(typeRef.typeArguments);
=======
emit('<');
visitList(typeRef.typeArguments);
emit('>');
}
break;
case ts.SyntaxKind.TypeParameter:
var typeParam = <ts.TypeParameterDeclaration>node;
visit(typeParam.name);
if (typeParam.constraint) {
emit('extends');
visit(typeParam.constraint);
>>>>>>>
this.emit('<');
this.visitList(typeRef.typeArguments);
this.emit('>');
}
break;
case ts.SyntaxKind.TypeParameter:
var typeParam = <ts.TypeParameterDeclaration>node;
this.visit(typeParam.name);
if (typeParam.constraint) {
this.emit('extends');
this.visit(typeParam.constraint);
<<<<<<<
if (funcDecl.type) this.visit(funcDecl.type);
this.visit(funcDecl.name);
this.visitFunctionLike(funcDecl);
=======
if (funcDecl.typeParameters) reportError(node, 'generic functions are unsupported');
if (funcDecl.type) visit(funcDecl.type);
visit(funcDecl.name);
visitFunctionLike(funcDecl);
>>>>>>>
if (funcDecl.typeParameters) this.reportError(node, 'generic functions are unsupported');
if (funcDecl.type) this.visit(funcDecl.type);
this.visit(funcDecl.name);
this.visitFunctionLike(funcDecl); |
<<<<<<<
const response = await virtualAlexa.utter("play now") as any;
=======
let requestToCheck: any;
assert(virtualAlexa.filter((request) => {
requestToCheck = request;
}));
const response = await virtualAlexa.utter("play now");
>>>>>>>
let requestToCheck: any;
assert(virtualAlexa.filter((request) => {
requestToCheck = request;
}));
const response = await virtualAlexa.utter("play now") as any; |
<<<<<<<
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
=======
try {
await this.executeQuery(connection, `CREATE extension IF NOT EXISTS "uuid-ossp"`);
} catch (_) {
logger.log("warn", "At least one of the entities has uuid column, but the 'uuid-ossp' extension cannot be installed automatically. Please install it manually using superuser rights");
}
>>>>>>>
try {
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
} catch (_) {
logger.log("warn", "At least one of the entities has uuid column, but the 'uuid-ossp' extension cannot be installed automatically. Please install it manually using superuser rights");
}
<<<<<<<
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "citext"`);
if (hasHstoreColumns)
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "hstore"`);
=======
try {
await this.executeQuery(connection, `CREATE extension IF NOT EXISTS "citext"`);
} catch (_) {
logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
}
>>>>>>>
try {
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "citext"`);
} catch (_) {
logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
}
if (hasHstoreColumns)
try {
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "hstore"`);
} catch (_) {
logger.log("warn", "At least one of the entities has hstore column, but the 'hstore' extension cannot be installed automatically. Please install it manually using superuser rights");
}
<<<<<<<
} else if (column.type === String || column.type === "varchar") {
return "character varying";
=======
} else if (column.type === Boolean) {
type += "boolean";
} else if (column.type === "simple-array") {
type += "text";
} else if (column.type === "simple-json") {
type += "text";
} else {
type += column.type;
}
>>>>>>>
} else if (column.type === String || column.type === "varchar") {
return "character varying"; |
<<<<<<<
import WindowFocusStory, {
code as windowFocusCode
} from '../src/stories/useWindowFocus.story'
import SWRStory, { code as SWRCode } from '../src/stories/useSWR.story'
=======
import LocalStorageStory, {
code as localStorageCode
} from '../src/stories/useLocalStorage.story'
>>>>>>>
import LocalStorageStory, {
code as localStorageCode
} from '../src/stories/useLocalStorage.story'
import WindowFocusStory, {
code as windowFocusCode
} from '../src/stories/useWindowFocus.story'
import SWRStory, { code as SWRCode } from '../src/stories/useSWR.story'
<<<<<<<
},
{
title: 'useWindowFocus',
component: WindowFocusStory,
code: windowFocusCode
},
{ title: 'useSWR', component: SWRStory, code: SWRCode }
=======
},
{
title: 'useLocalStorage',
component: LocalStorageStory,
code: localStorageCode
}
>>>>>>>
},
{
title: 'useLocalStorage',
component: LocalStorageStory,
code: localStorageCode
},
{
title: 'useWindowFocus',
component: WindowFocusStory,
code: windowFocusCode
},
{ title: 'useSWR', component: SWRStory, code: SWRCode } |
<<<<<<<
export type DiscussionsOptions = {
draftRef?: null | firebase.database.Reference;
initialHistoryKey: number;
discussionAnchors: DiscussionAnchor[];
};
=======
export type MediaUploadInstance = {
id: string;
start: (callbacks: {
onFinish: (src: string) => unknown;
onProgress: (progress: number) => unknown;
onFailure: () => unknown;
}) => unknown;
};
export type MediaUploadHandler = (file: File) => null | MediaUploadInstance;
>>>>>>>
export type DiscussionsOptions = {
draftRef?: null | firebase.database.Reference;
initialHistoryKey: number;
discussionAnchors: DiscussionAnchor[];
};
export type MediaUploadInstance = {
id: string;
start: (callbacks: {
onFinish: (src: string) => unknown;
onProgress: (progress: number) => unknown;
onFailure: () => unknown;
}) => unknown;
};
export type MediaUploadHandler = (file: File) => null | MediaUploadInstance; |
<<<<<<<
=======
const getBranchesForPub = async (pubId: string) => {
const pubBranches = await Branch.findAll({ where: { pubId: pubId } });
const draftBranch = pubBranches.find((branch) => branch.title === 'draft');
const publicBranch = pubBranches.find((branch) => branch.title === 'public');
return { draftBranch: draftBranch, publicBranch: publicBranch };
};
const getPubDraftDoc = async (pubId: string, draftBranchId: string, historyKey: number | null) => {
return getBranchDoc(pubId, draftBranchId, historyKey, false, false);
};
>>>>>>>
<<<<<<<
sequelizeTransaction,
),
=======
postgresTransaction,
).catch((err) => console.error('Failed to create updated discussion anchor', err)),
>>>>>>>
sequelizeTransaction,
).catch((err) => console.error('Failed to create updated discussion anchor', err)),
<<<<<<<
const { doc: nextDoc } = await getPubDraftDoc(pubId, historyKey);
=======
>>>>>>> |
<<<<<<<
export type PubDocInfo = {
initialDoc: DocJson;
initialDocKey: number;
mostRecentRemoteKey?: number;
=======
export type PubPageData = DefinitelyHas<Pub, 'attributions' | 'collectionPubs' | 'discussions'> & {
discussions: DefinitelyHas<Discussion, 'thread'>[];
viewHash: Maybe<string>;
editHash: Maybe<string>;
isReadOnly: boolean;
isRelease: boolean;
isInMaintenanceMode: boolean;
initialStructuredCitations: boolean;
releaseNumber: Maybe<number>;
>>>>>>>
export type PubDocInfo = {
initialDoc: DocJson;
initialDocKey: number;
mostRecentRemoteKey?: number;
<<<<<<<
export type VisibilityUser = {
id: string;
visibilityId: string;
userId: string;
};
export type Visibility = {
id: string;
access: 'private' | 'members' | 'public';
users: VisibilityUser[];
};
=======
export type ThreadComment = {
id: string;
text: string;
content: {};
userId: string;
threadId: string;
};
export type Thread = {
id: string;
updatedAt: string;
createdAt: string;
locked?: boolean;
comments: ThreadComment[];
};
>>>>>>>
export type VisibilityUser = {
id: string;
visibilityId: string;
userId: string;
};
export type Visibility = {
id: string;
access: 'private' | 'members' | 'public';
users: VisibilityUser[];
};
export type ThreadComment = {
id: string;
text: string;
content: {};
userId: string;
threadId: string;
};
export type Thread = {
id: string;
updatedAt: string;
createdAt: string;
locked?: boolean;
comments: ThreadComment[];
};
<<<<<<<
visibility: Visibility;
=======
thread?: Thread;
>>>>>>>
visibility: Visibility;
thread?: Thread; |
<<<<<<<
import * as _ from 'underscore';
/*
=======
/**
* Creates a wrappable Promise rejection function.
*
* Creates a function that returns a Promise.reject with a new WrappedError
* that has the provided message and wraps the original error that
* caused the promise to reject.
*/
export
function reject(message: any, log: any) {
return function promiseRejection(error: any): Promise<any> {
const wrapped_error = new WrappedError(message, error);
if (log) {
console.error(wrapped_error);
}
return Promise.reject(wrapped_error);
};
}
/**
>>>>>>>
/** |
<<<<<<<
let elt: HTMLElement;
const textValue = 'this-is-a-test\n';
=======
const textValue = 'this-is-a-test\n'
>>>>>>>
const textValue = 'this-is-a-test\n';
<<<<<<<
elt = await newWidget(modelState);
expect(elt.textContent).to.equal(textValue);
});
=======
const elt = await newWidget(modelState)
expect(elt.textContent).to.equal(textValue)
})
>>>>>>>
const elt = await newWidget(modelState);
expect(elt.textContent).to.equal(textValue);
});
<<<<<<<
let elt = await newWidget(modelState);
=======
const elt = await newWidget(modelState)
>>>>>>>
const elt = await newWidget(modelState); |
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.content.focus();
} else if (content.do === 'blur') {
this.content.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.content.focus();
} else if (content.do == 'blur') {
this.content.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.content.focus();
} else if (content.do === 'blur') {
this.content.blur();
}
}
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.content.focus();
} else if (content.do === 'blur') {
this.content.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.content.focus();
} else if (content.do == 'blur') {
this.content.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.content.focus();
} else if (content.do === 'blur') {
this.content.blur();
}
}
<<<<<<<
update_placeholder(value?: string) {
const v = value || this.model.get('placeholder');
this.textbox.setAttribute('placeholder', v.toString());
=======
update_placeholder(value?: string): void {
value = value || this.model.get('placeholder');
this.textbox.setAttribute('placeholder', value.toString());
>>>>>>>
update_placeholder(value?: string): void {
const v = value || this.model.get('placeholder');
this.textbox.setAttribute('placeholder', v.toString());
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.textbox.focus();
} else if (content.do == 'blur') {
this.textbox.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
}
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.textbox.focus();
} else if (content.do == 'blur') {
this.textbox.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
}
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.textbox.focus();
} else if (content.do == 'blur') {
this.textbox.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.textbox.focus();
} else if (content.do === 'blur') {
this.textbox.blur();
}
} |
<<<<<<<
DOMWidgetView, unpack_models, ViewList, JupyterPhosphorPanelWidget, Dict
=======
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget
>>>>>>>
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget, Dict
<<<<<<<
_createElement(tagName: string): HTMLElement {
this.pWidget = new JupyterPhosphorPanelWidget({ view: this });
=======
_createElement(tagName: string) {
this.pWidget = new JupyterLuminoPanelWidget({ view: this });
>>>>>>>
_createElement(tagName: string): HTMLElement {
this.pWidget = new JupyterLuminoPanelWidget({ view: this }); |
<<<<<<<
register_target(target_name: string, f: (comm: Comm, object: KernelMessage.IMessage) => void): void {
let handle = this.jsServicesKernel.registerCommTarget(target_name,
=======
register_target(target_name: string, f: (comm: Comm, data: {}) => void): void {
const handle = this.jsServicesKernel.registerCommTarget(target_name,
>>>>>>>
register_target(target_name: string, f: (comm: Comm, object: KernelMessage.IMessage) => void): void {
const handle = this.jsServicesKernel.registerCommTarget(target_name,
<<<<<<<
unregister_target(target_name: string, f: (comm: Comm, object: KernelMessage.IMessage) => void): void {
let handle = this.targets[target_name];
=======
unregister_target(target_name: string, f: (comm: Comm, data: {}) => void): void {
const handle = this.targets[target_name];
>>>>>>>
unregister_target(target_name: string, f: (comm: Comm, object: KernelMessage.IMessage) => void): void {
const handle = this.targets[target_name]; |
<<<<<<<
update(): void {
// Disable listbox if needed
this.listbox.disabled = this.model.get('disabled');
=======
update() {
>>>>>>>
update(): void { |
<<<<<<<
function isEqual(a: unknown, b: unknown) {
=======
function isEqual(a: any, b: any): boolean {
>>>>>>>
function isEqual(a: unknown, b: unknown): boolean {
<<<<<<<
return function promiseRejection(error: Error) {
=======
return function promiseRejection(error: any): never {
>>>>>>>
return function promiseRejection(error: Error): never {
<<<<<<<
function put_buffers(state: Dict<BufferJSON>, buffer_paths: (string | number)[][], buffers: DataView[]) {
=======
function put_buffers(state: any, buffer_paths: (string | number)[][], buffers: DataView[]): void {
>>>>>>>
function put_buffers(state: Dict<BufferJSON>, buffer_paths: (string | number)[][], buffers: DataView[]): void {
<<<<<<<
function remove_buffers(state: BufferJSON | ISerializeable): ISerializedState {
let buffers: ArrayBuffer[] = [];
let buffer_paths: (string | number)[][] = [];
=======
function remove_buffers(state: any): {state: any; buffers: ArrayBuffer[]; buffer_paths: (string | number)[][]} {
const buffers: ArrayBuffer[] = [];
const buffer_paths: (string | number)[][] = [];
>>>>>>>
function remove_buffers(state: BufferJSON | ISerializeable): ISerializedState {
const buffers: ArrayBuffer[] = [];
const buffer_paths: (string | number)[][] = [];
<<<<<<<
function remove(obj: BufferJSON | ISerializeable, path: (string | number)[]): BufferJSON {
if (isSerializable(obj)) {
=======
function remove(obj: any, path: (string | number)[]): any {
if (obj.toJSON) {
>>>>>>>
function remove(obj: BufferJSON | ISerializeable, path: (string | number)[]): BufferJSON {
if (isSerializable(obj)) {
<<<<<<<
} else if (isObject(obj)) {
for (let key in obj) {
=======
} else if (isPlainObject(obj)) {
for (const key in obj) {
>>>>>>>
} else if (isObject(obj)) {
for (const key in obj) {
<<<<<<<
let new_state = remove(state, []) as JSONObject;
=======
const new_state = remove(state, []);
>>>>>>>
const new_state = remove(state, []) as JSONObject; |
<<<<<<<
initialize(parameters: WidgetView.InitializeParameters) {
=======
initialize(parameters: any): void {
>>>>>>>
initialize(parameters: WidgetView.InitializeParameters): void {
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
=======
handle_message(content: any): void {
if (content.do == 'focus') {
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
<<<<<<<
}
listbox: HTMLSelectElement;
=======
}
>>>>>>>
}
<<<<<<<
initialize(parameters: WidgetView.InitializeParameters) {
=======
initialize(parameters: any): void {
>>>>>>>
initialize(parameters: WidgetView.InitializeParameters): void {
<<<<<<<
let radio = view.container.querySelectorAll<HTMLInputElement>(item_query);
=======
const radio = this.container.querySelectorAll(item_query);
>>>>>>>
const radio = this.container.querySelectorAll<HTMLInputElement>(item_query);
<<<<<<<
let radio_el = radio[0];
radio_el.checked = view.model.get('index') === index;
radio_el.disabled = view.model.get('disabled');
=======
const radio_el = radio[0] as HTMLInputElement;
radio_el.checked = this.model.get('index') === index;
radio_el.disabled = this.model.get('disabled');
>>>>>>>
const radio_el = radio[0];
radio_el.checked = this.model.get('index') === index;
radio_el.disabled = this.model.get('disabled');
<<<<<<<
let cStyles = window.getComputedStyle(e.container);
let containerMargin = parseInt(cStyles.marginBottom, 10);
=======
const cStyles = window.getComputedStyle(e.container);
const containerMargin = parseInt(cStyles.marginBottom);
>>>>>>>
const cStyles = window.getComputedStyle(e.container);
const containerMargin = parseInt(cStyles.marginBottom, 10);
<<<<<<<
let extraMargin = diff === 0 ? 0 : (lineHeight - diff);
=======
const extraMargin = diff == 0 ? 0 : (lineHeight - diff);
>>>>>>>
const extraMargin = diff === 0 ? 0 : (lineHeight - diff);
<<<<<<<
_handle_click (event: Event) {
let target = event.target as HTMLInputElement;
this.model.set('index', parseInt(target.value, 10), {updated_view: this});
=======
_handle_click (event: Event): void {
const target = event.target as HTMLInputElement;
this.model.set('index', parseInt(target.value), {updated_view: this});
>>>>>>>
_handle_click (event: Event): void {
const target = event.target as HTMLInputElement;
this.model.set('index', parseInt(target.value, 10), {updated_view: this});
<<<<<<<
initialize(options: WidgetView.InitializeParameters) {
=======
initialize(options: any): void {
>>>>>>>
initialize(options: WidgetView.InitializeParameters): void {
<<<<<<<
items.forEach(function(item: any, index: number) {
let item_query = '[data-value="' + encodeURIComponent(item) + '"]';
let button = view.buttongroup.querySelector(item_query)!;
if (view.model.get('index') === index) {
=======
items.forEach((item: any, index: number) => {
const item_query = '[data-value="' + encodeURIComponent(item) + '"]';
const button = this.buttongroup.querySelector(item_query);
if (this.model.get('index') === index) {
>>>>>>>
items.forEach((item: any, index: number) => {
const item_query = '[data-value="' + encodeURIComponent(item) + '"]';
const button = view.buttongroup.querySelector(item_query)!;
if (this.model.get('index') === index) {
<<<<<<<
initialize(parameters: WidgetView.InitializeParameters) {
=======
initialize(parameters: any): void {
>>>>>>>
initialize(parameters: WidgetView.InitializeParameters): void { |
<<<<<<<
DOMWidgetView, unpack_models, ViewList, JupyterPhosphorPanelWidget,
reject, WidgetModel, WidgetView
=======
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget, WidgetModel
>>>>>>>
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget,
reject, WidgetModel, WidgetView
<<<<<<<
children_views: ViewList<DOMWidgetView> | null;
pWidget: JupyterPhosphorPanelWidget;
=======
children_views: ViewList<DOMWidgetView>;
pWidget: JupyterLuminoPanelWidget;
>>>>>>>
children_views: ViewList<DOMWidgetView> | null;
pWidget: JupyterLuminoPanelWidget; |
<<<<<<<
initialize(attributes: Backbone.ObjectHash, options: {model_id: string, comm?: any, widget_manager: any}) {
=======
initialize(attributes: any, options: {model_id: string; comm?: any; widget_manager: any}): void {
>>>>>>>
initialize(attributes: Backbone.ObjectHash, options: {model_id: string; comm?: any; widget_manager: any}): void {
<<<<<<<
set_state(state: Dict<unknown>) {
=======
set_state(state: any): void {
>>>>>>>
set_state(state: Dict<unknown>): void {
<<<<<<<
get_state(drop_defaults?: boolean): JSONObject {
let fullState = this.attributes;
=======
get_state(drop_defaults: boolean): any {
const fullState = this.attributes;
>>>>>>>
get_state(drop_defaults?: boolean): JSONObject {
const fullState = this.attributes;
<<<<<<<
let d = this.defaults;
let defaults = (typeof d === 'function') ? d.call(this) : d;
let state: JSONObject = {};
=======
const d = this.defaults;
const defaults = (typeof d === 'function') ? d.call(this) : d;
const state: {[key: string]: any} = {};
>>>>>>>
const d = this.defaults;
const defaults = (typeof d === 'function') ? d.call(this) : d;
const state: JSONObject = {};
<<<<<<<
serialize(state: Dict<any>): JSONObject {
=======
serialize(state: {[key: string]: any}): {[key: string]: any} {
>>>>>>>
serialize(state: Dict<any>): JSONObject {
<<<<<<<
send_sync_message(state: JSONObject, callbacks: any = {}) {
=======
send_sync_message(state: {}, callbacks: any = {}): void {
>>>>>>>
send_sync_message(state: JSONObject, callbacks: any = {}): void {
<<<<<<<
toJSON(options?: {}) {
=======
toJSON(options: any): string {
>>>>>>>
toJSON(options?: {}): string {
<<<<<<<
static _deserialize_state(state: JSONObject, manager: managerBase.ManagerBase<any>) {
let serializers = this.serializers;
let deserialized: Dict<any>;
=======
static _deserialize_state(state: {[key: string]: any}, manager: managerBase.ManagerBase<any>): Promise<utils.Dict<unknown>> {
const serializers = this.serializers;
let deserialized: {[key: string]: any};
>>>>>>>
static _deserialize_state(state: JSONObject, manager: managerBase.ManagerBase<any>): Promise<utils.Dict<unknown>> {
const serializers = this.serializers;
let deserialized: Dict<any>;
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.el.focus();
} else if (content.do === 'blur') {
this.el.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.el.focus();
} else if (content.do == 'blur') {
this.el.blur();
}
}
>>>>>>>
handle_message(content: any): void {
if (content.do === 'focus') {
this.el.focus();
} else if (content.do === 'blur') {
this.el.blur();
}
}
<<<<<<<
setLayout(layout: LayoutModel, oldLayout?: LayoutModel) {
=======
setLayout(layout: WidgetModel, oldLayout?: WidgetModel): void {
>>>>>>>
setLayout(layout: LayoutModel, oldLayout?: LayoutModel): void {
<<<<<<<
setStyle(style: StyleModel, oldStyle?: StyleModel) {
=======
setStyle(style: WidgetModel, oldStyle?: WidgetModel): void {
>>>>>>>
setStyle(style: StyleModel, oldStyle?: StyleModel): void {
<<<<<<<
update_mapped_classes(class_map: Dict<string[]>, trait_name: string, el?: HTMLElement) {
let key = this.model.previous(trait_name) as string;
let old_classes = class_map[key] ? class_map[key] : [];
=======
update_mapped_classes(class_map: {[key: string]: string[]}, trait_name: string, el?: HTMLElement): void {
let key = this.model.previous(trait_name);
const old_classes = class_map[key] ? class_map[key] : [];
>>>>>>>
update_mapped_classes(class_map: Dict<string[]>, trait_name: string, el?: HTMLElement): void {
let key = this.model.previous(trait_name) as string;
const old_classes = class_map[key] ? class_map[key] : [];
<<<<<<<
set_mapped_classes(class_map: Dict<string[]>, trait_name: string, el?: HTMLElement) {
let key = this.model.get(trait_name);
let new_classes = class_map[key] ? class_map[key] : [];
=======
set_mapped_classes(class_map: {[key: string]: string[]}, trait_name: string, el?: HTMLElement): void {
const key = this.model.get(trait_name);
const new_classes = class_map[key] ? class_map[key] : [];
>>>>>>>
set_mapped_classes(class_map: Dict<string[]>, trait_name: string, el?: HTMLElement): void {
const key = this.model.get(trait_name);
const new_classes = class_map[key] ? class_map[key] : []; |
<<<<<<<
var matchesSelector = ElementProto.matches ||
(ElementProto as any)['webkitMatchesSelector'] ||
(ElementProto as any)['mozMatchesSelector'] ||
(ElementProto as any)['msMatchesSelector'] ||
(ElementProto as any)['oMatchesSelector'] ||
function matches(selector) {
var matches = (this.document || this.ownerDocument).querySelectorAll(selector),
i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {}
=======
let matchesSelector = ElementProto.matches ||
ElementProto['webkitMatchesSelector'] ||
ElementProto['mozMatchesSelector'] ||
ElementProto['msMatchesSelector'] ||
ElementProto['oMatchesSelector'] ||
function matches(selector: string) {
/* tslint:disable:no-invalid-this */
let matches = (this.document || this.ownerDocument).querySelectorAll(selector);
let i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {
continue;
}
>>>>>>>
let matchesSelector = ElementProto.matches ||
ElementProto['webkitMatchesSelector'] ||
ElementProto['mozMatchesSelector'] ||
ElementProto['msMatchesSelector'] ||
ElementProto['oMatchesSelector'] ||
function matches(selector: string) {
/* tslint:disable:no-invalid-this */
let matches = (this.document || this.ownerDocument).querySelectorAll(selector);
let i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {
continue;
}
<<<<<<<
_setAttributes(attrs: Backbone.ObjectHash) {
for (var attr in attrs) {
=======
_setAttributes(attrs: {[key: string]: string}) {
for (let attr in attrs) {
>>>>>>>
_setAttributes(attrs: Backbone.ObjectHash) {
for (let attr in attrs) {
<<<<<<<
delegate(eventName: string, listener: Function): Backbone.View<T>;
delegate(eventName: string, selector: string, listener: Function): Backbone.View<T>;
delegate(eventName: string, selector: string | Function, listener?: any): Backbone.View<T> {
=======
delegate(eventName: string, selector: any, listener: any) {
>>>>>>>
delegate(eventName: string, listener: Function): Backbone.View<T>;
delegate(eventName: string, selector: string, listener: Function): Backbone.View<T>;
delegate(eventName: string, selector: string | Function, listener?: any): Backbone.View<T> {
<<<<<<<
var root = this.el;
var handler = selector ? function (e: any) {
var node: any = e.target || e.srcElement;
for (; node && node != root; node = (node as any).parentNode) {
=======
let root = this.el;
let handler = selector ? function (e: Event) {
let node = (e.target as HTMLElement) || (e.srcElement as HTMLElement);
for (; node && node !== root; node = node.parentNode as HTMLElement) {
>>>>>>>
let root = this.el;
let handler = selector ? function (e: Event) {
let node = (e.target as HTMLElement) || (e.srcElement as HTMLElement);
for (; node && node !== root; node = node.parentNode as HTMLElement) {
<<<<<<<
undelegate(eventName: string, selector?: string, listener?: Function): NativeView<T>;
undelegate(selector: string, listener?: Function): NativeView<T>;
undelegate(eventName: string, selector?: string | Function, listener?: Function): NativeView<T> {
=======
undelegate(eventName: string, selector?: any, listener?: any) {
>>>>>>>
undelegate(eventName: string, selector?: string, listener?: Function): NativeView<T>;
undelegate(selector: string, listener?: Function): NativeView<T>;
undelegate(eventName: string, selector?: string | Function, listener?: Function): NativeView<T> { |
<<<<<<<
let protocolVersion = ((msg.metadata || {})['version'] as string) || '';
=======
const protocolVersion = ((msg.metadata || {}).version as string) || '';
>>>>>>>
const protocolVersion = ((msg.metadata || {})['version'] as string) || '';
<<<<<<<
let data = msg.content.data as unknown as ISerializedState;
let buffer_paths = data.buffer_paths || [];
=======
const data = (msg.content.data as any);
const buffer_paths = data.buffer_paths || [];
>>>>>>>
const data = msg.content.data as unknown as ISerializedState;
const buffer_paths = data.buffer_paths || [];
<<<<<<<
new_widget(options: ModelOptions, serialized_state: JSONObject = {}): Promise<WidgetModel> {
=======
new_widget(options: IWidgetOptions, serialized_state: any = {}): Promise<WidgetModel> {
>>>>>>>
new_widget(options: IWidgetOptions, serialized_state: JSONObject = {}): Promise<WidgetModel> {
<<<<<<<
async new_model(options: ModelOptions, serialized_state: JSONObject = {}): Promise<WidgetModel> {
=======
async new_model(options: IModelOptions, serialized_state: any = {}): Promise<WidgetModel> {
>>>>>>>
async new_model(options: ModelOptions, serialized_state: any = {}): Promise<WidgetModel> {
<<<<<<<
async _make_model(options: ModelOptions, serialized_state: JSONObject = {}): Promise<WidgetModel> {
let model_id = options.model_id;
let model_promise = this.loadClass(
=======
async _make_model(options: IModelOptions, serialized_state: any = {}): Promise<WidgetModel> {
const model_id = options.model_id;
const model_promise = this.loadClass(
>>>>>>>
async _make_model(options: ModelOptions, serialized_state: any = {}): Promise<WidgetModel> {
const model_id = options.model_id;
const model_promise = this.loadClass(
<<<<<<<
let models = state.state;
=======
const models = state.state as any;
>>>>>>>
let models = state.state as any;
<<<<<<<
let bufferPaths = model.buffers.map(b => b.path);
=======
const bufferPaths = model.buffers.map((b: any) => b.path);
>>>>>>>
let bufferPaths = model.buffers.map((b: any) => b.path);
<<<<<<<
let buffers = model.buffers.map(b => new DataView(decode[b.encoding](b.data)));
=======
const buffers = model.buffers.map((b: any) => new DataView(decode[b.encoding](b.data)));
>>>>>>>
let buffers = model.buffers.map((b: any) => new DataView(decode[b.encoding](b.data)));
<<<<<<<
protected filterExistingModelState(serialized_state: IManagerState) {
let models = serialized_state.state;
=======
protected filterExistingModelState(serialized_state: any): any {
let models = serialized_state.state as {[key: string]: any};
>>>>>>>
protected filterExistingModelState(serialized_state: any) {
let models = serialized_state.state;
<<<<<<<
function serialize_state(models: WidgetModel[], options: IStateOptions = {}): IManagerState {
const state: IManagerStateMap = {};
=======
function serialize_state(models: WidgetModel[], options: IStateOptions = {}): ReadonlyPartialJSONValue {
const state: {[key: string]: any} = {};
>>>>>>>
function serialize_state(models: WidgetModel[], options: IStateOptions = {}) {
const state: IManagerStateMap = {}; |
<<<<<<<
}
listbox: HTMLSelectElement;
=======
};
>>>>>>>
} |
<<<<<<<
ManagerBase
} from './manager-base';
import {
Kernel, KernelMessage
} from '@jupyterlab/services';
import {
Widget
} from '@phosphor/widgets';
=======
Widget, Panel
} from '@lumino/widgets';
>>>>>>>
Widget, Panel
} from '@lumino/widgets';
<<<<<<<
import {
JSONObject, JSONValue
} from '@phosphor/coreutils';
import {
LayoutModel
} from './widget_layout';
import {
StyleModel
} from './widget_style';
export
const JUPYTER_WIDGETS_VERSION = '1.0.0';
=======
>>>>>>>
<<<<<<<
function unpack_models(value: any | Backbone.ObjectHash | string | (Backbone.ObjectHash | string)[], manager: ManagerBase<any>): Promise<WidgetModel | ModelDict | WidgetModel[] | any> {
let unpacked: Promise<WidgetModel> | Promise<WidgetModel>[];
=======
function unpack_models(value: any, manager: managerBase.ManagerBase<any>): Promise<any> {
>>>>>>>
function unpack_models(value: any | Backbone.ObjectHash | string | (Backbone.ObjectHash | string)[], manager: ManagerBase<any>): Promise<WidgetModel | ModelDict | WidgetModel[] | any> {
let unpacked: Promise<WidgetModel> | Promise<WidgetModel>[];
<<<<<<<
let unpacked: Promise<WidgetModel>[] = [];
=======
const unpacked: any[] = [];
>>>>>>>
const unpacked: any[] = [];
<<<<<<<
} else if (value instanceof Object && typeof value !== 'string') {
let unpacked: ModelPromiseDict = {};
=======
} else if (value instanceof Object) {
const unpacked: {[key: string]: any} = {};
>>>>>>>
} else if (value instanceof Object && typeof value !== 'string') {
const unpacked: {[key: string]: any} = {};
<<<<<<<
unpacked[key] = unpack_models((value as Backbone.ObjectHash)[key], manager);
})
=======
unpacked[key] = unpack_models(value[key], manager);
});
>>>>>>>
unpacked[key] = unpack_models(value[key], manager);
});
<<<<<<<
initialize(attributes: Backbone.ObjectHash, options: {model_id: string, comm?: any, widget_manager: any}) {
=======
initialize(attributes: any, options: {model_id: string, comm?: any, widget_manager: any}) {
>>>>>>>
initialize(attributes: Backbone.ObjectHash, options: {model_id: string, comm?: any, widget_manager: any}) {
<<<<<<<
send(content: any, callbacks, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
=======
send(content: {}, callbacks: {}, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
>>>>>>>
send(content: {}, callbacks: {}, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
<<<<<<<
_handle_comm_msg(msg: KernelMessage.ICommOpenMsg): Promise<void> {
let data = msg.content.data as JSONObject | null;
if (data === null) {
return Promise.resolve();
}
switch (data['method']) {
=======
_handle_comm_msg(msg: KernelMessage.ICommMsgMsg): Promise<void> {
const data = msg.content.data as any;
let method = data.method;
// tslint:disable-next-line:switch-default
switch (method) {
>>>>>>>
_handle_comm_msg(msg: KernelMessage.ICommMsgMsg): Promise<void> {
const data = msg.content.data as any;
let method = data.method;
// tslint:disable-next-line:switch-default
switch (method) {
<<<<<<<
let state = data!['state'] as JSONObject;
let buffer_paths = (data!['buffer_paths'] || []) as (string | number)[][];
=======
let state = data.state;
let buffer_paths = data.buffer_paths || [];
>>>>>>>
let state = data.state;
let buffer_paths = data.buffer_paths || [];
<<<<<<<
this.trigger('msg:custom', data['content'], msg.buffers);
=======
this.trigger('msg:custom', data.content, msg.buffers);
>>>>>>>
this.trigger('msg:custom', data.content, msg.buffers);
<<<<<<<
let defaults = (typeof d === "function") ? d.call(this) : d;
let state: JSONObject = {};
=======
let defaults = (typeof d === 'function') ? d.call(this) : d;
let state: {[key: string]: any} = {};
>>>>>>>
let defaults = (typeof d === 'function') ? d.call(this) : d;
let state: JSONObject = {};
<<<<<<<
send_sync_message(state: JSONObject, callbacks: any = {}) {
=======
send_sync_message(state: {}, callbacks: any = {}) {
>>>>>>>
send_sync_message(state: JSONObject, callbacks: any = {}) {
<<<<<<<
let statuscb = callbacks.iopub.status
callbacks.iopub.status = (msg: KernelMessage.IStatusMsg) => {
=======
let statuscb = callbacks.iopub.status;
callbacks.iopub.status = (msg: KernelMessage.IStatusMsg) => {
>>>>>>>
let statuscb = callbacks.iopub.status;
callbacks.iopub.status = (msg: KernelMessage.IStatusMsg) => {
<<<<<<<
on_some_change(keys: string[], callback, context: any) {
this.on('change', function() {
if (keys.some(this.hasChanged, this)) {
=======
on_some_change(keys: string[], callback: (...args: any[]) => void, context: any) {
const scope = this;
this.on('change', function () {
if (keys.some(scope.hasChanged, scope)) {
>>>>>>>
on_some_change(keys: string[], callback: (...args: any[]) => void, context: any) {
const scope = this;
this.on('change', function () {
if (keys.some(scope.hasChanged, scope)) {
<<<<<<<
toJSON(options?: {}) {
=======
toJSON(options: any) {
>>>>>>>
toJSON(options?: {}) {
<<<<<<<
static _deserialize_state(state: JSONObject, manager: ManagerBase<any>) {
=======
static _deserialize_state(state: {[key: string]: any}, manager: managerBase.ManagerBase<any>) {
>>>>>>>
static _deserialize_state(state: JSONObject, manager: managerBase.ManagerBase<any>) {
<<<<<<<
comm: COMMTYPEHERE;
=======
comm: IClassicComm;
>>>>>>>
comm: IClassicComm;
<<<<<<<
initialize(parameters: { options: any} ) {
=======
constructor(options?: Backbone.ViewOptions<WidgetModel> & {options?: any}) {
super(options);
}
/**
* Initializer, called at the end of the constructor.
*/
initialize(parameters: WidgetView.InitializeParameters) {
>>>>>>>
constructor(options?: Backbone.ViewOptions<WidgetModel> & {options?: any}) {
super(options);
}
/**
* Initializer, called at the end of the constructor.
*/
initialize(parameters: WidgetView.InitializeParameters) {
<<<<<<<
update(options?: {}) {
};
=======
update(options?: any) {
return;
}
>>>>>>>
update(options?: any) {
return;
}
<<<<<<<
create_child_view(child_model: WidgetModel, options = {}) {
let that = this;
=======
create_child_view(child_model: WidgetModel, options = {}) {
>>>>>>>
create_child_view(child_model: WidgetModel, options = {}) {
<<<<<<<
send(content: JSONObject, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
=======
send(content: {}, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
>>>>>>>
send(content: {}, buffers?: ArrayBuffer[] | ArrayBufferView[]) {
<<<<<<<
initialize(parameters: { options: any }) {
=======
initialize(parameters: WidgetView.InitializeParameters) {
>>>>>>>
initialize(parameters: WidgetView.InitializeParameters) {
<<<<<<<
this.listenTo(this.model, 'change:_dom_classes', (model: DOMWidgetModel, new_classes: string[]) => {
=======
this.listenTo(this.model, 'change:_dom_classes', (model: WidgetModel, new_classes: string[]) => {
>>>>>>>
this.listenTo(this.model, 'change:_dom_classes', (model: WidgetModel, new_classes: string[]) => {
<<<<<<<
this.listenTo(this.model, 'change:layout', (model: DOMWidgetModel, value: LayoutModel) => {
=======
this.listenTo(this.model, 'change:layout', (model: WidgetModel, value: WidgetModel) => {
>>>>>>>
this.listenTo(this.model, 'change:layout', (model: WidgetModel, value: WidgetModel) => {
<<<<<<<
this.listenTo(this.model, 'change:style', (model: DOMWidgetModel, value: StyleModel) => {
=======
this.listenTo(this.model, 'change:style', (model: WidgetModel, value: WidgetModel) => {
>>>>>>>
this.listenTo(this.model, 'change:style', (model: WidgetModel, value: WidgetModel) => {
<<<<<<<
setLayout(layout: LayoutModel, oldLayout?: LayoutModel) {
=======
setLayout(layout: WidgetModel, oldLayout?: WidgetModel) {
>>>>>>>
setLayout(layout: LayoutModel, oldLayout?: LayoutModel) {
<<<<<<<
setStyle(style: StyleModel, oldStyle?: StyleModel) {
=======
setStyle(style: WidgetModel, oldStyle?: WidgetModel) {
>>>>>>>
setStyle(style: StyleModel, oldStyle?: StyleModel) {
<<<<<<<
update_mapped_classes(class_map: IClassMap, trait_name: string, el?: HTMLElement) {
let key = this.model.previous(trait_name) as string;
=======
update_mapped_classes(class_map: {[key: string]: string[]}, trait_name: string, el?: HTMLElement) {
let key = this.model.previous(trait_name);
>>>>>>>
update_mapped_classes(class_map: IClassMap, trait_name: string, el?: HTMLElement) {
let key = this.model.previous(trait_name);
<<<<<<<
set_mapped_classes(class_map: IClassMap, trait_name: string, el?: HTMLElement) {
=======
set_mapped_classes(class_map: {[key: string]: string[]}, trait_name: string, el?: HTMLElement) {
>>>>>>>
set_mapped_classes(class_map: IClassMap, trait_name: string, el?: HTMLElement) { |
<<<<<<<
dispose() {
this._view = null!;
=======
dispose(): void {
this._view = null;
>>>>>>>
dispose(): void {
this._view = null!; |
<<<<<<<
};
/** TODO: Upgrading to TSC 2.4, maybe we don't need this?
* - RC 20 June 2016 */
type JSXChild = JSX.Element | string | undefined;
export type JSXChildren = JSXChild[] | JSXChild;
=======
};
/** HACK: Server side caching (or webpack) is not doing something right.
* This is a work around until then. */
export function hardRefresh() {
let HARD_RESET = "NEED_HARD_REFRESH2";
console.warn("[HARD RESET] 1");
if (localStorage) {
console.warn("[HARD RESET] 2");
if (!localStorage.getItem(HARD_RESET)) {
localStorage.setItem(HARD_RESET, "DONE");
console.warn("[HARD RESET] 3");
window.location.reload(true);
}
};
}
>>>>>>>
};
/** TODO: Upgrading to TSC 2.4, maybe we don't need this?
* - RC 20 June 2016 */
type JSXChild = JSX.Element | string | undefined;
export type JSXChildren = JSXChild[] | JSXChild;
/** HACK: Server side caching (or webpack) is not doing something right.
* This is a work around until then. */
export function hardRefresh() {
let HARD_RESET = "NEED_HARD_REFRESH2";
console.warn("[HARD RESET] 1");
if (localStorage) {
console.warn("[HARD RESET] 2");
if (!localStorage.getItem(HARD_RESET)) {
localStorage.setItem(HARD_RESET, "DONE");
console.warn("[HARD RESET] 3");
window.location.reload(true);
}
};
} |
<<<<<<<
import {SqliteDriver} from "../driver/sqlite/SqliteDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {RandomGenerator} from "../util/RandomGenerator";
import {InsertResult} from "./result/InsertResult";
import {ReturningStatementNotSupportedError} from "../error/ReturningStatementNotSupportedError";
import {InsertValuesMissingError} from "../error/InsertValuesMissingError";
import {ColumnMetadata} from "../metadata/ColumnMetadata";
import {ReturningResultsEntityUpdator} from "./ReturningResultsEntityUpdator";
=======
import {AbstractSqliteDriver} from "../driver/sqlite-abstract/AbstractSqliteDriver";
>>>>>>>
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {RandomGenerator} from "../util/RandomGenerator";
import {InsertResult} from "./result/InsertResult";
import {ReturningStatementNotSupportedError} from "../error/ReturningStatementNotSupportedError";
import {InsertValuesMissingError} from "../error/InsertValuesMissingError";
import {ColumnMetadata} from "../metadata/ColumnMetadata";
import {ReturningResultsEntityUpdator} from "./ReturningResultsEntityUpdator";
import {AbstractSqliteDriver} from "../driver/sqlite-abstract/AbstractSqliteDriver";
import {SqljsDriver} from "../driver/sqljs/SqljsDriver";
<<<<<<<
if (this.connection.driver instanceof SqliteDriver) { // unfortunately sqlite does not support DEFAULT expression in INSERT queries
if (column.default !== undefined) { // try to use default defined in the column
return this.connection.driver.normalizeDefault(column);
}
return "NULL"; // otherwise simply use NULL and pray if column is nullable
=======
if (this.connection.driver instanceof AbstractSqliteDriver) {
return "NULL";
>>>>>>>
if (this.connection.driver instanceof AbstractSqliteDriver) { // unfortunately sqlite does not support DEFAULT expression in INSERT queries
if (column.default !== undefined) { // try to use default defined in the column
return this.connection.driver.normalizeDefault(column);
}
return "NULL"; // otherwise simply use NULL and pray if column is nullable |
<<<<<<<
protected recreateTableLocked = false;
protected async recreateTableLock() {
while (this.recreateTableLocked) {
await new Promise<void>((resolve) => setTimeout(resolve, 10));
}
this.recreateTableLocked = true;
}
protected async recreateTableRelease() {
this.recreateTableLocked = false;
}
protected async recreateTable(tableSchema: TableSchema, oldTableSchema?: TableSchema): Promise<void> {
await this.recreateTableLock();
=======
protected async recreateTable(tableSchema: TableSchema, oldTableSchema?: TableSchema, migrateData = true): Promise<void> {
>>>>>>>
protected recreateTableLocked = false;
protected async recreateTableLock() {
while (this.recreateTableLocked) {
await new Promise<void>((resolve) => setTimeout(resolve, 10));
}
this.recreateTableLocked = true;
}
protected async recreateTableRelease() {
this.recreateTableLocked = false;
}
protected async recreateTable(tableSchema: TableSchema, oldTableSchema?: TableSchema, migrateData = true): Promise<void> {
await this.recreateTableLock(); |
<<<<<<<
const mediator = require("desktop/lib/mediator.coffee")
// TODO: Needs removed to prevent importing backbone
=======
>>>>>>>
// TODO: Needs removed to prevent importing backbone |
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.classify(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
const _callback = (typeof params === 'function' && !callback) ? params : (callback) ? callback : () => {/* noop */};
>>>>>>>
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.classify(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.detectFaces(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
const _callback = (typeof params === 'function' && !callback) ? params : (callback) ? callback : () => {/* noop */};
>>>>>>>
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.detectFaces(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
=======
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
*
* Specify the filename by appending `_positive_examples_filename` to the class name. For example,
* the filename parameter for `goldenretriever_positive_examples` would be `goldenretriever_positive_examples_filename`
>>>>>>>
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
*
* Specify the filename by appending `_positive_examples_filename` to the class name. For example,
* the filename parameter for `goldenretriever_positive_examples` would be `goldenretriever_positive_examples_filename`
<<<<<<<
const _callback = callback;
const requiredParams = ['name'];
if (!_callback) {
return new Promise((resolve, reject) => {
this.createClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
const positiveExamplesKeys = Object.keys(_params).filter(key => {
return key.match(/^.+_positive_examples$/);
});
if (positiveExamplesKeys.length === 0) {
requiredParams.push('<classname>_positive_examples');
}
=======
const _callback = (callback) ? callback : () => { /* noop */ };
const requiredParams = ['name'];
const positiveExamplesKeys = Object.keys(_params).filter(key => {
return key.match(/^.+_positive_examples$/);
});
if (positiveExamplesKeys.length === 0) {
requiredParams.push('<classname>_positive_examples');
}
>>>>>>>
const _callback = callback;
const requiredParams = ['name'];
if (!_callback) {
return new Promise((resolve, reject) => {
this.createClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
const positiveExamplesKeys = Object.keys(_params).filter(key => {
return key.match(/^.+_positive_examples$/);
});
if (positiveExamplesKeys.length === 0) {
requiredParams.push('<classname>_positive_examples');
}
<<<<<<<
if (!_callback) {
return new Promise((resolve, reject) => {
this.deleteClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
>>>>>>>
if (!_callback) {
return new Promise((resolve, reject) => {
this.deleteClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
if (!_callback) {
return new Promise((resolve, reject) => {
this.getClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
>>>>>>>
if (!_callback) {
return new Promise((resolve, reject) => {
this.getClassifier(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.listClassifiers(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
const _callback = (typeof params === 'function' && !callback) ? params : (callback) ? callback : () => {/* noop */};
>>>>>>>
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.listClassifiers(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
=======
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
*
* Specify the filename by appending `_positive_examples_filename` to the class name. For example,
* the filename parameter for `goldenretriever_positive_examples` would be `goldenretriever_positive_examples_filename`
>>>>>>>
* @param {string} [params.positive_examples_filename] - The filename for positive_examples.
*
* Specify the filename by appending `_positive_examples_filename` to the class name. For example,
* the filename parameter for `goldenretriever_positive_examples` would be `goldenretriever_positive_examples_filename`
<<<<<<<
if (!_callback) {
return new Promise((resolve, reject) => {
this.getCoreMlModel(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
>>>>>>>
if (!_callback) {
return new Promise((resolve, reject) => {
this.getCoreMlModel(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
if (!_callback) {
return new Promise((resolve, reject) => {
this.deleteUserData(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
>>>>>>>
if (!_callback) {
return new Promise((resolve, reject) => {
this.deleteUserData(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
<<<<<<<
/** The language of the output class names. The full set of languages is supported for the built-in classifier IDs: `default`, `food`, and `explicit`. The class names of custom classifiers are not translated. The response might not be in the specified language when the requested language is not supported or when there is no translation for the class name. */
=======
/** The desired language of parts of the response. See the response for details. */
>>>>>>>
/** The desired language of parts of the response. See the response for details. */ |
<<<<<<<
import { BaseService } from '../lib/base_service';
import { getDefaultHeaders } from '../lib/common';
import { getMissingParams } from '../lib/helper';
=======
import { BaseService, getMissingParams} from 'ibm-cloud-sdk-core';
import { RequestResponse } from 'request';
import { getSdkHeaders } from '../lib/common';
>>>>>>>
import { BaseService, getMissingParams} from 'ibm-cloud-sdk-core';
import { getSdkHeaders } from '../lib/common'; |
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.listModels(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
const _callback = (typeof params === 'function' && !callback) ? params : (callback) ? callback : () => {/* noop */};
const defaultHeaders = getDefaultHeaders('speech_to_text', 'v1', 'listModels');
>>>>>>>
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.listModels(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
const defaultHeaders = getDefaultHeaders('speech_to_text', 'v1', 'listModels');
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.checkJobs(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
=======
const _callback = (typeof params === 'function' && !callback) ? params : (callback) ? callback : () => {/* noop */};
const defaultHeaders = getDefaultHeaders('speech_to_text', 'v1', 'checkJobs');
>>>>>>>
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.checkJobs(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
});
}
const defaultHeaders = getDefaultHeaders('speech_to_text', 'v1', 'checkJobs'); |
<<<<<<<
=======
export import CompareComplyV1 = require('./compare-comply/v1');
export import ConversationV1 = require('./conversation/v1');
>>>>>>>
export import CompareComplyV1 = require('./compare-comply/v1');
<<<<<<<
=======
export import DialogV1 = require('./dialog/v1');
>>>>>>> |
<<<<<<<
const loadCompilerFunction = function (compilerModule: string | undefined){
if (compilerModule) {
const compilerMod = require(compilerModule);
if(!compilerMod.create){ throw new Error("No create function defined for "+ compilerModule);}
const compilerObject = compilerMod.create()
if (!compilerObject.compile) { throw new Error("No compile function defined for create return object"); }
return compilerObject.compile
}
return undefined
}
=======
const loadEnvVariables = function () {
const env = dotenv.config();
//ignore file not found but throw otherwise
if (env.error && (env.error as any).code && (env.error as any).code != "ENOENT") {
throw env.error;
}
return env;
}
>>>>>>>
const loadCompilerFunction = function (compilerModule: string | undefined){
if (compilerModule) {
const compilerMod = require(compilerModule);
if(!compilerMod.create){ throw new Error("No create function defined for "+ compilerModule);}
const compilerObject = compilerMod.create()
if (!compilerObject.compile) { throw new Error("No compile function defined for create return object"); }
return compilerObject.compile
}
return undefined
}
const loadEnvVariables = function () {
const env = dotenv.config();
//ignore file not found but throw otherwise
if (env.error && (env.error as any).code && (env.error as any).code != "ENOENT") {
throw env.error;
}
return env;
}
<<<<<<<
fname = path.resolve(fname)
servient.runPrivilegedScript(data, fname,{argv:scriptArgs, compiler: compile});
=======
fname = path.resolve(fname)
servient.runPrivilegedScript(data, fname,{argv:scriptArgs, env: env.parsed});
>>>>>>>
fname = path.resolve(fname)
servient.runPrivilegedScript(data, fname,{
argv: scriptArgs,
env: env.parsed,
compiler: compile
}); |
<<<<<<<
import {Broadcaster} from "../subscriber/Broadcaster";
=======
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
>>>>>>>
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
import {Broadcaster} from "../subscriber/Broadcaster";
<<<<<<<
* Broadcaster used on this query runner to broadcast entity events.
*/
readonly broadcaster: Broadcaster;
/**
* Isolated entity manager working only with current query runner.
=======
* Isolated entity manager working only with this query runner.
>>>>>>>
* Broadcaster used on this query runner to broadcast entity events.
*/
readonly broadcaster: Broadcaster;
/**
* Isolated entity manager working only with this query runner.
<<<<<<<
* Inserts new values into closure table.
=======
* Insert a new row with given values into the given table.
* Returns value of the generated column if given and generate column exist in the table.
*
* @deprecated todo: remove later use query builder instead
*/
insert(tablePath: string, valuesMap: Object): Promise<InsertResult>;
/**
* Updates rows that match given simple conditions in the given table.
*
* @deprecated todo: remove later use query builder instead
*/
update(tablePath: string, valuesMap: Object, conditions: Object): Promise<void>;
/**
* Performs a simple DELETE query by a given conditions in a given table.
*
* @deprecated todo: remove later use query builder instead
*/
delete(tablePath: string, condition: Object|string, parameters?: any[]): Promise<void>;
/**
* Inserts new values into closure table.
*
* @deprecated todo: move to ClosureQueryBuilder
*/
insertIntoClosureTable(tablePath: string, newEntityId: any, parentId: any, hasLevel: boolean): Promise<number>;
/**
* Returns all available database names including system databases.
>>>>>>>
* Inserts new values into closure table.
*
* @deprecated todo: move to ClosureQueryBuilder
*/
insertIntoClosureTable(tablePath: string, newEntityId: any, parentId: any, hasLevel: boolean): Promise<number>;
/**
* Returns all available database names including system databases. |
<<<<<<<
onIntent(): Observable<string> { return; };
=======
onNewIntent(): Observable<string> {
return;
}
>>>>>>>
onIntent(): Observable<string> {
return;
} |
<<<<<<<
export class PostProcessRenderContext {
private readonly _camera: Camera = null!;
private readonly _postProcessingCamera: Camera = paper.GameObject.globalGameObject.getOrAddComponent(Camera); // TODO 后期渲染专用相机
private readonly _drawCall: DrawCall = DrawCall.create();
private readonly _copyMaterial: Material = new Material(egret3d.DefaultShaders.COPY);//TODO全局唯一?
private _fullScreenRT: BaseRenderTarget = null!;
/**
* 禁止实例化。
*/
public constructor(camera: Camera) {
this._camera = camera;
//
this._postProcessingCamera.opvalue = 0.0;
this._postProcessingCamera.size = 1;
this._postProcessingCamera.near = 0.01;
this._postProcessingCamera.far = 1;
//
this._drawCall.mesh = DefaultMeshes.FULLSCREEN_QUAD;
this._drawCall.mesh._createBuffer();
this._drawCall.subMeshIndex = 0;
this._drawCall.matrix = Matrix4.IDENTITY;
}
public blit(src: Texture, material: Material | null = null, dest: BaseRenderTarget | null = null) {
if (!material) {
material = this._copyMaterial;
material.setTexture(src);
}
const postProcessingCamera = this._postProcessingCamera;
const renderState = paper.GameObject.globalGameObject.getComponent(WebGLRenderState)!;
const backupRenderTarget = renderState.renderTarget;
this._drawCall.material = material;
renderState.updateViewport(postProcessingCamera.viewport, dest || backupRenderTarget);
renderState.clearBuffer(gltf.BufferBit.DEPTH_BUFFER_BIT | gltf.BufferBit.COLOR_BUFFER_BIT, egret3d.Color.WHITE);
renderState.draw(postProcessingCamera, this._drawCall);
// renderState.updateViewport(postProcessingCamera.viewport, backupRenderTarget);
}
public clear() {
this._fullScreenRT.dispose();
this._fullScreenRT = null;
}
public get currentCamera() {
return this._camera;
}
public get fullScreenRT() {
const stageViewport = stage.viewport;
if (!this._fullScreenRT || this._fullScreenRT.width !== stageViewport.w || this._fullScreenRT.height !== stageViewport.h) {
if (this._fullScreenRT) {
this._fullScreenRT.dispose();
}
this._fullScreenRT = new GlRenderTarget("fullScreenRT", stageViewport.w, stageViewport.h, true);//TODO 平台无关
}
return this._fullScreenRT;
}
}
=======
>>>>>>> |
<<<<<<<
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
=======
>>>>>>>
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
<<<<<<<
import { Observable } from 'rxjs';
=======
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
>>>>>>>
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs'; |
<<<<<<<
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
=======
import { Cordova, CordovaFunctionOverride, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
>>>>>>>
import { Cordova, CordovaFunctionOverride, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
<<<<<<<
* @param {Array<IndexItem>} items Array of items to index
* @return {Promise<any>} Returns if index set was successfull
=======
* @param {Array<IndexItem>} Array of items to index
* @return {Promise<any>} Returns if index set was successful
>>>>>>>
* @param {Array<IndexItem>} items Array of items to index
* @return {Promise<any>} Returns if index set was successfull
<<<<<<<
* @param {Array<string>} domains Array of domains to clear
* @return {Promise<any>} Resolve if successfull
=======
* @param {Array<string>} Array of domains to clear
* @return {Promise<any>} Resolve if successful
>>>>>>>
* @param {Array<string>} domains Array of domains to clear
* @return {Promise<any>} Resolve if successfull
<<<<<<<
* @param {Array<string>} identifiers Array of identifiers to clear
* @return {Promise<any>} Resolve if successfull
=======
* @param {Array<string>} Array of identifiers to clear
* @return {Promise<any>} Resolve if successful
>>>>>>>
* @param {Array<string>} identifiers Array of identifiers to clear
* @return {Promise<any>} Resolve if successfull |
<<<<<<<
import {ColumnOptions} from "../decorator/options/ColumnOptions";
import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
import {LazyRelationsWrapper} from "../lazy-loading/LazyRelationsWrapper";
import {UniqueMetadata} from "../metadata/UniqueMetadata";
=======
>>>>>>>
import {UniqueMetadata} from "../metadata/UniqueMetadata";
<<<<<<<
// build all unique constraints (need to do it after relations and their join columns are built)
entityMetadatas.forEach(entityMetadata => {
entityMetadata.uniques.forEach(unique => unique.build(this.connection.namingStrategy));
});
entityMetadatas
.filter(metadata => !!metadata.parentEntityMetadata && metadata.tableType === "class-table-child")
.forEach(metadata => {
const parentPrimaryColumns = metadata.parentEntityMetadata.primaryColumns;
const parentRelationColumns = parentPrimaryColumns.map(parentPrimaryColumn => {
const columnName = this.connection.namingStrategy.classTableInheritanceParentColumnName(metadata.parentEntityMetadata.tableName, parentPrimaryColumn.propertyPath);
const column = new ColumnMetadata({
connection: this.connection,
entityMetadata: metadata,
referencedColumn: parentPrimaryColumn,
args: {
target: metadata.target,
propertyName: columnName,
mode: "parentId",
options: <ColumnOptions> {
name: columnName,
type: parentPrimaryColumn.type,
unique: false,
nullable: false,
primary: true
}
}
});
metadata.registerColumn(column);
column.build(this.connection);
return column;
});
metadata.foreignKeys = [
new ForeignKeyMetadata({
entityMetadata: metadata,
referencedEntityMetadata: metadata.parentEntityMetadata,
namingStrategy: this.connection.namingStrategy,
columns: parentRelationColumns,
referencedColumns: parentPrimaryColumns,
onDelete: "CASCADE"
})
];
});
=======
>>>>>>>
// build all unique constraints (need to do it after relations and their join columns are built)
entityMetadatas.forEach(entityMetadata => {
entityMetadata.uniques.forEach(unique => unique.build(this.connection.namingStrategy));
}); |
<<<<<<<
import {GoogleMaps} from './plugins/googlemaps';
=======
import {GoogleAnalytics} from './plugins/googleanalytics';
>>>>>>>
import {GoogleMaps} from './plugins/googlemaps';
import {GoogleAnalytics} from './plugins/googleanalytics';
<<<<<<<
GoogleMaps,
=======
GoogleAnalytics,
>>>>>>>
GoogleMaps,
GoogleAnalytics,
<<<<<<<
GoogleMaps : GoogleMaps,
=======
GoogleAnalytics: GoogleAnalytics,
>>>>>>>
GoogleMaps : GoogleMaps,
GoogleAnalytics: GoogleAnalytics, |
<<<<<<<
} else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === Date) {
return DateUtils.mixedDateToDate(value);
=======
} else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === Date) {
return DateUtils.mixedDateToDate(value);
} else if (columnMetadata.isGenerated && columnMetadata.generationStrategy === "uuid" && !value) {
return RandomGenerator.uuid4();
>>>>>>>
} else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === Date) {
return DateUtils.mixedDateToDate(value);
<<<<<<<
return column.entityMetadata.indices.some(idx => idx.isUnique && idx.columns.length === 1 && idx.columns[0] === column);
=======
return column.isUnique ||
!!column.entityMetadata.indices.find(index => index.isUnique && index.columns.length === 1 && index.columns[0] === column);
>>>>>>>
return column.entityMetadata.indices.some(idx => idx.isUnique && idx.columns.length === 1 && idx.columns[0] === column);
<<<<<<<
=======
>>>>>>>
<<<<<<<
/**
* Checks if "DEFAULT" values in the column metadata and in the database are equal.
*/
protected compareDefaultValues(columnMetadataValue: string, databaseValue: string): boolean {
if (typeof columnMetadataValue === "string" && typeof databaseValue === "string") {
// we need to cut out "'" because in mysql we can understand returned value is a string or a function
// as result compare cannot understand if default is really changed or not
columnMetadataValue = columnMetadataValue.replace(/^'+|'+$/g, "");
databaseValue = databaseValue.replace(/^'+|'+$/g, "");
}
return columnMetadataValue === databaseValue;
}
/**
* Compare column lengths only if the datatype supports it.
*/
protected compareColumnLengths(tableColumn: TableColumn, columnMetadata: ColumnMetadata): boolean {
const normalizedColumn = this.normalizeType(columnMetadata) as ColumnType;
if (this.withLengthColumnTypes.indexOf(normalizedColumn) !== -1) {
let metadataLength = this.getColumnLength(columnMetadata);
// if we found something to compare with then do it, else skip it
// use use case insensitive comparison to catch "MAX" vs "Max" case
if (metadataLength !== null && metadataLength !== undefined)
return tableColumn.length.toString().toLowerCase() === metadataLength.toLowerCase();
}
return true;
}
=======
/**
* Attaches all required base handlers to a database connection, such as the unhandled error handler.
*/
private prepareDbConnection(connection: any): any {
const { logger } = this.connection;
/*
Attaching an error handler to connection errors is essential, as, otherwise, errors raised will go unhandled and
cause the hosting app to crash.
*/
connection.on("error", (error: any) => logger.log("warn", `MySQL connection raised an error. ${error}`));
return connection;
}
>>>>>>>
/**
* Attaches all required base handlers to a database connection, such as the unhandled error handler.
*/
private prepareDbConnection(connection: any): any {
const { logger } = this.connection;
/*
Attaching an error handler to connection errors is essential, as, otherwise, errors raised will go unhandled and
cause the hosting app to crash.
*/
connection.on("error", (error: any) => logger.log("warn", `MySQL connection raised an error. ${error}`));
return connection;
}
/**
* Checks if "DEFAULT" values in the column metadata and in the database are equal.
*/
protected compareDefaultValues(columnMetadataValue: string, databaseValue: string): boolean {
if (typeof columnMetadataValue === "string" && typeof databaseValue === "string") {
// we need to cut out "'" because in mysql we can understand returned value is a string or a function
// as result compare cannot understand if default is really changed or not
columnMetadataValue = columnMetadataValue.replace(/^'+|'+$/g, "");
databaseValue = databaseValue.replace(/^'+|'+$/g, "");
}
return columnMetadataValue === databaseValue;
}
/**
* Compare column lengths only if the datatype supports it.
*/
protected compareColumnLengths(tableColumn: TableColumn, columnMetadata: ColumnMetadata): boolean {
const normalizedColumn = this.normalizeType(columnMetadata) as ColumnType;
if (this.withLengthColumnTypes.indexOf(normalizedColumn) !== -1) {
let metadataLength = this.getColumnLength(columnMetadata);
// if we found something to compare with then do it, else skip it
// use use case insensitive comparison to catch "MAX" vs "Max" case
if (metadataLength !== null && metadataLength !== undefined)
return tableColumn.length.toString().toLowerCase() === metadataLength.toLowerCase();
}
return true;
} |
<<<<<<<
import { ColorPickerService } from 'ngx-color-picker';
=======
import { EstimateEmailModule } from './auth/estimate-email/estimate-email.module';
>>>>>>>
import { ColorPickerService } from 'ngx-color-picker';
import { EstimateEmailModule } from './auth/estimate-email/estimate-email.module'; |
<<<<<<<
import {OracleDriver} from "../driver/oracle/OracleDriver";
=======
import {OrderByCondition} from "../find-options/OrderByCondition";
import {LimitOnUpdateNotSupportedError} from "../error/LimitOnUpdateNotSupportedError";
>>>>>>>
import {OrderByCondition} from "../find-options/OrderByCondition";
import {LimitOnUpdateNotSupportedError} from "../error/LimitOnUpdateNotSupportedError";
import {OracleDriver} from "../driver/oracle/OracleDriver"; |
<<<<<<<
import { EmployeeStatisticsService } from '../../../@core/services/employee-statistics.serivce';
import { Store } from '../../../@core/services/store.service';
import { takeUntil } from 'rxjs/operators';
=======
import { monthNames } from '../../../@core/utils/date';
>>>>>>>
import { EmployeeStatisticsService } from '../../../@core/services/employee-statistics.serivce';
import { Store } from '../../../@core/services/store.service';
import { takeUntil } from 'rxjs/operators';
import { monthNames } from '../../../@core/utils/date';
<<<<<<<
labels: this._getLast12months(),
=======
labels: [...monthNames],
>>>>>>>
labels: this._getLast12months(),
<<<<<<<
{
label: 'Revenue',
backgroundColor: colors.infoLight,
borderWidth: 1,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
},
{
label: 'Expenses',
backgroundColor: colors.successLight,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
},
{
label: 'Profit',
backgroundColor: colors.warningLight,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
},
=======
{
label: 'Revenue',
backgroundColor: colors.infoLight,
borderWidth: 1,
data: [
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
],
},
{
label: 'Expenses',
backgroundColor: colors.successLight,
data: [
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
],
},
{
label: 'Profit',
backgroundColor: colors.warningLight,
data: [
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
this.random(),
],
},
>>>>>>>
{
label: 'Revenue',
backgroundColor: colors.infoLight,
borderWidth: 1,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
},
{
label: 'Expenses',
backgroundColor: colors.successLight,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
},
{
label: 'Profit',
backgroundColor: colors.warningLight,
data: [
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
this._random(),
],
}, |
<<<<<<<
import { KeyResultUpdate } from '../keyresult-update/keyresult-update.entity';
=======
import { CandidateCriterionsRating } from '../candidate-criterions-rating/candidate-criterion-rating.entity';
>>>>>>>
import { KeyResultUpdate } from '../keyresult-update/keyresult-update.entity';
import { CandidateCriterionsRating } from '../candidate-criterions-rating/candidate-criterion-rating.entity'; |
<<<<<<<
import { RequestApprovalTeamModule } from './request-approval-team/request-approval-team.module';
=======
import { KeyResultUpdateModule } from './keyresult-update/keyresult-update.module';
import { CandidateCriterionsRatingModule } from './candidate-criterions-rating/candidate-criterion-rating.module';
import { GoalTimeFrameModule } from './goal-time-frame/goal-time-frame.module';
>>>>>>>
import { RequestApprovalTeamModule } from './request-approval-team/request-approval-team.module';
import { KeyResultUpdateModule } from './keyresult-update/keyresult-update.module';
import { CandidateCriterionsRatingModule } from './candidate-criterions-rating/candidate-criterion-rating.module';
import { GoalTimeFrameModule } from './goal-time-frame/goal-time-frame.module'; |
<<<<<<<
const integrationTypes = await this.tryExecute(
'Default Integration Types',
createDefaultIntegrationTypes(this.connection)
);
await this.tryExecute(
'Default Integrations',
createDefaultIntegrations(this.connection, this.tenant, integrationTypes)
);
=======
>>>>>>>
const integrationTypes = await this.tryExecute(
'Default Integration Types',
createDefaultIntegrationTypes(this.connection)
);
await this.tryExecute(
'Default Integrations',
createDefaultIntegrations(this.connection, integrationTypes)
); |
<<<<<<<
import { NgxElectronModule } from 'ngx-electron';
=======
import { NgxPermissionsModule } from 'ngx-permissions';
>>>>>>>
import { NgxElectronModule } from 'ngx-electron';
import { NgxPermissionsModule } from 'ngx-permissions';
<<<<<<<
SharedModule.forRoot(),
NgxElectronModule
=======
SharedModule.forRoot(),
NgxPermissionsModule.forRoot()
>>>>>>>
SharedModule.forRoot(),
NgxElectronModule,
NgxPermissionsModule.forRoot() |
<<<<<<<
import { TranslateModule } from '../../@shared/translate/translate.module';
=======
import { TranslatableService } from '../../@core/services/translatable.service';
>>>>>>>
import { TranslateModule } from '../../@shared/translate/translate.module';
import { TranslatableService } from '../../@core/services/translatable.service'; |
<<<<<<<
@Input() isGridEdit: boolean;
=======
@Input()
contactType: string;
>>>>>>>
@Input() isGridEdit: boolean;
@Input()
contactType: string; |
<<<<<<<
import { Integration } from '../integration/integration.entity';
import { IntegrationType } from '../integration/integration-type.entity';
=======
import { CandidateInterview } from '../candidate-interview/candidate-interview.entity';
import { EmployeeAppointment } from '../employee-appointment';
import { AppointmentEmployees } from '../appointment-employees/appointment-employees.entity';
>>>>>>>
import { Integration } from '../integration/integration.entity';
import { IntegrationType } from '../integration/integration-type.entity';
import { CandidateInterview } from '../candidate-interview/candidate-interview.entity';
import { EmployeeAppointment } from '../employee-appointment';
import { AppointmentEmployees } from '../appointment-employees/appointment-employees.entity';
<<<<<<<
=======
CandidateInterview,
IntegrationSetting,
>>>>>>>
CandidateInterview, |
<<<<<<<
import { HelpCenterArticleModule } from './help-center-article/help-center-article.module';
=======
import { GoalTimeFrameModule } from './goal-time-frame/goal-time-frame.module';
>>>>>>>
import { HelpCenterArticleModule } from './help-center-article/help-center-article.module';
import { GoalTimeFrameModule } from './goal-time-frame/goal-time-frame.module'; |
<<<<<<<
import { CandidateFeedbacksModule } from './candidate-feedbacks/candidate-feedbacks.module';
=======
import { ProductVariantSettingsModule } from './product-settings/product-settings.module';
>>>>>>>
import { CandidateFeedbacksModule } from './candidate-feedbacks/candidate-feedbacks.module';
import { ProductVariantSettingsModule } from './product-settings/product-settings.module'; |
<<<<<<<
s;
=======
selectedPolicyId: string;
>>>>>>>
<<<<<<<
smartTableSettings = {
actions: false,
editable: true,
noDataMessage: 'No Data',
columns: {
name: {
title: 'Name',
type: 'string',
filter: true
},
requiresApproval: {
title: 'Requires Approval',
type: 'custom',
width: '20%',
filter: false,
renderComponent: RequestApprovalIcon
},
paid: {
title: 'Paid',
type: 'custom',
width: '20%',
filter: false,
renderComponent: PaidIcon
}
}
};
=======
@ViewChild('timeOffPolicyTable', { static: false }) timeOffPolicyTable;
>>>>>>>
smartTableSettings = {
actions: false,
editable: true,
noDataMessage: 'No Data',
columns: {
name: {
title: 'Name',
type: 'string',
filter: true
},
requiresApproval: {
title: 'Requires Approval',
type: 'custom',
width: '20%',
filter: false,
renderComponent: RequestApprovalIcon
},
paid: {
title: 'Paid',
type: 'custom',
width: '20%',
filter: false,
renderComponent: PaidIcon
}
}
};
@ViewChild('timeOffPolicyTable', { static: false }) timeOffPolicyTable; |
<<<<<<<
source: {
title: this.getTranslation('SM_TABLE.SOURCE'),
type: 'custom',
class: 'text-center',
width: '200px',
renderComponent: CandidateSourceComponent,
filter: false
},
=======
>>>>>>>
source: {
title: this.getTranslation('SM_TABLE.SOURCE'),
type: 'custom',
class: 'text-center',
width: '200px',
renderComponent: CandidateSourceComponent,
filter: false
}, |
<<<<<<<
import { TenantBase } from '../core/entities/tenant-base';
import { Organization } from '../organization/organization.entity';
=======
import { Task } from '../tasks/task.entity';
>>>>>>>
import { TenantBase } from '../core/entities/tenant-base';
import { Organization } from '../organization/organization.entity';
import { Task } from '../tasks/task.entity';
<<<<<<<
@ManyToOne((type) => Organization, (organization) => organization.id)
organization: Organization;
=======
@ApiProperty({ type: String })
@IsString()
@IsNotEmpty()
@Column({ nullable: true })
owner: string;
>>>>>>>
@ManyToOne((type) => Organization, (organization) => organization.id)
organization?: Organization;
@ApiProperty({ type: String })
@IsString()
@IsNotEmpty()
@Column({ nullable: true })
owner: string; |
<<<<<<<
import { Employee } from '../../employee';
import {
TimeLogType,
TimerStatus,
IManualTimeInput,
IGetTimeLogInput
} from '@gauzy/models';
=======
import { Employee } from '../../employee/employee.entity';
import { TimeLogType, TimerStatus, IManualTimeInput } from '@gauzy/models';
>>>>>>>
import { Employee } from '../../employee/employee.entity';
import {
TimeLogType,
TimerStatus,
IManualTimeInput,
IGetTimeLogInput
} from '@gauzy/models'; |
<<<<<<<
import {
createCandidateSkills,
createRandomCandidateSkills
} from '../../candidate-skill/candidate-skill.seed';
import {
createCandidateExperiences,
createRandomCandidateExperience
} from '../../candidate-experience/candidate-experience.seed';
import {
createCandidateEducations,
createRandomCandidateEducations
} from '../../candidate-education/candidate-education.seed';
=======
import { createRandomContacts } from '../../contact/contact.seed';
import { createRandomOrganizationContact } from '../../organization-contact/organization-contact.seed';
>>>>>>>
import {
createCandidateSkills,
createRandomCandidateSkills
} from '../../candidate-skill/candidate-skill.seed';
import {
createCandidateExperiences,
createRandomCandidateExperience
} from '../../candidate-experience/candidate-experience.seed';
import {
createCandidateEducations,
createRandomCandidateEducations
} from '../../candidate-education/candidate-education.seed';
import { createRandomContacts } from '../../contact/contact.seed';
import { createRandomOrganizationContact } from '../../organization-contact/organization-contact.seed'; |
<<<<<<<
import { ProductTypeTranslation } from '../product-type/product-type-translation.entity';
=======
import { HelpCenter } from '../help-center/help-center.entity';
>>>>>>>
import { ProductTypeTranslation } from '../product-type/product-type-translation.entity';
import { HelpCenter } from '../help-center/help-center.entity';
<<<<<<<
AvailabilitySlots,
ProductTypeTranslation,
=======
AvailabilitySlots,
>>>>>>>
AvailabilitySlots,
ProductTypeTranslation |
<<<<<<<
logger: this.options.logger
}, (err: any, client: any) => {
=======
logger: this.options.logger,
authMechanism: this.options.authMechanism
}, (err: any, dbConnection: any) => {
>>>>>>>
logger: this.options.logger,
authMechanism: this.options.authMechanism
}, (err: any, client: any) => { |
<<<<<<<
import { Organization, OrganizationCreateInput } from '@gauzy/models';
import { first } from 'rxjs/operators';
=======
import { Organization, OrganizationSelectInput } from '@gauzy/models';
import { Observable } from 'rxjs';
>>>>>>>
import { Organization, OrganizationSelectInput } from '@gauzy/models';
import { Observable } from 'rxjs';
<<<<<<<
update(id: string, updateInput: OrganizationCreateInput): Promise<any> {
return this.http.put(`/api/organization/${id}`, updateInput).pipe(first()).toPromise();
}
delete(id: string): Promise<any> {
return this.http.delete(`/api/organization/${id}`).pipe(first()).toPromise();
}
getAll(): Promise<{ items: Organization[], total: number }> {
return this.http.get<{ items: Organization[], total: number }>(`/api/organization`).pipe(first()).toPromise();
}
getById(id: string): Promise<Organization> {
return this.http.get<Organization>(`/api/organization/${id}`).pipe(first()).toPromise();
=======
getById(id: string = '', select?: OrganizationSelectInput[]): Observable<Organization> {
return this.http.get<Organization>(`/api/organization/${id}/${JSON.stringify(select || '')}`);
>>>>>>>
update(id: string, updateInput: OrganizationCreateInput): Promise<any> {
return this.http.put(`/api/organization/${id}`, updateInput).pipe(first()).toPromise();
}
delete(id: string): Promise<any> {
return this.http.delete(`/api/organization/${id}`).pipe(first()).toPromise();
}
getAll(): Promise<{ items: Organization[], total: number }> {
return this.http.get<{ items: Organization[], total: number }>(`/api/organization`).pipe(first()).toPromise();
}
getById(id: string = '', select?: OrganizationSelectInput[]): Observable<Organization> {
return this.http.get<Organization>(`/api/organization/${id}/${JSON.stringify(select || '')}`); |
<<<<<<<
import { EmployeeProposalTemplate } from '../employee-proposal-template/employee-proposal-template.entity';
=======
import { ReportOrganization } from '../reports/report-organization.entity';
>>>>>>>
import { EmployeeProposalTemplate } from '../employee-proposal-template/employee-proposal-template.entity';
import { ReportOrganization } from '../reports/report-organization.entity';
<<<<<<<
ReportCategory,
EmployeeProposalTemplate
=======
ReportCategory,
ReportOrganization
>>>>>>>
ReportCategory,
EmployeeProposalTemplate,
ReportOrganization |
<<<<<<<
clock.tickInterval = options.tickRate ? 1.0 / options.tickRate : 0;
console.info("tick rate:", options.tickRate ? options.tickRate : "auto");
clock.frameInterval = options.frameRate ? 1.0 / options.frameRate : 0;
console.info("frame rate:", options.frameRate ? options.frameRate : "auto");
this.resume();
=======
if (options.tickInterval !== (void 0)) { clock.tickInterval = options.tickInterval; }
console.info("tick rate:", clock.tickInterval ? (1.0 / clock.tickInterval) : "auto");
if (options.frameInterval !== (void 0)) { clock.frameInterval = options.frameInterval; }
console.info("frame rate:", clock.frameInterval ? (1.0 / clock.frameInterval) : "auto");
>>>>>>>
clock.tickInterval = options.tickRate ? 1.0 / options.tickRate : 0;
console.info("tick rate:", options.tickRate ? options.tickRate : "auto");
clock.frameInterval = options.frameRate ? 1.0 / options.frameRate : 0;
console.info("frame rate:", options.frameRate ? options.frameRate : "auto"); |
<<<<<<<
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
=======
import { TimesheetModule } from './timesheet/timesheet.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
>>>>>>>
import { TimesheetModule } from './timesheet/timesheet.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
<<<<<<<
},
{
path: '/expense-categories',
module: ExpenseCategoriesModule
=======
},
{
path: '/timesheet',
module: TimesheetModule
},
{
path: '/integrations',
module: IntegrationsModule
>>>>>>>
},
{
path: '/expense-categories',
module: ExpenseCategoriesModule
},
{
path: '/timesheet',
module: TimesheetModule
},
{
path: '/integrations',
module: IntegrationsModule
<<<<<<<
OrganizationEmploymentTypeModule,
ExpenseCategoriesModule
=======
OrganizationEmploymentTypeModule,
TimesheetModule,
IntegrationsModule,
ExpenseCategoriesModule
>>>>>>>
OrganizationEmploymentTypeModule,
TimesheetModule,
IntegrationsModule,
ExpenseCategoriesModule |
<<<<<<<
import {abbreviate} from "../../util/StringUtils";
=======
import {EntityMetadata} from "../../metadata/EntityMetadata";
>>>>>>>
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {abbreviate} from "../../util/StringUtils";
<<<<<<<
const value = rawResults[0][this.buildColumnAlias(alias.name, column.databaseName)];
if (value === undefined || column.isVirtual || column.isParentId || column.isDiscriminator)
=======
const value = rawResults[0][alias.name + "_" + column.databaseName];
if (value === undefined || column.isVirtual)
>>>>>>>
const value = rawResults[0][this.buildColumnAlias(alias.name, column.databaseName)];
if (value === undefined || column.isVirtual)
<<<<<<<
if (metadata.parentEntityMetadata) { // todo: revisit
metadata.parentEntityMetadata.columns.forEach(column => {
const value = rawResults[0]["parentIdColumn_" + this.buildColumnAlias(metadata.parentEntityMetadata.tableName, column.databaseName)];
if (value === undefined || column.isVirtual || column.isParentId || column.isDiscriminator)
return;
column.setEntityValue(entity, this.driver.prepareHydratedValue(value, column));
if (value !== null) // we don't mark it as has data because if we will have all nulls in our object - we don't need such object
hasData = true;
});
}
=======
>>>>>>> |
<<<<<<<
constructor(readonly translateService: TranslateService) {
super(translateService);
}
=======
constructor(translateService: TranslateService) {
super(translateService);
}
>>>>>>>
constructor(readonly translateService: TranslateService) {
super(translateService);
}
<<<<<<<
=======
getCategoryName(categoryName: string) {
return categoryName in RecurringExpenseDefaultCategoriesEnum
? this.getTranslation(
`EXPENSES_PAGE.DEFAULT_CATEGORY.${categoryName}`
)
: categoryName;
}
>>>>>>>
getCategoryName(categoryName: string) {
return categoryName in RecurringExpenseDefaultCategoriesEnum
? this.getTranslation(
`EXPENSES_PAGE.DEFAULT_CATEGORY.${categoryName}`
)
: categoryName;
} |
<<<<<<<
import { ExpenseCategory } from '../expense-categories';
=======
import { EquipmentSharing } from '../equipment-sharing';
>>>>>>>
import { ExpenseCategory } from '../expense-categories';
import { EquipmentSharing } from '../equipment-sharing'; |
<<<<<<<
import { DownloadAllModule } from './download-all';
import { EmployeeLevelModule } from './organization_employeeLevel/organization-employee-level.module';
=======
import { ExportAllModule } from './export_import';
>>>>>>>
import { DownloadAllModule } from './download-all';
import { EmployeeLevelModule } from './organization_employeeLevel/organization-employee-level.module';
import { ExportAllModule } from './export_import';
<<<<<<<
TagModule,
EmployeeLevelModule
=======
TagModule
>>>>>>>
TagModule,
EmployeeLevelModule |
<<<<<<<
export * from './lib/candidate-feedback.model';
=======
export * from './lib/candidate-source.model';
>>>>>>>
export * from './lib/candidate-feedback.model';
export * from './lib/candidate-source.model'; |
<<<<<<<
export * from './lib/http-status.enum';
=======
export * from './lib/product.model';
export * from './lib/seed.model';
>>>>>>>
export * from './lib/http-status.enum';
export * from './lib/product.model';
export * from './lib/seed.model'; |
<<<<<<<
import { CandidateInterviewModule } from './candidate-interview/candidate-interview.module';
=======
import { AppointmentEmployeesModule } from './appointment-employees/appointment-employees.module';
>>>>>>>
import { CandidateInterviewModule } from './candidate-interview/candidate-interview.module';
import { AppointmentEmployeesModule } from './appointment-employees/appointment-employees.module'; |
<<<<<<<
import { IntegrationEntitySetting } from '../integration-entity-setting/integration-entity-setting.entity';
import { IntegrationEntitySettingTiedEntity } from '../integration-entity-setting-tied-entity/integration-entity-setting-tied-entitiy.entity';
=======
import { CandidateCv } from '../candidate-cv/candidate-cv.entity';
import { CandidateEducation } from '../candidate-education/candidate-education.entity';
>>>>>>>
import { IntegrationEntitySetting } from '../integration-entity-setting/integration-entity-setting.entity';
import { IntegrationEntitySettingTiedEntity } from '../integration-entity-setting-tied-entity/integration-entity-setting-tied-entitiy.entity';
import { CandidateCv } from '../candidate-cv/candidate-cv.entity';
import { CandidateEducation } from '../candidate-education/candidate-education.entity'; |
<<<<<<<
public zdist: float = -1.0;
=======
public zdist: number = -1;
/**
* TODO
*/
public count?: number = 0;
>>>>>>>
public zdist: float = -1.0;
/**
* TODO
*/
public count?: number = 0; |
<<<<<<<
hasInvoiceEditPermission: boolean;
enableSaveButton = true;
=======
subtotal = 0;
total = 0;
>>>>>>>
hasInvoiceEditPermission: boolean;
enableSaveButton = true;
subtotal = 0;
total = 0; |
<<<<<<<
convertAcceptedEstimates?: boolean;
=======
daysUntilDue?: number;
>>>>>>>
convertAcceptedEstimates?: boolean;
daysUntilDue?: number;
<<<<<<<
convertAcceptedEstimates?: boolean;
=======
daysUntilDue?: number;
>>>>>>>
convertAcceptedEstimates?: boolean;
daysUntilDue?: number; |
Subsets and Splits